2756 files changed, 42504 insertions, 44116 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());
 }
-// -------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 1e6ab619f426..96d2e22b19cb 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -53,7 +53,7 @@ void WpADOColumn::Create()
         pColumn->Release( );
     }
 }
-// -------------------------------------------------------------------------
+
 OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pColumn)
     : connectivity::sdbcx::OColumn(_bCase)
     ,m_pConnection(_pConnection)
@@ -64,7 +64,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection,_ADOColumn* _pC
     //  m_aColumn.put_ParentCatalog(_pConnection->getAdoCatalog()->getCatalog());
     fillPropertyValues();
 }
-// -------------------------------------------------------------------------
+
 OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection)
     : connectivity::sdbcx::OColumn(_bCase)
     ,m_pConnection(_pConnection)
@@ -76,7 +76,7 @@ OAdoColumn::OAdoColumn(sal_Bool _bCase,OConnection* _pConnection)
     m_Type = DataType::OTHER;
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -93,14 +93,14 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OColumn_ADO::getSomething(rId);
 }
-// -------------------------------------------------------------------------
+
 void OAdoColumn::construct()
 {
     sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
@@ -108,7 +108,7 @@ void OAdoColumn::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),     PROPERTY_ID_ISASCENDING,    nAttrib,&m_IsAscending, ::getBooleanCppuType());
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN),   PROPERTY_ID_RELATEDCOLUMN,  nAttrib,&m_ReferencedColumn,    ::getCppuType(static_cast< OUString*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     if(m_aColumn.IsValid())
@@ -189,7 +189,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
     }
     OColumn_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
-// -----------------------------------------------------------------------------
+
 void OAdoColumn::fillPropertyValues()
 {
     if(m_aColumn.IsValid())
@@ -271,23 +271,23 @@ void OAdoColumn::fillPropertyValues()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 WpADOColumn OAdoColumn::getColumnImpl() const
 {
     return m_aColumn;
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void SAL_CALL OAdoColumn::acquire() throw()
 {
     OColumn_ADO::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoColumn::release() throw()
 {
     OColumn_ADO::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 68063f1d9e6f..08dda621be35 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -47,17 +47,17 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
     return new OAdoColumn(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
 
-// -------------------------------------------------------------------------
+
 void OColumns::impl_refresh() throw(RuntimeException)
 {
     m_aCollection.Refresh();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OColumns::createDescriptor()
 {
     return new OAdoColumn(isCaseSensitive(),m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
@@ -125,14 +125,14 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro
 
     return new OAdoColumn(isCaseSensitive(),m_pConnection,pColumn->getColumnImpl());
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OColumns::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     if(!m_aCollection.Delete(_sElementName))
         ADOS::ThrowException(*m_pConnection->getConnection(),static_cast<XTypeProvider*>(this));
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 5dc84766b7a7..31768d537141 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -43,9 +43,9 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection");
-// --------------------------------------------------------------------------------
+
 OConnection::OConnection(ODriver*   _pDriver) throw(SQLException, RuntimeException)
                          : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
                          m_xCatalog(NULL),
@@ -92,11 +92,11 @@ OConnection::OConnection(ODriver*   _pDriver) throw(SQLException, RuntimeExcepti
 
     osl_atomic_decrement( &m_refCount );
 }
-//-----------------------------------------------------------------------------
+
 OConnection::~OConnection()
 {
 }
-//-----------------------------------------------------------------------------
+
 void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
 {
     osl_atomic_increment( &m_refCount );
@@ -157,12 +157,12 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
     }
     osl_atomic_decrement( &m_refCount );
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -173,7 +173,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return pStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -185,7 +185,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xPStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -197,7 +197,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xPStmt;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -218,7 +218,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLExcept
 
     return sql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -231,7 +231,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti
     else
         m_pAdoConnection->RollbackTrans();
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -240,7 +240,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
 
     return m_bAutocommit;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -249,7 +249,7 @@ void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 
     m_pAdoConnection->CommitTrans();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -258,14 +258,14 @@ void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 
     m_pAdoConnection->RollbackTrans();
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return OConnection_BASE::rBHelper.bDisposed && !m_pAdoConnection->get_State();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -281,7 +281,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -292,7 +292,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
     m_pAdoConnection->put_Mode(readOnly ? adModeRead : adModeReadWrite);
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -301,7 +301,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
 
     return m_pAdoConnection->get_Mode() == adModeRead;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -310,7 +310,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept
     m_pAdoConnection->PutDefaultDatabase(catalog);
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -318,7 +318,7 @@ OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeExcepti
 
     return m_pAdoConnection->GetDefaultDatabase();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -350,7 +350,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE
     m_pAdoConnection->put_IsolationLevel(eIso);
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -381,7 +381,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException,
     ADOS::ThrowException(*m_pAdoConnection,*this);
     return nRet;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -390,12 +390,12 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT
 
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this );
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -406,17 +406,17 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-//--------------------------------------------------------------------
+
 void OConnection::buildTypeInfo() throw( SQLException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -475,7 +475,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
         pRecordset->Release();
     }
 }
-//------------------------------------------------------------------------------
+
 void OConnection::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -500,7 +500,7 @@ void OConnection::disposing()
 
     dispose_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
@@ -509,7 +509,7 @@ sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Seque
                 :
             OConnection_BASE::getSomething(rId);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -524,7 +524,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
     }
     return pId->getImplementationId();
 }
-// -----------------------------------------------------------------------------
+
 const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
                            DataTypeEnum _nType,
                            const OUString& _sTypeName,
@@ -615,7 +615,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
 //  OSL_ENSURE(pTypeInfo, "getTypeInfoFromType: no type info found for this type!");
     return pTypeInfo;
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index cfbe22524fcd..847b1dd1359b 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -45,7 +45,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
     ,m_pConnection(_pCon)
 {
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
@@ -58,7 +58,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty)  throw
     return nValue;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
@@ -67,7 +67,7 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty)  throw(:
     ADO_PROP(_aProperty);
     return (!aVar.isNull() && !aVar.isEmpty() ? aVar.getBool() : sal_False);
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
@@ -81,7 +81,7 @@ OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty)  throw
 
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     ADORecordset *pRecordset = m_pADOConnection->getTypeInfo();
@@ -91,7 +91,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
     Reference< XResultSet > xRef = pResult;
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     OLEVariant  vtEmpty;
@@ -109,12 +109,12 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLExc
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     return getLiteral(DBLITERAL_CATALOG_SEPARATOR);
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     OLEVariant  vtEmpty;
@@ -131,7 +131,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLExce
     xRef = pResult;
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     const Any& catalog, const OUString& schema, const OUString& table,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -146,7 +146,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     xRef = pResult;
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -162,7 +162,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
@@ -178,7 +178,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -194,7 +194,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
@@ -211,67 +211,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_BINARY_LITERAL);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Maximum Row Size"));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_CATALOG_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_CHAR_LITERAL);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_COLUMN_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_CURSOR_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Active Sessions"));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Max Columns in Table"));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_TEXT_COMMAND);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_TABLE_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     return getInt32Property(OUString("Maximum Tables in SELECT"));
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -285,7 +285,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -300,7 +300,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -315,7 +315,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     const Any& catalog, const OUString& schema, const OUString& table,
     sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
@@ -331,7 +331,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -384,7 +384,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const OUString& primarySchema,
     const OUString& primaryTable, const Any& foreignCatalog,
@@ -401,138 +401,138 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return getBoolProperty(OUString("Maximum Row Size Includes BLOB"));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Maximum Index Size"));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("Catalog Term"));
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     return getLiteral(DBLITERAL_QUOTE_PREFIX);
 
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return isCapable(DBLITERAL_CORRELATION_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     return getInt32Property(OUString("Catalog Location")) == DBPROPVAL_CL_START;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DML;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_ALL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     sal_Bool bValue(sal_False);
@@ -551,323 +551,323 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3
 
     return bValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return sal_True;
     return getBoolProperty(OUString("Outer Join Capabilities"));
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     return new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_PROCEDURE_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_SCHEMA_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     return getBoolProperty(OUString("Read-Only Data Source"));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     return isCapable(DBLITERAL_COLUMN_ALIAS);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return isCapable(DBLITERAL_CORRELATION_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
     return getBoolProperty(OUString("Rowset Conversions on Command"));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return getBoolProperty(OUString("ORDER BY Columns in Select List"));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return isCapable(DBLITERAL_ESCAPE_PERCENT);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return getBoolProperty(OUString("ORDER BY Columns in Select List"));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     return OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("User Name"));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("Provider Friendly Name"));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("Provider Version"));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("DBMS Version"));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("DBMS Name"));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("Procedure Term"));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     return getStringProperty(OUString("Schema Term"));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nRet = TransactionIsolation::NONE;
@@ -890,12 +890,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(S
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = NULL;
@@ -925,151 +925,151 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, Runt
     }
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     return getLiteral(DBLITERAL_ESCAPE_PERCENT);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue.copy(0,aValue.lastIndexOf(','));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue.copy(0,aValue.lastIndexOf(','));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return sal_True;
     return (getInt32Property(OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return supportsFullOuterJoins(  );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Max Columns in GROUP BY"));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return getInt32Property(OUString("Max Columns in ORDER BY"));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     return getMaxSize(DBLITERAL_USER_NAME);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY != setType;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaData::getUDTs", *this );
     return Reference< XResultSet >();
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 1fa5f97f92be..100c1ae27e2e 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::uno;
 
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaData::fillLiterals()
 {
     ADORecordset *pRecordset = NULL;
@@ -78,7 +78,7 @@ void ODatabaseMetaData::fillLiterals()
         aRecordset.Close();
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)
 {
     if(!m_aLiteralInfo.size())
@@ -90,7 +90,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)
         nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == (-1)) ? 0 : (*aIter).second.cchMaxLen;
     return nSize;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
 {
     if(!m_aLiteralInfo.size())
@@ -102,7 +102,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
     return bSupported;
 }
 
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId)
 {
     if(!m_aLiteralInfo.size())
@@ -113,8 +113,8 @@ OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId)
         sStr = (*aIter).second.pwszLiteralValue;
     return sStr;
 }
-// -----------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 {
     m_mColumns[8] = OColumn(OUString(),OUString("IS_GRANTABLE"),
@@ -122,7 +122,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
         3,3,0,
         DataType::VARCHAR);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 {
     m_mColumns[6] = OColumn(OUString(),OUString("TYPE_NAME"),
@@ -154,7 +154,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
         1,1,0,
         DataType::INTEGER);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 {
     m_mColumns[5] = OColumn(OUString(),OUString("REMARKS"),
@@ -162,7 +162,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap()
         0,0,0,
         DataType::VARCHAR);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 {
     m_mColumns[12] = OColumn(OUString(),OUString("NULLABLE"),
@@ -170,7 +170,7 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
         1,1,0,
         DataType::INTEGER);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 {
     m_mColumns[5] = OColumn(OUString(),OUString("KEY_SEQ"),
@@ -182,7 +182,7 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
         0,0,0,
         DataType::VARCHAR);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 {
     m_mColumns[4] = OColumn(OUString(),OUString("NON_UNIQUE"),
@@ -198,7 +198,7 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
         0,0,0,
         DataType::VARCHAR);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 {
     m_mColumns[6] = OColumn(OUString(),OUString("PRIVILEGE"),
@@ -210,7 +210,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
         0,0,0,
         DataType::VARCHAR);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 {
     m_mColumns[9] = OColumn(OUString(),OUString("KEY_SEQ"),
@@ -218,7 +218,7 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
         1,1,0,
         DataType::INTEGER);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 {
     m_mColumns[3] = OColumn(OUString(),OUString("PRECISION"),
@@ -246,7 +246,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
         1,1,0,
         DataType::INTEGER);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
 {
     m_mColumns[7] = OColumn(OUString(),OUString("REMARKS"),
@@ -254,49 +254,49 @@ void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
         0,0,0,
         DataType::VARCHAR);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isSearchable();
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isAutoIncrement();
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnServiceName();
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getTableName();
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getCatalogName();
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnTypeName();
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -304,7 +304,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32
         return (*m_mColumnsIter).second.isCaseSensitive();
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -312,8 +312,8 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 c
         return (*m_mColumnsIter).second.getSchemaName();
     return OUString();
 }
-// -----------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 ObjectTypeEnum OAdoGroup::MapObjectType(sal_Int32 _ObjType)
 {
     ObjectTypeEnum eNumType= adPermObjTable;
@@ -330,7 +330,7 @@ ObjectTypeEnum OAdoGroup::MapObjectType(sal_Int32 _ObjType)
     }
     return eNumType;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OAdoGroup::MapRight(RightsEnum _eNum)
 {
     sal_Int32 nRight = 0;
@@ -355,7 +355,7 @@ sal_Int32 OAdoGroup::MapRight(RightsEnum _eNum)
 
     return nRight;
 }
-// -------------------------------------------------------------------------
+
 RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum)
 {
     sal_Int32 nRight = adRightNone;
@@ -388,7 +388,7 @@ RightsEnum OAdoGroup::Map2Right(sal_Int32 _eNum)
 
     return (RightsEnum)nRight;
 }
-// -------------------------------------------------------------------------
+
 void WpADOIndex::Create()
 {
     _ADOIndex* pIndex = NULL;
@@ -405,7 +405,7 @@ void WpADOIndex::Create()
         pIndex->Release();
     }
 }
-// -------------------------------------------------------------------------
+
 void OAdoIndex::fillPropertyValues()
 {
     if(m_aIndex.IsValid())
@@ -416,7 +416,7 @@ void OAdoIndex::fillPropertyValues()
         m_IsClustered       = m_aIndex.get_Clustered();
     }
 }
-// -----------------------------------------------------------------------------
+
 void WpADOKey::Create()
 {
     _ADOKey* pKey = NULL;
@@ -433,7 +433,7 @@ void WpADOKey::Create()
         pKey->Release();
     }
 }
-// -------------------------------------------------------------------------
+
 void OAdoKey::fillPropertyValues()
 {
     if(m_aKey.IsValid())
@@ -445,7 +445,7 @@ void OAdoKey::fillPropertyValues()
         m_aProps->m_DeleteRule      = MapRule(m_aKey.get_DeleteRule());
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OAdoKey::MapRule(const RuleEnum& _eNum)
 {
         sal_Int32 eNum = KeyRule::NO_ACTION;
@@ -466,7 +466,7 @@ sal_Int32 OAdoKey::MapRule(const RuleEnum& _eNum)
     }
     return eNum;
 }
-// -------------------------------------------------------------------------
+
 RuleEnum OAdoKey::Map2Rule(const sal_Int32& _eNum)
 {
     RuleEnum eNum = adRINone;
@@ -487,7 +487,7 @@ RuleEnum OAdoKey::Map2Rule(const sal_Int32& _eNum)
     }
     return eNum;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OAdoKey::MapKeyRule(const KeyTypeEnum& _eNum)
 {
     sal_Int32 nKeyType = KeyType::PRIMARY;
@@ -505,7 +505,7 @@ sal_Int32 OAdoKey::MapKeyRule(const KeyTypeEnum& _eNum)
     }
     return nKeyType;
 }
-// -------------------------------------------------------------------------
+
 KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum)
 {
     KeyTypeEnum eNum( adKeyPrimary );
@@ -525,7 +525,7 @@ KeyTypeEnum OAdoKey::Map2KeyRule(const sal_Int32& _eNum)
     }
     return eNum;
 }
-// -----------------------------------------------------------------------------
+
 void WpADOTable::Create()
 {
     _ADOTable* pTable = NULL;
@@ -542,7 +542,7 @@ void WpADOTable::Create()
         pTable->Release();
     }
 }
-// -------------------------------------------------------------------------
+
 OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum)
 {
     OLEVariant _rVar;
@@ -552,7 +552,7 @@ OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eN
     pInterface->GetObjectOwner(sStr1,_eNum,_rVar,&aBSTR);
     return aBSTR;
 }
-// -----------------------------------------------------------------------------
+
 void OAdoTable::fillPropertyValues()
 {
     if(m_aTable.IsValid())
@@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void WpADOUser::Create()
 {
     _ADOUser* pUser = NULL;
@@ -588,7 +588,7 @@ void WpADOUser::Create()
         pUser->Release();
     }
 }
-// -------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 74ccdee09ec3..36caa9a53f3e 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -41,14 +41,14 @@ using namespace dbtools;
 using namespace connectivity::ado;
 using namespace cppu;
 using namespace ::comphelper;
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet)
     :ODatabaseMetaDataResultSet_BASE(m_aMutex)
     ,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
@@ -75,13 +75,13 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(ADORecordset* _pRecordSet
     //  allocBuffer();
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
 {
     if(m_pRecordSet)
         m_pRecordSet->Release();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -92,13 +92,13 @@ void ODatabaseMetaDataResultSet::disposing(void)
     m_aStatement    = NULL;
 m_xMetaData.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -107,13 +107,13 @@ Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) th
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
-// -----------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException)
 {
     if(!m_pRecordSet)
         throwFunctionSequenceException(*this);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -136,7 +136,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum
     return 0; // Never reached
 }
 #define BLOCK_SIZE 256
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -179,14 +179,14 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResult
         return NULL;
     return new SequenceInputStream(m_aValue);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getCharacterStream", *this );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -199,7 +199,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex
     }
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -218,31 +218,31 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t
 
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 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)
 {
@@ -262,21 +262,21 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t
 
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XResultSet::getRow", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getLong", *this );
     return sal_Int64(0);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -291,34 +291,34 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
 
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRow", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
@@ -331,7 +331,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const
     columnIndex = mapColumn(columnIndex);
     return Any();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -350,7 +350,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -368,21 +368,21 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
     return m_aValue;
 }
 
-// -------------------------------------------------------------------------
+
 
 
 ::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)
 {
@@ -396,7 +396,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException
     m_pRecordSet->get_EOF(&bIsAtEOF);
     return bIsAtEOF == VARIANT_TRUE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -407,7 +407,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, Ru
 
     return m_nRowPos == 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -418,7 +418,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, Run
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -430,7 +430,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, Ru
     if(first())
         previous();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -443,7 +443,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, Runt
         next();
     m_bEOF = sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -454,7 +454,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeE
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -470,7 +470,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, Runt
         m_nRowPos = 1;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -480,7 +480,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, Runti
 
     return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast()) ? sal_True : sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -498,7 +498,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -515,7 +515,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ
         m_nRowPos += row;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -530,12 +530,12 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, R
         --m_nRowPos;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     return m_aStatement.get();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -549,7 +549,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException,
     m_pRecordSet->get_Status((sal_Int32*)&eRec);
     return (eRec & adRecDeleted) == adRecDeleted;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {   ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -561,7 +561,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException
     m_pRecordSet->get_Status((sal_Int32*)&eRec);
     return (eRec & adRecNew) == adRecNew;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -574,7 +574,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException,
     m_pRecordSet->get_Status((sal_Int32*)&eRec);
     return (eRec & adRecModified) == adRecModified;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -589,7 +589,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLExcepti
     m_pRecordSet->get_BOF(&bIsAtBOF);
     return bIsAtBOF == VARIANT_TRUE;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -608,7 +608,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, Runti
     else
         return SUCCEEDED(m_pRecordSet->MoveNext());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -620,7 +620,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, Ru
 
     return m_aValue.isNull();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -631,7 +631,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, Run
 
     m_pRecordSet->Resync(adAffectCurrent,adResyncAllValues);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -643,34 +643,34 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
 
     m_pRecordSet->Cancel();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return ResultSetConcurrency::READ_ONLY;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return FetchDirection::FORWARD;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -679,27 +679,27 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const
         m_pRecordSet->get_CacheSize(&nValue);
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 OUString ODatabaseMetaDataResultSet::getCursorName() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return OUString();
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 /*_par0*/)
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "ResultSet::FetchDirection", *this );
 }
-//------------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0)
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     if(m_pRecordSet)
         m_pRecordSet->put_CacheSize(_par0);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const
 {
 
@@ -714,12 +714,12 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0)
 
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper()
 {
     return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -742,7 +742,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& /*rValue*/
@@ -761,7 +761,7 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast(
             OSL_FAIL("setFastPropertyValue_NoBroadcast: Illegal handle value!");
     }
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::getFastPropertyValue(
                                 Any& rValue,
                                 sal_Int32 nHandle
@@ -786,7 +786,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue(
             break;
     }
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setProceduresMap()
 {
 
@@ -808,21 +808,21 @@ void ODatabaseMetaDataResultSet::setProceduresMap()
     pMetaData->setProceduresMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setCatalogsMap()
 {
     m_aColMapping.push_back(1);
 
     m_xMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setSchemasMap()
 {
     m_aColMapping.push_back(2);
 
     m_xMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
 {
 
@@ -838,7 +838,7 @@ void ODatabaseMetaDataResultSet::setColumnPrivilegesMap()
     pMetaData->setColumnPrivilegesMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setColumnsMap()
 {
 
@@ -915,7 +915,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
     pMetaData->setColumnsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTablesMap()
 {
 
@@ -927,7 +927,7 @@ void ODatabaseMetaDataResultSet::setTablesMap()
     pMetaData->setTablesMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
 {
 
@@ -994,7 +994,7 @@ void ODatabaseMetaDataResultSet::setProcedureColumnsMap()
     pMetaData->setProcedureColumnsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
 {
 
@@ -1008,7 +1008,7 @@ void ODatabaseMetaDataResultSet::setPrimaryKeysMap()
     pMetaData->setProcedureColumnsMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setIndexInfoMap()
 {
 
@@ -1050,7 +1050,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
     pMetaData->setIndexInfoMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
 {
 
@@ -1072,7 +1072,7 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
     pMetaData->setTablePrivilegesMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setCrossReferenceMap()
 {
 
@@ -1103,7 +1103,7 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap()
     pMetaData->setCrossReferenceMap();
     m_xMetaData = pMetaData;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine)
 {
     sal_Int32 i=1;
@@ -1181,22 +1181,22 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine)
     pMetaData->setTypeInfoMap();
     m_xMetaData = pMetaData;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw()
 {
     ODatabaseMetaDataResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
 {
     ODatabaseMetaDataResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1208,7 +1208,7 @@ OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQ
     aField.get_Value(m_aValue);
     return m_aValue;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index e0905ed37f02..011e347625d4 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -29,13 +29,13 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData()
 {
     if(m_pRecordSet)
         m_pRecordSet->Release();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nSize = 0;
@@ -49,7 +49,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal
     }
     return nSize;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -63,7 +63,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32
     }
     return nType;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
@@ -81,7 +81,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(
     m_nColCount = aFields.GetItemCount();
     return m_nColCount;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -95,14 +95,14 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 c
 
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnLabel();
     return getColumnName(column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -117,7 +117,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
@@ -133,7 +133,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c
         return aField.GetPrecision();
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
@@ -159,7 +159,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum
         return aField.GetNumericScale();
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -176,7 +176,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -193,7 +193,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -211,14 +211,14 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_
     return sal_False;
 ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.isWritable();
     return isDefinitelyWritable(column);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 3daa811fcf14..0f4958bca242 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -39,8 +39,8 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
+
+
 ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB)
     : ODriver_BASE(m_aMutex)
     ,m_xORB(_xORB)
@@ -53,13 +53,13 @@ ODriver::ODriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang:
          ++h;
      }
 }
-// -------------------------------------------------------------------------
+
 ODriver::~ODriver()
 {
     CoUninitialize();
     CoInitialize(NULL);
 }
-//------------------------------------------------------------------------------
+
 void ODriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -76,12 +76,12 @@ void ODriver::disposing()
     ODriver_BASE::disposing();
 }
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.comp.sdbc.ado.ODriver");
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > ODriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< OUString > aSNS( 2 );
@@ -89,13 +89,13 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static(  ) throw (Runtime
     aSNS[1] = "com.sun.star.sdbcx.Driver";
     return aSNS;
 }
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL connectivity::ado::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
     return *(new ODriver(_rxFactory));
 }
 
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -106,13 +106,13 @@ sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) thro
     return cppu::supportsService(this, _rServiceName);
 }
 
-// --------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     if ( ! acceptsURL(url) )
@@ -125,13 +125,13 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:ado:");
 }
-// -----------------------------------------------------------------------------
+
 void ODriver::impl_checkURL_throw(const OUString& _sUrl)
 {
     if ( !acceptsURL(_sUrl) )
@@ -141,7 +141,7 @@ void ODriver::impl_checkURL_throw(const OUString& _sUrl)
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     } // if ( !acceptsURL(_sUrl) )
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     impl_checkURL_throw(url);
@@ -178,17 +178,17 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
     }
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// --------------------------------------------------------------------------------
+
 // XDataDefinitionSupplier
 Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -229,14 +229,14 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co
     }
     return xTab;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     impl_checkURL_throw(url);
     return getDataDefinitionByConnection(connect(url,info));
 }
 
-// -----------------------------------------------------------------------------
+
 void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException)
 {
     ADOErrors *pErrors = NULL;
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index 1ef7304ddaef..473573e0cadc 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -34,7 +34,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
-// -------------------------------------------------------------------------
+
 void WpADOGroup::Create()
 {
     ADOGroup* pGroup = NULL;
@@ -51,7 +51,7 @@ void WpADOGroup::Create()
         pGroup->Release();
     }
 }
-// -------------------------------------------------------------------------
+
 OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase,    ADOGroup* _pGroup) : OGroup_ADO(_bCase),m_pCatalog(_pParent)
 {
     construct();
@@ -61,14 +61,14 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase,    ADOGroup* _pGroup) :
         m_aGroup.Create();
 
 }
-// -------------------------------------------------------------------------
+
 OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent)
 {
     construct();
     m_aGroup.Create();
     m_aGroup.put_Name(_Name);
 }
-// -------------------------------------------------------------------------
+
 void OAdoGroup::refreshUsers()
 {
     TStringVector aVector;
@@ -81,7 +81,7 @@ void OAdoGroup::refreshUsers()
     else
         m_pUsers = new OUsers(m_pCatalog,m_aMutex,aVector,aUsers,isCaseSensitive());
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -98,7 +98,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
@@ -106,7 +106,7 @@ sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run
                 : OGroup_ADO::getSomething(rId);
 }
 
-// -------------------------------------------------------------------------
+
 void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     if(m_aGroup.IsValid())
@@ -124,7 +124,7 @@ void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV
         }
     }
 }
-// -------------------------------------------------------------------------
+
 void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     if(m_aGroup.IsValid())
@@ -137,13 +137,13 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
         }
     }
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType)));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType));
@@ -151,28 +151,28 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, s
         return MapRight(eNum);
     return 0;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges));
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoGroup::acquire() throw()
 {
     OGroup_ADO::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoGroup::release() throw()
 {
     OGroup_ADO::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 33531fc4c2b6..ba19dbeb9a77 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -38,22 +38,22 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType OGroups::createObject(const OUString& _rName)
 {
     return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName);
 }
-// -------------------------------------------------------------------------
+
 void OGroups::impl_refresh() throw(RuntimeException)
 {
     m_aCollection.Refresh();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OGroups::createDescriptor()
 {
     return new OAdoGroup(m_pCatalog,isCaseSensitive());
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -64,13 +64,13 @@ sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Refere
     m_aCollection.Append( pGroup->getImpl() );
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OGroups::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     m_aCollection.Delete(_sElementName);
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 065a7e41a8b5..d0764651c348 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex)
     : OIndex_ADO(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase)
     ,m_pConnection(_pConnection)
@@ -44,7 +44,7 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex
     m_aIndex = WpADOIndex(_pIndex);
     fillPropertyValues();
 }
-// -------------------------------------------------------------------------
+
 OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection)
     : OIndex_ADO(_bCase)
     ,m_pConnection(_pConnection)
@@ -53,7 +53,7 @@ OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection)
     m_aIndex.Create();
 }
 
-// -------------------------------------------------------------------------
+
 
 void OAdoIndex::refreshColumns()
 {
@@ -72,7 +72,7 @@ void OAdoIndex::refreshColumns()
         m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection);
 }
 
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -89,14 +89,14 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OIndex_ADO::getSomething(rId);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     if(m_aIndex.IsValid())
@@ -130,17 +130,17 @@ void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
     }
     OIndex_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoIndex::acquire() throw()
 {
     OIndex_ADO::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoIndex::release() throw()
 {
     OIndex_ADO::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index f5d5c49d5875..e95fd3db114b 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -42,17 +42,17 @@ sdbcx::ObjectType OIndexes::createObject(const OUString& _rName)
 {
     return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
-// -------------------------------------------------------------------------
+
 void OIndexes::impl_refresh() throw(RuntimeException)
 {
     m_aCollection.Refresh();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OIndexes::createDescriptor()
 {
     return new OAdoIndex(isCaseSensitive(),m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -69,13 +69,13 @@ sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Refer
 
     return new OAdoIndex(isCaseSensitive(),m_pConnection,pIndex->getImpl());
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OIndexes::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     m_aCollection.Delete(_sElementName);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index d92ca58646e1..d76bf93823b8 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -32,7 +32,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
-// -------------------------------------------------------------------------
+
 OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey)
     : OKey_ADO(_bCase)
     ,m_pConnection(_pConnection)
@@ -41,7 +41,7 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection, ADOKey* _pKey)
     m_aKey = WpADOKey(_pKey);
     fillPropertyValues();
 }
-// -------------------------------------------------------------------------
+
 OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection)
     : OKey_ADO(_bCase)
     ,m_pConnection(_pConnection)
@@ -49,7 +49,7 @@ OAdoKey::OAdoKey(sal_Bool _bCase,OConnection* _pConnection)
     construct();
     m_aKey.Create();
 }
-// -------------------------------------------------------------------------
+
 void OAdoKey::refreshColumns()
 {
     TStringVector aVector;
@@ -66,7 +66,7 @@ void OAdoKey::refreshColumns()
     else
         m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -83,14 +83,14 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OKey_ADO::getSomething(rId);
 }
-// -------------------------------------------------------------------------
+
 void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     if(m_aKey.IsValid())
@@ -141,18 +141,18 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
     }
     OKey_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
-// -------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void SAL_CALL OAdoKey::acquire() throw()
 {
     OKey_ADO::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoKey::release() throw()
 {
     OKey_ADO::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index bda4efcaadeb..735b8c6fc215 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -48,17 +48,17 @@ sdbcx::ObjectType OKeys::createObject(const OUString& _rName)
 {
     return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
-// -------------------------------------------------------------------------
+
 void OKeys::impl_refresh() throw(RuntimeException)
 {
     m_aCollection.Refresh();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OKeys::createDescriptor()
 {
     return new OAdoKey(isCaseSensitive(),m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
@@ -95,14 +95,14 @@ sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XProper
 
     return new OAdoKey(isCaseSensitive(),m_pConnection,pKey->getImpl());
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OKeys::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     if(!m_aCollection.Delete(OLEVariant(_sElementName)))
         ADOS::ThrowException(*m_pConnection->getConnection(),static_cast<XTypeProvider*>(this));
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 951f8888aee2..44967fbd136b 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -51,13 +51,13 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
-//------------------------------------------------------------------------------
+
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet");
 OUString SAL_CALL OResultSet::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)  \
 {
     return OUString("com.sun.star.sdbcx.ado.ResultSet");
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(2);
@@ -70,7 +70,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) t
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) :  OResultSet_BASE(m_aMutex)
                         ,OPropertySetHelper(OResultSet_BASE::rBHelper)
                         ,m_pRecordSet(_pRecordSet)
@@ -83,7 +83,7 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet,OStatement_Base* pStmt) :  ORes
                         ,m_bOnFirstAfterOpen(sal_False)
 {
 }
-// -------------------------------------------------------------------------
+
 OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
                         ,OPropertySetHelper(OResultSet_BASE::rBHelper)
                         ,m_pRecordSet(_pRecordSet)
@@ -96,7 +96,7 @@ OResultSet::OResultSet(ADORecordset* _pRecordSet) : OResultSet_BASE(m_aMutex)
                         ,m_bOnFirstAfterOpen(sal_False)
 {
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::construct()
 {
     osl_atomic_increment( &m_refCount );
@@ -113,13 +113,13 @@ void OResultSet::construct()
     m_bOnFirstAfterOpen = bIsAtBOF != VARIANT_TRUE;
     osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 OResultSet::~OResultSet()
 {
     if(m_pRecordSet)
         m_pRecordSet->Release();
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -130,13 +130,13 @@ void OResultSet::disposing(void)
 m_xStatement.clear();
 m_xMetaData.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -146,7 +146,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -169,7 +169,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
     return 0; // Never reached
 }
 #define BLOCK_SIZE 256
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -209,13 +209,13 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinarySt
 
     return m_aValue.isNull() ? NULL : new ::comphelper::SequenceInputStream(m_aValue);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getCharacterStream", *this );
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -225,48 +225,48 @@ OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, Runt
     aField.get_Value(m_aValue);
     return m_aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
@@ -279,14 +279,14 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
     return  (aPos > 0) ? static_cast<sal_Int32>(aPos) : m_nRowPos;
     // return the rowcount from driver if the driver doesn't support this return our count
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getLong", *this );
     return sal_Int64(0);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -298,67 +298,67 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
         m_xMetaData = new OResultSetMetaData(m_pRecordSet);
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *this );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getClob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getBlob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex).makeAny();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
 
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
@@ -370,7 +370,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
     CHECK_RETURN(m_pRecordSet->get_EOF(&bIsAtEOF))
     return bIsAtEOF == VARIANT_TRUE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -379,7 +379,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 
     return m_nRowPos == 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -388,7 +388,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -398,7 +398,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
     if(first())
         m_bOnFirstAfterOpen = !previous();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -409,7 +409,7 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
         next();
     m_bEOF = sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -420,7 +420,7 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -436,7 +436,7 @@ sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -452,7 +452,7 @@ sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -485,7 +485,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt
         m_bOnFirstAfterOpen = sal_False;
     return bCheck;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -505,7 +505,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -519,14 +519,14 @@ sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_xStatement;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -541,7 +541,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
         --m_nRowPos;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {   ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -554,7 +554,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
         ++m_nRowPos;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -565,7 +565,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
     m_pRecordSet->get_Status((sal_Int32*)&eRec);
     return (eRec & adRecModified) == adRecModified;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -582,7 +582,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
     }
     return bIsAtBOF == VARIANT_TRUE;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -613,7 +613,7 @@ sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -623,7 +623,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 
     return m_aValue.isNull();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -633,16 +633,16 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 
     m_pRecordSet->Cancel();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -653,7 +653,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     aEmpty.setNoArg();
     m_pRecordSet->AddNew(aEmpty,aEmpty);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -664,7 +664,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
     aEmpty.setNoArg();
     m_pRecordSet->Update(aEmpty,aEmpty);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -674,7 +674,7 @@ void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
     m_pRecordSet->Delete(adAffectCurrent);
     m_pRecordSet->UpdateBatch(adAffectCurrent);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
@@ -684,7 +684,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
 
     m_pRecordSet->CancelUpdate();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
@@ -693,12 +693,12 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
  //   if ( getResultSetConcurrency() == ResultSetConcurrency::READ_ONLY )
  //       throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -707,79 +707,79 @@ void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x)
     WpADOField aField = ADOS::getField(m_pRecordSet,columnIndex);
     aField.PutValue(x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     OLEVariant x;
     x.setNull();
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,bool(x));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -790,7 +790,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     x->readBytes(aSeq,length);
     updateBytes(columnIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     if(!x.is())
@@ -800,7 +800,7 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re
     x->readBytes(aSeq,length);
     updateBytes(columnIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -809,20 +809,20 @@ void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 
     m_pRecordSet->Resync(adAffectCurrent,adResyncAllValues);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
-//------------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL OResultSet::getBookmark(  ) throw(SQLException, RuntimeException)
 {
@@ -838,7 +838,7 @@ Any SAL_CALL OResultSet::getBookmark(  ) throw(SQLException, RuntimeException)
     return makeAny((sal_Int32)(m_aBookmarks.size()-1));
 
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -853,7 +853,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLExc
 
     return SUCCEEDED(m_pRecordSet->Move(0,m_aBookmarks[nPos]));
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -868,7 +868,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I
         ::dbtools::throwFunctionSequenceException(*this);
     return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos]));
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -887,7 +887,7 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any
     m_pRecordSet->CompareBookmarks(m_aBookmarks[nPos1],m_aBookmarks[nPos2],&eNum);
     return ((sal_Int32)eNum) +1;
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -913,7 +913,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, Runtim
         bValue = aVar;
     return bValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -924,7 +924,7 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLExce
     bookmark >>= nPos;
     return nPos;
 }
-//------------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException)
 {
@@ -973,7 +973,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro
     }
     return aSeq;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getResultSetConcurrency() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -993,7 +993,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const
     }
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getResultSetType() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1018,13 +1018,13 @@ sal_Int32 OResultSet::getResultSetType() const
     }
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getFetchDirection() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return FetchDirection::FORWARD;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getFetchSize() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1032,26 +1032,26 @@ sal_Int32 OResultSet::getFetchSize() const
     m_pRecordSet->get_CacheSize(&nValue);
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 OUString OResultSet::getCursorName() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return OUString();
 }
 
-//------------------------------------------------------------------------------
+
 void OResultSet::setFetchDirection(sal_Int32 /*_par0*/)
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "ResultSet::FetchDirection", *this );
 }
-//------------------------------------------------------------------------------
+
 void OResultSet::setFetchSize(sal_Int32 _par0)
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     m_pRecordSet->put_CacheSize(_par0);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
     Sequence< com::sun::star::beans::Property > aProps(5);
@@ -1067,12 +1067,12 @@ void OResultSet::setFetchSize(sal_Int32 _par0)
 
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -1097,7 +1097,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     switch(nHandle)
@@ -1118,7 +1118,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     switch(nHandle)
@@ -1148,22 +1148,22 @@ void OResultSet::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
             break;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 22461245b5bb..9c4912350f11 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -37,13 +37,13 @@ OResultSetMetaData::OResultSetMetaData( ADORecordset* _pRecordSet)
     if ( m_pRecordSet )
         m_pRecordSet->AddRef();
 }
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
     if ( m_pRecordSet )
         m_pRecordSet->Release();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
@@ -51,14 +51,14 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column )
         return aField.GetActualSize();
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     return ADOS::MapADOType2Jdbc(aField.GetADOType());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
@@ -74,7 +74,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, Ru
     m_nColCount = aFields.GetItemCount();
     return m_nColCount;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -88,13 +88,13 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -104,7 +104,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
 
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     OUString sTableName;
@@ -118,27 +118,27 @@ OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQL
     }
     return sTableName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getColumnName(column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -149,7 +149,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -174,7 +174,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
@@ -187,7 +187,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
@@ -195,7 +195,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ
         return aField.GetPrecision();
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
@@ -203,7 +203,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com:
         return aField.GetNumericScale();
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -214,13 +214,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -231,7 +231,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -243,11 +243,11 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t
     return sal_False;
 ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return isDefinitelyWritable(column);
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 404101ebe57c..a232ad183177 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -45,13 +45,13 @@ using namespace ::comphelper;
 
 using namespace connectivity::ado;
 
-//------------------------------------------------------------------------------
+
 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 ::std;
-//------------------------------------------------------------------------------
+
 OStatement_Base::OStatement_Base(OConnection* _pConnection ) :  OStatement_BASE(m_aMutex)
                                                         ,OPropertySetHelper(OStatement_BASE::rBHelper)
                                                         ,OSubComponent<OStatement_Base, OStatement_BASE>((::cppu::OWeakObject*)_pConnection, this)
@@ -76,7 +76,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection ) :  OStatement_BASE(
 
     osl_atomic_decrement( &m_refCount );
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::disposeResultSet()
 {
     // free the cursor if alive
@@ -86,7 +86,7 @@ void OStatement_Base::disposeResultSet()
     m_xResultSet.clear();
 }
 
-//------------------------------------------------------------------------------
+
 void OStatement_Base::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -108,18 +108,18 @@ void OStatement_Base::disposing()
     dispose_ChildImpl();
     OStatement_BASE::disposing();
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::release() throw()
 {
     relase_ChildImpl();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OStatement_Base::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -129,7 +129,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 {
@@ -139,7 +139,7 @@ void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 
     CHECK_RETURN(m_Command.Cancel())
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 {
@@ -150,13 +150,13 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement::clearBatch(  ) throw(SQLException, RuntimeException)
 {
 
 }
-// -------------------------------------------------------------------------
+
 
 void OStatement_Base::reset() throw (SQLException)
 {
@@ -169,10 +169,10 @@ void OStatement_Base::reset() throw (SQLException)
     if (m_xResultSet.get().is())
         clearMyResultSet();
 }
-//--------------------------------------------------------------------
+
 // clearMyResultSet
 // If a ResultSet was created for this Statement, close it
-//--------------------------------------------------------------------
+
 
 void OStatement_Base::clearMyResultSet () throw (SQLException)
 {
@@ -189,7 +189,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
 
     m_xResultSet.clear();
 }
-//--------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -198,11 +198,11 @@ sal_Int32 OStatement_Base::getRowCount () throw( SQLException)
 
     return m_RecordsAffected;
 }
-//--------------------------------------------------------------------
+
 // getPrecision
 // Given a SQL type, return the maximum precision for the column.
 // Returns -1 if not known
-//--------------------------------------------------------------------
+
 
 sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType)
 {
@@ -224,10 +224,10 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType)
 
     return prec;
 }
-//--------------------------------------------------------------------
+
 // setWarning
 // Sets the warning
-//--------------------------------------------------------------------
+
 
 void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
 {
@@ -237,7 +237,7 @@ void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
 
     m_aLastWarning = ex;
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
 {
     WpADORecordset aOldRS( m_RecordSet );
@@ -249,7 +249,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
     if ( m_RecordSet.IsValid() )
         m_RecordSet.PutRefDataSource( (IDispatch*)m_Command );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -279,7 +279,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep
 
     return m_RecordSet.IsValid();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -315,7 +315,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
 
     return xRs;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -325,14 +325,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLEx
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -342,7 +342,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru
 
     m_aBatchList.push_back(sql);
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -386,7 +386,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
     }
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
@@ -414,7 +414,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S
 
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLException, RuntimeException)
 {
@@ -424,7 +424,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLExce
 
     return m_xResultSet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, RuntimeException)
 {
@@ -437,7 +437,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, Runti
         return nRet;
     return -1;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, RuntimeException)
 {
@@ -470,9 +470,9 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, Runtim
     }
     return m_RecordSet.IsValid();
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -481,9 +481,9 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -492,13 +492,13 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
 sal_Int32 OStatement_Base::getQueryTimeOut() const  throw(SQLException, RuntimeException)
 {
     return m_Command.get_CommandTimeout();
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException)
 {
     ADO_LONGPTR nRet=-1;
@@ -506,7 +506,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti
         ::dbtools::throwFunctionSequenceException(NULL);
     return nRet;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue;
@@ -523,7 +523,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R
 
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue=0;
@@ -543,27 +543,27 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE
     }
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getFetchDirection() const throw(SQLException, RuntimeException)
 {
     return FetchDirection::FORWARD;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeException)
 {
     return m_nFetchSize;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getMaxFieldSize() const throw(SQLException, RuntimeException)
 {
     return 0;
 }
-//------------------------------------------------------------------------------
+
 OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException)
 {
     return m_Command.GetName();
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -572,7 +572,7 @@ void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, Run
 
     m_Command.put_CommandTimeout(seconds);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -580,7 +580,7 @@ void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeExc
 
     m_nMaxRows = _par0;
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -596,7 +596,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLExceptio
             break;
     }
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -616,14 +616,14 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, Runt
             break;
     }
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedException( "Statement::FetchDirection", *this );
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -632,14 +632,14 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE
 
     m_nFetchSize = _par0;
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedException( "Statement::MaxFieldSize", *this );
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -648,7 +648,7 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R
     m_Command.put_Name(_par0);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const
 {
     Sequence< com::sun::star::beans::Property > aProps(10);
@@ -669,12 +669,12 @@ void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, R
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
     return *const_cast<OStatement_Base*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OStatement_Base::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -728,7 +728,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
     }
     return bModified;
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch(nHandle)
@@ -765,7 +765,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     switch(nHandle)
@@ -802,27 +802,27 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 OStatement::~OStatement()
 {
 }
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.AStatement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::acquire() throw()
 {
     OStatement_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::acquire() throw()
 {
     OStatement_Base::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::release() throw()
 {
     OStatement_Base::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index 680140525188..d41d462ec7ab 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -45,7 +45,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog,_ADOTable* _pTable)
     : OTable_TYPEDEF(_pTables,_bCase)
     ,m_pCatalog(_pCatalog)
@@ -56,7 +56,7 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa
     fillPropertyValues();
 
 }
-// -----------------------------------------------------------------------------
+
 OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog)
     : OTable_TYPEDEF(_pTables,_bCase)
     ,m_pCatalog(_pCatalog)
@@ -66,13 +66,13 @@ OAdoTable::OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCa
     m_aTable.putref_ParentCatalog(_pCatalog->getCatalog());
 
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoTable::disposing(void)
 {
     OTable_TYPEDEF::disposing();
     m_aTable.clear();
 }
-// -------------------------------------------------------------------------
+
 void OAdoTable::refreshColumns()
 {
     TStringVector aVector;
@@ -89,7 +89,7 @@ void OAdoTable::refreshColumns()
     else
         m_pColumns = new OColumns(*this,m_aMutex,aVector,aColumns,isCaseSensitive(),m_pCatalog->getConnection());
 }
-// -------------------------------------------------------------------------
+
 void OAdoTable::refreshKeys()
 {
     TStringVector aVector;
@@ -106,7 +106,7 @@ void OAdoTable::refreshKeys()
     else
         m_pKeys = new OKeys(*this,m_aMutex,aVector,aKeys,isCaseSensitive(),m_pCatalog->getConnection());
 }
-// -------------------------------------------------------------------------
+
 void OAdoTable::refreshIndexes()
 {
     TStringVector aVector;
@@ -123,7 +123,7 @@ void OAdoTable::refreshIndexes()
     else
         m_pIndexes = new OIndexes(*this,m_aMutex,aVector,aIndexes,isCaseSensitive(),m_pCatalog->getConnection());
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -140,14 +140,14 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OTable_TYPEDEF::getSomething(rId);
 }
-// -------------------------------------------------------------------------
+
 // XRename
 void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
@@ -159,12 +159,12 @@ void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, E
 
     OTable_TYPEDEF::rename(newName);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData> OAdoTable::getMetaData() const
 {
     return m_pCatalog->getConnection()->getMetaData();
 }
-// -------------------------------------------------------------------------
+
 // XAlterTable
 void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
@@ -185,7 +185,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer
     m_pColumns->refresh();
     refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -196,7 +196,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< X
     if(xOld.is())
         alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor);
 }
-// -------------------------------------------------------------------------
+
 void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     if(m_aTable.IsValid())
@@ -228,17 +228,17 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV
     }
     OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoTable::acquire() throw()
 {
     OTable_TYPEDEF::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoTable::release() throw()
 {
     OTable_TYPEDEF::release();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException)
 {
       return m_aTable.get_Name();
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index ff8d6f292189..d506ef2a7c27 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -48,19 +48,19 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName));
 }
-// -------------------------------------------------------------------------
+
 void OTables::impl_refresh(  ) throw(RuntimeException)
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     m_aCollection.Refresh();
     m_pCatalog->refreshTables();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OTables::createDescriptor()
 {
     return new OAdoTable(this,isCaseSensitive(),m_pCatalog);
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
@@ -75,7 +75,7 @@ sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XProp
 
     return new OAdoTable(this,isCaseSensitive(),m_pCatalog,pTable->getImpl());
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OTables::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
@@ -83,7 +83,7 @@ void OTables::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
     if ( !m_aCollection.Delete(_sElementName) )
         ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this));
 }
-// -----------------------------------------------------------------------------
+
 void OTables::appendNew(const OUString& _rsNewTable)
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
@@ -97,7 +97,7 @@ void OTables::appendNew(const OUString& _rsNewTable)
     while (aListenerLoop.hasMoreElements())
         static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index 6fc7c92f22cd..dc3ce53f8ac5 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser)
     : OUser_TYPEDEF(_bCase)
     ,m_pCatalog(_pParent)
@@ -45,7 +45,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser)
     else
         m_aUser.Create();
 }
-// -------------------------------------------------------------------------
+
 OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase,   const OUString& _Name)
     : OUser_TYPEDEF(_Name,_bCase)
     , m_pCatalog(_pParent)
@@ -54,7 +54,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase,   const OUString& _Name)
     m_aUser.Create();
     m_aUser.put_Name(_Name);
 }
-// -------------------------------------------------------------------------
+
 void OAdoUser::refreshGroups()
 {
     TStringVector aVector;
@@ -65,7 +65,7 @@ void OAdoUser::refreshGroups()
     else
         m_pGroups = new OGroups(m_pCatalog,m_aMutex,aVector,aGroups,isCaseSensitive());
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -82,7 +82,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
@@ -90,7 +90,7 @@ sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt
                 : OUser_TYPEDEF::getSomething(rId);
 }
 
-// -------------------------------------------------------------------------
+
 void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
 {
     if(m_aUser.IsValid())
@@ -108,7 +108,7 @@ void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVa
         }
     }
 }
-// -------------------------------------------------------------------------
+
 void OAdoUser::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     if(m_aUser.IsValid())
@@ -121,47 +121,47 @@ void OAdoUser::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
         }
     }
 }
-// -------------------------------------------------------------------------
+
 OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase,    ADOUser* _pUser)
     : OAdoUser(_pParent,_bCase,_pUser)
 {
 }
-// -------------------------------------------------------------------------
+
 OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name)
     : OAdoUser(_pParent,_bCase,_Name)
 {
 }
 
-// -------------------------------------------------------------------------
+
 void OUserExtend::construct()
 {
     OUser_TYPEDEF::construct();
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
 {
     Sequence< com::sun::star::beans::Property > aProps;
     describeProperties(aProps);
     return new cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
 {
     return *OUserExtend_PROP::getArrayHelper();
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void SAL_CALL OAdoUser::acquire() throw()
 {
     OUser_TYPEDEF::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoUser::release() throw()
 {
     OUser_TYPEDEF::release();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -169,7 +169,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 o
 
     return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -182,7 +182,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sa
     ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
     return nRights;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -190,7 +190,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objT
     m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessGrant,RightsEnum(ADOS::mapRights2Ado(objPrivileges)));
     ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -198,7 +198,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 obj
     m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessRevoke,RightsEnum(ADOS::mapRights2Ado(objPrivileges)));
     ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
 }
-// -----------------------------------------------------------------------------
+
 // XUser
 void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException)
 {
@@ -207,7 +207,7 @@ void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUStr
     m_aUser.ChangePassword(objPassword,newPassword);
     ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index 285a4551bf28..6c4643247464 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -41,17 +41,17 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
 {
     return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName);
 }
-// -------------------------------------------------------------------------
+
 void OUsers::impl_refresh() throw(RuntimeException)
 {
     m_aCollection.Refresh();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OUsers::createDescriptor()
 {
     return new OUserExtend(m_pCatalog,isCaseSensitive());
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -64,13 +64,13 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen
 
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     m_aCollection.Delete(_sElementName);
 }
-// -------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index fcc156e073a9..dba3c8e894e2 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -26,7 +26,7 @@
 #include <comphelper/types.hxx>
 #include "TConnection.hxx"
 
-// -------------------------------------------------------------------------
+
 using namespace comphelper;
 using namespace connectivity::ado;
 using namespace com::sun::star::uno;
@@ -35,12 +35,12 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 
 //  IMPLEMENT_SERVICE_INFO(OAdoView,"com.sun.star.sdbcx.AView","com.sun.star.sdbcx.View");
-// -------------------------------------------------------------------------
+
 OAdoView::OAdoView(sal_Bool _bCase,ADOView* _pView) : OView_ADO(_bCase,NULL)
 ,m_aView(_pView)
 {
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -57,7 +57,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
@@ -65,7 +65,7 @@ sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt
                 : OView_ADO::getSomething(rId);
 }
 
-// -------------------------------------------------------------------------
+
 void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     if(m_aView.IsValid())
@@ -98,17 +98,17 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
     else
         OView_ADO::getFastPropertyValue(rValue,nHandle);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoView::acquire() throw()
 {
     OView_ADO::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OAdoView::release() throw()
 {
     OView_ADO::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index cea3507a47fd..1401d17b5a4b 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -44,18 +44,18 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName)
     pView->setNew(sal_False);
     return pView;
 }
-// -------------------------------------------------------------------------
+
 void OViews::impl_refresh(  ) throw(RuntimeException)
 {
     m_aCollection.Refresh();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OViews::createDescriptor()
 {
     return new OAdoView(isCaseSensitive());
 }
 
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -81,14 +81,14 @@ sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Referen
 
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OViews::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     if(!m_aCollection.Delete(_sElementName))
         ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this));
 }
-// -------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 54452bd7ce6c..cebb4a38cc5a 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -412,7 +412,7 @@ OLEVariant::operator OUString() const
     return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(&varDest)));
 }
 
-// -----------------------------------------------------------------------------
+
 void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc)
 {
     //
@@ -443,7 +443,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const
 {
     ::com::sun::star::uno::Sequence< sal_Int8 > aRet;
@@ -484,7 +484,7 @@ OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const
 
     return aRet;
 }
-// -----------------------------------------------------------------------------
+
 OUString OLEVariant::getString() const
 {
     if(isNull())
@@ -492,7 +492,7 @@ OUString OLEVariant::getString() const
     else
         return *this;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OLEVariant::getBool() const
 {
     if (V_VT(this) == VT_BOOL)
@@ -506,7 +506,7 @@ sal_Bool OLEVariant::getBool() const
 
     return V_BOOL(&varDest) == VARIANT_TRUE ? sal_True : sal_False;
 }
-// -----------------------------------------------------------------------------
+
 IUnknown* OLEVariant::getIUnknown() const
 {
     if (V_VT(this) == VT_UNKNOWN)
@@ -523,7 +523,7 @@ IUnknown* OLEVariant::getIUnknown() const
     V_UNKNOWN(&varDest)->AddRef();
     return V_UNKNOWN(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 IDispatch* OLEVariant::getIDispatch() const
 {
     if (V_VT(this) == VT_DISPATCH)
@@ -541,7 +541,7 @@ IDispatch* OLEVariant::getIDispatch() const
     V_DISPATCH(&varDest)->AddRef();
     return V_DISPATCH(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt8 OLEVariant::getByte() const
 {
     if (V_VT(this) == VT_UI1)
@@ -555,7 +555,7 @@ sal_uInt8 OLEVariant::getByte() const
 
     return V_UI1(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int16 OLEVariant::getInt16() const
 {
     if (V_VT(this) == VT_I2)
@@ -569,7 +569,7 @@ sal_Int16 OLEVariant::getInt16() const
 
     return V_I2(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int8 OLEVariant::getInt8() const
 {
     if (V_VT(this) == VT_I1)
@@ -584,7 +584,7 @@ sal_Int8 OLEVariant::getInt8() const
 
     return V_I1(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OLEVariant::getInt32() const
 {
     if (V_VT(this) == VT_I4)
@@ -599,7 +599,7 @@ sal_Int32 OLEVariant::getInt32() const
 
     return V_I4(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 OLEVariant::getUInt32() const
 {
     if (V_VT(this) == VT_UI4)
@@ -614,7 +614,7 @@ sal_uInt32 OLEVariant::getUInt32() const
 
     return V_UI4(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 float OLEVariant::getFloat() const
 {
     if (V_VT(this) == VT_R4)
@@ -628,7 +628,7 @@ float OLEVariant::getFloat() const
 
     return V_R4(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 double OLEVariant::getDouble() const
 {
     if (V_VT(this) == VT_R8)
@@ -642,7 +642,7 @@ double OLEVariant::getDouble() const
 
     return V_R8(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 double OLEVariant::getDate() const
 {
     if (V_VT(this) == VT_DATE)
@@ -656,7 +656,7 @@ double OLEVariant::getDate() const
 
     return V_DATE(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 CY OLEVariant::getCurrency() const
 {
     if (V_VT(this) == VT_CY)
@@ -674,7 +674,7 @@ CY OLEVariant::getCurrency() const
 
     return V_CY(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const
 {
     if (V_VT(this) == (VT_ARRAY|VT_UI1))
@@ -688,7 +688,7 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const
 
     return V_ARRAY(&varDest);
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any OLEVariant::makeAny() const
 {
     ::com::sun::star::uno::Any aValue;
@@ -771,8 +771,8 @@ SAFEARRAY* OLEVariant::getUI1SAFEARRAYPtr() const
     }
     return aValue;
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index bd1320128f11..ac5773348b81 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -73,7 +73,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL ado_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 660c7dd6b5df..026390aa307b 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -1659,7 +1659,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any
     OpenSchema(adSchemaForeignKeys,vsa,vtEmpty,&pRecordset);
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table )
 {
     // Create elements used in the array
@@ -1701,7 +1701,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any
     return pRecordset;
 
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table )
 {
     // Create elements used in the array
@@ -1739,7 +1739,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any&
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getIndexInfo(
     const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table,
     sal_Bool /*unique*/, sal_Bool /*approximate*/ )
@@ -1782,7 +1782,7 @@ ADORecordset* WpADOConnection::getIndexInfo(
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::Any& catalog,
                                                   const OUString& schemaPattern,
                                                   const OUString& tableNamePattern )
@@ -1824,7 +1824,7 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog,
                                                   const OUString& primarySchema,
                                                   const OUString& primaryTable,
@@ -1877,7 +1877,7 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& catalog,
                                                   const OUString& schemaPattern,
                                                   const OUString& procedureNamePattern )
@@ -1916,7 +1916,7 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any&
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno::Any& catalog,
                                                   const OUString& schemaPattern,
                                                   const OUString& procedureNamePattern,
@@ -1961,7 +1961,7 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno:
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& catalog,
                                                   const OUString& schemaPattern,
                                                   const OUString& tableNamePattern,
@@ -2025,7 +2025,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& catalog,
                                                   const OUString& schemaPattern,
                                                   const OUString& tableNamePattern,
@@ -2069,7 +2069,7 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno::Any& catalog,
                                                   const OUString& schema,
                                                   const OUString& table,
@@ -2112,7 +2112,7 @@ ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno:
 
     return pRecordset;
 }
-// -----------------------------------------------------------------------------
+
 ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/)
 {
     // Create elements used in the array
@@ -2140,7 +2140,7 @@ ADORecordset* WpADOConnection::getTypeInfo(DataTypeEnum /*_eType*/)
 
     return pRec;
 }
-// -----------------------------------------------------------------------------
+
 void WpADOColumn::put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
@@ -2148,7 +2148,7 @@ void WpADOColumn::put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject)
     OSL_ENSURE(bRet,"Could not set ParentCatalog!");
     OSL_UNUSED(bRet);
 }
-// -----------------------------------------------------------------------------
+
 void WpADOTable::putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObject)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
@@ -2156,12 +2156,12 @@ void WpADOTable::putref_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR *ppvObjec
     OSL_ENSURE(bRet,"Could not set ParentCatalog!");
     OSL_UNUSED(bRet);
 }
-// -----------------------------------------------------------------------------
+
 void WpBase::setIDispatch(IDispatch* _pIUnknown)
 {
     pIUnknown = _pIUnknown;
 }
-// -----------------------------------------------------------------------------
+
 void OTools::putValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition,const OLEVariant &_aValVar)
 {
     OSL_ENSURE(_rProps.IsValid(),"Properties are not valid!");
@@ -2173,7 +2173,7 @@ void OTools::putValue(const WpADOProperties& _rProps,const OLEVariant &_aPositio
         OSL_UNUSED(bRet);
     }
 }
-// -----------------------------------------------------------------------------
+
 OLEVariant OTools::getValue(const WpADOProperties& _rProps,const OLEVariant &_aPosition)
 {
     WpADOProperty aProp(_rProps.GetItem(_aPosition));
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index 9ca1a0223393..7e5647b44430 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -73,7 +73,7 @@ OLEString& ADOS::GetKeyStr()
     return sKeyStr;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType)
 {
     sal_Int32 nType = DataType::VARCHAR;
@@ -126,7 +126,7 @@ sal_Int32 ADOS::MapADOType2Jdbc(DataTypeEnum eType)
     }
     return nType;
 }
-// -------------------------------------------------------------------------
+
 DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine)
 {
     switch (_nType)
@@ -159,7 +159,7 @@ DataTypeEnum ADOS::MapJdbc2ADOType(sal_Int32 _nType,sal_Int32 _nJetEngine)
     }
     return adEmpty;
 }
-// -----------------------------------------------------------------------------
+
 const int JET_ENGINETYPE_UNKNOWN    = 0;
 const int JET_ENGINETYPE_JET10      = 1;
 const int JET_ENGINETYPE_JET11      = 2;
@@ -219,7 +219,7 @@ sal_Bool ADOS::isJetEngine(sal_Int32 _nEngineType)
     }
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 ObjectTypeEnum ADOS::mapObjectType2Ado(sal_Int32 objType)
 {
     ObjectTypeEnum eType = adPermObjTable;
@@ -237,7 +237,7 @@ ObjectTypeEnum ADOS::mapObjectType2Ado(sal_Int32 objType)
     }
     return eType;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ADOS::mapAdoType2Object(ObjectTypeEnum objType)
 {
     sal_Int32 nType = PrivilegeObject::TABLE;
@@ -261,7 +261,7 @@ sal_Int32 ADOS::mapAdoType2Object(ObjectTypeEnum objType)
 #ifdef DELETE
 #undef DELETE
 #endif
-// -----------------------------------------------------------------------------
+
 sal_Int32 ADOS::mapAdoRights2Sdbc(RightsEnum eRights)
 {
     sal_Int32 nRights = 0;
@@ -282,7 +282,7 @@ sal_Int32 ADOS::mapAdoRights2Sdbc(RightsEnum eRights)
 
     return nRights;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights)
 {
     sal_Int32 eRights = adRightNone;
@@ -304,7 +304,7 @@ sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights)
 
     return eRights;
 }
-// -----------------------------------------------------------------------------
+
 WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     if ( !_pRecordSet )
@@ -320,7 +320,7 @@ WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) thr
         ::dbtools::throwInvalidIndexException(NULL);
     return aField;
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index aa2f18b0c5ff..da63d9d443a8 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -29,14 +29,14 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::calc;
-// -------------------------------------------------------------------------
+
 OCalcCatalog::OCalcCatalog(OCalcConnection* _pCon) : file::OFileCatalog(_pCon)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcCatalog::OCalcCatalog" );
 }
-// -------------------------------------------------------------------------
+
 void OCalcCatalog::refreshTables()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcCatalog::refreshTables" );
@@ -61,7 +61,7 @@ void OCalcCatalog::refreshTables()
     //if ( m_pTables && m_pTables->hasElements() )
     //    m_pTables->getByIndex(0);
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index f5542d74c83d..9fb1ca6a9201 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -41,6 +41,6 @@ sdbcx::ObjectType OCalcColumns::createObject(const OUString& _rName)
         xRet = sdbcx::ObjectType(*aIter,UNO_QUERY);
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index dc2f25b7fdea..2889096177b8 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -40,7 +40,7 @@ using namespace connectivity::file;
 
 typedef connectivity::file::OConnection OConnection_BASE;
 
-//------------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::sheet;
 
-// --------------------------------------------------------------------------------
+
 
 OCalcConnection::OCalcConnection(ODriver* _pDriver) : OConnection(_pDriver),m_nDocCount(0)
 {
@@ -103,7 +103,7 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
     ODocHolder aDocHodler(this); // just to test that the doc can be loaded
     acquireDoc();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::acquireDoc" );
@@ -170,14 +170,14 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
     osl_atomic_increment(&m_nDocCount);
     return m_xDoc;
 }
-// -----------------------------------------------------------------------------
+
 void OCalcConnection::releaseDoc()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::releaseDoc" );
     if ( osl_atomic_decrement(&m_nDocCount) == 0 )
         ::comphelper::disposeComponent( m_xDoc );
 }
-// -----------------------------------------------------------------------------
+
 void OCalcConnection::disposing()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcConnection::disposing" );
@@ -190,11 +190,11 @@ void OCalcConnection::disposing()
 }
 
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 
 IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 
 Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -213,7 +213,7 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData(  ) throw(S
     return xMetaData;
 }
 
-//------------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog()
 {
@@ -229,7 +229,7 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData(  ) throw(S
     return xTab;
 }
 
-// --------------------------------------------------------------------------------
+
 
 Reference< XStatement > SAL_CALL OCalcConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
@@ -243,7 +243,7 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement(  ) throw(SQLE
     return xReturn;
 }
 
-// --------------------------------------------------------------------------------
+
 
 Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql )
     throw(SQLException, RuntimeException)
@@ -260,7 +260,7 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons
     return pStmt;
 }
 
-// --------------------------------------------------------------------------------
+
 
 Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ )
     throw(SQLException, RuntimeException)
@@ -272,6 +272,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUS
     ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 00a6d1dad062..6cade720740a 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -46,20 +46,20 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::sheet;
 
-// -------------------------------------------------------------------------
+
 
 OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon)    :ODatabaseMetaData(_pCon)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::OCalcDatabaseMetaData" );
 }
 
-// -------------------------------------------------------------------------
+
 
 OCalcDatabaseMetaData::~OCalcDatabaseMetaData()
 {
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::impl_getTypeInfo_throw" );
@@ -139,7 +139,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
     return xRef;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
@@ -237,7 +237,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
     return xRef;
 }
 
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OCalcDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
@@ -247,7 +247,7 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeE
     return OUString("sdbc:calc:") + m_pConnection->getURL();
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
@@ -255,33 +255,33 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQ
     return SAL_MAX_INT32;
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxCharLiteralLength" );
     return SAL_MAX_INT32;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnNameLength" );
     return SAL_MAX_INT32;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnsInIndex" );
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcDatabaseMetaData::getMaxColumnsInTable" );
     return 256;
 }
 
-// -------------------------------------------------------------------------
+
 
 static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName )
 {
@@ -353,7 +353,7 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const
     return bUnnamed;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
@@ -449,7 +449,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
 
     return xRef;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 40dcf3af9061..5d117678087a 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
 
-//------------------------------------------------------------------------------
+
 // static ServiceInfo
 
 OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
@@ -49,7 +49,7 @@ OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 
 // service names from file::OFileDriver
 
-//------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
     connectivity::calc::ODriver_CreateInstance(const ::com::sun::star::uno::Reference<
@@ -92,6 +92,6 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
     }
     return Sequence< DriverPropertyInfo >();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CPreparedStatement.cxx b/connectivity/source/drivers/calc/CPreparedStatement.cxx
index 93636fd98b91..96eb9a2672a8 100644
--- a/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -23,12 +23,12 @@
 using namespace connectivity::calc;
 using namespace connectivity::file;
 using namespace com::sun::star::uno;
-// -------------------------------------------------------------------------
+
 OResultSet* OCalcPreparedStatement::createResultSet()
 {
     return new OCalcResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OCalcPreparedStatement,"com.sun.star.sdbc.driver.calc.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index f6f977c0c8e5..7038cb3532a8 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -35,19 +35,19 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
-//------------------------------------------------------------------------------
+
 OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator)
                 : file::OResultSet(pStmt,_aSQLIterator)
                 ,m_bBookmarkable(sal_True)
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OCalcResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
     return OUString("com.sun.star.sdbcx.calc.ResultSet");
 }
-// -------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< OUString > aSupported(2);
@@ -60,19 +60,19 @@ sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OResultSet::queryInterface(rType);
     return aRet.hasValue() ? aRet : OCalcResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
  Sequence<  Type > SAL_CALL OCalcResultSet::getTypes(  ) throw( RuntimeException)
 {
     return ::comphelper::concatSequences(OResultSet::getTypes(),OCalcResultSet_BASE::getTypes());
 }
 
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL OCalcResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 {
@@ -82,7 +82,7 @@ Any SAL_CALL OCalcResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcept
 
     return makeAny((sal_Int32)(m_aRow->get())[0]->getValue());
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const  Any& bookmark ) throw(
 
     return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),sal_True);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -107,17 +107,17 @@ sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const  Any& bookmark,
     return relative(rows);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const  Any& rhs ) throw( SQLException,  RuntimeException)
 {
     return (lhs == rhs) ? 0 : 2;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -126,7 +126,7 @@ sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const  Any& bookmark ) throw( S
 
     return comphelper::getINT32(bookmark);
 }
-// -------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const  Sequence<  Any >& /*rows*/ ) throw( SQLException,  RuntimeException)
 {
@@ -136,41 +136,41 @@ Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const  Sequence<  Any
     ::dbtools::throwFeatureNotImplementedException( "XDeleteRows::deleteRows", *this );
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OCalcResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/)
 {
     //  Calc table has no index
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OCalcResultSet::getInfoHelper()
 {
     return *OCalcResultSet_BASE3::getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OCalcResultSet::createArrayHelper() const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void SAL_CALL OCalcResultSet::acquire() throw()
 {
     OCalcResultSet_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCalcResultSet::release() throw()
 {
     OCalcResultSet_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CStatement.cxx b/connectivity/source/drivers/calc/CStatement.cxx
index 3f0199ca2baa..15d4e45a04b8 100644
--- a/connectivity/source/drivers/calc/CStatement.cxx
+++ b/connectivity/source/drivers/calc/CStatement.cxx
@@ -23,12 +23,12 @@
 using namespace connectivity::calc;
 using namespace connectivity::file;
 using namespace com::sun::star::uno;
-// -------------------------------------------------------------------------
+
 OResultSet* OCalcStatement::createResultSet()
 {
     return new OCalcResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OCalcStatement,"com.sun.star.sdbc.driver.calc.Statement","com.sun.star.sdbc.Statement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 5b8630d63718..ec38222882ce 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -311,7 +311,7 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& xSheet,
                     sal_Int32 nStartCol, sal_Int32 nStartRow, sal_Bool bHasHeaders,
@@ -428,7 +428,7 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
 //  rValue.setTypeKind(nType);
 }
 
-// -------------------------------------------------------------------------
+
 
 static OUString lcl_GetColumnStr( sal_Int32 nColumn )
 {
@@ -521,7 +521,7 @@ void OCalcTable::fillColumns()
     }
 }
 
-// -------------------------------------------------------------------------
+
 OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnection,
                     const OUString& _Name,
                     const OUString& _Type,
@@ -543,7 +543,7 @@ OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnectio
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::OCalcTable" );
 }
-// -----------------------------------------------------------------------------
+
 void OCalcTable::construct()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::construct" );
@@ -626,7 +626,7 @@ void OCalcTable::construct()
 
     refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 void OCalcTable::refreshColumns()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::refreshColumns" );
@@ -643,14 +643,14 @@ void OCalcTable::refreshColumns()
     else
         m_pColumns  = new OCalcColumns(this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OCalcTable::refreshIndexes()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::refreshIndexes" );
     //  Calc table has no index
 }
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCalcTable::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::disposing" );
@@ -662,7 +662,7 @@ void SAL_CALL OCalcTable::disposing(void)
     m_pConnection = NULL;
 
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OCalcTable::getTypes(  ) throw(RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getTypes" );
@@ -687,7 +687,7 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes(  ) throw(RuntimeException)
     return Sequence< Type >(pAttrs, aOwnTypes.size());
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
@@ -701,7 +701,7 @@ Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeExcep
     return aRet.hasValue() ? aRet : OTable_TYPEDEF::queryInterface(rType);
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
 {
     //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getUnoTunnelImplementationId" );
@@ -719,7 +719,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getSomething" );
@@ -727,17 +727,17 @@ sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OCalcTable_BASE::getSomething(rId);
 }
-//------------------------------------------------------------------
+
 sal_Int32 OCalcTable::getCurrentLastPos() const
 {
     //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::getCurrentLastPos" );
     return m_nDataRows;
 }
-//------------------------------------------------------------------
+
 sal_Bool OCalcTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::seekRow" );
-    // ----------------------------------------------------------
+
     // prepare positioning:
 
     sal_uInt32 nNumberOfRecords = m_nDataRows;
@@ -806,7 +806,7 @@ End:
     nCurPos = m_nFilePos;
     return sal_True;
 }
-//------------------------------------------------------------------
+
 sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
                                 sal_Bool _bUseTableDefs, sal_Bool bRetrieveData )
 {
@@ -843,7 +843,7 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
     }
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 void OCalcTable::FileClose()
 {
     SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen@sun.com OCalcTable::FileClose" );
@@ -851,6 +851,6 @@ void OCalcTable::FileClose()
 
     OCalcTable_BASE::FileClose();
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 407f2b3950f1..7b084a16b7d2 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -44,6 +44,6 @@ sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
     pTable->construct();
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 7b95af660383..335be8ab969a 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -75,7 +75,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL connectivity_calc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 6c67969ed46f..4ff0d83c65c2 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -29,13 +29,13 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::dbase;
-// -------------------------------------------------------------------------
+
 ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon) : file::OFileCatalog(_pCon)
 {
 }
-// -------------------------------------------------------------------------
+
 void ODbaseCatalog::refreshTables()
 {
     TStringVector aVector;
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index 9d9b0827eab9..80e9aed2c9a5 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
 TYPEINIT1(OFILEOperandAttr, OOperandAttr);
-// -----------------------------------------------------------------------------
+
 OOperandAttr* OFILEAnalyzer::createOperandAttr(sal_Int32 _nPos,
                                                const Reference< XPropertySet>& _xCol,
                                                const Reference< XNameAccess>& _xIndexes)
@@ -40,7 +40,7 @@ OOperandAttr* OFILEAnalyzer::createOperandAttr(sal_Int32 _nPos,
     return new OFILEOperandAttr((sal_uInt16)_nPos,_xCol,_xIndexes);
 }
 
-//------------------------------------------------------------------
+
 OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
                                    const Reference< XPropertySet>& _xColumn,
                                    const Reference< XNameAccess>& _xIndexes)
@@ -82,12 +82,12 @@ OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
     }
 
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OFILEOperandAttr::isIndexed() const
 {
     return m_xIndex.is();
 }
-//------------------------------------------------------------------
+
 OEvaluateSet* OFILEOperandAttr::preProcess(OBoolOperator* pOp, OOperand* pRight)
 {
     OEvaluateSet* pEvaluateSet = NULL;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index eaa6d1a605e1..00888a0c4e77 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -46,18 +46,18 @@ sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-// -------------------------------------------------------------------------
+
 void ODbaseColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > ODbaseColumns::createDescriptor()
 {
     return new sdbcx::OColumn(isCaseSensitive());
 }
-// -----------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 // XAppend
 sdbcx::ObjectType ODbaseColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -67,14 +67,14 @@ sdbcx::ObjectType ODbaseColumns::appendObject( const OUString& _rForName, const
     m_pTable->addColumn( descriptor );
     return createObject( _rForName );
 }
-// -----------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 // XDrop
 void ODbaseColumns::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
     if(!m_pTable->isNew())
         m_pTable->dropColumn(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index 0ef1c4229b38..2fd71ab384ba 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -33,7 +33,7 @@ using namespace connectivity::file;
 
 typedef connectivity::file::OConnection  OConnection_BASE;
 
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
@@ -41,23 +41,23 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
 DBG_NAME(ODbaseConnection)
-// --------------------------------------------------------------------------------
+
 ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver)
 {
     DBG_CTOR(ODbaseConnection,NULL);
     m_aFilenameExtension = "dbf";
 }
-//-----------------------------------------------------------------------------
+
 ODbaseConnection::~ODbaseConnection()
 {
     DBG_DTOR(ODbaseConnection,NULL);
 }
 
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(ODbaseConnection, "com.sun.star.sdbc.drivers.dbase.Connection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -73,7 +73,7 @@ Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData(  ) throw(
 
     return xMetaData;
 }
-//------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< XTablesSupplier > ODbaseConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -86,7 +86,7 @@ Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData(  ) throw(
     }
     return xTab;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -97,7 +97,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  ) throw(SQL
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -110,12 +110,12 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return pStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 13c25f5e7bef..3047b5b77aec 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -49,11 +49,11 @@ ODbaseDatabaseMetaData::ODbaseDatabaseMetaData(::connectivity::file::OConnection
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::ODbaseDatabaseMetaData" );
 }
-// -------------------------------------------------------------------------
+
 ODbaseDatabaseMetaData::~ODbaseDatabaseMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::impl_getTypeInfo_throw" );
@@ -153,7 +153,7 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
         const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -244,7 +244,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table,
         sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException)
@@ -321,56 +321,56 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getURL" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return OUString("sdbc:dbase:") + m_pConnection->getURL();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxBinaryLiteralLength" );
     return SAL_MAX_INT32;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxCharLiteralLength" );
     return 254;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnNameLength" );
     return 10;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnsInIndex" );
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::getMaxColumnsInTable" );
     return 128;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn" );
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::isReadOnly" );
@@ -383,19 +383,19 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  ) throw(SQLException, Run
 
     return bReadOnly;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" );
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" );
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 67748a843ae8..993b7abf7fd3 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -34,24 +34,24 @@ using namespace ::com::sun::star::lang;
 
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.comp.sdbc.dbase.ODriver");
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL connectivity::dbase::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -68,12 +68,12 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:dbase:");
 }
-// -----------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
@@ -113,7 +113,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 73bf4f45a9be..5286072b7665 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -41,7 +41,7 @@
 #include <unotools/sharedunocomponent.hxx>
 
 using namespace ::comphelper;
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace utl;
 using namespace ::cppu;
@@ -55,7 +55,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
 IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.sun.star.sdbcx.Index");
-// -------------------------------------------------------------------------
+
 ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable)
     : OIndex(sal_True/*_pTable->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers()*/)
     , m_pFileStream(NULL)
@@ -68,7 +68,7 @@ ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable)
     memset(&m_aHeader, 0, sizeof(m_aHeader));
     construct();
 }
-// -------------------------------------------------------------------------
+
 ODbaseIndex::ODbaseIndex(   ODbaseTable* _pTable,
                             const NDXHeader& _rHeader,
                             const OUString& _rName)
@@ -83,12 +83,12 @@ ODbaseIndex::ODbaseIndex(   ODbaseTable* _pTable,
 {
     construct();
 }
-// -----------------------------------------------------------------------------
+
 ODbaseIndex::~ODbaseIndex()
 {
     closeImpl();
 }
-// -------------------------------------------------------------------------
+
 void ODbaseIndex::refreshColumns()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -106,7 +106,7 @@ void ODbaseIndex::refreshColumns()
     else
         m_pColumns = new ODbaseIndexColumns(this,m_aMutex,aVector);
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -123,14 +123,14 @@ Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId()
 }
 
 // XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : ODbaseIndex_BASE::getSomething(rId);
 }
-//------------------------------------------------------------------
+
 ONDXPagePtr ODbaseIndex::getRoot()
 {
     openIndexFile();
@@ -142,7 +142,7 @@ ONDXPagePtr ODbaseIndex::getRoot()
     }
     return m_aRoot;
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::openIndexFile()
 {
     if(!m_pFileStream)
@@ -172,14 +172,14 @@ sal_Bool ODbaseIndex::openIndexFile()
 
     return m_pFileStream != NULL;
 }
-//------------------------------------------------------------------
+
 OIndexIterator* ODbaseIndex::createIterator(OBoolOperator* pOp,
                                             const OOperand* pOperand)
 {
     openIndexFile();
     return new OIndexIterator(this, pOp, pOperand);
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -207,7 +207,7 @@ sal_Bool ODbaseIndex::ConvertToKey(ONDXKey* rKey, sal_uInt32 nRec, const ORowSet
     return sal_True;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
@@ -218,7 +218,7 @@ sal_Bool ODbaseIndex::Find(sal_uInt32 nRec, const ORowSetValue& rValue)
     return ConvertToKey(&aKey, nRec, rValue) && getRoot()->Find(aKey);
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
@@ -242,7 +242,7 @@ sal_Bool ODbaseIndex::Insert(sal_uInt32 nRec, const ORowSetValue& rValue)
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
                          const ORowSetValue& rNewValue)
 {
@@ -255,7 +255,7 @@ sal_Bool ODbaseIndex::Update(sal_uInt32 nRec, const ORowSetValue& rOldValue,
         return Delete(nRec, rOldValue) && Insert(nRec,rNewValue);
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
 {
     openIndexFile();
@@ -277,13 +277,13 @@ sal_Bool ODbaseIndex::Delete(sal_uInt32 nRec, const ORowSetValue& rValue)
 
     return m_aCurLeaf->Delete(m_nCurNode);
 }
-//------------------------------------------------------------------
+
 void ODbaseIndex::Collect(ONDXPage* pPage)
 {
     if (pPage)
         m_aCollector.push_back(pPage);
 }
-//------------------------------------------------------------------
+
 void ODbaseIndex::Release(sal_Bool bSave)
 {
     // Release the Index-recources
@@ -320,7 +320,7 @@ void ODbaseIndex::Release(sal_Bool bSave)
 
     closeImpl();
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseIndex::closeImpl()
 {
     if(m_pFileStream)
@@ -329,7 +329,7 @@ void ODbaseIndex::closeImpl()
         m_pFileStream = NULL;
     }
 }
-//------------------------------------------------------------------
+
 ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, sal_Bool bLoad)
 {
     OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
@@ -351,7 +351,7 @@ ONDXPage* ODbaseIndex::CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent, sal_Bo
     return pPage;
 }
 
-//------------------------------------------------------------------
+
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ODbaseIndex& rIndex)
 {
     rStream.Seek(0);
@@ -361,14 +361,14 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ODbaseIndex& rInd
     rIndex.m_nPageCount = rIndex.m_aHeader.db_pagecount;
     return rStream;
 }
-//------------------------------------------------------------------
+
 SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex& rIndex)
 {
     rStream.Seek(0);
     OSL_VERIFY_EQUALS( rStream.Write(&rIndex.m_aHeader,DINDEX_PAGE_SIZE), DINDEX_PAGE_SIZE, "Write not successful: Wrong header size for dbase index!");
     return rStream;
 }
-// -------------------------------------------------------------------------
+
 OUString ODbaseIndex::getCompletePath()
 {
     OUString sDir = m_pTable->getConnection()->getURL() +
@@ -376,7 +376,7 @@ OUString ODbaseIndex::getCompletePath()
         m_Name + ".ndx";
     return sDir;
 }
-//------------------------------------------------------------------
+
 void ODbaseIndex::createINFEntry()
 {
     // synchronize inf-file
@@ -412,7 +412,7 @@ void ODbaseIndex::createINFEntry()
     }
     aInfFile.WriteKey(aNewEntry, OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding()));
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::DropImpl()
 {
     closeImpl();
@@ -455,7 +455,7 @@ sal_Bool ODbaseIndex::DropImpl()
     }
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile)
 {
     closeImpl();
@@ -463,7 +463,7 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OU
         UCBContentHelper::Kill(_sFile);
     m_pTable->getConnection()->throwGenericSQLException(_nErrorId,*this);
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseIndex::CreateImpl()
 {
     // Create the Index
@@ -603,18 +603,18 @@ sal_Bool ODbaseIndex::CreateImpl()
     createINFEntry();
     return sal_True;
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void SAL_CALL ODbaseIndex::acquire() throw()
 {
     ODbaseIndex_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODbaseIndex::release() throw()
 {
     ODbaseIndex_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 9a2da6e39659..16ab90e6ac88 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -67,22 +67,22 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-// -------------------------------------------------------------------------
+
 void ODbaseIndexColumns::impl_refresh() throw(RuntimeException)
 {
     m_pIndex->refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > ODbaseIndexColumns::createDescriptor()
 {
     return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 2a5892aa84c6..00ca2e78095d 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -27,24 +27,24 @@ using namespace connectivity::file;
 //==================================================================
 // OIndexIterator
 //==================================================================
-//------------------------------------------------------------------
+
 OIndexIterator::~OIndexIterator()
 {
     m_pIndex->release();
 }
 
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::First()
 {
     return Find(sal_True);
 }
 
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::Next()
 {
     return Find(sal_False);
 }
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst)
 {
     sal_uIntPtr nRes = NODE_NOTFOUND;
@@ -82,7 +82,7 @@ sal_uIntPtr OIndexIterator::Find(sal_Bool bFirst)
     return nRes;
 }
 
-//------------------------------------------------------------------
+
 ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
 {
     // searches a given key
@@ -128,7 +128,7 @@ ONDXKey* OIndexIterator::GetFirstKey(ONDXPage* pPage, const OOperand& rKey)
     return pFoundKey;
 }
 
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst)
 {
     ONDXKey* pKey = NULL;
@@ -198,7 +198,7 @@ sal_uIntPtr OIndexIterator::GetCompare(sal_Bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst)
 {
     if (bFirst)
@@ -218,7 +218,7 @@ sal_uIntPtr OIndexIterator::GetLike(sal_Bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst)
 {
     if (bFirst)
@@ -240,7 +240,7 @@ sal_uIntPtr OIndexIterator::GetNull(sal_Bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-//------------------------------------------------------------------
+
 sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
 {
     ONDXKey* pKey;
@@ -259,7 +259,7 @@ sal_uIntPtr OIndexIterator::GetNotNull(sal_Bool bFirst)
     return pKey ? pKey->GetRecord() : NODE_NOTFOUND;
 }
 
-//------------------------------------------------------------------
+
 ONDXKey* OIndexIterator::GetNextKey()
 {
     if (m_aCurLeaf.Is() && ((++m_nCurNode) >= m_aCurLeaf->Count()))
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index ef31f7e73e62..56dd8a750c97 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -77,18 +77,18 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName)
     }
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void ODbaseIndexes::impl_refresh(  ) throw(RuntimeException)
 {
     if(m_pTable)
         m_pTable->refreshIndexes();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > ODbaseIndexes::createDescriptor()
 {
     return new ODbaseIndex(m_pTable);
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType ODbaseIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -102,7 +102,7 @@ sdbcx::ObjectType ODbaseIndexes::appendObject( const OUString& _rForName, const
 
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void ODbaseIndexes::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
@@ -115,7 +115,7 @@ void ODbaseIndexes::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
     }
 
 }
-// -------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 48ccb2042114..8aff710eaee8 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -23,12 +23,12 @@
 using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::uno;
-// -------------------------------------------------------------------------
+
 OResultSet* ODbasePreparedStatement::createResultSet()
 {
     return new ODbaseResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(ODbasePreparedStatement,"com.sun.star.sdbc.driver.dbase.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 4df238369842..768f210e9120 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -39,19 +39,19 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
-//------------------------------------------------------------------------------
+
 ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator&   _aSQLIterator)
                 : file::OResultSet(pStmt,_aSQLIterator)
                 ,m_bBookmarkable(sal_True)
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
     return OUString("com.sun.star.sdbcx.dbase.ResultSet");
 }
-// -------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< OUString > aSupported(2);
@@ -64,19 +64,19 @@ sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceNam
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODbaseResultSet_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
  Sequence<  Type > SAL_CALL ODbaseResultSet::getTypes(  ) throw( RuntimeException)
 {
     return ::comphelper::concatSequences(OResultSet::getTypes(),ODbaseResultSet_BASE::getTypes());
 }
 
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL ODbaseResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 {
@@ -86,7 +86,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcep
 
     return makeAny((sal_Int32)(m_aRow->get())[0]->getValue());
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const  Any& bookmark ) throw(
 
     return m_pTable ? Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -111,7 +111,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const  Any& bookmark,
     return relative(rows);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException,  RuntimeException)
 {
     sal_Int32 nFirst(0),nSecond(0),nResult(0);
@@ -133,12 +133,12 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any&
 
     return  nResult;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -147,7 +147,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const  Any& bookmark ) throw(
 
     return comphelper::getINT32(bookmark);
 }
-// -------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const  Sequence<  Any >& /*rows*/ ) throw( SQLException,  RuntimeException)
 {
@@ -157,7 +157,7 @@ Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const  Sequence<  An
     ::dbtools::throwFeatureNotImplementedException( "XDeleteRows::deleteRows", *this );
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_xIndex)
 {
     Reference<XUnoTunnel> xTunnel(_xIndex,UNO_QUERY);
@@ -187,44 +187,44 @@ sal_Bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_x
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & ODbaseResultSet::getInfoHelper()
 {
     return *ODbaseResultSet_BASE3::getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* ODbaseResultSet::createArrayHelper() const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODbaseResultSet::acquire() throw()
 {
     ODbaseResultSet_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODbaseResultSet::release() throw()
 {
     ODbaseResultSet_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OSQLAnalyzer* ODbaseResultSet::createAnalyzer()
 {
     return new OFILEAnalyzer(m_pTable->getConnection());
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ODbaseResultSet::getCurrentFilePos() const
 {
     return m_pTable->getFilePos();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index 3477e015e933..e0eea49f36eb 100644
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
@@ -24,12 +24,12 @@ using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::uno;
 
-// -------------------------------------------------------------------------
+
 OResultSet* ODbaseStatement::createResultSet()
 {
     return new ODbaseResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(ODbaseStatement,"com.sun.star.sdbc.driver.dbase.Statement","com.sun.star.sdbc.Statement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index c07f80108e68..b23085cf3f1c 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -189,7 +189,7 @@ void lcl_CalDate(sal_Int32 _nJulianDate,sal_Int32 _nJulianTime,com::sun::star::u
 
 }
 
-// -------------------------------------------------------------------------
+
 void ODbaseTable::readHeader()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::readHeader" );
@@ -292,7 +292,7 @@ void ODbaseTable::readHeader()
         }
     }
 }
-// -------------------------------------------------------------------------
+
 void ODbaseTable::fillColumns()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::fillColumns" );
@@ -439,7 +439,7 @@ void ODbaseTable::fillColumns()
     } // for (; i < nFieldCount; i++)
     OSL_ENSURE(i,"No columns in table!");
 }
-// -------------------------------------------------------------------------
+
 ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConnection)
     : ODbaseTable_BASE(_pTables,_pConnection)
     , m_pMemoStream(NULL)
@@ -451,7 +451,7 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
     m_aHeader.db_typ = dBaseIII;
     m_eEncoding = getConnection()->getTextEncoding();
 }
-// -------------------------------------------------------------------------
+
 ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConnection,
                          const OUString& _Name,
                          const OUString& _Type,
@@ -471,7 +471,7 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables, ODbaseConnection* _pConne
     m_eEncoding = getConnection()->getTextEncoding();
 }
 
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::construct()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::construct" );
@@ -554,7 +554,7 @@ void ODbaseTable::construct()
         AllocBuffer();
     }
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::ReadMemoHeader()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::ReadMemoHeader" );
@@ -604,7 +604,7 @@ sal_Bool ODbaseTable::ReadMemoHeader()
     }
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getEntry" );
@@ -648,7 +648,7 @@ OUString ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName
     }
     return sURL;
 }
-// -------------------------------------------------------------------------
+
 void ODbaseTable::refreshColumns()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::refreshColumns" );
@@ -665,7 +665,7 @@ void ODbaseTable::refreshColumns()
     else
         m_pColumns  = new ODbaseColumns(this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void ODbaseTable::refreshIndexes()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::refreshIndexes" );
@@ -710,7 +710,7 @@ void ODbaseTable::refreshIndexes()
         m_pIndexes  = new ODbaseIndexes(this,m_aMutex,aVector);
 }
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODbaseTable::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::disposing" );
@@ -718,7 +718,7 @@ void SAL_CALL ODbaseTable::disposing(void)
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aColumns = NULL;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getTypes" );
@@ -741,7 +741,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes(  ) throw(RuntimeException)
     return Sequence< Type >(pTypes, aOwnTypes.size());
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::queryInterface" );
@@ -753,7 +753,7 @@ Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeExce
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this));
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getUnoTunnelImplementationId" );
@@ -771,7 +771,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getSomething" );
@@ -779,7 +779,7 @@ sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R
                 ? reinterpret_cast< sal_Int64 >( this )
                 : ODbaseTable_BASE::getSomething(rId);
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::fetchRow" );
@@ -1001,8 +1001,8 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
     }
     return sal_True;
 }
-//------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 void ODbaseTable::FileClose()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::FileClose" );
@@ -1016,7 +1016,7 @@ void ODbaseTable::FileClose()
 
     ODbaseTable_BASE::FileClose();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODbaseTable::CreateImpl()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::CreateImpl" );
@@ -1131,7 +1131,7 @@ sal_Bool ODbaseTable::CreateImpl()
 
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::throwInvalidColumnType" );
@@ -1150,7 +1150,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUStri
          ) );
     ::dbtools::throwGenericSQLException( sError, *this );
 }
-//------------------------------------------------------------------
+
 // creates in principle dBase IV file format
 sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo)
 {
@@ -1399,7 +1399,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
     return sal_True;
 }
 
-//------------------------------------------------------------------
+
 // creates in principle dBase III file format
 sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
 {
@@ -1420,7 +1420,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     m_pMemoStream = NULL;
     return sal_True;
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::Drop_Static" );
@@ -1469,7 +1469,7 @@ sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields
     }
     return bDropped;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ODbaseTable::DropImpl()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::DropImpl" );
@@ -1488,7 +1488,7 @@ sal_Bool ODbaseTable::DropImpl()
     return bDropped;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Reference<XIndexAccess>& _xCols)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::InsertRow" );
@@ -1546,7 +1546,7 @@ sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Ref
     return bInsertRow;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::UpdateRow" );
@@ -1576,7 +1576,7 @@ sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,con
     return sal_True;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::DeleteRow" );
@@ -1629,7 +1629,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
     m_pFileStream->Flush();
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::isUniqueByColumnName" );
@@ -1658,13 +1658,13 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
     }
     return Reference<XPropertySet>();
 }
-//------------------------------------------------------------------
+
 static double toDouble(const OString& rString)
 {
     return ::rtl::math::stringToDouble( rString, '.', ',', NULL, NULL );
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, const Reference<XIndexAccess>& _xCols, const bool bForceAllFields)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::UpdateBuffer" );
@@ -2001,7 +2001,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlockNr)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::WriteMemo" );
@@ -2136,7 +2136,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAlterTable
 void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
@@ -2150,7 +2150,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref
 
     alterColumn(m_pColumns->findColumn(colName)-1,descriptor,xOldColumn);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::alterColumnByIndex" );
@@ -2164,7 +2164,7 @@ void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference<
     m_pColumns->getByIndex(index) >>= xOldColumn;
     alterColumn(index,descriptor,xOldColumn);
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::alterColumn(sal_Int32 index,
                               const Reference< XPropertySet >& descriptor ,
                               const Reference< XDataDescriptorFactory >& xOldColumn )
@@ -2272,13 +2272,13 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         throw;
     }
 }
-// -----------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getMetaData" );
     return getConnection()->getMetaData();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::rename" );
@@ -2335,7 +2335,7 @@ namespace
         }
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getEntry" );
@@ -2351,7 +2351,7 @@ void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::su
         renameFile(m_pConnection,m_Name,newName,sExt);
     }
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::addColumn" );
@@ -2424,7 +2424,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
         throw;
     }
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::dropColumn(sal_Int32 _nPos)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::dropColumn" );
@@ -2480,7 +2480,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
     FileClose();
     construct();
 }
-// -----------------------------------------------------------------------------
+
 OUString ODbaseTable::createTempFile()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::createTempFile" );
@@ -2503,7 +2503,7 @@ OUString ODbaseTable::createTempFile()
 
     return sNewName;
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::copyData" );
@@ -2561,7 +2561,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
         }
     } // for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.db_anz;++nRowPos)
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::throwInvalidDbaseFormat()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::throwInvalidDbaseFormat" );
@@ -2574,18 +2574,18 @@ void ODbaseTable::throwInvalidDbaseFormat()
              ) );
     ::dbtools::throwGenericSQLException( sError, *this );
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::refreshHeader()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::refreshHeader" );
     if ( m_aHeader.db_anz == 0 )
         readHeader();
 }
-//------------------------------------------------------------------
+
 sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::seekRow" );
-    // ----------------------------------------------------------
+
     // prepare positioning:
     OSL_ENSURE(m_pFileStream,"ODbaseTable::seekRow: FileStream is NULL!");
 
@@ -2665,7 +2665,7 @@ End:
     nCurPos = m_nFilePos;
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::ReadMemo" );
@@ -2742,7 +2742,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
     }
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 void ODbaseTable::AllocBuffer()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::AllocBuffer" );
@@ -2762,7 +2762,7 @@ void ODbaseTable::AllocBuffer()
         m_pBuffer       = new sal_uInt8[m_nBufferSize+1];
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ODbaseTable::WriteBuffer()
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::WriteBuffer" );
@@ -2773,7 +2773,7 @@ sal_Bool ODbaseTable::WriteBuffer()
     m_pFileStream->Seek(nPos);
     return m_pFileStream->Write((char*) m_pBuffer, m_aHeader.db_slng) > 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ODbaseTable::getCurrentLastPos() const
 {
     SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen@sun.com ODbaseTable::getCurrentLastPos" );
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 79cd308cd438..3d8ed8232564 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -52,17 +52,17 @@ sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
     pRet->construct();
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void ODbaseTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<ODbaseCatalog*>(&m_rParent)->refreshTables();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > ODbaseTables::createDescriptor()
 {
     return new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection());
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -90,7 +90,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const R
     }
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void ODbaseTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
@@ -120,13 +120,13 @@ void ODbaseTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
         ::dbtools::throwGenericSQLException( sError, NULL );
     }
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     typedef sdbcx::OCollection OTables_BASE;
     return OTables_BASE::queryInterface(rType);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 5565df23d169..10815e70b2d6 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -75,7 +75,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbase_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 7e519fc27837..25da53c2daee 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -32,19 +32,19 @@ using namespace connectivity;
 using namespace connectivity::dbase;
 using namespace connectivity::file;
 using namespace com::sun::star::sdbc;
-// -----------------------------------------------------------------------------
+
 ONDXKey::ONDXKey(sal_uInt32 nRec)
     :nRecord(nRec)
 {
 }
-// -----------------------------------------------------------------------------
+
 ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
     : ONDXKey_BASE(eType)
     , nRecord(nRec)
     , xValue(rVal)
 {
 }
-// -----------------------------------------------------------------------------
+
 ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
      ,nRecord(nRec)
@@ -55,7 +55,7 @@ ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec)
         xValue.setBound(true);
     }
 }
-// -----------------------------------------------------------------------------
+
 
 ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::DOUBLE)
@@ -63,7 +63,7 @@ ONDXKey::ONDXKey(double aVal, sal_uInt32 nRec)
      ,xValue(aVal)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 //==================================================================
 // index page
@@ -80,12 +80,12 @@ ONDXPage::ONDXPage(ODbaseIndex& rInd, sal_uInt32 nPos, ONDXPage* pParent)
     ppNodes = new ONDXNode[nT];
 }
 
-//------------------------------------------------------------------
+
 ONDXPage::~ONDXPage()
 {
     delete[] ppNodes;
 }
-//------------------------------------------------------------------
+
 void ONDXPage::QueryDelete()
 {
     // Store in GarbageCollector
@@ -114,7 +114,7 @@ void ONDXPage::QueryDelete()
     else
         SvRefBase::QueryDelete();
 }
-//------------------------------------------------------------------
+
 ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
 {
     if (!aChild.Is() && pIndex)
@@ -124,7 +124,7 @@ ONDXPagePtr& ONDXPage::GetChild(ODbaseIndex* pIndex)
     return aChild;
 }
 
-//------------------------------------------------------------------
+
 sal_uInt16 ONDXPage::FindPos(const ONDXKey& rKey) const
 {
     // searches the position for the given key in a page
@@ -135,7 +135,7 @@ sal_uInt16 ONDXPage::FindPos(const ONDXKey& rKey) const
     return i;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ONDXPage::Find(const ONDXKey& rKey)
 {
     // searches the given key
@@ -169,7 +169,7 @@ sal_Bool ONDXPage::Find(const ONDXKey& rKey)
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
 {
     // When creating an index there can be multiple nodes added,
@@ -289,7 +289,7 @@ sal_Bool ONDXPage::Insert(ONDXNode& rNode, sal_uInt32 nRowsLeft)
     }
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode)
 {
     sal_uInt16 nMaxCount = rIndex.getHeader().db_maxkeys;
@@ -321,13 +321,13 @@ sal_Bool ONDXPage::Insert(sal_uInt16 nPos, ONDXNode& rNode)
     return sal_True;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool ONDXPage::Append(ONDXNode& rNode)
 {
     DBG_ASSERT(!IsFull(), "kein Append moeglich");
     return Insert(nCount, rNode);
 }
-//------------------------------------------------------------------
+
 void ONDXPage::Release(sal_Bool bSave)
 {
     // free pages
@@ -346,7 +346,7 @@ void ONDXPage::Release(sal_Bool bSave)
     }
     aParent = NULL;
 }
-//------------------------------------------------------------------
+
 void ONDXPage::ReleaseFull(sal_Bool bSave)
 {
     ONDXPagePtr aTempParent = aParent;
@@ -363,7 +363,7 @@ void ONDXPage::ReleaseFull(sal_Bool bSave)
             aTempParent->GetChild().Clear();
     }
 }
-//------------------------------------------------------------------
+
 sal_Bool ONDXPage::Delete(sal_uInt16 nNodePos)
 {
     if (IsLeaf())
@@ -414,7 +414,7 @@ sal_Bool ONDXPage::Delete(sal_uInt16 nNodePos)
 }
 
 
-//------------------------------------------------------------------
+
 ONDXNode ONDXPage::Split(ONDXPage& rPage)
 {
     DBG_ASSERT(IsFull(), "Falsches Splitting");
@@ -464,7 +464,7 @@ ONDXNode ONDXPage::Split(ONDXPage& rPage)
     return aResultNode;
 }
 
-//------------------------------------------------------------------
+
 void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
 {
     DBG_ASSERT(HasParent(), "kein Vater vorhanden");
@@ -651,7 +651,7 @@ void ONDXPage::Merge(sal_uInt16 nParentNodePos, ONDXPagePtr xPage)
 // ONDXNode
 //==================================================================
 
-//------------------------------------------------------------------
+
 void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
 {
     rStream.ReadUInt32( aKey.nRecord ); // key
@@ -675,7 +675,7 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     rStream >> aChild;
 }
 
-//------------------------------------------------------------------
+
 void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
 {
     const ODbaseIndex& rIndex = rPage.GetIndex();
@@ -717,7 +717,7 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
 }
 
 
-//------------------------------------------------------------------
+
 ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 {
     if (!aChild.Is() && pIndex)
@@ -730,13 +730,13 @@ ONDXPagePtr& ONDXNode::GetChild(ODbaseIndex* pIndex, ONDXPage* pParent)
 //==================================================================
 // ONDXKey
 //==================================================================
-//------------------------------------------------------------------
+
 sal_Bool ONDXKey::IsText(sal_Int32 eType)
 {
     return eType == DataType::VARCHAR || eType == DataType::CHAR;
 }
 
-//------------------------------------------------------------------
+
 int ONDXKey::Compare(const ONDXKey& rKey) const
 {
     sal_Int32 nRes;
@@ -774,40 +774,40 @@ int ONDXKey::Compare(const ONDXKey& rKey) const
     }
     return nRes;
 }
-// -----------------------------------------------------------------------------
+
 void ONDXKey::setValue(const ORowSetValue& _rVal)
 {
     xValue = _rVal;
 }
-// -----------------------------------------------------------------------------
+
 const ORowSetValue& ONDXKey::getValue() const
 {
     return xValue;
 }
-// -----------------------------------------------------------------------------
+
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPagePtr& rPage)
 {
     rStream.ReadUInt32( rPage.nPagePos );
     return rStream;
 }
-// -----------------------------------------------------------------------------
+
 SvStream& connectivity::dbase::WriteONDXPagePtr(SvStream &rStream, const ONDXPagePtr& rPage)
 {
     rStream.WriteUInt32( rPage.nPagePos );
     return rStream;
 }
-// -----------------------------------------------------------------------------
+
 //==================================================================
 // ONDXPagePtr
 //==================================================================
-//------------------------------------------------------------------
+
 ONDXPagePtr::ONDXPagePtr(const ONDXPagePtr& rRef)
               :ONDXPageRef(rRef)
               ,nPagePos(rRef.nPagePos)
 {
 }
 
-//------------------------------------------------------------------
+
 ONDXPagePtr::ONDXPagePtr(ONDXPage* pRefPage)
               :ONDXPageRef(pRefPage)
               ,nPagePos(0)
@@ -815,7 +815,7 @@ ONDXPagePtr::ONDXPagePtr(ONDXPage* pRefPage)
     if (pRefPage)
         nPagePos = pRefPage->GetPagePos();
 }
-//------------------------------------------------------------------
+
 ONDXPagePtr& ONDXPagePtr::operator=(const ONDXPagePtr& rRef)
 {
     ONDXPageRef::operator=(rRef);
@@ -823,16 +823,16 @@ ONDXPagePtr& ONDXPagePtr::operator=(const ONDXPagePtr& rRef)
     return *this;
 }
 
-//------------------------------------------------------------------
+
 ONDXPagePtr& ONDXPagePtr::operator= (ONDXPage* pRef)
 {
     ONDXPageRef::operator=(pRef);
     nPagePos = (pRef) ? pRef->GetPagePos() : 0;
     return *this;
 }
-// -----------------------------------------------------------------------------
+
 static sal_uInt32 nValue;
-//------------------------------------------------------------------
+
 SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
 {
     rStream.Seek(rPage.GetPagePos() * DINDEX_PAGE_SIZE);
@@ -844,7 +844,7 @@ SvStream& connectivity::dbase::operator >> (SvStream &rStream, ONDXPage& rPage)
     return rStream;
 }
 
-//------------------------------------------------------------------
+
 SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage& rPage)
 {
     // Page doesn't exist yet
@@ -887,9 +887,9 @@ SvStream& connectivity::dbase::WriteONDXPage(SvStream &rStream, const ONDXPage&
     }
     return rStream;
 }
-// -----------------------------------------------------------------------------
+
 #if OSL_DEBUG_LEVEL > 1
-//------------------------------------------------------------------
+
 void ONDXPage::PrintPage()
 {
     OSL_TRACE("\nSDB: -----------Page: %d  Parent: %d  Count: %d  Child: %d-----",
@@ -930,13 +930,13 @@ void ONDXPage::PrintPage()
     OSL_TRACE("SDB: ===============================================");
 }
 #endif
-// -----------------------------------------------------------------------------
+
 sal_Bool ONDXPage::IsFull() const
 {
     return Count() == rIndex.getHeader().db_maxkeys;
 }
-// -----------------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
 {
     // binary search later
@@ -948,7 +948,7 @@ sal_uInt16 ONDXPage::Search(const ONDXKey& rSearch)
     return (i < Count()) ? i : NODE_NOTFOUND;
 }
 
-//------------------------------------------------------------------
+
 sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
 {
     sal_uInt16 i = NODE_NOTFOUND;
@@ -959,7 +959,7 @@ sal_uInt16 ONDXPage::Search(const ONDXPage* pPage)
     // if not found, then we assume, that the page itself points to the page
     return (i < Count()) ? i : NODE_NOTFOUND;
 }
-// -----------------------------------------------------------------------------
+
 // runs recursively
 void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
                                   ONDXKey& rReplace)
@@ -980,20 +980,20 @@ void ONDXPage::SearchAndReplace(const ONDXKey& rSearch,
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
 
-//------------------------------------------------------------------
+
 const ONDXNode& ONDXPage::operator[] (sal_uInt16 nPos) const
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
     return ppNodes[nPos];
 }
-// -----------------------------------------------------------------------------
+
 void ONDXPage::Remove(sal_uInt16 nPos)
 {
     DBG_ASSERT(nCount > nPos, "falscher Indexzugriff");
@@ -1004,6 +1004,6 @@ void ONDXPage::Remove(sal_uInt16 nPos)
     nCount--;
     bModified = sal_True;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index 95ce61830f5a..6fdd864871df 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::evoab;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) :
     connectivity::sdbcx::OCatalog(_pCon)
     ,m_pConnection(_pCon)
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index 9f05ea22a80b..bb9a23c08e07 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace connectivity::evoab;
 
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
@@ -80,7 +80,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OEvoabColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index d06613304489..3846fca5d041 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -33,7 +33,7 @@
 using namespace connectivity::evoab;
 using namespace dbtools;
 
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
@@ -64,14 +64,14 @@ OUString implGetExceptionMsg( Exception& e )
          return aMsg;
 }
 
-// --------------------------------------------------------------------------------
+
 OEvoabConnection::OEvoabConnection( OEvoabDriver& _rDriver )
     :OSubComponent<OEvoabConnection, OConnection_BASE>( (::cppu::OWeakObject*)(&_rDriver), this )
     ,m_rDriver(_rDriver)
     ,m_xCatalog(NULL)
 {
 }
-//-----------------------------------------------------------------------------
+
 OEvoabConnection::~OEvoabConnection()
 {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -82,17 +82,17 @@ OEvoabConnection::~OEvoabConnection()
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OEvoabConnection::release() throw()
 {
     relase_ChildImpl();
 }
 
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection")
 
-//-----------------------------------------------------------------------------
+
 void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
@@ -123,13 +123,13 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa
     osl_atomic_decrement( &m_refCount );
 }
 
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     // when you need to transform SQL92 to you driver specific you can do it here
     return _sSql;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -144,7 +144,7 @@ Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData(  ) throw(
 
     return xMetaData;
 }
-//------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -157,7 +157,7 @@ Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData(  ) throw(
      }
      return xTab;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OEvoabConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -169,7 +169,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement(  ) throw(SQL
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -194,7 +194,7 @@ sal_Bool SAL_CALL OEvoabConnection::isClosed(  ) throw(SQLException, RuntimeExce
     return OConnection_BASE::rBHelper.bDisposed;
 }
 
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OEvoabConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -205,7 +205,7 @@ void SAL_CALL OEvoabConnection::close(  ) throw(SQLException, RuntimeException)
     dispose();
 }
 
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OEvoabConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
@@ -215,7 +215,7 @@ void SAL_CALL OEvoabConnection::clearWarnings(  ) throw(SQLException, RuntimeExc
 {
     m_aWarnings.clearWarnings();
 }
-//------------------------------------------------------------------------------
+
 
 void OEvoabConnection::disposing()
 {
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 2ae114fbccde..76039c62c77a 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -256,7 +256,7 @@ OEvoabDatabaseMetaData::~OEvoabDatabaseMetaData()
 {
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const OUString& columnNamePattern )
 {
     static ODatabaseMetaDataResultSet::ORows aRows;
@@ -317,682 +317,682 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
 
     return aRows ;
 }
-// -------------------------------------------------------------------------
+
 OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OEvoabDatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     // We only support a single table
     return 1;
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
     OUString aVal("\"");
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     sal_Bool bValue = sal_False;
     return bValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     // We allow you to select from any table.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     // For now definitely read-only, no support for update/delete
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     // todo add Support for this.
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OEvoabDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     // Any case may be used
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_pConnection->getURL();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     return OUString( "1" );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     return OUString( "0" );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return TransactionIsolation::NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 // here follow all methods which return a resultset
 // the first methods is an example implementation how to use this resultset
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     /* Dont need to change as evoab driver supports only table */
@@ -1022,7 +1022,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  ) throw
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     /*
@@ -1069,7 +1069,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
     pResultSet->setRows(aRows);
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -1082,7 +1082,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
     return xResultSet;
 }
 
-// -------------------------------------------------------------------------
+
 bool isSourceBackend(ESource *pSource, const char *backendname)
 {
     if (!pSource || !e_source_has_extension (pSource, E_SOURCE_EXTENSION_ADDRESS_BOOK))
@@ -1225,12 +1225,12 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaDaza::getUDTs", *this );
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index af4d24d6a3fc..b0f629f0cd19 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -41,16 +41,16 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
 
-// --------------------------------------------------------------------------------
+
 OEvoabDriver::OEvoabDriver(const Reference< XMultiServiceFactory >& _rxFactory) :
         ODriver_BASE( m_aMutex ), m_xFactory( _rxFactory )
 {
 }
-// -----------------------------------------------------------------------------
+
 OEvoabDriver::~OEvoabDriver()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OEvoabDriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -78,7 +78,7 @@ void OEvoabDriver::disposing()
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString(EVOAB_DRIVER_IMPL_NAME);
@@ -86,7 +86,7 @@ OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
     // Please take care when changing it.
 }
 
-//------------------------------------------------------------------
+
 Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
@@ -95,7 +95,7 @@ Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) throw (Ru
     aSNS[0] = "com.sun.star.sdbc.Driver";
     return aSNS;
 }
-//------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -105,18 +105,18 @@ sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
     return *(new OEvoabDriver(_rxFactory));
 }
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -133,14 +133,14 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, co
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url )
     throw(SQLException, RuntimeException)
 {
     return acceptsURL_Stat(url);
 }
 
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( ! acceptsURL(url) )
@@ -154,21 +154,21 @@ Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUS
     return Sequence< DriverPropertyInfo >();
 }
 
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool OEvoabDriver::acceptsURL_Stat( const OUString& url )
 {
     return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 6118a161eadc..d73229b9202b 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -50,7 +50,7 @@ OEvoabPreparedStatement::OEvoabPreparedStatement( OEvoabConnection* _pConnection
 {
 }
 
-// -----------------------------------------------------------------------------
+
 void OEvoabPreparedStatement::construct( const OUString& _sql )
 {
     m_sSqlStatement = _sql;
@@ -65,24 +65,24 @@ void OEvoabPreparedStatement::construct( const OUString& _sql )
     pMeta->setEvoabFields( m_aQueryData.xSelectColumns );
 }
 
-// -----------------------------------------------------------------------------
+
 OEvoabPreparedStatement::~OEvoabPreparedStatement()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OEvoabPreparedStatement::acquire() throw()
 {
     OCommonStatement::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OEvoabPreparedStatement::release() throw()
 {
     OCommonStatement::release();
 }
 
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OCommonStatement::queryInterface(rType);
@@ -90,12 +90,12 @@ Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw
         aRet = OPreparedStatement_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -106,7 +106,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData(
     ENSURE_OR_THROW( m_xMetaData.is(), "internal error: no meta data" );
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::close(  ) throw(SQLException, RuntimeException)
 {
@@ -124,7 +124,7 @@ void SAL_CALL OEvoabPreparedStatement::close(  ) throw(SQLException, RuntimeExce
     }
 
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OEvoabPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
 {
@@ -134,7 +134,7 @@ sal_Bool SAL_CALL OEvoabPreparedStatement::execute(  ) throw(SQLException, Runti
     Reference< XResultSet> xRS = impl_executeQuery_throw( m_aQueryData );
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
 {
@@ -143,13 +143,13 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate(  ) throw(SQLException
     ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setString", *this );
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -158,7 +158,7 @@ Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection(  ) thr
 
     return impl_getConnection();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
@@ -167,104 +167,104 @@ Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery(  ) throw
 
     return impl_executeQuery_throw( m_aQueryData );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setBoolean", *this );
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setByte", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setDate", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setTime", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setTimestamp", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setDouble", *this );
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setFloat", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setInt", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setLong", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setNull", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setClob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setBlob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setArray", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setRef", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectWithInfo", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectNull", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
@@ -277,51 +277,51 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons
         ::dbtools::throwGenericSQLException(sError,*this);
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setShort", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setBytes", *this );
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setCharacterStream", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setBinaryStream", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OEvoabPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount(  ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 2cc664bcfb0d..4ad700b1308c 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -63,12 +63,12 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException)   \
 {
     return OUString("com.sun.star.sdbcx.evoab.ResultSet");
 }
-// -------------------------------------------------------------------------
+
  Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< OUString > aSupported(1);
@@ -645,12 +645,12 @@ OEvoabResultSet::OEvoabResultSet( OCommonStatement* pStmt, OEvoabConnection *pCo
     REGISTER_PROP( PROPERTY_ID_RESULTSETCONCURRENCY, m_nResultSetConcurrency );
 }
 
-// -------------------------------------------------------------------------
+
 OEvoabResultSet::~OEvoabResultSet()
 {
 }
 
-// -------------------------------------------------------------------------
+
 void OEvoabResultSet::construct( const QueryData& _rData )
 {
     ENSURE_OR_THROW( _rData.getQuery(), "internal error: no EBookQuery" );
@@ -708,7 +708,7 @@ void OEvoabResultSet::construct( const QueryData& _rData )
     pMeta->setEvoabFields( _rData.xSelectColumns );
 }
 
-// -------------------------------------------------------------------------
+
 void OEvoabResultSet::disposing(void)
 {
     ::comphelper::OPropertyContainer::disposing();
@@ -719,7 +719,7 @@ void OEvoabResultSet::disposing(void)
     m_pStatement = NULL;
     m_xMetaData.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ::comphelper::OPropertyContainer::queryInterface(rType);
@@ -727,7 +727,7 @@ Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(Runtime
         aRet = OResultSet_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  ) throw( RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -736,7 +736,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  ) throw( RuntimeException)
     );
 }
 
-// -------------------------------------------------------------------------
+
 // XRow Interface
 
 /**
@@ -761,7 +761,7 @@ OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLEx
     }
     return aResult;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -778,110 +778,110 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE
     }
     return bResult ? sal_True : sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getLong", *this );
     return sal_Int64();
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getObject", *this );
     return Any();
 }
-// -------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getShort", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getTime", *this );
     return ::com::sun::star::util::Time();
 }
-// -------------------------------------------------------------------------
+
 util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getTimestamp", *this );
     return ::com::sun::star::util::DateTime();
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getBinaryStream", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getCharacterStream", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getByte", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getBytes", *this );
     return Sequence< sal_Int8 >();
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getDate", *this );
     return ::com::sun::star::util::Date();
 }
-// -------------------------------------------------------------------------
+
 double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getDouble", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getFloat", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getInt", *this );
     return 0;
 }
 // XRow Interface Ends
-// -------------------------------------------------------------------------
+
 
 // XResultSetMetaDataSupplier Interface
 Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
@@ -894,7 +894,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData(  ) throw(
     return m_xMetaData;
 }
 // XResultSetMetaDataSupplier Interface Ends
-// -------------------------------------------------------------------------
+
 
 // XResultSet Interface
 sal_Bool SAL_CALL OEvoabResultSet::next(  ) throw(SQLException, RuntimeException)
@@ -908,7 +908,7 @@ sal_Bool SAL_CALL OEvoabResultSet::next(  ) throw(SQLException, RuntimeException
     else
         return false;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -916,7 +916,7 @@ sal_Bool SAL_CALL OEvoabResultSet::wasNull(  ) throw(SQLException, RuntimeExcept
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -924,7 +924,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst(  ) throw(SQLException, Runtime
 
     return m_nIndex < 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -932,7 +932,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getRow(  ) throw(SQLException, RuntimeExcept
 
     return m_nIndex;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -940,7 +940,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isAfterLast(  ) throw(SQLException, RuntimeEx
 
     return m_nIndex >= m_nLength;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -948,7 +948,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isFirst(  ) throw(SQLException, RuntimeExcept
 
     return m_nIndex == 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -956,7 +956,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isLast(  ) throw(SQLException, RuntimeExcepti
 
     return m_nIndex == m_nLength - 1;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OEvoabResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -964,7 +964,7 @@ void SAL_CALL OEvoabResultSet::beforeFirst(  ) throw(SQLException, RuntimeExcept
 
     m_nIndex = -1;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OEvoabResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -972,7 +972,7 @@ void SAL_CALL OEvoabResultSet::afterLast(  ) throw(SQLException, RuntimeExceptio
 
     m_nIndex = m_nLength;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OEvoabResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -982,7 +982,7 @@ sal_Bool SAL_CALL OEvoabResultSet::first(  ) throw(SQLException, RuntimeExceptio
     m_nIndex = 0;
     return true;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OEvoabResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -992,7 +992,7 @@ sal_Bool SAL_CALL OEvoabResultSet::last(  ) throw(SQLException, RuntimeException
     m_nIndex = m_nLength - 1;
     return true;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1004,7 +1004,7 @@ sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException,
     else
         return false;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1017,7 +1017,7 @@ sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException,
     else
         return false;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1030,7 +1030,7 @@ sal_Bool SAL_CALL OEvoabResultSet::previous(  ) throw(SQLException, RuntimeExcep
         else
         return false;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1038,7 +1038,7 @@ Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement(  ) throw(SQLExce
 ::com::sun::star::uno::WeakReferenceHelper      aStatement((OWeakObject*)m_pStatement);
     return aStatement.get();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OEvoabResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -1047,7 +1047,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowDeleted(  ) throw(SQLException, RuntimeExc
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1055,7 +1055,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowInserted(  ) throw(SQLException, RuntimeEx
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1063,14 +1063,14 @@ sal_Bool SAL_CALL OEvoabResultSet::rowUpdated(  ) throw(SQLException, RuntimeExc
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OEvoabResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
 //XResult Interface ends
-// -------------------------------------------------------------------------
+
 // XCancellable
 
 void SAL_CALL OEvoabResultSet::cancel(  ) throw(RuntimeException)
@@ -1093,19 +1093,19 @@ void SAL_CALL OEvoabResultSet::close(  ) throw(SQLException, RuntimeException)
 }
 
 // XWarningsSupplier
-// -------------------------------------------------------------------------
+
 void SAL_CALL OEvoabResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OEvoabResultSet::clearWarnings" );
     m_aWarnings.clearWarnings();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OEvoabResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OEvoabResultSet::getWarnings" );
     return m_aWarnings.getWarnings();
 }
-// -------------------------------------------------------------------------
+
 //XColumnLocate Interface
 sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -1127,38 +1127,38 @@ sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) thr
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 //XColumnLocate interface ends
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OEvoabResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
     describeProperties( aProps );
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OEvoabResultSet::getInfoHelper()
 {
     return *const_cast<OEvoabResultSet*>(this)->getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OEvoabResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OEvoabResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
 OEvoabResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 } } // connectivity::evoab
 
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 889c9269eccc..535b2c4f6f53 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -34,11 +34,11 @@ OEvoabResultSetMetaData::OEvoabResultSetMetaData(const OUString& _aTableName)
 {
 
 }
-// -------------------------------------------------------------------------
+
 OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
         OSQLColumns::Vector::const_iterator aIter;
@@ -63,45 +63,45 @@ void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity
         }
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnDisplaySize( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return 50;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnType( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
         sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldType (nField);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
     return m_aEvoabFields.size();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldName( nField );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldTypeName( nField );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
@@ -114,72 +114,72 @@ OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum
                                              RTL_TEXTENCODING_UTF8 );
     return aLabel;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return m_aTableName;//OUString("TABLE");
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isCurrency( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isAutoIncrement( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isSigned( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getPrecision( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::getScale( sal_Int32 /*nColumnNum*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OEvoabResultSetMetaData::isNullable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isSearchable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isReadOnly( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isDefinitelyWritable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OEvoabResultSetMetaData::isWritable( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index c5e7082dbcc2..f66e9166fc4f 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -36,7 +36,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -77,7 +77,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL evoab2_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 31612ce5674f..15332b510912 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -38,7 +38,7 @@
 
 namespace connectivity { namespace evoab {
 
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -47,7 +47,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
-//------------------------------------------------------------------------------
+
 OCommonStatement::OCommonStatement(OEvoabConnection* _pConnection)
     : OCommonStatement_IBase(m_aMutex)
     , ::comphelper::OPropertyContainer(OCommonStatement_IBase::rBHelper)
@@ -87,11 +87,11 @@ OCommonStatement::OCommonStatement(OEvoabConnection* _pConnection)
     REGISTER_PROP( PROPERTY_ID_ESCAPEPROCESSING, m_bEscapeProcessing );
     REGISTER_PROP( PROPERTY_ID_RESULTSETCONCURRENCY, m_nResultSetConcurrency );
 }
-// -----------------------------------------------------------------------------
+
 OCommonStatement::~OCommonStatement()
 {
 }
-//------------------------------------------------------------------------------
+
 void OCommonStatement::disposeResultSet()
 {
     // free the cursor if alive
@@ -100,7 +100,7 @@ void OCommonStatement::disposeResultSet()
         xComp->dispose();
     m_xResultSet.clear();
 }
-//------------------------------------------------------------------------------
+
 void OCommonStatement::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -114,7 +114,7 @@ void OCommonStatement::disposing()
     dispose_ChildImpl();
     OCommonStatement_IBase::disposing();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OCommonStatement_IBase::queryInterface(rType);
@@ -122,7 +122,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
         aRet = ::comphelper::OPropertyContainer::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -131,7 +131,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBase::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 //void SAL_CALL OCommonStatement::cancel(  ) throw(RuntimeException)
 //{
@@ -140,7 +140,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 //// cancel the current sql statement
 //}
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException)
 {
     {
@@ -150,7 +150,7 @@ void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 EBookQuery *
 OCommonStatement::createTrue()
@@ -170,7 +170,7 @@ OCommonStatement::createTest( const OUString &aColumnName,
                                     eTest, sMatch.getStr() );
 }
 
-// -------------------------------------------------------------------------
+
 
 OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef )
 {
@@ -205,7 +205,7 @@ OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNod
     return sColumnName;
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::orderByAnalysis( const OSQLParseNode* _pOrderByClause, SortDescriptor& _out_rSort )
 {
     ENSURE_OR_THROW( _pOrderByClause, "NULL node" );
@@ -246,7 +246,7 @@ void OCommonStatement::orderByAnalysis( const OSQLParseNode* _pOrderByClause, So
     }
 }
 
-// -------------------------------------------------------------------------
+
 EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
 {
     EBookQuery *pResult = NULL;
@@ -491,7 +491,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -502,7 +502,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLExcepti
     return impl_getConnection();
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -512,38 +512,38 @@ Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExcept
     return makeAny(SQLWarning());
 }
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OCommonStatement::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
     describeProperties( aProps );
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper()
 {
     return *const_cast< OCommonStatement* >( this )->getArrayHelper();
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::acquire() throw()
 {
     OCommonStatement_IBase::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::release() throw()
 {
     relase_ChildImpl();
 }
 
-// -------------------------------------------------------------------------
+
 QueryData OCommonStatement::impl_getEBookQuery_throw( const OUString& _rSql )
 {
     QueryData aData;
@@ -566,7 +566,7 @@ QueryData OCommonStatement::impl_getEBookQuery_throw( const OUString& _rSql )
     return aData;
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryData& _rQueryData )
 {
     // create result set
@@ -579,7 +579,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa
     return xRS;
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql )
 {
     SAL_INFO( "connectivity.evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" );
@@ -592,7 +592,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUStrin
     return impl_executeQuery_throw( impl_getEBookQuery_throw( _rSql ) );
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
@@ -601,16 +601,16 @@ Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  )
 // =============================================================================
 // = OStatement
 // =============================================================================
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO( OStatement, "com.sun.star.comp.sdbcx.evoab.OStatement", "com.sun.star.sdbc.Statement" );
 
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase )
 
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase )
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -620,7 +620,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException
     return xRS.is();
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -629,7 +629,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql
     return impl_executeQuery_throw( _sql );
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 4b13fa3f8539..15510ac8c366 100644
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace connectivity::evoab;
-// -------------------------------------------------------------------------
+
 OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
                 OEvoabConnection* _pConnection,
                 const OUString& _Name,
@@ -50,7 +50,7 @@ OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OEvoabTable::refreshColumns()
 {
     TStringVector aVector;
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index 208cb6b83c0d..26f424ef48dc 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -76,17 +76,17 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OEvoabTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OEvoabCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OEvoabTables::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index fff9d4b56c1c..6687ebd3572f 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -29,15 +29,15 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::file;
-// -------------------------------------------------------------------------
+
 OFileCatalog::OFileCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
                 ,m_pConnection(_pCon)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::OFileCatalog" );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OFileCatalog::disposing()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::disposing" );
@@ -47,13 +47,13 @@ void SAL_CALL OFileCatalog::disposing()
 m_xMetaData.clear();
     OFileCatalog_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 OUString OFileCatalog::buildName(const Reference< XRow >& _xRow)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::buildName" );
     return _xRow->getString(3);
 }
-// -------------------------------------------------------------------------
+
 void OFileCatalog::refreshTables()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::refreshTables" );
@@ -69,7 +69,7 @@ void OFileCatalog::refreshTables()
         m_pTables = new OTables(m_xMetaData,*this,m_aMutex,aVector);
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::queryInterface" );
@@ -82,7 +82,7 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc
     typedef sdbcx::OCatalog OFileCatalog_BASE;
     return OFileCatalog_BASE::queryInterface(rType);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileCatalog::getTypes" );
@@ -105,7 +105,7 @@ Sequence< Type > SAL_CALL OFileCatalog::getTypes(  ) throw(RuntimeException)
     const Type *pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
     return Sequence< Type >(pTypes, aOwnTypes.size());
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 1633812df86a..1f894a1e016c 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -74,12 +74,12 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 void OColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 848873a43de7..9cb00a8dea2a 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -44,7 +44,7 @@
 
 using namespace connectivity::file;
 using namespace dbtools;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -54,7 +54,7 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::ucb;
 using namespace ::ucbhelper;
 typedef connectivity::OMetaConnection OConnection_BASE;
-// --------------------------------------------------------------------------------
+
 OConnection::OConnection(OFileDriver*   _pDriver)
     : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this)
     , m_pDriver(_pDriver)
@@ -68,19 +68,19 @@ OConnection::OConnection(OFileDriver*   _pDriver)
 {
     m_nTextEncoding = RTL_TEXTENCODING_DONTKNOW;
 }
-//-----------------------------------------------------------------------------
+
 OConnection::~OConnection()
 {
     if(!isClosed(  ))
         close();
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OConnection::release() throw()
 {
     relase_ChildImpl();
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool OConnection::matchesExtension( const OUString& _rExt ) const
 {
     if ( isCaseSensitveExtension() )
@@ -92,7 +92,7 @@ sal_Bool OConnection::matchesExtension( const OUString& _rExt ) const
     return sMyExtension == sExt;
 }
 
-//-----------------------------------------------------------------------------
+
 void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
@@ -212,10 +212,10 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
     osl_atomic_decrement( &m_refCount );
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.file.Connection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -226,7 +226,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -239,18 +239,18 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return pStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     return sql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -258,7 +258,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti
 
     m_bAutoCommit = autoCommit;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -266,22 +266,22 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
 
     return m_bAutoCommit;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 {
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return OConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -297,7 +297,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -306,7 +306,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
 
     m_bReadOnly = readOnly;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -315,36 +315,36 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
 
     return m_bReadOnly;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XConnection::setCatalog", *this );
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -355,17 +355,17 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-//------------------------------------------------------------------------------
+
 void OConnection::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -378,7 +378,7 @@ m_xContent.clear();
 
     dispose_ChildImpl();
 }
-//------------------------------------------------------------------------------
+
 Reference< XTablesSupplier > OConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -390,7 +390,7 @@ Reference< XTablesSupplier > OConnection::createCatalog()
     }
     return xTab;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XDynamicResultSet > OConnection::getDir() const
 {
     Reference<XDynamicResultSet> xContent;
@@ -408,14 +408,14 @@ Reference< XDynamicResultSet > OConnection::getDir() const
     }
     return xContent;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         ? reinterpret_cast< sal_Int64 >( this )
         : (sal_Int64)0;
 }
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -430,7 +430,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
     }
     return pId->getImplementationId();
 }
-// -----------------------------------------------------------------------------
+
 void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsMessage)
 {
     SQLException aError;
@@ -447,7 +447,7 @@ void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsM
 
     throw aError;
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 058d5089ea0d..5b123cb3f23e 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -52,24 +52,24 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::OData
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ODatabaseMetaData" );
     DBG_CTOR( file_ODatabaseMetaData, NULL );
 }
-// -------------------------------------------------------------------------
+
 ODatabaseMetaData::~ODatabaseMetaData()
 {
     DBG_DTOR( file_ODatabaseMetaData, NULL );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getTypeInfo_throw" );
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTypeInfo );
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getCatalogSeparator_throw" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
         const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
@@ -79,7 +79,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
 }
 
-// -------------------------------------------------------------------------
+
 namespace
 {
     sal_Int16 isCaseSensitiveParentFolder( const OUString& _rFolderOrDoc, const OUString& _rDocName )
@@ -162,7 +162,7 @@ namespace
     }
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/,
         const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
@@ -317,79 +317,79 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxBinaryLiteralLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxRowSize" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCatalogNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCharLiteralLength" );
     return SAL_MAX_INT32;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInIndex" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxCursorNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxConnections" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInTable" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getMaxStatements_throw" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxTableNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getMaxTablesInSelect_throw" );
     return 1;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
         const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -459,230 +459,230 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::doesMaxRowSizeIncludeBlobs" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesLowerCaseQuotedIdentifiers" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesLowerCaseIdentifiers" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesMixedCaseIdentifiers" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesUpperCaseQuotedIdentifiers" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::storesUpperCaseIdentifiers" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxIndexLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsNonNullableColumns" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getCatalogTerm" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_getIdentifierQuoteString_throw" );
     static const OUString sQuote("\"");
     return sQuote;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getExtraNameCharacters" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDifferentTableCorrelationNames" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_isCatalogAtStart_throw" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::dataDefinitionIgnoredInTransactions" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::dataDefinitionCausesTransactionCommit" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDataManipulationTransactionsOnly" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsPositionedDelete" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsPositionedUpdate" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenStatementsAcrossRollback" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenStatementsAcrossCommit" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenCursorsAcrossCommit" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOpenCursorsAcrossRollback" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTransactionIsolationLevel" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92FullSQL" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92EntryLevelSQL" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsIntegrityEnhancementFacility" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInIndexDefinitions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInIndexDefinitions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOuterJoins" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTableTypes" );
@@ -701,416 +701,416 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxStatementLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxProcedureNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxSchemaNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTransactions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::allProceduresAreCallable" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsStoredProcedures" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSelectForUpdate" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::allTablesAreSelectable" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::isReadOnly" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::usesLocalFiles" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::usesLocalFilePerTable" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTypeConversion" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullPlusNonNullIsNull" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsColumnAliasing" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsTableCorrelationNames" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsConvert" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsExpressionsInOrderBy" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupBy" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupByBeyondSelect" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsGroupByUnrelated" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMultipleTransactions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMultipleResultSets" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsLikeEscapeClause" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsOrderByUnrelated" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsUnion" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsUnionAll" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMixedCaseIdentifiers" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedAtEnd" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedAtStart" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedHigh" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::nullsAreSortedLow" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInProcedureCalls" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInProcedureCalls" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCorrelatedSubqueries" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInComparisons" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInExists" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInIns" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsSubqueriesInQuantifieds" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsANSI92IntermediateSQL" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getURL" );
     static const OUString aValue(  "sdbc:file:" );
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getUserName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverVersion" );
     return OUString::number(1);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductVersion" );
     return OUString::number(0);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDatabaseProductName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getProcedureTerm" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSchemaTerm" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverMajorVersion" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDefaultTransactionIsolation" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getDriverMinorVersion" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSQLKeywords" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSearchStringEscape" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getStringFunctions" );
     return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getTimeDateFunctions" );
     return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getSystemFunctions" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getNumericFunctions" );
     return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsExtendedSQLGrammar" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsCoreSQLGrammar" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsMinimumSQLGrammar" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsFullOuterJoins" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsLimitedOuterJoins" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInGroupBy" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInOrderBy" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxColumnsInSelect" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getMaxUserNameLength" );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsResultSetType" );
@@ -1124,7 +1124,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType )
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsResultSetConcurrency" );
@@ -1138,67 +1138,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownUpdatesAreVisible" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownDeletesAreVisible" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::ownInsertsAreVisible" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersUpdatesAreVisible" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersDeletesAreVisible" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::othersInsertsAreVisible" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::updatesAreDetected" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::deletesAreDetected" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::insertsAreDetected" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::supportsBatchUpdates" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ODatabaseMetaData::getUDTs" );
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index 447037f8fa2a..f6bfca8af207 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -25,7 +25,7 @@
 
 using namespace connectivity;
 using namespace connectivity::file;
-//------------------------------------------------------------------
+
 ORowSetValue OOp_DayOfWeek::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -63,7 +63,7 @@ ORowSetValue OOp_DayOfWeek::operate(const ORowSetValue& lhs) const
     }
     return nRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_DayOfMonth::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -72,7 +72,7 @@ ORowSetValue OOp_DayOfMonth::operate(const ORowSetValue& lhs) const
     ::com::sun::star::util::Date aD = lhs;
     return static_cast<sal_Int16>(aD.Day);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_DayOfYear::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -82,7 +82,7 @@ ORowSetValue OOp_DayOfYear::operate(const ORowSetValue& lhs) const
     Date aDate(aD.Day,aD.Month,aD.Year);
     return static_cast<sal_Int16>(aDate.GetDayOfYear());
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Month::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -91,7 +91,7 @@ ORowSetValue OOp_Month::operate(const ORowSetValue& lhs) const
     ::com::sun::star::util::Date aD = lhs;
     return static_cast<sal_Int16>(aD.Month);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -129,7 +129,7 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
     }
     return sRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -178,7 +178,7 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
     }
     return sRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Quarter::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -194,7 +194,7 @@ ORowSetValue OOp_Quarter::operate(const ORowSetValue& lhs) const
         nRet = 4;
     return nRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Week::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     if ( lhs.empty() || lhs.size() > 2 )
@@ -211,7 +211,7 @@ ORowSetValue OOp_Week::operate(const ::std::vector<ORowSetValue>& lhs) const
 
     return static_cast<sal_Int16>(aDate.GetWeekOfYear(static_cast<DayOfWeek>(nStartDay)));
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Year::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -220,7 +220,7 @@ ORowSetValue OOp_Year::operate(const ORowSetValue& lhs) const
     ::com::sun::star::util::Date aD = lhs;
     return static_cast<sal_Int16>(aD.Year);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Hour::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -229,7 +229,7 @@ ORowSetValue OOp_Hour::operate(const ORowSetValue& lhs) const
     ::com::sun::star::util::Time aT = lhs;
     return static_cast<sal_Int16>(aT.Hours);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Minute::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -238,7 +238,7 @@ ORowSetValue OOp_Minute::operate(const ORowSetValue& lhs) const
     ::com::sun::star::util::Time aT = lhs;
     return static_cast<sal_Int16>(aT.Minutes);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -247,7 +247,7 @@ ORowSetValue OOp_Second::operate(const ORowSetValue& lhs) const
     ::com::sun::star::util::Time aT = lhs;
     return static_cast<sal_Int16>(aT.Seconds);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_CurDate::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     if ( !lhs.empty() )
@@ -256,7 +256,7 @@ ORowSetValue OOp_CurDate::operate(const ::std::vector<ORowSetValue>& lhs) const
     Date aCurDate( Date::SYSTEM );
     return ::com::sun::star::util::Date(aCurDate.GetDay(),aCurDate.GetMonth(),aCurDate.GetYear());
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_CurTime::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     if ( !lhs.empty() )
@@ -267,7 +267,7 @@ ORowSetValue OOp_CurTime::operate(const ::std::vector<ORowSetValue>& lhs) const
             aCurTime.GetSec(), aCurTime.GetMin(), aCurTime.GetHour(),
             false);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Now::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     if ( !lhs.empty() )
@@ -279,6 +279,6 @@ ORowSetValue OOp_Now::operate(const ::std::vector<ORowSetValue>& lhs) const
             aCurTime.GetDay(), aCurTime.GetMonth(), aCurTime.GetYear(),
             false);
 }
-//------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 6bb859620124..2d8ef7cb2298 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -35,14 +35,14 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
-// --------------------------------------------------------------------------------
+
 OFileDriver::OFileDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
     : ODriver_BASE(m_aMutex)
     ,m_xContext(_rxContext)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::OFileDriver" );
 }
-// --------------------------------------------------------------------------------
+
 void OFileDriver::disposing()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::disposing" );
@@ -61,12 +61,12 @@ void OFileDriver::disposing()
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString OFileDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.sdbc.driver.file.Driver");
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< OUString > aSNS( 2 );
@@ -75,7 +75,7 @@ Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (Run
     return aSNS;
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL OFileDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -86,13 +86,13 @@ sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName )
     return cppu::supportsService(this, _rServiceName);
 }
 
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::connect" );
@@ -106,14 +106,14 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, con
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url )
                 throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::acceptsURL" );
     return url.startsWith("sdbc:file:");
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getPropertyInfo" );
@@ -176,20 +176,20 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt
     } // if ( ! acceptsURL(url) )
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OFileDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getMajorVersion" );
     return 1;
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OFileDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getMinorVersion" );
     return 0;
 }
-// --------------------------------------------------------------------------------
-// --------------------------------------------------------------------------------
+
+
 // XDataDefinitionSupplier
 Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< ::com::sun::star::sdbc::XConnection >& connection ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -218,7 +218,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
     return xTab;
 }
 
-// --------------------------------------------------------------------------------
+
 Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileDriver::getDataDefinitionByURL" );
@@ -231,13 +231,13 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const
     return getDataDefinitionByConnection(connect(url,info));
 }
 
-// -----------------------------------------------------------------------------
+
 OOperandAttr::OOperandAttr(sal_uInt16 _nPos,const Reference< XPropertySet>& _xColumn)
     : OOperandRow(_nPos,::comphelper::getINT32(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))))
     , m_xColumn(_xColumn)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index d91a5dddffbc..d456654d480c 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -28,7 +28,7 @@
 
 using namespace connectivity;
 using namespace connectivity::file;
-// -----------------------------------------------------------------------------
+
 void OFileCatalog::refreshViews()
 {}
 void OFileCatalog::refreshGroups()
@@ -36,7 +36,7 @@ void OFileCatalog::refreshGroups()
 void OFileCatalog::refreshUsers()
 {
 }
-// -----------------------------------------------------------------------------
+
 OPredicateInterpreter::~OPredicateInterpreter()
 {
     while(!m_aStack.empty())
@@ -46,7 +46,7 @@ OPredicateInterpreter::~OPredicateInterpreter()
     }
     //  m_aStack.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OPredicateCompiler::Clean()
 {
     for(OCodeList::reverse_iterator aIter = m_aCodeList.rbegin(); aIter != m_aCodeList.rend();++aIter)
@@ -55,7 +55,7 @@ void OPredicateCompiler::Clean()
     }
     m_aCodeList.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
 {
     OCodeList& rCodeList    = m_aCompiler->m_aCodeList;
@@ -66,7 +66,7 @@ void OSQLAnalyzer::bindParameterRow(OValueRefRow& _pRow)
             pParam->bindValue(_pRow);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::scanParameter" );
@@ -87,7 +87,7 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
-// -----------------------------------------------------------------------------
+
 OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::GetOrderbyKeyValue" );
@@ -104,6 +104,6 @@ OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow)
 
     return pKeyValue;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index e4871a31ee72..99710645fc51 100644
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -24,7 +24,7 @@
 
 using namespace connectivity;
 using namespace connectivity::file;
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Abs::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -35,7 +35,7 @@ ORowSetValue OOp_Abs::operate(const ORowSetValue& lhs) const
         nVal *= -1.0;
     return fabs(nVal);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Sign::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -50,7 +50,7 @@ ORowSetValue OOp_Sign::operate(const ORowSetValue& lhs) const
 
     return nRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Mod::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
 {
     if ( lhs.isNull() || rhs.isNull() )
@@ -58,7 +58,7 @@ ORowSetValue OOp_Mod::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) c
 
     return fmod((double)lhs,(double)rhs);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Floor::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -66,7 +66,7 @@ ORowSetValue OOp_Floor::operate(const ORowSetValue& lhs) const
 
     return floor((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Ceiling::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -75,7 +75,7 @@ ORowSetValue OOp_Ceiling::operate(const ORowSetValue& lhs) const
     double nVal(lhs);
     return ceil(nVal);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Round::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     if ( lhs.empty() || lhs.size() > 2 )
@@ -89,7 +89,7 @@ ORowSetValue OOp_Round::operate(const ::std::vector<ORowSetValue>& lhs) const
         nDec = lhs[0];
     return ::rtl::math::round(nVal,nDec);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Exp::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -98,7 +98,7 @@ ORowSetValue OOp_Exp::operate(const ORowSetValue& lhs) const
     double nVal(lhs);
     return exp(nVal);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Ln::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() || static_cast<double>(lhs) < 0.0 )
@@ -110,7 +110,7 @@ ORowSetValue OOp_Ln::operate(const ORowSetValue& lhs) const
         return ORowSetValue();
     return nVal;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Log::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     if ( lhs.empty() || lhs.size() > 2 )
@@ -126,7 +126,7 @@ ORowSetValue OOp_Log::operate(const ::std::vector<ORowSetValue>& lhs) const
         return ORowSetValue();
     return nVal;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Log10::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() || static_cast<double>(lhs) < 0.0 )
@@ -138,7 +138,7 @@ ORowSetValue OOp_Log10::operate(const ORowSetValue& lhs) const
     nVal /= log(10.0);
     return nVal;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Pow::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
 {
     if ( lhs.isNull() || rhs.isNull() )
@@ -146,7 +146,7 @@ ORowSetValue OOp_Pow::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) c
 
     return pow((double)lhs,(double)rhs);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Sqrt::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -157,12 +157,12 @@ ORowSetValue OOp_Sqrt::operate(const ORowSetValue& lhs) const
         return ORowSetValue();
     return nVal;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Pi::operate(const ::std::vector<ORowSetValue>& /*lhs*/) const
 {
     return 3.141592653589793116;
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Cos::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -170,7 +170,7 @@ ORowSetValue OOp_Cos::operate(const ORowSetValue& lhs) const
 
     return cos((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Sin::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -178,7 +178,7 @@ ORowSetValue OOp_Sin::operate(const ORowSetValue& lhs) const
 
     return sin((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Tan::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -186,7 +186,7 @@ ORowSetValue OOp_Tan::operate(const ORowSetValue& lhs) const
 
     return tan((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_ACos::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -194,7 +194,7 @@ ORowSetValue OOp_ACos::operate(const ORowSetValue& lhs) const
 
     return acos((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_ASin::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -202,7 +202,7 @@ ORowSetValue OOp_ASin::operate(const ORowSetValue& lhs) const
 
     return asin((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_ATan::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -210,7 +210,7 @@ ORowSetValue OOp_ATan::operate(const ORowSetValue& lhs) const
 
     return atan((double)lhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_ATan2::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
 {
     if ( lhs.isNull() || rhs.isNull() )
@@ -218,7 +218,7 @@ ORowSetValue OOp_ATan2::operate(const ORowSetValue& lhs,const ORowSetValue& rhs)
 
     return atan2((double)lhs,(double)rhs);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Degrees::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -227,7 +227,7 @@ ORowSetValue OOp_Degrees::operate(const ORowSetValue& lhs) const
     double nLhs = lhs;
     return nLhs*180*(1.0/3.141592653589793116);
 }
-// -----------------------------------------------------------------------------
+
 ORowSetValue OOp_Radians::operate(const ORowSetValue& lhs) const
 {
     if ( lhs.isNull() )
@@ -236,6 +236,6 @@ ORowSetValue OOp_Radians::operate(const ORowSetValue& lhs) const
     double nLhs = lhs;
     return nLhs*3.141592653589793116*(1.0/180.0);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index f24748369d42..2fa3a21e2a4a 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -52,7 +52,7 @@ using namespace com::sun::star;
 IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbc.driver.file.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
 DBG_NAME( file_OPreparedStatement )
-// -------------------------------------------------------------------------
+
 OPreparedStatement::OPreparedStatement( OConnection* _pConnection)
     : OStatement_BASE2( _pConnection )
 {
@@ -60,14 +60,14 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection)
     DBG_CTOR( file_OPreparedStatement, NULL );
 }
 
-// -------------------------------------------------------------------------
+
 OPreparedStatement::~OPreparedStatement()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::~OPreparedStatement" );
     DBG_DTOR( file_OPreparedStatement, NULL );
 }
 
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::disposing()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::disposing" );
@@ -83,7 +83,7 @@ void OPreparedStatement::disposing()
         m_aParameterRow = NULL;
     }
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::construct(const OUString& sql)  throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::construct" );
@@ -116,7 +116,7 @@ Reference<XResultSet> OPreparedStatement::makeResultSet()
     return xRS;
 }
 
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
@@ -126,7 +126,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
                                         static_cast< XParameters*>(this),
                                         static_cast< XResultSetMetaDataSupplier*>(this));
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
         ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
@@ -135,7 +135,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -148,7 +148,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
         m_xMetaData = new OResultSetMetaData(m_aSQLIterator.getSelectColumns(),m_aSQLIterator.getTables().begin()->first,m_pTable);
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException)
 {
@@ -156,7 +156,7 @@ void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
 {
@@ -173,7 +173,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
 
     return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
 {
@@ -196,14 +196,14 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
     else
         return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setString" );
     setParameter(parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -213,7 +213,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
@@ -223,40 +223,40 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
 
     return makeResultSet();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBoolean" );
     setParameter(parameterIndex,static_cast<bool>(x));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setByte" );
     setParameter(parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setDate" );
     setParameter(parameterIndex,DBTypeConversion::toDouble(aData));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setTime" );
     setParameter(parameterIndex,DBTypeConversion::toDouble(aVal));
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setTimestamp" );
     setParameter(parameterIndex,DBTypeConversion::toDouble(aVal));
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
 {
@@ -264,28 +264,28 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x
     setParameter(parameterIndex,x);
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setFloat" );
     setParameter(parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setInt" );
     setParameter(parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setLong" );
     throwFeatureNotImplementedException( "XParameters::setLong", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException)
 {
@@ -298,35 +298,35 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
     else
         (m_aParameterRow->get())[parameterIndex]->setNull();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setClob" );
     throwFeatureNotImplementedException( "XParameters::setClob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBlob" );
     throwFeatureNotImplementedException( "XParameters::setBlob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setArray" );
     throwFeatureNotImplementedException( "XParameters::setArray", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setRef" );
     throwFeatureNotImplementedException( "XParameters::setRef", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
@@ -342,14 +342,14 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
             break;
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setObjectNull" );
     setNull(parameterIndex,sqlType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
@@ -364,21 +364,21 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
     }
     //  setObject (parameterIndex, x, sqlType, 0);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setShort" );
     setParameter(parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setBytes" );
     setParameter(parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
@@ -386,7 +386,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setCharacterStream" );
     setBinaryStream(parameterIndex,x,length );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -398,7 +398,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
     x->readBytes(aSeq,length);
     setParameter(parameterIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
@@ -409,13 +409,13 @@ void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, Runtim
     m_aParameterRow->get().clear();
     m_aParameterRow->get().push_back(new ORowSetValueDecorator(sal_Int32(0)) );
 }
-// -------------------------------------------------------------------------
+
 OResultSet* OPreparedStatement::createResultSet()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::createResultSet" );
     return new OResultSet(this,m_aSQLIterator);
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::initResultSet(OResultSet *pResultSet)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::initResultSet" );
@@ -428,17 +428,17 @@ void OPreparedStatement::initResultSet(OResultSet *pResultSet)
     pResultSet->OpenImpl();
     pResultSet->setMetaData(getMetaData());
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::checkAndResizeParameters" );
@@ -456,7 +456,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::setParameter" );
@@ -468,7 +468,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal
     else
         *((m_aParameterRow->get())[parameterIndex]) = x;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::AddParameter" );
@@ -516,7 +516,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
     m_xParamColumns->get().push_back(xParaColumn);
     return m_xParamColumns->get().size();
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::describeColumn" );
@@ -536,7 +536,7 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode
     //  else
         //  AddParameter(_pParameter,xProp);
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::describeParameter()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::describeParameter" );
@@ -557,7 +557,7 @@ void OPreparedStatement::describeParameter()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::initializeResultSet(OResultSet* pRS)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::initializeResultSet" );
@@ -598,7 +598,7 @@ void OPreparedStatement::initializeResultSet(OResultSet* pRS)
             m_pSQLAnalyzer->bindParameterRow(m_aParameterRow);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLParseNode* pRow_Value_Constructor_Elem)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OPreparedStatement::parseParamterElem" );
@@ -616,7 +616,7 @@ void OPreparedStatement::parseParamterElem(const OUString& _sColumnName, OSQLPar
     // Save number of parameter in the variable:
     SetAssignValue(_sColumnName, OUString(), sal_True, nParameter);
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index add766d87e25..9d7f9dc93f7b 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -71,10 +71,10 @@ namespace
         ::dbtools::throwGenericSQLException(sMessage ,_xContext);
     }
 }
-//------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.drivers.file.ResultSet","com.sun.star.sdbc.ResultSet");
 DBG_NAME( file_OResultSet )
-// -------------------------------------------------------------------------
+
 OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator&    _aSQLIterator) :    OResultSet_BASE(m_aMutex)
                         ,::comphelper::OPropertyContainer(OResultSet_BASE::rBHelper)
                         ,m_aAssignValues(NULL)
@@ -126,7 +126,7 @@ OResultSet::OResultSet(OStatement_Base* pStmt,OSQLParseTreeIterator&    _aSQLIte
     osl_atomic_decrement( &m_refCount );
 }
 
-// -------------------------------------------------------------------------
+
 OResultSet::~OResultSet()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::~OResultSet" );
@@ -134,7 +134,7 @@ OResultSet::~OResultSet()
     disposing();
     DBG_DTOR( file_OResultSet, NULL );
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::construct()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::construct" );
@@ -143,7 +143,7 @@ void OResultSet::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 OResultSet::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::disposing" );
@@ -175,14 +175,14 @@ void OResultSet::disposing(void)
 
     m_aSkipDeletedSet.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::queryInterface" );
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OResultSet::getTypes(  ) throw(RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTypes" );
@@ -194,7 +194,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -217,7 +217,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
     assert(false);
     return 0; // Never reached
 }
-// -----------------------------------------------------------------------------
+
 const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getValue" );
@@ -230,7 +230,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex ) throw(::com::su
     m_bWasNull = (m_aSelectRow->get())[columnIndex]->getValue().isNull();
     return *(m_aSelectRow->get())[columnIndex];
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::checkIndex" );
@@ -238,68 +238,68 @@ void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc
             || columnIndex >= m_nColumnCount )
         ::dbtools::throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBinaryStream" );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getCharacterStream" );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBoolean" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getByte" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBytes" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDate" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDouble" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getFloat" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getInt" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
@@ -311,14 +311,14 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 
     return m_aSkipDeletedSet.getMappedPosition((m_aRow->get())[0]->getValue());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getLong" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -331,66 +331,66 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
         m_xMetaData = new OResultSetMetaData(m_xColumns,m_aSQLIterator.getTables().begin()->first,m_pTable);
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getArray" );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getClob" );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getBlob" );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getRef" );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getObject" );
     return getValue(columnIndex).makeAny();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getShort" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getString" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTime" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getTimestamp" );
     return getValue(columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
@@ -401,7 +401,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
 
     return m_nRowPos == sal_Int32(m_pFileSet->get().size());
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isFirst" );
@@ -411,7 +411,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 
     return m_nRowPos == 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isLast" );
@@ -421,7 +421,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 
     return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::beforeFirst" );
@@ -432,7 +432,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
     if(first())
         previous();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::afterLast" );
@@ -444,14 +444,14 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
         next();
     m_bEOF = sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::close" );
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -460,7 +460,7 @@ sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::FIRST,1,sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -470,7 +470,7 @@ sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::absolute" );
@@ -478,7 +478,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE,row,sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::relative" );
@@ -486,7 +486,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE,row,sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::previous" );
@@ -494,7 +494,7 @@ sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getStatement" );
@@ -504,7 +504,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
 
     return m_xStatement;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -515,7 +515,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
 
     return m_bRowDeleted;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {   ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -523,7 +523,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
 
     return m_bRowInserted;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::rowInserted" );
@@ -533,7 +533,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 
     return m_bRowUpdated;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -544,7 +544,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
 
     return m_nRowPos == -1;
 }
-// -------------------------------------------------------------------------
+
 // sal_Bool OResultSet::evaluate()
 // {
 //     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::evaluate" );
@@ -576,7 +576,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
 
 //     return bRet;
 // }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -586,7 +586,7 @@ sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 
     return m_pTable ? m_aSkipDeletedSet.skipDeleted(IResultSetHelper::NEXT,1,sal_True) : sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -596,24 +596,24 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::cancel" );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::clearWarnings" );
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getWarnings" );
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::insertRow" );
@@ -638,7 +638,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
         m_aSkipDeletedSet.insertNewPosition((m_aRow->get())[0]->getValue());
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateRow" );
@@ -653,7 +653,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
 
     clearInsertRow();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::deleteRow" );
@@ -677,7 +677,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException)
         m_aSkipDeletedSet.deletePosition(nPos);
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::cancelRowUpdates" );
@@ -700,7 +700,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeExcept
         }
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
@@ -720,13 +720,13 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
         (*aIter)->setNull();
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::moveToCurrentRow" );
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateValue" );
@@ -739,7 +739,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
     (m_aInsertRow->get())[columnIndex]->setBound(true);
     *(m_aInsertRow->get())[columnIndex] = x;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -747,84 +747,84 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
     ORowSetValue aEmpty;
     updateValue(columnIndex,aEmpty);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBoolean" );
     updateValue(columnIndex, static_cast<bool>(x));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateByte" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateShort" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateInt" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateLong" );
     ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this );
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateFloat" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateDouble" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateString" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateBytes" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateDate" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateTime" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateTimestamp" );
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -839,27 +839,27 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     x->readBytes(aSeq,length);
     updateValue(columnIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateCharacterStream" );
     updateBinaryStream(columnIndex,x,length);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::refreshRow" );
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::updateObject" );
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
@@ -867,7 +867,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::createArrayHelper" );
@@ -875,14 +875,14 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getInfoHelper" );
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OResultSet::ExecuteRow(IResultSetHelper::Movement eFirstCursorPosition,
                                sal_Int32 nFirstOffset,
                                sal_Bool bEvaluate,
@@ -1020,7 +1020,7 @@ again:
     return sal_True;
 }
 
-//-------------------------------------------------------------------
+
 sal_Bool OResultSet::Move(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Bool bRetrieveData)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::Move" );
@@ -1229,7 +1229,7 @@ Error:
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::sortRows()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::sortRows" );
@@ -1336,7 +1336,7 @@ void OResultSet::sortRows()
 }
 
 
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::OpenImpl()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::OpenImpl" );
@@ -1598,7 +1598,7 @@ sal_Bool OResultSet::OpenImpl()
 
     return sal_True;
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getUnoTunnelImplementationId" );
@@ -1616,7 +1616,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getSomething" );
@@ -1624,7 +1624,7 @@ sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
                 ? reinterpret_cast< sal_Int64 >( this )
                 : 0;
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                                    const OValueRefRow& _rSelectRow,
                                    const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
@@ -1743,23 +1743,23 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getPropertySetInfo" );
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::doTableSpecials(const OSQLTable& _xTable)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::doTableSpecials" );
@@ -1771,7 +1771,7 @@ void OResultSet::doTableSpecials(const OSQLTable& _xTable)
             m_pTable->acquire();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::clearInsertRow()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::clearInsertRow" );
@@ -1790,7 +1790,7 @@ void OResultSet::clearInsertRow()
         rValue->setNull();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::initializeRow" );
@@ -1801,37 +1801,37 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount)
         ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(false));
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::fillIndexValues(const Reference< XColumnsSupplier> &/*_xIndex*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::fillIndexValues" );
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::move" );
     return Move(_eCursorPosition,_nOffset,_bRetrieveData);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getDriverPos() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::getDriverPos" );
     return (m_aRow->get())[0]->getValue();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::deletedVisible() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::deletedVisible" );
     return m_bShowDeleted;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::isRowDeleted() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::isRowDeleted" );
     return m_aRow->isDeleted();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSet::disposing" );
@@ -1842,6 +1842,6 @@ void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeE
         m_pTable = NULL;
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 3e33222b6b05..4f0d493f3b01 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const OUString& _aTableName,OFileTable* _pTable)
     :m_aTableName(_aTableName)
     ,m_xColumns(_rxColumns)
@@ -44,25 +44,25 @@ OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQL
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::OResultSetMetaData" );
 }
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
     m_xColumns = NULL;
 }
-// -----------------------------------------------------------------------------
+
 void OResultSetMetaData::checkColumnIndex(sal_Int32 column)  throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::checkColumnIndex" );
     if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size())
         throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnDisplaySize" );
     return getPrecision(column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -70,28 +70,28 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(S
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnCount" );
     return (m_xColumns->get()).size();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isCaseSensitive" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getSchemaName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -101,38 +101,38 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
     Any aName((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
     return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getTableName" );
     return m_aTableName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getCatalogName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnTypeName" );
     checkColumnIndex(column);
     return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnLabel" );
     return getColumnName(column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getColumnServiceName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -140,34 +140,34 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx
     checkColumnIndex(column);
     return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isAutoIncrement" );
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isSigned" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getPrecision" );
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::getScale" );
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -175,14 +175,14 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isSearchable" );
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -192,19 +192,19 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
                             (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) &&
                                 ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isDefinitelyWritable" );
     return !isReadOnly(column);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OResultSetMetaData::isWritable" );
     return !isReadOnly(column);
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 984a806c6636..8fb975f65d3f 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -42,7 +42,7 @@ namespace connectivity
     namespace file
     {
 
-//------------------------------------------------------------------------------
+
 using namespace dbtools;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -52,7 +52,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 DBG_NAME( file_OStatement_Base )
 
-//------------------------------------------------------------------------------
+
 OStatement_Base::OStatement_Base(OConnection* _pConnection )
     :OStatement_BASE(m_aMutex)
     ,::comphelper::OPropertyContainer(OStatement_BASE::rBHelper)
@@ -92,7 +92,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
 
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RESULTSETCONCURRENCY),        PROPERTY_ID_RESULTSETCONCURRENCY,   nAttrib,&m_nResultSetConcurrency,       ::getCppuType(static_cast<sal_Int32*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 OStatement_Base::~OStatement_Base()
 {
     osl_atomic_increment( &m_refCount );
@@ -101,7 +101,7 @@ OStatement_Base::~OStatement_Base()
 
     DBG_DTOR( file_OStatement_Base, NULL );
 }
-//------------------------------------------------------------------------------
+
 void OStatement_BASE2::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -139,24 +139,24 @@ void OStatement_BASE2::disposing()
 
     OStatement_Base::disposing();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::acquire() throw()
 {
     OStatement_BASE::acquire();
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_BASE2::release() throw()
 {
     relase_ChildImpl();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::queryInterface" );
     const Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getTypes" );
@@ -166,13 +166,13 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::cancel" );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 {
@@ -183,7 +183,7 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 void OStatement_Base::reset() throw (SQLException)
 {
@@ -195,7 +195,7 @@ void OStatement_Base::reset() throw (SQLException)
 
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getWarnings" );
@@ -204,7 +204,7 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::clearWarnings" );
@@ -213,7 +213,7 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::createArrayHelper" );
@@ -222,31 +222,31 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
     //SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getInfoHelper" );
     return *const_cast<OStatement_Base*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 OResultSet* OStatement::createResultSet()
 {
     return new OResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbc.driver.file.Statement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -256,7 +256,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException,
     return m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -273,12 +273,12 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql )
 
     return xRS;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -294,7 +294,7 @@ sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLExc
     return pResult->getRowCountResult();
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::disposing" );
@@ -306,25 +306,25 @@ void SAL_CALL OStatement_Base::disposing(void)
     delete m_pEvaluationKeySet;
     OStatement_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::getPropertySetInfo" );
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatement_XStatement::queryInterface( rType);
     return aRet.hasValue() ? aRet : OStatement_BASE2::queryInterface( rType);
 }
-// -----------------------------------------------------------------------------
+
 OSQLAnalyzer* OStatement_Base::createAnalyzer()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::createAnalyzer" );
     return new OSQLAnalyzer(m_pConnection);
 }
-// -----------------------------------------------------------------------------
+
 void OStatement_Base::anylizeSQL()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::anylizeSQL" );
@@ -355,7 +355,7 @@ void OStatement_Base::anylizeSQL()
         }
     }
 }
-//------------------------------------------------------------------
+
 void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
                                         OSQLParseNode* pAscendingDescending)
 {
@@ -388,7 +388,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
     m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC);
 }
 
-// -----------------------------------------------------------------------------
+
 void OStatement_Base::construct(const OUString& sql)  throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::construct" );
@@ -467,7 +467,7 @@ void OStatement_Base::construct(const OUString& sql)  throw(SQLException, Runtim
     else
         throw SQLException(aErr,*this,OUString(),0,Any());
 }
-// -----------------------------------------------------------------------------
+
 void OStatement_Base::createColumnMapping()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::createColumnMapping" );
@@ -481,7 +481,7 @@ void OStatement_Base::createColumnMapping()
     // now check which columns are bound
     OResultSet::setBoundedColumns(m_aRow,m_aSelectRow,xColumns,xNames,sal_True,m_xDBMetaData,m_aColMapping);
 }
-// -----------------------------------------------------------------------------
+
 void OStatement_Base::initializeResultSet(OResultSet* _pResult)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::initializeResultSet" );
@@ -500,7 +500,7 @@ void OStatement_Base::initializeResultSet(OResultSet* _pResult)
     m_pEvaluationKeySet = m_pSQLAnalyzer->bindEvaluationRow(m_aEvaluateRow);    // Set values in the code of the Compiler
     _pResult->setEvaluationKeySet(m_pEvaluationKeySet);
 }
-// -----------------------------------------------------------------------------
+
 void OStatement_Base::GetAssignValues()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::GetAssignValues" );
@@ -648,7 +648,7 @@ void OStatement_Base::GetAssignValues()
 
     }
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnNameList,OSQLParseNode* pRow_Value_Constructor_Elem, sal_Int32 nIndex)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::ParseAssignValues" );
@@ -676,7 +676,7 @@ void OStatement_Base::ParseAssignValues(const ::std::vector< OUString>& aColumnN
         throwFunctionSequenceException(*this);
     }
 }
-//------------------------------------------------------------------
+
 void OStatement_Base::SetAssignValue(const OUString& aColumnName,
                                      const OUString& aValue,
                                      sal_Bool bSetNull,
@@ -742,7 +742,7 @@ void OStatement_Base::SetAssignValue(const OUString& aColumnName,
     if(nParameter != SQL_NO_PARAMETER)
         m_aParameterIndexes[nParameter] = nId;
 }
-// -----------------------------------------------------------------------------
+
 void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLParseNode* /*pRow_Value_Constructor_Elem*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::parseParamterElem" );
@@ -752,6 +752,6 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar
     } // namespace file
 // =============================================================================
 }// namespace connectivity
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index a5cf7ce486ce..9459545669ab 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -23,7 +23,7 @@
 
 using namespace connectivity;
 using namespace connectivity::file;
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Upper::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Upper::operate" );
@@ -32,7 +32,7 @@ ORowSetValue OOp_Upper::operate(const ORowSetValue& lhs) const
 
     return lhs.getString().toAsciiUpperCase();
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Lower::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Lower::operate" );
@@ -41,7 +41,7 @@ ORowSetValue OOp_Lower::operate(const ORowSetValue& lhs) const
 
     return lhs.getString().toAsciiLowerCase();
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Ascii::operate" );
@@ -51,7 +51,7 @@ ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const
     sal_Int32 nAscii = sStr.toChar();
     return nAscii;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_CharLength::operate" );
@@ -60,7 +60,7 @@ ORowSetValue OOp_CharLength::operate(const ORowSetValue& lhs) const
 
     return lhs.getString().getLength();
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Char::operate" );
@@ -82,7 +82,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
 
     return sRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Concat::operate" );
@@ -102,7 +102,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const
 
     return sRet.makeStringAndClear();
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Locate::operate" );
@@ -121,7 +121,7 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
 
     return lhs[1].getString().indexOf(lhs[2].getString(),lhs[0]) + 1;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_SubString::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_SubString::operate" );
@@ -140,7 +140,7 @@ ORowSetValue OOp_SubString::operate(const ::std::vector<ORowSetValue>& lhs) cons
 
     return lhs[2].getString().copy(static_cast<sal_Int32>(lhs[1])-1,lhs[0]);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_LTrim::operate" );
@@ -151,7 +151,7 @@ ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
     OUString sNew = sRet.trim();
     return sRet.copy(sRet.indexOf(sNew));
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_RTrim::operate" );
@@ -162,7 +162,7 @@ ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const
     OUString sNew = sRet.trim();
     return sRet.copy(0,sRet.lastIndexOf(sNew[sNew.getLength()-1])+1);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Space::operate" );
@@ -178,7 +178,7 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
     }
     return sRet.makeStringAndClear();
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Replace::operate" );
@@ -197,7 +197,7 @@ ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const
 
     return sStr;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Repeat::operate" );
@@ -212,7 +212,7 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs
     }
     return sRet;
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Insert::operate" );
@@ -226,7 +226,7 @@ ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const
         nStart = 1;
     return sStr.replaceAt(nStart-1,static_cast<sal_Int32>(lhs[1]),lhs[0]);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Left::operate" );
@@ -239,7 +239,7 @@ ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs)
         return ORowSetValue();
     return sRet.copy(0,nCount);
 }
-//------------------------------------------------------------------
+
 ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_Right::operate" );
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 7996bb678133..f687fd4ea625 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -52,7 +52,7 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
     construct();
     m_aColumns = new OSQLColumns();
 }
-// -------------------------------------------------------------------------
+
 OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
                         const OUString& _Name,
                         const OUString& _Type,
@@ -78,12 +78,12 @@ OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
     construct();
     //  refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 OFileTable::~OFileTable( )
 {
     DBG_DTOR( file_OFileTable, NULL );
 }
-// -------------------------------------------------------------------------
+
 void OFileTable::refreshColumns()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshColumns" );
@@ -103,17 +103,17 @@ void OFileTable::refreshColumns()
     else
         m_pColumns  = new OColumns(this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OFileTable::refreshKeys()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshKeys" );
 }
-// -------------------------------------------------------------------------
+
 void OFileTable::refreshIndexes()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshIndexes" );
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::queryInterface" );
@@ -126,7 +126,7 @@ Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeExcep
 
     return OTable_TYPEDEF::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OFileTable::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::disposing" );
@@ -136,7 +136,7 @@ void SAL_CALL OFileTable::disposing(void)
 
     FileClose();
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::getUnoTunnelImplementationId" );
@@ -154,7 +154,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::getSomething" );
@@ -162,7 +162,7 @@ sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OTable_TYPEDEF::getSomething(rId);
 }
-// -----------------------------------------------------------------------------
+
 void OFileTable::FileClose()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::FileClose" );
@@ -180,48 +180,48 @@ void OFileTable::FileClose()
         m_pBuffer = NULL;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFileTable::acquire() throw()
 {
     OTable_TYPEDEF::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFileTable::release() throw()
 {
     OTable_TYPEDEF::release();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OFileTable::InsertRow(OValueRefVector& /*rRow*/, sal_Bool /*bFlush*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::InsertRow" );
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OFileTable::DeleteRow(const OSQLColumns& /*_rCols*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::DeleteRow" );
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OFileTable::UpdateRow(OValueRefVector& /*rRow*/, OValueRefRow& /*pOrgRow*/,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& /*_xCols*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::UpdateRow" );
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void OFileTable::addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& /*descriptor*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::addColumn" );
     OSL_FAIL( "OFileTable::addColumn: not implemented!" );
 }
-// -----------------------------------------------------------------------------
+
 void OFileTable::dropColumn(sal_Int32 /*_nPos*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::dropColumn" );
     OSL_FAIL( "OFileTable::addColumn: not implemented!" );
 }
 
-// -----------------------------------------------------------------------------
+
 SvStream* OFileTable::createStream_simpleError( const OUString& _rFileName, StreamMode _eOpenMode)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::createStream_simpleError" );
@@ -235,11 +235,11 @@ SvStream* OFileTable::createStream_simpleError( const OUString& _rFileName, Stre
     return pReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 void OFileTable::refreshHeader()
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OFileTable::refreshHeader" );
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index cba822e2bb0f..6b3f78251a3b 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -39,18 +39,18 @@ sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/)
 {
     return sdbcx::ObjectType();
 }
-// -------------------------------------------------------------------------
+
 void OTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OFileCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OTables::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-//------------------------------------------------------------------
+
 Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if( rType == ::getCppuType((const Reference<XColumnLocate>*)0) ||
@@ -62,6 +62,6 @@ Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeExceptio
     typedef sdbcx::OCollection OTables_BASE;
     return OTables_BASE::queryInterface(rType);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index d125c1eb5c9b..5c82068a0642 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
 DBG_NAME( file_OSQLAnalyzer )
-//------------------------------------------------------------------
+
 OSQLAnalyzer::OSQLAnalyzer(OConnection* _pConnection)
                :m_pConnection(_pConnection)
                ,m_bHasSelectionCode(sal_False)
@@ -46,18 +46,18 @@ OSQLAnalyzer::OSQLAnalyzer(OConnection* _pConnection)
     m_aInterpreter = new OPredicateInterpreter(m_aCompiler);
 }
 
-// -----------------------------------------------------------------------------
+
 OSQLAnalyzer::~OSQLAnalyzer()
 {
     DBG_DTOR( file_OSQLAnalyzer, NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLAnalyzer::setIndexes(const Reference< XNameAccess>& _xIndexes)
 {
     m_aCompiler->m_xIndexes = _xIndexes;
 }
-//------------------------------------------------------------------
+
 void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
 {
     if (SQL_ISRULE(pSQLParseNode,select_statement))
@@ -120,7 +120,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
     m_aCompiler->start(pSQLParseNode);
 }
 
-//------------------------------------------------------------------
+
 void OSQLAnalyzer::bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvaluateSetList& _rEvaluateSetList)
 {
     // count criteria
@@ -153,7 +153,7 @@ void OSQLAnalyzer::bindRow(OCodeList& rCodeList,const OValueRefRow& _pRow,OEvalu
         }
     }
 }
-//------------------------------------------------------------------
+
 void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
 {
     // first the select part
@@ -164,7 +164,7 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
             bindRow( aIter->first->m_aCodeList,_pRow,aEvaluateSetList);
     }
 }
-//------------------------------------------------------------------
+
 ::std::vector<sal_Int32>* OSQLAnalyzer::bindEvaluationRow(OValueRefRow& _pRow)
 {
     OEvaluateSetList    aEvaluateSetList;
@@ -203,19 +203,19 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow& _pRow)
     return pKeySet;
 }
 
-// -----------------------------------------------------------------------------
+
 OOperandAttr* OSQLAnalyzer::createOperandAttr(sal_Int32 _nPos,
                                               const Reference< XPropertySet>& _xCol,
                                               const Reference< XNameAccess>& /*_xIndexes*/)
 {
     return new OOperandAttr(static_cast<sal_uInt16>(_nPos),_xCol);
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OSQLAnalyzer::hasRestriction() const
 {
     return m_aCompiler->hasCode();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OSQLAnalyzer::hasFunctions() const
 {
     if ( m_bSelectionFirstTime )
@@ -229,7 +229,7 @@ sal_Bool OSQLAnalyzer::hasFunctions() const
     }
     return m_bHasSelectionCode;
 }
-// -----------------------------------------------------------------------------
+
 void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std::vector<sal_Int32>& _rColumnMapping)
 {
     sal_Int32 nPos = 1;
@@ -246,7 +246,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std:
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSQLAnalyzer::dispose()
 {
     m_aCompiler->dispose();
@@ -256,7 +256,7 @@ void OSQLAnalyzer::dispose()
             aIter->first->dispose();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSQLAnalyzer::setOrigColumns(const OFileColumns& rCols)
 {
     m_aCompiler->setOrigColumns(rCols);
@@ -266,6 +266,6 @@ void OSQLAnalyzer::setOrigColumns(const OFileColumns& rCols)
             aIter->first->setOrigColumns(rCols);
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index ba787a7cc8e4..9ce2d509a166 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -57,29 +57,29 @@ TYPEINIT1(ONthOperator, OOperator);
 TYPEINIT1(OBinaryOperator, OOperator);
 TYPEINIT1(OUnaryOperator, OOperator);
 
-//------------------------------------------------------------------
+
 DBG_NAME(OCode )
 OCode::OCode()
 {
     DBG_CTOR(OCode ,NULL);
 }
-// -----------------------------------------------------------------------------
+
 OCode::~OCode()
 {
     DBG_DTOR(OCode,NULL);
 }
 
-//------------------------------------------------------------------
+
 OEvaluateSet* OOperand::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 OOperandRow::OOperandRow(sal_uInt16 _nPos, sal_Int32 _rType)
     : OOperand(_rType)
     , m_nRowPos(_nPos)
 {}
-//------------------------------------------------------------------
+
 void OOperandRow::bindValue(const OValueRefRow& _pRow)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandRow::OOperandRow" );
@@ -88,14 +88,14 @@ void OOperandRow::bindValue(const OValueRefRow& _pRow)
     OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
     (m_pRow->get())[m_nRowPos]->setBound(true);
 }
-// -----------------------------------------------------------------------------
+
 void OOperandRow::setValue(const ORowSetValue& _rVal)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandRow::setValue" );
     OSL_ENSURE(m_pRow.is() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()");
     (*(m_pRow->get())[m_nRowPos]) = _rVal;
 }
-//------------------------------------------------------------------
+
 const ORowSetValue& OOperandRow::getValue() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandRow::getValue" );
@@ -103,18 +103,18 @@ const ORowSetValue& OOperandRow::getValue() const
     return (m_pRow->get())[m_nRowPos]->getValue();
 }
 
-// -----------------------------------------------------------------------------
+
 void OOperandValue::setValue(const ORowSetValue& _rVal)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandValue::setValue" );
     m_aValue = _rVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OOperandAttr::isIndexed() const
 {
     return sal_False;
 }
-//------------------------------------------------------------------
+
 OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos)
     : OOperandRow(static_cast<sal_uInt16>(_nPos), DataType::VARCHAR)         // Standard-Type
 {
@@ -144,14 +144,14 @@ OOperandParam::OOperandParam(OSQLParseNode* pNode, sal_Int32 _nPos)
 }
 
 
-//------------------------------------------------------------------
+
 const ORowSetValue& OOperandValue::getValue() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandValue::getValue" );
     return m_aValue;
 }
 
-//------------------------------------------------------------------
+
 OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aStrValue)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandConst::OOperandConst" );
@@ -192,10 +192,10 @@ OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aS
 /////////////////////////////////////////////////////////////////////////////////////////
 // Implementation of the operators
 
-//------------------------------------------------------------------
+
 sal_uInt16 OOperator::getRequestedOperands() const {return 2;}
 
-//------------------------------------------------------------------
+
 sal_Bool OBoolOperator::operate(const OOperand*, const OOperand*) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBoolOperator::operate" );
@@ -203,7 +203,7 @@ sal_Bool OBoolOperator::operate(const OOperand*, const OOperand*) const
 }
 
 
-//------------------------------------------------------------------
+
 void OBoolOperator::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBoolOperator::Exec" );
@@ -218,13 +218,13 @@ void OBoolOperator::Exec(OCodeStack& rCodeStack)
     if (IS_TYPE(OOperandResult,pRight))
         delete pRight;
 }
-//------------------------------------------------------------------
+
 sal_Bool OOp_NOT::operate(const OOperand* pLeft, const OOperand* ) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_AND::operate" );
     return !pLeft->isValid();
 }
-//------------------------------------------------------------------
+
 void OOp_NOT::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::Exec" );
@@ -235,35 +235,35 @@ void OOp_NOT::Exec(OCodeStack& rCodeStack)
     if (IS_TYPE(OOperandResult,pOperand))
         delete pOperand;
 }
-//------------------------------------------------------------------
+
 sal_uInt16 OOp_NOT::getRequestedOperands() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_NOT::getRequestedOperands" );
     return 1;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_AND::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_AND::operate" );
     return pLeft->isValid() && pRight->isValid();
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_OR::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_OR::operate" );
     return pLeft->isValid() || pRight->isValid();
 }
 
-//------------------------------------------------------------------
+
 sal_uInt16 OOp_ISNULL::getRequestedOperands() const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::getRequestedOperands" );
     return 1;
 }
 
-//------------------------------------------------------------------
+
 void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::Exec" );
@@ -275,20 +275,20 @@ void OOp_ISNULL::Exec(OCodeStack& rCodeStack)
         delete pOperand;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_ISNULL::operate(const OOperand* pOperand, const OOperand*) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::operate" );
     return pOperand->getValue().isNull();
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_ISNOTNULL::operate(const OOperand* pOperand, const OOperand*) const
 {
     return !OOp_ISNULL::operate(pOperand);
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ISNULL::operate" );
@@ -305,14 +305,14 @@ sal_Bool OOp_LIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
     return bMatch;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_NOTLIKE::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_NOTLIKE::operate" );
     return !OOp_LIKE::operate(pLeft, pRight);
 }
 
-//------------------------------------------------------------------
+
 sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_COMPARE::operate" );
@@ -383,7 +383,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 void ONumOperator::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ONumOperator::Exec" );
@@ -399,40 +399,40 @@ void ONumOperator::Exec(OCodeStack& rCodeStack)
     if (IS_TYPE(OOperandResult,pRight))
         delete pRight;
 }
-//------------------------------------------------------------------
+
 double OOp_ADD::operate(const double& fLeft,const double& fRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_ADD::operate" );
     return fLeft + fRight;
 }
 
-//------------------------------------------------------------------
+
 double OOp_SUB::operate(const double& fLeft,const double& fRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_SUB::operate" );
     return fLeft - fRight;
 }
 
-//------------------------------------------------------------------
+
 double OOp_MUL::operate(const double& fLeft,const double& fRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_MUL::operate" );
     return fLeft * fRight;
 }
 
-//------------------------------------------------------------------
+
 double OOp_DIV::operate(const double& fLeft,const double& fRight) const
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOp_DIV::operate" );
     return fLeft / fRight;
 }
-// -----------------------------------------------------------------------------
+
 OEvaluateSet* OOperandAttr::preProcess(OBoolOperator* /*pOp*/, OOperand* /*pRight*/)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OOperandAttr::preProcess" );
     return NULL;
 }
-//------------------------------------------------------------------
+
 void ONthOperator::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com ONthOperator::Exec" );
@@ -460,7 +460,7 @@ void ONthOperator::Exec(OCodeStack& rCodeStack)
             delete *aIter;
     }
 }
-//------------------------------------------------------------------
+
 void OBinaryOperator::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OBinaryOperator::Exec" );
@@ -478,7 +478,7 @@ void OBinaryOperator::Exec(OCodeStack& rCodeStack)
     if (IS_TYPE(OOperandResult,pLeft))
         delete pLeft;
 }
-//------------------------------------------------------------------
+
 void OUnaryOperator::Exec(OCodeStack& rCodeStack)
 {
     SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OUnaryOperator::Exec" );
@@ -490,7 +490,7 @@ void OUnaryOperator::Exec(OCodeStack& rCodeStack)
     if (IS_TYPE(OOperandResult,pOperand))
         delete pOperand;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 OUnaryOperator::getRequestedOperands() const {return 1;}
 
 
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 5b395aebcbe2..d48adc806dbb 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::container;
 using namespace com::sun::star;
 
 DBG_NAME(OPredicateCompiler)
-//------------------------------------------------------------------
+
 OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs)
                      : m_pAnalyzer(pAnalyzer)
                      , m_nParamCounter(0)
@@ -53,13 +53,13 @@ OPredicateCompiler::OPredicateCompiler(OSQLAnalyzer* pAnalyzer)//,OCursor& rCurs
     DBG_CTOR(OPredicateCompiler,NULL);
 }
 
-//------------------------------------------------------------------
+
 OPredicateCompiler::~OPredicateCompiler()
 {
     Clean();
     DBG_DTOR(OPredicateCompiler,NULL);
 }
-// -----------------------------------------------------------------------------
+
 void OPredicateCompiler::dispose()
 {
     Clean();
@@ -137,7 +137,7 @@ void OPredicateCompiler::start(OSQLParseNode* pSQLParseNode)
     }
 }
 
-//------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
 {
     OOperand* pOperand = NULL;
@@ -223,7 +223,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode)
     return pOperand;
 }
 
-//------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)  throw(SQLException, RuntimeException)
 {
     DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree");
@@ -271,7 +271,7 @@ OOperand* OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode)  th
     return NULL;
 }
 
-//------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
@@ -321,7 +321,7 @@ OOperand* OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(
 
     return NULL;
 }
-//------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
@@ -401,7 +401,7 @@ OOperand* OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) thr
 
     return NULL;
 }
-//------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
     DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree");
@@ -421,7 +421,7 @@ OOperand* OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) thro
 
     return NULL;
 }
-//------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException)
 {
     OOperand* pOperand = NULL;
@@ -575,7 +575,7 @@ sal_Bool OPredicateInterpreter::evaluate(OCodeList& rCodeList)
         delete pOperand;
     return bResult;
 }
-// -----------------------------------------------------------------------------
+
 void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueDecoratorRef& _rVal)
 {
     OCodeList::iterator aIter = rCodeList.begin();
@@ -601,7 +601,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD
     if (IS_TYPE(OOperandResult,pOperand))
         delete pOperand;
 }
-// -----------------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)   throw(SQLException, RuntimeException)
 {
     DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree");
@@ -618,7 +618,7 @@ OOperand* OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode)   thro
     m_aCodeList.push_back(pOperator);
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)    throw(SQLException, RuntimeException)
 {
     OOperator* pOperator = NULL;
@@ -906,7 +906,7 @@ OOperand* OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode)
     m_aCodeList.push_back(pOperator);
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 5cbe815f9e76..84b4f9fbe8c3 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -25,7 +25,7 @@ namespace connectivity
     //==================================================================
     //= QuotedTokenizedString
     //==================================================================
-    //------------------------------------------------------------------
+
     sal_Int32 QuotedTokenizedString::GetTokenCount( sal_Unicode cTok, sal_Unicode cStrDel ) const
     {
         SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com QuotedTokenizedString::GetTokenCount" );
@@ -84,7 +84,7 @@ namespace connectivity
         return nTokCount;
     }
 
-    //------------------------------------------------------------------
+
     OUString QuotedTokenizedString::GetTokenSpecial(sal_Int32& nStartPos, sal_Unicode cTok, sal_Unicode cStrDel) const
     {
         SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com QuotedTokenizedString::GetTokenCount" );
diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index ce5ef145cddf..41680747f0be 100644
--- a/connectivity/source/drivers/firebird/Connection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -548,7 +548,7 @@ sal_Bool SAL_CALL Connection::isClosed(  ) throw(SQLException, RuntimeException)
     // just simple -> we are close when we are disposed taht means someone called dispose(); (XComponent)
     return Connection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard( m_aMutex );
@@ -640,19 +640,19 @@ void SAL_CALL Connection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL Connection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     // when you collected some warnings -> return it
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL Connection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     // you should clear your collected warnings here
 }
-// --------------------------------------------------------------------------------
+
 // XDocumentEventListener
 void SAL_CALL Connection::documentEventOccured( const DocumentEvent& _Event )
                                                         throw(RuntimeException)
@@ -690,7 +690,7 @@ void SAL_CALL Connection::disposing(const EventObject& /*rSource*/)
     throw (RuntimeException)
 {
 }
-//--------------------------------------------------------------------
+
 void Connection::buildTypeInfo() throw( SQLException)
 {
     SAL_INFO("connectivity.firebird", "buildTypeInfo().");
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index fbc82ba3d7fb..ef7af338e849 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -211,14 +211,14 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException
 {
     return 31;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
@@ -367,24 +367,24 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames()
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
@@ -467,34 +467,34 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation()
     return TransactionIsolation::REPEATABLE_READ;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 31; // TODO: confirm
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
@@ -504,7 +504,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLExcep
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     return m_pConnection->isReadOnly();
@@ -519,12 +519,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLExceptio
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
@@ -547,17 +547,17 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLExcep
     return sal_False;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
@@ -572,52 +572,52 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, Ru
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
@@ -627,118 +627,118 @@ OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeExcepti
 {
     return m_pConnection->getConnectionURL();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     return 31;
@@ -767,55 +767,55 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(
     else
         return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     (void) setType;
@@ -834,12 +834,12 @@ uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection()
 {
     return (uno::Reference< XConnection >) m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 // here follow all methods which return a resultset
 // the first methods is an example implementation how to use this resultset
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     OSL_FAIL("Not implemented yet!");
@@ -1409,7 +1409,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -1423,7 +1423,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eProcedureColumns);
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
@@ -1436,7 +1436,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eProcedures);
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -1448,7 +1448,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eVersionColumns);
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -1463,7 +1463,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eExportedKeys);
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -1633,7 +1633,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
     sal_Bool nullable ) throw(SQLException, RuntimeException)
@@ -1715,7 +1715,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const OUString& primarySchema,
     const OUString& primaryTable, const Any& foreignCatalog,
@@ -1731,7 +1731,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCrossReference);
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
 {
     (void) catalog;
@@ -1742,7 +1742,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& cat
     // TODO implement
     return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eUDTs);
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index cd53fcb2f6f5..1379f8242bd4 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -431,7 +431,7 @@ void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 nIndex, const DateTime&
 
     setValue< ISC_TIMESTAMP >(nIndex, aISCTimestamp, SQL_TIMESTAMP);
 }
-// -------------------------------------------------------------------------
+
 
 // void OPreaparedStatement::set
 void OPreparedStatement::openBlobForWriting(isc_blob_handle& rBlobHandle, ISC_QUAD& rBlobId)
@@ -526,7 +526,7 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex,
     setValue< ISC_QUAD >(nParameterIndex, aBlobId, SQL_BLOB);
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException)
 {
@@ -536,7 +536,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException)
 {
@@ -546,7 +546,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
@@ -558,7 +558,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
     ::osl::MutexGuard aGuard( m_aMutex );
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException)
 {
@@ -569,7 +569,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
@@ -623,7 +623,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex,
 
     setValue< ISC_QUAD >(nParameterIndex, aBlobId, SQL_BLOB);
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
@@ -635,7 +635,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -646,7 +646,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
     checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
@@ -671,7 +671,7 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch()
     // Unsupported by firebird
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch(nHandle)
diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index a89e4609edd4..7e73cd8748b5 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -342,7 +342,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName)
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     (void) columnIndex;
@@ -351,7 +351,7 @@ uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 c
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     (void) columnIndex;
@@ -630,7 +630,7 @@ DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex)
     return safelyRetrieveValue< DateTime >(nIndex, SQL_TIMESTAMP);
 }
 
-// -------------------------------------------------------------------------
+
 uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_rMutex);
@@ -640,7 +640,7 @@ uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(
         m_xMetaData = new OResultSetMetaData(m_pConnection, m_pSqlda);
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     (void) columnIndex;
@@ -650,7 +650,7 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex )
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -674,7 +674,7 @@ uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex)
         return 0;
     return m_pConnection->createBlob(pBlobID);
 }
-// -------------------------------------------------------------------------
+
 
 uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -684,7 +684,7 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) thro
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
@@ -698,7 +698,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference<
 
 
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException)
 {
@@ -746,7 +746,7 @@ void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException)
     ::dbtools::throwFunctionNotSupportedException("refreshRow not supported in firebird",
                                                   *this);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -781,17 +781,17 @@ IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
diff --git a/connectivity/source/drivers/firebird/Services.cxx b/connectivity/source/drivers/firebird/Services.cxx
index f5a183026740..65bacd7439b9 100644
--- a/connectivity/source/drivers/firebird/Services.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -46,7 +46,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
 // It contains of 3 special functions that have to be exported.
 //
 
-//---------------------------------------------------------------------------------------
+
 void REGISTER_PROVIDER(
         const OUString& aServiceImplName,
         const Sequence< OUString>& Services,
@@ -62,7 +62,7 @@ void REGISTER_PROVIDER(
 }
 
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -102,7 +102,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL firebird_sdbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index dfff5d7e499c..190730f8029c 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -80,7 +80,7 @@ void OStatementCommonBase::freeStatementHandle()
     }
 }
 
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatementCommonBase_Base::queryInterface(rType);
@@ -88,7 +88,7 @@ Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(Ru
         aRet = OPropertySetHelper::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OStatementCommonBase::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes(
@@ -98,7 +98,7 @@ Sequence< Type > SAL_CALL OStatementCommonBase::getTypes(  ) throw(RuntimeExcept
 
     return concatSequences(aTypes.getTypes(),OStatementCommonBase_Base::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatementCommonBase::cancel(  ) throw(RuntimeException)
 {
@@ -271,7 +271,7 @@ void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeE
 {
     return *const_cast<OStatementCommonBase*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OStatementCommonBase::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -287,7 +287,7 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue(
     // here we have to try to convert
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     (void) rValue;
@@ -308,7 +308,7 @@ void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OStatementCommonBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     (void) rValue;
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 397bf78d5dbb..b686c40458e8 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -30,13 +30,13 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::flat;
-// -------------------------------------------------------------------------
+
 OFlatCatalog::OFlatCatalog(OFlatConnection* _pCon) : file::OFileCatalog(_pCon)
 {
 }
-// -------------------------------------------------------------------------
+
 void OFlatCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -55,7 +55,7 @@ void OFlatCatalog::refreshTables()
     else
         m_pTables = new OFlatTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index 0772f65bb342..f472c564b829 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -41,7 +41,7 @@ sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName)
         xRet = sdbcx::ObjectType(*aIter,UNO_QUERY);
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 3ed139065eca..56e16e4fc770 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -32,14 +32,14 @@ using namespace connectivity::file;
 
 typedef connectivity::file::OConnection  OConnection_B;
 
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
-// --------------------------------------------------------------------------------
+
 OFlatConnection::OFlatConnection(ODriver*   _pDriver) : OConnection(_pDriver)
     ,m_nMaxRowsToScan(50)
     ,m_bHeaderLine(sal_True)
@@ -49,16 +49,16 @@ OFlatConnection::OFlatConnection(ODriver*   _pDriver) : OConnection(_pDriver)
     ,m_cThousandDelimiter('.')
 {
 }
-//-----------------------------------------------------------------------------
+
 OFlatConnection::~OFlatConnection()
 {
 }
 
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connection", "com.sun.star.sdbc.Connection")
 
-//-----------------------------------------------------------------------------
+
 void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
@@ -103,7 +103,7 @@ void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValu
     OConnection::construct(url,info);
     m_bShowDeleted = sal_True; // we do not supported rows for this type
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -119,7 +119,7 @@ Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(S
 
     return xMetaData;
 }
-//------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< XTablesSupplier > OFlatConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -132,7 +132,7 @@ Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData(  ) throw(S
     }
     return xTab;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -144,7 +144,7 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLE
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -158,7 +158,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons
     m_aStatements.push_back(WeakReferenceHelper(*pStmt));
     return xStmt;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 69c8fbcb7017..7a9733323307 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -46,12 +46,12 @@ OFlatDatabaseMetaData::OFlatDatabaseMetaData(::connectivity::file::OConnection*
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::OFlatDatabaseMetaData" );
 }
-// -------------------------------------------------------------------------
+
 OFlatDatabaseMetaData::~OFlatDatabaseMetaData()
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::~OFlatDatabaseMetaData" );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::impl_getTypeInfo_throw" );
@@ -150,7 +150,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
         const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -240,14 +240,14 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OFlatDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatDatabaseMetaData::getURL" );
     ::osl::MutexGuard aGuard( m_aMutex );
     return OUString("sdbc:flat:") + m_pConnection->getURL();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index b5c8235acc7b..418431d0e730 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -37,24 +37,24 @@ using namespace ::com::sun::star::lang;
 
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.comp.sdbc.flat.ODriver");
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL connectivity::flat::ODriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
     return *(new ODriver( comphelper::getComponentContext(_rxFactory) ));
 }
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -71,13 +71,13 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
                 throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:flat:");
 }
-// -----------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
@@ -131,7 +131,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 322c23da7d76..2a51abb390d8 100644
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -24,12 +24,12 @@
 using namespace connectivity::flat;
 using namespace connectivity::file;
 using namespace ::com::sun::star::uno;
-// -------------------------------------------------------------------------
+
 OResultSet* OFlatPreparedStatement::createResultSet()
 {
     return new OFlatResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OFlatPreparedStatement,"com.sun.star.sdbc.driver.flat.PreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index f766ce704277..b9ce8bacc9e5 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -36,19 +36,19 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
-//------------------------------------------------------------------------------
+
 OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTreeIterator& _aSQLIterator)
                 : file::OResultSet(pStmt,_aSQLIterator)
                 ,m_bBookmarkable(sal_True)
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OFlatResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
     return OUString("com.sun.star.sdbcx.flat.ResultSet");
 }
-// -------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< OUString > aSupported(2);
@@ -61,7 +61,7 @@ sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if(rType == ::getCppuType((const Reference<XDeleteRows>*)0) || rType == ::getCppuType((const Reference<XResultSetUpdate>*)0)
@@ -71,7 +71,7 @@ Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeE
     const Any aRet = OResultSet::queryInterface(rType);
     return aRet.hasValue() ? aRet : OFlatResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  ) throw( RuntimeException)
 {
     Sequence< Type > aTypes = OResultSet::getTypes();
@@ -93,7 +93,7 @@ Sequence<  Type > SAL_CALL OFlatResultSet::getTypes(  ) throw( RuntimeException)
     return ::comphelper::concatSequences(aRet,OFlatResultSet_BASE::getTypes());
 }
 
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL OFlatResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 {
@@ -102,7 +102,7 @@ Any SAL_CALL OFlatResultSet::getBookmark(  ) throw( SQLException,  RuntimeExcept
 
     return makeAny((sal_Int32)(m_aRow->get())[0]->getValue());
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -113,7 +113,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const  Any& bookmark ) throw(
 
     return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),sal_True);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -127,48 +127,48 @@ sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const  Any& bookmark,
     return relative(rows);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const  Any& rhs ) throw( SQLException,  RuntimeException)
 {
     return (lhs == rhs) ? 0 : 2;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     return comphelper::getINT32(bookmark);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* OFlatResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & OFlatResultSet::getInfoHelper()
 {
     return *OFlatResultSet_BASE3::getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFlatResultSet::acquire() throw()
 {
     OFlatResultSet_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFlatResultSet::release() throw()
 {
     OFlatResultSet_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index 4701cf74a6d1..d7fb9a281d00 100644
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
@@ -23,12 +23,12 @@
 using namespace connectivity::flat;
 using namespace connectivity::file;
 using namespace com::sun::star::uno;
-// -------------------------------------------------------------------------
+
 OResultSet* OFlatStatement::createResultSet()
 {
     return new OFlatResultSet(this,m_aSQLIterator);
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OFlatStatement,"com.sun.star.sdbc.driver.flat.Statement","com.sun.star.sdbc.Statement");
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index e7c2e23abc3a..c11b23ff898d 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -62,7 +62,7 @@ using namespace ::com::sun::star::util;
 using std::vector;
 using std::lower_bound;
 
-// -------------------------------------------------------------------------
+
 void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::fillColumns" );
@@ -406,7 +406,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,
         }
     }
 }
-// -------------------------------------------------------------------------
+
 OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
                     const OUString& _Name,
                     const OUString& _Type,
@@ -427,7 +427,7 @@ OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnectio
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::OFlatTable" );
 
 }
-// -----------------------------------------------------------------------------
+
 void OFlatTable::construct()
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::construct" );
@@ -469,7 +469,7 @@ void OFlatTable::construct()
         refreshColumns();
     }
 }
-// -------------------------------------------------------------------------
+
 OUString OFlatTable::getEntry()
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::getEntry" );
@@ -515,7 +515,7 @@ OUString OFlatTable::getEntry()
     }
     return sURL;
 }
-// -------------------------------------------------------------------------
+
 void OFlatTable::refreshColumns()
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::refreshColumns" );
@@ -533,7 +533,7 @@ void OFlatTable::refreshColumns()
         m_pColumns  = new OFlatColumns(this,m_aMutex,aVector);
 }
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL OFlatTable::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::disposing" );
@@ -541,7 +541,7 @@ void SAL_CALL OFlatTable::disposing(void)
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aColumns = NULL;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException)
 {
     Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
@@ -564,7 +564,7 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes(  ) throw(RuntimeException)
     return Sequence< Type >(pTypes, aOwnTypes.size());
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0)      ||
@@ -578,7 +578,7 @@ Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeExcep
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< ::com::sun::star::lang::XUnoTunnel*> (this));
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -595,7 +595,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::getSomething" );
@@ -603,7 +603,7 @@ sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OFlatTable_BASE::getSomething(rId);
 }
-//------------------------------------------------------------------
+
 sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, sal_Bool bIsTable, sal_Bool bRetrieveData)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::fetchRow" );
@@ -747,13 +747,13 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns & _rCols, s
     return result;
 }
 
-// -----------------------------------------------------------------------------
+
 void OFlatTable::refreshHeader()
 {
     SAL_INFO( "connectivity.drivers", "flat lionel@mamane.lu OFlatTable::refreshHeader" );
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     template< typename Tp, typename Te> struct RangeBefore
@@ -765,12 +765,12 @@ namespace
         }
     };
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::seekRow" );
     OSL_ENSURE(m_pFileStream,"OFlatTable::seekRow: FileStream is NULL!");
-    // ----------------------------------------------------------
+
 
     switch(eCursorPosition)
     {
@@ -918,7 +918,7 @@ sal_Bool OFlatTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 bool OFlatTable::readLine(sal_Int32 * const pEndPos, sal_Int32 * const pStartPos, const bool nonEmpty)
 {
     SAL_INFO( "connectivity.drivers", "flat Ocke.Janssen@sun.com OFlatTable::readLine" );
@@ -953,7 +953,7 @@ bool OFlatTable::readLine(sal_Int32 * const pEndPos, sal_Int32 * const pStartPos
     return true;
 }
 
-// -----------------------------------------------------------------------------
+
 void OFlatTable::setRowPos(const vector<TRowPositionInFile>::size_type rowNum, const TRowPositionInFile &rowPos)
 {
     assert(m_aRowPosToFilePos.size() >= rowNum);
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index aee4095cb9ab..9abaf9b34740 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -47,6 +47,6 @@ sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName)
     pRet->construct();
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 3ebf8f4c2c40..29465c6cb3d2 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -75,7 +75,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL flat_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 2bbdbe859970..f2e5fae3cb0a 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -26,7 +26,7 @@
 #include <comphelper/types.hxx>
 
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace connectivity::hsqldb;
 using namespace ::com::sun::star::uno;
@@ -35,12 +35,12 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCatalog(_xConnection)
                 ,m_xConnection(_xConnection)
 {
 }
-// -----------------------------------------------------------------------------
+
 void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames)
 {
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
@@ -49,7 +49,7 @@ void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStrin
                                                             _sKindOfObject);
     fillNames(xResult,_rNames);
 }
-// -------------------------------------------------------------------------
+
 void OHCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -67,7 +67,7 @@ void OHCatalog::refreshTables()
     else
         m_pTables = new OTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OHCatalog::refreshViews()
 {
     Sequence< OUString > aTypes(1);
@@ -99,11 +99,11 @@ void OHCatalog::refreshViews()
     else
         m_pViews = new HViews( m_xConnection, *this, m_aMutex, aVector );
 }
-// -------------------------------------------------------------------------
+
 void OHCatalog::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 void OHCatalog::refreshUsers()
 {
     TStringVector aVector;
@@ -124,7 +124,7 @@ void OHCatalog::refreshUsers()
     else
         m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this);
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if ( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) )
@@ -132,7 +132,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeExcept
 
     return OCatalog::queryInterface(rType);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OHCatalog::getTypes(  ) throw(RuntimeException)
 {
     Sequence< Type > aTypes = OCatalog::getTypes();
@@ -150,7 +150,7 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes(  ) throw(RuntimeException)
     const Type* pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
     return Sequence< Type >(pTypes, aOwnTypes.size());
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 78f2eac9352d..16657cf227fb 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -40,35 +40,35 @@ OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent
             ) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
 {
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet > OHSQLColumns::createDescriptor()
 {
     return new OHSQLColumn(sal_True);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 OHSQLColumn::OHSQLColumn(   sal_Bool    _bCase)
     : connectivity::sdbcx::OColumn( _bCase )
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OHSQLColumn::construct()
 {
     m_sAutoIncrement = "IDENTITY";
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement));
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OHSQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & SAL_CALL OHSQLColumn::getInfoHelper()
 {
     return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
@@ -76,6 +76,6 @@ Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  ) throw(Ru
 
     return aSupported;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index f227e8124a82..f9499d63f143 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -99,7 +99,7 @@ namespace connectivity { namespace hsqldb
                         )   SAL_THROW( ( Exception ) );
     };
 
-    // -----------------------------------------------------------------------------
+
     bool FlushListeners::implTypedNotify( const Reference< XFlushListener >& _rxListener, const EventObject& _rEvent ) SAL_THROW( ( Exception ) )
     {
         _rxListener->flushed( _rEvent );
@@ -109,14 +109,14 @@ namespace connectivity { namespace hsqldb
     // =============================================================================
     // = OHsqlConnection
     // =============================================================================
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL OHsqlConnection::disposing(void)
     {
         m_aFlushListeners.disposeAndClear( EventObject( *this ) );
         OHsqlConnection_BASE::disposing();
         OConnectionWrapper::disposing();
     }
-    // -----------------------------------------------------------------------------
+
     OHsqlConnection::OHsqlConnection( const Reference< XDriver > _rxDriver,
         const Reference< XConnection >& _xConnection ,const Reference< XComponentContext >& _rxContext )
         :OHsqlConnection_BASE( m_aMutex )
@@ -128,7 +128,7 @@ namespace connectivity { namespace hsqldb
     {
         setDelegation(_xConnection,_rxContext,m_refCount);
     }
-    // -----------------------------------------------------------------------------
+
     OHsqlConnection::~OHsqlConnection()
     {
         if ( !OHsqlConnection_BASE::rBHelper.bDisposed )
@@ -137,25 +137,25 @@ namespace connectivity { namespace hsqldb
             dispose();
         }
     }
-    // -----------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2(OHsqlConnection,OHsqlConnection_BASE,OConnectionWrapper)
     IMPLEMENT_SERVICE_INFO(OHsqlConnection, "com.sun.star.sdbc.drivers.hsqldb.OHsqlConnection", "com.sun.star.sdbc.Connection")
     IMPLEMENT_FORWARD_XTYPEPROVIDER2(OHsqlConnection,OHsqlConnection_BASE,OConnectionWrapper)
 
-    //--------------------------------------------------------------------
+
     ::osl::Mutex& OHsqlConnection::getMutex() const
     {
         return m_aMutex;
     }
 
-    //--------------------------------------------------------------------
+
     void OHsqlConnection::checkDisposed() const
     {
         ::connectivity::checkDisposed( rBHelper.bDisposed );
     }
 
     // XFlushable
-    //--------------------------------------------------------------------
+
     void SAL_CALL OHsqlConnection::flush(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -193,21 +193,21 @@ namespace connectivity { namespace hsqldb
         }
    }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aFlushListeners.addInterface( l );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aFlushListeners.removeInterface( l );
     }
 
-    // -------------------------------------------------------------------
+
     Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -219,7 +219,7 @@ namespace connectivity { namespace hsqldb
         return impl_getTextTableIcon_nothrow();
     }
 
-    // -------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -246,7 +246,7 @@ namespace connectivity { namespace hsqldb
         // editor not yet implemented in this CWS
     }
 
-    // -------------------------------------------------------------------
+
     Reference< XNameAccess > OHsqlConnection::impl_getTableContainer_throw()
     {
         Reference< XNameAccess > xTables;
@@ -270,7 +270,7 @@ namespace connectivity { namespace hsqldb
     }
 
     //TODO: resource
-    // -------------------------------------------------------------------
+
     void OHsqlConnection::impl_checkExistingTable_throw( const OUString& _rTableName )
     {
         bool bDoesExist = false;
@@ -298,7 +298,7 @@ namespace connectivity { namespace hsqldb
         } // if ( !bDoesExist )
     }
 
-    // -------------------------------------------------------------------
+
     bool OHsqlConnection::impl_isTextTable_nothrow( const OUString& _rTableName )
     {
         bool bIsTextTable = false;
@@ -335,7 +335,7 @@ namespace connectivity { namespace hsqldb
         return bIsTextTable;
     }
 
-    // -------------------------------------------------------------------
+
     Reference< XGraphic > OHsqlConnection::impl_getTextTableIcon_nothrow()
     {
         Reference< XGraphic > xGraphic;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index f11ca6154bc4..5bec011330bb 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -89,7 +89,7 @@ namespace connectivity
     //====================================================================
     //= ODriverDelegator
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
         : ODriverDelegator_BASE(m_aMutex)
         ,m_xContext(_rxContext)
@@ -97,7 +97,7 @@ namespace connectivity
     {
     }
 
-    //--------------------------------------------------------------------
+
     ODriverDelegator::~ODriverDelegator()
     {
         try
@@ -109,7 +109,7 @@ namespace connectivity
         }
     }
 
-    // --------------------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::disposing()
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -131,7 +131,7 @@ namespace connectivity
 
         cppu::WeakComponentImplHelperBase::disposing();
     }
-    //--------------------------------------------------------------------
+
     Reference< XDriver > ODriverDelegator::loadDriver( )
     {
         if ( !m_xDriver.is() )
@@ -144,7 +144,7 @@ namespace connectivity
         return m_xDriver;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext )
@@ -175,7 +175,7 @@ namespace connectivity
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Reference< XConnection > xConnection;
@@ -394,7 +394,7 @@ namespace connectivity
         return xConnection;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException)
     {
         sal_Bool bEnabled = sal_False;
@@ -416,7 +416,7 @@ namespace connectivity
         return bEnabled  && url.equals("sdbc:embedded:hsqldb");
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException)
     {
         if ( !acceptsURL(url) )
@@ -446,19 +446,19 @@ namespace connectivity
         return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion(  ) throw (RuntimeException)
     {
         return 1;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion(  ) throw (RuntimeException)
     {
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -484,7 +484,7 @@ namespace connectivity
         return xTab;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         if ( ! acceptsURL(url) )
@@ -498,13 +498,13 @@ namespace connectivity
     }
 
     // XServiceInfo
-    // --------------------------------------------------------------------------------
-    //------------------------------------------------------------------------------
+
+
     OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
     {
         return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver");
     }
-    //------------------------------------------------------------------------------
+
     Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSNS( 2 );
@@ -512,7 +512,7 @@ namespace connectivity
         aSNS[1] = "com.sun.star.sdbcx.Driver";
         return aSNS;
     }
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ODriverDelegator::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
@@ -522,17 +522,17 @@ namespace connectivity
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    //------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, ::com::sun::star::container::ElementExistException, RuntimeException)
     {
         ::dbtools::throwFeatureNotImplementedException( "XCreateCatalog::createCatalog", *this );
     }
-    //------------------------------------------------------------------
+
     void ODriverDelegator::shutdownConnection(const TWeakPairVector::iterator& _aIter )
     {
         OSL_ENSURE(m_aConnections.end() != _aIter,"Iterator equals .end()");
@@ -567,7 +567,7 @@ namespace connectivity
         if ( !m_bInShutDownConnections )
             m_aConnections.erase(_aIter);
     }
-    //------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -598,7 +598,7 @@ namespace connectivity
             }
         }
     }
-    //------------------------------------------------------------------
+
     void ODriverDelegator::shutdownConnections()
     {
         m_bInShutDownConnections = sal_True;
@@ -617,7 +617,7 @@ namespace connectivity
         m_aConnections.clear();
         m_bInShutDownConnections = sal_True;
     }
-    //------------------------------------------------------------------
+
     void ODriverDelegator::flushConnections()
     {
         TWeakPairVector::iterator aEnd = m_aConnections.end();
@@ -633,7 +633,7 @@ namespace connectivity
             }
         }
     }
-    //------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -674,19 +674,19 @@ namespace connectivity
             }
         }
     }
-    //------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::commited( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
     }
-    //------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::preRevert( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
     {
     }
-    //------------------------------------------------------------------
+
     void SAL_CALL ODriverDelegator::reverted( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
     }
-    //------------------------------------------------------------------
+
     namespace
     {
         //..............................................................
@@ -875,7 +875,7 @@ namespace connectivity
             return sLocaleString;
         }
     }
-    //------------------------------------------------------------------
+
     void ODriverDelegator::onConnectedNewDatabase( const Reference< XConnection >& _rxConnection )
     {
         try
@@ -898,8 +898,8 @@ namespace connectivity
         }
     }
 
-    //------------------------------------------------------------------
-    //------------------------------------------------------------------
+
+
 //........................................................................
 }   // namespace connectivity
 //........................................................................
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 91dd98ee21fd..8416f41abaa2 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -56,7 +56,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
 
     StorageContainer::registerStream(env,name,key,mode);
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
  * Method:    close
@@ -95,7 +95,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
 
     StorageContainer::revokeStream(env,name,key);
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
  * Method:    getFilePointer
@@ -118,7 +118,7 @@ SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAc
 #endif
     return nReturn;
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
@@ -143,7 +143,7 @@ SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAc
     return nReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key, DataLogFile* logger )
 {
@@ -185,7 +185,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name,
     return -1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
@@ -206,7 +206,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger )
 {
@@ -258,7 +258,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
                     "Stream is not valid");
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
@@ -279,7 +279,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
@@ -347,7 +347,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
                     "No InputStream");
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
@@ -414,7 +414,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
     #endif
     }
 }
-// -----------------------------------------------------------------------------
+
 
 void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jbyteArray buffer, jint off, jint len, DataLogFile* logger )
 {
@@ -459,7 +459,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
@@ -479,7 +479,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
     write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, jstring key, jint v, DataLogFile* logger )
 {
@@ -518,7 +518,7 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 899ad14cec74..d992a35f2bb8 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -44,7 +44,7 @@ namespace connectivity
             : m_xStream(_xStream)
         {
         }
-        // -----------------------------------------------------------------------------
+
         StreamHelper::~StreamHelper()
         {
             try
@@ -79,45 +79,45 @@ namespace connectivity
                 OSL_FAIL("Exception caught!");
             }
         }
-        // -----------------------------------------------------------------------------
+
         Reference< XInputStream> StreamHelper::getInputStream()
         {
             if ( !m_xInputStream.is() )
                 m_xInputStream = m_xStream->getInputStream();
             return m_xInputStream;
         }
-        // -----------------------------------------------------------------------------
+
         Reference< XOutputStream> StreamHelper::getOutputStream()
         {
             if ( !m_xOutputStream.is() )
                 m_xOutputStream = m_xStream->getOutputStream();
             return m_xOutputStream;
         }
-        // -----------------------------------------------------------------------------
+
         Reference< XSeekable> StreamHelper::getSeek()
         {
             if ( !m_xSeek.is() )
                 m_xSeek.set(m_xStream,UNO_QUERY);
             return m_xSeek;
         }
-        // -----------------------------------------------------------------------------
+
         TStorages& lcl_getStorageMap()
         {
             static TStorages s_aMap;
             return s_aMap;
         }
-        // -----------------------------------------------------------------------------
+
         OUString lcl_getNextCount()
         {
             static sal_Int32 s_nCount = 0;
             return OUString::number(s_nCount++);
         }
-        // -----------------------------------------------------------------------------
+
         OUString StorageContainer::removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL)
         {
             return _sURL.copy(_sFileURL.getLength()+1);
         }
-        // -----------------------------------------------------------------------------
+
         OUString StorageContainer::removeOldURLPrefix(const OUString& _sURL)
         {
             OUString sRet = _sURL;
@@ -163,7 +163,7 @@ namespace connectivity
             return aStr;
         }
 
-        // -----------------------------------------------------------------------------
+
         OUString StorageContainer::registerStorage(const Reference< XStorage>& _xStorage,const OUString& _sURL)
         {
             OSL_ENSURE(_xStorage.is(),"Storage is NULL!");
@@ -181,7 +181,7 @@ namespace connectivity
 
             return aFind->first;
         }
-        // -----------------------------------------------------------------------------
+
         TStorages::mapped_type StorageContainer::getRegisteredStorage(const OUString& _sKey)
         {
             TStorages::mapped_type aRet;
@@ -193,7 +193,7 @@ namespace connectivity
 
             return aRet;
         }
-        // -----------------------------------------------------------------------------
+
         OUString StorageContainer::getRegisteredKey(const Reference< XStorage>& _xStorage)
         {
             OUString sKey;
@@ -209,7 +209,7 @@ namespace connectivity
                 sKey = aFind->first;
             return sKey;
         }
-        // -----------------------------------------------------------------------------
+
         void StorageContainer::revokeStorage(const OUString& _sKey,const Reference<XTransactionListener>& _xListener)
         {
             TStorages& rMap = lcl_getStorageMap();
@@ -234,7 +234,7 @@ namespace connectivity
                 rMap.erase(aFind);
             }
         }
-        // -----------------------------------------------------------------------------
+
         TStreamMap::mapped_type StorageContainer::registerStream(JNIEnv * env,jstring name, jstring key,sal_Int32 _nMode)
         {
             TStreamMap::mapped_type pHelper;
@@ -305,7 +305,7 @@ namespace connectivity
             }
             return pHelper;
         }
-        // -----------------------------------------------------------------------------
+
         void StorageContainer::revokeStream( JNIEnv * env,jstring name, jstring key)
         {
             TStorages& rMap = lcl_getStorageMap();
@@ -314,7 +314,7 @@ namespace connectivity
             if ( aFind != rMap.end() )
                 aFind->second.second.erase(removeURLPrefix(jstring2ustring(env,name),aFind->second.first.second));
         }
-        // -----------------------------------------------------------------------------
+
         TStreamMap::mapped_type StorageContainer::getRegisteredStream( JNIEnv * env,jstring name, jstring key)
         {
             TStreamMap::mapped_type  pRet;
@@ -330,7 +330,7 @@ namespace connectivity
 
             return pRet;
         }
-        // -----------------------------------------------------------------------------
+
         void StorageContainer::throwJavaException(const Exception& _aException,JNIEnv * env)
         {
             if (JNI_FALSE != env->ExceptionCheck())
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 247bbeed0c37..7a0515a2ecec 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -70,7 +70,7 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
                     Privilege::SELECT;
     construct();
 }
-// -------------------------------------------------------------------------
+
 OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
                            const Reference< XConnection >& _xConnection,
                     const OUString& _Name,
@@ -91,41 +91,41 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OHSQLTable::construct()
 {
     OTableHelper::construct();
     if ( !isNew() )
         registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES),  PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges,  ::getCppuType(&m_nPrivileges));
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OHSQLTable::getInfoHelper()
 {
     return *static_cast<OHSQLTable_PROP*>(const_cast<OHSQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0);
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::OCollection* OHSQLTable::createColumns(const TStringVector& _rNames)
 {
     OHSQLColumns* pColumns = new OHSQLColumns(*this,sal_True,m_aMutex,_rNames);
     pColumns->setParent(this);
     return pColumns;
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::OCollection* OHSQLTable::createKeys(const TStringVector& _rNames)
 {
     return new OKeysHelper(this,m_aMutex,_rNames);
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::OCollection* OHSQLTable::createIndexes(const TStringVector& _rNames)
 {
     return new OIndexesHelper(this,m_aMutex,_rNames);
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -142,14 +142,14 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OTable_TYPEDEF::getSomething(rId);
 }
-// -------------------------------------------------------------------------
+
 // XAlterTable
 void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
@@ -257,7 +257,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Refe
     }
 
 }
-// -----------------------------------------------------------------------------
+
 void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
 {
     OUString sSql = getAlterTableColumnPart();
@@ -288,7 +288,7 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, c
     sSql += ::dbtools::createStandardColumnPart(xProp,getConnection());
     executeStatement(sSql);
 }
-// -----------------------------------------------------------------------------
+
 void OHSQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName)
 {
     const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
@@ -299,7 +299,7 @@ void OHSQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString&
 
     executeStatement(sSql);
 }
-// -----------------------------------------------------------------------------
+
 void OHSQLTable::dropDefaultValue(const OUString& _rColName)
 {
     const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
@@ -310,7 +310,7 @@ void OHSQLTable::dropDefaultValue(const OUString& _rColName)
 
     executeStatement(sSql);
 }
-// -----------------------------------------------------------------------------
+
 OUString OHSQLTable::getAlterTableColumnPart()
 {
     OUString sSql(  "ALTER TABLE " );
@@ -320,7 +320,7 @@ OUString OHSQLTable::getAlterTableColumnPart()
 
     return sSql;
 }
-// -----------------------------------------------------------------------------
+
 void OHSQLTable::executeStatement(const OUString& _rStatement )
 {
     OUString sSQL = _rStatement;
@@ -339,7 +339,7 @@ void OHSQLTable::executeStatement(const OUString& _rStatement )
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OHSQLTable::getTypes(  ) throw(RuntimeException)
 {
     if ( m_Type.equalsAscii("VIEW") )
@@ -361,7 +361,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes(  ) throw(RuntimeException)
     }
     return OTableHelper::getTypes();
 }
-// -------------------------------------------------------------------------
+
 // XRename
 void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
@@ -398,7 +398,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException,
         ::dbtools::qualifiedNameComponents(getMetaData(),newName,m_CatalogName,m_SchemaName,m_Name,::dbtools::eInTableDefinitions);
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if( m_Type.equalsAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) )
@@ -406,6 +406,6 @@ Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeExcep
 
     return OTableHelper::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 1d75b8667e6a..055445f0f6aa 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -91,30 +91,30 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OHCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OTables::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OTables::createDescriptor()
 {
     return new OHSQLTable(this,static_cast<OHCatalog&>(m_rParent).getConnection());
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createTable(descriptor);
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
@@ -155,7 +155,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
         }
     }
 }
-// -------------------------------------------------------------------------
+
 void OTables::createTable( const Reference< XPropertySet >& descriptor )
 {
     Reference< XConnection > xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
@@ -168,7 +168,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OTables::appendNew(const OUString& _rsNewTable)
 {
     insertElement(_rsNewTable,NULL);
@@ -179,12 +179,12 @@ void OTables::appendNew(const OUString& _rsNewTable)
     while (aListenerLoop.hasMoreElements())
         static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent);
 }
-// -----------------------------------------------------------------------------
+
 OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!");
     return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false );
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 0a24620a25b2..2ea7be02e2ea 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -25,7 +25,7 @@ namespace connectivity { namespace hsqldb
     //====================================================================
     //= HTools
     //====================================================================
-    //--------------------------------------------------------------------
+
     void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog,
         const OUString _rSchema, const OUString _rName, bool _bShortForm )
     {
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index e1c2a757d64a..3770eff149c6 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -35,13 +35,13 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True)
                 ,m_xConnection(_xConnection)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
                 const OUString& _Name
             ) : connectivity::sdbcx::OUser(_Name,sal_True)
@@ -49,34 +49,34 @@ OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OHSQLUser::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 OUserExtend::OUserExtend(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OUserExtend::construct()
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
 {
     return *OUserExtend_PROP::getArrayHelper();
 }
 typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER;
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -86,7 +86,7 @@ sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32
     findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant);
     return nRights;
 }
-// -----------------------------------------------------------------------------
+
 void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException)
 {
     nRightsWithGrant = nRights = 0;
@@ -200,7 +200,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_In
         ::comphelper::disposeComponent(xRes);
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -210,7 +210,7 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, s
     findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant);
     return nRightsWithGrant;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     if ( objType != PrivilegeObject::TABLE )
@@ -237,7 +237,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 obj
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     if ( objType != PrivilegeObject::TABLE )
@@ -263,7 +263,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 ob
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 // XUser
 void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException)
 {
@@ -287,7 +287,7 @@ void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const
 {
     OUString sPrivs;
@@ -331,6 +331,6 @@ OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const
 
     return sPrivs;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index abf698d86333..ffb34e7b00d8 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -47,24 +47,24 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent,
     ,m_pParent(_pParent)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
 {
     return new OHSQLUser(m_xConnection,_rName);
 }
-// -------------------------------------------------------------------------
+
 void OUsers::impl_refresh() throw(RuntimeException)
 {
     m_pParent->refreshUsers();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OUsers::createDescriptor()
 {
     OUserExtend* pNew = new OUserExtend(m_xConnection);
     return pNew;
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -85,7 +85,7 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen
 
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OUsers::dropObject(sal_Int32 /*nPos*/,const OUString _sElementName)
 {
@@ -101,6 +101,6 @@ void OUsers::dropObject(sal_Int32 /*nPos*/,const OUString _sElementName)
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index dc640e16c588..45fc642fdf65 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -58,7 +58,7 @@ namespace connectivity { namespace hsqldb
     //====================================================================
     //= HView
     //====================================================================
-    //--------------------------------------------------------------------
+
     HView::HView( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive,
         const OUString& _rSchemaName, const OUString& _rName )
         :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, OUString() )
@@ -66,16 +66,16 @@ namespace connectivity { namespace hsqldb
     {
     }
 
-    //--------------------------------------------------------------------
+
     HView::~HView()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( HView, HView_Base, HView_IBASE )
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE )
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException)
     {
         // not really atomic ... as long as we do not have something like
@@ -143,7 +143,7 @@ namespace connectivity { namespace hsqldb
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL HView::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         if ( _nHandle == PROPERTY_ID_COMMAND )
@@ -157,7 +157,7 @@ namespace connectivity { namespace hsqldb
         HView_Base::getFastPropertyValue( _rValue, _nHandle );
     }
 
-    //--------------------------------------------------------------------
+
     OUString HView::impl_getCommand_throw( bool _bAllowSQLException ) const
     {
         OUString sCommand;
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 3a91dd8b7289..ef3922e9cdaf 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang;
 using namespace dbtools;
 typedef connectivity::sdbcx::OCollection OCollection_TYPE;
 
-// -------------------------------------------------------------------------
+
 HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex,
     const TStringVector &_rVector )
     :sdbcx::OCollection( _rParent, sal_True, _rMutex, _rVector )
@@ -59,7 +59,7 @@ HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObje
 {
 }
 
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType HViews::createObject(const OUString& _rName)
 {
     OUString sCatalog,sSchema,sTable;
@@ -72,32 +72,32 @@ sdbcx::ObjectType HViews::createObject(const OUString& _rName)
     return new HView( m_xConnection, isCaseSensitive(), sSchema, sTable );
 }
 
-// -------------------------------------------------------------------------
+
 void HViews::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OHCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void HViews::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > HViews::createDescriptor()
 {
     Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
     connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(sal_True,xConnection->getMetaData());
     return pNew;
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType HViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createView(descriptor);
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void HViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
@@ -119,14 +119,14 @@ void HViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 void HViews::dropByNameImpl(const OUString& elementName)
 {
     m_bInDrop = sal_True;
     OCollection_TYPE::dropByName(elementName);
     m_bInDrop = sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void HViews::createView( const Reference< XPropertySet >& descriptor )
 {
     Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
@@ -153,6 +153,6 @@ void HViews::createView( const Reference< XPropertySet >& descriptor )
         pTables->appendNew(sName);
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index c96e3da55559..ccc8f28ebbc8 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -36,7 +36,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -76,7 +76,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL hsqldb_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index e5bbab94aab4..a39f617e416f 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -85,7 +85,7 @@ SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileA
     }
     return JNI_FALSE;
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
@@ -120,7 +120,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
@@ -163,6 +163,6 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 099a6176e952..1f127c95f38e 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -67,7 +67,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
 #endif
     StorageContainer::registerStream(env,name,key,mode);
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
@@ -86,7 +86,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
     return read_from_storage_stream( env, obj_this, name, key );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
@@ -105,7 +105,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
     return read_from_storage_stream_into_buffer(env,obj_this,name,key,buffer,off,len);
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
@@ -125,7 +125,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
 #endif
     StorageContainer::revokeStream(env,name,key);
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
@@ -191,7 +191,7 @@ SAL_JNI_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeIn
     }
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
@@ -233,7 +233,7 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
     }
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
@@ -291,6 +291,6 @@ SAL_JNI_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInp
 #endif
     return nBytesRead;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 9b677a0fd7f9..7a6765f724b5 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::connectivity::hsqldb;
 
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
  * Method:    openStream
@@ -84,7 +84,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
     write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, off, len );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
  * Method:    write
@@ -102,7 +102,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
     write_to_storage_stream_from_buffer( env, obj_this, name, key, buffer, 0, env->GetArrayLength( buffer ) );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
  * Method:    close
@@ -134,7 +134,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
 #endif
     StorageContainer::revokeStream(env,name,key);
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
  * Method:    write
@@ -152,7 +152,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
     write_to_storage_stream( env, obj_this, name, key, b );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
  * Method:    flush
@@ -171,7 +171,7 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
     OUString sName = StorageContainer::jstring2ustring(env,name);
 #endif
 }
-// -----------------------------------------------------------------------------
+
 /*
  * Class:     com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream
  * Method:    sync
@@ -198,6 +198,6 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index 18b7d05d749f..880600a71d5a 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -37,14 +37,14 @@ namespace connectivity { namespace hsqldb
         return streams;
     }
 
-    //---------------------------------------------------------------------
+
     LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
     {
         m_sFileName = StorageContainer::jstring2ustring(env,streamName) +
             "." + OUString::createFromAscii( _pAsciiSuffix );
     }
 
-    //---------------------------------------------------------------------
+
     FILE*& LogFile::getLogFile()
     {
         FILE*& pLogFile = getStreams()[m_sFileName];
@@ -56,7 +56,7 @@ namespace connectivity { namespace hsqldb
         return pLogFile;
     }
 
-    //---------------------------------------------------------------------
+
     void LogFile::writeString( const sal_Char* _pString, bool _bEndLine )
     {
         FILE* pLogFile = getLogFile();
@@ -66,7 +66,7 @@ namespace connectivity { namespace hsqldb
         fflush( pLogFile );
     }
 
-    //---------------------------------------------------------------------
+
     void LogFile::close()
     {
         fclose( getLogFile() );
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 50cce64578f8..83ab8985f93b 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -47,18 +47,18 @@ java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_
     : java_sql_PreparedStatement( pEnv, _rCon, sql )
 {
 }
-// -----------------------------------------------------------------------------
+
 java_sql_CallableStatement::~java_sql_CallableStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = java_sql_PreparedStatement::queryInterface(rType);
     return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< starsdbc::XRow*>(this),static_cast< starsdbc::XOutParameters*>(this));
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< starsdbc::XRow > *)0 ),
@@ -66,7 +66,7 @@ Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) th
 
     return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes());
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_CallableStatement::wasNull(  ) throw(starsdbc::SQLException, RuntimeException)
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -300,17 +300,17 @@ Reference< starsdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_Ref( t.pEnv, out );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_CallableStatement::acquire() throw()
 {
     java_sql_PreparedStatement::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_CallableStatement::release() throw()
 {
     java_sql_PreparedStatement::release();
 }
-// -----------------------------------------------------------------------------
+
 void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -347,7 +347,7 @@ void java_sql_CallableStatement::createStatement(JNIEnv* /*_pEnv*/)
             object = t.pEnv->NewGlobalRef( out );
     } //t.pEnv
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 0216ad23186a..c8574f2e87e7 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -33,7 +33,7 @@ namespace connectivity { namespace java { namespace sql {
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XComponentContext;
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         sal_Int32 lcl_getFreeID( ConnectionLog::ObjectType _eType )
@@ -46,21 +46,21 @@ namespace connectivity { namespace java { namespace sql {
     //====================================================================
     //= ConnectionLog
     //====================================================================
-    //--------------------------------------------------------------------
+
     ConnectionLog::ConnectionLog( const ::comphelper::ResourceBasedEventLogger& _rDriverLog )
         :ConnectionLog_Base( _rDriverLog )
         ,m_nObjectID( lcl_getFreeID( CONNECTION ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ConnectionLog::ConnectionLog( const ConnectionLog& _rSourceLog )
         :ConnectionLog_Base( _rSourceLog )
         ,m_nObjectID( _rSourceLog.m_nObjectID )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ConnectionLog::ConnectionLog( const ConnectionLog& _rSourceLog, ConnectionLog::ObjectType _eType )
         :ConnectionLog_Base( _rSourceLog )
         ,m_nObjectID( lcl_getFreeID( _eType ) )
@@ -82,7 +82,7 @@ namespace comphelper { namespace log { namespace convert
     using ::com::sun::star::util::Time;
     using ::com::sun::star::util::DateTime;
 
-    //--------------------------------------------------------------------
+
     OUString convertLogArgToString( const Date& _rDate )
     {
         char buffer[ 30 ];
@@ -92,7 +92,7 @@ namespace comphelper { namespace log { namespace convert
         return OUString::createFromAscii( buffer );
     }
 
-    //--------------------------------------------------------------------
+
     OUString convertLogArgToString( const Time& _rTime )
     {
         char buffer[ 30 ];
@@ -102,7 +102,7 @@ namespace comphelper { namespace log { namespace convert
         return OUString::createFromAscii( buffer );
     }
 
-    //--------------------------------------------------------------------
+
     OUString convertLogArgToString( const DateTime& _rDateTime )
     {
         char buffer[ 30 ];
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 544fdbc5ae7f..f92c541b67fe 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -33,7 +33,7 @@ namespace connectivity { namespace jdbc
     //====================================================================
     //= ContextClassLoaderScope
     //====================================================================
-    //--------------------------------------------------------------------
+
     ContextClassLoaderScope::ContextClassLoaderScope( JNIEnv& environment, const GlobalRef< jobject >& newClassLoader,
         const ::comphelper::ResourceBasedEventLogger& _rLoggerForErrors, const Reference< XInterface >& _rxErrorContext )
         :m_environment( environment )
@@ -95,7 +95,7 @@ namespace connectivity { namespace jdbc
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ContextClassLoaderScope::pop( bool clearExceptions )
     {
         if ( isActive() )
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index f563c51b0ad4..f567486d1796 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -57,7 +57,7 @@ jclass java_sql_DatabaseMetaData::getMyClass() const
         theClass = findMyClass("java/sql/DatabaseMetaData");
     return theClass;
 }
-// -----------------------------------------------------------------------------
+
 java_sql_DatabaseMetaData::java_sql_DatabaseMetaData( JNIEnv * pEnv, jobject myObj, java_sql_Connection& _rConnection )
     :ODatabaseMetaDataBase( &_rConnection,_rConnection.getConnectionInfo() )
     ,java_lang_Object( pEnv, myObj )
@@ -67,38 +67,38 @@ java_sql_DatabaseMetaData::java_sql_DatabaseMetaData( JNIEnv * pEnv, jobject myO
     SDBThreadAttach::addRef();
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > java_sql_DatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethod( "getTypeInfo", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethod( "getCatalogs", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getCatalogSeparator", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethod( "getSchemas", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges(
         const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
         const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -106,7 +106,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
     return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern );
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException)
 {
@@ -220,121 +220,121 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName );
     return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns(
         const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any&
                 catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns(
         const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxBinaryLiteralLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxRowSize", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxCatalogNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxCharLiteralLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxColumnNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxColumnsInIndex", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxCursorNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxConnections", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxColumnsInTable", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxStatementLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxTableNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxTablesInSelect", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys(
         const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys(
         const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys(
         const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
         const Any& catalog, const OUString& schema, const OUString& table,
         sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
@@ -375,7 +375,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName );
     return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier(
         const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
         sal_Bool nullable ) throw(SQLException, RuntimeException)
@@ -415,7 +415,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_SUCCESS, cMethodName );
     return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection);
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
         const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -491,7 +491,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
     }
     return xReturn;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference(
         const Any& primaryCatalog, const OUString& primarySchema,
         const OUString& primaryTable, const Any& foreignCatalog,
@@ -541,7 +541,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference(
     return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID )
 {
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
@@ -550,7 +550,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod
     return out;
 }
 
-// -------------------------------------------------------------------------
+
 OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID )
 {
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
@@ -567,7 +567,7 @@ OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodN
     return sReturn;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 java_sql_DatabaseMetaData::impl_callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID )
 {
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
@@ -576,7 +576,7 @@ sal_Int32 java_sql_DatabaseMetaData::impl_callIntMethod( const char* _pMethodNam
     return out;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument )
 {
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG1, _pMethodName, _nArgument );
@@ -587,7 +587,7 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethodWithIntArg( const char
     return out;
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethod( const char* _pMethodName, jmethodID& _inout_MethodID )
 {
     SDBThreadAttach t;
@@ -597,7 +597,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethod( con
     return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection);
 }
 
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings( const char* _pMethodName, jmethodID& _inout_MethodID,
     const Any& _rCatalog, const OUString& _rSchemaPattern, const OUString& _rLeastPattern,
     const OUString* _pOptionalAdditionalString )
@@ -668,326 +668,326 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS
     return new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "doesMaxRowSizeIncludeBlobs", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "storesLowerCaseQuotedIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "storesMixedCaseIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "storesUpperCaseQuotedIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "storesUpperCaseIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsAlterTableWithAddColumn", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsAlterTableWithDropColumn", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxIndexLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsNonNullableColumns", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getCatalogTerm", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getIdentifierQuoteString", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getExtraNameCharacters", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsDifferentTableCorrelationNames", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "isCatalogAtStart", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "dataDefinitionIgnoredInTransactions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "dataDefinitionCausesTransactionCommit", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsDataManipulationTransactionsOnly", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsDataDefinitionAndDataManipulationTransactions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsPositionedDelete", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsPositionedUpdate", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsOpenStatementsAcrossRollback", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsOpenStatementsAcrossCommit", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsOpenCursorsAcrossCommit", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsOpenCursorsAcrossRollback", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "supportsTransactionIsolationLevel", mID, level );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSchemasInDataManipulation", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsANSI92FullSQL", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsANSI92EntryLevelSQL", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsIntegrityEnhancementFacility", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSchemasInTableDefinitions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCatalogsInTableDefinitions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsOuterJoins", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethod( "getTableTypes", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxStatements", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxProcedureNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxSchemaNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsTransactions", mID );
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "allProceduresAreCallable", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsStoredProcedures", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSelectForUpdate", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "allTablesAreSelectable", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "isReadOnly", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "usesLocalFiles", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "usesLocalFilePerTable", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsTypeConversion", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "nullPlusNonNullIsNull", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsColumnAliasing", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsTableCorrelationNames", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException)
 {
     static const char* pMethodName = "supportsConvert";
@@ -1006,163 +1006,163 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType
     m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
     return out;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsExpressionsInOrderBy", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsGroupBy", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsGroupByBeyondSelect", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsGroupByUnrelated", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsMultipleTransactions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsMultipleResultSets", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsLikeEscapeClause", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsOrderByUnrelated", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsUnion", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsUnionAll", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsMixedCaseIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_DatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsMixedCaseQuotedIdentifiers", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "nullsAreSortedAtEnd", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "nullsAreSortedAtStart", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "nullsAreSortedHigh", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "nullsAreSortedLow", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSchemasInProcedureCalls", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSchemasInPrivilegeDefinitions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCatalogsInProcedureCalls", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCatalogsInPrivilegeDefinitions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCorrelatedSubqueries", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSubqueriesInComparisons", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSubqueriesInExists", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSubqueriesInIns", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsSubqueriesInQuantifieds", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     OUString sURL = m_pConnection->getURL();
@@ -1173,163 +1173,163 @@ OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, Runt
     }
     return sURL;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getUserName", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDriverName", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDriverVersion", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDatabaseProductVersion", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDatabaseProductName", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getProcedureTerm", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSchemaTerm", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getDriverMajorVersion", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getDefaultTransactionIsolation", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getDriverMinorVersion", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSQLKeywords", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSearchStringEscape", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getStringFunctions", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getTimeDateFunctions", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSystemFunctions", mID );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getNumericFunctions", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsExtendedSQLGrammar", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsCoreSQLGrammar", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsMinimumSQLGrammar", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsFullOuterJoins", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsLimitedOuterJoins", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxColumnsInGroupBy", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxColumnsInOrderBy", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxColumnsInSelect", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callIntMethod( "getMaxUserNameLength", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "supportsResultSetType", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException)
 {
     static const char* pMethodName = "supportsResultSetConcurrency";
@@ -1348,67 +1348,67 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I
     m_aLogger.log< const sal_Char*, sal_Int16 >( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, pMethodName, out );
     return out;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "ownUpdatesAreVisible", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "ownDeletesAreVisible", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "ownInsertsAreVisible", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "othersUpdatesAreVisible", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "othersDeletesAreVisible", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "othersInsertsAreVisible", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "updatesAreDetected", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "deletesAreDetected", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethodWithIntArg( "insertsAreDetected", mID, setType );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callBooleanMethod( "supportsBatchUpdates", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs(
         const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern,
         const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
@@ -1449,6 +1449,6 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs(
 
     return out ? new java_sql_ResultSet( t.pEnv, out, m_aLogger,*m_pConnection ) : 0;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index c124450cdf8c..ec3f45fc6344 100644
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
@@ -38,7 +38,7 @@ jclass java_util_Date::getMyClass() const
     return theClass;
 }
 
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index f510d8cc93d9..956cad32fb82 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -35,10 +35,10 @@ using namespace ::com::sun::star::lang;
 //**************************************************************
 
 jclass java_sql_DriverPropertyInfo::theClass = 0;
-// --------------------------------------------------------------------------------
+
 java_sql_DriverPropertyInfo::~java_sql_DriverPropertyInfo()
 {}
-// --------------------------------------------------------------------------------
+
 jclass java_sql_DriverPropertyInfo::getMyClass() const
 {
     // the class must be fetched only once, therefore static
@@ -47,7 +47,7 @@ jclass java_sql_DriverPropertyInfo::getMyClass() const
     return theClass;
 }
 
-// --------------------------------------------------------------------------------
+
 java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo()
 {
     starsdbc::DriverPropertyInfo aInfo;
@@ -59,7 +59,7 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo()
 
     return aInfo;
 }
-// --------------------------------------------------------------------------------
+
 OUString java_sql_DriverPropertyInfo::name()
 {
     OUString aStr;
@@ -72,7 +72,7 @@ OUString java_sql_DriverPropertyInfo::name()
     } //t.pEnv
     return aStr;
 }
-// --------------------------------------------------------------------------------
+
 OUString java_sql_DriverPropertyInfo::description()
 {
     OUString aStr;
@@ -85,7 +85,7 @@ OUString java_sql_DriverPropertyInfo::description()
     } //t.pEnv
     return aStr;
 }
-// --------------------------------------------------------------------------------
+
 OUString java_sql_DriverPropertyInfo::value()
 {
     OUString aStr;
@@ -98,7 +98,7 @@ OUString java_sql_DriverPropertyInfo::value()
     } //t.pEnv
     return aStr;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool java_sql_DriverPropertyInfo::required()
 {
     jboolean out(0);
@@ -111,7 +111,7 @@ sal_Bool java_sql_DriverPropertyInfo::required()
     } //t.pEnv
     return out;
 }
-// --------------------------------------------------------------------------------
+
 Sequence< OUString> java_sql_DriverPropertyInfo::choices()
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -127,6 +127,6 @@ Sequence< OUString> java_sql_DriverPropertyInfo::choices()
     } //t.pEnv
     return Sequence< OUString>();
 }
-// --------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 810a1aee9896..3ed09d08f1c5 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -75,7 +75,7 @@ void SAL_CALL java_io_InputStream::closeInput(  ) throw(::com::sun::star::io::No
     static jmethodID mID(NULL);
     callVoidMethod("close",mID);
 }
-// -----------------------------------------------------
+
 sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     if (nBytesToRead < 0)
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 4c7a3a9ab0ae..7de8a6b3814a 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -249,9 +249,9 @@ bool loadClass(
 
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(java_sql_Connection,"com.sun.star.sdbcx.JConnection","com.sun.star.sdbc.Connection");
-//------------------------------------------------------------------------------
+
 //**************************************************************
 //************ Class: java.sql.Connection
 //**************************************************************
@@ -271,7 +271,7 @@ java_sql_Connection::java_sql_Connection( const java_sql_Driver& _rDriver )
     ,m_bIgnoreCurrency(sal_False)
 {
 }
-// -----------------------------------------------------------------------------
+
 java_sql_Connection::~java_sql_Connection()
 {
     ::rtl::Reference< jvmaccess::VirtualMachine > xTest = java_lang_Object::getVM();
@@ -291,12 +291,12 @@ java_sql_Connection::~java_sql_Connection()
         t.releaseRef();
     }
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::release() throw()
 {
     relase_ChildImpl();
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Connection::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -312,7 +312,7 @@ void java_sql_Connection::disposing()
         callVoidMethod("close",mID);
     }
 }
-// -------------------------------------------------------------------------
+
 jclass java_sql_Connection::getMyClass() const
 {
     // the class must be fetched only once, therefore static
@@ -321,7 +321,7 @@ jclass java_sql_Connection::getMyClass() const
     return theClass;
 }
 
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_Connection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -330,7 +330,7 @@ OUString SAL_CALL java_sql_Connection::getCatalog(  ) throw(SQLException, Runtim
     static jmethodID mID(NULL);
     return callStringMethod("getCatalog",mID);
 }
-// -------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -352,18 +352,18 @@ Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData(  ) thr
 
     return xMetaData;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::close(  ) throw(SQLException, RuntimeException)
 {
     dispose();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::commit(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethod("commit",mID);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_Connection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -371,7 +371,7 @@ sal_Bool SAL_CALL java_sql_Connection::isClosed(  ) throw(SQLException, RuntimeE
     static jmethodID mID(NULL);
     return callBooleanMethod( "isClosed", mID ) && java_sql_Connection_BASE::rBHelper.bDisposed;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_Connection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -379,37 +379,37 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly(  ) throw(SQLException, Runtim
     static jmethodID mID(NULL);
     return callBooleanMethod( "isReadOnly", mID );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethodWithStringArg("setCatalog",mID,catalog);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::rollback(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethod("rollback",mID);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_Connection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return callBooleanMethod( "getAutoCommit", mID );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethodWithBoolArg("setReadOnly",mID,readOnly);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethodWithBoolArg("setAutoCommit",mID,autoCommit);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -421,7 +421,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL java_sql_Connecti
     // WARNING: the caller becomes the owner of the returned pointer
     return 0;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -430,7 +430,7 @@ void SAL_CALL java_sql_Connection::setTypeMap( const Reference< ::com::sun::star
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this );
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -439,7 +439,7 @@ sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation(  ) throw(SQLExc
     static jmethodID mID(NULL);
     return callIntMethod("getTransactionIsolation",mID);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -448,7 +448,7 @@ void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) th
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setTransactionIsolation",mID,level);
 }
-// -------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL java_sql_Connection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -463,7 +463,7 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement(  ) throw(
     m_aLogger.log( LogLevel::FINE, STR_LOG_CREATED_STATEMENT_ID, pStatement->getStatementObjectID() );
     return xStmt;
 }
-// -----------------------------------------------------------------------------
+
 OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL)
 {
     OUString sSqlStatement = _sSQL;
@@ -489,7 +489,7 @@ OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL)
     }
     return sSqlStatement;
 }
-// -------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -507,7 +507,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement(
     m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARED_STATEMENT_ID, pStatement->getStatementObjectID() );
     return xReturn;
 }
-// -------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -525,7 +525,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const
     m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARED_CALL_ID, pStatement->getStatementObjectID() );
     return xStmt;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -553,13 +553,13 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQ
 
     return aStr;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Connection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethod("clearWarnings",mID);
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL java_sql_Connection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -588,7 +588,7 @@ Any SAL_CALL java_sql_Connection::getWarnings(  ) throw(SQLException, RuntimeExc
     return Any();
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const OUString& _rDriverClass, const OUString& _rDriverClassPath )
@@ -609,7 +609,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     bool lcl_setSystemProperties_nothrow( const java::sql::ConnectionLog& _rLogger,
@@ -655,7 +655,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClass, const OUString& _sDriverClassPath,
     const Sequence< NamedValue >& _rSystemProperties )
 {
@@ -755,7 +755,7 @@ void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClas
     enableAutoRetrievingEnabled( bAutoRetrievingEnabled );
     setAutoRetrievingStatement( sGeneratedValueStatement );
 }
-// -----------------------------------------------------------------------------
+
 OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString& _sDriverClass)
 {
     static const OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths");
@@ -769,7 +769,7 @@ OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString
     }
     return sURL;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool java_sql_Connection::construct(const OUString& url,
                                     const Sequence< PropertyValue >& info)
 {
@@ -861,6 +861,6 @@ sal_Bool java_sql_Connection::construct(const OUString& url,
     } //t.pEnv
      return object != NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index d867e50e784c..c1988f1ec5e9 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -40,38 +40,38 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 java_sql_Driver::java_sql_Driver(const Reference< ::com::sun::star::uno::XComponentContext >& _rxContext)
     :m_aContext( _rxContext )
     ,m_aLogger( _rxContext, "sdbcl", "org.openoffice.sdbc.jdbcBridge" )
 {
 }
-// --------------------------------------------------------------------------------
+
 java_sql_Driver::~java_sql_Driver()
 {
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString java_sql_Driver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.comp.sdbc.JDBCDriver");
         // this name is referenced in the configuration and in the jdbc.xml
         // Please take care when changing it.
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< OUString > aSNS( 1 );
     aSNS[0] = "com.sun.star.sdbc.Driver";
     return aSNS;
 }
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
     return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory)));
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_Driver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -82,12 +82,12 @@ sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceNam
     return cppu::supportsService(this, _rServiceName);
 }
 
-// --------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const
                                                          Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
@@ -105,7 +105,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url,
     }
     return xOut;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException)
 {
     // don't ask the real driver for the url
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLEx
     }
     return bEnabled && url.startsWith("jdbc:");
 }
-// -------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url,
                                                                          const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
@@ -237,17 +237,17 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index c4b0f296ecda..5eba3aeb92ac 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -43,21 +43,21 @@
 using namespace ::comphelper;
 using namespace connectivity;
 using namespace ::cppu;
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-//------------------------------------------------------------------------------
+
 //**************************************************************
 //************ Class: java.sql.Statement
 //**************************************************************
 
 jclass java_sql_Statement_Base::theClass = 0;
 
-// -------------------------------------------------------------------------
+
 java_sql_Statement_Base::java_sql_Statement_Base( JNIEnv * pEnv, java_sql_Connection& _rCon )
     :java_sql_Statement_BASE(m_aMutex)
     ,java_lang_Object( pEnv, NULL )
@@ -72,12 +72,12 @@ java_sql_Statement_Base::java_sql_Statement_Base( JNIEnv * pEnv, java_sql_Connec
     m_pConnection->acquire();
 }
 
-//------------------------------------------------------------------------------
+
 java_sql_Statement_Base::~java_sql_Statement_Base()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OStatement_BASE2::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -96,7 +96,7 @@ void SAL_CALL OStatement_BASE2::disposing()
     dispose_ChildImpl();
     java_sql_Statement_Base::disposing();
 }
-// -------------------------------------------------------------------------
+
 jclass java_sql_Statement_Base::getMyClass() const
 {
     // the class must be fetched only once, therefore static
@@ -104,21 +104,21 @@ jclass java_sql_Statement_Base::getMyClass() const
         theClass = findMyClass("java/sql/Statement");
     return theClass;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Statement_Base::disposing(void)
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_CLOSING_STATEMENT );
     java_sql_Statement_BASE::disposing();
     clearObject();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_BASE2::release() throw()
 {
     relase_ChildImpl();
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) )
@@ -126,7 +126,7 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw
     Any aRet( java_sql_Statement_BASE::queryInterface(rType) );
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -143,7 +143,7 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes(  ) throw(RuntimeExc
 
     return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  ) throw (SQLException, RuntimeException)
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_GENERATED_VALUES );
@@ -185,7 +185,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  )
     return xRes;
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_Statement_Base::cancel(  ) throw(RuntimeException)
 {
@@ -194,7 +194,7 @@ void SAL_CALL java_sql_Statement_Base::cancel(  ) throw(RuntimeException)
     static jmethodID mID(NULL);
     callVoidMethod("cancel",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_Statement_Base::close(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -205,7 +205,7 @@ void SAL_CALL java_sql_Statement_Base::close(  ) throw(::com::sun::star::sdbc::S
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_Statement::clearBatch(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -217,7 +217,7 @@ void SAL_CALL java_sql_Statement::clearBatch(  ) throw(::com::sun::star::sdbc::S
         callVoidMethod("clearBatch",mID);
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -251,7 +251,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(
     } //t.pEnv
     return out;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -287,21 +287,21 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this );
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     return aRet.hasValue() ? aRet : java_sql_Statement_Base::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -314,7 +314,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::s
         callVoidMethodWithStringArg("addBatch",mID,sql);
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -334,7 +334,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch(  ) throw(::com:
     }
     return aSeq;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
@@ -349,7 +349,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql )
     static jmethodID mID(NULL);
     return callIntMethodWithStringArg("executeUpdate",mID,sql);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -361,7 +361,7 @@ Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -372,16 +372,16 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount(  ) throw(::com::sun:
     m_aLogger.log( LogLevel::FINER, STR_LOG_UPDATE_COUNT, (sal_Int32)out );
     return out;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return callBooleanMethod( "getMoreResults", mID );
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 Any SAL_CALL java_sql_Statement_Base::getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     SDBThreadAttach t;
@@ -399,7 +399,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings(  ) throw(::com::sun::star::sd
 
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Statement_Base::clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -412,32 +412,32 @@ void SAL_CALL java_sql_Statement_Base::clearWarnings(  ) throw(::com::sun::star:
         callVoidMethod("clearWarnings",mID);
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getQueryTimeOut()  throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getQueryTimeOut",mID);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getMaxRows() throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getMaxRows",mID);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getResultSetConcurrency() throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getResultSetConcurrency",mID,m_nResultSetConcurrency);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getResultSetType() throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getResultSetType",mID,m_nResultSetType);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nDefault)
 {
     sal_Int32 out = _nDefault;
@@ -446,7 +446,7 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm
 
     return out;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jmethodID& _inout_MethodID)
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
@@ -454,25 +454,25 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm
     return callIntMethod(_pMethodName,_inout_MethodID,true);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getFetchDirection() throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getFetchDirection",mID);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getFetchSize() throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getFetchSize",mID);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_getProperty("getMaxFieldSize",mID);
 }
-//------------------------------------------------------------------------------
+
 OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -489,7 +489,7 @@ OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeExc
     }
     return OUString();
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -500,7 +500,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLExceptio
     callVoidMethodWithIntArg("setQueryTimeOut",mID,_par0,true);
 }
 
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -514,7 +514,7 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException
     callVoidMethodWithBoolArg("setEscapeProcessing",mID,_par0,true);
 }
 
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -524,7 +524,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, Ru
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setMaxRows",mID,_par0,true);
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -534,7 +534,7 @@ void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQL
 
     clearObject();
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -544,7 +544,7 @@ void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLExcepti
 
     clearObject();
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -555,7 +555,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLExcept
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setFetchDirection",mID,_par0,true);
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -567,7 +567,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException,
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setFetchSize",mID,_par0,true);
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -577,7 +577,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setMaxFieldSize",mID,_par0,true);
 }
-//------------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -590,7 +590,7 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLExce
     } //t.pEnv
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* java_sql_Statement_Base::createArrayHelper( ) const
 {
     Sequence< Property > aProps(10);
@@ -610,13 +610,13 @@ void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLExce
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & java_sql_Statement_Base::getInfoHelper()
 
 {
     return *const_cast<java_sql_Statement_Base*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_Statement_Base::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -662,7 +662,7 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& rValue
@@ -704,7 +704,7 @@ void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void java_sql_Statement_Base::getFastPropertyValue(
                                 Any& rValue,
                                 sal_Int32 nHandle
@@ -751,7 +751,7 @@ void java_sql_Statement_Base::getFastPropertyValue(
     {
     }
 }
-// -------------------------------------------------------------------------
+
 jclass java_sql_Statement::theClass = 0;
 
 java_sql_Statement::~java_sql_Statement()
@@ -765,7 +765,7 @@ jclass java_sql_Statement::getMyClass() const
     return theClass;
 }
 
-// -----------------------------------------------------------------------------
+
 void java_sql_Statement::createStatement(JNIEnv* _pEnv)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -797,36 +797,36 @@ void java_sql_Statement::createStatement(JNIEnv* _pEnv)
             object = _pEnv->NewGlobalRef( out );
     } //_pEnv
 }
-// -----------------------------------------------------------------------------
+
 
 
 IMPLEMENT_SERVICE_INFO(java_sql_Statement,"com.sun.star.sdbcx.JStatement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Statement_Base::acquire() throw()
 {
     java_sql_Statement_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Statement_Base::release() throw()
 {
     java_sql_Statement_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Statement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_Statement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index f2a9ece8c85b..ef437409ba00 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 
-// -----------------------------------------------------------------------------
+
 ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM2(const ::rtl::Reference< jvmaccess::VirtualMachine >& _rVM = ::rtl::Reference< jvmaccess::VirtualMachine >(),
                                                         sal_Bool _bSet = sal_False)
 {
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::lang;
         s_VM = _rVM;
     return s_VM;
 }
-// -----------------------------------------------------------------------------
+
 ::rtl::Reference< jvmaccess::VirtualMachine > java_lang_Object::getVM(const Reference<XComponentContext >& _rxContext)
 {
     ::rtl::Reference< jvmaccess::VirtualMachine > xVM = getJavaVM2();
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::lang;
 
     return xVM;
 }
-// -----------------------------------------------------------------------------
+
 SDBThreadAttach::SDBThreadAttach()
  : m_aGuard(java_lang_Object::getVM())
  , pEnv(NULL)
@@ -66,22 +66,22 @@ SDBThreadAttach::SDBThreadAttach()
     pEnv = m_aGuard.getEnvironment();
     OSL_ENSURE(pEnv,"Environment is nULL!");
 }
-// -----------------------------------------------------------------------------
+
 SDBThreadAttach::~SDBThreadAttach()
 {
 }
-// -----------------------------------------------------------------------------
+
 oslInterlockedCount& getJavaVMRefCount()
 {
     static oslInterlockedCount s_nRefCount = 0;
     return s_nRefCount;
 }
-// -----------------------------------------------------------------------------
+
 void SDBThreadAttach::addRef()
 {
     osl_atomic_increment(&getJavaVMRefCount());
 }
-// -----------------------------------------------------------------------------
+
 void SDBThreadAttach::releaseRef()
 {
     osl_atomic_decrement(&getJavaVMRefCount());
@@ -90,7 +90,7 @@ void SDBThreadAttach::releaseRef()
         getJavaVM2(::rtl::Reference< jvmaccess::VirtualMachine >(),sal_True);
     }
 }
-// -----------------------------------------------------------------------------
+
 // static variables of the class
 jclass java_lang_Object::theClass = 0;
 
@@ -157,7 +157,7 @@ OUString java_lang_Object::toString() const
     return callStringMethod("toString",mID);
 }
 
-// --------------------------------------------------------------------------------
+
 namespace
 {
     bool    lcl_translateJNIExceptionToUNOException(
@@ -197,7 +197,7 @@ namespace
     }
 }
 
-// --------------------------------------------------------------------------------
+
 void java_lang_Object::ThrowLoggedSQLException( const ::comphelper::ResourceBasedEventLogger& _rLogger, JNIEnv* _pEnvironment,
     const Reference< XInterface >& _rxContext )
 {
@@ -209,14 +209,14 @@ void java_lang_Object::ThrowLoggedSQLException( const ::comphelper::ResourceBase
     }
 }
 
-// --------------------------------------------------------------------------------
+
 void java_lang_Object::ThrowSQLException( JNIEnv* _pEnvironment, const Reference< XInterface>& _rxContext )
 {
     SQLException aException;
     if ( lcl_translateJNIExceptionToUNOException( _pEnvironment, _rxContext, aException ) )
         throw aException;
 }
-// -----------------------------------------------------------------------------
+
 void java_lang_Object::obtainMethodId(JNIEnv* _pEnv,const char* _pMethodName, const char* _pSignature,jmethodID& _inout_MethodID) const
 {
     if  ( !_inout_MethodID )
@@ -227,7 +227,7 @@ void java_lang_Object::obtainMethodId(JNIEnv* _pEnv,const char* _pMethodName, co
             throw SQLException();
     } // if  ( !_inout_MethodID )
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool java_lang_Object::callBooleanMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const
 {
     jboolean out( sal_False );
@@ -241,7 +241,7 @@ sal_Bool java_lang_Object::callBooleanMethod( const char* _pMethodName, jmethodI
 
     return out;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool java_lang_Object::callBooleanMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument ) const
 {
     jboolean out( sal_False );
@@ -254,14 +254,14 @@ sal_Bool java_lang_Object::callBooleanMethodWithIntArg( const char* _pMethodName
 
     return out;
 }
-// -------------------------------------------------------------------------
+
 jobject java_lang_Object::callResultSetMethod( JNIEnv& _rEnv,const char* _pMethodName, jmethodID& _inout_MethodID ) const
 {
     // call method
     jobject out = callObjectMethod(&_rEnv,_pMethodName,"()Ljava/sql/ResultSet;", _inout_MethodID);
     return out;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID& _inout_MethodID,bool _bIgnoreException ) const
 {
     SDBThreadAttach t;
@@ -277,7 +277,7 @@ sal_Int32 java_lang_Object::callIntMethod( const char* _pMethodName, jmethodID&
 
     return (sal_Int32)out;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 java_lang_Object::callIntMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID,sal_Int32 _nArgument ) const
 {
     SDBThreadAttach t;
@@ -289,7 +289,7 @@ sal_Int32 java_lang_Object::callIntMethodWithIntArg( const char* _pMethodName, j
 
     return (sal_Int32)out;
 }
-// -------------------------------------------------------------------------
+
 void java_lang_Object::callVoidMethod( const char* _pMethodName, jmethodID& _inout_MethodID) const
 {
     SDBThreadAttach t;
@@ -300,7 +300,7 @@ void java_lang_Object::callVoidMethod( const char* _pMethodName, jmethodID& _ino
     t.pEnv->CallVoidMethod( object, _inout_MethodID );
     ThrowSQLException( t.pEnv, NULL );
 }
-// -------------------------------------------------------------------------
+
 void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID, sal_Int32 _nArgument,bool _bIgnoreException ) const
 {
     SDBThreadAttach t;
@@ -314,7 +314,7 @@ void java_lang_Object::callVoidMethodWithIntArg( const char* _pMethodName, jmeth
     else
         ThrowSQLException( t.pEnv, NULL );
 }
-// -------------------------------------------------------------------------
+
 void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmethodID& _inout_MethodID, bool _nArgument,bool _bIgnoreException ) const
 {
     SDBThreadAttach t;
@@ -327,7 +327,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet
     else
         ThrowSQLException( t.pEnv, NULL );
 }
-// -----------------------------------------------------------------------------
+
 OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const
 {
     SDBThreadAttach t;
@@ -337,7 +337,7 @@ OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID
     jstring out = (jstring)callObjectMethod(t.pEnv,_pMethodName,"()Ljava/lang/String;", _inout_MethodID);
     return JavaString2String( t.pEnv, out );
 }
-// -----------------------------------------------------------------------------
+
 jobject java_lang_Object::callObjectMethod( JNIEnv * _pEnv,const char* _pMethodName,const char* _pSignature, jmethodID& _inout_MethodID ) const
 {
     // obtain method ID
@@ -348,7 +348,7 @@ jobject java_lang_Object::callObjectMethod( JNIEnv * _pEnv,const char* _pMethodN
     return out;
 }
 
-// -----------------------------------------------------------------------------
+
 jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char* _pMethodName,const char* _pSignature, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const
 {
     obtainMethodId(_pEnv, _pMethodName,_pSignature, _inout_MethodID);
@@ -357,7 +357,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char*
     ThrowSQLException( _pEnv, NULL );
     return out;
 }
-// -----------------------------------------------------------------------------
+
 OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const
 {
     SDBThreadAttach t;
@@ -365,7 +365,7 @@ OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName,
     jstring out = (jstring)callObjectMethodWithIntArg(t.pEnv,_pMethodName,"(I)Ljava/lang/String;",_inout_MethodID,_nArgument);
     return JavaString2String( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const
 {
     SDBThreadAttach t;
@@ -377,7 +377,7 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm
     t.pEnv->CallVoidMethod( object, _inout_MethodID , str.get());
     ThrowSQLException( t.pEnv, NULL );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const
 {
     SDBThreadAttach t;
@@ -399,7 +399,7 @@ sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName
     ThrowSQLException( t.pEnv, NULL );
     return (sal_Int32)out;
 }
-// -----------------------------------------------------------------------------
+
 jclass java_lang_Object::findMyClass(const char* _pClassName)
 {
     // the class must be fetched only once, therefore static
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index fa941de61820..f15bd4f45b7d 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -53,13 +53,13 @@ java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_
 {
     m_sSqlStatement = sql;
 }
-// -----------------------------------------------------------------------------
+
 jclass java_sql_PreparedStatement::theClass = 0;
 
 java_sql_PreparedStatement::~java_sql_PreparedStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 jclass java_sql_PreparedStatement::getMyClass() const
 {
@@ -68,7 +68,7 @@ jclass java_sql_PreparedStatement::getMyClass() const
         theClass = findMyClass("java/sql/PreparedStatement");
     return theClass;
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
@@ -79,7 +79,7 @@ jclass java_sql_PreparedStatement::getMyClass() const
                                         static_cast< XResultSetMetaDataSupplier*>(this),
                                         static_cast< XPreparedBatchExecution*>(this));
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const ::com::sun::star::uno::Reference< XPreparedStatement > *)0 ),
@@ -89,7 +89,7 @@ jclass java_sql_PreparedStatement::getMyClass() const
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_BASE2::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -102,7 +102,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute(  ) throw(::com::sun::star
     static jmethodID mID(NULL);
     return callBooleanMethod( "execute", mID );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -115,7 +115,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate(  ) throw(::com::su
     static jmethodID mID(NULL);
     return callIntMethod("executeUpdate",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -137,13 +137,13 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -158,7 +158,7 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c
 
     return out==0 ? 0 : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -171,7 +171,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex,
     static jmethodID mID(NULL);
     callVoidMethod("setBoolean", "(IZ)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -184,7 +184,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal
     static jmethodID mID(NULL);
     callVoidMethod("setByte", "(IB)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -198,7 +198,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con
     static jmethodID mID(NULL);
     callVoidMethod("setDate", "(ILjava/sql/Date;)V", mID, parameterIndex, aT.getJavaObject());
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -213,7 +213,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con
     static jmethodID mID(NULL);
     callVoidMethod("setTime", "(ILjava/sql/Time;)V", mID, parameterIndex, aT.getJavaObject());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -227,7 +227,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex
     java_sql_Timestamp aD(x);
     callVoidMethod("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject());
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_DOUBLE_PARAMETER, parameterIndex, x );
@@ -239,7 +239,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d
     static jmethodID mID(NULL);
     callVoidMethod("setDouble", "(ID)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -252,7 +252,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl
     static jmethodID mID(NULL);
     callVoidMethod("setFloat", "(IF)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -265,7 +265,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_
     static jmethodID mID(NULL);
     callVoidMethod("setInt", "(II)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -278,7 +278,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal
     static jmethodID mID(NULL);
     callVoidMethod("setLong", "(IJ)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -291,31 +291,31 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal
     static jmethodID mID(NULL);
     callVoidMethod("setNull", "(II)V", mID, parameterIndex, sqlType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XClob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRef >& /*x*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -374,7 +374,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
         } //mID
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -387,7 +387,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde
     static jmethodID mID(NULL);
     callVoidMethod<jobject>("setObject", "(ILjava/lang/Object;)V", mID, parameterIndex, NULL);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -400,7 +400,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c
         ::dbtools::throwGenericSQLException(sError,*this);
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -413,7 +413,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa
     static jmethodID mID(NULL);
     callVoidMethod("setShort", "(IS)V", mID, parameterIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -438,7 +438,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -486,7 +486,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete
         ThrowLoggedSQLException( m_aLogger, t.pEnv, *this );
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -535,7 +535,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn
         }
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::clearParameters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -551,7 +551,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters(  ) throw(::com::sun::
         callVoidMethod("clearParameters",mID);
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_PreparedStatement::clearBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -563,7 +563,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch(  ) throw(::com::sun::star:
         callVoidMethod("clearBatch",mID);
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -576,7 +576,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd
         callVoidMethod("addBatch",mID);
     } //t.pEnv
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -596,7 +596,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd
     }
     return aSeq;
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -608,17 +608,17 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(::com::sun::star::sd
 
     return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_PreparedStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_PreparedStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -656,7 +656,7 @@ void java_sql_PreparedStatement::createStatement(JNIEnv* _pEnv)
             object = _pEnv->NewGlobalRef( out );
     } //t.pEnv
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index a15066c9475e..1cf384c4ee31 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -77,7 +77,7 @@ void SAL_CALL java_io_Reader::closeInput(  ) throw(::com::sun::star::io::NotConn
     static jmethodID mID(NULL);
     callVoidMethod("close",mID);
 }
-// -----------------------------------------------------
+
 sal_Int32 SAL_CALL java_io_Reader::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_ENSURE(aData.getLength() < nBytesToRead," Sequence is smaller than BytesToRead");
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 1b3c38c658c0..6912fce9b990 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -78,7 +78,7 @@ java_sql_ResultSet::java_sql_ResultSet( JNIEnv * pEnv, jobject myObj, const java
 
     osl_atomic_decrement(&m_refCount);
 }
-// -----------------------------------------------------------------------------
+
 java_sql_ResultSet::~java_sql_ResultSet()
 {
     if ( !java_sql_ResultSet_BASE::rBHelper.bDisposed && !java_sql_ResultSet_BASE::rBHelper.bInDispose )
@@ -98,7 +98,7 @@ jclass java_sql_ResultSet::getMyClass() const
     return theClass;
 }
 
-// -------------------------------------------------------------------------
+
 void java_sql_ResultSet::disposing(void)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::disposing" );
@@ -116,14 +116,14 @@ m_xMetaData.clear();
 
     SDBThreadAttach::releaseRef();
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::queryInterface" );
     ::com::sun::star::uno::Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL java_sql_ResultSet::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getTypes" );
@@ -133,7 +133,7 @@ m_xMetaData.clear();
 
     return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_ResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -141,7 +141,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName )
     static jmethodID mID(NULL);
     return callIntMethodWithStringArg("findColumn",mID,columnName);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBinaryStream" );
@@ -152,7 +152,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_io_InputStream( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getCharacterStream" );
@@ -163,7 +163,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL java_sql_ResultSet::get
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_io_Reader( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -171,7 +171,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -180,7 +180,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQL
     jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod;
     return callMethodWithIntArg<jbyte>(pCallMethod,"getByte","(I)B",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -198,7 +198,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde
     }
     return aSeq;
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -209,7 +209,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde
     // WARNING: the caller becomes the owner of the returned pointer
     return out ? static_cast <com::sun::star::util::Date> (java_sql_Date( t.pEnv, out )) : ::com::sun::star::util::Date();
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -218,7 +218,7 @@ double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQL
     jdouble (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod;
     return callMethodWithIntArg<double>(pCallMethod,"getDouble","(I)D",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -227,7 +227,7 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLEx
     jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod;
     return callMethodWithIntArg<jfloat>(pCallMethod,"getFloat","(I)F",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -235,7 +235,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQL
     static jmethodID mID(NULL);
     return callIntMethodWithIntArg("getInt",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_ResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
@@ -243,7 +243,7 @@ sal_Int32 SAL_CALL java_sql_ResultSet::getRow(  ) throw(SQLException, RuntimeExc
     static jmethodID mID(NULL);
     return callIntMethod("getRow",mID);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -252,7 +252,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ
     jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod;
     return callMethodWithIntArg<jlong>(pCallMethod,"getLong","(I)J",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -263,7 +263,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ
 
     return out==0 ? 0 : new java_sql_ResultSetMetaData( t.pEnv, out, m_aLogger,*m_pConnection );
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getArray" );
@@ -274,7 +274,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_Array( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -285,7 +285,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex )
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_Clob( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getBlob" );
@@ -295,7 +295,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex )
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_Blob( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -307,7 +307,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t
     // WARNING: the caller becomes the owner of the returned pointer
     return out==0 ? 0 : new java_sql_Ref( t.pEnv, out );
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
@@ -369,7 +369,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
     } //t.pEnv
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -378,7 +378,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S
     jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod;
     return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 
 OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -387,7 +387,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getString",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -399,7 +399,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S
     // WARNING: the caller becomes the owner of the returned pointer
     return out ? static_cast <com::sun::star::util::Time> (java_sql_Time( t.pEnv, out )) : ::com::sun::star::util::Time();
 }
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -411,7 +411,7 @@ OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(S
     // WARNING: the caller becomes the owner of the returned pointer
     return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
@@ -419,42 +419,42 @@ sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast(  ) throw(SQLException, Runtim
     static jmethodID mID(NULL);
     return callBooleanMethod( "isAfterLast", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isFirst" );
     static jmethodID mID(NULL);
     return callBooleanMethod( "isFirst", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::isLast" );
     static jmethodID mID(NULL);
     return callBooleanMethod( "isLast", mID );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::beforeFirst" );
     static jmethodID mID(NULL);
     callVoidMethod("beforeFirst",mID);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::afterLast" );
     static jmethodID mID(NULL);
     callVoidMethod("afterLast",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::close(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::close" );
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -462,7 +462,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::first(  ) throw(SQLException, RuntimeExcep
     static jmethodID mID(NULL);
     return callBooleanMethod( "first", mID );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -470,34 +470,34 @@ sal_Bool SAL_CALL java_sql_ResultSet::last(  ) throw(SQLException, RuntimeExcept
     static jmethodID mID(NULL);
     return callBooleanMethod( "last", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::absolute" );
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "absolute", mID,row );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::relative" );
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "relative", mID,row );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::previous" );
     static jmethodID mID(NULL);
     return callBooleanMethod( "previous", mID );
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getStatement" );
     return m_xStatement;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -505,21 +505,21 @@ sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted(  ) throw(SQLException, Runtime
     static jmethodID mID(NULL);
     return callBooleanMethod( "rowDeleted", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowInserted" );
     static jmethodID mID(NULL);
     return callBooleanMethod( "rowInserted", mID );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::rowUpdated" );
     static jmethodID mID(NULL);
     return callBooleanMethod( "rowUpdated", mID );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -527,7 +527,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst(  ) throw(SQLException, Runt
     static jmethodID mID(NULL);
     return callBooleanMethod( "isBeforeFirst", mID );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -535,7 +535,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::next(  ) throw(SQLException, RuntimeExcept
     static jmethodID mID(NULL);
     return callBooleanMethod( "next", mID );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -543,7 +543,7 @@ sal_Bool SAL_CALL java_sql_ResultSet::wasNull(  ) throw(SQLException, RuntimeExc
     static jmethodID mID(NULL);
     return callBooleanMethod( "wasNull", mID );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::cancel(  ) throw(::com::sun::star::uno::RuntimeException)
 {
@@ -551,15 +551,15 @@ void SAL_CALL java_sql_ResultSet::cancel(  ) throw(::com::sun::star::uno::Runtim
     static jmethodID mID(NULL);
     callVoidMethod("cancel",mID);
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 void SAL_CALL java_sql_ResultSet::clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::clearWarnings" );
     static jmethodID mID(NULL);
     callVoidMethod("clearWarnings",mID);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SAL_CALL java_sql_ResultSet::getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getWarnings" );
@@ -577,7 +577,7 @@ void SAL_CALL java_sql_ResultSet::clearWarnings(  ) throw(::com::sun::star::sdbc
 
     return ::com::sun::star::uno::Any();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::insertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -585,21 +585,21 @@ void SAL_CALL java_sql_ResultSet::insertRow(  ) throw(::com::sun::star::sdbc::SQ
     static jmethodID mID(NULL);
     callVoidMethod("insertRow",mID);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::updateRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateRow" );
     static jmethodID mID(NULL);
     callVoidMethod("updateRow",mID);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::deleteRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::deleteRow" );
     static jmethodID mID(NULL);
     callVoidMethod("deleteRow",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::cancelRowUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -607,7 +607,7 @@ void SAL_CALL java_sql_ResultSet::cancelRowUpdates(  ) throw(::com::sun::star::s
     static jmethodID mID(NULL);
     callVoidMethod("cancelRowUpdates",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::moveToInsertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -615,7 +615,7 @@ void SAL_CALL java_sql_ResultSet::moveToInsertRow(  ) throw(::com::sun::star::sd
     static jmethodID mID(NULL);
     callVoidMethod("moveToInsertRow",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -623,7 +623,7 @@ void SAL_CALL java_sql_ResultSet::moveToCurrentRow(  ) throw(::com::sun::star::s
     static jmethodID mID(NULL);
     callVoidMethod("moveToCurrentRow",mID);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -631,7 +631,7 @@ void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(::co
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("updateNull",mID,columnIndex);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -639,14 +639,14 @@ void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool
     static jmethodID mID(NULL);
     callVoidMethod("updateBoolean", "(IZ)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateByte" );
     static jmethodID mID(NULL);
     callVoidMethod("updateByte", "(IB)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -654,30 +654,30 @@ void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16
     static jmethodID mID(NULL);
     callVoidMethod("updateShort", "(IS)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateInt" );
     static jmethodID mID(NULL);
     callVoidMethod("updateInt", "(II)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateLong" );
     static jmethodID mID(NULL);
     callVoidMethod("updateLong", "(IJ)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateFloat" );
     static jmethodID mID(NULL);
     callVoidMethod("updateFloat", "(IF)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -685,7 +685,7 @@ void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x
     static jmethodID mID(NULL);
     callVoidMethod("updateDouble", "(ID)V", mID, columnIndex, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -713,7 +713,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS
         }
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -742,7 +742,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const ::co
         }
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -751,7 +751,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const ::com
     static jmethodID mID(NULL);
     callVoidMethod("updateDate", "(ILjava/sql/Date;)V", mID, columnIndex, aD.getJavaObject());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -760,7 +760,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const ::com
     static jmethodID mID(NULL);
     callVoidMethod("updateTime", "(ILjava/sql/Time;)V", mID, columnIndex, aD.getJavaObject());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -769,7 +769,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const
     static jmethodID mID(NULL);
     callVoidMethod("updateTimestamp", "(ILjava/sql/Timestamp;)V", mID, columnIndex, aD.getJavaObject());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -802,7 +802,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con
         ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateBinaryStream", *this );
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateCharacterStream" );
@@ -834,7 +834,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex,
         ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateCharacterStream", *this );
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::updateObject" );
@@ -848,7 +848,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c
         ::dbtools::throwGenericSQLException(sError,*this);
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -892,35 +892,35 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co
         updateObject( columnIndex,x);
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getResultSetConcurrency" );
     static jmethodID mID(NULL);
     return callIntMethod("getConcurrency",mID,true);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_ResultSet::getResultSetType() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getResultSetType" );
     static jmethodID mID(NULL);
     return callIntMethod("getType",mID,true);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFetchDirection" );
     static jmethodID mID(NULL);
     return callIntMethod("getFetchDirection",mID,true);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getFetchSize" );
     static jmethodID mID(NULL);
     return callIntMethod("getFetchSize",mID,true);
 }
-//------------------------------------------------------------------------------
+
 OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getCursorName" );
@@ -928,28 +928,28 @@ OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc:
     return callStringMethod("getCursorName",mID);
 }
 
-//------------------------------------------------------------------------------
+
 void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::setFetchDirection" );
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setFetchDirection",mID,_par0,true);
 }
-//------------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::refreshRow" );
     static jmethodID mID(NULL);
     callVoidMethod("refreshRow",mID);
 }
-//------------------------------------------------------------------------------
+
 void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::setFetchSize" );
     static jmethodID mID(NULL);
     callVoidMethodWithIntArg("setFetchSize",mID,_par0,true);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* java_sql_ResultSet::createArrayHelper( ) const
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::createArrayHelper" );
@@ -964,13 +964,13 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s
 
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & java_sql_ResultSet::getInfoHelper()
 {
     //SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getInfoHelper" );
     return *const_cast<java_sql_ResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool java_sql_ResultSet::convertFastPropertyValue(
                             ::com::sun::star::uno::Any & rConvertedValue,
                             ::com::sun::star::uno::Any & rOldValue,
@@ -997,7 +997,7 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue(
     return bRet;
 }
 
-// -------------------------------------------------------------------------
+
 void java_sql_ResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const ::com::sun::star::uno::Any& rValue
@@ -1021,7 +1021,7 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void java_sql_ResultSet::getFastPropertyValue(
                                 ::com::sun::star::uno::Any& rValue,
                                 sal_Int32 nHandle
@@ -1053,23 +1053,23 @@ void java_sql_ResultSet::getFastPropertyValue(
     {
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::acquire() throw()
 {
     java_sql_ResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL java_sql_ResultSet::release() throw()
 {
     java_sql_ResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSet::getPropertySetInfo" );
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index b3876b187f93..2e65be4f1ebf 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -55,7 +55,7 @@ jclass java_sql_ResultSetMetaData::getMyClass() const
         theClass = findMyClass("java/sql/ResultSetMetaData");
     return theClass;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -63,7 +63,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 c
     static jmethodID mID(NULL);
     return callIntMethodWithIntArg("getColumnDisplaySize",mID,column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -71,7 +71,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column )
     static jmethodID mID(NULL);
     return callIntMethodWithIntArg("getColumnType",mID,column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
@@ -84,7 +84,7 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount(  ) throw(SQLExcep
     return m_nColumnCount;
 
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -92,14 +92,14 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getSchemaName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getSchemaName",mID,column);
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -107,42 +107,42 @@ OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column )
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnName",mID,column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getTableName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getTableName",mID,column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getCatalogName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getCatalogName",mID,column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnTypeName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnTypeName",mID,column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnLabel" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnLabel",mID,column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getColumnServiceName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnClassName",mID,column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -152,7 +152,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) thr
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isCurrency", mID,column );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -160,7 +160,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isAutoIncrement", mID,column );
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
@@ -169,28 +169,28 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isSigned", mID,column );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getPrecision" );
     static jmethodID mID(NULL);
     return callIntMethodWithIntArg("getPrecision",mID,column);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::getScale" );
     static jmethodID mID(NULL);
     return callIntMethodWithIntArg("getScale",mID,column);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isNullable" );
     static jmethodID mID(NULL);
     return callIntMethodWithIntArg("isNullable",mID,column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -198,7 +198,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) t
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isSearchable", mID,column );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -206,7 +206,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) thr
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isReadOnly", mID,column );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -214,13 +214,13 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 co
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isDefinitelyWritable", mID,column );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "jdbc Ocke.Janssen@sun.com java_sql_ResultSetMetaData::isWritable" );
     static jmethodID mID(NULL);
     return callBooleanMethodWithIntArg( "isWritable", mID,column );
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index ce9d464ecf3e..477ab07036c2 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -41,7 +41,7 @@ jclass java_lang_String::st_getMyClass()
     return theClass;
 }
 
-//--------------------------------------------------------------------------
+
 java_lang_String::operator OUString()
 {
     SDBThreadAttach t;
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index 90b4a015e673..6143ff7ec343 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -40,14 +40,14 @@ jclass java_lang_Throwable::st_getMyClass()
         theClass = findMyClass("java/lang/Throwable");
     return theClass;
 }
-// -----------------------------------------------------------------------------
+
 
 OUString java_lang_Throwable::getMessage() const
 {
     static jmethodID mID(NULL);
     return callStringMethod("getMessage",mID);
 }
-// -----------------------------------------------------------------------------
+
 
 OUString java_lang_Throwable::getLocalizedMessage() const
 {
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index c319f75679a0..20d257714514 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -68,7 +68,7 @@ jclass java_sql_Date::st_getMyClass()
         theClass = findMyClass("java/sql/Date");
     return theClass;
 }
-// -----------------------------------------------------------------------------
+
 
 java_sql_Date::operator ::com::sun::star::util::Date()
 {
@@ -121,7 +121,7 @@ java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_
     t.pEnv->DeleteLocalRef( tempObj );
     // and clean
 }
-// -----------------------------------------------------------------------------
+
 java_sql_Time::operator ::com::sun::star::util::Time()
 {
     return ::dbtools::DBTypeConversion::toTime(toString());
@@ -176,12 +176,12 @@ java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _
     // and clean
 }
 
-// -----------------------------------------------------------------------------
+
 java_sql_Timestamp::operator ::com::sun::star::util::DateTime()
 {
     return ::dbtools::DBTypeConversion::toDateTime(toString());
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 438bb28b3318..600294db836a 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index 02a8094ae36d..c443b229edcb 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -74,7 +74,7 @@ jclass java_util_Properties::getMyClass() const
     return theClass;
 }
 
-//--------------------------------------------------------------------------
+
 java_util_Properties::java_util_Properties( ): java_lang_Object( NULL, (jobject)NULL )
 {
     SDBThreadAttach t;
@@ -91,7 +91,7 @@ java_util_Properties::java_util_Properties( ): java_lang_Object( NULL, (jobject)
     t.pEnv->DeleteLocalRef( tempObj );
 }
 
-// --------------------------------------------------------------------------------
+
 jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _rTemp)
 {
     OSL_ENSURE(pEnv,"Environment is NULL!");
@@ -101,7 +101,7 @@ jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _r
     return pStr;
 }
 
-// --------------------------------------------------------------------------------
+
 java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info )  throw(SQLException, RuntimeException)
 {
     java_util_Properties* pProps = new java_util_Properties();
@@ -152,7 +152,7 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr
     }
     return pProps;
 }
-// --------------------------------------------------------------------------------
+
 OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str)
 {
     OUString aStr;
@@ -169,7 +169,7 @@ OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str)
     }
     return aStr;
 }
-// --------------------------------------------------------------------------------
+
 jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference< ::com::sun::star::container::XNameAccess > & _rMap)
 {
     if ( _rMap.is() )
@@ -180,7 +180,7 @@ jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference<
     }
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool connectivity::isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear)
 {
     if ( !pEnv )
@@ -208,7 +208,7 @@ sal_Bool connectivity::isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear)
 
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length)
 {
     SDBThreadAttach t;
@@ -235,7 +235,7 @@ jobject connectivity::createByteInputStream(const ::com::sun::star::uno::Referen
     t.pEnv->DeleteLocalRef((jbyteArray)pByteArray);
     return out;
 }
-// -----------------------------------------------------------------------------
+
 jobject connectivity::createCharArrayReader(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& x,sal_Int32 length)
 {
     SDBThreadAttach t;
@@ -262,6 +262,6 @@ jobject connectivity::createCharArrayReader(const ::com::sun::star::uno::Referen
     t.pEnv->DeleteLocalRef((jcharArray)pCharArray);
     return out;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index a0b22b34e6e1..3eee195ee388 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -31,14 +31,14 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::cppu;
 
-// -------------------------------------------------------------------------
+
 KabCatalog::KabCatalog(KabConnection* _pCon)
         : connectivity::sdbcx::OCatalog(_pCon),
           m_pConnection(_pCon),
           m_xMetaData(m_pConnection->getMetaData())
 {
 }
-// -------------------------------------------------------------------------
+
 void KabCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -68,19 +68,19 @@ void KabCatalog::refreshTables()
     else
         m_pTables = new KabTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void KabCatalog::refreshViews()
 {
 }
-// -------------------------------------------------------------------------
+
 void KabCatalog::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 void KabCatalog::refreshUsers()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL KabCatalog::getTables(  ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index a73f813d357f..d3c0c8a891eb 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType KabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
@@ -77,12 +77,12 @@ sdbcx::ObjectType KabColumns::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void KabColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 KabColumns::KabColumns( KabTable* _pTable,
                         ::osl::Mutex& _rMutex,
                         const TStringVector &_rVector)
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index 0e0cc690083b..32d1cae21522 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
 IMPLEMENT_SERVICE_INFO(KabConnection, "com.sun.star.sdbc.drivers.KabConnection", "com.sun.star.sdbc.Connection")
-//-----------------------------------------------------------------------------
+
 KabConnection::KabConnection(KabDriver* _pDriver)
          : OMetaConnection_BASE(m_aMutex),
          OSubComponent<KabConnection, KabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
@@ -46,7 +46,7 @@ KabConnection::KabConnection(KabDriver* _pDriver)
 {
     m_pDriver->acquire();
 }
-//-----------------------------------------------------------------------------
+
 KabConnection::~KabConnection()
 {
     if (!isClosed())
@@ -55,12 +55,12 @@ KabConnection::~KabConnection()
     m_pDriver->release();
     m_pDriver = NULL;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 void KabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
@@ -74,7 +74,7 @@ void KabConnection::construct(const OUString&, const Sequence< PropertyValue >&)
     osl_atomic_decrement( &m_refCount );
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL KabConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -86,7 +86,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement(  ) throw(SQLExc
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -98,7 +98,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -107,7 +107,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUStr
     // not implemented yet :-) a task to do
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -115,14 +115,14 @@ OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLExc
 
     return _sSql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
     // here you  have to set your commit mode please have a look at the jdbc documentation to get a clear explanation
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -132,7 +132,7 @@ sal_Bool SAL_CALL KabConnection::getAutoCommit(  ) throw(SQLException, RuntimeEx
 
     return sal_True;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -140,7 +140,7 @@ void SAL_CALL KabConnection::commit(  ) throw(SQLException, RuntimeException)
 
     // when you database does support transactions you should commit here
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -148,7 +148,7 @@ void SAL_CALL KabConnection::rollback(  ) throw(SQLException, RuntimeException)
 
     // same as commit but for the other case
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -156,7 +156,7 @@ sal_Bool SAL_CALL KabConnection::isClosed(  ) throw(SQLException, RuntimeExcepti
     // just simple -> we are closed when we are disposed, that means someone called dispose(); (XComponent)
     return KabConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -173,7 +173,7 @@ Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData(  ) throw(SQL
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -181,7 +181,7 @@ void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runtime
 
     // set you connection to readonly
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -190,7 +190,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly(  ) throw(SQLException, RuntimeExcep
     // return if your connection to readonly
     return sal_False;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -198,7 +198,7 @@ void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, R
 
     // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL KabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -208,7 +208,7 @@ OUString SAL_CALL KabConnection::getCatalog(  ) throw(SQLException, RuntimeExcep
     // return your current catalog
     return OUString();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -217,7 +217,7 @@ void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExcep
     // set your isolation level
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -227,7 +227,7 @@ sal_Int32 SAL_CALL KabConnection::getTransactionIsolation(  ) throw(SQLException
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
     return TransactionIsolation::NONE;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -237,12 +237,12 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL KabConnection::ge
 
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& ) throw(SQLException, RuntimeException)
 {
     // the other way around
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL KabConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -252,19 +252,19 @@ void SAL_CALL KabConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL KabConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     // when you collected some warnings -> return it
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     // you should clear your collected warnings here
 }
-//------------------------------------------------------------------------------
+
 void KabConnection::disposing()
 {
     // we noticed that we should be destroied in near future so we have to dispose our statements
@@ -289,7 +289,7 @@ void KabConnection::disposing()
     dispose_ChildImpl();
     KabConnection_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XTablesSupplier > SAL_CALL KabConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -303,12 +303,12 @@ Reference< XTablesSupplier > SAL_CALL KabConnection::createCatalog()
     }
     return xTab;
 }
-// -----------------------------------------------------------------------------
+
 ::KABC::AddressBook* KabConnection::getAddressBook() const
 {
     return m_pAddressBook;
 }
-// -----------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL createKabConnection( void* _pDriver )
 {
     KabConnection* pConnection = new KabConnection( static_cast< KabDriver* >( _pDriver ) );
diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx
index 83f4bd98f970..411bae233d21 100644
--- a/connectivity/source/drivers/kab/KDEInit.cxx
+++ b/connectivity/source/drivers/kab/KDEInit.cxx
@@ -42,11 +42,11 @@ namespace connectivity
             static void Shutdown();
         };
 
-        // ---------------------------------------------------------------
+
         KApplication* KDEInit::s_pKApplication = NULL;
         bool          KDEInit::s_bDidInsertCatalogue = false;
 
-        // ---------------------------------------------------------------
+
         void KDEInit::Init()
         {
             // TODO: All this is not thread-safe
@@ -77,7 +77,7 @@ namespace connectivity
             s_bDidInsertCatalogue = true;
         }
 
-        // ---------------------------------------------------------------
+
         void KDEInit::Shutdown()
         {
             if ( s_bDidInsertCatalogue )
@@ -103,18 +103,18 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL initKApplication()
 {
     ::connectivity::kab::KDEInit::Init();
 }
 
-// -----------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL shutdownKApplication()
 {
     ::connectivity::kab::KDEInit::Shutdown();
 }
-// -----------------------------------------------------------------------
+
 /** checks whether the KDE version on the system we're running at is supported
     by the driver
 
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 486eaff38e66..b2481c458983 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -44,11 +44,11 @@ KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon)
     m_bUseCatalog   = !(usesLocalFiles() || usesLocalFilePerTable());
     osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 KabDatabaseMetaData::~KabDatabaseMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 const OUString & KabDatabaseMetaData::getAddressBookTableName()
 {
     static const OUString aAddressBookTableName
@@ -56,7 +56,7 @@ const OUString & KabDatabaseMetaData::getAddressBookTableName()
 
     return aAddressBookTableName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
@@ -66,73 +66,73 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLExceptio
 
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
 {
     // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement,
@@ -140,63 +140,63 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLExcept
     sal_Int32 nValue = 1;
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
@@ -205,25 +205,25 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, Ru
     }
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
     OUString aVal("\"");
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException, RuntimeException)
 {
     sal_Bool bValue = sal_False;
@@ -232,326 +232,326 @@ sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException,
     }
     return bValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     // for the moment, we have read-only addresses, but this might change in the future
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     // if someday we support more than the default address book,
@@ -559,145 +559,145 @@ OUString SAL_CALL KabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeExc
     OUString aValue(  "sdbc:address:kab:" );
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue(  "kab" );
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     OUString aValue(KAB_DRIVER_VERSION);
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return KAB_DRIVER_VERSION_MAJOR;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return TransactionIsolation::NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return KAB_DRIVER_VERSION_MINOR;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     switch (setType)
@@ -708,7 +708,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException)
 {
     switch (setType)
@@ -719,62 +719,62 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 s
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection(  ) throw(SQLException, RuntimeException)
 {
     return (Reference< XConnection >) m_xConnection.get();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
@@ -793,7 +793,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQ
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
@@ -830,24 +830,24 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLE
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
-// -----------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges(
     const Any&, const OUString&, const OUString&,
     const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
     const Any&,
     const OUString&,
@@ -917,7 +917,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     const Any&,
     const OUString&,
@@ -968,21 +968,21 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns(
     const Any&, const OUString&,
     const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures(
     const Any&, const OUString&,
     const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
     const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -1015,45 +1015,45 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo(
     const Any&, const OUString&, const OUString&,
     sal_Bool, sal_Bool ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier(
     const Any&, const OUString&, const OUString&, sal_Int32,
     sal_Bool ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference(
     const Any&, const OUString&,
     const OUString&, const Any&,
@@ -1061,12 +1061,12 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference(
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException)
 {
     OSL_FAIL("Not implemented yet!");
     throw SQLException();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 798d7405e224..ef551d500c2c 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -45,7 +45,7 @@ using namespace connectivity::kab;
 // =======================================================================
 // = KabImplModule
 // =======================================================================
-// --------------------------------------------------------------------------------
+
 KabImplModule::KabImplModule( const Reference< XComponentContext >& _rxContext )
     :m_xContext(_rxContext)
     ,m_bAttemptedLoadModule(false)
@@ -60,7 +60,7 @@ KabImplModule::KabImplModule( const Reference< XComponentContext >& _rxContext )
         throw NullPointerException();
 }
 
-// --------------------------------------------------------------------------------
+
 bool KabImplModule::isKDEPresent()
 {
     if ( !impl_loadModule() )
@@ -69,7 +69,7 @@ bool KabImplModule::isKDEPresent()
     return true;
 }
 
-// --------------------------------------------------------------------------------
+
 KabImplModule::KDEVersionType KabImplModule::matchKDEVersion()
 {
     OSL_PRECOND( m_pKDEVersionCheckFunc, "KabImplModule::matchKDEVersion: module not loaded!" );
@@ -82,7 +82,7 @@ KabImplModule::KDEVersionType KabImplModule::matchKDEVersion()
     return eSupported;
 }
 
-// --------------------------------------------------------------------------------
+
 namespace
 {
     template< typename FUNCTION >
@@ -108,7 +108,7 @@ namespace
     }
 }
 
-// --------------------------------------------------------------------------------
+
 extern "C" { void SAL_CALL thisModule() {} }
 
 bool KabImplModule::impl_loadModule()
@@ -138,7 +138,7 @@ bool KabImplModule::impl_loadModule()
     return true;
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::impl_unloadModule()
 {
     OSL_PRECOND( m_hConnectorModule != NULL, "KabImplModule::impl_unloadModule: no module!" );
@@ -154,7 +154,7 @@ void KabImplModule::impl_unloadModule()
     m_bAttemptedLoadModule = false;
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::init()
 {
     if ( !impl_loadModule() )
@@ -176,7 +176,7 @@ void KabImplModule::init()
     }
 }
 
-// --------------------------------------------------------------------------------
+
 bool KabImplModule::impl_doAllowNewKDEVersion()
 {
     try
@@ -206,7 +206,7 @@ bool KabImplModule::impl_doAllowNewKDEVersion()
     return false;
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::impl_throwNoKdeException()
 {
     ::connectivity::SharedResources aResources;
@@ -216,7 +216,7 @@ void KabImplModule::impl_throwNoKdeException()
     impl_throwGenericSQLException( sError );
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::impl_throwKdeTooOldException()
 {
     ::connectivity::SharedResources aResources;
@@ -228,7 +228,7 @@ void KabImplModule::impl_throwKdeTooOldException()
     impl_throwGenericSQLException( sError );
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
 {
     SQLException aError;
@@ -238,7 +238,7 @@ void KabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
     throw aError;
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::impl_throwKdeTooNewException()
 {
     ::connectivity::SharedResources aResources;
@@ -275,7 +275,7 @@ void KabImplModule::impl_throwKdeTooNewException()
     throw aError;
 }
 
-// --------------------------------------------------------------------------------
+
 KabConnection* KabImplModule::createConnection( KabDriver* _pDriver ) const
 {
     OSL_PRECOND( m_hConnectorModule, "KabImplModule::createConnection: not initialized!" );
@@ -287,7 +287,7 @@ KabConnection* KabImplModule::createConnection( KabDriver* _pDriver ) const
     return static_cast< KabConnection* >( pUntypedConnection );
 }
 
-// --------------------------------------------------------------------------------
+
 void KabImplModule::shutdown()
 {
     if ( !m_hConnectorModule )
@@ -323,7 +323,7 @@ KabDriver::KabDriver(
     }
     osl_atomic_decrement( &m_refCount );
 }
-// --------------------------------------------------------------------------------
+
 void KabDriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -340,12 +340,12 @@ void KabDriver::disposing()
     WeakComponentImplHelperBase::disposing();
 }
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString KabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString::createFromAscii( impl_getAsciiImplementationName() );
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
@@ -355,7 +355,7 @@ Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (Runti
 
     return aSNS;
 }
-//------------------------------------------------------------------
+
 OUString SAL_CALL KabDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -365,12 +365,12 @@ sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) th
 {
     return cppu::supportsService(this, _rServiceName);
 }
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -393,7 +393,7 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const
 
     return xConnection;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
@@ -405,45 +405,45 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url )
     // here we have to look whether we support this URL format
     return url.startsWith("sdbc:address:kab:");
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
 {
     // if you have something special to say, return it here :-)
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return KAB_DRIVER_VERSION_MAJOR;
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return KAB_DRIVER_VERSION_MINOR;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException)
 {
     // nothing to do, nothing to veto
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabDriver::notifyTermination( const EventObject& ) throw (RuntimeException)
 {
     m_aImplModule.shutdown();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException)
 {
     // not interested in (this is the disposing of the desktop, if any)
 }
-// --------------------------------------------------------------------------------
+
 const sal_Char* KabDriver::impl_getAsciiImplementationName()
 {
     return "com.sun.star.comp.sdbc.kab.Driver";
         // this name is referenced in the configuration and in the kab.xml
         // Please be careful when changing it.
 }
-// --------------------------------------------------------------------------------
+
 OUString KabDriver::impl_getConfigurationSettingsPath()
 {
     OUStringBuffer aPath;
@@ -451,7 +451,7 @@ OUString KabDriver::impl_getConfigurationSettingsPath()
     aPath.appendAscii( "com.sun.star.comp.sdbc.kab.Driver" );
     return aPath.makeStringAndClear();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XInterface >  SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception )
 {
     return *(new KabDriver( comphelper::getComponentContext(_rxFactory)));
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index 85a254b6b69c..fe9fd4952cab 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -32,7 +32,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(KabPreparedStatement, "com.sun.star.sdbc.drivers.KabPreparedStatement", "com.sun.star.sdbc.PreparedStatement");
-// -------------------------------------------------------------------------
+
 void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException)
 {
     if ( !m_aParameterRow.is() )
@@ -44,7 +44,7 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL
     if (nParams >= (sal_Int32) (m_aParameterRow->get()).size())
         (m_aParameterRow->get()).resize(nParams);
 }
-// -------------------------------------------------------------------------
+
 void KabPreparedStatement::setKabFields() const throw(SQLException)
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
@@ -60,12 +60,12 @@ void KabPreparedStatement::setKabFields() const throw(SQLException)
     }
     m_xMetaData->setKabFields(xColumns);
 }
-// -------------------------------------------------------------------------
+
 void KabPreparedStatement::resetParameters() const throw(SQLException)
 {
     m_nParameterIndex = 0;
 }
-// -------------------------------------------------------------------------
+
 void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException)
 {
     if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size())
@@ -81,7 +81,7 @@ void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQ
 
     m_nParameterIndex++;
 }
-// -------------------------------------------------------------------------
+
 KabPreparedStatement::KabPreparedStatement(
     KabConnection* _pConnection,
     const OUString& sql)
@@ -92,11 +92,11 @@ KabPreparedStatement::KabPreparedStatement(
       m_aParameterRow()
 {
 }
-// -------------------------------------------------------------------------
+
 KabPreparedStatement::~KabPreparedStatement()
 {
 }
-// -------------------------------------------------------------------------
+
 void KabPreparedStatement::disposing()
 {
     KabPreparedStatement_BASE::disposing();
@@ -107,7 +107,7 @@ void KabPreparedStatement::disposing()
         m_aParameterRow = NULL;
     }
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -121,7 +121,7 @@ Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() thr
     Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
     return xMetaData;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -139,7 +139,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException
     // Remove this Statement object from the Connection object's
     // list
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -149,7 +149,7 @@ sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeExc
 
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -158,7 +158,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, Run
     // same as in statement with the difference that this statement also can contain parameter
     return 0;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -166,7 +166,7 @@ Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQ
 
     return (Reference< XConnection >) m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -176,7 +176,7 @@ Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLE
 
     return rs;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -186,7 +186,7 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32)
 
     (m_aParameterRow->get())[parameterIndex - 1].setNull();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException)
 {
 
@@ -194,7 +194,7 @@ void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OU
 
 ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException)
 {
 
@@ -202,7 +202,7 @@ void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLExc
 
 ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException)
 {
 
@@ -210,7 +210,7 @@ void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLExcept
 
 ::dbtools::throwFunctionNotSupportedException("setByte", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException)
 {
 
@@ -218,7 +218,7 @@ void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLExce
 
 ::dbtools::throwFunctionNotSupportedException("setShort", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -226,7 +226,7 @@ void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLExcept
 
 ::dbtools::throwFunctionNotSupportedException("setInt", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException)
 {
 
@@ -234,7 +234,7 @@ void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLExcep
 
 ::dbtools::throwFunctionNotSupportedException("", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException)
 {
 
@@ -242,7 +242,7 @@ void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLExceptio
 
 ::dbtools::throwFunctionNotSupportedException("setFloat", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException)
 {
 
@@ -250,7 +250,7 @@ void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExcept
 
 ::dbtools::throwFunctionNotSupportedException("setDouble", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -260,7 +260,7 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OU
 
     (m_aParameterRow->get())[parameterIndex - 1] = x;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException)
 {
 
@@ -268,7 +268,7 @@ void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8
 
 ::dbtools::throwFunctionNotSupportedException("setBytes", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException)
 {
 
@@ -276,7 +276,7 @@ void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLExc
 
 ::dbtools::throwFunctionNotSupportedException("setDate", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException)
 {
 
@@ -284,7 +284,7 @@ void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLExc
 
 ::dbtools::throwFunctionNotSupportedException("setTime", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException)
 {
 
@@ -292,7 +292,7 @@ void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) thr
 
 ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -300,7 +300,7 @@ void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference<
 
 ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -308,7 +308,7 @@ void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Referenc
 
 ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException)
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
@@ -316,7 +316,7 @@ void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const An
         throw SQLException();
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -324,7 +324,7 @@ void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal
 
 ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException)
 {
 
@@ -332,7 +332,7 @@ void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&)
 
 ::dbtools::throwFunctionNotSupportedException("setRef", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException)
 {
 
@@ -340,7 +340,7 @@ void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&
 
 ::dbtools::throwFunctionNotSupportedException("setBlob", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException)
 {
 
@@ -348,7 +348,7 @@ void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&
 
 ::dbtools::throwFunctionNotSupportedException("setClob", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException)
 {
 
@@ -356,12 +356,12 @@ void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray
 
 ::dbtools::throwFunctionNotSupportedException("setArray", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException)
 {
 ::dbtools::throwFunctionNotSupportedException("clearParameters", NULL);
 }
-// -------------------------------------------------------------------------
+
 void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch (nHandle)
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index e797274fc143..1dbeabff6599 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star::io;
 namespace cssu = com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(KabResultSet, "com.sun.star.sdbc.drivers.KabResultSet", "com.sun.star.sdbc.ResultSet");
-// -------------------------------------------------------------------------
+
 KabResultSet::KabResultSet(KabCommonStatement* pStmt)
     : KabResultSet_BASE(m_aMutex),
       OPropertySetHelper(KabResultSet_BASE::rBHelper),
@@ -54,11 +54,11 @@ KabResultSet::KabResultSet(KabCommonStatement* pStmt)
       m_bWasNull(sal_True)
 {
 }
-// -------------------------------------------------------------------------
+
 KabResultSet::~KabResultSet()
 {
 }
-// -------------------------------------------------------------------------
+
 void KabResultSet::allKabAddressees()
 {
     KabConnection* pConnection = static_cast< KabConnection *>(m_xStatement->getConnection().get());
@@ -66,7 +66,7 @@ void KabResultSet::allKabAddressees()
 
     m_aKabAddressees = pAddressBook->allAddressees();
 }
-// -------------------------------------------------------------------------
+
 void KabResultSet::someKabAddressees(const KabCondition *pCondition)
 {
     KabConnection* pConnection = static_cast< KabConnection *>(m_xStatement->getConnection().get());
@@ -82,7 +82,7 @@ void KabResultSet::someKabAddressees(const KabCondition *pCondition)
             m_aKabAddressees.push_back(*iterator);
     }
 }
-// -------------------------------------------------------------------------
+
 void KabResultSet::sortKabAddressees(const KabOrder *pOrder)
 {
     // We do not use class KAddresseeList, which has a sorting algorithm in it, because
@@ -105,7 +105,7 @@ void KabResultSet::sortKabAddressees(const KabOrder *pOrder)
         }
     }
 }
-// -------------------------------------------------------------------------
+
 void KabResultSet::disposing()
 {
     OPropertySetHelper::disposing();
@@ -115,7 +115,7 @@ void KabResultSet::disposing()
 m_xStatement.clear();
 m_xMetaData.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
@@ -123,17 +123,17 @@ Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeExcep
         aRet = KabResultSet_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::acquire() throw()
 {
     KabResultSet_BASE::acquire();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::release() throw()
 {
     KabResultSet_BASE::release();
 }
-// -------------------------------------------------------------------------
+
 Sequence<  Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException)
 {
     OTypeCollection aTypes(
@@ -143,12 +143,12 @@ Sequence<  Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException)
 
     return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -168,7 +168,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQ
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -205,7 +205,7 @@ return aRet;
     m_bWasNull = true;
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -215,7 +215,7 @@ sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, Runtim
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -226,7 +226,7 @@ sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeEx
     sal_Int8 nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -237,7 +237,7 @@ sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, Runtime
     sal_Int16 nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -248,7 +248,7 @@ sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeEx
     sal_Int32 nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -258,7 +258,7 @@ sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeE
 
     return sal_Int64();
 }
-// -------------------------------------------------------------------------
+
 float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -269,7 +269,7 @@ float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeExce
     float nVal(0);
     return nVal;
 }
-// -------------------------------------------------------------------------
+
 double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -280,7 +280,7 @@ double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeEx
     double nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -290,7 +290,7 @@ Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLExcepti
 
     return Sequence< sal_Int8 >();
 }
-// -------------------------------------------------------------------------
+
 cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -301,7 +301,7 @@ cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, Runtime
     cssu::Date aRet;
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -312,7 +312,7 @@ cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, Runtime
     cssu::Time nRet;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -351,7 +351,7 @@ cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(
     m_bWasNull = true;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -361,7 +361,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) thro
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -371,7 +371,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) t
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< ::com::sun::star::container::XNameAccess >&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -381,7 +381,7 @@ Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< ::com::sun::sta
 
     return Any();
 }
-// -------------------------------------------------------------------------
+
 Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -391,7 +391,7 @@ Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, R
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -401,7 +401,7 @@ Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException,
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -411,7 +411,7 @@ Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException,
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -421,7 +421,7 @@ Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLExceptio
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -433,7 +433,7 @@ Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLEx
     Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
     return xMetaData;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -444,7 +444,7 @@ sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeExcep
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -456,7 +456,7 @@ sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeExcepti
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -467,7 +467,7 @@ sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -479,7 +479,7 @@ sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -488,7 +488,7 @@ void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException)
     // move before the first row
     m_nRowPos = -1;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -498,7 +498,7 @@ void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException)
     sal_Int32 nAddressees = m_aKabAddressees.size();
     m_nRowPos = nAddressees;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException)
 {
     {
@@ -507,7 +507,7 @@ void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -520,7 +520,7 @@ sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException)
     m_nRowPos = 0;
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -533,7 +533,7 @@ sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException)
     m_nRowPos = nAddressees - 1;
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -541,7 +541,7 @@ sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException)
 
     return m_nRowPos;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -555,7 +555,7 @@ sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, Runt
     m_nRowPos = row;
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -563,7 +563,7 @@ sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, Runt
 
     return absolute(m_nRowPos + row);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -571,7 +571,7 @@ sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException)
 
     return absolute(m_nRowPos + 1);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -579,7 +579,7 @@ sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException)
 
     return absolute(m_nRowPos - 1);
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -588,7 +588,7 @@ Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException
     Reference< XStatement > xStatement = m_xStatement.get();
     return xStatement;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -596,7 +596,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -604,7 +604,7 @@ sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeExcepti
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -612,7 +612,7 @@ sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeExceptio
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -620,22 +620,22 @@ sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException)
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::cancel() throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::clearWarnings() throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL KabResultSet::getWarnings() throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -643,7 +643,7 @@ void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException)
 
     // you only have to implement this if you want to insert new rows
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -651,19 +651,19 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException)
 
     // only when you allow updates
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::deleteRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -671,121 +671,121 @@ void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcepti
 
     // only when you allow inserts
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException)
 {
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
 {
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::refreshRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL KabResultSet::getBookmark() throw( SQLException,  RuntimeException)
 {
@@ -802,7 +802,7 @@ Any SAL_CALL KabResultSet::getBookmark() throw( SQLException,  RuntimeException)
     }
     return Any();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -824,7 +824,7 @@ sal_Bool SAL_CALL KabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLE
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal_Int32 rows) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -845,7 +845,7 @@ sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal
     m_nRowPos = nRowSave;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const  Any& firstItem, const  Any& secondItem) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -860,12 +860,12 @@ sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const  Any& firstItem, const
         return CompareBookmark::GREATER;
     return CompareBookmark::EQUAL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() throw( SQLException,  RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSet::hashBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -875,7 +875,7 @@ sal_Int32 SAL_CALL KabResultSet::hashBookmark(const  Any& bookmark) throw( SQLEx
 
     return sBookmark.hashCode();
 }
-// -------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const  Sequence<  Any >&) throw( SQLException,  RuntimeException)
 {
@@ -884,7 +884,7 @@ Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const  Sequence<  Any >&
 
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* KabResultSet::createArrayHelper() const
 {
     Sequence< Property > aProps(6);
@@ -899,12 +899,12 @@ IPropertyArrayHelper* KabResultSet::createArrayHelper() const
 
     return new OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & KabResultSet::getInfoHelper()
 {
     return *static_cast<KabResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool KabResultSet::convertFastPropertyValue(
             Any &,
             Any &,
@@ -927,7 +927,7 @@ sal_Bool KabResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void KabResultSet::setFastPropertyValue_NoBroadcast(
             sal_Int32 nHandle,
             const Any& )
@@ -949,7 +949,7 @@ void KabResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void KabResultSet::getFastPropertyValue(
             Any& _rValue,
             sal_Int32 nHandle) const
@@ -967,6 +967,6 @@ void KabResultSet::getFastPropertyValue(
             ;
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index ed384ba19801..2ef79e4fd606 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -31,11 +31,11 @@ using namespace com::sun::star::sdbc;
 KabResultSetMetaData::KabResultSetMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 KabResultSetMetaData::~KabResultSetMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
     OSQLColumns::Vector::const_iterator aIter;
@@ -51,32 +51,32 @@ void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQ
         m_aKabFields.push_back(nFieldNumber);
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException)
 {
     return m_aKabFields[column - 1] < KAB_DATA_FIELDS? 20: 50;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException)
 {
     return m_aKabFields[column - 1] == KAB_FIELD_REVISION? DataType::TIMESTAMP: DataType::CHAR;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException)
 {
     return m_aKabFields.size();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nFieldNumber = m_aKabFields[column - 1];
@@ -95,83 +95,83 @@ OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQ
 
     return aName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return KabDatabaseMetaData::getAddressBookTableName();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSetMetaData::getScale(sal_Int32) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return (sal_Int32) sal_True;
 // KDE address book currently does not use NULL values.
 // But it might do it someday
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index 61cd54456ce2..dc99bce6e61f 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -36,7 +36,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -76,7 +76,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL kab_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index 99a08dd58b8e..85885cbc1f12 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx
@@ -58,7 +58,7 @@ namespace
 }
 
 IMPLEMENT_SERVICE_INFO(KabStatement, "com.sun.star.sdbc.drivers.KabStatement", "com.sun.star.sdbc.Statement");
-//------------------------------------------------------------------------------
+
 KabCommonStatement::KabCommonStatement(KabConnection* _pConnection )
     : KabCommonStatement_BASE(m_aMutex),
     OPropertySetHelper(KabCommonStatement_BASE::rBHelper),
@@ -70,26 +70,26 @@ KabCommonStatement::KabCommonStatement(KabConnection* _pConnection )
 {
     m_pConnection->acquire();
 }
-// -----------------------------------------------------------------------------
+
 KabCommonStatement::~KabCommonStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 void KabCommonStatement::disposing()
 {
     KabCommonStatement_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 void KabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc::SQLException)
 {
     lcl_throwError(STR_PARA_ONLY_PREPARED);
 }
-// -----------------------------------------------------------------------------
+
 void KabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException)
 {
     lcl_throwError(STR_PARA_ONLY_PREPARED);
 }
-// -----------------------------------------------------------------------------
+
 KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException)
 {
     if (pParseNode->count() == 3)
@@ -236,7 +236,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse
     OSL_ASSERT(false);
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException)
 {
     if (SQL_ISRULE(pParseNode, ordering_spec_commalist))
@@ -284,7 +284,7 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo
     OSL_ASSERT(false);
     return 0;
 }
-//------------------------------------------------------------------------------
+
 sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const
 {
     // can handle requests like        SELECT * FROM addresses addresses
@@ -297,7 +297,7 @@ sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const
 
     return sal_True;
 }
-//------------------------------------------------------------------------------
+
 void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException)
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
@@ -309,7 +309,7 @@ void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLExce
     }
     pResult->getKabMetaData()->setKabFields(xColumns);
 }
-// -------------------------------------------------------------------------
+
 void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQLException)
 {
     const OSQLParseNode *pParseNode;
@@ -334,7 +334,7 @@ void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQL
     // no WHERE clause: get all rows
     pResult->allKabAddressees();
 }
-// -------------------------------------------------------------------------
+
 void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLException)
 {
     const OSQLParseNode *pParseNode;
@@ -351,7 +351,7 @@ void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLEx
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = KabCommonStatement_BASE::queryInterface(rType);
@@ -359,7 +359,7 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt
         aRet = OPropertySetHelper::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL KabCommonStatement::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -368,7 +368,7 @@ Sequence< Type > SAL_CALL KabCommonStatement::getTypes(  ) throw(RuntimeExceptio
 
     return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabCommonStatement::cancel(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -376,7 +376,7 @@ void SAL_CALL KabCommonStatement::cancel(  ) throw(RuntimeException)
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
     // cancel the current sql statement
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabCommonStatement::close(  ) throw(SQLException, RuntimeException)
 {
     {
@@ -386,7 +386,7 @@ void SAL_CALL KabCommonStatement::close(  ) throw(SQLException, RuntimeException
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL KabCommonStatement::execute(
         const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -397,7 +397,7 @@ sal_Bool SAL_CALL KabCommonStatement::execute(
 
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery(
         const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -438,7 +438,7 @@ OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql));
 
     return xRS;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL KabCommonStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -447,7 +447,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection(  ) throw(SQ
     // just return our connection here
     return (Reference< XConnection >) m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -456,7 +456,7 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQ
     // the return values gives information about how many rows are affected by executing the sql statement
     return 0;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL KabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -464,7 +464,7 @@ Any SAL_CALL KabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExce
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL KabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -472,7 +472,7 @@ void SAL_CALL KabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeE
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* KabCommonStatement::createArrayHelper( ) const
 {
     // this properties are defined by the service statement
@@ -493,12 +493,12 @@ void SAL_CALL KabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeE
 
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & KabCommonStatement::getInfoHelper()
 {
     return *const_cast<KabCommonStatement*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool KabCommonStatement::convertFastPropertyValue(
         Any &,
         Any &,
@@ -509,7 +509,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue(
     // here we have to try to convert
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception)
 {
     // set the value to whatever is necessary
@@ -529,7 +529,7 @@ void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void KabCommonStatement::getFastPropertyValue(Any&,sal_Int32 nHandle) const
 {
     switch (nHandle)
@@ -548,22 +548,22 @@ void KabCommonStatement::getFastPropertyValue(Any&,sal_Int32 nHandle) const
             ;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL KabCommonStatement::acquire() throw()
 {
     KabCommonStatement_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL KabCommonStatement::release() throw()
 {
     KabCommonStatement_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 KabStatement::KabStatement(KabConnection* _pConnection)
     : KabStatement_BASE(_pConnection)
 {
diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx
index 0469acbc61bd..ca31e546f6d4 100644
--- a/connectivity/source/drivers/kab/KTable.cxx
+++ b/connectivity/source/drivers/kab/KTable.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 KabTable::KabTable( sdbcx::OCollection* _pTables,
                 KabConnection* _pConnection,
                 const OUString& _Name,
@@ -51,7 +51,7 @@ KabTable::KabTable( sdbcx::OCollection* _pTables,
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void KabTable::refreshColumns()
 {
     TStringVector aVector;
diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx
index f0ec31cad9ba..6f910d4e25ce 100644
--- a/connectivity/source/drivers/kab/KTables.cxx
+++ b/connectivity/source/drivers/kab/KTables.cxx
@@ -67,12 +67,12 @@ sdbcx::ObjectType KabTables::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void KabTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<KabCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void KabTables::disposing(void)
 {
 m_xMetaData.clear();
diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx
index ab0273c7dbfc..1e69494f2a8f 100644
--- a/connectivity/source/drivers/kab/kcondition.cxx
+++ b/connectivity/source/drivers/kab/kcondition.cxx
@@ -24,55 +24,55 @@
 
 using namespace ::connectivity::kab;
 using namespace ::com::sun::star::sdbc;
-// -----------------------------------------------------------------------------
+
 KabCondition::~KabCondition()
 {
 }
-// -----------------------------------------------------------------------------
+
 KabConditionConstant::KabConditionConstant(const sal_Bool bValue)
     : KabCondition(),
       m_bValue(bValue)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionConstant::isAlwaysTrue() const
 {
     return m_bValue;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionConstant::isAlwaysFalse() const
 {
     return !m_bValue;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionConstant::eval(const ::KABC::Addressee &) const
 {
     return m_bValue;
 }
-// -----------------------------------------------------------------------------
+
 KabConditionColumn::KabConditionColumn(const OUString &sColumnName) throw(SQLException)
     : KabCondition(),
       m_nFieldNumber(findKabField(sColumnName))
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionColumn::isAlwaysTrue() const
 {
     // Sometimes true, sometimes false
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionColumn::isAlwaysFalse() const
 {
     // Sometimes true, sometimes false
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLException)
     : KabConditionColumn(sColumnName)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const
 {
     QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
@@ -81,12 +81,12 @@ sal_Bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const
 // KDE address book currently does not use NULL values.
 // But it might do it someday
 }
-// -----------------------------------------------------------------------------
+
 KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) throw(SQLException)
     : KabConditionColumn(sColumnName)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const
 {
     QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
@@ -95,18 +95,18 @@ sal_Bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const
 // KDE address book currently does not use NULL values.
 // But it might do it someday
 }
-// -----------------------------------------------------------------------------
+
 KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : KabConditionColumn(sColumnName),
       m_sMatchString(sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : KabConditionCompare(sColumnName, sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const
 {
     QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
@@ -120,12 +120,12 @@ sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const
     OUString sValue((const sal_Unicode *) aQtName.ucs2());
     return sValue == m_sMatchString;
 }
-// -----------------------------------------------------------------------------
+
 KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : KabConditionCompare(sColumnName, sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const
 {
     QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
@@ -135,12 +135,12 @@ sal_Bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const
     OUString sValue((const sal_Unicode *) aQtName.ucs2());
     return sValue != m_sMatchString;
 }
-// -----------------------------------------------------------------------------
+
 KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : KabConditionCompare(sColumnName, sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const
 {
     QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber);
@@ -150,35 +150,35 @@ sal_Bool KabConditionSimilar::eval(const ::KABC::Addressee &aAddressee) const
     OUString sValue((const sal_Unicode *) aQtName.ucs2());
     return match(m_sMatchString, sValue, '\0');
 }
-// -----------------------------------------------------------------------------
+
 KabConditionBoolean::KabConditionBoolean(KabCondition *pLeft, KabCondition *pRight)
     : KabCondition(),
       m_pLeft(pLeft),
       m_pRight(pRight)
 {
 }
-// -----------------------------------------------------------------------------
+
 KabConditionBoolean::~KabConditionBoolean()
 {
     delete m_pLeft;
     delete m_pRight;
 }
-// -----------------------------------------------------------------------------
+
 KabConditionOr::KabConditionOr(KabCondition *pLeft, KabCondition *pRight)
     : KabConditionBoolean(pLeft, pRight)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionOr::isAlwaysTrue() const
 {
     return m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionOr::isAlwaysFalse() const
 {
     return m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionOr::eval(const ::KABC::Addressee &aAddressee) const
 {
     // We avoid evaluating terms as much as we can
@@ -190,22 +190,22 @@ sal_Bool KabConditionOr::eval(const ::KABC::Addressee &aAddressee) const
 
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 KabConditionAnd::KabConditionAnd(KabCondition *pLeft, KabCondition *pRight)
     : KabConditionBoolean(pLeft, pRight)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionAnd::isAlwaysTrue() const
 {
     return m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionAnd::isAlwaysFalse() const
 {
     return m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool KabConditionAnd::eval(const ::KABC::Addressee &aAddressee) const
 {
     // We avoid evaluating terms as much as we can
diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx
index e1576c6a1f42..ec7d40037bd0 100644
--- a/connectivity/source/drivers/kab/kfields.cxx
+++ b/connectivity/source/drivers/kab/kfields.cxx
@@ -29,7 +29,7 @@ namespace connectivity
 {
     namespace kab
     {
-// -----------------------------------------------------------------------------
+
 // return the value of a KDE address book field, given an addressee and a field number
 QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber)
 {
@@ -42,7 +42,7 @@ QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNum
             return aFields[nFieldNumber - KAB_DATA_FIELDS]->value(aAddressee);
     }
 }
-// ------------------------------------------------------------------------------
+
 // search the KDE address book field number of a given column name
 sal_uInt32 findKabField(const OUString& columnName) throw(SQLException)
 {
@@ -79,7 +79,7 @@ sal_uInt32 findKabField(const OUString& columnName) throw(SQLException)
     OSL_ASSERT(false);
     return 0;
 }
-// ------------------------------------------------------------------------------
+
     }
 }
 
diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx
index 3a8e42fcebeb..cb9fe4494932 100644
--- a/connectivity/source/drivers/kab/korder.cxx
+++ b/connectivity/source/drivers/kab/korder.cxx
@@ -26,14 +26,14 @@ using namespace ::connectivity::kab;
 KabOrder::~KabOrder()
 {
 }
-// -----------------------------------------------------------------------------
+
 KabSimpleOrder::KabSimpleOrder(OUString &sColumnName, sal_Bool bAscending)
     : KabOrder(),
       m_nFieldNumber(findKabField(sColumnName)),
       m_bAscending(bAscending)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 KabSimpleOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const
 {
     sal_Int32 result;
@@ -47,24 +47,24 @@ sal_Int32 KabSimpleOrder::compare(const ::KABC::Addressee &aAddressee1, const ::
 
     return result;
 }
-// -----------------------------------------------------------------------------
+
 KabComplexOrder::KabComplexOrder()
     : KabOrder(),
       m_aOrders()
 {
 }
-// -----------------------------------------------------------------------------
+
 KabComplexOrder::~KabComplexOrder()
 {
     for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
         delete m_aOrders[i];
 }
-// -----------------------------------------------------------------------------
+
 void KabComplexOrder::addOrder(KabOrder *pOrder)
 {
     m_aOrders.push_back(pOrder);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 KabComplexOrder::compare(const ::KABC::Addressee &aAddressee1, const ::KABC::Addressee &aAddressee2) const
 {
     for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 3a61df373ab9..48559c810586 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -33,7 +33,7 @@
 using namespace connectivity::macab;
 using namespace ::com::sun::star::uno;
 
-// -----------------------------------------------------------------------------
+
 MacabAddressBook::MacabAddressBook( )
 {
     m_aAddressBook = ABGetSharedAddressBook();
@@ -41,7 +41,7 @@ MacabAddressBook::MacabAddressBook( )
     m_bRetrievedGroups = sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 MacabAddressBook::~MacabAddressBook()
 {
     if(m_xMacabRecords != NULL)
@@ -62,7 +62,7 @@ MacabAddressBook::~MacabAddressBook()
     m_bRetrievedGroups = sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 /* Get the address book's default table name. This is the table name that
  * refers to the table containing _all_ records in the address book.
  */
@@ -75,7 +75,7 @@ const OUString & MacabAddressBook::getDefaultTableName()
     return aDefaultTableName;
 }
 
-// -----------------------------------------------------------------------------
+
 MacabRecords *MacabAddressBook::getMacabRecords()
 {
     /* If the MacabRecords don't exist, create them. */
@@ -89,7 +89,7 @@ MacabRecords *MacabAddressBook::getMacabRecords()
     return m_xMacabRecords;
 }
 
-// -----------------------------------------------------------------------------
+
 /* Get the MacabRecords for a given name: either a group name or the
  * default table name.
  */
@@ -105,7 +105,7 @@ MacabRecords *MacabAddressBook::getMacabRecords(const OUString _tableName)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString _tableName)
 {
     if(match(_tableName, getDefaultTableName(), '\0'))
@@ -116,7 +116,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString _tableName)
     return getMacabGroupMatch(_tableName);
 }
 
-// -----------------------------------------------------------------------------
+
 ::std::vector<MacabGroup *> MacabAddressBook::getMacabGroups()
 {
     /* If the MacabGroups haven't been created yet, create them. */
@@ -154,7 +154,7 @@ MacabRecords *MacabAddressBook::getMacabRecordsMatch(const OUString _tableName)
     return m_xMacabGroups;
 }
 
-// -----------------------------------------------------------------------------
+
 MacabGroup *MacabAddressBook::getMacabGroup(OUString _groupName)
 {
     // initialize groups if not already initialized
@@ -178,7 +178,7 @@ MacabGroup *MacabAddressBook::getMacabGroup(OUString _groupName)
     return NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString _groupName)
 {
     // initialize groups if not already initialized
@@ -202,7 +202,7 @@ MacabGroup *MacabAddressBook::getMacabGroupMatch(OUString _groupName)
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroups) const
 {
     /* If we have two cases of groups, say, family, this makes it:
diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx
index 17e7ed69cd35..62589d7a1261 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -31,14 +31,14 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::cppu;
 
-// -------------------------------------------------------------------------
+
 MacabCatalog::MacabCatalog(MacabConnection* _pCon)
         : connectivity::sdbcx::OCatalog(_pCon),
           m_pConnection(_pCon),
           m_xMetaData(m_pConnection->getMetaData())
 {
 }
-// -------------------------------------------------------------------------
+
 void MacabCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -69,25 +69,25 @@ void MacabCatalog::refreshTables()
     else
         m_pTables = new MacabTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void MacabCatalog::refreshViews()
 {
 }
-// -------------------------------------------------------------------------
+
 void MacabCatalog::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 void MacabCatalog::refreshUsers()
 {
 }
-// -------------------------------------------------------------------------
+
 const OUString& MacabCatalog::getDot()
 {
     static const OUString sDot = ".";
     return sDot;
 }
-// -----------------------------------------------------------------------------
+
 
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL MacabCatalog::getTables(  ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx
index 38d6e5606051..713ff04396e3 100644
--- a/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
@@ -77,12 +77,12 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void MacabColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
 }
-// -------------------------------------------------------------------------
+
 MacabColumns::MacabColumns( MacabTable* _pTable,
                         ::osl::Mutex& _rMutex,
                         const TStringVector &_rVector)
diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx
index 6932f5aea724..28bcb7c3675d 100644
--- a/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 
 IMPLEMENT_SERVICE_INFO(MacabConnection, "com.sun.star.sdbc.drivers.MacabConnection", "com.sun.star.sdbc.Connection")
-//-----------------------------------------------------------------------------
+
 MacabConnection::MacabConnection(MacabDriver*   _pDriver)
          : OSubComponent<MacabConnection, MacabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
          m_pAddressBook(NULL),
@@ -44,7 +44,7 @@ MacabConnection::MacabConnection(MacabDriver*   _pDriver)
 {
     m_pDriver->acquire();
 }
-//-----------------------------------------------------------------------------
+
 MacabConnection::~MacabConnection()
 {
     if (!isClosed())
@@ -53,12 +53,12 @@ MacabConnection::~MacabConnection()
     m_pDriver->release();
     m_pDriver = NULL;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
@@ -69,7 +69,7 @@ void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >
     osl_atomic_decrement( &m_refCount );
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL MacabConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -81,7 +81,7 @@ Reference< XStatement > SAL_CALL MacabConnection::createStatement(  ) throw(SQLE
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -93,7 +93,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( cons
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -102,7 +102,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUS
     // not implemented yet :-) a task to do
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -110,14 +110,14 @@ OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLE
 
     return _sSql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabConnection_BASE::rBHelper.bDisposed);
     // here you  have to set your commit mode please have a look at the jdbc documentation to get a clear explanation
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -127,7 +127,7 @@ sal_Bool SAL_CALL MacabConnection::getAutoCommit(  ) throw(SQLException, Runtime
 
     return sal_True;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -135,7 +135,7 @@ void SAL_CALL MacabConnection::commit(  ) throw(SQLException, RuntimeException)
 
     // when you database does support transactions you should commit here
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -143,7 +143,7 @@ void SAL_CALL MacabConnection::rollback(  ) throw(SQLException, RuntimeException
 
     // same as commit but for the other case
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -151,7 +151,7 @@ sal_Bool SAL_CALL MacabConnection::isClosed(  ) throw(SQLException, RuntimeExcep
     // just simple -> we are closed when we are disposed, that means someone called dispose(); (XComponent)
     return MacabConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -168,7 +168,7 @@ Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData(  ) throw(S
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -176,7 +176,7 @@ void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runti
 
     // set you connection to readonly
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -185,7 +185,7 @@ sal_Bool SAL_CALL MacabConnection::isReadOnly(  ) throw(SQLException, RuntimeExc
     // return if your connection to readonly
     return sal_False;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -193,7 +193,7 @@ void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException,
 
     // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL MacabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -203,7 +203,7 @@ OUString SAL_CALL MacabConnection::getCatalog(  ) throw(SQLException, RuntimeExc
     // return your current catalog
     return OUString();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -212,7 +212,7 @@ void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExc
     // set your isolation level
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -222,7 +222,7 @@ sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation(  ) throw(SQLExcepti
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
     return TransactionIsolation::NONE;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -232,12 +232,12 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL MacabConnection::
 
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& ) throw(SQLException, RuntimeException)
 {
     // the other way around
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL MacabConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -247,19 +247,19 @@ void SAL_CALL MacabConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL MacabConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     // when you collected some warnings -> return it
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     // you should clear your collected warnings here
 }
-//------------------------------------------------------------------------------
+
 void MacabConnection::disposing()
 {
     // we noticed that we should be destroied in near future so we have to dispose our statements
@@ -284,7 +284,7 @@ void MacabConnection::disposing()
     dispose_ChildImpl();
     MacabConnection_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XTablesSupplier > SAL_CALL MacabConnection::createCatalog()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -298,12 +298,12 @@ Reference< XTablesSupplier > SAL_CALL MacabConnection::createCatalog()
     }
     return xTab;
 }
-// -----------------------------------------------------------------------------
+
 MacabAddressBook* MacabConnection::getAddressBook() const
 {
     return m_pAddressBook;
 }
-// -----------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL createMacabConnection( void* _pDriver )
 {
     MacabConnection* pConnection = new MacabConnection( static_cast< MacabDriver* >( _pDriver ) );
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index a832c33faec7..ead208d0871f 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -49,11 +49,11 @@ MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon)
     m_bUseCatalog   = !(usesLocalFiles() || usesLocalFilePerTable());
     osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 MacabDatabaseMetaData::~MacabDatabaseMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
@@ -63,73 +63,73 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLExcept
 
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
 {
     // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement,
@@ -137,63 +137,63 @@ sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLExce
     sal_Int32 nValue = 1;
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
@@ -202,25 +202,25 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException,
     }
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
     OUString aVal("\"");
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException, RuntimeException)
 {
     sal_Bool bValue = sal_False;
@@ -229,326 +229,326 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart(  ) throw(SQLException
     }
     return bValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     // for the moment, we have read-only addresses, but this might change in the future
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     // if someday we support more than the default address book,
@@ -556,145 +556,145 @@ OUString SAL_CALL MacabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeE
     OUString aValue(  "sdbc:address:macab:" );
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue(  "macab" );
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     OUString aValue(MACAB_DRIVER_VERSION);
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return MACAB_DRIVER_VERSION_MAJOR;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return TransactionIsolation::NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return MACAB_DRIVER_VERSION_MINOR;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     switch (setType)
@@ -705,7 +705,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setTyp
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException)
 {
     switch (setType)
@@ -716,62 +716,62 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection(  ) throw(SQLException, RuntimeException)
 {
     return (Reference< XConnection >) m_xConnection.get();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes);
@@ -790,7 +790,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes(  ) throw(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
     ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo);
@@ -846,24 +846,24 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo(  ) throw(SQ
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
-// -----------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges(
     const Any&, const OUString&, const OUString&,
     const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
     const Any&,
     const OUString&,
@@ -950,7 +950,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     const Any&,
     const OUString&,
@@ -1012,21 +1012,21 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns(
     const Any&, const OUString&,
     const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures(
     const Any&, const OUString&,
     const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
     const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -1057,45 +1057,45 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo(
     const Any&, const OUString&, const OUString&,
     sal_Bool, sal_Bool ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier(
     const Any&, const OUString&, const OUString&, sal_Int32,
     sal_Bool ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges(
     const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference(
     const Any&, const OUString&,
     const OUString&, const Any&,
@@ -1103,12 +1103,12 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference(
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException)
 {
     OSL_FAIL("Not implemented yet!");
     throw SQLException();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx
index b08e754a7e20..7a23ae394129 100644
--- a/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -41,7 +41,7 @@ using namespace connectivity::macab;
 // =======================================================================
 // = MacabImplModule
 // =======================================================================
-// --------------------------------------------------------------------------------
+
 MacabImplModule::MacabImplModule()
     :m_bAttemptedLoadModule(false)
     ,m_hConnectorModule(NULL)
@@ -49,13 +49,13 @@ MacabImplModule::MacabImplModule()
 {
 }
 
-// --------------------------------------------------------------------------------
+
 bool MacabImplModule::isMacOSPresent()
 {
     return impl_loadModule();
 }
 
-// --------------------------------------------------------------------------------
+
 namespace
 {
     template< typename FUNCTION >
@@ -78,7 +78,7 @@ namespace
     }
 }
 
-// --------------------------------------------------------------------------------
+
 extern "C" { static void SAL_CALL thisModule() {} }
 
 bool MacabImplModule::impl_loadModule()
@@ -105,7 +105,7 @@ bool MacabImplModule::impl_loadModule()
     return true;
 }
 
-// --------------------------------------------------------------------------------
+
 void MacabImplModule::impl_unloadModule()
 {
     OSL_PRECOND( m_hConnectorModule != NULL, "MacabImplModule::impl_unloadModule: no module!" );
@@ -118,7 +118,7 @@ void MacabImplModule::impl_unloadModule()
     m_bAttemptedLoadModule = false;
 }
 
-// --------------------------------------------------------------------------------
+
 void MacabImplModule::init()
 {
     if ( !impl_loadModule() )
@@ -126,7 +126,7 @@ void MacabImplModule::init()
 
 }
 
-// --------------------------------------------------------------------------------
+
 void MacabImplModule::impl_throwNoMacOSException()
 {
     ::connectivity::SharedResources aResources;
@@ -136,7 +136,7 @@ void MacabImplModule::impl_throwNoMacOSException()
     impl_throwGenericSQLException( sError );
 }
 
-// --------------------------------------------------------------------------------
+
 void MacabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
 {
     SQLException aError;
@@ -146,7 +146,7 @@ void MacabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
     throw aError;
 }
 
-// --------------------------------------------------------------------------------
+
 MacabConnection* MacabImplModule::createConnection( MacabDriver* _pDriver ) const
 {
     OSL_PRECOND( m_hConnectorModule, "MacabImplModule::createConnection: not initialized!" );
@@ -158,7 +158,7 @@ MacabConnection* MacabImplModule::createConnection( MacabDriver* _pDriver ) cons
     return static_cast< MacabConnection* >( pUntypedConnection );
 }
 
-// --------------------------------------------------------------------------------
+
 void MacabImplModule::shutdown()
 {
     if ( !m_hConnectorModule )
@@ -191,7 +191,7 @@ MacabDriver::MacabDriver(
     }
     osl_atomic_decrement( &m_refCount );
 }
-// --------------------------------------------------------------------------------
+
 void MacabDriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -208,12 +208,12 @@ void MacabDriver::disposing()
     WeakComponentImplHelperBase::disposing();
 }
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString MacabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString::createFromAscii( impl_getAsciiImplementationName() );
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > MacabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
@@ -223,7 +223,7 @@ Sequence< OUString > MacabDriver::getSupportedServiceNames_Static(  ) throw (Run
 
     return aSNS;
 }
-//------------------------------------------------------------------
+
 OUString SAL_CALL MacabDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -233,12 +233,12 @@ sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -261,7 +261,7 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, con
 
     return xConnection;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
@@ -273,45 +273,45 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url )
     // here we have to look whether we support this URL format
     return url.equals("sdbc:address:macab");
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
 {
     // if you have something special to say, return it here :-)
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return MACAB_DRIVER_VERSION_MAJOR;
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return MACAB_DRIVER_VERSION_MINOR;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException)
 {
     // nothing to do, nothing to veto
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabDriver::notifyTermination( const EventObject& ) throw (RuntimeException)
 {
     m_aImplModule.shutdown();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeException)
 {
     // not interested in (this is the disposing of the desktop, if any)
 }
-// --------------------------------------------------------------------------------
+
 const sal_Char* MacabDriver::impl_getAsciiImplementationName()
 {
     return "com.sun.star.comp.sdbc.macab.Driver";
         // this name is referenced in the configuration and in the macab.xml
         // Please be careful when changing it.
 }
-// --------------------------------------------------------------------------------
+
 OUString MacabDriver::impl_getConfigurationSettingsPath()
 {
     OUStringBuffer aPath;
@@ -319,7 +319,7 @@ OUString MacabDriver::impl_getConfigurationSettingsPath()
     aPath.appendAscii( "com.sun.star.comp.sdbc.macab.Driver" );
     return aPath.makeStringAndClear();
 }
-// --------------------------------------------------------------------------------
+
 Reference< XInterface >  SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception )
 {
     return *(new MacabDriver(comphelper::getComponentContext(_rxFactory)));
diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx
index a169c302f331..8911550b14d5 100644
--- a/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/connectivity/source/drivers/macab/MacabGroup.cxx
@@ -24,7 +24,7 @@
 
 using namespace connectivity::macab;
 
-// -------------------------------------------------------------------------
+
 /* A MacabGroup is basically a MacabRecords with a different constructor.
  * It only exists as a different entity for clarification purposes (a group
  * is its own entity in the Mac OS X Address Book) and because its
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index 419e35101e14..6d0eb20005eb 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::util;
 using namespace ::dbtools;
 
-// -------------------------------------------------------------------------
+
 MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields)
 {
     sal_Int32 i;
@@ -58,19 +58,19 @@ MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields)
 
 }
 
-// -------------------------------------------------------------------------
+
 MacabHeader::MacabHeader()
 {
     size = 0;
     fields = NULL;
 }
 
-// -------------------------------------------------------------------------
+
 MacabHeader::~MacabHeader()
 {
 }
 
-// -------------------------------------------------------------------------
+
 void MacabHeader::operator+= (const MacabHeader *r)
 {
     /* Add one MacabHeader to another. Anything not already in the header is
@@ -139,7 +139,7 @@ void MacabHeader::operator+= (const MacabHeader *r)
     }
 }
 
-// -------------------------------------------------------------------------
+
 OUString MacabHeader::getString(const sal_Int32 i) const
 {
     OUString nRet;
@@ -158,13 +158,13 @@ OUString MacabHeader::getString(const sal_Int32 i) const
     return nRet;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabHeader::sortRecord()
 {
     sortRecord(0,size);
 }
 
-// -------------------------------------------------------------------------
+
 macabfield **MacabHeader::sortRecord(const sal_Int32 _start, const sal_Int32 _length)
 {
     /* Sort using mergesort. Because it uses mergesort, it is recursive and
@@ -263,7 +263,7 @@ sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield
     return (sal_Int32) result;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabHeader::getColumnNumber(const OUString s) const
 {
     sal_Int32 i;
@@ -279,18 +279,18 @@ sal_Int32 MacabHeader::getColumnNumber(const OUString s) const
     return i;
 }
 
-// -------------------------------------------------------------------------
+
 MacabHeader *MacabHeader::begin()
 {
     return this;
 }
 
-// -------------------------------------------------------------------------
+
 MacabHeader::iterator::iterator ()
 {
 }
 
-// -------------------------------------------------------------------------
+
 MacabHeader::iterator::~iterator ()
 {
 }
@@ -302,31 +302,31 @@ MacabHeader::iterator& MacabHeader::iterator::operator= (MacabHeader *_record)
     return *this;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabHeader::iterator::operator++ ()
 {
     id++;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool MacabHeader::iterator::operator!= (const sal_Int32 i) const
 {
     return(id != i);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool MacabHeader::iterator::operator== (const sal_Int32 i) const
 {
     return(id == i);
 }
 
-// -------------------------------------------------------------------------
+
 macabfield *MacabHeader::iterator::operator* () const
 {
     return record->get(id);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabHeader::end() const
 {
     return size;
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 1072dacb4ac8..5f1924c759ea 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(MacabPreparedStatement, "com.sun.star.sdbc.drivers.MacabPreparedStatement", "com.sun.star.sdbc.PreparedStatement");
-// -------------------------------------------------------------------------
+
 void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException)
 {
     if ( !m_aParameterRow.is() )
@@ -45,7 +45,7 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S
     if (nParams >= (sal_Int32) (m_aParameterRow->get()).size())
         (m_aParameterRow->get()).resize(nParams);
 }
-// -------------------------------------------------------------------------
+
 void MacabPreparedStatement::setMacabFields() const throw(SQLException)
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
@@ -61,12 +61,12 @@ void MacabPreparedStatement::setMacabFields() const throw(SQLException)
     }
     m_xMetaData->setMacabFields(xColumns);
 }
-// -------------------------------------------------------------------------
+
 void MacabPreparedStatement::resetParameters() const throw(SQLException)
 {
     m_nParameterIndex = 0;
 }
-// -------------------------------------------------------------------------
+
 void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException)
 {
     if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size())
@@ -82,7 +82,7 @@ void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(
 
     m_nParameterIndex++;
 }
-// -------------------------------------------------------------------------
+
 MacabPreparedStatement::MacabPreparedStatement(
     MacabConnection* _pConnection,
     const OUString& sql)
@@ -94,11 +94,11 @@ MacabPreparedStatement::MacabPreparedStatement(
 {
 
 }
-// -------------------------------------------------------------------------
+
 MacabPreparedStatement::~MacabPreparedStatement()
 {
 }
-// -------------------------------------------------------------------------
+
 void MacabPreparedStatement::disposing()
 {
     MacabPreparedStatement_BASE::disposing();
@@ -109,7 +109,7 @@ void MacabPreparedStatement::disposing()
         m_aParameterRow = NULL;
     }
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -134,7 +134,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() t
     Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
     return xMetaData;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -152,7 +152,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti
     // Remove this Statement object from the Connection object's
     // list
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeE
 
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -171,7 +171,7 @@ sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, R
     // same as in statement with the difference that this statement also can contain parameter
     return 0;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -179,7 +179,7 @@ Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw(
 
     return (Reference< XConnection >) m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -189,7 +189,7 @@ Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQ
 
     return rs;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -199,7 +199,7 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3
 
     (m_aParameterRow->get())[parameterIndex - 1].setNull();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException)
 {
 
@@ -207,7 +207,7 @@ void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const
 
 ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException)
 {
 
@@ -215,7 +215,7 @@ void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLE
 
 ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException)
 {
 
@@ -223,7 +223,7 @@ void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLExce
 
 ::dbtools::throwFunctionNotSupportedException("setByte", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException)
 {
 
@@ -231,7 +231,7 @@ void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLEx
 
 ::dbtools::throwFunctionNotSupportedException("setShort", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -239,7 +239,7 @@ void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLExce
 
 ::dbtools::throwFunctionNotSupportedException("setInt", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException)
 {
 
@@ -247,7 +247,7 @@ void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLExc
 
 ::dbtools::throwFunctionNotSupportedException("setLong", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException)
 {
 
@@ -255,7 +255,7 @@ void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLExcept
 
 ::dbtools::throwFunctionNotSupportedException("setFloat", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException)
 {
 
@@ -263,7 +263,7 @@ void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExce
 
 ::dbtools::throwFunctionNotSupportedException("setDouble", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -273,7 +273,7 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const
 
     (m_aParameterRow->get())[parameterIndex - 1] = x;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException)
 {
 
@@ -281,7 +281,7 @@ void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_In
 
 ::dbtools::throwFunctionNotSupportedException("setBytes", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException)
 {
 
@@ -289,7 +289,7 @@ void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLE
 
 ::dbtools::throwFunctionNotSupportedException("setDate", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException)
 {
 
@@ -297,7 +297,7 @@ void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLE
 
 ::dbtools::throwFunctionNotSupportedException("setTime", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException)
 {
 
@@ -305,7 +305,7 @@ void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) t
 
 ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -313,7 +313,7 @@ void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference
 
 ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -321,7 +321,7 @@ void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Refere
 
 ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException)
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
@@ -333,7 +333,7 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const
         ::dbtools::throwGenericSQLException(sError,*this);
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
 {
 
@@ -341,7 +341,7 @@ void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, s
 
 ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException)
 {
 
@@ -349,7 +349,7 @@ void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&
 
 ::dbtools::throwFunctionNotSupportedException("setRef", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException)
 {
 
@@ -357,7 +357,7 @@ void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob
 
 ::dbtools::throwFunctionNotSupportedException("setBlob", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException)
 {
 
@@ -365,7 +365,7 @@ void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob
 
 ::dbtools::throwFunctionNotSupportedException("setClob", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException)
 {
 
@@ -373,12 +373,12 @@ void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArra
 
 ::dbtools::throwFunctionNotSupportedException("setArray", NULL);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabPreparedStatement::clearParameters() throw(SQLException, RuntimeException)
 {
 ::dbtools::throwFunctionNotSupportedException("clearParameters", NULL);
 }
-// -------------------------------------------------------------------------
+
 void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch (nHandle)
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx
index 2ebd7869429a..81c99ef9a3e3 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -32,14 +32,14 @@ using namespace connectivity::macab;
 using namespace com::sun::star::util;
 using namespace ::dbtools;
 
-// -------------------------------------------------------------------------
+
 MacabRecord::MacabRecord()
 {
     size = 0;
     fields = NULL;
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecord::MacabRecord(const sal_Int32 _size)
 {
     size = _size;
@@ -49,7 +49,7 @@ MacabRecord::MacabRecord(const sal_Int32 _size)
         fields[i] = NULL;
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecord::~MacabRecord()
 {
     if(size > 0)
@@ -65,7 +65,7 @@ MacabRecord::~MacabRecord()
     fields = NULL;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecord::insertAtColumn (CFTypeRef _value, ABPropertyType _type, const sal_Int32 _column)
 {
     if(_column < size)
@@ -80,7 +80,7 @@ void MacabRecord::insertAtColumn (CFTypeRef _value, ABPropertyType _type, const
     }
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool MacabRecord::contains (const macabfield *_field) const
 {
     if(_field == NULL)
@@ -89,7 +89,7 @@ sal_Bool MacabRecord::contains (const macabfield *_field) const
         return contains(_field->value);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool MacabRecord::contains (const CFTypeRef _value) const
 {
     sal_Int32 i;
@@ -107,13 +107,13 @@ sal_Bool MacabRecord::contains (const CFTypeRef _value) const
     return sal_False;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabRecord::getSize() const
 {
     return size;
 }
 
-// -------------------------------------------------------------------------
+
 macabfield *MacabRecord::copy(const sal_Int32 i) const
 {
     /* Note: copy(i) creates a new macabfield identical to that at
@@ -133,7 +133,7 @@ macabfield *MacabRecord::copy(const sal_Int32 i) const
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 macabfield *MacabRecord::get(const sal_Int32 i) const
 {
     /* Note: copy(i) creates a new macabfield identical to that at
@@ -148,7 +148,7 @@ macabfield *MacabRecord::get(const sal_Int32 i) const
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecord::releaseFields()
 {
     /* This method is, at the moment, only used in MacabHeader.cxx, but
@@ -161,7 +161,7 @@ void MacabRecord::releaseFields()
         CFRelease(fields[i]->value);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield *_field2)
 {
 
@@ -217,7 +217,7 @@ sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield
     return (sal_Int32) result;
 }
 
-// -------------------------------------------------------------------------
+
 /* Create a macabfield out of an OUString and type. Together with the
  * method fieldToString() (below), it is possible to switch conveniently
  * between an OUString and a macabfield (for use when creating and handling
@@ -285,7 +285,7 @@ macabfield *MacabRecord::createMacabField(const OUString _newFieldString, const
     return newField;
 }
 
-// -------------------------------------------------------------------------
+
 /* Create an OUString out of a macabfield. Together with the method
  * createMacabField() (above), it is possible to switch conveniently
  * between an OUString and a macabfield (for use when creating and handling
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 802a15a52b55..4a86821e05ac 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -32,7 +32,7 @@
 using namespace connectivity::macab;
 using namespace com::sun::star::util;
 
-// -------------------------------------------------------------------------
+
 MacabRecords::MacabRecords(const ABAddressBookRef _addressBook, MacabHeader *_header, MacabRecord **_records, sal_Int32 _numRecords)
 {
     /* Variables passed in... */
@@ -50,7 +50,7 @@ MacabRecords::MacabRecords(const ABAddressBookRef _addressBook, MacabHeader *_he
     bootstrap_requiredProperties();
 }
 
-// -------------------------------------------------------------------------
+
 /* Creates a MacabRecords from another: copies the length, name, and
  * address book of the original, but the header or the records themselves.
  * The idea is that the only reason to copy a MacabRecords is to create
@@ -77,7 +77,7 @@ MacabRecords::MacabRecords(const MacabRecords *_copy)
     bootstrap_requiredProperties();
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecords::MacabRecords(const ABAddressBookRef _addressBook)
 {
     /* Variables passed in... */
@@ -95,7 +95,7 @@ MacabRecords::MacabRecords(const ABAddressBookRef _addressBook)
     bootstrap_requiredProperties();
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecords::initialize()
 {
 
@@ -145,12 +145,12 @@ void MacabRecords::initialize()
     CFRelease(allRecords);
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecords::~MacabRecords()
 {
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecords::setHeader(MacabHeader *_header)
 {
     if(header != NULL)
@@ -158,13 +158,13 @@ void MacabRecords::setHeader(MacabHeader *_header)
     header = _header;
 }
 
-// -------------------------------------------------------------------------
+
 MacabHeader *MacabRecords::getHeader() const
 {
     return header;
 }
 
-// -------------------------------------------------------------------------
+
 /* Inserts a MacabRecord at a given location. If there is already a
  * MacabRecord at that location, return it.
  */
@@ -199,14 +199,14 @@ MacabRecord *MacabRecords::insertRecord(MacabRecord *_newRecord, const sal_Int32
     return oldRecord;
 }
 
-// -------------------------------------------------------------------------
+
 /* Insert a record at the next available place. */
 void MacabRecords::insertRecord(MacabRecord *_newRecord)
 {
     insertRecord(_newRecord, currentRecord);
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecord *MacabRecords::getRecord(const sal_Int32 _location) const
 {
     if(_location >= recordsSize)
@@ -214,7 +214,7 @@ MacabRecord *MacabRecords::getRecord(const sal_Int32 _location) const
     return records[_location];
 }
 
-// -------------------------------------------------------------------------
+
 macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const sal_Int32 _columnNumber) const
 {
     if(_recordNumber >= recordsSize)
@@ -228,7 +228,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const sal_Int3
     return record->get(_columnNumber);
 }
 
-// -------------------------------------------------------------------------
+
 macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const OUString _columnName) const
 {
     if(header != NULL)
@@ -246,7 +246,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const OUString
     }
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabRecords::getFieldNumber(const OUString _columnName) const
 {
     if(header != NULL)
@@ -256,7 +256,7 @@ sal_Int32 MacabRecords::getFieldNumber(const OUString _columnName) const
         return -1;
 }
 
-// -------------------------------------------------------------------------
+
 /* Create the lcl_CFTypes array -- we need this because there is no
  * way to get the ABType of an object from the object itself, and the
  * function ABTypeOfProperty can't handle multiple levels of data
@@ -295,7 +295,7 @@ void MacabRecords::bootstrap_CF_types()
     lcl_CFTypes[5].ab = kABDataProperty;
 }
 
-// -------------------------------------------------------------------------
+
 /* This is based on the possible fields required in the mail merge template
  * in sw. If the fields possible there change, it would be optimal to
  * change these fields as well.
@@ -313,7 +313,7 @@ void MacabRecords::bootstrap_requiredProperties()
     requiredProperties[6] = kABEmailProperty;
 }
 
-// -------------------------------------------------------------------------
+
 /* Create the header for a given record type and a given array of records.
  * Because the array of records and the record type are given, if you want
  * to, you can run this method on the members of a group, or on any other
@@ -470,7 +470,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records,
     return lcl_header;
 }
 
-// -------------------------------------------------------------------------
+
 /* Create a header for a single property. Basically, this method gets
  * the property's value and type and then calls another method of
  * the same name to do the dirty work.
@@ -499,7 +499,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABRecordRef _record, co
     return result;
 }
 
-// -------------------------------------------------------------------------
+
 /* Create a header for a single property. This method is recursive
  * because a single property might contain several sub-properties that
  * we also want to treat singly.
@@ -810,7 +810,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert
         return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_Int32 _length) const
 {
     /* If we have two cases of, say, phone: home, this makes it:
@@ -842,7 +842,7 @@ void MacabRecords::manageDuplicateHeaders(macabfield **_headerNames, const sal_I
     }
 }
 
-// -------------------------------------------------------------------------
+
 /* Create a MacabRecord out of an ABRecord, using a given MacabHeader and
  * the record's type. We go through each property for this record type
  * then process it much like we processed the header (above), with two
@@ -889,7 +889,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const
     return macabRecord;
 }
 
-// -------------------------------------------------------------------------
+
 /* Inserts a given property into a MacabRecord. This method calls another
  * method by the same name after getting the property type (it only
  * receives the property value). It is called when we aren't given the
@@ -904,7 +904,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(MacabRecord *_abrecord, const M
         insertPropertyIntoMacabRecord(ab_type, _abrecord, _header, _propertyName, _propertyValue);
 }
 
-// -------------------------------------------------------------------------
+
 /* Inserts a given property into a MacabRecord. This method is recursive
  * because properties can contain many sub-properties.
  */
@@ -1105,7 +1105,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT
 
 }
 
-// -------------------------------------------------------------------------
+
 ABPropertyType MacabRecords::getABTypeFromCFType(const CFTypeID cf_type ) const
 {
     sal_Int32 i;
@@ -1120,29 +1120,29 @@ ABPropertyType MacabRecords::getABTypeFromCFType(const CFTypeID cf_type ) const
     return kABErrorInProperty;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabRecords::size() const
 {
     return currentRecord;
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecords *MacabRecords::begin()
 {
     return this;
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecords::iterator::iterator ()
 {
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecords::iterator::~iterator ()
 {
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecords::iterator& MacabRecords::iterator::operator= (MacabRecords *_records)
 {
     id = 0;
@@ -1150,37 +1150,37 @@ MacabRecords::iterator& MacabRecords::iterator::operator= (MacabRecords *_record
     return *this;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecords::iterator::operator++ ()
 {
     id++;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool MacabRecords::iterator::operator!= (const sal_Int32 i) const
 {
     return(id != i);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool MacabRecords::iterator::operator== (const sal_Int32 i) const
 {
     return(id == i);
 }
 
-// -------------------------------------------------------------------------
+
 MacabRecord *MacabRecords::iterator::operator* () const
 {
     return records->getRecord(id);
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MacabRecords::end() const
 {
     return currentRecord;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecords::swap(const sal_Int32 _id1, const sal_Int32 _id2)
 {
     MacabRecord *swapRecord = records[_id1];
@@ -1189,13 +1189,13 @@ void MacabRecords::swap(const sal_Int32 _id1, const sal_Int32 _id2)
     records[_id2] = swapRecord;
 }
 
-// -------------------------------------------------------------------------
+
 void MacabRecords::setName(const OUString _sName)
 {
     m_sName = _sName;
 }
 
-// -------------------------------------------------------------------------
+
 OUString MacabRecords::getName() const
 {
     return m_sName;
diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx
index c9f866e6b992..95e3b09de90a 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(MacabResultSet, "com.sun.star.sdbc.drivers.MacabResultSet", "com.sun.star.sdbc.ResultSet");
-// -------------------------------------------------------------------------
+
 MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt)
     : MacabResultSet_BASE(m_aMutex),
       OPropertySetHelper(MacabResultSet_BASE::rBHelper),
@@ -56,18 +56,18 @@ MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt)
 {
     m_sTableName = MacabAddressBook::getDefaultTableName();
 }
-// -------------------------------------------------------------------------
+
 MacabResultSet::~MacabResultSet()
 {
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::allMacabRecords()
 {
     MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get());
 
     m_aMacabRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName);
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::someMacabRecords(const MacabCondition *pCondition)
 {
     MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get());
@@ -96,7 +96,7 @@ void MacabResultSet::someMacabRecords(const MacabCondition *pCondition)
             m_aMacabRecords->insertRecord(*iterator);
     }
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::sortMacabRecords(const MacabOrder *pOrder)
 {
     // I do this with ints rather than an iterator because the ids will
@@ -126,12 +126,12 @@ void MacabResultSet::sortMacabRecords(const MacabOrder *pOrder)
     }
 
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::setTableName(OUString _sTableName)
 {
     m_sTableName = _sTableName;
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::disposing()
 {
     OPropertySetHelper::disposing();
@@ -141,7 +141,7 @@ void MacabResultSet::disposing()
 m_xStatement.clear();
 m_xMetaData.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
@@ -149,17 +149,17 @@ Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeExc
         aRet = MacabResultSet_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::acquire() throw()
 {
     MacabResultSet_BASE::acquire();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::release() throw()
 {
     MacabResultSet_BASE::release();
 }
-// -------------------------------------------------------------------------
+
 Sequence<  Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException)
 {
     OTypeCollection aTypes(
@@ -169,12 +169,12 @@ Sequence<  Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException)
 
     return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -196,7 +196,7 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -223,7 +223,7 @@ OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLExce
 // Trigger an exception if m_bWasNull is true?
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -233,7 +233,7 @@ sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, Runt
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -244,7 +244,7 @@ sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, Runtime
     sal_Int8 nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -255,7 +255,7 @@ sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, Runti
     sal_Int16 nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -284,7 +284,7 @@ sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLExcept
 // Trigger an exception if m_bWasNull is true?
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -313,7 +313,7 @@ sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLExcep
 // Trigger an exception if m_bWasNull is true?
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -342,7 +342,7 @@ float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLExceptio
 // Trigger an exception if m_bWasNull is true?
     return nVal;
 }
-// -------------------------------------------------------------------------
+
 double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -371,7 +371,7 @@ double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLExcept
 // Trigger an exception if m_bWasNull is true?
     return nVal;
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -381,7 +381,7 @@ Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLExcep
 
     return Sequence< sal_Int8 >();
 }
-// -------------------------------------------------------------------------
+
 Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -392,7 +392,7 @@ Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeExce
     Date aRet;
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -403,7 +403,7 @@ Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeExce
     Time nRet;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -430,7 +430,7 @@ DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLE
 // Trigger an exception if m_bWasNull is true?
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -440,7 +440,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) th
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -450,7 +450,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32)
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< ::com::sun::star::container::XNameAccess >&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -460,7 +460,7 @@ Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< ::com::sun::s
 
     return Any();
 }
-// -------------------------------------------------------------------------
+
 Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -470,7 +470,7 @@ Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException,
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -480,7 +480,7 @@ Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLExceptio
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -490,7 +490,7 @@ Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLExceptio
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -500,7 +500,7 @@ Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLExcept
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -512,7 +512,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQL
     Reference< XResultSetMetaData > xMetaData = m_xMetaData.get();
     return xMetaData;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -523,7 +523,7 @@ sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeExc
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -535,7 +535,7 @@ sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeExcep
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -546,7 +546,7 @@ sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -558,7 +558,7 @@ sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -567,7 +567,7 @@ void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException
     // move before the first row
     m_nRowPos = -1;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -577,7 +577,7 @@ void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException)
     sal_Int32 nRecords = m_aMacabRecords->size();
     m_nRowPos = nRecords;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException)
 {
     {
@@ -586,7 +586,7 @@ void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -599,7 +599,7 @@ sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException)
     m_nRowPos = 0;
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -612,7 +612,7 @@ sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException)
     m_nRowPos = nRecords - 1;
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -620,7 +620,7 @@ sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException
 
     return m_nRowPos;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -634,7 +634,7 @@ sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, Ru
     m_nRowPos = row;
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -642,7 +642,7 @@ sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, Ru
 
     return absolute(m_nRowPos + row);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -650,7 +650,7 @@ sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException)
 
     return absolute(m_nRowPos + 1);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -658,7 +658,7 @@ sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeExceptio
 
     return absolute(m_nRowPos - 1);
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -667,7 +667,7 @@ Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLExcepti
     Reference< XStatement > xStatement = m_xStatement.get();
     return xStatement;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -675,7 +675,7 @@ sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeExcept
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -683,7 +683,7 @@ sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeExcep
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -691,7 +691,7 @@ sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeExcept
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -699,22 +699,22 @@ sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::cancel() throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::clearWarnings() throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL MacabResultSet::getWarnings() throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -722,7 +722,7 @@ void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException)
 
     // you only have to implement this if you want to insert new rows
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -730,19 +730,19 @@ void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException)
 
     // only when you allow updates
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::deleteRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -750,121 +750,121 @@ void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcep
 
     // only when you allow inserts
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException)
 {
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException)
 {
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateTime(sal_Int32, const Time&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::refreshRow() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException,  RuntimeException)
 {
@@ -886,7 +886,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException,  RuntimeExceptio
     }
     return Any();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -913,7 +913,7 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const  Any& bookmark) throw( SQ
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const  Any& bookmark, sal_Int32 rows) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -934,7 +934,7 @@ sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const  Any& bookmark, s
     m_nRowPos = nRowSave;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const  Any& firstItem, const  Any& secondItem) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -949,12 +949,12 @@ sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const  Any& firstItem, const
         return CompareBookmark::GREATER;
     return CompareBookmark::EQUAL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks() throw( SQLException,  RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const  Any& bookmark) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -964,7 +964,7 @@ sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const  Any& bookmark) throw( SQL
 
     return sBookmark.hashCode();
 }
-// -------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const  Sequence<  Any >&) throw( SQLException,  RuntimeException)
 {
@@ -973,7 +973,7 @@ Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const  Sequence<  Any
 
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* MacabResultSet::createArrayHelper() const
 {
     Sequence< Property > aProps(6);
@@ -988,12 +988,12 @@ IPropertyArrayHelper* MacabResultSet::createArrayHelper() const
 
     return new OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & MacabResultSet::getInfoHelper()
 {
     return *static_cast<MacabResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool MacabResultSet::convertFastPropertyValue(
             Any &,
             Any &,
@@ -1016,7 +1016,7 @@ sal_Bool MacabResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::setFastPropertyValue_NoBroadcast(
             sal_Int32 nHandle,
             const Any& )
@@ -1038,7 +1038,7 @@ void MacabResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSet::getFastPropertyValue(
             Any& _rValue,
             sal_Int32 nHandle) const
@@ -1056,6 +1056,6 @@ void MacabResultSet::getFastPropertyValue(
             ;
     }
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index c3199ebe8670..5da1a2811f9e 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -36,11 +36,11 @@ MacabResultSetMetaData::MacabResultSetMetaData(MacabConnection* _pConnection, OU
       m_aMacabFields()
 {
 }
-// -------------------------------------------------------------------------
+
 MacabResultSetMetaData::~MacabResultSetMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
     OSQLColumns::Vector::const_iterator aIter;
@@ -69,13 +69,13 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity:
     }
 
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /* column */) throw(SQLException, RuntimeException)
 {
     // For now, all columns are the same size.
     return 50;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw(SQLException, RuntimeException)
 {
     MacabRecords *aRecords;
@@ -101,22 +101,22 @@ sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw
 
     return ABTypeToDataType(aField->type);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException)
 {
     return m_aMacabFields.size();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nFieldNumber = m_aMacabFields[column - 1];
@@ -136,81 +136,81 @@ OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(
 
     return aName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return m_sTableName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return (sal_Int32) sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx
index 6c7cd113a165..5428db736cb5 100644
--- a/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/connectivity/source/drivers/macab/MacabServices.cxx
@@ -36,7 +36,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -74,7 +74,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL macab_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx
index 026e69dc28cb..6b85a0ef5225 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -61,7 +61,7 @@ namespace connectivity
 }
 
 IMPLEMENT_SERVICE_INFO(MacabStatement, "com.sun.star.sdbc.drivers.MacabStatement", "com.sun.star.sdbc.Statement");
-//------------------------------------------------------------------------------
+
 MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection )
     : MacabCommonStatement_BASE(m_aMutex),
     OPropertySetHelper(MacabCommonStatement_BASE::rBHelper),
@@ -73,26 +73,26 @@ MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection )
 {
     m_pConnection->acquire();
 }
-// -----------------------------------------------------------------------------
+
 MacabCommonStatement::~MacabCommonStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 void MacabCommonStatement::disposing()
 {
     MacabCommonStatement_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 void MacabCommonStatement::resetParameters() const throw(::com::sun::star::sdbc::SQLException)
 {
     impl_throwError(STR_PARA_ONLY_PREPARED);
 }
-// -----------------------------------------------------------------------------
+
 void MacabCommonStatement::getNextParameter(OUString &) const throw(::com::sun::star::sdbc::SQLException)
 {
     impl_throwError(STR_PARA_ONLY_PREPARED);
 }
-// -----------------------------------------------------------------------------
+
 MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException)
 {
     if (pParseNode->count() == 3)
@@ -237,7 +237,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP
     OSL_ASSERT(false);
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException)
 {
     if (SQL_ISRULE(pParseNode, ordering_spec_commalist))
@@ -285,7 +285,7 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar
     OSL_ASSERT(false);
     return 0;
 }
-//------------------------------------------------------------------------------
+
 OUString MacabCommonStatement::getTableName() const
 {
     const OSQLTables& xTabs = m_aSQLIterator.getTables();
@@ -299,7 +299,7 @@ OUString MacabCommonStatement::getTableName() const
 
     return xTabs.begin()->first;
 }
-//------------------------------------------------------------------------------
+
 void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException)
 {
     ::rtl::Reference<connectivity::OSQLColumns> xColumns;   // selected columns
@@ -317,7 +317,7 @@ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(S
     pMeta = static_cast<MacabResultSetMetaData *>(pResult->getMetaData().get());
     pMeta->setMacabFields(xColumns);
 }
-// -------------------------------------------------------------------------
+
 void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQLException)
 {
     const OSQLParseNode *pParseNode;
@@ -344,7 +344,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ
     // no WHERE clause: get all rows
     pResult->allMacabRecords();
 }
-// -------------------------------------------------------------------------
+
 void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLException)
 {
     const OSQLParseNode *pParseNode;
@@ -361,7 +361,7 @@ void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLE
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = MacabCommonStatement_BASE::queryInterface(rType);
@@ -369,7 +369,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru
         aRet = OPropertySetHelper::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL MacabCommonStatement::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -378,7 +378,7 @@ Sequence< Type > SAL_CALL MacabCommonStatement::getTypes(  ) throw(RuntimeExcept
 
     return comphelper::concatSequences(aTypes.getTypes(),MacabCommonStatement_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabCommonStatement::cancel(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -386,7 +386,7 @@ void SAL_CALL MacabCommonStatement::cancel(  ) throw(RuntimeException)
     checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed);
     // cancel the current sql statement
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabCommonStatement::close(  ) throw(SQLException, RuntimeException)
 {
     {
@@ -396,7 +396,7 @@ void SAL_CALL MacabCommonStatement::close(  ) throw(SQLException, RuntimeExcepti
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MacabCommonStatement::execute(
         const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -407,7 +407,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute(
 
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery(
         const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -467,7 +467,7 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql));
     m_xResultSet = Reference<XResultSet>(pResult);
     return xRS;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -476,7 +476,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection(  ) throw(
     // just return our connection here
     return (Reference< XConnection >) m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -485,7 +485,7 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(
     // the return values gives information about how many rows are affected by executing the sql statement
     return 0;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL MacabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -493,7 +493,7 @@ Any SAL_CALL MacabCommonStatement::getWarnings(  ) throw(SQLException, RuntimeEx
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL MacabCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -501,7 +501,7 @@ void SAL_CALL MacabCommonStatement::clearWarnings(  ) throw(SQLException, Runtim
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* MacabCommonStatement::createArrayHelper( ) const
 {
     // this properties are defined by the service statement
@@ -522,12 +522,12 @@ void SAL_CALL MacabCommonStatement::clearWarnings(  ) throw(SQLException, Runtim
 
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & MacabCommonStatement::getInfoHelper()
 {
     return *const_cast<MacabCommonStatement*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool MacabCommonStatement::convertFastPropertyValue(
         Any &,
         Any &,
@@ -538,7 +538,7 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue(
     // here we have to try to convert
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception)
 {
     // set the value to whatever is necessary
@@ -558,7 +558,7 @@ void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void MacabCommonStatement::getFastPropertyValue(Any&,sal_Int32 nHandle) const
 {
     switch (nHandle)
@@ -577,22 +577,22 @@ void MacabCommonStatement::getFastPropertyValue(Any&,sal_Int32 nHandle) const
             ;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL MacabCommonStatement::acquire() throw()
 {
     MacabCommonStatement_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL MacabCommonStatement::release() throw()
 {
     MacabCommonStatement_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 MacabStatement::MacabStatement(MacabConnection* _pConnection)
     : MacabStatement_BASE(_pConnection)
 {
diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx
index 341b2ff5e87b..26c83eb2b4d3 100644
--- a/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/connectivity/source/drivers/macab/MacabTable.cxx
@@ -33,14 +33,14 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection)
     : MacabTable_TYPEDEF(_pTables, sal_True),
     m_pConnection(_pConnection)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 MacabTable::MacabTable( sdbcx::OCollection* _pTables,
                 MacabConnection* _pConnection,
                 const OUString& _Name,
@@ -58,7 +58,7 @@ MacabTable::MacabTable( sdbcx::OCollection* _pTables,
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void MacabTable::refreshColumns()
 {
     TStringVector aVector;
diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx
index 32fd6ab96cbf..6fa6dc45c6a6 100644
--- a/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/connectivity/source/drivers/macab/MacabTables.cxx
@@ -67,12 +67,12 @@ sdbcx::ObjectType MacabTables::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void MacabTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<MacabCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void MacabTables::disposing(void)
 {
 m_xMetaData.clear();
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 175076ea6447..186802670f8b 100644
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
@@ -25,55 +25,55 @@
 
 using namespace ::connectivity::macab;
 using namespace ::com::sun::star::sdbc;
-// -----------------------------------------------------------------------------
+
 MacabCondition::~MacabCondition()
 {
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionConstant::MacabConditionConstant(const sal_Bool bValue)
     : MacabCondition(),
       m_bValue(bValue)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionConstant::isAlwaysTrue() const
 {
     return m_bValue;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionConstant::isAlwaysFalse() const
 {
     return !m_bValue;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionConstant::eval(const MacabRecord *) const
 {
     return m_bValue;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) throw(SQLException)
     : MacabCondition(),
       m_nFieldNumber(header->getColumnNumber(sColumnName))
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionColumn::isAlwaysTrue() const
 {
     // Sometimes true, sometimes false
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionColumn::isAlwaysFalse() const
 {
     // Sometimes true, sometimes false
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException)
     : MacabConditionColumn(header, sColumnName)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionNull::eval(const MacabRecord *aRecord) const
 {
     macabfield *aValue = aRecord->get(m_nFieldNumber);
@@ -85,12 +85,12 @@ sal_Bool MacabConditionNull::eval(const MacabRecord *aRecord) const
     else
         return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException)
     : MacabConditionColumn(header, sColumnName)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const
 {
     macabfield *aValue = aRecord->get(m_nFieldNumber);
@@ -102,18 +102,18 @@ sal_Bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const
     else
         return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : MacabConditionColumn(header, sColumnName),
       m_sMatchString(sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : MacabConditionCompare(header, sColumnName, sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionEqual::eval(const MacabRecord *aRecord) const
 {
     macabfield *aValue = aRecord->get(m_nFieldNumber);
@@ -131,12 +131,12 @@ sal_Bool MacabConditionEqual::eval(const MacabRecord *aRecord) const
     delete aValue2;
     return nReturn == 0;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : MacabConditionCompare(header, sColumnName, sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const
 {
     macabfield *aValue = aRecord->get(m_nFieldNumber);
@@ -154,12 +154,12 @@ sal_Bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const
     delete aValue2;
     return nReturn != 0;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException)
     : MacabConditionCompare(header, sColumnName, sMatchString)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionSimilar::eval(const MacabRecord *aRecord) const
 {
     macabfield *aValue = aRecord->get(m_nFieldNumber);
@@ -171,35 +171,35 @@ sal_Bool MacabConditionSimilar::eval(const MacabRecord *aRecord) const
 
     return match(m_sMatchString, sName, '\0');
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionBoolean::MacabConditionBoolean(MacabCondition *pLeft, MacabCondition *pRight)
     : MacabCondition(),
       m_pLeft(pLeft),
       m_pRight(pRight)
 {
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionBoolean::~MacabConditionBoolean()
 {
     delete m_pLeft;
     delete m_pRight;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionOr::MacabConditionOr(MacabCondition *pLeft, MacabCondition *pRight)
     : MacabConditionBoolean(pLeft, pRight)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionOr::isAlwaysTrue() const
 {
     return m_pLeft->isAlwaysTrue() || m_pRight->isAlwaysTrue();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionOr::isAlwaysFalse() const
 {
     return m_pLeft->isAlwaysFalse() && m_pRight->isAlwaysFalse();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionOr::eval(const MacabRecord *aRecord) const
 {
     // We avoid evaluating terms as much as we can
@@ -211,22 +211,22 @@ sal_Bool MacabConditionOr::eval(const MacabRecord *aRecord) const
 
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 MacabConditionAnd::MacabConditionAnd(MacabCondition *pLeft, MacabCondition *pRight)
     : MacabConditionBoolean(pLeft, pRight)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionAnd::isAlwaysTrue() const
 {
     return m_pLeft->isAlwaysTrue() && m_pRight->isAlwaysTrue();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionAnd::isAlwaysFalse() const
 {
     return m_pLeft->isAlwaysFalse() || m_pRight->isAlwaysFalse();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool MacabConditionAnd::eval(const MacabRecord *aRecord) const
 {
     // We avoid evaluating terms as much as we can
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index 79dd1c18619d..18e8def51e4c 100644
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
@@ -27,14 +27,14 @@ using namespace ::connectivity::macab;
 MacabOrder::~MacabOrder()
 {
 }
-// -----------------------------------------------------------------------------
+
 MacabSimpleOrder::MacabSimpleOrder(MacabHeader *header, OUString &sColumnName, sal_Bool bAscending)
     : MacabOrder(),
       m_nFieldNumber(header->getColumnNumber(sColumnName)),
       m_bAscending(bAscending)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 MacabSimpleOrder::compare(const MacabRecord *record1, const MacabRecord *record2) const
 {
     sal_Int32 result;
@@ -45,24 +45,24 @@ sal_Int32 MacabSimpleOrder::compare(const MacabRecord *record1, const MacabRecor
 
     return result;
 }
-// -----------------------------------------------------------------------------
+
 MacabComplexOrder::MacabComplexOrder()
     : MacabOrder(),
       m_aOrders()
 {
 }
-// -----------------------------------------------------------------------------
+
 MacabComplexOrder::~MacabComplexOrder()
 {
     for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
         delete m_aOrders[i];
 }
-// -----------------------------------------------------------------------------
+
 void MacabComplexOrder::addOrder(MacabOrder *pOrder)
 {
     m_aOrders.push_back(pOrder);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 MacabComplexOrder::compare(const MacabRecord *record1, const MacabRecord *record2) const
 {
     for (sal_uInt32 i = 0; i < m_aOrders.size(); i++)
diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx
index 663ee08d2267..1426378f48dc 100644
--- a/connectivity/source/drivers/mork/MCatalog.cxx
+++ b/connectivity/source/drivers/mork/MCatalog.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <cppuhelper/interfacecontainer.h>
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::mork;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::cppu;
 
-// -------------------------------------------------------------------------
+
 OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
                 ,m_pConnection(_pCon)
                 ,m_xMetaData(m_pConnection->getMetaData(  ))
@@ -46,7 +46,7 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
 //  refreshUsers();
 //  osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -70,19 +70,19 @@ void OCatalog::refreshTables()
     else
         m_pTables = new OTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshViews()
 {
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshUsers()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/mork/MColumnAlias.cxx b/connectivity/source/drivers/mork/MColumnAlias.cxx
index 96af40bf706b..0ad8a3dc8685 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-//------------------------------------------------------------------------------
+
 OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
 {
     static const sal_Char* s_pProgrammaticNames[] =
@@ -87,7 +87,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::
     initialize( _rxORB );
 }
 
-//------------------------------------------------------------------------------
+
 void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
 {
     Reference< XNameAccess > xAliasesNode(
@@ -125,7 +125,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
     }
 }
 
-//------------------------------------------------------------------
+
 OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const
 {
     AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias );
diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx
index 009ed6b998ad..57851ee70f70 100644
--- a/connectivity/source/drivers/mork/MColumns.cxx
+++ b/connectivity/source/drivers/mork/MColumns.cxx
@@ -82,12 +82,12 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-// -------------------------------------------------------------------------
+
 void OColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 78956371372f..71b44a115648 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -32,19 +32,19 @@
 
 using namespace dbtools;
 
-//------------------------------------------------------------------------------
+
 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::sdbcx;
-// --------------------------------------------------------------------------------
+
 
 namespace connectivity { namespace mork {
 
 static const int defaultScope = 0x80;
 
-// -----------------------------------------------------------------------------
+
 
 OConnection::OConnection(MorkDriver* _pDriver)
     :OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this)
@@ -56,7 +56,7 @@ OConnection::OConnection(MorkDriver* _pDriver)
     m_pBook = new MorkParser();
     m_pHistory = new MorkParser();
 }
-//-----------------------------------------------------------------------------
+
 OConnection::~OConnection()
 {
     acquire();
@@ -68,13 +68,13 @@ OConnection::~OConnection()
     delete m_pBook;
     delete m_pHistory;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
 void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     (void) info; // avoid warnings
@@ -173,10 +173,10 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
 }
 
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mork.OConnection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OConnection::createStatement()" );
@@ -190,7 +190,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" );
@@ -210,7 +210,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" );
@@ -220,7 +220,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     SAL_INFO("connectivity.mork", "OConnection::prepareCall( " << _sSql << " )");
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" );
@@ -232,12 +232,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep
 
     return _sSql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setAutoCommit", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     // you have to distinguish which if you are in autocommit mode or not
@@ -245,17 +245,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
 
     return sal_True;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     // when you database does support transactions you should commit here
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     // same as commit but for the other case
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -263,7 +263,7 @@ sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException
     // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent)
     return OConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OConnection::getMetaData()" );
@@ -282,50 +282,50 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setReadOnly", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     // return if your connection to readonly
     return sal_False;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this );
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
     return TransactionIsolation::NONE;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     // if your driver has special database types you can return it here
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this );
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -337,26 +337,26 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     // when you collected some warnings -> return it
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     // you should clear your collected warnings here
 }
-//------------------------------------------------------------------------------
+
 void OConnection::disposing()
 {
     // we noticed that we should be destroied in near future so we have to dispose our statements
     ::osl::MutexGuard aGuard(m_aMutex);
     dispose_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
 {
@@ -372,9 +372,9 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
     OSL_TRACE( "\tOUT OConnection::createCatalog()" );
     return xTab;
 }
-// -----------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------------
+
+
 void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext )
 {
     if ( _rError.getResId() != 0 )
@@ -411,7 +411,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
     throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext );
 }
 
-// -----------------------------------------------------------------------------
+
 void OConnection::throwSQLException( const sal_uInt16 _nErrorResourceId, const Reference< XInterface >& _rxContext )
 {
     ErrorDescriptor aError;
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index a850bdec26dd..94be41197400 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -52,13 +52,13 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
     OSL_ENSURE(m_pConnection,"ODatabaseMetaData::ODatabaseMetaData: No connection set!");
     m_pMetaDataHelper = new MDatabaseMetaDataHelper();
 }
-// -------------------------------------------------------------------------
+
 ODatabaseMetaData::~ODatabaseMetaData()
 {
     delete m_pMetaDataHelper;
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
         const OUString& tableNamePattern,
         const OUString& columnNamePattern ) throw(SQLException)
@@ -147,317 +147,317 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
     }
     return( aRows );
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 65535; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 254; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 20; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     // We only support a single table
     return 1;
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
     return OUString( "\"");
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     //We support create table
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     // We allow you to select from any table.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     //we support insert/update/delete now
@@ -465,384 +465,384 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeE
     //entry to the popup menu. We should avoid them.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     // Support added for this.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     // Any case may be used
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_pConnection->getURL();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     OUString aValue = OUString::number(1);
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue = OUString::number(0);
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return TransactionIsolation::NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 // here follow all methods which return a resultset
 // the first methods is an example implementation how to use this resultset
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     // there exists no possibility to get table types so we have to check
@@ -876,7 +876,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     // this returns an empty resultset where the column-names are already set
@@ -916,7 +916,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
     pResultSet->setRows(aRows);
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -928,7 +928,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     pResultSet->setRows( getColumnRows( tableNamePattern, columnNamePattern ));
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/,
     const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ ) throw(SQLException, RuntimeException)
@@ -954,7 +954,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -1013,11 +1013,11 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
index 9502919bc569..4aba2596cfd0 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx
@@ -36,13 +36,13 @@ static ::osl::Mutex m_aMetaMutex;
 using namespace connectivity;
 using namespace connectivity::mork;
 
-// -------------------------------------------------------------------------
+
 MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()
 {
     SAL_INFO("connectivity.mork", "=> MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" );
 }
 
-// -------------------------------------------------------------------------
+
 MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()
 {
 }
diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx
index 33a22aa90b6b..11619f08487b 100644
--- a/connectivity/source/drivers/mork/MDriver.cxx
+++ b/connectivity/source/drivers/mork/MDriver.cxx
@@ -38,13 +38,13 @@ MorkDriver::MorkDriver(css::uno::Reference< css::uno::XComponentContext > const
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString MorkDriver::getImplementationName_Static(  ) throw(css::uno::RuntimeException)
 {
     return OUString(MORK_DRIVER_IMPL_NAME);
 }
 
-//------------------------------------------------------------------------------
+
 css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames_Static(  ) throw (css::uno::RuntimeException)
 {
     css::uno::Sequence< OUString > aSNS(1);
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx
index 71a01493d659..5237a9304f23 100644
--- a/connectivity/source/drivers/mork/MNSFolders.cxx
+++ b/connectivity/source/drivers/mork/MNSFolders.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::mozilla;
 
 namespace
 {
-    // -------------------------------------------------------------------
+
     static OUString lcl_getUserDataDirectory()
     {
         ::osl::Security   aSecurity;
@@ -59,7 +59,7 @@ namespace
         return aConfigPath + "/";
     }
 
-    // -------------------------------------------------------------------
+
     const size_t NB_PRODUCTS = 3;
     const size_t NB_CANDIDATES = 4;
 
@@ -87,7 +87,7 @@ namespace
         "MOZILLA_THUNDERBIRD_PROFILE_ROOT",
     };
 
-    // -------------------------------------------------------------------
+
     static OUString lcl_guessProfileRoot( MozillaProductType _product )
     {
         size_t productIndex = _product - 1;
@@ -144,7 +144,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------
+
 OUString getRegistryDir(MozillaProductType product)
 {
     if (product == MozillaProductType_Default)
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx
index 00bf3ca1ec70..3cbc45d904e2 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx
@@ -51,17 +51,17 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString
     ,m_pResultSet()
 {
 }
-// -----------------------------------------------------------------------------
+
 OPreparedStatement::~OPreparedStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::lateInit()
 {
     if ( eSelect != parseSql( m_sSqlStatement ) )
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -76,7 +76,7 @@ void SAL_CALL OPreparedStatement::disposing()
     }
     m_xParamColumns = NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted )
     throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
@@ -98,7 +98,7 @@ OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sq
     return eStatementType;
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::initializeResultSet( OResultSet* _pResult )
 {
     OCommonStatement::initializeResultSet( _pResult );
@@ -106,14 +106,14 @@ void OPreparedStatement::initializeResultSet( OResultSet* _pResult )
     _pResult->setParameterRow( m_aParameterRow );
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::clearCachedResultSet()
 {
     OCommonStatement::clearCachedResultSet();
     m_pResultSet.clear();
     m_xMetaData.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult )
 {
     OCommonStatement::cacheResultSet( _pResult );
@@ -121,17 +121,17 @@ void OPreparedStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _
     m_pResultSet = _pResult;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::acquire() throw()
 {
     OCommonStatement::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::release() throw()
 {
     OCommonStatement::release();
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OCommonStatement::queryInterface(rType);
@@ -139,12 +139,12 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
         aRet = OPreparedStatement_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -165,7 +165,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
     return m_xMetaData;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OPreparedStatement::execute()" );
@@ -175,7 +175,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
     Reference< XResultSet> xResult = executeQuery();
     return xResult.is();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
 {
@@ -184,7 +184,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
     ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
@@ -194,7 +194,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS
     OSL_TRACE("prepStmt::setString( %s )", OUtoCStr( x ) );
     setParameter( parameterIndex, x );
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -203,7 +203,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
@@ -217,62 +217,62 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
     // stuff again. Just execute.
     return impl_executeCurrentQuery();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBoolean", *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setByte", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setDate", *this );
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setTime", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setTimestamp", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setDouble", *this );
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setFloat", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setInt", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setLong", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException)
 {
@@ -283,79 +283,79 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
 
     (m_aParameterRow->get())[parameterIndex].setNull();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setObjectWithInfo", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     setNull(parameterIndex,sqlType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     ::dbtools::implSetObject(this,parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setShort", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBytes", *this );
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setCharacterStream", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBinaryStream", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch(nHandle)
@@ -373,7 +373,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
 {
     ::connectivity::checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -386,7 +386,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
     if ((sal_Int32)(m_aParameterRow->get()).size() <= parameterIndex)
         (m_aParameterRow->get()).resize(parameterIndex+1);
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const
 ORowSetValue& x)
 {
@@ -397,7 +397,7 @@ ORowSetValue& x)
     (m_aParameterRow->get())[parameterIndex] = x;
 }
 
-//------------------------------------------------------------------
+
 size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
     OSL_UNUSED( pParameter );
@@ -449,7 +449,7 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
     m_xParamColumns->get().push_back(xParaColumn);
     return nParameter;
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::describeColumn(OSQLParseNode*
 _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
 {
@@ -469,7 +469,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
     //  else
         //  AddParameter(_pParameter,xProp);
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::describeParameter()
 {
     ::std::vector< OSQLParseNode*> aParseNodes;
@@ -491,7 +491,7 @@ aParseNodes.begin();
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes)
 {
     OSL_ENSURE(pParseNode != NULL,"OResultSet: internal error: invalid ParseNode");
@@ -511,22 +511,22 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OPreparedStatement::getMoreResults(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 05dd1219f6fc..8f09d46aacdb 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -92,7 +92,7 @@ MQueryHelper::~MQueryHelper()
     OSL_TRACE("OUT MQueryHelper::~MQueryHelper()");
 }
 
-// -------------------------------------------------------------------------
+
 void MQueryHelper::setAddressbook(OUString &ab)
 {
     SAL_INFO("connectivity.mork", "MQueryHelper::setAddressbook()");
@@ -103,7 +103,7 @@ void MQueryHelper::setAddressbook(OUString &ab)
 
     OSL_TRACE("\tOUT MQuery::setAddressbook()");
 }
-// -------------------------------------------------------------------------
+
 void MQueryHelper::setExpression( MQueryExpression &_expr )
 {
     SAL_INFO("connectivity.mork", "MQueryHelper::setExpression()");
@@ -164,7 +164,7 @@ sal_Int32 MQueryHelper::getResultCount() const
     return result;
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Bool MQueryHelper::queryComplete() const
 {
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index 7baac6653c6e..d2c4b1c610af 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -61,13 +61,13 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 
-//------------------------------------------------------------------------------
+
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException)    \
 {
     return OUString("com.sun.star.sdbcx.mork.ResultSet");
 }
-// -------------------------------------------------------------------------
+
  Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(2);
@@ -81,7 +81,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) t
     return cppu::supportsService(this, _rServiceName);
 }
 
-// -------------------------------------------------------------------------
+
 OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< connectivity::OSQLParseTreeIterator >& _pSQLIterator )
     : OResultSet_BASE(m_aMutex)
     ,OPropertySetHelper(OResultSet_BASE::rBHelper)
@@ -111,12 +111,12 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne
 {
     //m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
 }
-// -------------------------------------------------------------------------
+
 OResultSet::~OResultSet()
 {
 }
 
-// -------------------------------------------------------------------------
+
 void OResultSet::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -135,7 +135,7 @@ void OResultSet::disposing(void)
         m_pTable = NULL;
     }
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
@@ -143,7 +143,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
         aRet = OResultSet_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException)
 {
     OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -152,7 +152,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::methodEntry()
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -163,7 +163,7 @@ void OResultSet::methodEntry()
     }
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -183,60 +183,60 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     m_bWasNull = sal_True;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return Sequence< sal_Int8 >();
 }
-// -------------------------------------------------------------------------
+
 
 Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return Date();
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return 0.0;
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
@@ -244,7 +244,7 @@ sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLExce
     return 0;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -252,14 +252,14 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
     OSL_TRACE("In/Out: OResultSet::getRow, return = %u", m_nRowPos );
     return m_nRowPos;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return sal_Int64();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -270,49 +270,49 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
         m_pSQLIterator->getSelectColumns(), m_pSQLIterator->getTables().begin()->first ,m_pTable,determineReadOnly());
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
 {
     if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size())
         ::dbtools::throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 sal_uInt32 OResultSet::currentRowCount()
 {
     if ( m_bIsAlwaysFalseQuery )
@@ -322,7 +322,7 @@ sal_uInt32 OResultSet::currentRowCount()
     return m_aQueryHelper.getResultCount();
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
 {
@@ -330,7 +330,7 @@ sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
     return fetchRow(getCurrentCardNumber());
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::pushCard(sal_uInt32 /*cardNumber*/) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OResultSet::pushCard()" );
@@ -360,7 +360,7 @@ sal_Bool OResultSet::pushCard(sal_uInt32 /*cardNumber*/) throw(SQLException, Run
     return sal_True;
 */
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=> OResultSet::fetchRow()" );
@@ -404,7 +404,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(
     return sal_True;
 
 }
-// -------------------------------------------------------------------------
+
 
 const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -419,7 +419,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI
     return (m_aRow->get())[columnIndex];
 
 }
-// -------------------------------------------------------------------------
+
 
 
 OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -434,14 +434,14 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept
     return getValue(getCurrentCardNumber(), mapColumn( columnIndex ) );
 
 }
-// -------------------------------------------------------------------------
+
 
 Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return Time();
 }
-// -------------------------------------------------------------------------
+
 
 
 DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
@@ -449,7 +449,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQ
     ResultSetEntryGuard aGuard( *this );
     return DateTime();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -460,7 +460,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
     OSL_TRACE("In/Out: OResultSet::isBeforeFirst" );
     return( m_nRowPos < 1 );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_WARN("connectivity.mork", "OResultSet::isAfterLast() NOT IMPLEMENTED!");
@@ -470,7 +470,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
 //    return sal_True;
     return m_nRowPos > currentRowCount() && m_aQueryHelper.queryComplete();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -478,7 +478,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
     OSL_TRACE("In/Out: OResultSet::isFirst" );
     return m_nRowPos == 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_WARN("connectivity.mork", "OResultSet::isLast() NOT IMPLEMENTED!");
@@ -488,7 +488,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 //    return sal_True;
     return m_nRowPos == currentRowCount() && m_aQueryHelper.queryComplete();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -498,7 +498,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
     if ( first() )
         previous();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -507,47 +507,47 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
     if(last())
         next();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::close" );
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::first" );
     return seekRow( FIRST_POS );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::last" );
     return seekRow( LAST_POS );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::absolute" );
     return seekRow( ABSOLUTE_POS, row );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::relative" );
     return seekRow( RELATIVE_POS, row );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     OSL_TRACE("In/Out: OResultSet::previous" );
     return seekRow( PRIOR_POS );
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -555,7 +555,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
     OSL_TRACE("In/Out: OResultSet::getStatement" );
     return m_xStatement;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
     OSL_TRACE("In/Out: OResultSet::rowDeleted, m_RowStates=%u",m_RowStates );
     return sal_True;//return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     SAL_WARN("connectivity.mork", "OResultSet::rowInserted() NOT IMPLEMENTED!");
@@ -572,7 +572,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
     OSL_TRACE("In/Out: OResultSet::rowInserted,m_RowStates=%u",m_RowStates );
     return sal_True;//return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     SAL_WARN("connectivity.mork", "OResultSet::rowUpdated() NOT IMPLEMENTED!");
@@ -580,13 +580,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
     OSL_TRACE("In/Out: OResultSet::rowUpdated,m_RowStates=%u",m_RowStates );
     return sal_True;// return ((m_RowStates & RowStates_Updated) == RowStates_Updated) ;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 {
     return seekRow( NEXT_POS );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -594,7 +594,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -602,18 +602,18 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
     OSL_TRACE("In/Out: OResultSet::cancel" );
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::clearWarnings" );
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::getWarnings" );
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::refreshRow" );
@@ -622,7 +622,7 @@ void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
         m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_REFRESH_ROW, *this );
     }
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps(5);
@@ -636,12 +636,12 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
     return new OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::convertFastPropertyValue(
                             Any & /*rConvertedValue*/,
                             Any & /*rOldValue*/,
@@ -663,7 +663,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& /*rValue*/
@@ -685,7 +685,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::getFastPropertyValue(
                                 Any& rValue,
                                 sal_Int32 nHandle
@@ -711,23 +711,23 @@ void OResultSet::getFastPropertyValue(
          break;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-// -------------------------------------------------------------------------
+
 void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchString )
 {
     OSL_ENSURE(pNode->count() > 0,"Error parsing parameter in Parse Tree");
@@ -1051,7 +1051,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OResultSet::fillRowData()
     throw( ::com::sun::star::sdbc::SQLException )
@@ -1123,7 +1123,7 @@ void OResultSet::fillRowData()
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 static sal_Bool matchRow( OValueRow& row1, OValueRow& row2 )
 {
     OValueVector::Vector::iterator row1Iter = row1->get().begin();
@@ -1165,7 +1165,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLException,
                                                 ::com::sun::star::uno::RuntimeException)
 {
@@ -1335,7 +1335,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 
 void OResultSet::setBoundedColumns(const OValueRow& _rRow,
@@ -1418,7 +1418,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
 }
 
 
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::isCount() const
 {
     return (m_pParseTree &&
@@ -1430,7 +1430,7 @@ sal_Bool OResultSet::isCount() const
             );
 }
 
-// -----------------------------------------------------------------------------
+
 //
 // Check for valid row in m_aQuery
 //
@@ -1489,7 +1489,7 @@ sal_Int32 OResultSet::deletedCount()
     return m_CurrentRowCount - static_cast<sal_Int32>(m_pKeySet->get().size());
 
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
 {
     SAL_INFO("connectivity.mork", "=> OResultSet::seekRow()" );
@@ -1559,7 +1559,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
     fetchCurrentRow();
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping)
 {
     m_aColMapping = _aColumnMapping;
@@ -1568,7 +1568,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
         OSL_TRACE("Set Mapped: %d -> %d", i, m_aColMapping[i] );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Any OResultSet::getBookmark(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1677,7 +1677,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
     m_nUpdatedRow = getCurrentCardNumber();
 //    m_RowStates = m_RowStates | RowStates_Updated;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -1695,72 +1695,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
     m_nUpdatedRow = getCurrentCardNumber();
 //    m_RowStates = m_RowStates | RowStates_Updated;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex, static_cast<bool>(x));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this );
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -1773,12 +1773,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     x->readBytes(aSeq,length);
     updateValue(columnIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     updateBinaryStream(columnIndex,x,length);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
@@ -1790,7 +1790,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
         ::dbtools::throwGenericSQLException(sError,*this);
     } // if (!::dbtools::implUpdateObject(this, columnIndex, x))
  }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
@@ -1805,7 +1805,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
 }
 
 // XResultSetUpdate
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::insertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -1817,27 +1817,27 @@ void SAL_CALL OResultSet::insertRow(  ) throw(::com::sun::star::sdbc::SQLExcepti
     //m_aQueryHelper.setRowStates(getCurrentCardNumber(),m_RowStates);
     OSL_TRACE("insertRow out, m_nRowPos = %u", m_nRowPos );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "OResultSet::updateRow(  ) not implemented" );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::deleteRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "OResultSet::deleteRow(  ) not implemented" );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "OResultSet::cancelRowUpdates(  ) not implemented" );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "OResultSet::moveToInsertRow(  ) not implemented" );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
index 2e7763227c12..4aa8faec1542 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx
@@ -34,48 +34,48 @@ using namespace com::sun::star::beans;
 using namespace ::dbtools;
 using namespace ::comphelper;
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
    m_xColumns = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 void OResultSetMetaData::checkColumnIndex(sal_Int32 column)  throw(SQLException, RuntimeException)
 {
     if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size())
         throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getPrecision(column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return DataType::VARCHAR; // at the moment there exists only this type
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
     return static_cast<sal_Int32>((m_xColumns->get()).size());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -93,70 +93,70 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
     }
     return sColumnName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return m_aTableName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getColumnName(column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
@@ -168,7 +168,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -178,17 +178,17 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
 
     return m_bReadOnly || bReadOnly || m_pTable->isReadOnly();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return !isReadOnly(column);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return !isReadOnly(column);
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 0d719b591efb..403ae0b648b7 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -59,7 +59,7 @@ static ::osl::Mutex m_ThreadMutex;
 using namespace ::comphelper;
 using namespace connectivity::mork;
 using namespace connectivity;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -67,7 +67,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
-//------------------------------------------------------------------------------
+
 
 OStatement::OStatement( OConnection* _pConnection) : OCommonStatement( _pConnection)
 {
@@ -90,12 +90,12 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
     m_pConnection->acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 OCommonStatement::~OCommonStatement()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void OCommonStatement::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -112,7 +112,7 @@ void OCommonStatement::disposing()
     dispose_ChildImpl();
     OCommonStatement_IBASE::disposing();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OCommonStatement_IBASE::queryInterface(rType);
@@ -120,7 +120,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
         aRet = OPropertySetHelper::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -129,7 +129,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException)
 {
     {
@@ -140,7 +140,7 @@ void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException)
 }
 
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::createTable()" );
@@ -189,7 +189,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
         getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
 */
 }
-// -------------------------------------------------------------------------
+
 OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted)
     throw ( SQLException, RuntimeException )
 {
@@ -266,7 +266,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
     return eSelect;
 
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery()
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::impl_executeCurrentQuery()" );
@@ -283,7 +283,7 @@ Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery()
 
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::initializeResultSet( OResultSet* _pResult )
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::initializeResultSet()" );
@@ -297,7 +297,7 @@ void OCommonStatement::initializeResultSet( OResultSet* _pResult )
     _pResult->setTable(m_pTable);
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::clearCachedResultSet()
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::clearCachedResultSet()" );
@@ -311,14 +311,14 @@ void OCommonStatement::clearCachedResultSet()
     m_xResultSet.clear();
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult )
 {
     ENSURE_OR_THROW( _pResult.is(), "invalid result set" );
     m_xResultSet = Reference< XResultSet >( _pResult.get() );
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::execute()" );
@@ -332,7 +332,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce
     // returns true when a resultset is available
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -350,7 +350,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString&
 
     return impl_executeCurrentQuery();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -362,7 +362,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  ) throw(SQLE
     // just return our connection here
     return (Reference< XConnection >)m_pConnection;
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::queryInterface()" );
@@ -372,14 +372,14 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
         aRet = OCommonStatement::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this );
     return 0;
 
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -387,9 +387,9 @@ Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExcept
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -398,7 +398,7 @@ void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeExc
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OCommonStatement::createArrayHelper( ) const
 {
     // this properties are define by the service resultset
@@ -419,12 +419,12 @@ void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeExc
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper()
 {
     return *const_cast<OCommonStatement*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OCommonStatement::convertFastPropertyValue(
                             Any & /*rConvertedValue*/,
                             Any & /*rOldValue*/,
@@ -436,7 +436,7 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
     // here we have to try to convert
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception)
 {
     // set the value to whatever is necessary
@@ -454,7 +454,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OCommonStatement::getFastPropertyValue(Any& /*rValue*/,sal_Int32 nHandle) const
 {
     switch(nHandle)
@@ -471,34 +471,34 @@ void OCommonStatement::getFastPropertyValue(Any& /*rValue*/,sal_Int32 nHandle) c
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::acquire() throw()
 {
     OCommonStatement_IBASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::acquire() throw()
 {
     OCommonStatement::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::release() throw()
 {
     OCommonStatement::release();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 void OCommonStatement::createColumnMapping()
 {
     SAL_INFO("connectivity.mork", "=>  OCommonStatement::createColumnMapping()" );
@@ -523,7 +523,7 @@ void OCommonStatement::createColumnMapping()
         OSL_TRACE("AFTER  Mapped: %d -> %d", i, m_aColMapping[i] );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 void OCommonStatement::analyseSQL()
 {
@@ -549,7 +549,7 @@ void OCommonStatement::analyseSQL()
         }
     }
 }
-//------------------------------------------------------------------
+
 void OCommonStatement::setOrderbyColumn(    OSQLParseNode* pColumnRef,
                                         OSQLParseNode* pAscendingDescending)
 {
@@ -576,6 +576,6 @@ void OCommonStatement::setOrderbyColumn(    OSQLParseNode* pColumnRef,
     // Ascending or Descending?
     m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx
index e90dc3cd0b85..c28d25346fc6 100644
--- a/connectivity/source/drivers/mork/MTable.cxx
+++ b/connectivity/source/drivers/mork/MTable.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
                 const OUString& _Name, const OUString& _Type, const OUString& _Description )
     :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description )
@@ -55,25 +55,25 @@ OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
     construct();
 }
 
-//--------------------------------------------------------------------------
+
 sdbcx::OCollection* OTable::createColumns( const TStringVector& _rNames )
 {
     return new OColumns( this, m_aMutex, _rNames );
 }
 
-//--------------------------------------------------------------------------
+
 sdbcx::OCollection* OTable::createKeys(const TStringVector& _rNames)
 {
     return new OKeysHelper( this, m_aMutex, _rNames );
 }
 
-//--------------------------------------------------------------------------
+
 sdbcx::OCollection* OTable::createIndexes(const TStringVector& _rNames)
 {
     return new OIndexesHelper( this, m_aMutex, _rNames );
 }
 
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx
index 546103ec4c40..19a3f1e25260 100644
--- a/connectivity/source/drivers/mork/MTables.cxx
+++ b/connectivity/source/drivers/mork/MTables.cxx
@@ -70,17 +70,17 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OTables::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx
index a4a288d1a70c..8fae349bfe70 100644
--- a/connectivity/source/drivers/mozab/MCatalog.cxx
+++ b/connectivity/source/drivers/mozab/MCatalog.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <cppuhelper/interfacecontainer.h>
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity::mozab;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::cppu;
 
-// -------------------------------------------------------------------------
+
 OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
                 ,m_pConnection(_pCon)
                 ,m_xMetaData(m_pConnection->getMetaData(  ))
@@ -46,7 +46,7 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
 //  refreshUsers();
 //  osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -70,19 +70,19 @@ void OCatalog::refreshTables()
     else
         m_pTables = new OTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshViews()
 {
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 void OCatalog::refreshUsers()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException)
diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx
index df9254b3d6fc..18aa6ca90020 100644
--- a/connectivity/source/drivers/mozab/MColumnAlias.cxx
+++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx
@@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-//------------------------------------------------------------------------------
+
 OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
 {
     static const sal_Char* s_pProgrammaticNames[] =
@@ -87,7 +87,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::
     initialize( _rxORB );
 }
 
-//------------------------------------------------------------------------------
+
 void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB )
 {
     // open our driver settings config node
@@ -157,7 +157,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su
     }
 }
 
-//------------------------------------------------------------------
+
 OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const
 {
     AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias );
@@ -169,7 +169,7 @@ OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString&
     return pos->second.programmaticAsciiName;
 }
 
-//------------------------------------------------------------------
+
 bool OColumnAlias::isColumnSearchable( const OUString _alias ) const
 {
     OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias );
diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx
index a7c3b96c5758..452a34bece0a 100644
--- a/connectivity/source/drivers/mozab/MColumns.cxx
+++ b/connectivity/source/drivers/mozab/MColumns.cxx
@@ -83,12 +83,12 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
     return xRet;
 }
 
-// -------------------------------------------------------------------------
+
 void OColumns::impl_refresh() throw(RuntimeException)
 {
     m_pTable->refreshColumns();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx
index dd4281a81bb5..53083fb4893b 100644
--- a/connectivity/source/drivers/mozab/MConfigAccess.cxx
+++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx
@@ -34,7 +34,7 @@ namespace connectivity
 {
     namespace mozab
     {
-        //-----------------------------------------------------------------
+
         Reference< XPropertySet > createDriverConfigNode( Reference< XMultiServiceFactory > _rxORB )
         {
             Reference< XPropertySet > xNode;
@@ -86,7 +86,7 @@ namespace connectivity
             return xNode;
         }
 
-        //-----------------------------------------------------------------
+
         namespace
         {
             // a private helper to accessing the point where we store the reference
@@ -98,19 +98,19 @@ namespace connectivity
             }
         }
 
-        //-----------------------------------------------------------------
+
         void setMozabServiceFactory( const Reference< XMultiServiceFactory >& _rxFactory )
         {
             accessFactoryStorage( ) = _rxFactory;
         }
 
-        //-----------------------------------------------------------------
+
         const Reference< XMultiServiceFactory >& getMozabServiceFactory( )
         {
             return accessFactoryStorage( );
         }
 
-        //-----------------------------------------------------------------
+
         OUString getDescription(const sal_Char* sNode,const OUString & sDefault)
         {
             OUString sPreferredName;
@@ -143,7 +143,7 @@ namespace connectivity
                 sDescription = sDefault;
             return sDescription;
         }
-        //-----------------------------------------------------------------
+
         OUString getPreferredProfileName( )
         {
             OUString sPreferredName;
@@ -174,7 +174,7 @@ namespace connectivity
 
 //.........................................................................
 
-//-------------------------------------------------------------------------
+
 extern "C" const sal_Unicode* SAL_CALL getUserProfile( void )
 {
     static sal_Bool         bReadConfig = sal_False;
@@ -187,7 +187,7 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void )
 
     return sUserProfile.getStr();
 }
-//------------------------------------------------------------------------
+
 extern "C" const sal_Char* SAL_CALL getPabDescription( void )
 {
     static sal_Bool         bReadConfig = sal_False;
@@ -207,7 +207,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void )
     return sPabDescription.getStr();
 }
 
-//-------------------------------------------------------------------------
+
 extern "C" const sal_Char* SAL_CALL getHisDescription( void )
 {
     static sal_Bool         bReadConfig = sal_False;
@@ -227,7 +227,7 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void )
     return sHisDescription.getStr();
 }
 
-//-------------------------------------------------------------------------
+
 // MConfigAccess was invented to allow non-UNO parts access to the configuration.
 // Unfortunately, configuration access requires a XMultiServiceFactory - which the
 // mozilla side does not have.
diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx
index 8440d50d9770..708438f67612 100644
--- a/connectivity/source/drivers/mozab/MConnection.cxx
+++ b/connectivity/source/drivers/mozab/MConnection.cxx
@@ -54,13 +54,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void*  SAL_CALL OMozabConnection_CreateInstance(
 
 using namespace dbtools;
 
-//------------------------------------------------------------------------------
+
 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::sdbcx;
-// --------------------------------------------------------------------------------
+
 
 namespace connectivity { namespace mozab {
 
@@ -72,7 +72,7 @@ struct ConnectionImplData
     ::boost::shared_ptr< ::comphelper::OfficeResourceBundle >   pResourceBundle;
 };
 
-// -----------------------------------------------------------------------------
+
 #ifdef __MINGW32__
 extern "C"
 #endif
@@ -88,13 +88,13 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme )
     }
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 OUString OConnection::getDriverImplementationName()
 {
     return OUString(MOZAB_DRIVER_IMPL_NAME);
 }
 
-// -----------------------------------------------------------------------------
+
 const sal_Char* getSchemeURI( MozillaScheme _eScheme )
 {
     switch ( _eScheme )
@@ -108,7 +108,7 @@ const sal_Char* getSchemeURI( MozillaScheme _eScheme )
     return NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OConnection::OConnection(MozabDriver*   _pDriver)
     :OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this)
@@ -123,7 +123,7 @@ OConnection::OConnection(MozabDriver*   _pDriver)
     m_pDriver->acquire();
 
 }
-//-----------------------------------------------------------------------------
+
 OConnection::~OConnection()
 {
     acquire();
@@ -132,13 +132,13 @@ OConnection::~OConnection()
     m_pDriver->release();
     m_pDriver = NULL;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
 void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     OSL_TRACE("IN OConnection::construct()" );
@@ -340,10 +340,10 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
 
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mozab.OConnection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -355,7 +355,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -372,7 +372,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     OSL_UNUSED( _sSql );
@@ -380,7 +380,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin
     OSL_TRACE("OConnection::prepareCall( %s )", OUtoCStr( _sSql ) );
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -389,12 +389,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep
 
     return _sSql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setAutoCommit", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     // you have to distinguish which if you are in autocommit mode or not
@@ -402,17 +402,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
 
     return sal_True;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     // when you database does support transactions you should commit here
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     // same as commit but for the other case
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -420,7 +420,7 @@ sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException
     // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent)
     return OConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -437,51 +437,51 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setReadOnly", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     // return if your connection to readonly
     return sal_False;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this );
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     // return your current catalog
     return OUString();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this );
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
     return TransactionIsolation::NONE;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     // if your driver has special database types you can return it here
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this );
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -493,19 +493,19 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     // when you collected some warnings -> return it
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     // you should clear your collected warnings here
 }
-//------------------------------------------------------------------------------
+
 void OConnection::disposing()
 {
     // we noticed that we should be destroied in near future so we have to dispose our statements
@@ -521,7 +521,7 @@ void OConnection::disposing()
 
     dispose_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
 {
@@ -537,7 +537,7 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog()
     OSL_TRACE( "\tOUT OConnection::createCatalog()" );
     return xTab;
 }
-// -----------------------------------------------------------------------------
+
 
 MNameMapper* OConnection::getNameMapper ()
 {
@@ -547,7 +547,7 @@ MNameMapper* OConnection::getNameMapper ()
     return m_aNameMapper;
 }
 
-// -----------------------------------------------------------------------------
+
 void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext )
 {
     if ( _rError.getResId() != 0 )
@@ -584,7 +584,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer
     throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext );
 }
 
-// -----------------------------------------------------------------------------
+
 void OConnection::throwSQLException( const sal_uInt16 _nErrorResourceId, const Reference< XInterface >& _rxContext )
 {
     ErrorDescriptor aError;
diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
index 34c640b6d5e4..ef3b63bf8801 100644
--- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx
@@ -64,13 +64,13 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
     OSL_ENSURE(m_pConnection,"ODatabaseMetaData::ODatabaseMetaData: No connection set!");
     m_pDbMetaDataHelper = new  MDatabaseMetaDataHelper();
 }
-// -------------------------------------------------------------------------
+
 ODatabaseMetaData::~ODatabaseMetaData()
 {
     delete m_pDbMetaDataHelper;
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
         const OUString& tableNamePattern,
         const OUString& columnNamePattern ) throw(SQLException)
@@ -152,317 +152,317 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows(
     }
     return( aRows );
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 65535; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 254; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 20; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     // We only support a single table
     return 1;
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
     return OUString("\"");
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     //We support create table
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     return 0;// 0 means no limit
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     // We allow you to select from any table.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     //we support insert/update/delete now
@@ -470,382 +470,382 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeE
     //entry to the popup menu. We should avoid them.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     // Support added for this.
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     // Any case may be used
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_pConnection->getURL();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     return OUString( "1" );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     return OUString( "0" );
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return TransactionIsolation::NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 // here follow all methods which return a resultset
 // the first methods is an example implementation how to use this resultset
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     // there exists no possibility to get table types so we have to check
@@ -879,7 +879,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     pResult->setRows(aRows);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     // this returns an empty resultset where the column-names are already set
@@ -919,7 +919,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
     pResultSet->setRows(aRows);
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -931,7 +931,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     pResultSet->setRows( getColumnRows( tableNamePattern, columnNamePattern ));
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/,
     const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
@@ -952,7 +952,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
     return xResultSet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -1007,12 +1007,12 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     return xRef;
 
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx
index 0f945dc05beb..a30fae3b3d88 100644
--- a/connectivity/source/drivers/mozab/MDriver.cxx
+++ b/connectivity/source/drivers/mozab/MDriver.cxx
@@ -36,14 +36,14 @@ namespace connectivity
 {
     namespace mozab
     {
-        //------------------------------------------------------------------
+
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL MozabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
         {
             return *(new MozabDriver( _rxFactory ));
         }
     }
 }
-// --------------------------------------------------------------------------------
+
 MozabDriver::MozabDriver(
     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
     : ODriver_BASE(m_aMutex), m_xMSFactory( _rxFactory )
@@ -51,11 +51,11 @@ MozabDriver::MozabDriver(
     ,m_pCreationFunc(NULL)
 {
 }
-// -----------------------------------------------------------------------------
+
 MozabDriver::~MozabDriver()
 {
 }
-// --------------------------------------------------------------------------------
+
 void MozabDriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -80,14 +80,14 @@ void MozabDriver::disposing()
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString MozabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString(MOZAB_DRIVER_IMPL_NAME);
         // this name is referenced in the configuration and in the mozab.xml
         // Please take care when changing it.
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > MozabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
@@ -97,7 +97,7 @@ Sequence< OUString > MozabDriver::getSupportedServiceNames_Static(  ) throw (Run
     return aSNS;
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL MozabDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -108,13 +108,13 @@ sal_Bool SAL_CALL MozabDriver::supportsService( const OUString& _rServiceName )
     return cppu::supportsService(this, _rServiceName);
 }
 
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL MozabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     if ( !ensureInit() )
@@ -150,7 +150,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, con
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MozabDriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
@@ -160,7 +160,7 @@ sal_Bool SAL_CALL MozabDriver::acceptsURL( const OUString& url )
     // here we have to look if we support this url format
     return impl_classifyURL(url) != Unknown;
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( !ensureInit() )
@@ -194,17 +194,17 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const OUSt
     // if you have something special to say return it here :-)
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MozabDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return 1; // depends on you
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL MozabDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return 0; // depends on you
 }
-// --------------------------------------------------------------------------------
+
 EDriverType MozabDriver::impl_classifyURL( const OUString& url )
 {
     // Skip 'sdbc:mozab: part of URL
@@ -252,7 +252,7 @@ EDriverType MozabDriver::impl_classifyURL( const OUString& url )
     return Unknown;
 }
 
-// --------------------------------------------------------------------------------
+
 namespace
 {
     template< typename FUNCTION >
@@ -277,7 +277,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 extern "C" { static void SAL_CALL thisModule() {} }
 
 bool MozabDriver::ensureInit()
@@ -314,6 +314,6 @@ bool MozabDriver::ensureInit()
 
     return true;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index 346c6bda8ff1..e8ace7cf11ce 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -61,17 +61,17 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString
     ,m_pResultSet()
 {
 }
-// -----------------------------------------------------------------------------
+
 OPreparedStatement::~OPreparedStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::lateInit()
 {
     if ( eSelect != parseSql( m_sSqlStatement ) )
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -86,7 +86,7 @@ void SAL_CALL OPreparedStatement::disposing()
     }
     m_xParamColumns = NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted )
     throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException )
@@ -106,7 +106,7 @@ OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sq
     return eStatementType;
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::initializeResultSet( OResultSet* _pResult )
 {
     OCommonStatement::initializeResultSet( _pResult );
@@ -114,14 +114,14 @@ void OPreparedStatement::initializeResultSet( OResultSet* _pResult )
     _pResult->setParameterRow( m_aParameterRow );
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::clearCachedResultSet()
 {
     OCommonStatement::clearCachedResultSet();
     m_pResultSet.clear();
     m_xMetaData.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult )
 {
     OCommonStatement::cacheResultSet( _pResult );
@@ -129,17 +129,17 @@ void OPreparedStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _
     m_pResultSet = _pResult;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::acquire() throw()
 {
     OCommonStatement::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::release() throw()
 {
     OCommonStatement::release();
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OCommonStatement::queryInterface(rType);
@@ -147,12 +147,12 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
         aRet = OPreparedStatement_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -171,7 +171,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
     return m_xMetaData;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -180,14 +180,14 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
     Reference< XResultSet> xResult = executeQuery();
     return xResult.is();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
@@ -197,7 +197,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS
     OSL_TRACE("prepStmt::setString( %s )", OUtoCStr( x ) );
     setParameter( parameterIndex, x );
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -206,7 +206,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
@@ -218,62 +218,62 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
     // stuff again. Just execute.
     return impl_executeCurrentQuery();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBoolean", *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setByte", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setDate", *this );
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setTime", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setTimestamp", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setDouble", *this );
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setFloat", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setInt", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setLong", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException)
 {
@@ -284,79 +284,79 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /
 
     (m_aParameterRow->get())[parameterIndex].setNull();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setObjectWithInfo", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     setNull(parameterIndex,sqlType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     ::dbtools::implSetObject(this,parameterIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setShort", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBytes", *this );
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setCharacterStream", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XParameters::setBinaryStream", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch(nHandle)
@@ -374,7 +374,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
 {
     ::connectivity::checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed);
@@ -387,7 +387,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex)
     if ((sal_Int32)(m_aParameterRow->get()).size() <= parameterIndex)
         (m_aParameterRow->get()).resize(parameterIndex+1);
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const
 ORowSetValue& x)
 {
@@ -398,7 +398,7 @@ ORowSetValue& x)
     (m_aParameterRow->get())[parameterIndex] = x;
 }
 
-//------------------------------------------------------------------
+
 size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol)
 {
     OSL_UNUSED( pParameter );
@@ -450,7 +450,7 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere
     m_xParamColumns->get().push_back(xParaColumn);
     return nParameter;
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::describeColumn(OSQLParseNode*
 _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
 {
@@ -470,7 +470,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable)
     //  else
         //  AddParameter(_pParameter,xProp);
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::describeParameter()
 {
     ::std::vector< OSQLParseNode*> aParseNodes;
@@ -492,7 +492,7 @@ aParseNodes.begin();
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes)
 {
     OSL_ENSURE(pParseNode != NULL,"OResultSet: internal error: invalid ParseNode");
@@ -512,22 +512,22 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector<
     for (sal_uInt32 i = 0; i < pParseNode->count(); i++)
         scanParameter(pParseNode->getChild(i),_rParaNodes);
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OPreparedStatement::getMoreResults(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index aeb5bea51dd0..49c9ff05f76e 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -60,13 +60,13 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
 
-//------------------------------------------------------------------------------
+
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException)    \
 {
     return OUString("com.sun.star.sdbcx.mozab.ResultSet");
 }
-// -------------------------------------------------------------------------
+
  Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(2);
@@ -80,7 +80,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) t
     return cppu::supportsService(this, _rServiceName);
 }
 
-// -------------------------------------------------------------------------
+
 OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< connectivity::OSQLParseTreeIterator >& _pSQLIterator )
     : OResultSet_BASE(m_aMutex)
     ,OPropertySetHelper(OResultSet_BASE::rBHelper)
@@ -109,12 +109,12 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne
 
     m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
 }
-// -------------------------------------------------------------------------
+
 OResultSet::~OResultSet()
 {
 }
 
-// -------------------------------------------------------------------------
+
 void OResultSet::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -133,7 +133,7 @@ void OResultSet::disposing(void)
         m_pTable = NULL;
     }
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
@@ -141,7 +141,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
         aRet = OResultSet_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException)
 {
     OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -150,7 +150,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::methodEntry()
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -161,7 +161,7 @@ void OResultSet::methodEntry()
     }
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -181,60 +181,60 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     m_bWasNull = sal_True;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return Sequence< sal_Int8 >();
 }
-// -------------------------------------------------------------------------
+
 
 Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return Date();
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return 0.0;
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
@@ -242,7 +242,7 @@ sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLExce
     return 0;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -250,14 +250,14 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
     OSL_TRACE("In/Out: OResultSet::getRow, return = %u", m_nRowPos );
     return m_nRowPos;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return sal_Int64();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -268,49 +268,49 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
         m_pSQLIterator->getSelectColumns(), m_pSQLIterator->getTables().begin()->first ,m_pTable,determineReadOnly());
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException)
 {
     if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size())
         ::dbtools::throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 sal_uInt32  OResultSet::currentRowCount()
 {
     if ( m_bIsAlwaysFalseQuery )
@@ -318,7 +318,7 @@ sal_uInt32  OResultSet::currentRowCount()
     return m_aQuery.getRealRowCount() - deletedCount();
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
 {
@@ -326,7 +326,7 @@ sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException)
     return fetchRow(getCurrentCardNumber());
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, RuntimeException)
 {
     if (cardNumber == 0)
@@ -353,7 +353,7 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime
     return sal_True;
 
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("fetchRow, cardNumber = %u", cardNumber );
@@ -394,7 +394,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(
     }
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -409,7 +409,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI
     return (m_aRow->get())[columnIndex];
 
 }
-// -------------------------------------------------------------------------
+
 
 
 OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -424,14 +424,14 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept
     return getValue(getCurrentCardNumber(), mapColumn( columnIndex ) );
 
 }
-// -------------------------------------------------------------------------
+
 
 Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     return Time();
 }
-// -------------------------------------------------------------------------
+
 
 
 DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
@@ -439,7 +439,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQ
     ResultSetEntryGuard aGuard( *this );
     return DateTime();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -450,7 +450,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
     OSL_TRACE("In/Out: OResultSet::isBeforeFirst" );
     return( m_nRowPos < 1 );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -458,7 +458,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
     OSL_TRACE("In/Out: OResultSet::isAfterLast" );
     return m_nRowPos > currentRowCount() && m_aQuery.queryComplete();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -466,7 +466,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
     OSL_TRACE("In/Out: OResultSet::isFirst" );
     return m_nRowPos == 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -474,7 +474,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
     OSL_TRACE("In/Out: OResultSet::isLast" );
     return m_nRowPos == currentRowCount() && m_aQuery.queryComplete();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -484,7 +484,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
     if ( first() )
         previous();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -493,7 +493,7 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
     if(last())
         next();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -501,40 +501,40 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
     OSL_TRACE("In/Out: OResultSet::close" );
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::first" );
     return seekRow( FIRST_POS );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::last" );
     return seekRow( LAST_POS );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::absolute" );
     return seekRow( ABSOLUTE_POS, row );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::relative" );
     return seekRow( RELATIVE_POS, row );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     OSL_TRACE("In/Out: OResultSet::previous" );
     return seekRow( PRIOR_POS );
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -542,7 +542,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
     OSL_TRACE("In/Out: OResultSet::getStatement" );
     return m_xStatement;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -550,27 +550,27 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
     OSL_TRACE("In/Out: OResultSet::rowDeleted, m_RowStates=%u",m_RowStates );
     return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     OSL_TRACE("In/Out: OResultSet::rowInserted,m_RowStates=%u",m_RowStates );
     return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
     OSL_TRACE("In/Out: OResultSet::rowUpdated,m_RowStates=%u",m_RowStates );
     return ((m_RowStates & RowStates_Updated) == RowStates_Updated) ;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 {
     return seekRow( NEXT_POS );
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -578,7 +578,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -586,25 +586,25 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
     OSL_TRACE("In/Out: OResultSet::cancel" );
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::clearWarnings" );
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::getWarnings" );
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     OSL_TRACE("In/Out: OResultSet::refreshRow" );
     if (fetchRow(getCurrentCardNumber(),sal_True))  //force fetch current row will cause we lose all change to the current row
         m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_REFRESH_ROW, *this );
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps(5);
@@ -618,12 +618,12 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
     return new OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::convertFastPropertyValue(
                             Any & /*rConvertedValue*/,
                             Any & /*rOldValue*/,
@@ -645,7 +645,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& /*rValue*/
@@ -667,7 +667,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::getFastPropertyValue(
                                 Any& rValue,
                                 sal_Int32 nHandle
@@ -693,23 +693,23 @@ void OResultSet::getFastPropertyValue(
          break;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
-// -------------------------------------------------------------------------
+
 void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchString )
 {
     OSL_ENSURE(pNode->count() > 0,"Error parsing parameter in Parse Tree");
@@ -1032,7 +1032,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*                 parseT
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void OResultSet::fillRowData()
     throw( ::com::sun::star::sdbc::SQLException )
@@ -1122,7 +1122,7 @@ void OResultSet::fillRowData()
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 static sal_Bool matchRow( OValueRow& row1, OValueRow& row2 )
 {
     OValueVector::Vector::iterator row1Iter = row1->get().begin();
@@ -1162,7 +1162,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLException,
                                                 ::com::sun::star::uno::RuntimeException)
 {
@@ -1337,7 +1337,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OResultSet::setBoundedColumns(const OValueRow& _rRow,
                                    const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,
@@ -1419,7 +1419,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
 }
 
 
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::isCount() const
 {
     return (m_pParseTree &&
@@ -1431,7 +1431,7 @@ sal_Bool OResultSet::isCount() const
             );
 }
 
-// -----------------------------------------------------------------------------
+
 //
 // Check for valid row in m_aQuery
 //
@@ -1483,7 +1483,7 @@ sal_Int32 OResultSet::deletedCount()
     return m_CurrentRowCount - static_cast<sal_Int32>(m_pKeySet->get().size());
 
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
 {
     ResultSetEntryGuard aGuard( *this );
@@ -1560,7 +1560,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
     fetchCurrentRow();
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping)
 {
     m_aColMapping = _aColumnMapping;
@@ -1569,7 +1569,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
         OSL_TRACE("Set Mapped: %d -> %d", i, m_aColMapping[i] );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Any OResultSet::getBookmark(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1673,7 +1673,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw
     m_nUpdatedRow = getCurrentCardNumber();
     m_RowStates = m_RowStates | RowStates_Updated;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -1691,72 +1691,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
     m_nUpdatedRow = getCurrentCardNumber();
     m_RowStates = m_RowStates | RowStates_Updated;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex, static_cast<bool>(x));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this );
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -1769,12 +1769,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     x->readBytes(aSeq,length);
     updateValue(columnIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     updateBinaryStream(columnIndex,x,length);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
@@ -1786,7 +1786,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th
         ::dbtools::throwGenericSQLException(sError,*this);
     } // if (!::dbtools::implUpdateObject(this, columnIndex, x))
  }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
@@ -1801,7 +1801,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
 }
 
 // XResultSetUpdate
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::insertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -1813,7 +1813,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(::com::sun::star::sdbc::SQLExcepti
     m_aQuery.setRowStates(getCurrentCardNumber(),m_RowStates);
     OSL_TRACE("insertRow out, m_nRowPos = %u", m_nRowPos );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_TRACE("updateRow in, m_nRowPos = %u", m_nRowPos );
@@ -1842,7 +1842,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(::com::sun::star::sdbc::SQLExcepti
     fetchCurrentRow();
     OSL_TRACE("updateRow out, m_nRowPos = %u", m_nRowPos );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::deleteRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_TRACE("deleteRow, m_nRowPos = %u", m_nRowPos );
@@ -1864,7 +1864,7 @@ void SAL_CALL OResultSet::deleteRow(  ) throw(::com::sun::star::sdbc::SQLExcepti
     m_RowStates = RowStates_Deleted;
     OSL_TRACE("deleteRow out, m_nRowPos = %u", m_nRowPos );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
@@ -1872,7 +1872,7 @@ void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(::com::sun::star::sdbc::SQL
     if (fetchRow(getCurrentCardNumber(),sal_True))  //force fetch current row will cause we lose all change to the current row
         m_pStatement->getOwnConnection()->throwSQLException( STR_CAN_NOT_CANCEL_ROW_UPDATE, *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     OSL_TRACE("moveToInsertRow in, m_nRowPos = %u", m_nRowPos );
@@ -1902,7 +1902,7 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(::com::sun::star::sdbc::SQLE
     fetchCurrentRow();
     OSL_TRACE("moveToInsertRow out, m_nRowPos = %u", m_nRowPos );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ResultSetEntryGuard aGuard( *this );
diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
index 48a888d4316a..d43eda83a0c8 100644
--- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
+++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx
@@ -34,48 +34,48 @@ using namespace com::sun::star::beans;
 using namespace ::dbtools;
 using namespace ::comphelper;
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
    m_xColumns = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 void OResultSetMetaData::checkColumnIndex(sal_Int32 column)  throw(SQLException, RuntimeException)
 {
     if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size())
         throwInvalidIndexException(*this);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getPrecision(column);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return DataType::VARCHAR; // at the moment there exists only this type
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
     return static_cast<sal_Int32>((m_xColumns->get()).size());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -93,70 +93,70 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ
     }
     return sColumnName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return m_aTableName;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getColumnName(column);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     checkColumnIndex(column);
     return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -177,7 +177,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -187,17 +187,17 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx
 
     return m_bReadOnly || bReadOnly || m_pTable->isReadOnly();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return !isReadOnly(column);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return !isReadOnly(column);
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx
index 3469a62b75a0..cbe2f70fee1c 100644
--- a/connectivity/source/drivers/mozab/MServices.cxx
+++ b/connectivity/source/drivers/mozab/MServices.cxx
@@ -41,7 +41,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -79,7 +79,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory );
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
@@ -109,7 +109,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere
         }
         return NULL;
 }
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx
index 14d154ebf1ae..2632bf8b5737 100644
--- a/connectivity/source/drivers/mozab/MStatement.cxx
+++ b/connectivity/source/drivers/mozab/MStatement.cxx
@@ -58,7 +58,7 @@ static ::osl::Mutex m_ThreadMutex;
 using namespace ::comphelper;
 using namespace connectivity::mozab;
 using namespace connectivity;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -66,7 +66,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
-//------------------------------------------------------------------------------
+
 OCommonStatement::OCommonStatement(OConnection* _pConnection )
     :OCommonStatement_IBASE(m_aMutex)
     ,OPropertySetHelper(OCommonStatement_IBASE::rBHelper)
@@ -83,12 +83,12 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection )
     m_pConnection->acquire();
     OSL_TRACE("In/Out: OCommonStatement::OCommonStatement" );
 }
-// -----------------------------------------------------------------------------
+
 OCommonStatement::~OCommonStatement()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void OCommonStatement::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -105,7 +105,7 @@ void OCommonStatement::disposing()
     dispose_ChildImpl();
     OCommonStatement_IBASE::disposing();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OCommonStatement_IBASE::queryInterface(rType);
@@ -113,7 +113,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim
         aRet = OPropertySetHelper::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -122,7 +122,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException)
 {
     {
@@ -133,7 +133,7 @@ void SAL_CALL OCommonStatement::close(  ) throw(SQLException, RuntimeException)
 }
 
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
 {
     if(m_pParseTree)
@@ -178,7 +178,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException )
     else
         getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
 }
-// -------------------------------------------------------------------------
+
 OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted)
     throw ( SQLException, RuntimeException )
 {
@@ -250,7 +250,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
     return eSelect;
 
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery()
 {
     clearCachedResultSet();
@@ -265,7 +265,7 @@ Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery()
 
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::initializeResultSet( OResultSet* _pResult )
 {
     ENSURE_OR_THROW( _pResult, "invalid result set" );
@@ -277,7 +277,7 @@ void OCommonStatement::initializeResultSet( OResultSet* _pResult )
     _pResult->setTable(m_pTable);
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::clearCachedResultSet()
 {
     Reference< XResultSet > xResultSet( m_xResultSet.get(), UNO_QUERY );
@@ -297,14 +297,14 @@ void OCommonStatement::clearCachedResultSet()
     m_xResultSet.clear();
 }
 
-// -------------------------------------------------------------------------
+
 void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult )
 {
     ENSURE_OR_THROW( _pResult.is(), "invalid result set" );
     m_xResultSet = Reference< XResultSet >( _pResult.get() );
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -316,7 +316,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce
     // returns true when a resultset is available
     return xRS.is();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -332,7 +332,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString&
 
     return impl_executeCurrentQuery();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -342,7 +342,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection(  ) throw(SQLE
     // just return our connection here
     return (Reference< XConnection >)m_pConnection;
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XServiceInfo*> (this));
@@ -350,14 +350,14 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
         aRet = OCommonStatement::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this );
     return 0;
 
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -365,9 +365,9 @@ Any SAL_CALL OCommonStatement::getWarnings(  ) throw(SQLException, RuntimeExcept
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -376,7 +376,7 @@ void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeExc
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OCommonStatement::createArrayHelper( ) const
 {
     // this properties are define by the service resultset
@@ -397,12 +397,12 @@ void SAL_CALL OCommonStatement::clearWarnings(  ) throw(SQLException, RuntimeExc
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper()
 {
     return *const_cast<OCommonStatement*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OCommonStatement::convertFastPropertyValue(
                             Any & /*rConvertedValue*/,
                             Any & /*rOldValue*/,
@@ -414,7 +414,7 @@ sal_Bool OCommonStatement::convertFastPropertyValue(
     // here we have to try to convert
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception)
 {
     // set the value to whatever is necessary
@@ -432,7 +432,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OCommonStatement::getFastPropertyValue(Any& /*rValue*/,sal_Int32 nHandle) const
 {
     switch(nHandle)
@@ -449,34 +449,34 @@ void OCommonStatement::getFastPropertyValue(Any& /*rValue*/,sal_Int32 nHandle) c
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::acquire() throw()
 {
     OCommonStatement_IBASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCommonStatement::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::acquire() throw()
 {
     OCommonStatement::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::release() throw()
 {
     OCommonStatement::release();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 void OCommonStatement::createColumnMapping()
 {
     size_t i;
@@ -499,7 +499,7 @@ void OCommonStatement::createColumnMapping()
         OSL_TRACE("AFTER  Mapped: %d -> %d", i, m_aColMapping[i] );
 #endif
 }
-// -----------------------------------------------------------------------------
+
 
 void OCommonStatement::analyseSQL()
 {
@@ -525,7 +525,7 @@ void OCommonStatement::analyseSQL()
         }
     }
 }
-//------------------------------------------------------------------
+
 void OCommonStatement::setOrderbyColumn(    OSQLParseNode* pColumnRef,
                                         OSQLParseNode* pAscendingDescending)
 {
@@ -550,6 +550,6 @@ void OCommonStatement::setOrderbyColumn(    OSQLParseNode* pColumnRef,
     // Ascending or Descending?
     m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx
index 4abecfa5ba64..e0939535352d 100644
--- a/connectivity/source/drivers/mozab/MTable.cxx
+++ b/connectivity/source/drivers/mozab/MTable.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -------------------------------------------------------------------------
+
 OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
                 const OUString& _Name, const OUString& _Type, const OUString& _Description )
     :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description )
@@ -55,25 +55,25 @@ OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection,
     construct();
 }
 
-//--------------------------------------------------------------------------
+
 sdbcx::OCollection* OTable::createColumns( const TStringVector& _rNames )
 {
     return new OColumns( this, m_aMutex, _rNames );
 }
 
-//--------------------------------------------------------------------------
+
 sdbcx::OCollection* OTable::createKeys(const TStringVector& _rNames)
 {
     return new OKeysHelper( this, m_aMutex, _rNames );
 }
 
-//--------------------------------------------------------------------------
+
 sdbcx::OCollection* OTable::createIndexes(const TStringVector& _rNames)
 {
     return new OIndexesHelper( this, m_aMutex, _rNames );
 }
 
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx
index 91bd7da14abe..7a3ee5b9451a 100644
--- a/connectivity/source/drivers/mozab/MTables.cxx
+++ b/connectivity/source/drivers/mozab/MTables.cxx
@@ -70,17 +70,17 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OTables::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
index d97e4a6ef157..a59240723db4 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx
@@ -51,11 +51,11 @@ MozillaBootstrap::MozillaBootstrap(
       m_ProfileAccess(NULL), m_ProfileManager(NULL)
 {
 }
-// -----------------------------------------------------------------------------
+
 MozillaBootstrap::~MozillaBootstrap()
 {
 }
-// -----------------------------------------------------------------------------
+
 void MozillaBootstrap::Init()
 {
     sal_Bool aProfileExists=sal_False;
@@ -72,7 +72,7 @@ void MozillaBootstrap::Init()
     bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString());
 }
 
-// --------------------------------------------------------------------------------
+
 void MozillaBootstrap::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -80,12 +80,12 @@ void MozillaBootstrap::disposing()
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString MozillaBootstrap::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString(MOZAB_MozillaBootstrap_IMPL_NAME);
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
@@ -95,7 +95,7 @@ Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static(  ) throw
     return aSNS;
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL MozillaBootstrap::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -106,7 +106,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceNa
     return cppu::supportsService(this, _rServiceName);
 }
 
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 71a01493d659..5237a9304f23 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::mozilla;
 
 namespace
 {
-    // -------------------------------------------------------------------
+
     static OUString lcl_getUserDataDirectory()
     {
         ::osl::Security   aSecurity;
@@ -59,7 +59,7 @@ namespace
         return aConfigPath + "/";
     }
 
-    // -------------------------------------------------------------------
+
     const size_t NB_PRODUCTS = 3;
     const size_t NB_CANDIDATES = 4;
 
@@ -87,7 +87,7 @@ namespace
         "MOZILLA_THUNDERBIRD_PROFILE_ROOT",
     };
 
-    // -------------------------------------------------------------------
+
     static OUString lcl_guessProfileRoot( MozillaProductType _product )
     {
         size_t productIndex = _product - 1;
@@ -144,7 +144,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------
+
 OUString getRegistryDir(MozillaProductType product)
 {
     if (product == MozillaProductType_Default)
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
index 77a9020a7207..e71d28ba965a 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
@@ -87,7 +87,7 @@ namespace connectivity
 
 extern sal_Bool MNS_Init(sal_Bool& aProfileExists);
 
-// -------------------------------------------------------------------------
+
 MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()
     :m_bProfileExists(sal_False)
 {
@@ -96,7 +96,7 @@ MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()
     OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" );
 
 }
-// -------------------------------------------------------------------------
+
 MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper()
 {
     m_aTableNames.clear();
@@ -198,7 +198,7 @@ static nsresult insertPABDescription()
     {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc}   \
 }
 
-// -------------------------------------------------------------------------
+
 // Case where we get a parent uri, and need to list its children.
 static nsresult getSubsFromParent(const OString& aParent, nsIEnumerator **aSubs)
 {
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
index add19e6852ba..1324d7822a97 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx
@@ -141,21 +141,21 @@ namespace connectivity { namespace mozab {
     //====================================================================
     //= MLdapAttributeMap
     //====================================================================
-    // -------------------------------------------------------------------
+
     MLdapAttributeMap::MLdapAttributeMap()
         :m_pData( new AttributeMap_Data )
     {
     }
 
-    // -------------------------------------------------------------------
+
     MLdapAttributeMap::~MLdapAttributeMap()
     {
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMPL_THREADSAFE_ISUPPORTS1( MLdapAttributeMap, nsIAbLDAPAttributeMap )
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval)
     {
         OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
@@ -175,7 +175,7 @@ namespace connectivity { namespace mozab {
         return NS_OK;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs)
     {
         OSL_FAIL( "MLdapAttributeMap::GetAttributes: not implemented!" );
@@ -185,7 +185,7 @@ namespace connectivity { namespace mozab {
         return NS_ERROR_NOT_IMPLEMENTED;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval)
     {
         OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) );
@@ -207,7 +207,7 @@ namespace connectivity { namespace mozab {
         return NS_OK;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies)
     {
         OSL_FAIL( "MLdapAttributeMap::SetAttributeList: not implemented!" );
@@ -217,7 +217,7 @@ namespace connectivity { namespace mozab {
         return NS_ERROR_NOT_IMPLEMENTED;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval)
     {
         OSL_FAIL( "MLdapAttributeMap::GetProperty: not implemented!" );
@@ -226,7 +226,7 @@ namespace connectivity { namespace mozab {
         return NS_ERROR_NOT_IMPLEMENTED;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval)
     {
         const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() );
@@ -246,14 +246,14 @@ namespace connectivity { namespace mozab {
         return NS_OK;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::CheckState(void)
     {
         // we do not allow modifying the map, so we're always in a valid state
         return NS_OK;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName)
     {
         OSL_FAIL( "MLdapAttributeMap::SetFromPrefs: not implemented!" );
@@ -261,7 +261,7 @@ namespace connectivity { namespace mozab {
         return NS_ERROR_NOT_IMPLEMENTED;
     }
 
-    // -------------------------------------------------------------------
+
     NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard)
     {
         NS_ENSURE_ARG_POINTER( aMessage );
@@ -313,7 +313,7 @@ namespace connectivity { namespace mozab {
         return NS_OK;
     }
 
-    // -------------------------------------------------------------------
+
     namespace
     {
         struct PreferMailFormatType
@@ -347,7 +347,7 @@ namespace connectivity { namespace mozab {
         }
     }
 
-    // -------------------------------------------------------------------
+
     void MLdapAttributeMap::fillCardFromResult( nsIAbCard& _card, const MQueryHelperResultEntry& _result )
     {
         _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown );
@@ -391,7 +391,7 @@ namespace connectivity { namespace mozab {
         }
     }
 
-    // -------------------------------------------------------------------
+
     void MLdapAttributeMap::fillResultFromCard( MQueryHelperResultEntry& _result, nsIAbCard& _card )
     {
         nsXPIDLString value;
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
index 039db52576f5..9cd96b40acdc 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx
@@ -191,7 +191,7 @@ nsresult MNSMozabProxy::QueryHelperStub()
     }
     return rv;
 }
-//-------------------------------------------------------------------
+
 
 #define NS_LDAPCONNECTION_CONTRACTID     "@mozilla.org/network/ldap-connection;1"
 #define NS_LDAPOPERATION_CONTRACTID      "@mozilla.org/network/ldap-operation;1"
@@ -287,7 +287,7 @@ NS_IMETHODIMP MLDAPMessageListener::OnLDAPMessage( nsILDAPMessage* aMessage )
     return NS_OK;
 }
 
-//-------------------------------------------------------------------
+
 
 nsresult
 MNSMozabProxy::testLDAPConnection( )
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
index be8d8e637ae2..4325f4e31892 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx
@@ -28,33 +28,33 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::frame;
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener>          MNSTerminateListener::mxTerminateListener = new MNSTerminateListener();
 
-// -----------------------------------------
+
 // - MNSTerminateListener -
-// -----------------------------------------
+
 
 MNSTerminateListener::MNSTerminateListener(  )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 MNSTerminateListener::~MNSTerminateListener()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL MNSTerminateListener::disposing( const EventObject& /*Source*/ ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL MNSTerminateListener::queryTermination( const EventObject& /*aEvent*/ ) throw( TerminationVetoException, RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL MNSTerminateListener::notifyTermination( const EventObject& /*aEvent*/ ) throw( RuntimeException )
 {
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
index 3a618fa8c62a..2395bd0009b0 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::sdbc;
 using namespace connectivity;
 
-// -------------------------------------------------------------------------
+
 // Used to store an nsIAbDirectoryQuery member without the need to use Mozilla
 // types in the MQuery.hxx file.
 //
@@ -65,7 +65,7 @@ namespace connectivity {
     }
 }
 
-// -------------------------------------------------------------------------
+
 MQuery::MQuery( const OColumnAlias& _ca )
     :m_rColumnAlias( _ca )
 {
@@ -79,7 +79,7 @@ MQuery::MQuery( const OColumnAlias& _ca )
 
     OSL_TRACE( "\tOUT MQuery::MQuery( ca )" );
 }
-// -------------------------------------------------------------------------
+
 MQuery::~MQuery()
 {
     OSL_TRACE("IN MQuery::~MQuery()");
@@ -98,7 +98,7 @@ MQuery::~MQuery()
 
     OSL_TRACE("\tOUT MQuery::~MQuery()");
 }
-// -----------------------------------------------------------------------------
+
 void MQuery::construct()
 {
      // Set default values. (For now just as a reminder).
@@ -113,7 +113,7 @@ void MQuery::construct()
     m_aQueryHelper = new MQueryHelper();
     NS_IF_ADDREF( m_aQueryHelper);
 }
-// -------------------------------------------------------------------------
+
 void MQuery::setAddressbook(OUString &ab)
 {
     OSL_TRACE("IN MQuery::setAddressbook()");
@@ -123,7 +123,7 @@ void MQuery::setAddressbook(OUString &ab)
 
     OSL_TRACE("\tOUT MQuery::setAddressbook()");
 }
-// -------------------------------------------------------------------------
+
 void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
 {
     OSL_TRACE( "IN MQuery::setMaxNrOfReturns()" );
@@ -132,7 +132,7 @@ void MQuery::setMaxNrOfReturns(const sal_Int32 mnr)
     m_nMaxNrOfReturns = mnr;
     OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()" );
 }
-// -------------------------------------------------------------------------
+
 void MQuery::setExpression( MQueryExpression &_expr )
 {
     OSL_TRACE("IN MQuery::setExpression()");
@@ -142,7 +142,7 @@ void MQuery::setExpression( MQueryExpression &_expr )
 
     OSL_TRACE("\tOUT MQuery::setExpression()");
 }
-// -------------------------------------------------------------------------
+
 static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression*  _aExpr,
                                      nsIAbBooleanExpression* queryExpression )
 {
@@ -312,7 +312,7 @@ sal_Bool isProfileLocked(OConnection* _pCon)
 }
 
 
-// -------------------------------------------------------------------------
+
 sal_Int32 getDirectoryType(const nsIAbDirectory*  directory)
 {
     nsresult retCode;
@@ -349,7 +349,7 @@ sal_Int32 getDirectoryType(const nsIAbDirectory*  directory)
     return SDBCAddress::Unknown;
 
 }
-// -------------------------------------------------------------------------
+
 sal_Bool isForceQueryProxyUsed(const nsIAbDirectory*  directory)
 {
     sal_Int32 nType = getDirectoryType(directory);
@@ -357,7 +357,7 @@ sal_Bool isForceQueryProxyUsed(const nsIAbDirectory*  directory)
         return sal_True;
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 MQuery::commitRow(const sal_Int32 rowIndex)
 {
     if (!m_aQueryHelper || !m_aQueryDirectory || !m_aQueryDirectory->directoryQuery)
@@ -374,7 +374,7 @@ sal_Int32 MQuery::commitRow(const sal_Int32 rowIndex)
     return rv;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex)
 {
     if (!m_aQueryHelper || !m_aQueryDirectory || !m_aQueryDirectory->directoryQuery)
@@ -392,7 +392,7 @@ sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex)
 
 }
 
-// -------------------------------------------------------------------------
+
 sal_Int32 MQuery::executeQuery(OConnection* _pCon)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -410,7 +410,7 @@ sal_Int32 MQuery::executeQuery(OConnection* _pCon)
     rv = xMProxy.StartProxy(&args,m_Product,m_Profile);
     return rv;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
 {
 #if OSL_DEBUG_LEVEL > 0
@@ -563,7 +563,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon)
     return(0);
 }
 
-// -------------------------------------------------------------------------
+
 //
 //
 //  If the query executed is being done asynchronously then this may return
@@ -575,7 +575,7 @@ MQuery::getRowCount()
     return( m_aQueryHelper->getResultCount() );
 }
 
-// -------------------------------------------------------------------------
+
 //
 //
 // As opposed to getRowCount() this returns the actual number of rows fetched
@@ -606,7 +606,7 @@ MQuery::waitForQueryComplete( void )
     return( sal_False );
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Bool
 MQuery::checkRowAvailable( sal_Int32 nDBRow )
@@ -619,7 +619,7 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow )
 
     return( getRowCount() > nDBRow );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool
 MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const
 {
@@ -644,7 +644,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBC
     return sal_True;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool
 MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const
 {
@@ -670,7 +670,7 @@ MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBC
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32
 MQuery::getRowStates(sal_Int32 nDBRow)
 {
@@ -728,7 +728,7 @@ MQuery::createNewCard()
     NS_ENSURE_SUCCESS(rv,0);
     return nNumber;
 }
-// -------------------------------------------------------------------------
+
 
 MNameMapper*
 MQuery::CreateNameMapper()
@@ -736,13 +736,13 @@ MQuery::CreateNameMapper()
     return( new MNameMapper() );
 }
 
-// -------------------------------------------------------------------------
+
 void
 MQuery::FreeNameMapper( MNameMapper* _ptr )
 {
     delete _ptr;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool MQuery::isWritable(OConnection* _pCon)
 {
     if ( !m_aQueryDirectory )
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
index 6ef6759e2bbb..0e9264a39fad 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx
@@ -290,7 +290,7 @@ MQueryHelper::waitForRow( sal_Int32 rowNum )
     return( sal_True );
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_Int32
 MQueryHelper::getResultCount() const
@@ -308,7 +308,7 @@ MQueryHelper::getResultCount() const
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 sal_uInt32
 MQueryHelper::getRealCount() const
@@ -317,7 +317,7 @@ MQueryHelper::getRealCount() const
     return static_cast<sal_Int32>(m_aResults.size());
 }
 
-// -------------------------------------------------------------------------
+
 NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -398,7 +398,7 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result)
     return(NS_OK);
 }
 
-// -----------------------------------------------------------------------------
+
 void MQueryHelper::notifyQueryError()
 {
     m_bQueryComplete = sal_True ;
@@ -591,7 +591,7 @@ sal_Bool MQueryHelper::resyncRow(sal_uInt32 rowIndex)
     getCardValues(card,rowIndex);
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 MQueryHelper::createNewCard()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
index 813d67b09179..5272a6b61cab 100644
--- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
+++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx
@@ -24,7 +24,7 @@
 
 using namespace connectivity::mozab;
 
-// -------------------------------------------------------------------------
+
 void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss)
 {
     // Convert to OString (utf-8 encoding).
@@ -37,20 +37,20 @@ void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss)
     //const PRUnichar* uniMozString = (const PRUnichar*) mozString;
     nss = mozString; // temp.
 }
-// -------------------------------------------------------------------------
+
 OString MTypeConverter::nsACStringToOString( const nsACString& _source )
 {
     const char* buffer = _source.BeginReading();
     const char* bufferEnd = _source.EndReading();
     return OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) );
 }
-// -------------------------------------------------------------------------
+
 void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest )
 {
     _dest.Truncate();
     _dest.AppendASCII( _asciiString );
 }
-// -------------------------------------------------------------------------
+
 void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous)
 {
     // Get clone of buffer.
@@ -64,7 +64,7 @@ void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous)
 
     nsMemory::Free(uc);
 }
-// -------------------------------------------------------------------------
+
 void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous)
 {
     // TODO, specify length.
@@ -72,7 +72,7 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous)
     OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru));
     ous = _ous;
 }
-// -------------------------------------------------------------------------
+
 char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous)
 {
     // Convert OUString to OString,
@@ -80,6 +80,6 @@ char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous)
 
     return(strdup(os.getStr()));
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index df97f2db4fcc..d70c750ecbea 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -26,7 +26,7 @@
 #include <comphelper/types.hxx>
 
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace connectivity::mysql;
 using namespace connectivity::sdbcx;
@@ -36,12 +36,12 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OMySQLCatalog::OMySQLCatalog(const Reference< XConnection >& _xConnection) : OCatalog(_xConnection)
                 ,m_xConnection(_xConnection)
 {
 }
-// -----------------------------------------------------------------------------
+
 void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames)
 {
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
@@ -50,7 +50,7 @@ void OMySQLCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TS
                                                             _sKindOfObject);
     fillNames(xResult,_rNames);
 }
-// -------------------------------------------------------------------------
+
 void OMySQLCatalog::refreshTables()
 {
     TStringVector aVector;
@@ -70,7 +70,7 @@ void OMySQLCatalog::refreshTables()
     else
         m_pTables = new OTables(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OMySQLCatalog::refreshViews()
 {
     Sequence< OUString > aTypes(1);
@@ -91,11 +91,11 @@ void OMySQLCatalog::refreshViews()
     else
         m_pViews = new OViews(m_xMetaData,*this,m_aMutex,aVector);
 }
-// -------------------------------------------------------------------------
+
 void OMySQLCatalog::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 void OMySQLCatalog::refreshUsers()
 {
     TStringVector aVector;
@@ -116,7 +116,7 @@ void OMySQLCatalog::refreshUsers()
     else
         m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this);
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if ( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) )
@@ -125,7 +125,7 @@ Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeEx
 
     return OCatalog::queryInterface(rType);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OMySQLCatalog::getTypes(  ) throw(RuntimeException)
 {
     Sequence< Type > aTypes = OCatalog::getTypes();
@@ -143,7 +143,7 @@ Sequence< Type > SAL_CALL OMySQLCatalog::getTypes(  ) throw(RuntimeException)
     const Type* pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
     return Sequence< Type >(pTypes, aOwnTypes.size());
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index f936432e76e7..d0dba8c9ca4e 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -40,35 +40,35 @@ OMySQLColumns::OMySQLColumns(   ::cppu::OWeakObject& _rParent
             ) : OColumnsHelper(_rParent,_bCase,_rMutex,_rVector,_bUseHardRef)
 {
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet > OMySQLColumns::createDescriptor()
 {
     return new OMySQLColumn(sal_True);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 OMySQLColumn::OMySQLColumn( sal_Bool    _bCase)
     : connectivity::sdbcx::OColumn( _bCase )
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OMySQLColumn::construct()
 {
     m_sAutoIncrement = "auto_increment";
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement));
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OMySQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & SAL_CALL OMySQLColumn::getInfoHelper()
 {
     return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
-// -----------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
@@ -76,6 +76,6 @@ Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames(  ) throw(R
 
     return aSupported;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index 10af859d0dcd..f99166b1a641 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -63,14 +63,14 @@ namespace connectivity
     //====================================================================
     //= ODriverDelegator
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODriverDelegator::ODriverDelegator(const Reference< XComponentContext >& _rxContext)
         : ODriverDelegator_BASE(m_aMutex)
         ,m_xContext(_rxContext)
     {
     }
 
-    //--------------------------------------------------------------------
+
     ODriverDelegator::~ODriverDelegator()
     {
         try
@@ -87,7 +87,7 @@ namespace connectivity
         }
     }
 
-    // --------------------------------------------------------------------------------
+
     void ODriverDelegator::disposing()
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -117,12 +117,12 @@ namespace connectivity
         {
             return _sUrl.copy(0,16) == "sdbc:mysql:odbc:";
         }
-        //--------------------------------------------------------------------
+
         sal_Bool isNativeUrl(const OUString& _sUrl)
         {
             return (!_sUrl.compareTo(OUString("sdbc:mysql:mysqlc:"), sizeof("sdbc:mysql:mysqlc:")-1));
         }
-        //--------------------------------------------------------------------
+
         T_DRIVERTYPE lcl_getDriverType(const OUString& _sUrl)
         {
             T_DRIVERTYPE eRet = D_JDBC;
@@ -132,7 +132,7 @@ namespace connectivity
                 eRet = D_NATIVE;
             return eRet;
         }
-        //--------------------------------------------------------------------
+
         OUString transformUrl(const OUString& _sUrl)
         {
             OUString sNewUrl = _sUrl.copy(11);
@@ -146,14 +146,14 @@ namespace connectivity
             }
             return sNewUrl;
         }
-        //--------------------------------------------------------------------
+
         Reference< XDriver > lcl_loadDriver(const Reference< XComponentContext >& _rxContext,const OUString& _sUrl)
         {
             Reference<XDriverManager2> xDriverAccess = DriverManager::create(_rxContext);
             Reference< XDriver > xDriver = xDriverAccess->getDriverByURL(_sUrl);
             return xDriver;
         }
-        //--------------------------------------------------------------------
+
         Sequence< PropertyValue > lcl_convertProperties(T_DRIVERTYPE _eType,const Sequence< PropertyValue >& info,const OUString& _sUrl)
         {
             ::std::vector<PropertyValue> aProps;
@@ -222,7 +222,7 @@ namespace connectivity
             return Sequence< PropertyValue >(pProps, aProps.size());
         }
     }
-    //--------------------------------------------------------------------
+
     Reference< XDriver > ODriverDelegator::loadDriver( const OUString& url, const Sequence< PropertyValue >& info )
     {
         Reference< XDriver > xDriver;
@@ -252,7 +252,7 @@ namespace connectivity
         return xDriver;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Reference< XConnection > xConnection;
@@ -314,7 +314,7 @@ namespace connectivity
         return xConnection;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException)
     {
         Sequence< PropertyValue > info;
@@ -327,7 +327,7 @@ namespace connectivity
         return bOK;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
@@ -385,19 +385,19 @@ namespace connectivity
         return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion(  ) throw (RuntimeException)
     {
         return 1;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion(  ) throw (RuntimeException)
     {
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -447,7 +447,7 @@ namespace connectivity
         return xTab;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         if ( ! acceptsURL(url) )
@@ -461,13 +461,13 @@ namespace connectivity
     }
 
     // XServiceInfo
-    // --------------------------------------------------------------------------------
-    //------------------------------------------------------------------------------
+
+
     OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.drivers.MySQL.Driver");
     }
-    //------------------------------------------------------------------------------
+
     Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSNS( 2 );
@@ -475,7 +475,7 @@ namespace connectivity
         aSNS[1] = "com.sun.star.sdbcx.Driver";
         return aSNS;
     }
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ODriverDelegator::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
@@ -485,12 +485,12 @@ namespace connectivity
     {
         return cppu::supportsService(this, _rServiceName);
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
-    //------------------------------------------------------------------
+
 //........................................................................
 }   // namespace connectivity
 //........................................................................
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index aabd1517ac5b..ba17a0993aac 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -58,7 +58,7 @@ namespace connectivity
         class OMySQLKeysHelper : public OKeysHelper
         {
         protected:
-            // -----------------------------------------------------------------------------
+
             virtual OUString getDropForeignKey() const
             {
                 return OUString(" DROP FOREIGN KEY ");
@@ -89,7 +89,7 @@ OMySQLTable::OMySQLTable(   sdbcx::OCollection* _pTables,
                     Privilege::SELECT;
     construct();
 }
-// -------------------------------------------------------------------------
+
 OMySQLTable::OMySQLTable(   sdbcx::OCollection* _pTables,
                            const Reference< XConnection >& _xConnection,
                     const OUString& _Name,
@@ -110,41 +110,41 @@ OMySQLTable::OMySQLTable(   sdbcx::OCollection* _pTables,
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OMySQLTable::construct()
 {
     OTableHelper::construct();
     if ( !isNew() )
         registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES),  PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges,  ::getCppuType(&m_nPrivileges));
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OMySQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OMySQLTable::getInfoHelper()
 {
     return *static_cast<OMySQLTable_PROP*>(const_cast<OMySQLTable*>(this))->getArrayHelper(isNew() ? 1 : 0);
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::OCollection* OMySQLTable::createColumns(const TStringVector& _rNames)
 {
     OMySQLColumns* pColumns = new OMySQLColumns(*this,sal_True,m_aMutex,_rNames);
     pColumns->setParent(this);
     return pColumns;
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::OCollection* OMySQLTable::createKeys(const TStringVector& _rNames)
 {
     return new OMySQLKeysHelper(this,m_aMutex,_rNames);
 }
-// -----------------------------------------------------------------------------
+
 sdbcx::OCollection* OMySQLTable::createIndexes(const TStringVector& _rNames)
 {
     return new OIndexesHelper(this,m_aMutex,_rNames);
 }
-//--------------------------------------------------------------------------
+
 Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -161,14 +161,14 @@ Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId()
 }
 
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
 {
     return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
                 ? reinterpret_cast< sal_Int64 >( this )
                 : OTable_TYPEDEF::getSomething(rId);
 }
-// -------------------------------------------------------------------------
+
 // XAlterTable
 void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
@@ -289,7 +289,7 @@ void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Ref
     }
 
 }
-// -----------------------------------------------------------------------------
+
 void OMySQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
 {
     const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
@@ -305,13 +305,13 @@ void OMySQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName,
     sSql += OTables::adjustSQL(::dbtools::createStandardColumnPart(xProp,getConnection(),static_cast<OTables*>(m_pTables),getTypeCreatePattern()));
     executeStatement(sSql);
 }
-// -----------------------------------------------------------------------------
+
 OUString OMySQLTable::getTypeCreatePattern() const
 {
     static const OUString s_sCreatePattern("(M,D)");
     return s_sCreatePattern;
 }
-// -----------------------------------------------------------------------------
+
 void OMySQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName)
 {
     const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
@@ -321,7 +321,7 @@ void OMySQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString&
 
     executeStatement(sSql);
 }
-// -----------------------------------------------------------------------------
+
 void OMySQLTable::dropDefaultValue(const OUString& _rColName)
 {
     const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
@@ -331,7 +331,7 @@ void OMySQLTable::dropDefaultValue(const OUString& _rColName)
 
     executeStatement(sSql);
 }
-// -----------------------------------------------------------------------------
+
 OUString OMySQLTable::getAlterTableColumnPart()
 {
     OUString sSql(  "ALTER TABLE " );
@@ -342,7 +342,7 @@ OUString OMySQLTable::getAlterTableColumnPart()
 
     return sSql;
 }
-// -----------------------------------------------------------------------------
+
 void OMySQLTable::executeStatement(const OUString& _rStatement )
 {
     OUString sSQL = _rStatement;
@@ -356,7 +356,7 @@ void OMySQLTable::executeStatement(const OUString& _rStatement )
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 OUString OMySQLTable::getRenameStart() const
 {
     return OUString("RENAME TABLE ");
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 08957989a178..eb9156aab7d2 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -96,30 +96,30 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 
     return xRet;
 }
-// -------------------------------------------------------------------------
+
 void OTables::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OMySQLCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OTables::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OTables::createDescriptor()
 {
     return new OMySQLTable(this,static_cast<OMySQLCatalog&>(m_rParent).getConnection());
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createTable(descriptor);
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
@@ -160,7 +160,7 @@ void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
         }
     }
 }
-// -------------------------------------------------------------------------
+
 OUString OTables::adjustSQL(const OUString& _sSql)
 {
     OUString sSQL = _sSql;
@@ -176,7 +176,7 @@ OUString OTables::adjustSQL(const OUString& _sSql)
     }
     return sSQL;
 }
-// -------------------------------------------------------------------------
+
 void OTables::createTable( const Reference< XPropertySet >& descriptor )
 {
     const Reference< XConnection > xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
@@ -189,7 +189,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OTables::appendNew(const OUString& _rsNewTable)
 {
     insertElement(_rsNewTable,NULL);
@@ -200,13 +200,13 @@ void OTables::appendNew(const OUString& _rsNewTable)
     while (aListenerLoop.hasMoreElements())
         static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent);
 }
-// -----------------------------------------------------------------------------
+
 OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!");
     return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false );
 }
-// -----------------------------------------------------------------------------
+
 void OTables::addComment(const Reference< XPropertySet >& descriptor,OUStringBuffer& _rOut)
 {
     OUString sDesc;
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index aff9841f8dee..e3f760b76208 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -35,13 +35,13 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-// -------------------------------------------------------------------------
+
 OMySQLUser::OMySQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True)
                 ,m_xConnection(_xConnection)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OMySQLUser::OMySQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
                 const OUString& _Name
             ) : connectivity::sdbcx::OUser(_Name,sal_True)
@@ -49,34 +49,34 @@ OMySQLUser::OMySQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::st
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OMySQLUser::refreshGroups()
 {
 }
-// -------------------------------------------------------------------------
+
 OUserExtend::OUserExtend(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OMySQLUser(_xConnection)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 void OUserExtend::construct()
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
 {
     return *OUserExtend_PROP::getArrayHelper();
 }
 typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER;
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -86,7 +86,7 @@ sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32
     findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant);
     return nRights;
 }
-// -----------------------------------------------------------------------------
+
 void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException)
 {
     nRightsWithGrant = nRights = 0;
@@ -200,7 +200,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_I
         ::comphelper::disposeComponent(xRes);
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -210,7 +210,7 @@ sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName,
     findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant);
     return nRightsWithGrant;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     if ( objType != PrivilegeObject::TABLE )
@@ -236,7 +236,7 @@ void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 ob
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     if ( objType != PrivilegeObject::TABLE )
@@ -262,7 +262,7 @@ void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 o
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 // XUser
 void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException)
 {
@@ -280,7 +280,7 @@ void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const
 {
     OUString sPrivs;
@@ -324,6 +324,6 @@ OUString OMySQLUser::getPrivilegeString(sal_Int32 nRights) const
 
     return sPrivs;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index f71549ddcf0e..6791435eaac0 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -47,24 +47,24 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent,
     ,m_pParent(_pParent)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
 {
     return new OMySQLUser(m_xConnection,_rName);
 }
-// -------------------------------------------------------------------------
+
 void OUsers::impl_refresh() throw(RuntimeException)
 {
     m_pParent->refreshUsers();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OUsers::createDescriptor()
 {
     OUserExtend* pNew = new OUserExtend(m_xConnection);
     return pNew;
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
@@ -89,7 +89,7 @@ sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Referen
 
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
@@ -103,6 +103,6 @@ void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
     ::comphelper::disposeComponent(xStmt);
 }
 
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index a2378d1382cb..12fa1daad23f 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -66,32 +66,32 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName)
                             sCatalog
                             );
 }
-// -------------------------------------------------------------------------
+
 void OViews::impl_refresh(  ) throw(RuntimeException)
 {
     static_cast<OMySQLCatalog&>(m_rParent).refreshTables();
 }
-// -------------------------------------------------------------------------
+
 void OViews::disposing(void)
 {
 m_xMetaData.clear();
     OCollection::disposing();
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > OViews::createDescriptor()
 {
     Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
     connectivity::sdbcx::OView* pNew = new connectivity::sdbcx::OView(sal_True,xConnection->getMetaData());
     return pNew;
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createView(descriptor);
     return createObject( _rForName );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void OViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
@@ -113,14 +113,14 @@ void OViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
         ::comphelper::disposeComponent(xStmt);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViews::dropByNameImpl(const OUString& elementName)
 {
     m_bInDrop = sal_True;
     OCollection_TYPE::dropByName(elementName);
     m_bInDrop = sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void OViews::createView( const Reference< XPropertySet >& descriptor )
 {
     Reference<XConnection> xConnection = static_cast<OMySQLCatalog&>(m_rParent).getConnection();
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index 136a74019f58..950418751a66 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -35,7 +35,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -75,7 +75,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mysql_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index 03942e561bd3..4ada11bb59f1 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -39,12 +39,12 @@ using namespace connectivity::odbc;
 using namespace connectivity;
 using namespace dbtools;
 
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
-// --------------------------------------------------------------------------------
+
 OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver)
                          : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this)
                          ,m_pDriver(_pDriver)
@@ -61,7 +61,7 @@ OConnection::OConnection(const SQLHANDLE _pDriverHandle,ODBCDriver* _pDriver)
 {
     m_pDriver->acquire();
 }
-//-----------------------------------------------------------------------------
+
 OConnection::~OConnection()
 {
     if(!isClosed(  ))
@@ -84,18 +84,18 @@ OConnection::~OConnection()
     m_pDriver->release();
     m_pDriver = NULL;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 oslGenericFunction OConnection::getOdbcFunction(sal_Int32 _nIndex)  const
 {
     OSL_ENSURE(m_pDriver,"OConnection::getOdbcFunction: m_pDriver is null!");
     return m_pDriver->getOdbcFunction(_nIndex);
 }
-//-----------------------------------------------------------------------------
+
 SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr,sal_Int32 nTimeOut, sal_Bool bSilent)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -176,7 +176,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr,sal_Int32 nTim
 
     return nSQLRETURN;
 }
-//-----------------------------------------------------------------------------
+
 SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     m_aConnectionHandle  = SQL_NULL_HANDLE;
@@ -278,10 +278,10 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal
     return nSQLRETURN;
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.odbc.OConnection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -291,7 +291,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -301,13 +301,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -318,7 +318,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLExcepti
     OTools::ThrowException(this,N3SQLNativeSql(m_aConnectionHandle,(SDB_ODBC_CHAR*)aSql.getStr(),aSql.getLength(),(SDB_ODBC_CHAR*)pOut,sizeof pOut - 1,&nOutLen),m_aConnectionHandle,SQL_HANDLE_DBC,*this);
     return OUString(pOut,nOutLen,getTextEncoding());
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -330,7 +330,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti
                                    (SQLPOINTER)((autoCommit) ? SQL_AUTOCOMMIT_ON : SQL_AUTOCOMMIT_OFF) ,SQL_IS_INTEGER),
                                    m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -342,7 +342,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
                                    SQL_ATTR_AUTOCOMMIT, &nOption,0,0),m_aConnectionHandle,SQL_HANDLE_DBC,*this);
     return nOption == SQL_AUTOCOMMIT_ON ;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -351,7 +351,7 @@ void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 
     OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_COMMIT),m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -360,14 +360,14 @@ void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 
     OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_ROLLBACK),m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return OConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -382,7 +382,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -393,13 +393,13 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
         N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_ACCESS_MODE,reinterpret_cast< SQLPOINTER >( readOnly ),SQL_IS_INTEGER),
         m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException)
 {
     // const member which will initialized only once
     return m_bReadOnly;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -411,7 +411,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept
         N3SQLSetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)aCat.getStr(),SQL_NTS),
         m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
-// --------------------------------------------------------------------------------
+
 OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -426,7 +426,7 @@ OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeExcepti
 
     return OUString(pCat,nValueLen,getTextEncoding());
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -438,7 +438,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE
                                    (SQLPOINTER)(sal_IntPtr)level,SQL_IS_INTEGER),
                                    m_aConnectionHandle,SQL_HANDLE_DBC,*this);
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -452,7 +452,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException,
         m_aConnectionHandle,SQL_HANDLE_DBC,*this);
     return nTxn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -461,12 +461,12 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT
 
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this );
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -477,17 +477,17 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-//------------------------------------------------------------------------------
+
 void OConnection::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -505,12 +505,12 @@ void OConnection::disposing()
 
     dispose_ChildImpl();
 }
-// -----------------------------------------------------------------------------
+
 OConnection* OConnection::cloneConnection()
 {
     return new OConnection(m_pDriverHandleCopy,m_pDriver);
 }
-// -----------------------------------------------------------------------------
+
 SQLHANDLE OConnection::createStatementHandle()
 {
     OConnection* pConnectionTemp = this;
@@ -541,7 +541,7 @@ SQLHANDLE OConnection::createStatementHandle()
     return aStatementHandle;
 
 }
-// -----------------------------------------------------------------------------
+
 void OConnection::freeStatementHandle(SQLHANDLE& _pHandle)
 {
     if( SQL_NULL_HANDLE == _pHandle )
@@ -563,7 +563,7 @@ void OConnection::freeStatementHandle(SQLHANDLE& _pHandle)
     }
     --m_nStatementCount;
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index 63f20e2ee020..0a9888d67ae9 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -59,11 +59,11 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon
         osl_atomic_decrement( &m_refCount );
     }
 }
-// -------------------------------------------------------------------------
+
 ODatabaseMetaData::~ODatabaseMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 {
     Reference< XResultSet > xRef;
@@ -80,7 +80,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     Reference< XResultSet > xRef;
@@ -104,7 +104,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLExc
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     OUString aVal;
@@ -113,7 +113,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     Reference< XResultSet > xRef;
@@ -129,7 +129,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLExce
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     const Any& catalog, const OUString& schema, const OUString& table,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -147,7 +147,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern,
     const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -165,7 +165,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
@@ -183,7 +183,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
@@ -201,7 +201,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const OUString& schemaPattern,
     const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
@@ -219,7 +219,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -246,91 +246,91 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
 
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_BINARY_LITERAL_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CATALOG_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CHAR_LITERAL_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMN_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_INDEX,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CURSOR_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_DRIVER_CONNECTIONS/*SQL_ACTIVE_CONNECTIONS*/,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_TABLE,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_STATEMENT_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_TABLE_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_TABLES_IN_SELECT,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -347,7 +347,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -364,7 +364,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
@@ -381,7 +381,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     const Any& catalog, const OUString& schema, const OUString& table,
     sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
@@ -399,7 +399,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
     sal_Bool nullable ) throw(SQLException, RuntimeException)
@@ -417,7 +417,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
@@ -430,7 +430,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     pResult->openTablePrivileges(m_bUseCatalog ? catalog : Any(),schemaPattern,tableNamePattern);
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const OUString& primarySchema,
     const OUString& primaryTable, const Any& foreignCatalog,
@@ -450,63 +450,63 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE_INCLUDES_LONG,aVal,*this,m_pConnection->getTextEncoding());
     return aVal.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_LOWER;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_LOWER;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_MIXED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_MIXED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_UPPER;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_UPPER;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ALTER_TABLE,nValue,*this);
     return (nValue & SQL_AT_ADD_COLUMN) == SQL_AT_ADD_COLUMN;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 {
     SQLUINTEGER nValue;
@@ -515,21 +515,21 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
             ((nValue & SQL_AT_DROP_COLUMN_CASCADE)  == SQL_AT_DROP_COLUMN_CASCADE)  ||
             ((nValue & SQL_AT_DROP_COLUMN_RESTRICT) == SQL_AT_DROP_COLUMN_RESTRICT);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_INDEX_SIZE,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NON_NULLABLE_COLUMNS,nValue,*this);
     return nValue == SQL_NNC_NON_NULL;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
@@ -537,28 +537,28 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, Runt
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_TERM,aVal,*this,m_pConnection->getTextEncoding());
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     OUString aVal;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_QUOTE_CHAR,aVal,*this,m_pConnection->getTextEncoding());
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     OUString aVal;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SPECIAL_CHARACTERS,aVal,*this,m_pConnection->getTextEncoding());
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
     return nValue != SQL_CN_NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool        ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
     SQLUSMALLINT nValue=0;
@@ -566,126 +566,126 @@ sal_Bool        ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_LOCATION,nValue,*this);
     return nValue == SQL_CL_START;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_DDL_IGNORE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_DDL_COMMIT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_DML;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue == SQL_TC_ALL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this);
     return (nValue & SQL_CA1_POS_DELETE) == SQL_CA1_POS_DELETE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this);
     return (nValue & SQL_CA1_POS_UPDATE) == SQL_CA1_POS_UPDATE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_PRESERVE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_ISOLATION_OPTION,nValue,*this);
     return (nValue & static_cast<SQLUINTEGER>(level)) == static_cast<SQLUINTEGER>(level);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_DML_STATEMENTS) == SQL_SU_DML_STATEMENTS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
     return nValue == SQL_SC_SQL92_FULL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
     return nValue == SQL_SC_SQL92_ENTRY;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     OUString aStr;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_INTEGRITY,aStr,*this,m_pConnection->getTextEncoding());
     return aStr.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_INDEX_DEFINITION) == SQL_SU_INDEX_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_TABLE_DEFINITION) == SQL_SU_TABLE_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
 {
     SQLUINTEGER nValue=0;
@@ -693,7 +693,7 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_USAGE,nValue,*this);
     return (nValue & SQL_CU_TABLE_DEFINITION) == SQL_CU_TABLE_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue=0;
@@ -701,7 +701,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) thro
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_USAGE,nValue,*this);
     return (nValue & SQL_CU_INDEX_DEFINITION) == SQL_CU_INDEX_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
 {
     SQLUINTEGER nValue=0;
@@ -709,14 +709,14 @@ sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw(  )
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_USAGE,nValue,*this);
     return (nValue & SQL_CU_DML_STATEMENTS) == SQL_CU_DML_STATEMENTS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this);
     return ((nValue & (SQL_OJ_FULL|SQL_OJ_LEFT|SQL_OJ_RIGHT|SQL_OJ_NESTED|SQL_OJ_NOT_ORDERED|SQL_OJ_ALL_COMPARISON_OPS|SQL_OJ_INNER)) != 0);
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     Reference< XResultSet > xRef;
@@ -732,110 +732,110 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     }
     return xRef;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CONCURRENT_ACTIVITIES,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_PROCEDURE_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_SCHEMA_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this);
     return nValue != SQL_TC_NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this);
     return (nValue & SQL_CA1_POSITIONED_UPDATE) == SQL_CA1_POSITIONED_UPDATE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_TABLES,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     return m_pConnection->isReadOnly();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this);
     return nValue == SQL_FILE_CATALOG;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this);
     return nValue == SQL_FILE_TABLE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_FUNCTIONS,nValue,*this);
     return (nValue & SQL_FN_CVT_CONVERT) == SQL_FN_CVT_CONVERT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONCAT_NULL_BEHAVIOR,nValue,*this);
     return nValue == SQL_CB_NULL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_COLUMN_ALIAS,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this);
     return nValue != SQL_CN_NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException)
 {
     if(fromType == toType)
@@ -991,133 +991,133 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In
 
     return bConvert;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_EXPRESSIONS_IN_ORDERBY,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this);
     return nValue != SQL_GB_NOT_SUPPORTED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this);
     return nValue != SQL_GB_GROUP_BY_CONTAINS_SELECT;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this);
     return nValue == SQL_GB_NO_RELATION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULTIPLE_ACTIVE_TXN,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULT_RESULT_SETS,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_LIKE_ESCAPE_CLAUSE,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'Y';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ORDER_BY_COLUMNS_IN_SELECT,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.toChar() == 'N';
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this);
     return (nValue & SQL_U_UNION) == SQL_U_UNION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this);
     return (nValue & SQL_U_UNION_ALL) == SQL_U_UNION_ALL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_MIXED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this);
     return nValue == SQL_IC_MIXED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_END;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_START;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_HIGH;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this);
     return nValue == SQL_NC_LOW;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_PROCEDURE_INVOCATION) == SQL_SU_PROCEDURE_INVOCATION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this);
     return (nValue & SQL_SU_PRIVILEGE_DEFINITION) == SQL_SU_PRIVILEGE_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue=0;
@@ -1125,7 +1125,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_USAGE,nValue,*this);
     return (nValue & SQL_CU_PROCEDURE_INVOCATION) == SQL_CU_PROCEDURE_INVOCATION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue=0;
@@ -1133,56 +1133,56 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
         OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CATALOG_USAGE,nValue,*this);
     return (nValue & SQL_CU_PRIVILEGE_DEFINITION) == SQL_CU_PRIVILEGE_DEFINITION;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_CORRELATED_SUBQUERIES) == SQL_SQ_CORRELATED_SUBQUERIES;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_COMPARISON) == SQL_SQ_COMPARISON;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_EXISTS) == SQL_SQ_EXISTS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_IN) == SQL_SQ_IN;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return (nValue & SQL_SQ_QUANTIFIED) == SQL_SQ_QUANTIFIED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this);
     return nValue == SQL_SC_SQL92_INTERMEDIATE;
 }
-// -----------------------------------------------------------------------------
+
 OUString ODatabaseMetaData::getURLImpl()
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DATA_SOURCE_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue = m_pConnection->getURL();
@@ -1192,91 +1192,91 @@ OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeExcep
     }
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_USER_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DBMS_NAME,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURE_TERM,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_TERM,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.copy(0,aValue.indexOf('.')).toInt32();
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding());
     return aValue.copy(0,aValue.lastIndexOf('.')).toInt32();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_KEYWORDS,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     OUString aValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SEARCH_PATTERN_ESCAPE,aValue,*this,m_pConnection->getTextEncoding());
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1337,7 +1337,7 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException,
 
     return aValue.makeStringAndClear();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1392,7 +1392,7 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException
 
     return aValue.makeStringAndClear();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1411,7 +1411,7 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException,
 
     return aValue.makeStringAndClear();
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1472,7 +1472,7 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException,
 
     return aValue.makeStringAndClear();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1487,7 +1487,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLExc
         return nValue == SQL_OAC_LEVEL2;
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1502,7 +1502,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLExcepti
         return nValue == SQL_OSC_CORE || nValue == SQL_OAC_LEVEL1 || nValue == SQL_OAC_LEVEL2;
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1517,54 +1517,54 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLExce
         return nValue == SQL_OAC_LEVEL1 || nValue == SQL_OAC_LEVEL2;
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this);
     return (nValue & SQL_OJ_FULL) == SQL_OJ_FULL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return supportsFullOuterJoins(  );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_GROUP_BY,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_ORDER_BY,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_SELECT,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     SQLUSMALLINT nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_USER_NAME_LEN,nValue,*this);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_SENSITIVITY,nValue,*this);
     return (nValue & static_cast<SQLUINTEGER>(setType)) == static_cast<SQLUINTEGER>(setType);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1596,7 +1596,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1618,7 +1618,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) t
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,nAskFor,nValue,*this);
     return (nValue & SQL_CA2_SENSITIVITY_UPDATES) == SQL_CA2_SENSITIVITY_UPDATES;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1640,7 +1640,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) t
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,nAskFor,nValue,*this);
     return (nValue & SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     SQLUINTEGER nValue;
@@ -1662,46 +1662,46 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) t
     OTools::GetInfo(m_pConnection,m_aConnectionHandle,nAskFor,nValue,*this);
     return (nValue & SQL_CA2_SENSITIVITY_ADDITIONS) == SQL_CA2_SENSITIVITY_ADDITIONS;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ownUpdatesAreVisible(setType);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ownDeletesAreVisible(setType);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return ownInsertsAreVisible(setType);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 5d944287f81c..e5b6535a6942 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -42,14 +42,14 @@ using namespace ::comphelper;
 
 using namespace connectivity::odbc;
 using namespace cppu;
-//------------------------------------------------------------------------------
+
 using namespace ::com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::util;
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection)
     :ODatabaseMetaDataResultSet_BASE(m_aMutex)
     ,OPropertySetHelper(ODatabaseMetaDataResultSet_BASE::rBHelper)
@@ -77,7 +77,7 @@ ODatabaseMetaDataResultSet::ODatabaseMetaDataResultSet(OConnection* _pConnection
     //  allocBuffer();
 }
 
-// -------------------------------------------------------------------------
+
 ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
 {
     OSL_ENSURE(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed,"Object wasn't disposed!");
@@ -88,7 +88,7 @@ ODatabaseMetaDataResultSet::~ODatabaseMetaDataResultSet()
     }
     delete [] m_pRowStatusArray;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -101,28 +101,28 @@ void ODatabaseMetaDataResultSet::disposing(void)
 m_xMetaData.clear();
     m_pConnection->release();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::acquire() throw()
 {
     ODatabaseMetaDataResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::release() throw()
 {
     ODatabaseMetaDataResultSet_BASE::release();
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -131,7 +131,7 @@ Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes(  ) throw(Runtime
 
     return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes());
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32  column)
 {
     sal_Int32   map = column;
@@ -144,7 +144,7 @@ sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32  column)
 
     return map;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -192,20 +192,20 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get
     return nVal;
 }
 
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getBinaryStream", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getCharacterStream", *this );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
 
@@ -233,13 +233,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex
     }
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getInteger<sal_Int8, SQL_C_STINYINT>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -268,7 +268,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co
         m_bWasNull = sal_True;
     return Sequence<sal_Int8>();
 }
-// -------------------------------------------------------------------------
+
 
 ::com::sun::star::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -290,7 +290,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co
         m_bWasNull = sal_True;
     return Date();
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -307,7 +307,7 @@ double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) t
         m_bWasNull = sal_True;
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -324,25 +324,25 @@ float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) thr
         m_bWasNull = sal_True;
     return nVal;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getInteger<sal_Int32, SQL_C_SLONG>( 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 getInteger<sal_Int64, SQL_C_SBIGINT>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -350,45 +350,45 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_xMetaData.is() ? m_xMetaData :  (m_xMetaData = new OResultSetMetaData(m_pConnection,m_aStatementHandle));
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getObject", *this );
     return Any();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getInteger<sal_Int16, SQL_C_SSHORT>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -407,7 +407,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
     return aVal;
 }
 
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -425,7 +425,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
         m_bWasNull = sal_True;
     return Time(0, aTime.second,aTime.minute,aTime.hour, false);
 }
-// -------------------------------------------------------------------------
+
 
 
 ::com::sun::star::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -444,7 +444,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex )
     return DateTime(aTime.fraction, aTime.second, aTime.minute, aTime.hour,
             aTime.day, aTime.month, aTime.year, false);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
@@ -455,7 +455,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException
 
     return m_nCurrentFetchState == SQL_NO_DATA;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
 
@@ -465,7 +465,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, Ru
 
     return m_nRowPos == 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
 
@@ -475,7 +475,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, Run
 
     return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
 
@@ -487,7 +487,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, Ru
         previous();
     m_nCurrentFetchState = SQL_SUCCESS;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
 
@@ -498,7 +498,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast(  ) throw(SQLException, Runt
     if(last())
         next();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -510,7 +510,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) throw(SQLException, RuntimeE
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -527,7 +527,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, Runt
         m_nRowPos = 1;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -543,7 +543,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, Runti
         m_bEOF = sal_True;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
 
@@ -559,7 +559,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ
         m_nRowPos = row;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
 
@@ -575,7 +575,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ
         m_nRowPos += row;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
 
@@ -593,12 +593,12 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, R
         m_nRowPos = 0;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -609,7 +609,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted(  ) throw(SQLException,
 
     return m_pRowStatusArray[0] == SQL_ROW_DELETED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed);
@@ -618,7 +618,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted(  ) throw(SQLException
 
     return m_pRowStatusArray[0] == SQL_ROW_ADDED;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
 
@@ -628,7 +628,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated(  ) throw(SQLException,
 
     return m_pRowStatusArray[0] == SQL_ROW_UPDATED;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -639,7 +639,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst(  ) throw(SQLExcepti
 
     return m_nRowPos == 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -658,7 +658,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next(  ) throw(SQLException, Runti
         ++m_nRowPos;
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -669,7 +669,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull(  ) throw(SQLException, Ru
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
 
@@ -677,7 +677,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow(  ) throw(SQLException, Run
     ::osl::MutexGuard aGuard( m_aMutex );
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -688,43 +688,43 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel(  ) throw(RuntimeException)
 
     OTools::ThrowException(m_pConnection,N3SQLCancel(m_aStatementHandle),m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() const throw(SQLException, RuntimeException)
 {
     return ResultSetConcurrency::READ_ONLY;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() const throw(SQLException, RuntimeException)
 {
     return ResultSetType::FORWARD_ONLY;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() const throw(SQLException, RuntimeException)
 {
     return FetchDirection::FORWARD;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue=1;
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, RuntimeException)
 {
     return OUString();
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* ODatabaseMetaDataResultSet::createArrayHelper( ) const
 {
 
@@ -739,12 +739,12 @@ OUString ODatabaseMetaDataResultSet::getCursorName() const throw(SQLException, R
 
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & ODatabaseMetaDataResultSet::getInfoHelper()
 {
     return *const_cast<ODatabaseMetaDataResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -767,7 +767,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) throw (Exception)
 {
     switch(nHandle)
@@ -782,7 +782,7 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHa
             OSL_FAIL("setFastPropertyValue_NoBroadcast: Illegal handle value!");
     }
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
     switch(nHandle)
@@ -804,7 +804,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH
             break;
     }
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeException)
 {
     TInt2IntMap aMap;
@@ -846,7 +846,7 @@ void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeExcep
     OTools::ThrowException(m_pConnection,N3SQLGetTypeInfo(m_aStatementHandle, SQL_ALL_TYPES),m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-//-----------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& schemaPattern,
                             const OUString& tableNamePattern,
                             const Sequence< OUString >& types )  throw(SQLException, RuntimeException)
@@ -895,7 +895,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString&
     checkColumnCount();
 
 }
-//-----------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException)
 {
     SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
@@ -911,7 +911,7 @@ void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeE
     m_xMetaData = new OResultSetMetaData(m_pConnection,m_aStatementHandle,m_aColMapping);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeException)
 {
     SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
@@ -928,7 +928,7 @@ void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeExcep
     m_xMetaData = new OResultSetMetaData(m_pConnection,m_aStatementHandle,m_aColMapping);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeException)
 {
     SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle,
@@ -944,7 +944,7 @@ void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeExcept
     m_xMetaData = new OResultSetMetaData(m_pConnection,m_aStatementHandle,m_aColMapping);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openColumnPrivileges(  const Any& catalog, const OUString& schema,
                                         const OUString& table,   const OUString& columnNamePattern )
                                         throw(SQLException, RuntimeException)
@@ -979,7 +979,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges(  const Any& catalog, cons
 
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openColumns(   const Any& catalog,             const OUString& schemaPattern,
                                 const OUString& tableNamePattern,    const OUString& columnNamePattern )
                                 throw(SQLException, RuntimeException)
@@ -1047,7 +1047,7 @@ void ODatabaseMetaDataResultSet::openColumns(   const Any& catalog,
     m_aValueRange[5] = aMap;
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openProcedureColumns(  const Any& catalog,     const OUString& schemaPattern,
                                 const OUString& procedureNamePattern,const OUString& columnNamePattern )
                                 throw(SQLException, RuntimeException)
@@ -1081,7 +1081,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns(  const Any& catalog,
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUString& schemaPattern,
                                 const OUString& procedureNamePattern)
                                 throw(SQLException, RuntimeException)
@@ -1112,7 +1112,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any& catalog, const OUString& schema,
                                     const OUString& table,sal_Int32 scope,   sal_Bool nullable )
                                     throw(SQLException, RuntimeException)
@@ -1157,19 +1157,19 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any&
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openVersionColumns(const Any& catalog, const OUString& schema,
                                     const OUString& table)  throw(SQLException, RuntimeException)
 {
     openSpecialColumns(sal_True,catalog,schema,table,SQL_SCOPE_TRANSACTION,sal_False);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, const OUString& schema,
                                         const OUString& table,sal_Int32 scope,sal_Bool nullable ) throw(SQLException, RuntimeException)
 {
     openSpecialColumns(sal_False,catalog,schema,table,scope,nullable);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUString* schema,
                                   const OUString* table,
                                   const Any& catalog2, const OUString* schema2,
@@ -1200,20 +1200,20 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUSt
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const OUString& schema,
                                   const OUString& table) throw(SQLException, RuntimeException)
 {
 
     openForeignKeys(Any(),NULL,NULL,catalog, schema.equalsAscii("%") ? &schema : NULL, &table);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const OUString& schema,
                                   const OUString& table) throw(SQLException, RuntimeException)
 {
     openForeignKeys(catalog, schema.equalsAscii("%") ? &schema : NULL, &table,Any(),NULL,NULL);
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUString& schema,
                                   const OUString& table) throw(SQLException, RuntimeException)
 {
@@ -1242,7 +1242,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const OUString& schemaPattern,
                                   const OUString& tableNamePattern) throw(SQLException, RuntimeException)
 {
@@ -1271,7 +1271,7 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUString& schema,
                                 const OUString& table,sal_Bool unique,sal_Bool approximate )
                                 throw(SQLException, RuntimeException)
@@ -1303,14 +1303,14 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUStri
     OTools::ThrowException(m_pConnection,nRetcode,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     checkColumnCount();
 }
-// -------------------------------------------------------------------------
+
 void ODatabaseMetaDataResultSet::checkColumnCount()
 {
     sal_Int16 nNumResultCols=0;
     OTools::ThrowException(m_pConnection,N3SQLNumResultCols(m_aStatementHandle,&nNumResultCols),m_aStatementHandle,SQL_HANDLE_STMT,*this);
     m_nDriverColumnCount = nNumResultCols;
 }
-// -----------------------------------------------------------------------------
+
 
 SWORD ODatabaseMetaDataResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex)
 {
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index 091efa9a696c..d82362129042 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -31,14 +31,14 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
-// --------------------------------------------------------------------------------
+
 ODBCDriver::ODBCDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory)
     :ODriver_BASE(m_aMutex)
     ,m_xORB(_rxFactory)
     ,m_pDriverHandle(SQL_NULL_HANDLE)
 {
 }
-// --------------------------------------------------------------------------------
+
 void ODBCDriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -56,7 +56,7 @@ void ODBCDriver::disposing()
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 OUString ODBCDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.comp.sdbc.ODBCDriver");
@@ -64,7 +64,7 @@ OUString ODBCDriver::getImplementationName_Static(  ) throw(RuntimeException)
         // Please take care when changing it.
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     Sequence< OUString > aSNS( 1 );
@@ -72,7 +72,7 @@ Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static(  ) throw (Runt
     return aSNS;
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL ODBCDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
@@ -83,13 +83,13 @@ sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) t
     return cppu::supportsService(this, _rServiceName);
 }
 
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
-// --------------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     if ( ! acceptsURL(url) )
@@ -108,13 +108,13 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, cons
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODBCDriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:odbc:");
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
@@ -196,18 +196,18 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODBCDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODBCDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// --------------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 6e6f6ce2de48..4dea825c7b4a 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -80,7 +80,7 @@ T3SQLGetCursorName pODBC3SQLGetCursorName;
 T3SQLNativeSql pODBC3SQLNativeSql;
 
 sal_Bool LoadFunctions(oslModule pODBCso);
-// -------------------------------------------------------------------------
+
 // Take care of Dynamicly loading of the DLL/shared lib and Addresses:
 // Returns sal_True at success
 sal_Bool LoadLibrary_ODBC3(OUString &_rPath)
@@ -111,7 +111,7 @@ sal_Bool LoadLibrary_ODBC3(OUString &_rPath)
 
     return bLoaded = LoadFunctions(pODBCso);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool LoadFunctions(oslModule pODBCso)
 {
@@ -227,7 +227,7 @@ sal_Bool LoadFunctions(oslModule pODBCso)
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 }
 
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index c5a3bdf0bc74..49aa2fd2aa28 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -91,28 +91,28 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString
     {
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatement_BASE2::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPreparedStatement_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -126,7 +126,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
         m_xMetaData = new OResultSetMetaData(getOwnConnection(),m_aStatementHandle);
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException)
 {
@@ -151,7 +151,7 @@ void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException
     // Remove this Statement object from the Connection object's
     // list
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
 {
@@ -217,7 +217,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
 
     return getColumnCount() > 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
 {
@@ -240,13 +240,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
     }
     return numRows;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     setParameter(parameterIndex, DataType::CHAR, invalid_scale, x);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -255,7 +255,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
@@ -275,14 +275,14 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
     }
     return rs;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     // Set the parameter as if it were an integer
     setInt (parameterIndex, x ? 1 : 0 );
 }
-// -------------------------------------------------------------------------
+
 // The MutexGuard must _already_ be taken!
 void OPreparedStatement::setParameterPre(sal_Int32 parameterIndex)
 {
@@ -291,7 +291,7 @@ void OPreparedStatement::setParameterPre(sal_Int32 parameterIndex)
     checkParameterIndex(parameterIndex);
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
 }
-// -------------------------------------------------------------------------
+
 
 template <typename T> void OPreparedStatement::setScalarParameter(const sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, const T i_Value)
 {
@@ -305,7 +305,7 @@ template <typename T> void OPreparedStatement::setScalarParameter(const sal_Int3
 
     setParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, bindBuf, sizeof(i_Value), sizeof(i_Value));
 }
-// -------------------------------------------------------------------------
+
 
 void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_Int32 _nType, const sal_Int16 _nScale, const OUString &_sData)
 {
@@ -352,7 +352,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_
 
     setParameter( parameterIndex, _nType, nCharLen, _nScale, pData, nByteLen, nByteLen );
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_Int32 _nType, const Sequence< sal_Int8 > &x)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -367,7 +367,7 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_
 
     setParameter( parameterIndex, _nType, x.getLength(), invalid_scale, x.getConstArray(), x.getLength(), x.getLength() );
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_Int32 _nType, const SQLULEN _nColumnSize, const sal_Int32 _nScale, const void* const _pData, const SQLULEN _nDataLen, const SQLLEN _nDataAllocLen)
 {
     SQLSMALLINT fCType, fSqlType;
@@ -393,12 +393,12 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_
 
     OTools::ThrowException(m_pConnection, nRetcode, m_aStatementHandle, SQL_HANDLE_STMT, *this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     setScalarParameter(parameterIndex, DataType::TINYINT, 3, x);
 }
-// -------------------------------------------------------------------------
+
 // For older compilers (that do not support partial specialisation of class templates)
 // uncomment if necessary (safe also on compilers that *do* support partial specialisation)
 //BOOST_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION(DATE_STRUCT);
@@ -408,7 +408,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date&
     DATE_STRUCT x(OTools::DateToOdbcDate(aData));
     setScalarParameter<DATE_STRUCT&>(parameterIndex, DataType::DATE, 10, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException)
 {
@@ -436,7 +436,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time&
     TIME_STRUCT x(OTools::TimeToOdbcTime(aVal));
     setScalarParameter<TIME_STRUCT&>(parameterIndex, DataType::TIME, nColSize, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException)
 {
@@ -470,26 +470,26 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const
     TIMESTAMP_STRUCT x(OTools::DateTimeToTimestamp(aVal));
     setScalarParameter<TIMESTAMP_STRUCT&>(parameterIndex, DataType::TIMESTAMP, nColSize, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
 {
     setScalarParameter(parameterIndex, DataType::DOUBLE, 15, x);
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
 {
     setScalarParameter(parameterIndex, DataType::FLOAT, 15, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     setScalarParameter(parameterIndex, DataType::INTEGER, 10, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
 {
@@ -502,7 +502,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x
         setString(parameterIndex, ORowSetValue(x));
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) throw(SQLException, RuntimeException)
 {
@@ -536,33 +536,33 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_I
                                             );
     OTools::ThrowException(m_pConnection,nReturn,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException)
 {
     if ( x.is() )
         setStream(parameterIndex, x->getCharacterStream(), x->length(), DataType::LONGVARCHAR);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException)
 {
     if ( x.is() )
         setStream(parameterIndex, x->getBinaryStream(), x->length(), DataType::LONGVARBINARY);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setArray", *this );
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setRef", *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -602,13 +602,13 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
             ::dbtools::setObjectWithInfo(this,parameterIndex,x,sqlType,scale);
         }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     setNull(parameterIndex,sqlType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
@@ -617,19 +617,19 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
         throw SQLException();
     }
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     setScalarParameter(parameterIndex, DataType::SMALLINT, 5, x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     setParameter(parameterIndex, DataType::BINARY, x);
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
@@ -638,13 +638,13 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
     // The XInputStream provides *bytes*, not characters.
     setStream(parameterIndex, x, length, DataType::LONGVARCHAR);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     setStream(parameterIndex, x, length, DataType::LONGVARBINARY);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
@@ -655,20 +655,20 @@ void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, Runtim
     nRet = N3SQLFreeStmt (m_aStatementHandle, SQL_UNBIND);
     OSL_UNUSED(nRet);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::clearBatch(  ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XPreparedBatchExecution::clearBatch", *this );
     //  clearParameters(  );
     //  m_aBatchList.erase();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XPreparedBatchExecution::addBatch", *this );
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  ) throw(SQLException, RuntimeException)
 {
@@ -676,16 +676,16 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  ) throw(SQLExc
     // not reached, but keep -Werror happy
     return Sequence< sal_Int32 > ();
 }
-// -------------------------------------------------------------------------
+
 
 //====================================================================
 // methods
 //====================================================================
 
-//--------------------------------------------------------------------
+
 // initBoundParam
 // Initialize the bound parameter objects
-//--------------------------------------------------------------------
+
 
 void OPreparedStatement::initBoundParam () throw(SQLException)
 {
@@ -705,13 +705,13 @@ void OPreparedStatement::initBoundParam () throw(SQLException)
 
     }
 }
-// -------------------------------------------------------------------------
 
-//--------------------------------------------------------------------
+
+
 // allocBindBuf
 // Allocate storage for the permanent data buffer for the bound
 // parameter.
-//--------------------------------------------------------------------
+
 
 void* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen)
 {
@@ -726,12 +726,12 @@ void* OPreparedStatement::allocBindBuf( sal_Int32 index,sal_Int32 bufLen)
 
     return b;
 }
-// -------------------------------------------------------------------------
 
-//--------------------------------------------------------------------
+
+
 // getLengthBuf
 // Gets the length buffer for the given parameter index
-//--------------------------------------------------------------------
+
 
 SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index)
 {
@@ -747,13 +747,13 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index)
 
     return b;
 }
-// -------------------------------------------------------------------------
 
-//--------------------------------------------------------------------
+
+
 // putParamData
 // Puts parameter data from a previously bound input stream.  The
 // input stream was bound using SQL_LEN_DATA_AT_EXEC.
-//--------------------------------------------------------------------
+
 
 void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException)
 {
@@ -815,12 +815,12 @@ void OPreparedStatement::putParamData (sal_Int32 index) throw(SQLException)
         throw SQLException(ex.Message,*this,OUString(),0,Any());
     }
 }
-// -------------------------------------------------------------------------
 
-//--------------------------------------------------------------------
+
+
 // setStream
 // Sets an input stream as a parameter, using the given SQL type
-//--------------------------------------------------------------------
+
 
 void OPreparedStatement::setStream(
                                     sal_Int32 ParameterIndex,
@@ -869,9 +869,9 @@ void OPreparedStatement::setStream(
     // Save the input stream
     boundParams[ParameterIndex - 1].setInputStream (x, length);
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 
 void OPreparedStatement::FreeParams()
 {
@@ -879,7 +879,7 @@ void OPreparedStatement::FreeParams()
     delete [] boundParams;
     boundParams = NULL;
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     try
@@ -911,7 +911,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
         //  throw Exception(e.Message,*this);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::prepareStatement()
 {
     if(!isPrepared())
@@ -924,7 +924,7 @@ void OPreparedStatement::prepareStatement()
         initBoundParam();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
 {
     if( _parameterIndex > numParams ||
@@ -941,13 +941,13 @@ void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
         ::dbtools::throwInvalidIndexException(*this,makeAny(aNext));
     }
 }
-// -----------------------------------------------------------------------------
+
 OResultSet* OPreparedStatement::createResulSet()
 {
     OResultSet* pReturn = new OResultSet(m_aStatementHandle,this);
     pReturn->setMetaData(getMetaData());
     return pReturn;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index c1c2ceec58a3..e2d586967678 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -102,7 +102,7 @@ namespace connectivity
             ORealObdcDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODBCDriver(_rxFactory) {}
         };
 
-        //------------------------------------------------------------------
+
 oslGenericFunction ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const
 {
     oslGenericFunction pFunction = NULL;
@@ -324,12 +324,12 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(sal_Int32 _nIndex) const
     return pFunction;
 }
 
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL ODBCDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception )
 {
     return *(new ORealObdcDriver(_rxFactory));
 }
-// -----------------------------------------------------------------------------
+
 // ODBC Environment (common for all Connections):
 SQLHANDLE ORealObdcDriver::EnvironmentHandle(OUString &_rPath)
 {
@@ -352,7 +352,7 @@ SQLHANDLE ORealObdcDriver::EnvironmentHandle(OUString &_rPath)
 
     return m_pDriverHandle;
 }
-// -----------------------------------------------------------------------------
+
 
     }
 }
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 1812e8722765..cc59ed22e704 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -65,13 +65,13 @@ namespace
     const SQLLEN nMaxBookmarkLen = 20;
 }
 
-//------------------------------------------------------------------------------
+
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet");
 OUString SAL_CALL OResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
     return OUString("com.sun.star.sdbcx.odbc.ResultSet");
 }
-// -------------------------------------------------------------------------
+
  Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
      Sequence< OUString > aSupported(2);
@@ -85,7 +85,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) t
     return cppu::supportsService(this, _rServiceName);
 }
 
-// -------------------------------------------------------------------------
+
 OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :   OResultSet_BASE(m_aMutex)
                         ,OPropertySetHelper(OResultSet_BASE::rBHelper)
                         ,m_bFetchDataInOrder(sal_True)
@@ -169,20 +169,20 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) :
 
     osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 OResultSet::~OResultSet()
 {
     delete [] m_pRowStatusArray;
     delete m_pSkipDeletedSet;
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::construct()
 {
     osl_atomic_increment( &m_refCount );
     allocBuffer();
     osl_atomic_decrement( &m_refCount );
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::disposing(void)
 {
     SQLRETURN nRet = N3SQLCloseCursor(m_aStatementHandle);
@@ -197,7 +197,7 @@ void OResultSet::disposing(void)
     m_xStatement.clear();
     m_xMetaData.clear();
 }
-// -------------------------------------------------------------------------
+
 SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::unbind" );
@@ -268,7 +268,7 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
     }
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::allocBindColumn" );
@@ -330,7 +330,7 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex)
     }
     return aPair;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::allocBuffer()
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::allocBuffer" );
@@ -351,20 +351,20 @@ void OResultSet::allocBuffer()
     }
     m_aLengthVector.resize(nLen + 1);
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::releaseBuffer()
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::releaseBuffer" );
     unbind(sal_False);
     m_aLengthVector.clear();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
     return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException)
 {
     OTypeCollection aTypes( ::getCppuType( (const  Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ),
@@ -373,7 +373,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
     return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -397,7 +397,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ
     assert(false);
     return 0; // Never reached
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::ensureCacheForColumn(sal_Int32 columnIndex)
 {
     SAL_INFO( "connectivity.drivers", "odbc  lionel@mamane.lu OResultSet::ensureCacheForColumn" );
@@ -427,7 +427,7 @@ void OResultSet::invalidateCache()
         i->setBound(false);
     }
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -437,7 +437,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*colu
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -447,7 +447,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*c
 
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 template < typename T > T OResultSet::impl_getValue( const sal_Int32 _nColumnIndex, SQLSMALLINT nType )
 {
     T val;
@@ -456,13 +456,13 @@ template < typename T > T OResultSet::impl_getValue( const sal_Int32 _nColumnInd
 
     return val;
 }
-// -------------------------------------------------------------------------
+
 // this function exists for the implicit conversion to sal_Bool (compared to a direct call to impl_getValue)
 sal_Bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return impl_getValue<sal_Int8>(columnIndex, SQL_C_BIT);
 }
-// -------------------------------------------------------------------------
+
 template < typename T > T OResultSet::getValue( sal_Int32 columnIndex )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -475,12 +475,12 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLExcep
 {
     return getValue<sal_Bool>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<sal_Int8>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -526,7 +526,7 @@ Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQ
         return OTools::getBytesValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_C_BINARY,m_bWasNull,**this);
     }
 }
-// -------------------------------------------------------------------------
+
 Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     DATE_STRUCT aDate = impl_getValue< DATE_STRUCT> ( columnIndex,
@@ -534,34 +534,34 @@ Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, Runti
 
     return Date(aDate.day, aDate.month, aDate.year);
 }
-// -------------------------------------------------------------------------
+
 Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<Date>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<double>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<float>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<sal_Int16>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<sal_Int32>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue<sal_Int64>( columnIndex );
@@ -577,7 +577,7 @@ sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException,
         return getString(columnIndex).toInt64();
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -585,7 +585,7 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 
     return m_pSkipDeletedSet ? m_pSkipDeletedSet->getMappedPosition(getDriverPos()) : getDriverPos();
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::getMetaData" );
@@ -597,40 +597,40 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
         m_xMetaData = new OResultSetMetaData(m_pStatement->getOwnConnection(),m_aStatementHandle);
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getArray", *this );
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getClob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getBlob", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRow::getRef", *this );
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
     return getValue<ORowSetValue>( columnIndex ).makeAny();
 }
-// -------------------------------------------------------------------------
+
 OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -641,7 +641,7 @@ OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, Runt
 {
     return getValue<OUString>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     TIME_STRUCT aTime = impl_getValue< TIME_STRUCT > ( columnIndex,
@@ -653,7 +653,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, R
 {
     return getValue<Time>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 DateTime OResultSet::impl_getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     TIMESTAMP_STRUCT aTime = impl_getValue< TIMESTAMP_STRUCT > ( columnIndex,
@@ -672,14 +672,14 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLExc
 {
     return getValue<DateTime>( columnIndex );
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_nRowPos == 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -687,7 +687,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
 
     return m_nRowPos != 0 && m_nCurrentFetchState == SQL_NO_DATA;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -695,7 +695,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 
     return m_nRowPos == 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -704,7 +704,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 
     return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::beforeFirst" );
@@ -716,7 +716,7 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
         previous();
     m_nCurrentFetchState = SQL_SUCCESS;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::afterLast" );
@@ -727,7 +727,7 @@ void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
         next();
     m_bEOF = sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -738,46 +738,46 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::first" );
     return moveImpl(IResultSetHelper::FIRST,0,sal_True);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::last" );
     return moveImpl(IResultSetHelper::LAST,0,sal_True);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::absolute" );
     return moveImpl(IResultSetHelper::ABSOLUTE,row,sal_True);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::relative" );
     return moveImpl(IResultSetHelper::RELATIVE,row,sal_True);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::previous" );
     return moveImpl(IResultSetHelper::PRIOR,0,sal_True);
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     return m_xStatement;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException)
 {
@@ -790,7 +790,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException)
 
     return bRet;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowInserted" );
@@ -802,7 +802,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
 
     return bInserted;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::rowUpdated" );
@@ -812,14 +812,14 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 
     return m_pRowStatusArray[0] == SQL_ROW_UPDATED;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::next" );
     return moveImpl(IResultSetHelper::NEXT,1,sal_True);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -829,7 +829,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -839,16 +839,16 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 
     OTools::ThrowException(m_pStatement->getOwnConnection(),N3SQLCancel(m_aStatementHandle),m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::insertRow" );
@@ -925,7 +925,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
     m_bRowInserted = sal_True;
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::updateRow" );
@@ -976,7 +976,7 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
         throw;
     }
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::deleteRow" );
@@ -1002,12 +1002,12 @@ void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
     if ( m_pSkipDeletedSet )
         m_pSkipDeletedSet->deletePosition(nPos);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
@@ -1022,13 +1022,13 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
     //  SQLRETURN nRet = N3SQLSetStmtAttr(m_aStatementHandle,SQL_ATTR_ROW_ARRAY_SIZE ,(SQLPOINTER)1,SQL_IS_INTEGER);
     m_bInserting = sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
     invalidateCache();
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::updateValue" );
@@ -1050,7 +1050,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pVa
                         m_nTextEncoding,
                         m_pStatement->getOwnConnection()->useOldDateFormat());
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1060,45 +1060,45 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException
     void* pData = reinterpret_cast<void*>(m_aBindVector.rbegin()->first);
     OTools::bindValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_CHAR,0,(sal_Int8*)NULL,pData,&m_aLengthVector[columnIndex],**this,m_nTextEncoding,m_pStatement->getOwnConnection()->useOldDateFormat());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,SQL_BIT,&x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,SQL_CHAR,&x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,SQL_TINYINT,&x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,SQL_INTEGER,&x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRowUpdate::updateLong", *this );
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,SQL_REAL,&x);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,SQL_DOUBLE,&x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nType = m_aRow[columnIndex].getTypeKind();
@@ -1108,7 +1108,7 @@ void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x
     m_aRow[columnIndex].setBound(true);
     updateValue(columnIndex,nOdbcType,(void*)&x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nType = m_aRow[columnIndex].getTypeKind();
@@ -1118,27 +1118,27 @@ void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sa
     m_aRow[columnIndex].setBound(true);
     updateValue(columnIndex,nOdbcType,(void*)&x);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException)
 {
     DATE_STRUCT aVal = OTools::DateToOdbcDate(x);
     updateValue(columnIndex,SQL_DATE,&aVal);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException)
 {
     TIME_STRUCT aVal = OTools::TimeToOdbcTime(x);
     updateValue(columnIndex,SQL_TIME,&aVal);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException)
 {
     TIMESTAMP_STRUCT aVal = OTools::DateTimeToTimestamp(x);
     updateValue(columnIndex,SQL_TIMESTAMP,&aVal);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -1149,12 +1149,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     x->readBytes(aSeq,length);
     updateBytes(columnIndex,aSeq);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     updateBinaryStream(columnIndex,x,length);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::refreshRow" );
@@ -1166,20 +1166,20 @@ void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
     m_nCurrentFetchState = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_RELATIVE,0);
     OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException)
 {
     if (!::dbtools::implUpdateObject(this, columnIndex, x))
         throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL OResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 {
@@ -1215,7 +1215,7 @@ Sequence<sal_Int8> OResultSet::impl_getBookmark(  ) throw( SQLException,  Runtim
         return aFind->first;
     }
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveToBookmark" );
@@ -1244,7 +1244,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLE
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::moveRelativeToBookmark" );
@@ -1262,7 +1262,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_
     OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this);
     return m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const  Any& rhs ) throw( SQLException,  RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::compareBookmarks" );
@@ -1271,18 +1271,18 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const  Any& rhs
 
     return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::hashBookmark( const  Any& /*bookmark*/ ) throw( SQLException,  RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XRowLocate::hashBookmark", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const  Sequence<  Any >& rows ) throw( SQLException,  RuntimeException)
 {
@@ -1309,7 +1309,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const  Sequence<  Any >&
     }
     return aRet;
 }
-//------------------------------------------------------------------------------
+
 template < typename T, SQLINTEGER BufferLength > T OResultSet::getStmtOption (SQLINTEGER fOption, T dflt) const
 {
     T result (dflt);
@@ -1323,7 +1323,7 @@ template < typename T, SQLINTEGER BufferLength > SQLRETURN OResultSet::setStmtOp
     SQLPOINTER sv = reinterpret_cast<SQLPOINTER>(value);
     return N3SQLSetStmtAttr(m_aStatementHandle, fOption, sv, BufferLength);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getResultSetConcurrency() const
 {
     sal_uInt32 nValue = getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_CONCURRENCY);
@@ -1334,7 +1334,7 @@ sal_Int32 OResultSet::getResultSetConcurrency() const
 
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getResultSetType() const
 {
     sal_uInt32 nValue = getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_CURSOR_SENSITIVITY);
@@ -1356,17 +1356,17 @@ sal_Int32 OResultSet::getResultSetType() const
     }
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getFetchDirection() const
 {
     return FetchDirection::FORWARD;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getFetchSize() const
 {
     return getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_ROW_ARRAY_SIZE);
 }
-//------------------------------------------------------------------------------
+
 OUString OResultSet::getCursorName() const
 {
     SQLCHAR pName[258];
@@ -1374,7 +1374,7 @@ OUString OResultSet::getCursorName() const
     N3SQLGetCursorName(m_aStatementHandle,(SQLCHAR*)pName,256,&nRealLen);
     return OUString::createFromAscii((const char*)pName);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool  OResultSet::isBookmarkable() const
 {
     if(!m_aConnectionHandle)
@@ -1412,7 +1412,7 @@ sal_Bool  OResultSet::isBookmarkable() const
 
     return (m_nUseBookmarks != SQL_UB_OFF) && (nAttr & SQL_CA1_BOOKMARK) == SQL_CA1_BOOKMARK;
 }
-//------------------------------------------------------------------------------
+
 void OResultSet::setFetchDirection(sal_Int32 _par0)
 {
     ::dbtools::throwFunctionNotSupportedException( "setFetchDirection", *this );
@@ -1423,7 +1423,7 @@ void OResultSet::setFetchDirection(sal_Int32 _par0)
         setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_CURSOR_TYPE, _par0);
     }
 }
-//------------------------------------------------------------------------------
+
 void OResultSet::setFetchSize(sal_Int32 _par0)
 {
     OSL_ENSURE(_par0>0,"Illegal fetch size!");
@@ -1440,7 +1440,7 @@ void OResultSet::setFetchSize(sal_Int32 _par0)
         setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, m_pRowStatusArray);
     }
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps(6);
@@ -1455,12 +1455,12 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
     return new OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -1484,7 +1484,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& rValue
@@ -1508,7 +1508,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::getFastPropertyValue(
                                 Any& rValue,
                                 sal_Int32 nHandle
@@ -1536,7 +1536,7 @@ void OResultSet::getFastPropertyValue(
             break;
     }
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::fillColumn(const sal_Int32 _nColumn)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::fillColumn" );
@@ -1656,22 +1656,22 @@ void OResultSet::fillColumn(const sal_Int32 _nColumn)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool /*_bRetrieveData*/)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::move" );
@@ -1777,24 +1777,24 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32
 
     return bSuccess;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OResultSet::getDriverPos() const
 {
     sal_Int32 nValue = getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_ROW_NUMBER);
     OSL_TRACE( __FILE__": OResultSet::getDriverPos() = RowNum = %d, RowPos = %d", nValue, m_nRowPos);
     return nValue ? nValue : m_nRowPos;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::deletedVisible() const
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::isRowDeleted() const
 {
     return m_pRowStatusArray[0] == SQL_ROW_DELETED;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1803,7 +1803,7 @@ sal_Bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_I
                 ?   m_pSkipDeletedSet->skipDeleted(_eCursorPosition,_nOffset,_bRetrieveData)
                 :   move(_eCursorPosition,_nOffset,_bRetrieveData);
 }
-// -----------------------------------------------------------------------------
+
 void OResultSet::fillNeededData(SQLRETURN _nRet)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSet::fillNeededData" );
@@ -1853,7 +1853,7 @@ void OResultSet::fillNeededData(SQLRETURN _nRet)
         while (nRet == SQL_NEED_DATA);
     }
 }
-// -----------------------------------------------------------------------------
+
 SWORD OResultSet::impl_getColumnType_nothrow(sal_Int32 columnIndex)
 {
     ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex);
diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
index 15ab4e63584f..5ef770f4a3c1 100644
--- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
@@ -25,11 +25,11 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException)
 {
     sal_Int32 column = _column;
@@ -75,7 +75,7 @@ OUString OResultSetMetaData::getCharColAttrib(sal_Int32 _column,sal_Int32 ident)
 
     return  sValue;
 }
-// -------------------------------------------------------------------------
+
 SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
@@ -92,7 +92,7 @@ SQLLEN OResultSetMetaData::getNumColAttrib(OConnection* _pConnection
                                          &nValue),_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident) throw(SQLException, RuntimeException)
 {
     sal_Int32 column = _column;
@@ -101,12 +101,12 @@ sal_Int32 OResultSetMetaData::getNumColAttrib(sal_Int32 _column,sal_Int32 ident)
 
     return getNumColAttrib(m_pConnection,m_aStatementHandle,*this,column,ident);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getNumColAttrib(column,SQL_DESC_DISPLAY_SIZE);
 }
-// -------------------------------------------------------------------------
+
 SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
                                               ,SQLHANDLE _aStatementHandle
                                               ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface
@@ -127,7 +127,7 @@ SQLSMALLINT OResultSetMetaData::getColumnODBCType(OConnection* _pConnection
 
     return nType;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     ::std::map<sal_Int32,sal_Int32>::iterator aFind = m_aColumnTypes.find(column);
@@ -157,7 +157,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(S
 
     return aFind->second;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
@@ -168,65 +168,65 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, Ru
     OTools::ThrowException(m_pConnection,N3SQLNumResultCols(m_aStatementHandle,&nNumResultCols),m_aStatementHandle,SQL_HANDLE_STMT,*this);
     return m_nColCount = nNumResultCols;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getNumColAttrib(column,SQL_DESC_CASE_SENSITIVE) == SQL_TRUE;
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getCharColAttrib(column,SQL_DESC_SCHEMA_NAME);
 }
-// -------------------------------------------------------------------------
+
 
 OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getCharColAttrib(column,SQL_DESC_NAME);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getCharColAttrib(column,SQL_DESC_TABLE_NAME);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getCharColAttrib(column,SQL_DESC_CATALOG_NAME);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnTypeName" );
     return getCharColAttrib(column,SQL_DESC_TYPE_NAME);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnLabel" );
     return getCharColAttrib(column,SQL_DESC_LABEL);
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getColumnServiceName" );
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getNumColAttrib(column,SQL_DESC_FIXED_PREC_SCALE) == SQL_TRUE;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getNumColAttrib(column,SQL_DESC_AUTO_UNIQUE_VALUE) == SQL_TRUE;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
@@ -234,7 +234,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isSigned" );
     return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getPrecision" );
@@ -250,7 +250,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ
     }
     return nType;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::getScale" );
@@ -266,28 +266,28 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com:
     }
     return nType;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isNullable" );
     return getNumColAttrib(column,SQL_DESC_NULLABLE);
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isSearchable" );
     return getNumColAttrib(column,SQL_DESC_SEARCHABLE) != SQL_PRED_NONE;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isReadOnly" );
     return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_READONLY;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
@@ -295,12 +295,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t
     return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
 ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OResultSetMetaData::isWritable" );
     return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index bd55cc168c90..26cd84a81721 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -48,7 +48,7 @@ using namespace ::comphelper;
 
 
 using namespace connectivity::odbc;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -57,7 +57,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
-//------------------------------------------------------------------------------
+
 OStatement_Base::OStatement_Base(OConnection* _pConnection )
     :OStatement_BASE(m_aMutex)
     ,OPropertySetHelper(OStatement_BASE::rBHelper)
@@ -82,12 +82,12 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
 
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OStatement_Base::~OStatement_Base()
 {
     OSL_ENSURE(!m_aStatementHandle,"Sohould ne null here!");
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::disposeResultSet()
 {
     // free the cursor if alive
@@ -96,7 +96,7 @@ void OStatement_Base::disposeResultSet()
         xComp->dispose();
     m_xResultSet.clear();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::disposing(void)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -115,7 +115,7 @@ void SAL_CALL OStatement_Base::disposing(void)
 
     OStatement_BASE::disposing();
 }
-//------------------------------------------------------------------------------
+
 void OStatement_BASE2::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -123,12 +123,12 @@ void OStatement_BASE2::disposing()
     dispose_ChildImpl();
     OStatement_Base::disposing();
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_BASE2::release() throw()
 {
     relase_ChildImpl();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     if ( m_pConnection && !m_pConnection->isAutoRetrievingEnabled() && rType == ::getCppuType( (const Reference< XGeneratedResultSet > *)0 ) )
@@ -136,7 +136,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
     Any aRet = OStatement_BASE::queryInterface(rType);
     return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
@@ -152,7 +152,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes);
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues(  ) throw (SQLException, RuntimeException)
 {
     OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!");
@@ -169,7 +169,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getGeneratedValues(  ) throw (
     }
     return xRes;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -178,7 +178,7 @@ void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     OTools::ThrowException(m_pConnection,N3SQLCancel(m_aStatementHandle),m_aStatementHandle,SQL_HANDLE_STMT,*this);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 {
@@ -189,13 +189,13 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement::clearBatch(  ) throw(SQLException, RuntimeException)
 {
 
 }
-// -------------------------------------------------------------------------
+
 
 void OStatement_Base::reset() throw (SQLException)
 {
@@ -214,10 +214,10 @@ void OStatement_Base::reset() throw (SQLException)
         THROW_SQL(N3SQLFreeStmt(m_aStatementHandle, SQL_CLOSE));
     }
 }
-//--------------------------------------------------------------------
+
 // clearMyResultSet
 // If a ResultSet was created for this Statement, close it
-//--------------------------------------------------------------------
+
 
 void OStatement_Base::clearMyResultSet () throw (SQLException)
 {
@@ -234,7 +234,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException)
 
     m_xResultSet.clear();
 }
-//--------------------------------------------------------------------
+
 SQLLEN OStatement_Base::getRowCount () throw( SQLException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -251,12 +251,12 @@ SQLLEN OStatement_Base::getRowCount () throw( SQLException)
     }
     return numRows;
 }
-//--------------------------------------------------------------------
+
 // lockIfNecessary
 // If the given SQL statement contains a 'FOR UPDATE' clause, change
 // the concurrency to lock so that the row can then be updated.  Returns
 // true if the concurrency has been changed
-//--------------------------------------------------------------------
+
 
 sal_Bool OStatement_Base::lockIfNecessary (const OUString& sql) throw( SQLException)
 {
@@ -291,10 +291,10 @@ sal_Bool OStatement_Base::lockIfNecessary (const OUString& sql) throw( SQLExcept
 
     return rc;
 }
-//--------------------------------------------------------------------
+
 // setWarning
 // Sets the warning
-//--------------------------------------------------------------------
+
 
 void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
 {
@@ -305,10 +305,10 @@ void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException)
     m_aLastWarning = ex;
 }
 
-//--------------------------------------------------------------------
+
 // getColumnCount
 // Return the number of columns in the ResultSet
-//--------------------------------------------------------------------
+
 
 sal_Int32 OStatement_Base::getColumnCount () throw( SQLException)
 {
@@ -327,7 +327,7 @@ sal_Int32 OStatement_Base::getColumnCount () throw( SQLException)
     }
     return numCols;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -375,11 +375,11 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep
 
     return hasResultSet;
 }
-//--------------------------------------------------------------------
+
 // getResultSet
 // getResultSet returns the current result as a ResultSet.  It
 // returns NULL if the current result is not a ResultSet.
-//--------------------------------------------------------------------
+
 Reference< XResultSet > OStatement_Base::getResultSet (sal_Bool checkCount) throw( SQLException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -419,10 +419,10 @@ Reference< XResultSet > OStatement_Base::getResultSet (sal_Bool checkCount) thro
 
     return pRs;
 }
-//--------------------------------------------------------------------
+
 // getStmtOption
 // Invoke SQLGetStmtOption with the given option.
-//--------------------------------------------------------------------
+
 
 template < typename T, SQLINTEGER BufferLength > T OStatement_Base::getStmtOption (SQLINTEGER fOption, T dflt) const
 {
@@ -437,7 +437,7 @@ template < typename T, SQLINTEGER BufferLength > SQLRETURN OStatement_Base::setS
     SQLPOINTER sv = reinterpret_cast<SQLPOINTER>(value);
     return N3SQLSetStmtAttr(m_aStatementHandle, fOption, sv, BufferLength);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -462,7 +462,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString&
     }
     return xRS;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -471,14 +471,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLEx
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this));
     return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -488,7 +488,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru
 
     m_aBatchList.push_back(sql);
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -520,7 +520,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
     }
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
@@ -549,7 +549,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S
     return numRows;
 
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLException, RuntimeException)
 {
@@ -560,7 +560,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLExce
     m_xResultSet = getResultSet(sal_True);
     return m_xResultSet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, RuntimeException)
 {
@@ -578,7 +578,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(SQLException, Runti
 
     return rowCount;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, RuntimeException)
 {
@@ -629,9 +629,9 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, Runtim
 
     return hasResultSet;
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -640,9 +640,9 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -651,18 +651,18 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
 sal_Int64 OStatement_Base::getQueryTimeOut() const
 {
     return getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_QUERY_TIMEOUT);
 }
-//------------------------------------------------------------------------------
+
 sal_Int64 OStatement_Base::getMaxRows() const
 {
     return getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_MAX_ROWS);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getResultSetConcurrency() const
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -673,7 +673,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const
         nValue = ResultSetConcurrency::UPDATABLE;
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getResultSetType() const
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -696,7 +696,7 @@ sal_Int32 OStatement_Base::getResultSetType() const
 
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getFetchDirection() const
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -713,18 +713,18 @@ sal_Int32 OStatement_Base::getFetchDirection() const
 
     return nValue;
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OStatement_Base::getFetchSize() const
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     return getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_ROW_ARRAY_SIZE);
 }
-//------------------------------------------------------------------------------
+
 sal_Int64 OStatement_Base::getMaxFieldSize() const
 {
     return getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_MAX_LENGTH);
 }
-//------------------------------------------------------------------------------
+
 OUString OStatement_Base::getCursorName() const
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -734,19 +734,19 @@ OUString OStatement_Base::getCursorName() const
     OSL_UNUSED( nRetCode );
     return OUString::createFromAscii((const char*)pName);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setQueryTimeOut(sal_Int64 seconds)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_QUERY_TIMEOUT,seconds);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setMaxRows(sal_Int64 _par0)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_MAX_ROWS, _par0);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0)
 {
     SQLULEN nSet;
@@ -758,7 +758,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0)
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_CONCURRENCY, nSet);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setResultSetType(sal_Int32 _par0)
 {
 
@@ -814,7 +814,7 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0)
 
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_CURSOR_SENSITIVITY, nSet);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setEscapeProcessing( const sal_Bool _bEscapeProc )
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -822,7 +822,7 @@ void OStatement_Base::setEscapeProcessing( const sal_Bool _bEscapeProc )
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_NOSCAN, nEscapeProc);
 }
 
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setFetchDirection(sal_Int32 _par0)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -835,7 +835,7 @@ void OStatement_Base::setFetchDirection(sal_Int32 _par0)
         setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_CURSOR_SCROLLABLE, SQL_SCROLLABLE);
     }
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setFetchSize(sal_Int32 _par0)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
@@ -850,39 +850,39 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0)
         setStmtOption<SQLUSMALLINT*, SQL_IS_POINTER>(SQL_ATTR_ROW_STATUS_PTR, m_pRowStatusArray);
     }
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setMaxFieldSize(sal_Int64 _par0)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_MAX_LENGTH, _par0);
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::setCursorName(const OUString &_par0)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     OString aName(OUStringToOString(_par0,getOwnConnection()->getTextEncoding()));
     N3SQLSetCursorName(m_aStatementHandle,(SDB_ODBC_CHAR*)aName.getStr(),(SQLSMALLINT)aName.getLength());
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OStatement_Base::isUsingBookmarks() const
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     return SQL_UB_OFF != getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_USE_BOOKMARKS, SQL_UB_OFF);
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OStatement_Base::getEscapeProcessing() const
 {
     OSL_ENSURE( m_aStatementHandle, "StatementHandle is null!" );
     return SQL_NOSCAN_OFF == getStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_USE_BOOKMARKS, SQL_NOSCAN_OFF);;
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark)
 {
     OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!");
     SQLULEN nValue = _bUseBookmark ? SQL_UB_VARIABLE : SQL_UB_OFF;
     setStmtOption<SQLULEN, SQL_IS_UINTEGER>(SQL_ATTR_USE_BOOKMARKS, nValue);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const
 {
     Sequence< Property > aProps(10);
@@ -902,12 +902,12 @@ void OStatement_Base::setUsingBookmarks(sal_Bool _bUseBookmark)
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
     return *const_cast<OStatement_Base*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OStatement_Base::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -968,7 +968,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
     }
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     try
@@ -1015,7 +1015,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A
         //  throw Exception(e.Message,*this);
     }
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     switch(nHandle)
@@ -1055,39 +1055,39 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
             break;
     }
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::acquire() throw()
 {
     OStatement_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::release() throw()
 {
     OStatement_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 OResultSet* OStatement_Base::createResulSet()
 {
     return new OResultSet(m_aStatementHandle,this);
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 SQLUINTEGER OStatement_Base::getCursorProperties(SQLINTEGER _nCursorType,sal_Bool bFirst)
 {
     SQLUINTEGER nValueLen = 0;
@@ -1112,6 +1112,6 @@ SQLUINTEGER OStatement_Base::getCursorProperties(SQLINTEGER _nCursorType,sal_Boo
     }
     return nValueLen;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index 4c7ad027c576..03663f77aeb8 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -149,7 +149,7 @@ void OTools::getValue(  OConnection* _pConnection,
                             _aStatementHandle,SQL_HANDLE_STMT,_xInterface,sal_False);
     _bWasNull = pcbValue == SQL_NULL_DATA;
 }
-// -------------------------------------------------------------------------
+
 void OTools::bindValue( OConnection* _pConnection,
                         SQLHANDLE _aStatementHandle,
                         sal_Int32 columnIndex,
@@ -289,7 +289,7 @@ void OTools::bindValue( OConnection* _pConnection,
 
     OTools::ThrowException(_pConnection,nRetcode,_aStatementHandle,SQL_HANDLE_STMT,_xInterface);
 }
-// -----------------------------------------------------------------------------
+
 void OTools::ThrowException(const OConnection* _pConnection,
                             const SQLRETURN _rRetCode,
                             const SQLHANDLE _pContext,
@@ -349,7 +349,7 @@ void OTools::ThrowException(const OConnection* _pConnection,
                                 );
 
 }
-// -------------------------------------------------------------------------
+
 Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection,
                                          const SQLHANDLE _aStatementHandle,
                                          const sal_Int32 columnIndex,
@@ -402,7 +402,7 @@ Sequence<sal_Int8> OTools::getBytesValue(const OConnection* _pConnection,
     }
     return aData;
 }
-// -------------------------------------------------------------------------
+
 OUString OTools::getStringValue(OConnection* _pConnection,
                                        SQLHANDLE _aStatementHandle,
                                        sal_Int32 columnIndex,
@@ -516,7 +516,7 @@ OUString OTools::getStringValue(OConnection* _pConnection,
 
     return aData.makeStringAndClear();
 }
-// -------------------------------------------------------------------------
+
 void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
@@ -532,7 +532,7 @@ void OTools::GetInfo(OConnection* _pConnection,
 
     _rValue = OUString(aValue,nValueLen,_nTextEncoding);
 }
-// -------------------------------------------------------------------------
+
 void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
@@ -545,7 +545,7 @@ void OTools::GetInfo(OConnection* _pConnection,
         (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
         _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
 }
-// -------------------------------------------------------------------------
+
 void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
@@ -558,7 +558,7 @@ void OTools::GetInfo(OConnection* _pConnection,
         (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
         _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
 }
-// -------------------------------------------------------------------------
+
 void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
@@ -571,7 +571,7 @@ void OTools::GetInfo(OConnection* _pConnection,
         (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
         _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
 }
-// -------------------------------------------------------------------------
+
 void OTools::GetInfo(OConnection* _pConnection,
                      SQLHANDLE _aConnectionHandle,
                      SQLUSMALLINT _nInfo,
@@ -583,7 +583,7 @@ void OTools::GetInfo(OConnection* _pConnection,
                             (*(T3SQLGetInfo)_pConnection->getOdbcFunction(ODBC3SQLGetInfo))(_aConnectionHandle,_nInfo,&_rValue,sizeof _rValue,&nValueLen),
                             _aConnectionHandle,SQL_HANDLE_DBC,_xInterface);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType)
 {
     sal_Int32 nValue = DataType::VARCHAR;
@@ -658,10 +658,10 @@ sal_Int32 OTools::MapOdbcType2Jdbc(SQLSMALLINT _nType)
     }
     return nValue;
 }
-//--------------------------------------------------------------------
+
 // jdbcTypeToOdbc
 // Convert the JDBC SQL type to the correct ODBC type
-//--------------------------------------------------------------------
+
 SQLSMALLINT OTools::jdbcTypeToOdbc(sal_Int32 jdbcType)
 {
     SAL_INFO( "connectivity.drivers", "odbc Ocke.Janssen@sun.com OTools::jdbcTypeToOdbc" );
@@ -692,7 +692,7 @@ SQLSMALLINT OTools::jdbcTypeToOdbc(sal_Int32 jdbcType)
 
     return odbcType;
 }
-//-----------------------------------------------------------------------------
+
 void OTools::getBindTypes(sal_Bool _bUseWChar,
                           sal_Bool _bUseOldTimeDate,
                           SQLSMALLINT _nOdbcType,
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 423a11065057..aa19997fc71a 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -36,7 +36,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
             rtl_ModuleCount*
         );
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -76,7 +76,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL odbc_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
index d62583e3ec53..17120f36771b 100644
--- a/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xcolumns.cxx
@@ -569,7 +569,7 @@ Reference< com::sun::star::container::XNameAccess > Columns::create(
 }
 
 
-//_____________________________________________________________________________________
+
 ColumnDescriptors::ColumnDescriptors(
         const ::rtl::Reference< RefCountedMutex > & refMutex,
         const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >  & origin,
diff --git a/connectivity/source/drivers/postgresql/pq_xindex.cxx b/connectivity/source/drivers/postgresql/pq_xindex.cxx
index 779157fee0b1..3788a4a3d0a1 100644
--- a/connectivity/source/drivers/postgresql/pq_xindex.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindex.cxx
@@ -160,7 +160,7 @@ Any Index::queryInterface( const Type & reqType ) throw (RuntimeException)
 }
 
 
-//___________________________________________________________________________________
+
 IndexDescriptor::IndexDescriptor(
     const ::rtl::Reference< RefCountedMutex > & refMutex,
     const Reference< com::sun::star::sdbc::XConnection > & connection,
diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
index 55e9e3d9007e..4cc2eb1971ab 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx
@@ -269,7 +269,7 @@ Reference< com::sun::star::container::XNameAccess > IndexColumns::create(
     return ret;
 }
 
-//_________________________________________________________________________________________
+
 IndexColumnDescriptors::IndexColumnDescriptors(
         const ::rtl::Reference< RefCountedMutex > & refMutex,
         const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >  & origin,
diff --git a/connectivity/source/drivers/postgresql/pq_xindexes.cxx b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
index 18a2d7b3ec18..7aa98928b98d 100644
--- a/connectivity/source/drivers/postgresql/pq_xindexes.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xindexes.cxx
@@ -301,7 +301,7 @@ Reference< com::sun::star::container::XNameAccess > Indexes::create(
 }
 
 
-//_________________________________________________________________________________________
+
 IndexDescriptors::IndexDescriptors(
         const ::rtl::Reference< RefCountedMutex > & refMutex,
         const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >  & origin,
diff --git a/connectivity/source/drivers/postgresql/pq_xkey.cxx b/connectivity/source/drivers/postgresql/pq_xkey.cxx
index 3e36d498de81..3d2c5f40def0 100644
--- a/connectivity/source/drivers/postgresql/pq_xkey.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkey.cxx
@@ -162,7 +162,7 @@ Any Key::queryInterface( const Type & reqType ) throw (RuntimeException)
 }
 
 
-//_____________________________________________________________________________
+
 KeyDescriptor::KeyDescriptor( const ::rtl::Reference< RefCountedMutex > & refMutex,
           const Reference< com::sun::star::sdbc::XConnection > & connection,
           ConnectionSettings *pSettings )
diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
index b7f05970ac6c..8e9d19d26520 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeycolumns.cxx
@@ -369,7 +369,7 @@ Reference< com::sun::star::container::XNameAccess > KeyColumns::create(
     return ret;
 }
 
-//_______________________________________________________________________________________
+
 KeyColumnDescriptors::KeyColumnDescriptors(
         const ::rtl::Reference< RefCountedMutex > & refMutex,
         const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >  & origin,
diff --git a/connectivity/source/drivers/postgresql/pq_xkeys.cxx b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
index e6f60b9c5973..40e82b67bf5c 100644
--- a/connectivity/source/drivers/postgresql/pq_xkeys.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xkeys.cxx
@@ -285,7 +285,7 @@ Reference< com::sun::star::container::XIndexAccess > Keys::create(
 
     return ret;
 }
-//_________________________________________________________________________________________
+
 KeyDescriptors::KeyDescriptors(
         const ::rtl::Reference< RefCountedMutex > & refMutex,
         const ::com::sun::star::uno::Reference< com::sun::star::sdbc::XConnection >  & origin,
diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx
index a76d90db04f8..d802ac9634b3 100644
--- a/connectivity/source/drivers/postgresql/pq_xtable.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx
@@ -347,7 +347,7 @@ void Table::setName( const OUString& aName ) throw (::com::sun::star::uno::Runti
 
 
 
-//________________________________________________________________________
+
 TableDescriptor::TableDescriptor(
     const ::rtl::Reference< RefCountedMutex > & refMutex,
     const Reference< com::sun::star::sdbc::XConnection > & connection,
diff --git a/connectivity/source/drivers/postgresql/pq_xuser.cxx b/connectivity/source/drivers/postgresql/pq_xuser.cxx
index b32fb9721365..01ebaea86335 100644
--- a/connectivity/source/drivers/postgresql/pq_xuser.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xuser.cxx
@@ -198,7 +198,7 @@ void User::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int
                                              *this, OUString(), 1, Any() );
 }
 
-//______________________________________________________________________________________
+
 UserDescriptor::UserDescriptor(
     const ::rtl::Reference< RefCountedMutex > & refMutex,
     const Reference< com::sun::star::sdbc::XConnection > & connection,
diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx
index b71f36f5c963..a40846702468 100644
--- a/connectivity/source/drivers/postgresql/pq_xview.cxx
+++ b/connectivity/source/drivers/postgresql/pq_xview.cxx
@@ -226,7 +226,7 @@ void View::setName( const OUString& aName ) throw (::com::sun::star::uno::Runtim
     rename( aName );
 }
 
-//____________________________________________________________________________________________
+
 
 ViewDescriptor::ViewDescriptor(
     const ::rtl::Reference< RefCountedMutex > & refMutex,
diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx
index 02f3a9ce4001..484af4a08106 100644
--- a/connectivity/source/manager/mdrivermanager.cxx
+++ b/connectivity/source/manager/mdrivermanager.cxx
@@ -81,25 +81,25 @@ public:
     virtual Any SAL_CALL nextElement( ) throw(NoSuchElementException, WrappedTargetException, RuntimeException);
 };
 
-//--------------------------------------------------------------------------
+
 ODriverEnumeration::ODriverEnumeration(const DriverArray& _rDriverSequence)
     :m_aDrivers( _rDriverSequence )
     ,m_aPos( m_aDrivers.begin() )
 {
 }
 
-//--------------------------------------------------------------------------
+
 ODriverEnumeration::~ODriverEnumeration()
 {
 }
 
-//--------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODriverEnumeration::hasMoreElements(  ) throw(RuntimeException)
 {
     return m_aPos != m_aDrivers.end();
 }
 
-//--------------------------------------------------------------------------
+
 Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     if ( !hasMoreElements() )
@@ -247,7 +247,7 @@ Any SAL_CALL ODriverEnumeration::nextElement(  ) throw(NoSuchElementException, W
 //==========================================================================
 //= OSDBCDriverManager
 //==========================================================================
-//--------------------------------------------------------------------------
+
 OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _rxContext )
     :m_xContext( _rxContext )
     ,m_aEventLogger( _rxContext, "org.openoffice.logging.sdbc.DriverManager" )
@@ -261,7 +261,7 @@ OSDBCDriverManager::OSDBCDriverManager( const Reference< XComponentContext >& _r
     initializeDriverPrecedence();
 }
 
-//---------------------------------------------------------------------
+
 OSDBCDriverManager::~OSDBCDriverManager()
 {
 }
@@ -336,7 +336,7 @@ void OSDBCDriverManager::bootstrapDrivers()
     }
 }
 
-//--------------------------------------------------------------------------
+
 void OSDBCDriverManager::initializeDriverPrecedence()
 {
     if ( m_aDriversBS.empty() )
@@ -408,7 +408,7 @@ void OSDBCDriverManager::initializeDriverPrecedence()
     }
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -434,7 +434,7 @@ Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnection( const OUStr
     return xConnection;
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -460,21 +460,21 @@ Reference< XConnection > SAL_CALL OSDBCDriverManager::getConnectionWithInfo( con
     return xConnection;
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OSDBCDriverManager::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     m_nLoginTimeout = seconds;
 }
 
-//--------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OSDBCDriverManager::getLoginTimeout(  ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     return m_nLoginTimeout;
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration(  ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -503,20 +503,20 @@ Reference< XEnumeration > SAL_CALL OSDBCDriverManager::createEnumeration(  ) thr
     return new ODriverEnumeration( aDrivers );
 }
 
-//--------------------------------------------------------------------------
+
 ::com::sun::star::uno::Type SAL_CALL OSDBCDriverManager::getElementType(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::getCppuType(static_cast< Reference< XDriver >* >(NULL));
 }
 
-//--------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OSDBCDriverManager::hasElements(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     return !(m_aDriversBS.empty() && m_aDriversRT.empty());
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OSDBCDriverManager::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_static();
@@ -527,25 +527,25 @@ sal_Bool SAL_CALL OSDBCDriverManager::supportsService( const OUString& _rService
     return cppu::supportsService(this, _rServiceName);
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OSDBCDriverManager::Create( const Reference< XMultiServiceFactory >& _rxFactory )
 {
     return *( new OSDBCDriverManager( comphelper::getComponentContext(_rxFactory) ) );
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OSDBCDriverManager::getImplementationName_static(  ) throw(RuntimeException)
 {
     return OUString("com.sun.star.comp.sdbc.OSDBCDriverManager");
 }
 
-//--------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
@@ -553,13 +553,13 @@ Sequence< OUString > SAL_CALL OSDBCDriverManager::getSupportedServiceNames_stati
     return aSupported;
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OSDBCDriverManager::getSingletonName_static(  ) throw(RuntimeException)
 {
     return OUString(  "com.sun.star.sdbc.DriverManager"  );
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const OUString& _rName ) throw(Exception, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -570,7 +570,7 @@ Reference< XInterface > SAL_CALL OSDBCDriverManager::getRegisteredObject( const
     return aSearch->second.get();
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const Reference< XInterface >& _rxObject ) throw(Exception, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -598,7 +598,7 @@ void SAL_CALL OSDBCDriverManager::registerObject( const OUString& _rName, const
     );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(Exception, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
@@ -620,7 +620,7 @@ void SAL_CALL OSDBCDriverManager::revokeObject( const OUString& _rName ) throw(E
     );
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const OUString& _rURL ) throw(RuntimeException)
 {
     m_aEventLogger.log( LogLevel::INFO,
@@ -639,7 +639,7 @@ Reference< XDriver > SAL_CALL OSDBCDriverManager::getDriverByURL( const OUString
     return xDriver;
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XDriver > OSDBCDriverManager::implGetDriverForURL(const OUString& _rURL)
 {
     Reference< XDriver > xReturn;
diff --git a/connectivity/source/manager/mregistration.cxx b/connectivity/source/manager/mregistration.cxx
index ce712f303eec..745ce6efb551 100644
--- a/connectivity/source/manager/mregistration.cxx
+++ b/connectivity/source/manager/mregistration.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang;
 extern "C"
 {
 
-//---------------------------------------------------------------------------------------
+
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL sdbc2_component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     void* pRet = NULL;
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 6e5cdb91f0cc..8cf17f19d19f 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 
-// -------------------------------------------------------------------------
+
 OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool     _bCase)
     : connectivity::sdbcx::OColumn( getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
                                 ,   getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
@@ -60,7 +60,7 @@ OParseColumn::OParseColumn(const Reference<XPropertySet>& _xColumn,sal_Bool
     construct();
 }
 
-// -------------------------------------------------------------------------
+
 OParseColumn::OParseColumn( const OUString& _Name,
                     const OUString& _TypeName,
                     const OUString& _DefaultValue,
@@ -98,7 +98,7 @@ OParseColumn::OParseColumn( const OUString& _Name,
     construct();
 }
 
-// -------------------------------------------------------------------------
+
 ::rtl::Reference< OSQLColumns > OParseColumn::createColumnsForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData,
     const Reference< XDatabaseMetaData >& _rxDBMetaData,const Reference< XNameAccess>& i_xQueryColumns )
 {
@@ -123,7 +123,7 @@ OParseColumn::OParseColumn( const OUString& _Name,
     return aReturn;
 }
 
-// -------------------------------------------------------------------------
+
 OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSetMetaData >& _rxResMetaData,
     const Reference< XDatabaseMetaData >& _rxDBMetaData, sal_Int32 _nColumnPos, StringMap& _rColumns )
 {
@@ -163,11 +163,11 @@ OParseColumn* OParseColumn::createColumnForResultSet( const Reference< XResultSe
     return pColumn;
 }
 
-// -------------------------------------------------------------------------
+
 OParseColumn::~OParseColumn()
 {
 }
-// -------------------------------------------------------------------------
+
 void OParseColumn::construct()
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION),                PROPERTY_ID_FUNCTION,               0,  &m_bFunction,               ::getCppuType(&m_bFunction));
@@ -177,19 +177,19 @@ void OParseColumn::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISSEARCHABLE),            PROPERTY_ID_ISSEARCHABLE,           0,  &m_bIsSearchable,           ::getCppuType(&m_bIsSearchable));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_LABEL),                   PROPERTY_ID_LABEL,                  0,  &m_sLabel,                  ::getCppuType(&m_sLabel));
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OParseColumn::createArrayHelper() const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & SAL_CALL OParseColumn::getInfoHelper()
 {
     OSL_ENSURE( !isNew(), "OParseColumn::getInfoHelper: a *new* ParseColumn?" );
     return *OParseColumn_PROP::getArrayHelper();
 }
 
-// -----------------------------------------------------------------------------
+
 OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUString& i_rOriginatingTableName,
                             sal_Bool    _bCase, sal_Bool _bAscending )
     : connectivity::sdbcx::OColumn(
@@ -214,7 +214,7 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, const OUStr
     construct();
 }
 
-// -----------------------------------------------------------------------------
+
 OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, sal_Bool _bCase, sal_Bool _bAscending )
     : connectivity::sdbcx::OColumn(
         getString(_xColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),
@@ -238,29 +238,29 @@ OOrderColumn::OOrderColumn( const Reference<XPropertySet>& _xColumn, sal_Bool _b
     construct();
 }
 
-// -------------------------------------------------------------------------
+
 OOrderColumn::~OOrderColumn()
 {
 }
 
-// -------------------------------------------------------------------------
+
 void OOrderColumn::construct()
 {
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,
         PropertyAttribute::READONLY,  const_cast< sal_Bool* >( &m_bAscending ),    ::getCppuType( &m_bAscending ) );
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OOrderColumn::createArrayHelper() const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & SAL_CALL OOrderColumn::getInfoHelper()
 {
     OSL_ENSURE( !isNew(), "OOrderColumn::getInfoHelper: a *new* OrderColumn?" );
     return *OOrderColumn_PROP::getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -268,6 +268,6 @@ void OOrderColumn::construct()
 
     return aSupported;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/parse/internalnode.cxx b/connectivity/source/parse/internalnode.cxx
index 19caebb8cf0e..e6ea846b7cfe 100644
--- a/connectivity/source/parse/internalnode.cxx
+++ b/connectivity/source/parse/internalnode.cxx
@@ -24,7 +24,7 @@
 
 using namespace connectivity;
 
-//-----------------------------------------------------------------------------
+
 OSQLInternalNode::OSQLInternalNode(const sal_Char* pNewValue,
                                    SQLNodeType eNodeType,
                                    sal_uInt32 nNodeID)
@@ -34,7 +34,7 @@ OSQLInternalNode::OSQLInternalNode(const sal_Char* pNewValue,
     (*OSQLParser::s_pGarbageCollector)->push_back(this);
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLInternalNode::OSQLInternalNode(const OString &_NewValue,
                                  SQLNodeType eNodeType,
                                  sal_uInt32 nNodeID)
@@ -44,7 +44,7 @@ OSQLInternalNode::OSQLInternalNode(const OString &_NewValue,
     (*OSQLParser::s_pGarbageCollector)->push_back(this);
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLInternalNode::OSQLInternalNode(const OUString &_NewValue,
                                  SQLNodeType eNodeType,
                                  sal_uInt32 nNodeID)
@@ -55,7 +55,7 @@ OSQLInternalNode::OSQLInternalNode(const OUString &_NewValue,
 }
 
 
-//-----------------------------------------------------------------------------
+
 OSQLInternalNode::~OSQLInternalNode()
 {
     // remove the node from the garbage list
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index f896a1ec10df..506f51eac32b 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -110,7 +110,7 @@ namespace connectivity
         }
     };
 
-    //-------------------------------------------------------------------------
+
     /** helper class for temporarily adding a query name to a list of forbidden query names
     */
     class ForbidQueryName
@@ -134,7 +134,7 @@ namespace connectivity
         }
     };
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rxConnection,
                                              const Reference< XNameAccess >& _rxTables,
                                              const OSQLParser& _rParser,
@@ -146,7 +146,7 @@ OSQLParseTreeIterator::OSQLParseTreeIterator(const Reference< XConnection >& _rx
     setParseTree(pRoot);
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLParseTreeIterator::OSQLParseTreeIterator( const OSQLParseTreeIterator& _rParentIterator, const OSQLParser& _rParser, const OSQLParseNode* pRoot )
     :m_rParser( _rParser )
     ,m_pImpl( new OSQLParseTreeIteratorImpl( _rParentIterator.m_pImpl->m_xConnection, _rParentIterator.m_pImpl->m_xTableContainer ) )
@@ -156,27 +156,27 @@ OSQLParseTreeIterator::OSQLParseTreeIterator( const OSQLParseTreeIterator& _rPar
     setParseTree( pRoot );
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLParseTreeIterator::~OSQLParseTreeIterator()
 {
     dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 const OSQLTables& OSQLParseTreeIterator::getTables() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getTables" );
     return *m_pImpl->m_pTables;
 }
 
-// -----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::isCaseSensitive() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::isCaseSensitive" );
     return m_pImpl->m_bIsCaseSensitive;
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::dispose()
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::dispose" );
@@ -190,7 +190,7 @@ void OSQLParseTreeIterator::dispose()
     m_pImpl->m_pTables->clear();
     m_pImpl->m_pSubTables->clear();
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setParseTree" );
@@ -251,7 +251,7 @@ void OSQLParseTreeIterator::setParseTree(const OSQLParseNode * pNewParseTree)
     }
 }
 
-//-----------------------------------------------------------------------------
+
 namespace
 {
     //.........................................................................
@@ -309,7 +309,7 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQuery  )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_getQueryParameterColumns" );
@@ -358,7 +358,7 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu
         ::std::insert_iterator< OSQLColumns::Vector >( m_aParameters->get(), m_aParameters->get().end() ) );
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComposedName )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_locateRecordSource" );
@@ -436,7 +436,7 @@ OSQLTable OSQLParseTreeIterator::impl_locateRecordSource( const OUString& _rComp
     return aReturn;
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseOneTableName" );
@@ -470,7 +470,7 @@ void OSQLParseTreeIterator::traverseOneTableName( OSQLTables& _rTables,const OSQ
     if ( aTable.is() )
         _rTables[ aTableRange ] = aTable;
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoinCondition)
 {
     if (i_pJoinCondition->count() == 3 &&   // Expression with brackets
@@ -501,12 +501,12 @@ void OSQLParseTreeIterator::impl_fillJoinConditions(const OSQLParseNode* i_pJoin
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 ::std::vector< TNodePair >& OSQLParseTreeIterator::getJoinConditions() const
 {
     return m_pImpl->m_aJoinConditions;
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, OUString& aTableRange )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getQualified_join" );
@@ -549,7 +549,7 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLP
     if ( isTableNode( pNode ) )
         traverseOneTableName( _rTables, pNode, aTableRange );
 }
-//-----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables, const OSQLParseNode *pTableRef,OUString& rTableRange )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getTableNode" );
@@ -614,7 +614,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getTableNode( OSQLTables& _rTables,
 
     return pTableNameNode;
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSelect_statement" );
@@ -670,7 +670,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP
         //  if (! aIteratorStatus.IsSuccessful()) break;
     }
 }
-//-----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseTableNames" );
@@ -706,7 +706,7 @@ bool OSQLParseTreeIterator::traverseTableNames(OSQLTables& _rTables)
 
     return !hasErrors();
 }
-//-----------------------------------------------------------------------------
+
 OUString OSQLParseTreeIterator::getColumnAlias(const OSQLParseNode* _pDerivedColumn)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getColumnAlias" );
@@ -719,7 +719,7 @@ OUString OSQLParseTreeIterator::getColumnAlias(const OSQLParseNode* _pDerivedCol
     return sColumnAlias;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     void lcl_getColumnRange( const OSQLParseNode* _pColumnRef, const Reference< XConnection >& _rxConnection,
@@ -774,7 +774,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
                         OUString& _rColumnName,
                         OUString& _rTableRange) const
@@ -784,7 +784,7 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
     lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, NULL, sDummy );
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
                         OUString& _rColumnName,
                         OUString& _rTableRange,
@@ -794,7 +794,7 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
     lcl_getColumnRange( _pColumnRef, m_pImpl->m_xConnection, _rColumnName, _rTableRange, &*m_aSelectColumns, _out_rColumnAliasIfPresent );
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
     const Reference< XConnection >& _rxConnection, OUString& _out_rColumnName, OUString& _out_rTableRange )
 {
@@ -803,7 +803,7 @@ void OSQLParseTreeIterator::getColumnRange( const OSQLParseNode* _pColumnRef,
     lcl_getColumnRange( _pColumnRef, _rxConnection, _out_rColumnName, _out_rTableRange, NULL, sDummy );
 }
 
-//-----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const
 {
     OUString tmp;
@@ -870,7 +870,7 @@ bool OSQLParseTreeIterator::impl_getColumnTableRange(const OSQLParseNode* pNode,
     return true;
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseCreateColumns" );
@@ -931,7 +931,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
 
     }
 }
-//-----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSelectNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSelectColumnNames" );
@@ -1036,14 +1036,14 @@ bool OSQLParseTreeIterator::traverseSelectColumnNames(const OSQLParseNode* pSele
 }
 
 
-//-----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::traverseOrderByColumnNames(const OSQLParseNode* pSelectNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseOrderByColumnNames" );
     traverseByColumnNames( pSelectNode, sal_True );
     return !hasErrors();
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseByColumnNames" );
@@ -1128,7 +1128,7 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo
             setGroupByColumnName(sColumnName, aTableRange);
     }
 }
-//-----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::traverseGroupByColumnNames(const OSQLParseNode* pSelectNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseGroupByColumnNames" );
@@ -1136,7 +1136,7 @@ bool OSQLParseTreeIterator::traverseGroupByColumnNames(const OSQLParseNode* pSel
     return !hasErrors();
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     OUString lcl_generateParameterName( const OSQLParseNode& _rParentNode, const OSQLParseNode& _rParamNode )
@@ -1155,7 +1155,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseParameters" );
@@ -1209,7 +1209,7 @@ void OSQLParseTreeIterator::traverseParameters(const OSQLParseNode* _pNode)
         traverseParameters( pChild );
     }
 }
-//-----------------------------------------------------------------------------
+
 bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSelectNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSelectionCriteria" );
@@ -1272,7 +1272,7 @@ bool OSQLParseTreeIterator::traverseSelectionCriteria(const OSQLParseNode* pSele
     return !hasErrors();
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondition)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSearchCondition" );
@@ -1401,7 +1401,7 @@ void OSQLParseTreeIterator::traverseSearchCondition(OSQLParseNode * pSearchCondi
     }
     // Just pass on the error
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
                                               ,const OSQLParseNode* _pParentNode
                                               ,const OUString& _aColumnName
@@ -1542,7 +1542,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseOnePredicate(
                                 OSQLParseNode * pColumnRef,
                                 OUString& rValue,
@@ -1569,21 +1569,21 @@ void OSQLParseTreeIterator::traverseOnePredicate(
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseSome( sal_uInt32 _nIncludeMask )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseSome" );
     impl_traverse( _nIncludeMask );
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::traverseAll()
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::traverseAll" );
     impl_traverse( All );
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_traverse" );
@@ -1624,7 +1624,7 @@ void OSQLParseTreeIterator::impl_traverse( sal_uInt32 _nIncludeMask )
 
 // Dummy implementations
 
-//-----------------------------------------------------------------------------
+
 OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableName,
     const OUString& rCatalogName, const OUString& rSchemaName )
 {
@@ -1645,7 +1645,7 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN
     );
     return aReturnTable;
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::appendColumns" );
@@ -1692,7 +1692,7 @@ void OSQLParseTreeIterator::appendColumns(::rtl::Reference<OSQLColumns>& _rColum
             impl_appendError( IParseContext::ERROR_INVALID_COLUMN, pBegin, &_rTableAlias );
     }
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt,sal_Int32 _nType,sal_Bool bAggFkt)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setSelectColumnName" );
@@ -1848,7 +1848,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getUniqueColumnName" );
@@ -1873,7 +1873,7 @@ OUString OSQLParseTreeIterator::getUniqueColumnName(const OUString & rColumnName
     }
     return aAlias;
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setOrderByColumnName" );
@@ -1897,7 +1897,7 @@ void OSQLParseTreeIterator::setOrderByColumnName(const OUString & rColumnName, O
          << "\n";
 #endif
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::setGroupByColumnName" );
@@ -1920,7 +1920,7 @@ void OSQLParseTreeIterator::setGroupByColumnName(const OUString & rColumnName, O
 #endif
 }
 
-//-----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getWhereTree" );
@@ -1952,7 +1952,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getWhereTree() const
     return pWhereClause;
 }
 
-//-----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getOrderTree" );
@@ -1976,7 +1976,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const
         pOrderClause = NULL;
     return pOrderClause;
 }
-//-----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getGroupByTree" );
@@ -1998,7 +1998,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getGroupByTree() const
         pGroupClause = NULL;
     return pGroupClause;
 }
-//-----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const
 {
     if (!m_pParseTree || getStatementType() != SQL_STATEMENT_SELECT)
@@ -2019,7 +2019,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getHavingTree() const
         pHavingClause = NULL;
     return pHavingClause;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::isTableNode" );
@@ -2027,28 +2027,28 @@ sal_Bool OSQLParseTreeIterator::isTableNode(const OSQLParseNode* _pTableNode) co
                            SQL_ISRULE(_pTableNode,schema_name)  ||
                            SQL_ISRULE(_pTableNode,table_name));
 }
-// -----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getSimpleWhereTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleWhereTree" );
     const OSQLParseNode* pNode = getWhereTree();
     return pNode ? pNode->getChild(1) : NULL;
 }
-// -----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getSimpleOrderTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleOrderTree" );
     const OSQLParseNode* pNode = getOrderTree();
     return pNode ? pNode->getChild(2) : NULL;
 }
-// -----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getSimpleGroupByTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleGroupByTree" );
     const OSQLParseNode* pNode = getGroupByTree();
     return pNode ? pNode->getChild(2) : NULL;
 }
-// -----------------------------------------------------------------------------
+
 const OSQLParseNode* OSQLParseTreeIterator::getSimpleHavingTree() const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::getSimpleHavingTree" );
@@ -2056,7 +2056,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getSimpleHavingTree() const
     return pNode ? pNode->getChild(1) : NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet > OSQLParseTreeIterator::findSelectColumn( const OUString & rColumnName )
 {
     SAL_INFO( "connectivity.parse", "parse lionel@mamane.lu OSQLParseTreeIterator::findSelectColumn" );
@@ -2080,7 +2080,7 @@ Reference< XPropertySet > OSQLParseTreeIterator::findSelectColumn( const OUStrin
     return NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::findColumn" );
@@ -2090,7 +2090,7 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn( const OUString & rC
     return xColumn;
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::findColumn" );
@@ -2127,7 +2127,7 @@ Reference< XPropertySet > OSQLParseTreeIterator::findColumn(const OSQLTables& _r
     return xColumn;
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError, const OUString* _pReplaceToken1, const OUString* _pReplaceToken2 )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_appendError" );
@@ -2147,7 +2147,7 @@ void OSQLParseTreeIterator::impl_appendError( IParseContext::ErrorCode _eError,
         sErrorMessage, NULL, getStandardSQLState( SQL_GENERAL_ERROR ), 1000, Any() ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseTreeIterator::impl_appendError( const SQLException& _rError )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseTreeIterator::impl_appendError" );
@@ -2161,7 +2161,7 @@ void OSQLParseTreeIterator::impl_appendError( const SQLException& _rError )
     else
         m_aErrors = _rError;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OSQLParseTreeIterator::getFunctionReturnType(const OSQLParseNode* _pNode )
 {
     sal_Int32 nType = DataType::OTHER;
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 5ac2712bed11..1456a8588b31 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -76,7 +76,7 @@ connectivity::OSQLParser* xxx_pGLOBAL_SQLPARSER;
 
 namespace
 {
-    // -----------------------------------------------------------------------------
+
     sal_Bool lcl_saveConvertToNumber(const Reference< XNumberFormatter > & _xFormatter,sal_Int32 _nKey,const OUString& _sValue,double& _nrValue)
     {
         sal_Bool bRet = sal_False;
@@ -90,14 +90,14 @@ namespace
         }
         return bRet;
     }
-    // -----------------------------------------------------------------------------
+
     void replaceAndReset(connectivity::OSQLParseNode*& _pResetNode,connectivity::OSQLParseNode* _pNewNode)
     {
         _pResetNode->getParent()->replace(_pResetNode, _pNewNode);
         delete _pResetNode;
         _pResetNode = _pNewNode;
     }
-    // -----------------------------------------------------------------------------
+
     /** quotes a string and search for quotes inside the string and replace them with the new quote
         @param  rValue
             The value to be quoted.
@@ -195,7 +195,7 @@ namespace connectivity
 //=============================================================================
 //= SQLParseNodeParameter
 //=============================================================================
-//-----------------------------------------------------------------------------
+
 SQLParseNodeParameter::SQLParseNodeParameter( const Reference< XConnection >& _rxConnection,
         const Reference< XNumberFormatter >& _xFormatter, const Reference< XPropertySet >& _xField,
         const OUString &_sPredicateTableAlias,
@@ -217,7 +217,7 @@ SQLParseNodeParameter::SQLParseNodeParameter( const Reference< XConnection >& _r
 {
 }
 
-//-----------------------------------------------------------------------------
+
 SQLParseNodeParameter::~SQLParseNodeParameter()
 {
 }
@@ -225,7 +225,7 @@ SQLParseNodeParameter::~SQLParseNodeParameter()
 //=============================================================================
 //= OSQLParseNode
 //=============================================================================
-//-----------------------------------------------------------------------------
+
 OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::convertDateString" );
@@ -238,7 +238,7 @@ OUString OSQLParseNode::convertDateString(const SQLParseNodeParameter& rParam, c
     return rParam.xFormatter->convertNumberToString(nKey, fDate);
 }
 
-//-----------------------------------------------------------------------------
+
 OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::convertDateTimeString" );
@@ -251,7 +251,7 @@ OUString OSQLParseNode::convertDateTimeString(const SQLParseNodeParameter& rPara
     return rParam.xFormatter->convertNumberToString(nKey, fDateTime);
 }
 
-//-----------------------------------------------------------------------------
+
 OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::convertTimeString" );
@@ -265,7 +265,7 @@ OUString OSQLParseNode::convertTimeString(const SQLParseNodeParameter& rParam, c
     return rParam.xFormatter->convertNumberToString(nKey, fTime);
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::parseNodeToStr(OUString& rString,
                                    const Reference< XConnection >& _rxConnection,
                                    const IParseContext* pContext,
@@ -280,7 +280,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
         pContext, _bIntl, _bQuote, '.', false, false );
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
                                               const Reference< XConnection >& _rxConnection,
                                               const Reference< XNumberFormatter > & xFormatter,
@@ -296,7 +296,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
         parseNodeToStr(rString, _rxConnection, xFormatter, NULL, OUString(), rIntl, pContext, true, true, _cDec, true, false);
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
                                               const Reference< XConnection > & _rxConnection,
                                               const Reference< XNumberFormatter > & xFormatter,
@@ -314,7 +314,7 @@ void OSQLParseNode::parseNodeToPredicateStr(OUString& rString,
         parseNodeToStr( rString, _rxConnection, xFormatter, _xField, _sPredicateTableAlias, rIntl, pContext, true, true, _cDec, true, false );
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::parseNodeToStr(OUString& rString,
                       const Reference< XConnection > & _rxConnection,
                       const Reference< XNumberFormatter > & xFormatter,
@@ -354,7 +354,7 @@ void OSQLParseNode::parseNodeToStr(OUString& rString,
         rString = sBuffer.makeStringAndClear();
     }
 }
-//-----------------------------------------------------------------------------
+
 bool OSQLParseNode::parseNodeToExecutableStatement( OUString& _out_rString, const Reference< XConnection >& _rxConnection,
     OSQLParser& _rParser, ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const
 {
@@ -390,7 +390,7 @@ bool OSQLParseNode::parseNodeToExecutableStatement( OUString& _out_rString, cons
     return bSuccess;
 }
 
-//-----------------------------------------------------------------------------
+
 namespace
 {
     bool lcl_isAliasNamePresent( const OSQLParseNode& _rTableNameNode )
@@ -399,7 +399,7 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const SQLParseNodeParameter& rParam, bool bSimple) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseNodeToString_throw" );
@@ -633,7 +633,7 @@ void OSQLParseNode::impl_parseNodeToString_throw(OUStringBuffer& rString, const
     }
 }
 
-//-----------------------------------------------------------------------------
+
 bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseTableNameNodeToString_throw" );
@@ -731,7 +731,7 @@ bool OSQLParseNode::impl_parseTableNameNodeToString_throw( OUStringBuffer& rStri
     return false;
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseTableRangeNodeToString_throw" );
@@ -742,7 +742,7 @@ void OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rStri
         boost::bind( &OSQLParseNode::impl_parseNodeToString_throw, _1, boost::ref( rString ), boost::cref( rParam ), false ));
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam, bool bSimple ) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::impl_parseLikeNodeToString_throw" );
@@ -777,7 +777,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString, c
 }
 
 
-// -----------------------------------------------------------------------------
+
 sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
                                             ::com::sun::star::uno::Any &_rCatalog,
                                             OUString &_rSchema,
@@ -822,7 +822,7 @@ sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
     }
     return !_rTable.isEmpty();
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParser::killThousandSeparator(OSQLParseNode* pLiteral)
 {
     if ( pLiteral )
@@ -837,7 +837,7 @@ void OSQLParser::killThousandSeparator(OSQLParseNode* pLiteral)
             pLiteral->m_aNodeValue = pLiteral->m_aNodeValue.replace(',', sal_Unicode());
         }
 }
-// -----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*const& pLiteral)
 {
     if ( !pLiteral )
@@ -955,7 +955,7 @@ OSQLParseNode* OSQLParser::convertNode(sal_Int32 nType,OSQLParseNode*const& pLit
     }
     return pReturn;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int16 OSQLParser::buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode* const pLiteral,OSQLParseNode*const & pCompare,OSQLParseNode* pLiteral2)
 {
     OSL_ENSURE(inPredicateCheck(),"Only in predicate check allowed!");
@@ -984,7 +984,7 @@ sal_Int16 OSQLParser::buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode*
         delete pCompare;
     return nErg;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode* const& pAppend, OSQLParseNode*& pLiteral, const OSQLParseNode* pEscape)
 {
     sal_Int16 nErg = 0;
@@ -1059,7 +1059,7 @@ sal_Int16 OSQLParser::buildLikeRule(OSQLParseNode* const& pAppend, OSQLParseNode
     }
     return nErg;
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType)
 {
     OUString aEmptyString;
@@ -1108,7 +1108,7 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType)
 
     return pNewNode;
 }
-// -----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
 {
     OSQLParseNode* pReturn = NULL;
@@ -1136,7 +1136,7 @@ OSQLParseNode* OSQLParser::buildNode_STR_NUM(OSQLParseNode*& _pLiteral)
     }
     return pReturn;
 }
-// -----------------------------------------------------------------------------
+
 OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
 {
     OUString aValue;
@@ -1163,7 +1163,7 @@ OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
     }
     return aValue;
 }
-// -----------------------------------------------------------------------------
+
 
 ::osl::Mutex& OSQLParser::getMutex()
 {
@@ -1171,7 +1171,7 @@ OUString OSQLParser::stringToDouble(const OUString& _rValue,sal_Int16 _nScale)
     return aMutex;
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString& rStatement,
                                           const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                                          const Reference< XPropertySet > & xField)
@@ -1326,7 +1326,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
 }
 
 //=============================================================================
-//-----------------------------------------------------------------------------
+
 OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const IParseContext* _pContext)
     :m_pContext(_pContext)
     ,m_pParseTree(NULL)
@@ -1491,7 +1491,7 @@ OSQLParser::OSQLParser(const ::com::sun::star::uno::Reference< ::com::sun::star:
     m_pData->aLocale = m_pContext->getPreferredLocale();
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLParser::~OSQLParser()
 {
     {
@@ -1514,7 +1514,7 @@ OSQLParser::~OSQLParser()
         m_pParseTree = NULL;
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::substituteParameterNames" );
@@ -1535,7 +1535,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode)
 
     }
 }
-// -----------------------------------------------------------------------------
+
 bool OSQLParser::extractDate(OSQLParseNode* pLiteral,double& _rfValue)
 {
     Reference< XNumberFormatsSupplier > xFormatSup = m_xFormatter->getNumberFormatsSupplier();
@@ -1584,7 +1584,7 @@ bool OSQLParser::extractDate(OSQLParseNode* pLiteral,double& _rfValue)
     }
     return bSuccess;
 }
-// -----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParser::buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral)
 {
     // try converting the string into a date, according to our format key
@@ -1602,8 +1602,8 @@ OSQLParseNode* OSQLParser::buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral)
 
     return pFCTNode;
 }
-// -----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
 OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue,
                              SQLNodeType eNewNodeType,
                              sal_uInt32 nNewNodeID)
@@ -1616,7 +1616,7 @@ OSQLParseNode::OSQLParseNode(const sal_Char * pNewValue,
 
     OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType");
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode::OSQLParseNode(const OString &_rNewValue,
                              SQLNodeType eNewNodeType,
                              sal_uInt32 nNewNodeID)
@@ -1629,7 +1629,7 @@ OSQLParseNode::OSQLParseNode(const OString &_rNewValue,
 
     OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType");
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode::OSQLParseNode(const OUString &_rNewValue,
                                  SQLNodeType eNewNodeType,
                                  sal_uInt32 nNewNodeID)
@@ -1642,7 +1642,7 @@ OSQLParseNode::OSQLParseNode(const OUString &_rNewValue,
 
     OSL_ENSURE(m_eNodeType >= SQL_NODE_RULE && m_eNodeType <= SQL_NODE_CONCAT,"OSQLParseNode: created with invalid NodeType");
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode::OSQLParseNode(const OSQLParseNode& rParseNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::OSQLParseNode" );
@@ -1666,8 +1666,8 @@ OSQLParseNode::OSQLParseNode(const OSQLParseNode& rParseNode)
          i != rParseNode.m_aChildren.end(); ++i)
         append(new OSQLParseNode(**i));
 }
-// -----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
 OSQLParseNode& OSQLParseNode::operator=(const OSQLParseNode& rParseNode)
 {
     if (this != &rParseNode)
@@ -1690,7 +1690,7 @@ OSQLParseNode& OSQLParseNode::operator=(const OSQLParseNode& rParseNode)
     return *this;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
 {
     // The members must be equal
@@ -1709,7 +1709,7 @@ sal_Bool OSQLParseNode::operator==(OSQLParseNode& rParseNode) const
     return bResult;
 }
 
-//-----------------------------------------------------------------------------
+
 OSQLParseNode::~OSQLParseNode()
 {
     for (OSQLParseNodes::const_iterator i = m_aChildren.begin();
@@ -1718,7 +1718,7 @@ OSQLParseNode::~OSQLParseNode()
     m_aChildren.clear();
 }
 
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::append(OSQLParseNode* pNewNode)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::append" );
@@ -1733,7 +1733,7 @@ void OSQLParseNode::append(OSQLParseNode* pNewNode)
     // and attach the SubTree at the end
     m_aChildren.push_back(pNewNode);
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::addDateValue" );
@@ -1787,7 +1787,7 @@ sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNode
     }
     return sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString& rColumnName)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::replaceNodeValue" );
@@ -1804,7 +1804,7 @@ void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString
             getChild(i)->replaceNodeValue(rTableAlias,rColumnName);
     }
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParseNode::getByRule(OSQLParseNode::Rule eRule) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::getByRule" );
@@ -1819,7 +1819,7 @@ OSQLParseNode* OSQLParseNode::getByRule(OSQLParseNode::Rule eRule) const
     }
     return pRetNode;
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
 {
     OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::boolean_term));
@@ -1828,7 +1828,7 @@ OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
     pNewNode->append(pRightLeaf);
     return pNewNode;
 }
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
 {
     OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQL_NODE_RULE,OSQLParser::RuleID(OSQLParseNode::search_condition));
@@ -1837,7 +1837,7 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf)
     pNewNode->append(pRightLeaf);
     return pNewNode;
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::disjunctiveNormalForm(OSQLParseNode*& pSearchCondition)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::disjunctiveNormalForm" );
@@ -1914,7 +1914,7 @@ void OSQLParseNode::disjunctiveNormalForm(OSQLParseNode*& pSearchCondition)
             pSearchCondition->replace(pRight, pRight->removeAt(1));
     }
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_Bool bNegate)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::negateSearchCondition" );
@@ -2067,7 +2067,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, sal_
         delete pNot;
     }
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::eraseBraces" );
@@ -2086,7 +2086,7 @@ void OSQLParseNode::eraseBraces(OSQLParseNode*& pSearchCondition)
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::absorptions" );
@@ -2190,7 +2190,7 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition)
     }
     eraseBraces(pSearchCondition);
 }
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::compress" );
@@ -2296,7 +2296,7 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition)
     }
 }
 #if OSL_DEBUG_LEVEL > 1
-// -----------------------------------------------------------------------------
+
 void OSQLParseNode::showParseTree( OUString& rString ) const
 {
     OUStringBuffer aBuf;
@@ -2304,7 +2304,7 @@ void OSQLParseNode::showParseTree( OUString& rString ) const
     rString = aBuf.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------------
+
 void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nLevel ) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::showParseTree" );
@@ -2421,9 +2421,9 @@ void OSQLParseNode::showParseTree( OUStringBuffer& _inout_rBuffer, sal_uInt32 nL
     }
 }
 #endif // OSL_DEBUG_LEVEL > 0
-// -----------------------------------------------------------------------------
+
 // Insert methods
-//-----------------------------------------------------------------------------
+
 void OSQLParseNode::insert(sal_uInt32 nPos, OSQLParseNode* pNewSubTree)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::insert" );
@@ -2436,7 +2436,7 @@ void OSQLParseNode::insert(sal_uInt32 nPos, OSQLParseNode* pNewSubTree)
 }
 
 // removeAt methods
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParseNode::removeAt(sal_uInt32 nPos)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::removeAt" );
@@ -2452,7 +2452,7 @@ OSQLParseNode* OSQLParseNode::removeAt(sal_uInt32 nPos)
 }
 
 // Replace methods
-//-----------------------------------------------------------------------------
+
 OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode* pNewSubNode )
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::replace " );
@@ -2468,7 +2468,7 @@ OSQLParseNode* OSQLParseNode::replace (OSQLParseNode* pOldSubNode, OSQLParseNode
     ::std::replace(m_aChildren.begin(), m_aChildren.end(), pOldSubNode, pNewSubNode);
     return pOldSubNode;
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::parseLeaf" );
@@ -2563,7 +2563,7 @@ void OSQLParseNode::parseLeaf(OUStringBuffer& rString, const SQLParseNodeParamet
     }
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 OSQLParser::getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext)
 {
     sal_Int32 nType = DataType::VARCHAR;
@@ -2653,7 +2653,7 @@ sal_Int32 OSQLParser::getFunctionReturnType(const OUString& _sFunctionName, cons
 
     return nType;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OSQLParser::getFunctionParameterType(sal_uInt32 _nTokenId, sal_uInt32 _nPos)
 {
     sal_Int32 nType = DataType::VARCHAR;
@@ -2761,20 +2761,20 @@ sal_Int32 OSQLParser::getFunctionParameterType(sal_uInt32 _nTokenId, sal_uInt32
     return nType;
 }
 
-// -----------------------------------------------------------------------------
+
 const SQLError& OSQLParser::getErrorHelper() const
 {
     return m_pData->aErrors;
 }
 
-// -----------------------------------------------------------------------------
+
 OSQLParseNode::Rule OSQLParseNode::getKnownRuleID() const
 {
     if ( !isRule() )
         return UNKNOWN_RULE;
     return OSQLParser::RuleIDToRule( getRuleID() );
 }
-// -----------------------------------------------------------------------------
+
 OUString OSQLParseNode::getTableRange(const OSQLParseNode* _pTableRef)
 {
     SAL_INFO( "connectivity.parse", "parse Ocke.Janssen@sun.com OSQLParseNode::getTableRange" );
@@ -2793,21 +2793,21 @@ OUString OSQLParseNode::getTableRange(const OSQLParseNode* _pTableRef)
 
     return sTableRange;
 }
-// -----------------------------------------------------------------------------
+
 OSQLParseNodesContainer::OSQLParseNodesContainer()
 {
 }
-// -----------------------------------------------------------------------------
+
 OSQLParseNodesContainer::~OSQLParseNodesContainer()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNodesContainer::push_back(OSQLParseNode* _pNode)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aNodes.push_back(_pNode);
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2818,13 +2818,13 @@ void OSQLParseNodesContainer::erase(OSQLParseNode* _pNode)
             m_aNodes.erase(aFind);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNodesContainer::clear()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aNodes.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OSQLParseNodesContainer::clearAndDelete()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index 4de9d4c1d10a..7cd77737f165 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -68,11 +68,11 @@ namespace connectivity
         }
     };
 
-    //--------------------------------------------------------------------
+
     SharedResources_Impl*   SharedResources_Impl::s_pInstance( NULL );
     oslInterlockedCount     SharedResources_Impl::s_nClients( 0 );
 
-    //--------------------------------------------------------------------
+
     SharedResources_Impl::SharedResources_Impl()
     {
         try
@@ -87,7 +87,7 @@ namespace connectivity
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString SharedResources_Impl::getResourceString( ResourceId _nId )
     {
         if ( m_pResourceBundle.get() == NULL )
@@ -98,13 +98,13 @@ namespace connectivity
         return m_pResourceBundle->loadString( _nId );
     }
 
-    //--------------------------------------------------------------------
+
     void SharedResources_Impl::registerClient()
     {
         osl_atomic_increment( &s_nClients );
     }
 
-    //--------------------------------------------------------------------
+
     void SharedResources_Impl::revokeClient()
     {
         ::osl::MutexGuard aGuard( getMutex() );
@@ -115,7 +115,7 @@ namespace connectivity
         }
     }
 
-    //--------------------------------------------------------------------
+
     SharedResources_Impl& SharedResources_Impl::getInstance()
     {
         ::osl::MutexGuard aGuard( getMutex() );
@@ -152,25 +152,25 @@ namespace connectivity
     //====================================================================
     //= SharedResources
     //====================================================================
-    //--------------------------------------------------------------------
+
     SharedResources::SharedResources()
     {
         SharedResources_Impl::registerClient();
     }
 
-    //--------------------------------------------------------------------
+
     SharedResources::~SharedResources()
     {
         SharedResources_Impl::revokeClient();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SharedResources::getResourceString( ResourceId _nResId ) const
     {
         return SharedResources_Impl::getInstance().getResourceString( _nResId );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
                 const sal_Char* _pAsciiPatternToReplace, const OUString& _rStringToSubstitute ) const
     {
@@ -179,7 +179,7 @@ namespace connectivity
         return sString;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
                 const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2 ) const
@@ -190,7 +190,7 @@ namespace connectivity
         return sString;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
                 const sal_Char* _pAsciiPatternToReplace1, const OUString& _rStringToSubstitute1,
                 const sal_Char* _pAsciiPatternToReplace2, const OUString& _rStringToSubstitute2,
@@ -202,7 +202,7 @@ namespace connectivity
         OSL_VERIFY( lcl_substitute( sString, _pAsciiPatternToReplace3, _rStringToSubstitute3 ) );
         return sString;
     }
-    //--------------------------------------------------------------------
+
     OUString SharedResources::getResourceStringWithSubstitution( ResourceId _nResId,
                     const ::std::list< ::std::pair<const sal_Char* , OUString > > _aStringToSubstitutes) const
     {
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index cf5ffb284bb5..0721300bf87b 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -33,9 +33,9 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-//------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OCatalog,"com.sun.star.comp.connectivity.OCatalog","com.sun.star.sdbcx.DatabaseDefinition")
-//------------------------------------------------------------------------------
+
 OCatalog::OCatalog(const Reference< XConnection> &_xConnection) : OCatalog_BASE(m_aMutex)
             ,connectivity::OSubComponent<OCatalog, OCatalog_BASE>(_xConnection, this)
             ,m_pTables(NULL)
@@ -52,7 +52,7 @@ OCatalog::OCatalog(const Reference< XConnection> &_xConnection) : OCatalog_BASE(
         OSL_FAIL("No Metadata available!");
     }
 }
-//-----------------------------------------------------------------------------
+
 OCatalog::~OCatalog()
 {
     delete m_pTables;
@@ -60,18 +60,18 @@ OCatalog::~OCatalog()
     delete m_pGroups;
     delete m_pUsers;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OCatalog::acquire() throw()
 {
     OCatalog_BASE::acquire();
 }
-//------------------------------------------------------------------------------
+
 void SAL_CALL OCatalog::release() throw()
 {
     relase_ChildImpl();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OCatalog::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -88,7 +88,7 @@ void SAL_CALL OCatalog::disposing()
     dispose_ChildImpl();
     OCatalog_BASE::disposing();
 }
-//------------------------------------------------------------------------------
+
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException)
 {
@@ -112,7 +112,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables(  ) throw(RuntimeException
 
     return m_pTables;
 }
-// -------------------------------------------------------------------------
+
 // XViewsSupplier
 Reference< XNameAccess > SAL_CALL OCatalog::getViews(  ) throw(RuntimeException)
 {
@@ -136,7 +136,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getViews(  ) throw(RuntimeException)
 
     return m_pViews;
 }
-// -------------------------------------------------------------------------
+
 // XUsersSupplier
 Reference< XNameAccess > SAL_CALL OCatalog::getUsers(  ) throw(RuntimeException)
 {
@@ -160,7 +160,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getUsers(  ) throw(RuntimeException)
 
     return m_pUsers;
 }
-// -------------------------------------------------------------------------
+
 // XGroupsSupplier
 Reference< XNameAccess > SAL_CALL OCatalog::getGroups(  ) throw(RuntimeException)
 {
@@ -184,7 +184,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups(  ) throw(RuntimeException
 
     return m_pGroups;
 }
-// -----------------------------------------------------------------------------
+
 OUString OCatalog::buildName(const Reference< XRow >& _xRow)
 {
     OUString sCatalog = _xRow->getString(1);
@@ -201,7 +201,7 @@ OUString OCatalog::buildName(const Reference< XRow >& _xRow)
         ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation ) );
     return sComposedName;
 }
-// -----------------------------------------------------------------------------
+
 void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rNames)
 {
     if ( _xResult.is() )
@@ -216,16 +216,16 @@ void OCatalog::fillNames(Reference< XResultSet >& _xResult,TStringVector& _rName
         ::comphelper::disposeComponent(_xResult);
     }
 }
-// -------------------------------------------------------------------------
+
 void ODescriptor::construct()
 {
     sal_Int32 nAttrib = isNew() ? 0 : ::com::sun::star::beans::PropertyAttribute::READONLY;
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME), PROPERTY_ID_NAME ,nAttrib,&m_Name,::getCppuType(static_cast< OUString*>(0)));
 }
-// -------------------------------------------------------------------------
+
 ODescriptor::~ODescriptor()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 694a2727ff15..1924675c2d6a 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -68,23 +68,23 @@ namespace
         {
             m_aElements.reserve(nLength);
         }
-        // -----------------------------------------------------------------------------
+
         virtual bool exists(const OUString& _sName )
         {
             return m_aNameMap.find(_sName) != m_aNameMap.end();
         }
-        // -----------------------------------------------------------------------------
+
         virtual bool empty()
         {
             return m_aNameMap.empty();
         }
-        // -----------------------------------------------------------------------------
+
         virtual void swapAll()
         {
             ::std::vector< ObjectIter >(m_aElements).swap(m_aElements);
             ObjectMap(m_aNameMap).swap(m_aNameMap);
         }
-        // -----------------------------------------------------------------------------
+
         virtual void swap()
         {
             ::std::vector< ObjectIter >().swap(m_aElements);
@@ -97,18 +97,18 @@ namespace
                 // default constructed (instead of being constructed from the same instance in m_aNameMap), and
                 // it's case-sensitive flag would have an unpredictable value.
         }
-        // -----------------------------------------------------------------------------
+
         virtual void clear()
         {
             m_aElements.clear();
             m_aNameMap.clear();
         }
-        // -----------------------------------------------------------------------------
+
         virtual void insert(const OUString& _sName,const ObjectType& _xObject)
         {
             m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(_sName,_xObject)));
         }
-        // -----------------------------------------------------------------------------
+
         virtual void reFill(const TStringVector &_rVector)
         {
             OSL_ENSURE(!m_aNameMap.size(),"OCollection::reFill: collection isn't empty");
@@ -117,7 +117,7 @@ namespace
             for(TStringVector::const_iterator i=_rVector.begin(); i != _rVector.end();++i)
                 m_aElements.push_back(m_aNameMap.insert(m_aNameMap.begin(), ObjectEntry(*i,ObjectType())));
         }
-        // -----------------------------------------------------------------------------
+
         virtual bool rename(const OUString _sOldName,const OUString _sNewName)
         {
             bool bRet = false;
@@ -135,12 +135,12 @@ namespace
             }
             return bRet;
         }
-        // -----------------------------------------------------------------------------
+
         virtual sal_Int32 size()
         {
             return static_cast<sal_Int32>(m_aNameMap.size());
         }
-        // -----------------------------------------------------------------------------
+
         virtual Sequence< OUString > getElementNames()
         {
             Sequence< OUString > aNameList(m_aElements.size());
@@ -152,12 +152,12 @@ namespace
 
             return aNameList;
         }
-        // -----------------------------------------------------------------------------
+
         virtual OUString getName(sal_Int32 _nIndex)
         {
             return m_aElements[_nIndex]->first;
         }
-        // -----------------------------------------------------------------------------
+
         virtual void disposeAndErase(sal_Int32 _nIndex)
         {
             OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
@@ -169,7 +169,7 @@ namespace
             m_aElements.erase(m_aElements.begin()+_nIndex);
             m_aNameMap.erase(sName);
         }
-        // -----------------------------------------------------------------------------
+
         virtual void disposeElements()
         {
             for( ObjectIter aIter = m_aNameMap.begin(); aIter != m_aNameMap.end(); ++aIter)
@@ -184,42 +184,42 @@ namespace
             m_aElements.clear();
             m_aNameMap.clear();
         }
-        // -----------------------------------------------------------------------------
+
         virtual sal_Int32 findColumn( const OUString& columnName )
         {
             ObjectIter aIter = m_aNameMap.find(columnName);
             OSL_ENSURE(aIter != m_aNameMap.end(),"findColumn:: Illegal name!");
             return m_aElements.size() - (m_aElements.end() - ::std::find(m_aElements.begin(),m_aElements.end(),aIter));
         }
-        // -----------------------------------------------------------------------------
+
         virtual OUString findColumnAtIndex(  sal_Int32 _nIndex)
         {
             OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
             return m_aElements[_nIndex]->first;
         }
-        // -----------------------------------------------------------------------------
+
         virtual ObjectType getObject(sal_Int32 _nIndex)
         {
             OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
             return m_aElements[_nIndex]->second;
         }
-        // -----------------------------------------------------------------------------
+
         virtual ObjectType getObject(const OUString& columnName)
         {
             return m_aNameMap.find(columnName)->second;
         }
-        // -----------------------------------------------------------------------------
+
         virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject)
         {
             OSL_ENSURE(_nIndex >= 0 && _nIndex < static_cast<sal_Int32>(m_aElements.size()),"Illegal argument!");
             m_aElements[_nIndex]->second = _xObject;
         }
-        // -----------------------------------------------------------------------------
+
         sal_Bool isCaseSensitive() const
         {
             return m_aNameMap.key_comp().isCaseSensitive();
         }
-        // -----------------------------------------------------------------------------
+
     };
 }
 
@@ -249,11 +249,11 @@ OCollection::OCollection(::cppu::OWeakObject& _rParent
     }
     m_pElements->reFill(_rVector);
 }
-// -------------------------------------------------------------------------
+
 OCollection::~OCollection()
 {
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OCollection::queryInterface( const Type & rType ) throw (RuntimeException)
 {
     if ( m_bUseIndexOnly && rType == ::getCppuType(static_cast< Reference< XNameAccess > *> (NULL)) )
@@ -262,7 +262,7 @@ Any SAL_CALL OCollection::queryInterface( const Type & rType ) throw (RuntimeExc
     }
     return OCollectionBase::queryInterface( rType );
 }
-// -----------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException)
 {
     if ( m_bUseIndexOnly )
@@ -284,7 +284,7 @@ Sequence< Type > SAL_CALL OCollection::getTypes() throw (RuntimeException)
     }
     return OCollectionBase::getTypes( );
 }
-// -------------------------------------------------------------------------
+
 void OCollection::clear_NoDispose()
 {
     ::osl::MutexGuard aGuard(m_rMutex);
@@ -293,7 +293,7 @@ void OCollection::clear_NoDispose()
     m_pElements->swapAll();
 }
 
-// -------------------------------------------------------------------------
+
 void OCollection::disposing(void)
 {
     m_aContainerListeners.disposeAndClear(EventObject(static_cast<XTypeProvider*>(this)));
@@ -305,7 +305,7 @@ void OCollection::disposing(void)
 
     m_pElements->swap();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
@@ -314,7 +314,7 @@ Any SAL_CALL OCollection::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsEx
 
     return makeAny(getObject(Index));
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OCollection::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
@@ -331,13 +331,13 @@ Any SAL_CALL OCollection::getByName( const OUString& aName ) throw(NoSuchElement
 
     return makeAny(getObject(m_pElements->findColumn(aName)));
 }
-// -------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL OCollection::getElementNames(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_pElements->getElementNames();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCollection::refresh(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
@@ -348,12 +348,12 @@ void SAL_CALL OCollection::refresh(  ) throw(RuntimeException)
     EventObject aEvt(static_cast<XTypeProvider*>(this));
     m_aRefreshListeners.notifyEach( &XRefreshListener::refreshed, aEvt );
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::reFill(const TStringVector &_rVector)
 {
     m_pElements->reFill(_rVector);
 }
-// -------------------------------------------------------------------------
+
 // XDataDescriptorFactory
 Reference< XPropertySet > SAL_CALL OCollection::createDataDescriptor(  ) throw(RuntimeException)
 {
@@ -361,7 +361,7 @@ Reference< XPropertySet > SAL_CALL OCollection::createDataDescriptor(  ) throw(R
 
     return createDescriptor();
 }
-// -----------------------------------------------------------------------------
+
 OUString OCollection::getNameForObject(const ObjectType& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"OCollection::getNameForObject: Object is NULL!");
@@ -369,7 +369,7 @@ OUString OCollection::getNameForObject(const ObjectType& _xObject)
     _xObject->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sName;
     return sName;
 }
-// -------------------------------------------------------------------------
+
 // XAppend
 void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >& descriptor ) throw(SQLException, ElementExistException, RuntimeException)
 {
@@ -397,7 +397,7 @@ void SAL_CALL OCollection::appendByDescriptor( const Reference< XPropertySet >&
     aGuard.clear();
     m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvent );
 }
-// -------------------------------------------------------------------------
+
 // XDrop
 void SAL_CALL OCollection::dropByName( const OUString& elementName ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
@@ -408,7 +408,7 @@ void SAL_CALL OCollection::dropByName( const OUString& elementName ) throw(SQLEx
 
     dropImpl(m_pElements->findColumn(elementName));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
@@ -417,7 +417,7 @@ void SAL_CALL OCollection::dropByIndex( sal_Int32 index ) throw(SQLException, In
 
     dropImpl(index);
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop)
 {
     OUString elementName = m_pElements->getName(_nIndex);
@@ -430,7 +430,7 @@ void OCollection::dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop)
     // notify our container listeners
     notifyElementRemoved(elementName);
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::notifyElementRemoved(const OUString& _sName)
 {
     ContainerEvent aEvent(static_cast<XContainer*>(this), makeAny(_sName), Any(), Any());
@@ -439,7 +439,7 @@ void OCollection::notifyElementRemoved(const OUString& _sName)
     while (aListenerLoop.hasMoreElements())
         static_cast<XContainerListener*>(aListenerLoop.next())->elementRemoved(aEvent);
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     if ( !m_pElements->exists(columnName) )
@@ -450,74 +450,74 @@ sal_Int32 SAL_CALL OCollection::findColumn( const OUString& columnName ) throw(S
 
     return m_pElements->findColumn(columnName) + 1; // because columns start at one
 }
-// -------------------------------------------------------------------------
+
 Reference< XEnumeration > SAL_CALL OCollection::createEnumeration(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return new OEnumerationByIndex( static_cast< XIndexAccess*>(this));
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCollection::addContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
 {
     m_aContainerListeners.addInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OCollection::removeContainerListener( const Reference< XContainerListener >& _rxListener ) throw(RuntimeException)
 {
     m_aContainerListeners.removeInterface(_rxListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCollection::acquire() throw()
 {
     m_rParent.acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCollection::release() throw()
 {
     m_rParent.release();
 }
-// -----------------------------------------------------------------------------
+
 Type SAL_CALL OCollection::getElementType(  ) throw(RuntimeException)
 {
     return::getCppuType(static_cast< Reference< XPropertySet>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCollection::hasElements(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return !m_pElements->empty();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OCollection::getCount(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_pElements->size();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OCollection::hasByName( const OUString& aName ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_pElements->exists(aName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCollection::addRefreshListener( const Reference< XRefreshListener >& l ) throw(RuntimeException)
 {
     m_aRefreshListeners.addInterface(l);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OCollection::removeRefreshListener( const Reference< XRefreshListener >& l ) throw(RuntimeException)
 {
     m_aRefreshListeners.removeInterface(l);
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::insertElement(const OUString& _sElementName,const ObjectType& _xElement)
 {
     OSL_ENSURE(!m_pElements->exists(_sElementName),"Element already exists");
     if ( !m_pElements->exists(_sElementName) )
         m_pElements->insert(_sElementName,_xElement);
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::renameObject(const OUString _sOldName,const OUString _sNewName)
 {
     OSL_ENSURE(m_pElements->exists(_sOldName),"Element doesn't exist");
@@ -534,7 +534,7 @@ void OCollection::renameObject(const OUString _sOldName,const OUString _sNewName
             static_cast<XContainerListener*>(aListenerLoop.next())->elementReplaced(aEvent);
     }
 }
-// -----------------------------------------------------------------------------
+
 ObjectType OCollection::getObject(sal_Int32 _nIndex)
 {
     ObjectType xName = m_pElements->getObject(_nIndex);
@@ -559,33 +559,33 @@ ObjectType OCollection::getObject(sal_Int32 _nIndex)
     }
     return xName;
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::disposeElements()
 {
     m_pElements->disposeElements();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet > OCollection::createDescriptor()
 {
     OSL_FAIL("Need to be overloaded when used!");
     throw SQLException();
 }
-// -----------------------------------------------------------------------------
+
 ObjectType OCollection::cloneDescriptor( const ObjectType& _descriptor )
 {
     ObjectType xNewDescriptor( createDescriptor() );
     ::comphelper::copyProperties( _descriptor, xNewDescriptor );
     return xNewDescriptor;
 }
-// -----------------------------------------------------------------------------
+
 ObjectType OCollection::appendObject( const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
-// -----------------------------------------------------------------------------
+
 void OCollection::dropObject(sal_Int32 /*_nPos*/,const OUString /*_sElementName*/)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index c3058d033a89..59cf69a87e09 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include "TConnection.hxx"
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace connectivity::sdbcx;
 using namespace cppu;
@@ -32,14 +32,14 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdbc;
 
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OColumn::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VColumnDescription");
     return OUString("com.sun.star.sdbcx.VColumn");
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -55,7 +55,7 @@ sal_Bool SAL_CALL OColumn::supportsService( const OUString& _rServiceName ) thro
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 OColumn::OColumn(sal_Bool _bCase)
     :OColumnDescriptor_BASE(m_aMutex)
     ,ODescriptor(OColumnDescriptor_BASE::rBHelper,_bCase,sal_True)
@@ -69,7 +69,7 @@ OColumn::OColumn(sal_Bool _bCase)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OColumn::OColumn(   const OUString& _Name,
                     const OUString& _TypeName,
                     const OUString& _DefaultValue,
@@ -105,31 +105,31 @@ OColumn::OColumn(   const OUString& _Name,
 
     construct();
 }
-// -------------------------------------------------------------------------
+
 OColumn::~OColumn()
 {
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SAL_CALL OColumn::getInfoHelper()
 {
     return *OColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OColumn::acquire() throw()
 {
     OColumnDescriptor_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OColumn::release() throw()
 {
     OColumnDescriptor_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OColumn::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODescriptor::queryInterface( rType);
@@ -142,7 +142,7 @@ Any SAL_CALL OColumn::queryInterface( const Type & rType ) throw(RuntimeExceptio
     }
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OColumn::getTypes(  ) throw(RuntimeException)
 {
     if(isNew())
@@ -150,7 +150,7 @@ Sequence< Type > SAL_CALL OColumn::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OColumn_BASE::getTypes(),OColumnDescriptor_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void OColumn::construct()
 {
     ODescriptor::construct();
@@ -171,7 +171,7 @@ void OColumn::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCHEMANAME),      PROPERTY_ID_SCHEMANAME,         nAttrib, &m_SchemaName,      ::getCppuType(&m_SchemaName));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TABLENAME),       PROPERTY_ID_TABLENAME,          nAttrib, &m_TableName,       ::getCppuType(&m_TableName));
 }
-// -------------------------------------------------------------------------
+
 void OColumn::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -180,7 +180,7 @@ void OColumn::disposing(void)
     checkDisposed(OColumnDescriptor_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -205,22 +205,22 @@ Reference< XPropertySet > SAL_CALL OColumn::createDataDescriptor(  ) throw(Runti
     pNewColumn->setNew(sal_True);
     return pNewColumn;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OColumn::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 // XNamed
 OUString SAL_CALL OColumn::getName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return m_Name;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OColumn::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException)
 {
     m_Name = aName;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx
index 9993dd6f3020..153a14401b03 100644
--- a/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/connectivity/source/sdbcx/VDescriptor.cxx
@@ -35,7 +35,7 @@ namespace connectivity
         // =========================================================================
         // = ODescriptor
         // =========================================================================
-        // -------------------------------------------------------------------------
+
         ODescriptor::ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew)
             :ODescriptor_PBASE(_rBHelper)
             ,m_aCase(_bCase)
@@ -43,7 +43,7 @@ namespace connectivity
         {
         }
 
-        // -------------------------------------------------------------------------
+
         // com::sun::star::lang::XUnoTunnel
         sal_Int64 SAL_CALL ODescriptor::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
         {
@@ -52,7 +52,7 @@ namespace connectivity
                 : 0;
         }
 
-        // -----------------------------------------------------------------------------
+
         ODescriptor* ODescriptor::getImplementation( const Reference< XInterface >& _rxSomeComp )
         {
             Reference< XUnoTunnel > xTunnel( _rxSomeComp, UNO_QUERY );
@@ -61,7 +61,7 @@ namespace connectivity
             return NULL;
         }
 
-        // -----------------------------------------------------------------------------
+
         namespace
         {
             struct ResetROAttribute : public ::std::unary_function< Property, void >
@@ -80,7 +80,7 @@ namespace connectivity
             };
         }
 
-        // -----------------------------------------------------------------------------
+
         ::cppu::IPropertyArrayHelper* ODescriptor::doCreateArrayHelper() const
         {
             Sequence< Property > aProperties;
@@ -94,14 +94,14 @@ namespace connectivity
             return new ::cppu::OPropertyArrayHelper( aProperties );
         }
 
-        // -----------------------------------------------------------------------------
+
         sal_Bool ODescriptor::isNew( const Reference< XInterface >& _rxDescriptor )
         {
             ODescriptor* pImplementation = getImplementation( _rxDescriptor );
             return pImplementation != NULL ? pImplementation->isNew() : sal_False;
         }
 
-        // -----------------------------------------------------------------------------
+
         Sequence< sal_Int8 > ODescriptor::getUnoTunnelImplementationId()
         {
             static ::cppu::OImplementationId * pId = 0;
@@ -117,20 +117,20 @@ namespace connectivity
             return pId->getImplementationId();
         }
 
-        // -----------------------------------------------------------------------------
+
         Any SAL_CALL ODescriptor::queryInterface( const Type & rType ) throw(RuntimeException)
         {
             Any aRet = ::cppu::queryInterface(rType,static_cast< XUnoTunnel*> (this));
             return aRet.hasValue() ? aRet : ODescriptor_PBASE::queryInterface(rType);
         }
 
-        // -----------------------------------------------------------------------------
+
         void ODescriptor::setNew(sal_Bool _bNew)
         {
             m_bNew = _bNew;
         }
 
-        // -----------------------------------------------------------------------------
+
         Sequence< Type > SAL_CALL ODescriptor::getTypes(  ) throw(RuntimeException)
         {
             ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ),
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 72a2be7ddb19..140a298782e1 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -26,7 +26,7 @@
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbexception.hxx>
 
-// -------------------------------------------------------------------------
+
 using namespace ::connectivity::sdbcx;
 using namespace ::connectivity;
 using namespace ::dbtools;
@@ -37,36 +37,36 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
 IMPLEMENT_SERVICE_INFO(OGroup,"com.sun.star.sdbcx.VGroup","com.sun.star.sdbcx.Group");
-// -------------------------------------------------------------------------
+
 OGroup::OGroup(sal_Bool _bCase) :   OGroup_BASE(m_aMutex)
                 ,   ODescriptor(OGroup_BASE::rBHelper,_bCase)
                 ,   m_pUsers(NULL)
 {
 }
-// -------------------------------------------------------------------------
+
 OGroup::OGroup(const OUString& _Name,sal_Bool _bCase) :  OGroup_BASE(m_aMutex)
                         ,ODescriptor(OGroup_BASE::rBHelper,_bCase)
                         ,m_pUsers(NULL)
 {
     m_Name = _Name;
 }
-// -------------------------------------------------------------------------
+
 OGroup::~OGroup()
 {
     delete m_pUsers;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OGroup::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODescriptor::queryInterface( rType);
     return aRet.hasValue() ? aRet : OGroup_BASE::queryInterface( rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OGroup::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OGroup_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void OGroup::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -76,19 +76,19 @@ void OGroup::disposing(void)
     if(m_pUsers)
         m_pUsers->disposing();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OGroup::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OGroup::getInfoHelper()
 {
     return *const_cast<OGroup*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 Reference< XNameAccess > SAL_CALL OGroup::getUsers(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -111,7 +111,7 @@ Reference< XNameAccess > SAL_CALL OGroup::getUsers(  ) throw(RuntimeException)
 
     return const_cast<OGroup*>(this)->m_pUsers;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL OGroup::getPrivileges( const OUString& /*objName*/, sal_Int32
 
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -128,47 +128,47 @@ sal_Int32 SAL_CALL OGroup::getGrantablePrivileges( const OUString& /*objName*/,
 
     return 0;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OGroup::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
     throwFeatureNotImplementedException( "XAuthorizable::grantPrivileges", *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OGroup::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OGroup_BASE::rBHelper.bDisposed);
     throwFeatureNotImplementedException( "XAuthorizable::revokePrivileges", *this );
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OGroup::getName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return m_Name;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
     throwFeatureNotImplementedException( "XNamed::setName", *this );
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
 void SAL_CALL OGroup::acquire() throw()
 {
     OGroup_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::release() throw()
 {
     OGroup_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 23f662c74aac..7c5d9c0369fc 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -37,14 +37,14 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OIndex::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VIndexDescriptor");
     return OUString("com.sun.star.sdbcx.VIndex");
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OIndex::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -60,7 +60,7 @@ sal_Bool SAL_CALL OIndex::supportsService( const OUString& _rServiceName ) throw
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 OIndex::OIndex(sal_Bool _bCase) :   ODescriptor_BASE(m_aMutex)
                 ,   ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True)
                 ,m_IsUnique(sal_False)
@@ -69,7 +69,7 @@ OIndex::OIndex(sal_Bool _bCase) :   ODescriptor_BASE(m_aMutex)
                 ,m_pColumns(NULL)
 {
 }
-// -------------------------------------------------------------------------
+
 OIndex::OIndex( const OUString& _Name,
                 const OUString& _Catalog,
                 sal_Bool _isUnique,
@@ -85,22 +85,22 @@ OIndex::OIndex( const OUString& _Name,
 {
     m_Name = _Name;
 }
-// -------------------------------------------------------------------------
+
 OIndex::~OIndex( )
 {
     delete m_pColumns;
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OIndex::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SAL_CALL OIndex::getInfoHelper()
 {
     return *OIndex_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OIndex::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODescriptor::queryInterface( rType);
@@ -113,14 +113,14 @@ Any SAL_CALL OIndex::queryInterface( const Type & rType ) throw(RuntimeException
     }
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OIndex::getTypes(  ) throw(RuntimeException)
 {
     if(isNew())
         return ::comphelper::concatSequences(ODescriptor::getTypes(),ODescriptor_BASE::getTypes());
     return ::comphelper::concatSequences(ODescriptor::getTypes(),ODescriptor_BASE::getTypes(),OIndex_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void OIndex::construct()
 {
     ODescriptor::construct();
@@ -132,7 +132,7 @@ void OIndex::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISPRIMARYKEYINDEX),PROPERTY_ID_ISPRIMARYKEYINDEX, nAttrib,&m_IsPrimaryKeyIndex,   ::getBooleanCppuType());
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCLUSTERED),     PROPERTY_ID_ISCLUSTERED,        nAttrib,&m_IsClustered,     ::getBooleanCppuType());
 }
-// -------------------------------------------------------------------------
+
 void OIndex::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -142,7 +142,7 @@ void OIndex::disposing(void)
     if(m_pColumns)
         m_pColumns->disposing();
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OIndex::getColumns(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -165,7 +165,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OIndex::getColumn
 
     return const_cast<OIndex*>(this)->m_pColumns;
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -174,35 +174,35 @@ Reference< XPropertySet > SAL_CALL OIndex::createDataDescriptor(  ) throw(Runtim
 
     return this;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OIndex::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OIndex::getName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return m_Name;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OIndex::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
 void SAL_CALL OIndex::acquire() throw()
 {
     ODescriptor_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OIndex::release() throw()
 {
     ODescriptor_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 void OIndex::refreshColumns()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index ebb83ba0188e..9bdc3215ceeb 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -25,14 +25,14 @@ using namespace connectivity;
 using namespace connectivity::sdbcx;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OIndexColumn::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VIndexColumnDescription");
     return OUString("com.sun.star.sdbcx.VIndex");
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OIndexColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -48,13 +48,13 @@ sal_Bool SAL_CALL OIndexColumn::supportsService( const OUString& _rServiceName )
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -----------------------------------------------------------------------------
+
 OIndexColumn::OIndexColumn(sal_Bool _bCase) : OColumn(_bCase),  m_IsAscending(sal_True)
 {
     construct();
 }
 
-// -------------------------------------------------------------------------
+
 OIndexColumn::OIndexColumn( sal_Bool _IsAscending,
                             const OUString&  _Name,
                             const OUString&  _TypeName,
@@ -89,23 +89,23 @@ OIndexColumn::OIndexColumn( sal_Bool _IsAscending,
 {
     construct();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OIndexColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SAL_CALL OIndexColumn::getInfoHelper()
 {
     return *OIndexColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
-// -------------------------------------------------------------------------
+
 void OIndexColumn::construct()
 {
     sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING), PROPERTY_ID_ISASCENDING,    nAttrib,&m_IsAscending, ::getBooleanCppuType());
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 61da3eb3375e..e5117a07d543 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -35,14 +35,14 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OKey::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VKeyDescription");
     return OUString("com.sun.star.sdbcx.VKey");
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OKey::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -58,14 +58,14 @@ sal_Bool SAL_CALL OKey::supportsService( const OUString& _rServiceName ) throw(:
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 OKey::OKey(sal_Bool _bCase) :   ODescriptor_BASE(m_aMutex)
             ,   ODescriptor(ODescriptor_BASE::rBHelper,_bCase,sal_True)
             ,   m_aProps(new KeyProperties())
             ,   m_pColumns(NULL)
 {
 }
-// -------------------------------------------------------------------------
+
 OKey::OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase)
 : ODescriptor_BASE(m_aMutex)
  ,ODescriptor(ODescriptor_BASE::rBHelper,_bCase)
@@ -89,12 +89,12 @@ OKey::OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase)
 //{
 //  m_Name = _Name;
 //}
-// -------------------------------------------------------------------------
+
 OKey::~OKey( )
 {
     delete m_pColumns;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODescriptor::queryInterface( rType);
@@ -108,7 +108,7 @@ Any SAL_CALL OKey::queryInterface( const Type & rType ) throw(RuntimeException)
 
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OKey::getTypes(  ) throw(RuntimeException)
 {
     if(isNew())
@@ -116,7 +116,7 @@ Sequence< Type > SAL_CALL OKey::getTypes(  ) throw(RuntimeException)
 
     return ::comphelper::concatSequences(ODescriptor::getTypes(),ODescriptor_BASE::getTypes(),OKey_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void OKey::construct()
 {
     ODescriptor::construct();
@@ -128,7 +128,7 @@ void OKey::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_UPDATERULE),      PROPERTY_ID_UPDATERULE,         nAttrib,&m_aProps->m_UpdateRule,        ::getCppuType(static_cast<sal_Int32*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELETERULE),      PROPERTY_ID_DELETERULE,         nAttrib,&m_aProps->m_DeleteRule,        ::getCppuType(static_cast<sal_Int32*>(0)));
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OKey::disposing()
 {
     OPropertySetHelper::disposing();
@@ -140,17 +140,17 @@ void SAL_CALL OKey::disposing()
 
     ODescriptor_BASE::disposing();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OKey::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OKey::getInfoHelper()
 {
     return *const_cast<OKey*>(this)->getArrayHelper(isNew() ? 1 : 0);
 }
-// -------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OKey::getColumns(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -173,7 +173,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OKey::getColumns(
 
     return const_cast<OKey*>(this)->m_pColumns;
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -182,31 +182,31 @@ Reference< XPropertySet > SAL_CALL OKey::createDataDescriptor(  ) throw(RuntimeE
 
     return this;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OKey::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OKey::getName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return m_Name;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OKey::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
 void SAL_CALL OKey::acquire() throw()
 {
     ODescriptor_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OKey::release() throw()
 {
     ODescriptor_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index db8929dcaaed..3935f128f2cb 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -26,14 +26,14 @@ using namespace connectivity::sdbcx;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 using namespace cppu;
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OKeyColumn::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
         return OUString("com.sun.star.sdbcx.VKeyColumnDescription");
     return OUString("com.sun.star.sdbcx.VKeyColumn");
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OKeyColumn::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -49,12 +49,12 @@ sal_Bool SAL_CALL OKeyColumn::supportsService( const OUString& _rServiceName ) t
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 OKeyColumn::OKeyColumn(sal_Bool _bCase) : OColumn(_bCase)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OKeyColumn::OKeyColumn( const OUString&  _ReferencedColumn,
                         const OUString&  _Name,
                         const OUString&  _TypeName,
@@ -89,27 +89,27 @@ OKeyColumn::OKeyColumn( const OUString&  _ReferencedColumn,
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OKeyColumn::~OKeyColumn()
 {
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OKeyColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SAL_CALL OKeyColumn::getInfoHelper()
 {
     return *OKeyColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
-// -------------------------------------------------------------------------
+
 void OKeyColumn::construct()
 {
     sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN),   PROPERTY_ID_RELATEDCOLUMN,  nAttrib,&m_ReferencedColumn,    ::getCppuType(static_cast< OUString*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index b4f1338ce670..95e15dc7a9dd 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OTable::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     if(isNew())
@@ -47,7 +47,7 @@ OUString SAL_CALL OTable::getImplementationName(  ) throw (::com::sun::star::uno
     return OUString("com.sun.star.sdbcx.Table");
 }
 
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL OTable::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::com::sun::star::uno::Sequence< OUString > aSupported(1);
@@ -63,7 +63,7 @@ sal_Bool SAL_CALL OTable::supportsService( const OUString& _rServiceName ) throw
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -------------------------------------------------------------------------
+
 OTable::OTable(OCollection* _pTables,
                sal_Bool _bCase)
                : OTableDescriptor_BASE(m_aMutex)
@@ -74,7 +74,7 @@ OTable::OTable(OCollection* _pTables,
                 ,m_pTables(_pTables)
 {
 }
-// -----------------------------------------------------------------------------
+
 OTable::OTable( OCollection*    _pTables,
                 sal_Bool _bCase,
                 const OUString& _Name,       const OUString& _Type,
@@ -92,14 +92,14 @@ OTable::OTable( OCollection*    _pTables,
 {
     m_Name = _Name;
 }
-// -------------------------------------------------------------------------
+
 OTable::~OTable()
 {
     delete m_pKeys;
     delete m_pColumns;
     delete m_pIndexes;
 }
-// -------------------------------------------------------------------------
+
 void OTable::construct()
 {
     ODescriptor::construct();
@@ -111,18 +111,18 @@ void OTable::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DESCRIPTION),     PROPERTY_ID_DESCRIPTION,nAttrib,&m_Description, ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),            PROPERTY_ID_TYPE,       nAttrib,&m_Type,        ::getCppuType(static_cast< OUString*>(0)));
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OTable::acquire() throw()
 {
     OTableDescriptor_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OTable::release() throw()
 {
     OTableDescriptor_BASE::release();
 }
 
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODescriptor::queryInterface( rType);
@@ -137,14 +137,14 @@ Any SAL_CALL OTable::queryInterface( const Type & rType ) throw(RuntimeException
     }
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OTable::getTypes(  ) throw(RuntimeException)
 {
     if(isNew())
         return ::comphelper::concatSequences(ODescriptor::getTypes(),OTableDescriptor_BASE::getTypes());
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OTableDescriptor_BASE::getTypes(),OTable_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OTable::disposing(void)
 {
     ODescriptor::disposing();
@@ -160,7 +160,7 @@ void SAL_CALL OTable::disposing(void)
 
     m_pTables = NULL;
 }
-// -----------------------------------------------------------------------------
+
 // XColumnsSupplier
 Reference< XNameAccess > SAL_CALL OTable::getColumns(  ) throw(RuntimeException)
 {
@@ -185,7 +185,7 @@ Reference< XNameAccess > SAL_CALL OTable::getColumns(  ) throw(RuntimeException)
     return m_pColumns;
 }
 
-// -------------------------------------------------------------------------
+
 // XKeysSupplier
 Reference< XIndexAccess > SAL_CALL OTable::getKeys(  ) throw(RuntimeException)
 {
@@ -212,17 +212,17 @@ Reference< XIndexAccess > SAL_CALL OTable::getKeys(  ) throw(RuntimeException)
 
     return xKeys;
 }
-// -----------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper* OTable::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper & OTable::getInfoHelper()
 {
     return *const_cast<OTable*>(this)->getArrayHelper(isNew() ? 1 : 0);
 }
-// -------------------------------------------------------------------------
+
 Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -232,7 +232,7 @@ Reference< XPropertySet > SAL_CALL OTable::createDataDescriptor(  ) throw(Runtim
     pTable->setNew(sal_True);
     return pTable;
 }
-// -------------------------------------------------------------------------
+
 // XIndexesSupplier
 Reference< XNameAccess > SAL_CALL OTable::getIndexes(  ) throw(RuntimeException)
 {
@@ -256,7 +256,7 @@ Reference< XNameAccess > SAL_CALL OTable::getIndexes(  ) throw(RuntimeException)
 
     return m_pIndexes;
 }
-// -------------------------------------------------------------------------
+
 // XRename
 void SAL_CALL OTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
@@ -272,28 +272,28 @@ void SAL_CALL OTable::rename( const OUString& newName ) throw(SQLException, Elem
 
     m_pTables->renameObject(sOldComposedName,newName);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData> OTable::getMetaData() const
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 // XAlterTable
 void SAL_CALL OTable::alterColumnByName( const OUString& /*colName*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XAlterTable::alterColumnByName", *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OTable::alterColumnByIndex( sal_Int32 /*index*/, const Reference< XPropertySet >& /*descriptor*/ ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XAlterTable::alterColumnByIndex", *this );
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OTable::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeException)
 {
     // this is only correct for tables who haven't a schema or catalog name
@@ -301,22 +301,22 @@ OUString SAL_CALL OTable::getName() throw(::com::sun::star::uno::RuntimeExceptio
     OSL_ENSURE(m_SchemaName.isEmpty(),"getName(): forgot to overload getName()!");
     return m_Name;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OTable::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 void OTable::refreshColumns()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OTable::refreshKeys()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OTable::refreshIndexes()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index f7f8176e34cc..c4b5e05ee84d 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -28,7 +28,7 @@
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace connectivity::sdbcx;
 using namespace ::com::sun::star::sdbc;
@@ -38,25 +38,25 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 IMPLEMENT_SERVICE_INFO(OUser,"com.sun.star.sdbcx.VUser","com.sun.star.sdbcx.User");
-// -------------------------------------------------------------------------
+
 OUser::OUser(sal_Bool _bCase)  : OUser_BASE(m_aMutex)
                 , ODescriptor(OUser_BASE::rBHelper,_bCase,sal_True)
                 , m_pGroups(NULL)
 {
 }
-// -------------------------------------------------------------------------
+
 OUser::OUser(const OUString& _Name,sal_Bool _bCase) :    OUser_BASE(m_aMutex)
                         ,ODescriptor(OUser_BASE::rBHelper,_bCase)
                         ,m_pGroups(NULL)
 {
     m_Name = _Name;
 }
-// -------------------------------------------------------------------------
+
 OUser::~OUser( )
 {
     delete m_pGroups;
 }
-// -------------------------------------------------------------------------
+
 void OUser::disposing(void)
 {
     OPropertySetHelper::disposing();
@@ -64,18 +64,18 @@ void OUser::disposing(void)
     if(m_pGroups)
         m_pGroups->disposing();
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OUser::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = ODescriptor::queryInterface( rType);
     return aRet.hasValue() ? aRet : OUser_BASE::queryInterface( rType);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OUser::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OUser_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OUser::createArrayHelper( ) const
 {
         Sequence< Property > aProps;
@@ -83,12 +83,12 @@ Sequence< Type > SAL_CALL OUser::getTypes(  ) throw(RuntimeException)
     return new ::cppu::OPropertyArrayHelper(aProps);
 
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OUser::getInfoHelper()
 {
     return *const_cast<OUser*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 // XUser
 void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUString& /*newPassword*/ ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
@@ -96,7 +96,7 @@ void SAL_CALL OUser::changePassword( const OUString& /*objPassword*/, const OUSt
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedException( "XUser::changePassword", *this );
 }
-// -------------------------------------------------------------------------
+
 // XGroupsSupplier
 Reference< XNameAccess > SAL_CALL OUser::getGroups(  ) throw(RuntimeException)
 {
@@ -120,7 +120,7 @@ Reference< XNameAccess > SAL_CALL OUser::getGroups(  ) throw(RuntimeException)
 
     return const_cast<OUser*>(this)->m_pGroups;
 }
-// -------------------------------------------------------------------------
+
 
 SAL_WNOUNREACHABLE_CODE_PUSH
 
@@ -131,7 +131,7 @@ sal_Int32 SAL_CALL OUser::getPrivileges( const OUString& /*objName*/, sal_Int32
     ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::changePassword", *this );
     return 0;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -142,48 +142,48 @@ sal_Int32 SAL_CALL OUser::getGrantablePrivileges( const OUString& /*objName*/, s
 
 SAL_WNOUNREACHABLE_CODE_POP
 
-// -------------------------------------------------------------------------
+
 void SAL_CALL OUser::grantPrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::grantPrivileges", *this );
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OUser::revokePrivileges( const OUString& /*objName*/, sal_Int32 /*objType*/, sal_Int32 /*objPrivileges*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE::rBHelper.bDisposed);
     ::dbtools::throwFeatureNotImplementedException( "XAuthorizable::revokePrivileges", *this );
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OUser::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OUser::getName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return m_Name;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OUser::setName( const OUString& /*aName*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "OUser::setName: not implemented!" );
         // not allowed to throw an SQLException here ...
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
 void SAL_CALL OUser::acquire() throw()
 {
     OUser_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OUser::release() throw()
 {
     OUser_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 28aeb4aa03be..d4a5c18cd2b9 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -23,7 +23,7 @@
 #include "connectivity/dbtools.hxx"
 #include "TConnection.hxx"
 
-// -------------------------------------------------------------------------
+
 using namespace connectivity;
 using namespace connectivity::sdbcx;
 using namespace ::com::sun::star::beans;
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 IMPLEMENT_SERVICE_INFO(OView,"com.sun.star.sdbcx.VView","com.sun.star.sdbcx.View");
-// -------------------------------------------------------------------------
+
 OView::OView(sal_Bool _bCase,
             const OUString& _Name,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
@@ -51,18 +51,18 @@ OView::OView(sal_Bool _bCase,
     m_Name = _Name;
     construct();
 }
-// -------------------------------------------------------------------------
+
 OView::OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData)
     : ODescriptor(::comphelper::OMutexAndBroadcastHelper::m_aBHelper,_bCase,sal_True)
     ,m_xMetaData(_xMetaData)
 {
     construct();
 }
-// -------------------------------------------------------------------------
+
 OView::~OView()
 {
 }
-// -------------------------------------------------------------------------
+
 void OView::construct()
 {
     ODescriptor::construct();
@@ -74,35 +74,35 @@ void OView::construct()
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND),         PROPERTY_ID_COMMAND,    nAttrib,&m_Command,     ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CHECKOPTION),     PROPERTY_ID_CHECKOPTION,nAttrib,&m_CheckOption, ::getCppuType(static_cast< sal_Int32*>(0)));
 }
-// -------------------------------------------------------------------------
+
 void OView::disposing(void)
 {
     OPropertySetHelper::disposing();
 
     ::osl::MutexGuard aGuard(m_aMutex);
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OView::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(ODescriptor::getTypes(),OView_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OView::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OView_BASE::queryInterface( rType);
     return aRet.hasValue() ? aRet : ODescriptor::queryInterface( rType);
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OView::createArrayHelper( sal_Int32 /*_nId*/ ) const
 {
     return doCreateArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OView::getInfoHelper()
 {
     return *const_cast<OView*>(this)->getArrayHelper(isNew() ? 1 : 0);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException)
 {
     OUString sComposedName;
@@ -116,26 +116,26 @@ OUString SAL_CALL OView::getName() throw(::com::sun::star::uno::RuntimeException
     }
     return sComposedName;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OView::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OView::setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OView::acquire() throw()
 {
     OView_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OView::release() throw()
 {
     OView_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/simpledbt/charset_s.cxx b/connectivity/source/simpledbt/charset_s.cxx
index 64afb1c4870a..58365a98db8a 100644
--- a/connectivity/source/simpledbt/charset_s.cxx
+++ b/connectivity/source/simpledbt/charset_s.cxx
@@ -29,19 +29,19 @@ namespace connectivity
     //====================================================================
     //= ODataAccessCharSet
     //====================================================================
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ODataAccessCharSet::acquire()
     {
         return ORefBase::acquire();
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ODataAccessCharSet::release()
     {
         return ORefBase::release();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 ODataAccessCharSet::getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& _rEncs ) const
     {
         _rEncs.clear();
diff --git a/connectivity/source/simpledbt/dbtfactory.cxx b/connectivity/source/simpledbt/dbtfactory.cxx
index acaa5a934754..12dcb8bfdfdf 100644
--- a/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/connectivity/source/simpledbt/dbtfactory.cxx
@@ -45,7 +45,7 @@ namespace connectivity
     //================================================================
     //= ODataAccessToolsFactory
     //================================================================
-    //----------------------------------------------------------------
+
     ODataAccessToolsFactory::ODataAccessToolsFactory()
     {
         ODataAccessStaticTools* pStaticTools = new ODataAccessStaticTools;
@@ -53,37 +53,37 @@ namespace connectivity
         m_xToolsHelper = pStaticTools;
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ODataAccessToolsFactory::acquire()
     {
         return ORefBase::acquire();
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ODataAccessToolsFactory::release()
     {
         return ORefBase::release();
     }
 
-    //----------------------------------------------------------------
+
     ::rtl::Reference< simple::IDataAccessTypeConversion > ODataAccessToolsFactory::getTypeConversionHelper()
     {
         return m_xTypeConversionHelper;
     }
 
-    //----------------------------------------------------------------
+
     ::rtl::Reference< simple::IDataAccessCharSet > ODataAccessToolsFactory::createCharsetHelper( ) const
     {
         return new ODataAccessCharSet;
     }
 
-    //----------------------------------------------------------------
+
     ::rtl::Reference< simple::IDataAccessTools > ODataAccessToolsFactory::getDataAccessTools()
     {
         return m_xToolsHelper;
     }
 
-    //----------------------------------------------------------------
+
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::dbtools::FormattedColumnValue > ODataAccessToolsFactory::createFormattedColumnValue(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext,
@@ -94,7 +94,7 @@ namespace connectivity
     }
     SAL_WNODEPRECATED_DECLARATIONS_POP
 
-    //----------------------------------------------------------------
+
     ::rtl::Reference< simple::ISQLParser > ODataAccessToolsFactory::createSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext) const
     {
         return new OSimpleSQLParser(rxContext, _pContext);
diff --git a/connectivity/source/simpledbt/parsenode_s.cxx b/connectivity/source/simpledbt/parsenode_s.cxx
index 92cd3a23c212..8539f0524f59 100644
--- a/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/connectivity/source/simpledbt/parsenode_s.cxx
@@ -35,7 +35,7 @@ namespace connectivity
     //================================================================
     //= OSimpleParseNode
     //================================================================
-    //----------------------------------------------------------------
+
     OSimpleParseNode::OSimpleParseNode(const OSQLParseNode* _pNode, sal_Bool _bTakeOwnership)
         :m_pFullNode(_pNode)
         ,m_bOwner(_bTakeOwnership)
@@ -43,32 +43,32 @@ namespace connectivity
         OSL_ENSURE(m_pFullNode, "OSimpleParseNode::OSimpleParseNode: invalid node given!");
     }
 
-    //----------------------------------------------------------------
+
     OSimpleParseNode::~OSimpleParseNode()
     {
         if (m_bOwner)
             delete m_pFullNode;
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL OSimpleParseNode::acquire()
     {
         return ORefBase::acquire();
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL OSimpleParseNode::release()
     {
         return ORefBase::release();
     }
 
-    //----------------------------------------------------------------
+
     void OSimpleParseNode::parseNodeToStr(OUString& _rString, const Reference< XConnection >& _rxConnection,const IParseContext* _pContext) const
     {
         m_pFullNode->parseNodeToStr( _rString, _rxConnection, _pContext );
     }
 
-    //----------------------------------------------------------------
+
     void OSimpleParseNode::parseNodeToPredicateStr(OUString& _rString, const Reference< XConnection >& _rxConnection,
         const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField,
         const OUString &_sPredicateTableAlias,
diff --git a/connectivity/source/simpledbt/parser_s.cxx b/connectivity/source/simpledbt/parser_s.cxx
index b8168c7c4841..fcd25251fbb3 100644
--- a/connectivity/source/simpledbt/parser_s.cxx
+++ b/connectivity/source/simpledbt/parser_s.cxx
@@ -34,31 +34,31 @@ namespace connectivity
     //================================================================
     //= OSimpleSQLParser
     //================================================================
-    //----------------------------------------------------------------
+
     OSimpleSQLParser::OSimpleSQLParser(const Reference< XComponentContext >& rxContext, const IParseContext* _pContext)
         :m_aFullParser(rxContext, _pContext)
     {
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL OSimpleSQLParser::acquire()
     {
         return ORefBase::acquire();
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL OSimpleSQLParser::release()
     {
         return ORefBase::release();
     }
 
-    //----------------------------------------------------------------
+
     const IParseContext& OSimpleSQLParser::getContext() const
     {
         return m_aFullParser.getContext();
     }
 
-    //----------------------------------------------------------------
+
     ::rtl::Reference< simple::ISQLParseNode > OSimpleSQLParser::predicateTree(OUString& rErrorMessage, const OUString& rStatement,
         const Reference< XNumberFormatter >& _rxFormatter, const Reference< XPropertySet >& _rxField) const
     {
diff --git a/connectivity/source/simpledbt/refbase.cxx b/connectivity/source/simpledbt/refbase.cxx
index 7c9fe5e6b550..5ece9c208508 100644
--- a/connectivity/source/simpledbt/refbase.cxx
+++ b/connectivity/source/simpledbt/refbase.cxx
@@ -27,18 +27,18 @@ namespace connectivity
     //================================================================
     //= ORefBase
     //================================================================
-    //----------------------------------------------------------------
+
     ORefBase::~ORefBase()
     {
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ORefBase::acquire()
     {
         return osl_atomic_increment(&m_refCount);
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ORefBase::release()
     {
         oslInterlockedCount nNewRefCount = osl_atomic_decrement(&m_refCount);
diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx
index 9a7485ce9a6f..2a06624f6033 100644
--- a/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -39,64 +39,64 @@ namespace connectivity
     //================================================================
     //= ODataAccessStaticTools
     //================================================================
-    //----------------------------------------------------------------
+
     ODataAccessStaticTools::ODataAccessStaticTools()
     {
     }
 
-    //----------------------------------------------------------------
+
     Date ODataAccessStaticTools::getStandardDate() const
     {
         return ::dbtools::DBTypeConversion::getStandardDate();
     }
 
-    //----------------------------------------------------------------
+
     double ODataAccessStaticTools::getValue(const Reference< XColumn>& _rxVariant, const Date& rNullDate ) const
     {
         return ::dbtools::DBTypeConversion::getValue( _rxVariant, rNullDate );
     }
 
-    //----------------------------------------------------------------
+
     OUString ODataAccessStaticTools::getFormattedValue(const Reference< XColumn >& _rxColumn, const Reference< XNumberFormatter >& _rxFormatter,
         const Date& _rNullDate, sal_Int32 _nKey, sal_Int16 _nKeyType) const
     {
         return ::dbtools::DBTypeConversion::getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType);
     }
 
-    //----------------------------------------------------------------
+
     OUString ODataAccessStaticTools::getFormattedValue( const Reference< XPropertySet>& _rxColumn, const Reference< XNumberFormatter>& _rxFormatter,
         const Locale& _rLocale, const Date& _rNullDate ) const
     {
         return ::dbtools::DBTypeConversion::getFormattedValue( _rxColumn, _rxFormatter, _rLocale, _rNullDate );
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ODataAccessStaticTools::acquire()
     {
         return ORefBase::acquire();
     }
 
-    //----------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ODataAccessStaticTools::release()
     {
         return ORefBase::release();
     }
 
-    //----------------------------------------------------------------
+
     Reference< XConnection> ODataAccessStaticTools::getConnection_withFeedback(const OUString& _rDataSourceName, const OUString& _rUser,
         const OUString& _rPwd, const Reference< XComponentContext>& _rxContext) const SAL_THROW ( (SQLException) )
     {
         return ::dbtools::getConnection_withFeedback(_rDataSourceName, _rUser, _rPwd, _rxContext);
     }
 
-    //----------------------------------------------------------------
+
     Reference< XConnection> ODataAccessStaticTools::connectRowset(const Reference< XRowSet>& _rxRowSet, const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection) const
         SAL_THROW ( (SQLException, WrappedTargetException, RuntimeException) )
     {
         return ::dbtools::connectRowset( _rxRowSet, _rxContext, _bSetAsActiveConnection);
     }
 
-    // ------------------------------------------------
+
     Reference< XConnection> ODataAccessStaticTools::getRowSetConnection(
                 const Reference< XRowSet>& _rxRowSet)
                 const SAL_THROW ( (RuntimeException) )
@@ -104,75 +104,75 @@ namespace connectivity
         return ::dbtools::getConnection(_rxRowSet);
     }
 
-    //----------------------------------------------------------------
+
     Reference< XNumberFormatsSupplier> ODataAccessStaticTools::getNumberFormats(const Reference< XConnection>& _rxConn, sal_Bool _bAllowDefault) const
     {
         return ::dbtools::getNumberFormats(_rxConn, _bAllowDefault);
     }
 
-    //----------------------------------------------------------------
+
     sal_Int32 ODataAccessStaticTools::getDefaultNumberFormat( const Reference< XPropertySet >& _rxColumn, const Reference< XNumberFormatTypes >& _rxTypes,
         const Locale& _rLocale ) const
     {
         return ::dbtools::getDefaultNumberFormat( _rxColumn, _rxTypes, _rLocale );
     }
 
-    //----------------------------------------------------------------
+
     void ODataAccessStaticTools::TransferFormComponentProperties(const Reference< XPropertySet>& _rxOld, const Reference< XPropertySet>& _rxNew, const Locale& _rLocale) const
     {
         ::dbtools::TransferFormComponentProperties(_rxOld, _rxNew, _rLocale);
     }
 
-    //----------------------------------------------------------------
+
     OUString ODataAccessStaticTools::quoteName(const OUString& _rQuote, const OUString& _rName) const
     {
         return ::dbtools::quoteName(_rQuote, _rName);
     }
 
-    //----------------------------------------------------------------
+
     OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName ) const
     {
         return ::dbtools::composeTableNameForSelect( _rxConnection, _rCatalog, _rSchema, _rName );
     }
 
-    //----------------------------------------------------------------
+
     OUString ODataAccessStaticTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const
     {
         return ::dbtools::composeTableNameForSelect( _rxConnection, _xTable );
     }
 
-    //----------------------------------------------------------------
+
     SQLContext ODataAccessStaticTools::prependContextInfo(SQLException& _rException, const Reference< XInterface >& _rxContext,
         const OUString& _rContextDescription, const OUString& _rContextDetails) const
     {
         return ::dbtools::prependContextInfo(_rException, _rxContext, _rContextDescription, _rContextDetails);
     }
 
-    //----------------------------------------------------------------
+
     Reference< XDataSource > ODataAccessStaticTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const
     {
         return ::dbtools::getDataSource( _rsRegisteredName, _rxContext );
     }
 
-    //----------------------------------------------------------------
+
     sal_Bool ODataAccessStaticTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const
     {
         return ::dbtools::canInsert( _rxCursorSet );
     }
 
-    //----------------------------------------------------------------
+
     sal_Bool ODataAccessStaticTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const
     {
         return ::dbtools::canUpdate( _rxCursorSet );
     }
 
-    //----------------------------------------------------------------
+
     sal_Bool ODataAccessStaticTools::canDelete(const Reference< XPropertySet>& _rxCursorSet) const
     {
         return ::dbtools::canDelete( _rxCursorSet );
     }
 
-    //----------------------------------------------------------------
+
     Reference< XNameAccess > ODataAccessStaticTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
         const sal_Int32 _nCommandType, const OUString& _rCommand,
             Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
@@ -181,7 +181,7 @@ namespace connectivity
             _rxKeepFieldsAlive, _pErrorInfo );
     }
 
-    //----------------------------------------------------------------
+
     Sequence< OUString > ODataAccessStaticTools::getFieldNamesByCommandDescriptor(
         const Reference< XConnection >& _rxConnection, const sal_Int32 _nCommandType,
         const OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
@@ -190,7 +190,7 @@ namespace connectivity
             _rCommand, _pErrorInfo );
     }
 
-    // ------------------------------------------------
+
     bool ODataAccessStaticTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection )
     {
         return ::dbtools::isEmbeddedInDatabase( _rxComponent, _rxActualConnection );
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 9f3635e02bae..663c47592048 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -243,7 +243,7 @@ namespace cppcanvas
     namespace internal
     {
         // state stack manipulators
-        // ------------------------
+
         void VectorOfOutDevStates::clearStateStack()
         {
             m_aStates.clear();
@@ -527,7 +527,7 @@ namespace cppcanvas
 
 
                     // setup start/end color values
-                    // ----------------------------
+
 
                     // scale color coefficients with gradient intensities
                     const sal_uInt16 nStartIntensity( rGradient.GetStartIntensity() );
@@ -1143,7 +1143,7 @@ namespace cppcanvas
                 // sweep line implementation is done.
 
                 // general case: convert to polygon and clip
-                // -----------------------------------------
+
 
                 // convert rect to polygon beforehand, must revert
                 // to general polygon clipping here.
@@ -1239,13 +1239,13 @@ namespace cppcanvas
 
                 switch( pCurrAct->GetType() )
                 {
-                    // ------------------------------------------------------------
+
 
                     // In the first part of this monster-switch, we
                     // handle all state-changing meta actions. These
                     // are all handled locally.
 
-                    // ------------------------------------------------------------
+
 
                     case META_PUSH_ACTION:
                     {
@@ -1534,14 +1534,14 @@ namespace cppcanvas
                     }
                     break;
 
-                    // ------------------------------------------------------------
+
 
                     // In the second part of this monster-switch, we
                     // handle all recursing meta actions. These are the
                     // ones generating a metafile by themselves, which is
                     // then processed by recursively calling this method.
 
-                    // ------------------------------------------------------------
+
 
                     case META_GRADIENT_ACTION:
                     {
@@ -1798,14 +1798,14 @@ namespace cppcanvas
                     }
                     break;
 
-                    // ------------------------------------------------------------
+
 
                     // In the third part of this monster-switch, we
                     // handle all 'acting' meta actions. These are all
                     // processed by constructing function objects for
                     // them, which will later ease caching.
 
-                    // ------------------------------------------------------------
+
 
                     case META_POINT_ACTION:
                     {
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index af08d65435b1..c86757847652 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -229,7 +229,7 @@ namespace cppcanvas
             }
 
 
-            // -------------------------------------------------------------------------------
+
 
             class TexturedPolyPolyAction : public CachedPrimitiveBase
             {
@@ -343,7 +343,7 @@ namespace cppcanvas
                 return 1;
             }
 
-            // -------------------------------------------------------------------------------
+
 
             class StrokedPolyPolyAction : public CachedPrimitiveBase
             {
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 4cd4ab6dd30e..4e446648db6c 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -325,7 +325,7 @@ namespace cppcanvas
 
 
                 // adapt render state, to move text output to given offset
-                // -------------------------------------------------------
+
 
                 // TODO(F1): Strictly speaking, we also have to adapt
                 // the clip here, which normally should _not_ move
@@ -352,7 +352,7 @@ namespace cppcanvas
 
 
                 // reduce DX array to given substring
-                // ----------------------------------
+
 
                 const sal_Int32         nNewElements( rSubset.mnSubsetEnd - rSubset.mnSubsetBegin );
                 uno::Sequence< double > aAdaptedOffsets( nNewElements );
@@ -380,7 +380,7 @@ namespace cppcanvas
                                     const uno::Reference< rendering::XTextLayout >& rOrigTextLayout )
             {
                 // create temporary new text layout with subset string
-                // ---------------------------------------------------
+
 
                 const sal_Int32 nNewStartPos( rOrigContext.StartPosition + ::std::min(
                                                   rSubset.mnSubsetBegin, rOrigContext.Length-1 ) );
@@ -611,7 +611,7 @@ namespace cppcanvas
             }
 
 
-            // -------------------------------------------------------------------------
+
 
             class TextAction : public Action, private ::boost::noncopyable
             {
@@ -764,7 +764,7 @@ namespace cppcanvas
             }
 
 
-            // -------------------------------------------------------------------------
+
 
             class EffectTextAction :
                 public Action,
@@ -1005,7 +1005,7 @@ namespace cppcanvas
             }
 
 
-            // -------------------------------------------------------------------------
+
 
             class TextArrayAction : public Action, private ::boost::noncopyable
             {
@@ -1183,7 +1183,7 @@ namespace cppcanvas
             }
 
 
-            // -------------------------------------------------------------------------
+
 
             class EffectTextArrayAction :
                 public Action,
@@ -1521,7 +1521,7 @@ namespace cppcanvas
             }
 
 
-            // -------------------------------------------------------------------------
+
 
             class OutlineAction :
                 public Action,
@@ -2079,7 +2079,7 @@ namespace cppcanvas
         } // namespace
 
 
-        // ---------------------------------------------------------------------------------
+
 
         ActionSharedPtr TextActionFactory::createTextAction( const ::Point&                 rStartPoint,
                                                              const ::Size&                  rReliefOffset,
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index 0b8f5ab70b04..bb64202fd170 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -108,13 +108,13 @@ public:
     inline ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(());
     inline ~ThreadKey() SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 inline ThreadKey::ThreadKey( oslThreadKeyCallbackFunction pCallback ) SAL_THROW(())
     : _bInit( false )
     , _pCallback( pCallback )
 {
 }
-//__________________________________________________________________________________________________
+
 inline ThreadKey::~ThreadKey() SAL_THROW(())
 {
     if (_bInit)
@@ -122,7 +122,7 @@ inline ThreadKey::~ThreadKey() SAL_THROW(())
         ::osl_destroyThreadKey( _hThreadKey );
     }
 }
-//__________________________________________________________________________________________________
+
 inline oslThreadKey ThreadKey::getThreadKey() SAL_THROW(())
 {
     if (! _bInit)
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index e8a64c685390..3cab23d50aa2 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -35,7 +35,7 @@ using namespace osl;
 
 namespace cppu_threadpool {
 
-// ----------------------------------------------------------------------------------
+
     ThreadAdmin::ThreadAdmin(): m_disposed(false) {}
 
     ThreadAdmin::~ThreadAdmin()
@@ -99,7 +99,7 @@ namespace cppu_threadpool {
         }
     }
 
-// ----------------------------------------------------------------------------------
+
     ORequestThread::ORequestThread( ThreadPoolHolder const &aThreadPool,
                                     JobQueue *pQueue,
                                     const ByteSequence &aThreadId,
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 493ab25f6abd..787977ff7421 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -98,7 +98,7 @@ namespace cppu_threadpool
     }
 
 
-    //-------------------------------------------------------------------------------
+
 
     ThreadPool::ThreadPool()
     {
diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx
index c53d21a90cf6..8f46cec3ff66 100644
--- a/cppu/source/typelib/static_types.cxx
+++ b/cppu/source/typelib/static_types.cxx
@@ -40,19 +40,19 @@ using ::rtl::OUStringBuffer;
 extern "C"
 {
 
-//------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
     const typelib_TypeDescription * pTypeDescription,
     sal_Int32 nOffset,
     sal_Int32 & rMaxIntegralTypeSize )
     SAL_THROW_EXTERN_C();
-//------------------------------------------------------------------------
+
 void SAL_CALL typelib_typedescription_newEmpty(
     typelib_TypeDescription ** ppRet,
     typelib_TypeClass eTypeClass,
     rtl_uString * pTypeName )
     SAL_THROW_EXTERN_C();
-//-----------------------------------------------------------------------------
+
 void SAL_CALL typelib_typedescriptionreference_getByName(
     typelib_TypeDescriptionReference ** ppRet,
     rtl_uString * pName )
@@ -107,7 +107,7 @@ static inline sal_Int32 newAlignedSize(
     return (OldSize + NeededAlignment -1) / NeededAlignment * NeededAlignment + ElementSize;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 
 namespace
 {
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 25123c59b65a..24ef0bf8e904 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -151,19 +151,19 @@ static inline sal_Int32 getDescriptionSize( typelib_TypeClass eTypeClass )
 }
 
 
-//-----------------------------------------------------------------------------
+
 extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
     typelib_TypeDescriptionReference ** ppRet, rtl_uString * pName )
     SAL_THROW_EXTERN_C();
 
-//-----------------------------------------------------------------------------
+
 struct equalStr_Impl
 {
     bool operator()(const sal_Unicode * const & s1, const sal_Unicode * const & s2) const SAL_THROW(())
         { return 0 == rtl_ustr_compare( s1, s2 ); }
 };
 
-//-----------------------------------------------------------------------------
+
 struct hashStr_Impl
 {
     size_t operator()(const sal_Unicode * const & s) const SAL_THROW(())
@@ -171,7 +171,7 @@ struct hashStr_Impl
 };
 
 
-//-----------------------------------------------------------------------------
+
 // Heavy hack, the const sal_Unicode * is hold by the typedescription reference
 typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
                   hashStr_Impl, equalStr_Impl > WeakMap_Impl;
@@ -225,7 +225,7 @@ struct TypeDescriptor_Init_Impl
 
     ~TypeDescriptor_Init_Impl() SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW(())
 {
     if( !pMutex )
@@ -236,7 +236,7 @@ inline Mutex & TypeDescriptor_Init_Impl::getMutex() SAL_THROW(())
     }
     return * pMutex;
 }
-//__________________________________________________________________________________________________
+
 inline void TypeDescriptor_Init_Impl::callChain(
     typelib_TypeDescription ** ppRet, rtl_uString * pName )
     SAL_THROW(())
@@ -257,7 +257,7 @@ inline void TypeDescriptor_Init_Impl::callChain(
     }
 }
 
-//__________________________________________________________________________________________________
+
 TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() SAL_THROW(())
 {
     if( pCache )
@@ -359,7 +359,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_registerCallback
     rInit.pCallbacks->push_back( CallbackEntry( pContext, pCallback ) );
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_revokeCallback(
     void * pContext, typelib_typedescription_Callback pCallback )
     SAL_THROW_EXTERN_C()
@@ -391,7 +391,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
     sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
     SAL_THROW_EXTERN_C();
 
-//------------------------------------------------------------------------
+
 static inline void typelib_typedescription_initTables(
     typelib_TypeDescription * pTD )
     SAL_THROW(())
@@ -563,7 +563,7 @@ bool complete(typelib_TypeDescription ** ppTypeDescr, bool initTables) {
 
 }
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL typelib_typedescription_newEmpty(
     typelib_TypeDescription ** ppRet,
     typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
@@ -723,7 +723,7 @@ extern "C" void SAL_CALL typelib_typedescription_newEmpty(
     *ppRet = pRet;
 }
 
-//------------------------------------------------------------------------
+
 namespace {
 
 void newTypeDescription(
@@ -874,7 +874,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newStruct(
         pMembers);
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum(
     typelib_TypeDescription ** ppRet,
     rtl_uString * pTypeName,
@@ -903,7 +903,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newEnum(
     (*ppRet)->nAlignment = adjustAlignment( (*ppRet)->nAlignment );
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
     typelib_InterfaceTypeDescription ** ppRet,
     rtl_uString * pTypeName,
@@ -920,7 +920,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterface(
         &pBaseInterface, nMembers, ppMembers);
 }
 
-//------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1101,7 +1101,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newMIInterface(
     *ppRet = pITD;
 }
 
-//------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1203,7 +1203,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceMeth
 }
 
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttribute(
     typelib_InterfaceAttributeTypeDescription ** ppRet,
     sal_Int32 nAbsolutePosition,
@@ -1218,7 +1218,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newInterfaceAttr
         pAttributeTypeName, bReadOnly, 0, 0, 0, 0);
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInterfaceAttribute(
     typelib_InterfaceAttributeTypeDescription ** ppRet,
     sal_Int32 nAbsolutePosition,
@@ -1281,7 +1281,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_newExtendedInter
         pTmp->pWeakRef = (typelib_TypeDescriptionReference *)pTmp;
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire(
     typelib_TypeDescription * pTypeDescription )
     SAL_THROW_EXTERN_C()
@@ -1289,7 +1289,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_acquire(
     osl_atomic_increment( &pTypeDescription->nRefCount );
 }
 
-//------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1411,7 +1411,7 @@ static inline void typelib_typedescription_destructExtendedMembers(
     }
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release(
     typelib_TypeDescription * pTD )
     SAL_THROW_EXTERN_C()
@@ -1482,7 +1482,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_release(
     }
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
     typelib_TypeDescription ** ppNewDescription )
     SAL_THROW_EXTERN_C()
@@ -1616,7 +1616,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescription_register(
     OSL_ASSERT( pTDR->eTypeClass == (*ppNewDescription)->eTypeClass );
 }
 
-//------------------------------------------------------------------------
+
 static inline bool type_equals(
     typelib_TypeDescriptionReference * p1, typelib_TypeDescriptionReference * p2 )
     SAL_THROW(())
@@ -1634,7 +1634,7 @@ extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescription_equals(
         (typelib_TypeDescriptionReference *)p1, (typelib_TypeDescriptionReference *)p2 );
 }
 
-//------------------------------------------------------------------------
+
 extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
     const typelib_TypeDescription * pTypeDescription,
     sal_Int32 nOffset, sal_Int32 & rMaxIntegralTypeSize )
@@ -1771,7 +1771,7 @@ extern "C" sal_Int32 SAL_CALL typelib_typedescription_getAlignedUnoSize(
     return newAlignedSize( nOffset, nSize, rMaxIntegralTypeSize );
 }
 
-//------------------------------------------------------------------------
+
 
 namespace {
 
@@ -2079,7 +2079,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_newByAs
     OUString aTypeName( OUString::createFromAscii( pTypeName ) );
     typelib_typedescriptionreference_new( ppTDR, eTypeClass, aTypeName.pData );
 }
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new(
     typelib_TypeDescriptionReference ** ppTDR,
     typelib_TypeClass eTypeClass, rtl_uString * pTypeName )
@@ -2176,7 +2176,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_new(
     rInit.pWeakMap->operator[]( (*ppTDR)->pTypeName->buffer ) = *ppTDR;
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire(
     typelib_TypeDescriptionReference * pRef )
     SAL_THROW_EXTERN_C()
@@ -2184,7 +2184,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_acquire
     osl_atomic_increment( &pRef->nRefCount );
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release(
     typelib_TypeDescriptionReference * pRef )
     SAL_THROW_EXTERN_C()
@@ -2220,7 +2220,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_release
     }
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDescription(
     typelib_TypeDescription ** ppRet, typelib_TypeDescriptionReference * pRef )
     SAL_THROW_EXTERN_C()
@@ -2269,7 +2269,7 @@ extern "C" CPPU_DLLPUBLIC void SAL_CALL typelib_typedescriptionreference_getDesc
     pRef->pType = *ppRet;
 }
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
     typelib_TypeDescriptionReference ** ppRet, rtl_uString * pName )
     SAL_THROW_EXTERN_C()
@@ -2303,7 +2303,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_getByName(
     }
 }
 
-//------------------------------------------------------------------------
+
 extern "C" CPPU_DLLPUBLIC sal_Bool SAL_CALL typelib_typedescriptionreference_equals(
     const typelib_TypeDescriptionReference * p1,
     const typelib_TypeDescriptionReference * p2 )
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index da358d62a141..f7d8a76fc045 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -46,7 +46,7 @@ namespace cppu
 uno_Sequence g_emptySeq = { 1, 0, { 0 } };
 typelib_TypeDescriptionReference * g_pVoidType = 0;
 
-//--------------------------------------------------------------------------------------------------
+
 void * binuno_queryInterface( void * pUnoI, typelib_TypeDescriptionReference * pDestType )
 {
     // init queryInterface() td
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 5b45be29d411..9f7cc77325bd 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -51,7 +51,7 @@ using ::rtl::OUString;
 namespace
 {
 
-//------------------------------------------------------------------------------
+
 inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1,
                               typelib_InterfaceTypeDescription * pTD2 )
 {
@@ -66,7 +66,7 @@ inline static bool td_equals( typelib_InterfaceTypeDescription * pTD1,
 struct ObjectEntry;
 struct uno_DefaultEnvironment;
 
-//------------------------------------------------------------------------------
+
 struct InterfaceEntry
 {
     sal_Int32 refCount;
@@ -93,7 +93,7 @@ struct ObjectEntry
     inline sal_Int32 find( void * iface_ptr, ::std::size_t pos );
 };
 
-//------------------------------------------------------------------------------
+
 struct FctPtrHash :
     public ::std::unary_function< const void *, ::std::size_t >
 {
@@ -101,7 +101,7 @@ struct FctPtrHash :
         { return (::std::size_t) pKey; }
 };
 
-//------------------------------------------------------------------------------
+
 struct FctOUStringHash :
     public ::std::unary_function< const OUString &, ::std::size_t >
 {
@@ -163,7 +163,7 @@ struct uno_DefaultEnvironment : public uno_ExtEnvironment
     ~uno_DefaultEnvironment();
 };
 
-//______________________________________________________________________________
+
 inline ObjectEntry::ObjectEntry( OUString const & rOId_ )
     : oid( rOId_ ),
       nRef( 0 ),
@@ -172,7 +172,7 @@ inline ObjectEntry::ObjectEntry( OUString const & rOId_ )
     aInterfaces.reserve( 2 );
 }
 
-//______________________________________________________________________________
+
 inline void ObjectEntry::append(
     uno_DefaultEnvironment * pEnv,
     void * pInterface, typelib_InterfaceTypeDescription * pTypeDescr,
@@ -198,7 +198,7 @@ inline void ObjectEntry::append(
     aInterfaces.push_back( aNewEntry );
 }
 
-//______________________________________________________________________________
+
 inline InterfaceEntry * ObjectEntry::find(
     typelib_InterfaceTypeDescription * pTypeDescr_ )
 {
@@ -230,7 +230,7 @@ inline InterfaceEntry * ObjectEntry::find(
     return 0;
 }
 
-//______________________________________________________________________________
+
 inline sal_Int32 ObjectEntry::find(
     void * iface_ptr, ::std::size_t pos )
 {
@@ -246,7 +246,7 @@ inline sal_Int32 ObjectEntry::find(
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_registerInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -293,7 +293,7 @@ static void SAL_CALL defenv_registerInterface(
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_registerProxyInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface, uno_freeProxyFunc freeProxy,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -351,7 +351,7 @@ static void SAL_CALL defenv_registerProxyInterface(
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL s_stub_defenv_revokeInterface(va_list * pParam)
 {
     uno_ExtEnvironment * pEnv       = va_arg(*pParam, uno_ExtEnvironment *);
@@ -447,7 +447,7 @@ static void SAL_CALL defenv_revokeInterface(uno_ExtEnvironment * pEnv, void * pI
     uno_Environment_invoke(&pEnv->aBase, s_stub_defenv_revokeInterface, pEnv, pInterface);
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_getObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
@@ -477,7 +477,7 @@ static void SAL_CALL defenv_getObjectIdentifier(
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_getRegisteredInterface(
     uno_ExtEnvironment * pEnv, void ** ppInterface,
     rtl_uString * pOId, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -507,7 +507,7 @@ static void SAL_CALL defenv_getRegisteredInterface(
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_getRegisteredInterfaces(
     uno_ExtEnvironment * pEnv, void *** pppInterfaces, sal_Int32 * pnLen,
     uno_memAlloc memAlloc )
@@ -533,7 +533,7 @@ static void SAL_CALL defenv_getRegisteredInterfaces(
     *pnLen = nLen;
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
@@ -541,7 +541,7 @@ static void SAL_CALL defenv_acquire( uno_Environment * pEnv )
     osl_atomic_increment( &that->nRef );
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_release( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
@@ -562,14 +562,14 @@ static void SAL_CALL defenv_release( uno_Environment * pEnv )
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_acquireWeak( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
     osl_atomic_increment( &that->nWeakRef );
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
 {
     uno_DefaultEnvironment * that = (uno_DefaultEnvironment *)pEnv;
@@ -579,7 +579,7 @@ static void SAL_CALL defenv_releaseWeak( uno_Environment * pEnv )
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_harden(
     uno_Environment ** ppHardEnv, uno_Environment * pEnv )
 {
@@ -607,13 +607,13 @@ static void SAL_CALL defenv_harden(
     *ppHardEnv = pEnv;
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL defenv_dispose( SAL_UNUSED_PARAMETER uno_Environment * )
 {
 }
 }
 
-//______________________________________________________________________________
+
 uno_DefaultEnvironment::uno_DefaultEnvironment(
     const OUString & rEnvDcp_, void * pContext_ )
     : nRef( 0 ),
@@ -647,7 +647,7 @@ uno_DefaultEnvironment::uno_DefaultEnvironment(
 
 }
 
-//______________________________________________________________________________
+
 uno_DefaultEnvironment::~uno_DefaultEnvironment()
 {
     ::rtl_uString_release( ((uno_Environment *) this)->pTypeName );
@@ -851,7 +851,7 @@ namespace
     class theStaticOIdPart : public rtl::Static<makeOIdPart, theStaticOIdPart> {};
 }
 
-//------------------------------------------------------------------------------
+
 inline static const OUString & unoenv_getStaticOIdPart()
 {
     return theStaticOIdPart::get().getOIdPart();
@@ -860,7 +860,7 @@ inline static const OUString & unoenv_getStaticOIdPart()
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL unoenv_computeObjectIdentifier(
     uno_ExtEnvironment * pEnv, rtl_uString ** ppOId, void * pInterface )
 {
@@ -912,7 +912,7 @@ static void SAL_CALL unoenv_releaseInterface(
 }
 }
 
-//______________________________________________________________________________
+
 EnvironmentsData::~EnvironmentsData()
 {
     ::osl::MutexGuard guard( mutex );
@@ -937,7 +937,7 @@ EnvironmentsData::~EnvironmentsData()
     }
 }
 
-//______________________________________________________________________________
+
 inline void EnvironmentsData::getEnvironment(
     uno_Environment ** ppEnv, const OUString & rEnvDcp, void * pContext )
 {
@@ -961,7 +961,7 @@ inline void EnvironmentsData::getEnvironment(
     }
 }
 
-//______________________________________________________________________________
+
 inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
 {
     OSL_ENSURE( ppEnv, "### null ptr!" );
@@ -1001,7 +1001,7 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv )
     }
 }
 
-//______________________________________________________________________________
+
 inline void EnvironmentsData::getRegisteredEnvironments(
     uno_Environment *** pppEnvs, sal_Int32 * pnLen, uno_memAlloc memAlloc,
     const OUString & rEnvDcp )
@@ -1091,7 +1091,7 @@ static bool loadEnv(OUString const  & cLibStem,
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 static uno_Environment * initDefaultEnvironment(
     const OUString & rEnvDcp, void * pContext )
 {
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index aa8cde9dde7c..ef8a0eec7bea 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -71,27 +71,27 @@ public:
     inline bool SAL_CALL is() const SAL_THROW(())
         { return (_pMapping != 0); }
 };
-//__________________________________________________________________________________________________
+
 inline Mapping::Mapping( uno_Mapping * pMapping ) SAL_THROW(())
     : _pMapping( pMapping )
 {
     if (_pMapping)
         (*_pMapping->acquire)( _pMapping );
 }
-//__________________________________________________________________________________________________
+
 inline Mapping::Mapping( const Mapping & rMapping ) SAL_THROW(())
     : _pMapping( rMapping._pMapping )
 {
     if (_pMapping)
         (*_pMapping->acquire)( _pMapping );
 }
-//__________________________________________________________________________________________________
+
 inline Mapping::~Mapping() SAL_THROW(())
 {
     if (_pMapping)
         (*_pMapping->release)( _pMapping );
 }
-//__________________________________________________________________________________________________
+
 inline Mapping & Mapping::operator = ( uno_Mapping * pMapping ) SAL_THROW(())
 {
     if (pMapping)
@@ -120,13 +120,13 @@ struct MappingEntry
         , aMappingName( rMappingName_ )
         {}
 };
-//--------------------------------------------------------------------------------------------------
+
 struct FctOUStringHash : public std::unary_function< const OUString &, size_t >
 {
     size_t operator()( const OUString & rKey ) const SAL_THROW(())
         { return (size_t)rKey.hashCode(); }
 };
-//--------------------------------------------------------------------------------------------------
+
 struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
 {
     size_t operator()( uno_Mapping * pKey ) const SAL_THROW(())
@@ -154,7 +154,7 @@ struct MappingsData
     Mutex               aNegativeLibsMutex;
     t_OUStringSet       aNegativeLibs;
 };
-//--------------------------------------------------------------------------------------------------
+
 static MappingsData & getMappingsData() SAL_THROW(())
 {
     static MappingsData * s_p = 0;
@@ -195,13 +195,13 @@ struct uno_Mediate_Mapping : public uno_Mapping
 };
 extern "C"
 {
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL mediate_free( uno_Mapping * pMapping )
     SAL_THROW(())
 {
     delete static_cast< uno_Mediate_Mapping * >( pMapping );
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
     SAL_THROW(())
 {
@@ -215,7 +215,7 @@ static void SAL_CALL mediate_acquire( uno_Mapping * pMapping )
             static_cast< uno_Mediate_Mapping * >( pMapping )->aAddPurpose.pData );
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL mediate_release( uno_Mapping * pMapping )
     SAL_THROW(())
 {
@@ -225,7 +225,7 @@ static void SAL_CALL mediate_release( uno_Mapping * pMapping )
         uno_revokeMapping( pMapping );
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL mediate_mapInterface(
     uno_Mapping * pMapping,
     void ** ppOut, void * pInterface,
@@ -261,7 +261,7 @@ static void SAL_CALL mediate_mapInterface(
     }
 }
 }
-//__________________________________________________________________________________________________
+
 uno_Mediate_Mapping::uno_Mediate_Mapping(
     const Environment & rFrom_, const Environment & rTo_,
     const Mapping & rFrom2Uno_, const Mapping & rUno2To_,
@@ -487,7 +487,7 @@ static Mapping getDirectMapping(
     return Mapping();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static inline Mapping createMediateMapping(
     const Environment & rFrom, const Environment & rTo,
     const Mapping & rFrom2Uno, const Mapping & rUno2To,
diff --git a/cppu/source/uno/sequence.cxx b/cppu/source/uno/sequence.cxx
index 03198c175353..007e5a801d8f 100644
--- a/cppu/source/uno/sequence.cxx
+++ b/cppu/source/uno/sequence.cxx
@@ -40,7 +40,7 @@ using namespace cppu;
 namespace cppu
 {
 
-//------------------------------------------------------------------------------
+
 static inline uno_Sequence * reallocSeq(
     uno_Sequence * pReallocate, sal_Size nElementSize, sal_Int32 nElements )
 {
@@ -67,7 +67,7 @@ static inline uno_Sequence * reallocSeq(
     return pNew;
 }
 
-//------------------------------------------------------------------------------
+
 static inline bool idefaultConstructElements(
     uno_Sequence ** ppSeq,
     typelib_TypeDescriptionReference * pElementType,
@@ -309,7 +309,7 @@ static inline bool idefaultConstructElements(
     }
 }
 
-//------------------------------------------------------------------------------
+
 static inline bool icopyConstructFromElements(
     uno_Sequence ** ppSeq, void * pSourceElements,
     typelib_TypeDescriptionReference * pElementType,
@@ -587,7 +587,7 @@ static inline bool icopyConstructFromElements(
     }
 }
 
-//------------------------------------------------------------------------------
+
 static inline bool ireallocSequence(
     uno_Sequence ** ppSequence,
     typelib_TypeDescriptionReference * pElementType,
diff --git a/cppuhelper/source/access_control.cxx b/cppuhelper/source/access_control.cxx
index 1df5d2d21c30..fcac34619aae 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -41,7 +41,7 @@ namespace
 
 namespace cppu
 {
-//__________________________________________________________________________________________________
+
 AccessControl::AccessControl( Reference< XComponentContext > const & xContext )
     SAL_THROW( (RuntimeException) )
 {
@@ -51,7 +51,7 @@ AccessControl::AccessControl( Reference< XComponentContext > const & xContext )
             "no access controller!", Reference< XInterface >() );
     }
 }
-//__________________________________________________________________________________________________
+
 AccessControl::AccessControl(
     Reference< security::XAccessController > const & xController )
     SAL_THROW( (RuntimeException) )
@@ -63,7 +63,7 @@ AccessControl::AccessControl(
             "no access controller!", Reference< XInterface >() );
     }
 }
-//__________________________________________________________________________________________________
+
 AccessControl::AccessControl( AccessControl const & ac )
     SAL_THROW( (RuntimeException) )
     : m_xController( ac.m_xController )
@@ -88,7 +88,7 @@ AccessControl::AccessControl( AccessControl const & ac )
 #pragma pack(pop)
 #endif
 
-//--------------------------------------------------------------------------------------------------
+
 inline void __checkPermission(
     Reference< security::XAccessController > const & xController,
     Type const & type, rtl_uString * str1, rtl_uString * str2 )
@@ -104,7 +104,7 @@ inline void __checkPermission(
 
     xController->checkPermission( * static_cast< Any * >( &a ) );
 }
-//__________________________________________________________________________________________________
+
 void AccessControl::checkRuntimePermission(
     OUString const & name )
     SAL_THROW( (RuntimeException) )
@@ -113,7 +113,7 @@ void AccessControl::checkRuntimePermission(
         m_xController,
         ::getCppuType( (security::RuntimePermission *)0 ), name.pData, 0 );
 }
-//__________________________________________________________________________________________________
+
 void AccessControl::checkFilePermission(
     OUString const & url,
     OUString const & actions )
@@ -123,7 +123,7 @@ void AccessControl::checkFilePermission(
         m_xController,
         ::getCppuType( (io::FilePermission *)0 ), url.pData, actions.pData );
 }
-//__________________________________________________________________________________________________
+
 void AccessControl::checkSocketPermission(
     OUString const & host,
     OUString const & actions )
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index f19e243a92d8..b1983ee34fe8 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -70,7 +70,7 @@ namespace cppu
 {
 
 #ifdef CONTEXT_DIAG
-//--------------------------------------------------------------------------------------------------
+
 static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * pTypeRef )
 {
     OSL_ASSERT( pVal );
@@ -255,7 +255,7 @@ static OUString val2str( void const * pVal, typelib_TypeDescriptionReference * p
 
     return buf.makeStringAndClear();
 }
-//--------------------------------------------------------------------------------------------------
+
 static void dumpEntry( OUString const & key, Any const & value )
 {
     OUString val( val2str( value.getValue(), value.getValueTypeRef() ) );
@@ -264,7 +264,7 @@ static void dumpEntry( OUString const & key, Any const & value )
     ::fprintf( stderr, "| %s = %s\n", key_str.getStr(), val_str.getStr() );
 }
 #endif
-//--------------------------------------------------------------------------------------------------
+
 static inline void try_dispose( Reference< XInterface > const & xInstance )
     SAL_THROW( (RuntimeException) )
 {
@@ -274,7 +274,7 @@ static inline void try_dispose( Reference< XInterface > const & xInstance )
         xComp->dispose();
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline void try_dispose( Reference< lang::XComponent > const & xComp )
     SAL_THROW( (RuntimeException) )
 {
@@ -305,7 +305,7 @@ public:
     virtual void SAL_CALL disposing( lang::EventObject const & rSource )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 inline void DisposingForwarder::listen(
     Reference< lang::XComponent > const & xSource,
     Reference< lang::XComponent > const & xTarget )
@@ -316,7 +316,7 @@ inline void DisposingForwarder::listen(
         xSource->addEventListener( new DisposingForwarder( xTarget ) );
     }
 }
-//__________________________________________________________________________________________________
+
 void DisposingForwarder::disposing( lang::EventObject const & )
     throw (RuntimeException)
 {
@@ -400,7 +400,7 @@ public:
 };
 
 // XNameContainer
-//______________________________________________________________________________
+
 void ComponentContext::insertByName(
     OUString const & name, Any const & element )
     throw (lang::IllegalArgumentException, container::ElementExistException,
@@ -421,7 +421,7 @@ void ComponentContext::insertByName(
             static_cast<OWeakObject *>(this) );
 }
 
-//______________________________________________________________________________
+
 void ComponentContext::removeByName( OUString const & name )
         throw (container::NoSuchElementException,
                lang::WrappedTargetException, RuntimeException)
@@ -438,7 +438,7 @@ void ComponentContext::removeByName( OUString const & name )
 }
 
 // XNameReplace
-//______________________________________________________________________________
+
 void ComponentContext::replaceByName(
     OUString const & name, Any const & element )
     throw (lang::IllegalArgumentException,container::NoSuchElementException,
@@ -464,7 +464,7 @@ void ComponentContext::replaceByName(
 }
 
 // XNameAccess
-//______________________________________________________________________________
+
 Any ComponentContext::getByName( OUString const & name )
     throw (container::NoSuchElementException,
            lang::WrappedTargetException, RuntimeException)
@@ -472,7 +472,7 @@ Any ComponentContext::getByName( OUString const & name )
     return getValueByName( name );
 }
 
-//______________________________________________________________________________
+
 Sequence<OUString> ComponentContext::getElementNames()
     throw (RuntimeException)
 {
@@ -487,7 +487,7 @@ Sequence<OUString> ComponentContext::getElementNames()
     return ret;
 }
 
-//______________________________________________________________________________
+
 sal_Bool ComponentContext::hasByName( OUString const & name )
     throw (RuntimeException)
 {
@@ -496,20 +496,20 @@ sal_Bool ComponentContext::hasByName( OUString const & name )
 }
 
 // XElementAccess
-//______________________________________________________________________________
+
 Type ComponentContext::getElementType() throw (RuntimeException)
 {
     return ::getVoidCppuType();
 }
 
-//______________________________________________________________________________
+
 sal_Bool ComponentContext::hasElements() throw (RuntimeException)
 {
     MutexGuard guard( m_mutex );
     return ! m_map.empty();
 }
 
-//__________________________________________________________________________________________________
+
 Any ComponentContext::lookupMap( OUString const & rName )
     SAL_THROW( (RuntimeException) )
 {
@@ -629,7 +629,7 @@ Any ComponentContext::lookupMap( OUString const & rName )
     return ret;
 }
 
-//__________________________________________________________________________________________________
+
 Any ComponentContext::getValueByName( OUString const & rName )
     throw (RuntimeException)
 {
@@ -649,7 +649,7 @@ Any ComponentContext::getValueByName( OUString const & rName )
     }
     return ret;
 }
-//__________________________________________________________________________________________________
+
 Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager()
     throw (RuntimeException)
 {
@@ -661,7 +661,7 @@ Reference< lang::XMultiComponentFactory > ComponentContext::getServiceManager()
     }
     return m_xSMgr;
 }
-//__________________________________________________________________________________________________
+
 ComponentContext::~ComponentContext()
     SAL_THROW(())
 {
@@ -674,7 +674,7 @@ ComponentContext::~ComponentContext()
         delete iPos->second;
     m_map.clear();
 }
-//__________________________________________________________________________________________________
+
 void ComponentContext::disposing()
 {
 #ifdef CONTEXT_DIAG
@@ -739,7 +739,7 @@ void ComponentContext::disposing()
         delete iPos->second;
     m_map.clear();
 }
-//__________________________________________________________________________________________________
+
 ComponentContext::ComponentContext(
     ContextEntry_Init const * pEntries, sal_Int32 nEntries,
     Reference< XComponentContext > const & xDelegate )
diff --git a/cppuhelper/source/exc_thrower.cxx b/cppuhelper/source/exc_thrower.cxx
index 70a227410cf5..0e18f5d070d0 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -67,12 +67,12 @@ struct ExceptionThrower : public uno_Interface, XExceptionThrower
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL ExceptionThrower_acquire_release_nop(
     SAL_UNUSED_PARAMETER uno_Interface * )
 {}
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL ExceptionThrower_dispatch(
     uno_Interface * pUnoI, typelib_TypeDescription const * pMemberType,
     void * pReturn, void * pArgs [], uno_Any ** ppException )
@@ -131,7 +131,7 @@ static void SAL_CALL ExceptionThrower_dispatch(
 
 } // extern "C"
 
-//______________________________________________________________________________
+
 Any ExceptionThrower::queryInterface( Type const & type )
     throw (RuntimeException)
 {
@@ -145,29 +145,29 @@ Any ExceptionThrower::queryInterface( Type const & type )
     return Any();
 }
 
-//______________________________________________________________________________
+
 void ExceptionThrower::acquire() throw ()
 {
 }
-//______________________________________________________________________________
+
 void ExceptionThrower::release() throw ()
 {
 }
 
-//______________________________________________________________________________
+
 void ExceptionThrower::throwException( Any const & exc ) throw (Exception)
 {
     OSL_FAIL( "unexpected!" );
     throwException( exc );
 }
 
-//______________________________________________________________________________
+
 void ExceptionThrower::rethrowException() throw (Exception)
 {
     throw;
 }
 
-//______________________________________________________________________________
+
 inline ExceptionThrower::ExceptionThrower()
 {
     uno_Interface::acquire = ExceptionThrower_acquire_release_nop;
diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx
index 85a231880a2b..b2d18af32aaa 100644
--- a/cppuhelper/source/factory.cxx
+++ b/cppuhelper/source/factory.cxx
@@ -140,7 +140,7 @@ OSingleFactoryHelper::~OSingleFactoryHelper()
 }
 
 
-//-----------------------------------------------------------------------------
+
 Any OSingleFactoryHelper::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -195,14 +195,14 @@ Reference<XInterface > OSingleFactoryHelper::createInstanceWithArguments(
 }
 
 // XSingleComponentFactory
-//__________________________________________________________________________________________________
+
 Reference< XInterface > OSingleFactoryHelper::createInstanceWithContext(
     Reference< XComponentContext > const & xContext )
     throw (Exception, RuntimeException)
 {
     return createInstanceEveryTime( xContext );
 }
-//__________________________________________________________________________________________________
+
 Reference< XInterface > OSingleFactoryHelper::createInstanceWithArgumentsAndContext(
     Sequence< Any > const & rArguments,
     Reference< XComponentContext > const & xContext )
@@ -413,7 +413,7 @@ Reference<XInterface > OFactoryComponentHelper::createInstanceWithArguments(
 }
 
 // XSingleComponentFactory
-//__________________________________________________________________________________________________
+
 Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext(
     Reference< XComponentContext > const & xContext )
     throw (Exception, RuntimeException)
@@ -431,7 +431,7 @@ Reference< XInterface > OFactoryComponentHelper::createInstanceWithContext(
     }
     return OSingleFactoryHelper::createInstanceWithContext( xContext );
 }
-//__________________________________________________________________________________________________
+
 Reference< XInterface > OFactoryComponentHelper::createInstanceWithArgumentsAndContext(
     Sequence< Any > const & rArguments,
     Reference< XComponentContext > const & xContext )
@@ -564,7 +564,7 @@ protected:
 };
 
 // XInterface
-//______________________________________________________________________________
+
 Any SAL_CALL ORegistryFactoryHelper::queryInterface(
     Type const & type ) throw (RuntimeException)
 {
@@ -575,20 +575,20 @@ Any SAL_CALL ORegistryFactoryHelper::queryInterface(
         return OPropertySetHelper::queryInterface( type );
 }
 
-//______________________________________________________________________________
+
 void ORegistryFactoryHelper::acquire() throw ()
 {
     OFactoryComponentHelper::acquire();
 }
 
-//______________________________________________________________________________
+
 void ORegistryFactoryHelper::release() throw ()
 {
     OFactoryComponentHelper::release();
 }
 
 // XTypeProvider
-//______________________________________________________________________________
+
 Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException)
 {
     Sequence< Type > types( OFactoryComponentHelper::getTypes() );
@@ -605,7 +605,7 @@ Sequence< Type > ORegistryFactoryHelper::getTypes() throw (RuntimeException)
 }
 
 // XPropertySet
-//______________________________________________________________________________
+
 Reference< beans::XPropertySetInfo >
 ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException)
 {
@@ -616,7 +616,7 @@ ORegistryFactoryHelper::getPropertySetInfo() throw (RuntimeException)
 }
 
 // OPropertySetHelper
-//______________________________________________________________________________
+
 IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
 {
     ::osl::MutexGuard guard( aMutex );
@@ -634,7 +634,7 @@ IPropertyArrayHelper & ORegistryFactoryHelper::getInfoHelper()
     return *m_property_array_helper.get();
 }
 
-//______________________________________________________________________________
+
 sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
     Any &, Any &, sal_Int32, Any const & )
     throw (lang::IllegalArgumentException)
@@ -643,7 +643,7 @@ sal_Bool ORegistryFactoryHelper::convertFastPropertyValue(
     return false;
 }
 
-//______________________________________________________________________________
+
 void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast(
     sal_Int32, Any const & )
     throw (Exception)
@@ -653,7 +653,7 @@ void ORegistryFactoryHelper::setFastPropertyValue_NoBroadcast(
         static_cast< OWeakObject * >(this) );
 }
 
-//______________________________________________________________________________
+
 void ORegistryFactoryHelper::getFastPropertyValue(
     Any & rValue, sal_Int32 nHandle ) const
 {
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 983622ca5bfd..ecf7f9a36b15 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -48,7 +48,7 @@ Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(())
 }
 
 // ClassDataBase
-//__________________________________________________________________________________________________
+
 ClassDataBase::ClassDataBase() SAL_THROW(())
     : bOffsetsInit( sal_False )
     , nType2Offset( 0 )
@@ -57,7 +57,7 @@ ClassDataBase::ClassDataBase() SAL_THROW(())
     , pId( 0 )
 {
 }
-//__________________________________________________________________________________________________
+
 ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(())
     : bOffsetsInit( sal_False )
     , nType2Offset( 0 )
@@ -66,7 +66,7 @@ ClassDataBase::ClassDataBase( sal_Int32 nClassCode_ ) SAL_THROW(())
     , pId( 0 )
 {
 }
-//__________________________________________________________________________________________________
+
 ClassDataBase::~ClassDataBase() SAL_THROW(())
 {
     delete pTypes;
@@ -80,7 +80,7 @@ ClassDataBase::~ClassDataBase() SAL_THROW(())
 }
 
 // ClassData
-//__________________________________________________________________________________________________
+
 void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THROW(())
 {
     arType2Offset[nType2Offset].nOffset = nOffset;
@@ -100,7 +100,7 @@ void ClassData::writeTypeOffset( const Type & rType, sal_Int32 nOffset ) SAL_THR
     }
 #endif
 }
-//__________________________________________________________________________________________________
+
 void ClassData::initTypeProvider() SAL_THROW(())
 {
     ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
@@ -141,14 +141,14 @@ void ClassData::initTypeProvider() SAL_THROW(())
         pTypes = types;
     }
 }
-//__________________________________________________________________________________________________
+
 Sequence< Type > ClassData::getTypes() SAL_THROW(())
 {
     if (! pTypes)
         initTypeProvider();
     return *pTypes;
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(())
 {
     if (! pTypes)
@@ -156,7 +156,7 @@ Sequence< sal_Int8 > ClassData::getImplementationId() SAL_THROW(())
     return *pId;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static inline bool td_equals(
     typelib_TypeDescription * pTD, typelib_TypeDescriptionReference * pType )
     SAL_THROW(())
@@ -165,7 +165,7 @@ static inline bool td_equals(
             (pTD->pTypeName->length == pType->pTypeName->length &&
              rtl_ustr_compare( pTD->pTypeName->buffer, pType->pTypeName->buffer ) == 0));
 }
-//__________________________________________________________________________________________________
+
 Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THROW(())
 {
     if (rType == ::getCppuType( (const Reference< XInterface > *)0 ))
@@ -196,22 +196,22 @@ Any ClassData::query( const Type & rType, lang::XTypeProvider * pBase ) SAL_THRO
 //##################################################################################################
 
 // WeakComponentImplHelperBase
-//__________________________________________________________________________________________________
+
 WeakComponentImplHelperBase::WeakComponentImplHelperBase( Mutex & rMutex )
     SAL_THROW(())
     : rBHelper( rMutex )
 {
 }
-//__________________________________________________________________________________________________
+
 WeakComponentImplHelperBase::~WeakComponentImplHelperBase()
     SAL_THROW(())
 {
 }
-//__________________________________________________________________________________________________
+
 void WeakComponentImplHelperBase::disposing()
 {
 }
-//__________________________________________________________________________________________________
+
 Any WeakComponentImplHelperBase::queryInterface( Type const & rType )
     throw (RuntimeException)
 {
@@ -222,13 +222,13 @@ Any WeakComponentImplHelperBase::queryInterface( Type const & rType )
     }
     return OWeakObject::queryInterface( rType );
 }
-//__________________________________________________________________________________________________
+
 void WeakComponentImplHelperBase::acquire()
     throw ()
 {
     OWeakObject::acquire();
 }
-//__________________________________________________________________________________________________
+
 void WeakComponentImplHelperBase::release()
     throw ()
 {
@@ -252,7 +252,7 @@ void WeakComponentImplHelperBase::release()
         OWeakObject::release();
     }
 }
-//__________________________________________________________________________________________________
+
 void WeakComponentImplHelperBase::dispose()
     throw (RuntimeException)
 {
@@ -296,7 +296,7 @@ void WeakComponentImplHelperBase::dispose()
         }
     }
 }
-//__________________________________________________________________________________________________
+
 void WeakComponentImplHelperBase::addEventListener(
     Reference< lang::XEventListener > const & xListener )
     throw (RuntimeException)
@@ -313,7 +313,7 @@ void WeakComponentImplHelperBase::addEventListener(
         rBHelper.addListener( ::getCppuType( &xListener ), xListener );
     }
 }
-//__________________________________________________________________________________________________
+
 void WeakComponentImplHelperBase::removeEventListener(
     Reference< lang::XEventListener > const & xListener )
     throw (RuntimeException)
@@ -322,28 +322,28 @@ void WeakComponentImplHelperBase::removeEventListener(
 }
 
 // WeakAggComponentImplHelperBase
-//__________________________________________________________________________________________________
+
 WeakAggComponentImplHelperBase::WeakAggComponentImplHelperBase( Mutex & rMutex )
     SAL_THROW(())
     : rBHelper( rMutex )
 {
 }
-//__________________________________________________________________________________________________
+
 WeakAggComponentImplHelperBase::~WeakAggComponentImplHelperBase()
     SAL_THROW(())
 {
 }
-//__________________________________________________________________________________________________
+
 void WeakAggComponentImplHelperBase::disposing()
 {
 }
-//__________________________________________________________________________________________________
+
 Any WeakAggComponentImplHelperBase::queryInterface( Type const & rType )
     throw (RuntimeException)
 {
     return OWeakAggObject::queryInterface( rType );
 }
-//__________________________________________________________________________________________________
+
 Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType )
     throw (RuntimeException)
 {
@@ -354,13 +354,13 @@ Any WeakAggComponentImplHelperBase::queryAggregation( Type const & rType )
     }
     return OWeakAggObject::queryAggregation( rType );
 }
-//__________________________________________________________________________________________________
+
 void WeakAggComponentImplHelperBase::acquire()
     throw ()
 {
     OWeakAggObject::acquire();
 }
-//__________________________________________________________________________________________________
+
 void WeakAggComponentImplHelperBase::release()
     throw ()
 {
@@ -388,7 +388,7 @@ void WeakAggComponentImplHelperBase::release()
         OWeakAggObject::release();
     }
 }
-//__________________________________________________________________________________________________
+
 void WeakAggComponentImplHelperBase::dispose()
     throw (RuntimeException)
 {
@@ -432,7 +432,7 @@ void WeakAggComponentImplHelperBase::dispose()
         }
     }
 }
-//__________________________________________________________________________________________________
+
 void WeakAggComponentImplHelperBase::addEventListener(
     Reference< lang::XEventListener > const & xListener )
     throw (RuntimeException)
@@ -449,7 +449,7 @@ void WeakAggComponentImplHelperBase::addEventListener(
         rBHelper.addListener( ::getCppuType( &xListener ), xListener );
     }
 }
-//__________________________________________________________________________________________________
+
 void WeakAggComponentImplHelperBase::removeEventListener(
     Reference< lang::XEventListener > const & xListener )
     throw (RuntimeException)
diff --git a/cppuhelper/source/implbase_ex.cxx b/cppuhelper/source/implbase_ex.cxx
index c2a87fb72fb3..e7a01ad1a680 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -45,7 +45,7 @@ namespace cppu
 */
 ::osl::Mutex & SAL_CALL getImplHelperInitMutex(void) SAL_THROW(());
 
-//--------------------------------------------------------------------------------------------------
+
 static inline void checkInterface( Type const & rType )
     SAL_THROW( (RuntimeException) )
 {
@@ -56,17 +56,17 @@ static inline void checkInterface( Type const & rType )
         throw RuntimeException( msg, Reference< XInterface >() );
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline bool isXInterface( rtl_uString * pStr ) SAL_THROW(())
 {
     return (*((OUString const *)&pStr) == "com.sun.star.uno.XInterface");
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline void * makeInterface( sal_IntPtr nOffset, void * that ) SAL_THROW(())
 {
     return (((char *)that) + nOffset);
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline bool __td_equals(
     typelib_TypeDescriptionReference const * pTDR1,
     typelib_TypeDescriptionReference const * pTDR2 )
@@ -75,7 +75,7 @@ static inline bool __td_equals(
     return ((pTDR1 == pTDR2) ||
             ((OUString const *)&pTDR1->pTypeName)->equals( *(OUString const *)&pTDR2->pTypeName ));
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline type_entry * __getTypeEntries( class_data * cd )
     SAL_THROW( (RuntimeException) )
 {
@@ -106,7 +106,7 @@ static inline type_entry * __getTypeEntries( class_data * cd )
     }
     return pEntries;
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline void __fillTypes( Type * types, class_data * cd )
     SAL_THROW( (RuntimeException) )
 {
@@ -116,7 +116,7 @@ static inline void __fillTypes( Type * types, class_data * cd )
         types[ n ] = pEntries[ n ].m_type.typeRef;
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 namespace {
 
 bool recursivelyFindType(
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 45742962fb0a..f290fb71982e 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -144,27 +144,27 @@ public:
         throw (RuntimeException);
 };
 
-//__________________________________________________________________________________________________
+
 void Bootstrap_MacroExpander::disposing()
 {}
-//__________________________________________________________________________________________________
+
 Bootstrap_MacroExpander::~Bootstrap_MacroExpander() SAL_THROW(())
 {}
 
 // XServiceInfo impl
-//__________________________________________________________________________________________________
+
 OUString Bootstrap_MacroExpander::getImplementationName()
     throw (RuntimeException)
 {
     return s_impl_name();
 }
-//__________________________________________________________________________________________________
+
 sal_Bool Bootstrap_MacroExpander::supportsService( OUString const & serviceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, serviceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames()
     throw (RuntimeException)
 {
@@ -172,7 +172,7 @@ Sequence< OUString > Bootstrap_MacroExpander::getSupportedServiceNames()
 }
 
 // XMacroExpander impl
-//__________________________________________________________________________________________________
+
 OUString Bootstrap_MacroExpander::expandMacros( OUString const & exp )
     throw (lang::IllegalArgumentException)
 {
diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx
index 8953767cc7af..d276a9b5eb9c 100644
--- a/cppuhelper/source/propshlp.cxx
+++ b/cppuhelper/source/propshlp.cxx
@@ -588,7 +588,7 @@ Any OPropertySetHelper::getFastPropertyValue( sal_Int32 nHandle )
     return aRet;
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertySetHelper::impl_fireAll( sal_Int32* i_handles, const Any* i_newValues, const Any* i_oldValues, sal_Int32 i_count )
 {
     ClearableMutexGuard aGuard( rBHelper.rMutex );
@@ -624,7 +624,7 @@ void OPropertySetHelper::impl_fireAll( sal_Int32* i_handles, const Any* i_newVal
     fire( &allHandles[0], &allNewValues[0], &allOldValues[0], additionalEvents + i_count, sal_False );
 }
 
-//--------------------------------------------------------------------------
+
 void OPropertySetHelper::fire
 (
     sal_Int32 * pnHandles,
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index 8e614d2ce39c..582e3f5699dc 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -628,7 +628,7 @@ public:
     virtual void SAL_CALL disposing( lang::EventObject const & rEvt )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 void EventListenerImpl::disposing( lang::EventObject const & rEvt )
     throw (RuntimeException)
 {
diff --git a/cppuhelper/source/typeprovider.cxx b/cppuhelper/source/typeprovider.cxx
index ad8586f5eda8..29dd5a233948 100644
--- a/cppuhelper/source/typeprovider.cxx
+++ b/cppuhelper/source/typeprovider.cxx
@@ -27,12 +27,12 @@ using namespace com::sun::star::uno;
 namespace cppu
 {
 
-//__________________________________________________________________________________________________
+
 OImplementationId::~OImplementationId() SAL_THROW(())
 {
     delete _pSeq;
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(())
 {
     if (! _pSeq)
@@ -48,7 +48,7 @@ Sequence< sal_Int8 > OImplementationId::getImplementationId() const SAL_THROW(()
     return *_pSeq;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSource, sal_Int32 nOffset )
     SAL_THROW(())
 {
@@ -59,7 +59,7 @@ static inline void copy( Sequence< Type > & rDest, const Sequence< Type > & rSou
         pDest[nOffset+ nPos] = pSource[nPos];
 }
 
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Sequence< Type > & rAddTypes )
@@ -69,7 +69,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[0] = rType1;
     copy( _aTypes, rAddTypes, 1 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -81,7 +81,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[1] = rType2;
     copy( _aTypes, rAddTypes, 2 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -95,7 +95,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[2] = rType3;
     copy( _aTypes, rAddTypes, 3 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -111,7 +111,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[3] = rType4;
     copy( _aTypes, rAddTypes, 4 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -129,7 +129,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[4] = rType5;
     copy( _aTypes, rAddTypes, 5 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -149,7 +149,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[5] = rType6;
     copy( _aTypes, rAddTypes, 6 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -171,7 +171,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[6] = rType7;
     copy( _aTypes, rAddTypes, 7 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -195,7 +195,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[7] = rType8;
     copy( _aTypes, rAddTypes, 8 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -221,7 +221,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[8] = rType9;
     copy( _aTypes, rAddTypes, 9 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -249,7 +249,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[9] = rType10;
     copy( _aTypes, rAddTypes, 10 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
@@ -279,7 +279,7 @@ OTypeCollection::OTypeCollection(
     _aTypes[10] = rType11;
     copy( _aTypes, rAddTypes, 11 );
 }
-//__________________________________________________________________________________________________
+
 OTypeCollection::OTypeCollection(
     const Type & rType1,
     const Type & rType2,
diff --git a/cppuhelper/source/weak.cxx b/cppuhelper/source/weak.cxx
index 1429f64c81ba..857f64d50a4b 100644
--- a/cppuhelper/source/weak.cxx
+++ b/cppuhelper/source/weak.cxx
@@ -38,9 +38,9 @@ inline static Mutex & getWeakMutex() SAL_THROW(())
     return *s_pMutex;
 }
 
-//------------------------------------------------------------------------
+
 //-- OWeakConnectionPoint ----------------------------------------------------
-//------------------------------------------------------------------------
+
 class OWeakConnectionPoint : public XAdapter
 {
 public:
@@ -166,9 +166,9 @@ void SAL_CALL OWeakConnectionPoint::removeReference(const Reference< XReference
 }
 
 
-//------------------------------------------------------------------------
+
 //-- OWeakObject -------------------------------------------------------
-//------------------------------------------------------------------------
+
 
 #ifdef _MSC_VER
 // Accidentally occurs in msvc mapfile = > had to be outlined.
@@ -247,9 +247,9 @@ Reference< XAdapter > SAL_CALL OWeakObject::queryAdapter()
     return m_pWeakConnectionPoint;
 }
 
-//------------------------------------------------------------------------
+
 //-- OWeakAggObject ----------------------------------------------------
-//------------------------------------------------------------------------
+
 OWeakAggObject::~OWeakAggObject() SAL_THROW( (RuntimeException) )
 {
 }
@@ -313,9 +313,9 @@ namespace uno
 {
 
 
-//------------------------------------------------------------------------
+
 //-- OWeakRefListener -----------------------------------------------------
-//------------------------------------------------------------------------
+
 class OWeakRefListener : public XReference
 {
 public:
@@ -428,9 +428,9 @@ void SAL_CALL OWeakRefListener::dispose()
         xAdp->removeReference((XReference*)this);
 }
 
-//------------------------------------------------------------------------
+
 //-- WeakReferenceHelper ----------------------------------------------------------
-//------------------------------------------------------------------------
+
 WeakReferenceHelper::WeakReferenceHelper(const Reference< XInterface >& xInt) SAL_THROW(())
     : m_pImpl( 0 )
 {
diff --git a/cppuhelper/test/cfg_test.cxx b/cppuhelper/test/cfg_test.cxx
index c031fb7cbefa..b3eec0af67d3 100644
--- a/cppuhelper/test/cfg_test.cxx
+++ b/cppuhelper/test/cfg_test.cxx
@@ -50,24 +50,24 @@ using namespace ::com::sun::star::uno;
 namespace cfg_test
 {
 
-//--------------------------------------------------------------------------------------------------
+
 static Sequence< OUString > impl0_getSupportedServiceNames()
 {
     OUString str("com.sun.star.bootstrap.TestComponent0");
     return Sequence< OUString >( &str, 1 );
 }
-//--------------------------------------------------------------------------------------------------
+
 static OUString impl0_getImplementationName()
 {
     return OUString("com.sun.star.comp.bootstrap.TestComponent0");
 }
-//--------------------------------------------------------------------------------------------------
+
 static Sequence< OUString > impl1_getSupportedServiceNames()
 {
     OUString str("com.sun.star.bootstrap.TestComponent1");
     return Sequence< OUString >( &str, 1 );
 }
-//--------------------------------------------------------------------------------------------------
+
 static OUString impl1_getImplementationName()
 {
     return OUString("com.sun.star.comp.bootstrap.TestComponent1");
@@ -90,7 +90,7 @@ public:
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
     virtual sal_Bool SAL_CALL supportsService( const OUString & rServiceName ) throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SAL_THROW(())
     : m_xContext( xContext )
 {
@@ -113,7 +113,7 @@ ServiceImpl0::ServiceImpl0( Reference< XComponentContext > const & xContext ) SA
     OSL_VERIFY( val == "value of implprop1" );
 }
 // XInitialization
-//__________________________________________________________________________________________________
+
 void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
     throw (Exception, RuntimeException)
 {
@@ -128,19 +128,19 @@ void ServiceImpl0::initialize( const Sequence< Any >& rArgs )
     OSL_VERIFY( val == "third argument" );
 }
 // XServiceInfo
-//__________________________________________________________________________________________________
+
 OUString ServiceImpl0::getImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return impl0_getImplementationName();
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > ServiceImpl0::getSupportedServiceNames()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return impl0_getSupportedServiceNames();
 }
-//__________________________________________________________________________________________________
+
 sal_Bool ServiceImpl0::supportsService( const OUString & rServiceName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -159,13 +159,13 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException);
     virtual OUString SAL_CALL getImplementationName() throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 OUString ServiceImpl1::getImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return impl1_getImplementationName();
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > ServiceImpl1::getSupportedServiceNames()
     throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/cppuhelper/test/testpropshlp.cxx b/cppuhelper/test/testpropshlp.cxx
index a20413461a5d..0919146b51fa 100644
--- a/cppuhelper/test/testpropshlp.cxx
+++ b/cppuhelper/test/testpropshlp.cxx
@@ -293,9 +293,9 @@ void test_PropertyArrayHelper()
 
 
 
-//----------------------------------------------------
+
 //  test_OPropertySetHelper
-//----------------------------------------------------
+
 struct MutexContainer
 {
     Mutex aMutex;
@@ -384,9 +384,9 @@ protected:
     void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw(RuntimeException);
 };
 
-//----------------------------------------------------------------------
+
 //------ The Properties of this implementation -------------------------
-//----------------------------------------------------------------------
+
 // Id must be the index into the array
 #define PROPERTY_BOOL       0
 #define PROPERTY_INT16      1
@@ -421,9 +421,9 @@ Property * getBasicProps()
 }
 
 
-//----------------------------------------------------
+
 //  test_OPropertySetHelper_Listener
-//----------------------------------------------------
+
 class test_OPropertySetHelper_Listener
     : public WeakImplHelper3< XPropertyChangeListener, XPropertiesChangeListener, XVetoableChangeListener >
 {
@@ -744,7 +744,7 @@ void test_OPropertySetHelper::setFastPropertyValue_NoBroadcast
     }
 }
 
-//--------------------------
+
 void test_OPropertySetHelper::getFastPropertyValue( Any & rRet, sal_Int32 nHandle ) const
     throw(RuntimeException)
 {
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 4199a7580ada..b25ec7b1fdb9 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//-----------------------------------------------
+
 // include own files
 
 #include "acccfg.hxx"
@@ -39,7 +39,7 @@
 
 #include <svx/svxids.hrc>
 
-//-----------------------------------------------
+
 // include interface declarations
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/embed/StorageFactory.hpp>
@@ -60,7 +60,7 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
-//-----------------------------------------------
+
 // include other projects
 #include <comphelper/processfactory.hxx>
 #include <svtools/acceleratorexecute.hxx>
@@ -70,13 +70,13 @@
 #include <rtl/ustrbuf.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
-//-----------------------------------------------
+
 // namespaces
 
 using namespace com::sun::star;
 
 
-//-----------------------------------------------
+
 
 static OUString MODULEPROP_SHORTNAME             ("ooSetupFactoryShortName"                 );
 static OUString MODULEPROP_UINAME                ("ooSetupFactoryUIName"                    );
@@ -87,7 +87,7 @@ static OUString FOLDERNAME_UICONFIG              ("Configurations2"
 static OUString MEDIATYPE_PROPNAME               ("MediaType"                               );
 static OUString MEDIATYPE_UICONFIG               ("application/vnd.sun.xml.ui.configuration");
 
-//-----------------------------------------------
+
 static const sal_uInt16 KEYCODE_ARRAY[] =
 {
     KEY_F1       ,
@@ -602,7 +602,7 @@ static const sal_uInt16 KEYCODE_ARRAY[] =
 
 static const sal_uInt16 KEYCODE_ARRAY_SIZE = SAL_N_ELEMENTS(KEYCODE_ARRAY);
 
-//-----------------------------------------------
+
 // seems to be needed to layout the list box, which shows all
 // assignable shortcuts
 static long AccCfgTabs[] =
@@ -612,7 +612,7 @@ static long AccCfgTabs[] =
     120 // Function
 };
 
-//-----------------------------------------------
+
 class SfxAccCfgLBoxString_Impl : public SvLBoxString
 {
     public:
@@ -626,7 +626,7 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
         const Point& aPos, SvTreeListBox& rDevice, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
 };
 
-//-----------------------------------------------
+
 SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(      SvTreeListEntry* pEntry,
                                                          sal_uInt16       nFlags,
                                                    const OUString&      sText )
@@ -634,7 +634,7 @@ SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl(      SvTreeListEntry* pEntry
 {
 }
 
-//-----------------------------------------------
+
 SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
 {
 }
@@ -656,7 +656,7 @@ void SfxAccCfgLBoxString_Impl::Paint(
 
 }
 
-//-----------------------------------------------
+
 void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
                                          const OUString& rText,
                                          const Image& rImage1,
@@ -666,7 +666,7 @@ void SfxAccCfgTabListBox_Impl::InitEntry(SvTreeListEntry* pEntry,
     SvTabListBox::InitEntry(pEntry, rText, rImage1, rImage2, eButtonKind);
 }
 
-//-----------------------------------------------
+
 /** select the entry, which match the current key input ... excepting
     keys, which are used for the dialog itself.
   */
@@ -712,7 +712,7 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
     SvTabListBox::KeyInput(aKey);
 }
 
-//-----------------------------------------------
+
 SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxItemSet& aSet )
     : SfxTabPage              (pParent, CUI_RES(RID_SVXPAGE_KEYBOARD), aSet)
     , m_pMacroInfoItem        ()
@@ -788,7 +788,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
     aKeyBox.SetStyle(aKeyBox.GetStyle()|WB_CLIPCHILDREN|WB_HSCROLL|WB_SORT);
 }
 
-//-----------------------------------------------
+
 SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
 {
     // free memory - remove all dynamic user data
@@ -818,7 +818,7 @@ SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
     delete pFunctionBox;
 }
 
-//-----------------------------------------------
+
 void SfxAcceleratorConfigPage::InitAccCfg()
 {
     // already initialized ?
@@ -864,7 +864,7 @@ void SfxAcceleratorConfigPage::InitAccCfg()
         { m_xContext.clear(); }
 }
 
-//-----------------------------------------------
+
 /** Initialize text columns with own class to enable custom painting
     This is needed as we have to paint disabled entries by ourself. No support for that in the
     original SvTabListBox!
@@ -880,7 +880,7 @@ void SfxAcceleratorConfigPage::CreateCustomItems(      SvTreeListEntry* pEntry,
     pEntry->ReplaceItem(pStringItem, 2);
 }
 
-//-----------------------------------------------
+
 void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xAccMgr)
 {
     if (!xAccMgr.is())
@@ -965,7 +965,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
     }
 }
 
-//-----------------------------------------------
+
 void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& xAccMgr)
 {
     if (!xAccMgr.is())
@@ -1003,13 +1003,13 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele
     }
 }
 
-//-----------------------------------------------
+
 void SfxAcceleratorConfigPage::ResetConfig()
 {
     aEntriesBox.Clear();
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load)
 {
     // ask for filename, where we should load the new config data from
@@ -1017,14 +1017,14 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Load)
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Save)
 {
     StartFileDialog( WB_SAVEAS, aSaveAccelConfigStr );
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default)
 {
     css::uno::Reference< css::form::XReset > xReset(m_xAct, css::uno::UNO_QUERY);
@@ -1041,7 +1041,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default)
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
 {
     sal_uInt16    nPos        = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
@@ -1059,7 +1059,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
 {
     // get selected entry
@@ -1075,7 +1075,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
 {
     // disable help
@@ -1164,7 +1164,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
 {
     css::uno::Reference< css::ui::XAcceleratorConfiguration > xOld = m_xAct;
@@ -1198,7 +1198,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl)
     return 1L;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl)
 {
     assert(m_pFileDlg);
@@ -1282,7 +1282,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl)
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
 {
     assert(m_pFileDlg);
@@ -1383,7 +1383,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
     return 0;
 }
 
-//-----------------------------------------------
+
 void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& rTitle )
 {
     bool bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS );
@@ -1403,7 +1403,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const OUString& r
     m_pFileDlg->StartExecuteModal( aDlgClosedLink );
 }
 
-//-----------------------------------------------
+
 sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
 {
     Apply(m_xAct);
@@ -1419,7 +1419,7 @@ sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
     return sal_True;
 }
 
-//-----------------------------------------------
+
 void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
 {
     // open accelerator configs
@@ -1461,7 +1461,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
     }
 }
 
-//-----------------------------------------------
+
 sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
 {
     sal_uInt16       nCode1 = aKey.GetCode()+aKey.GetModifier();
@@ -1484,7 +1484,7 @@ sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
-//-----------------------------------------------
+
 OUString SfxAcceleratorConfigPage::GetLabel4Command(const OUString& sCommand)
 {
     try
@@ -1522,7 +1522,7 @@ SfxTabPage* SfxAcceleratorConfigPage::Create( Window* pParent, const SfxItemSet&
     return new SfxAcceleratorConfigPage( pParent, rAttrSet );
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::frame::XModel > SfxAcceleratorConfigPage::SearchForAlreadyLoadedDoc(const OUString& /*sName*/)
 {
     return css::uno::Reference< css::frame::XModel >();
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index dd768be7da09..d42203fd5af7 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1525,7 +1525,7 @@ SvxDescriptionEdit::SvxDescriptionEdit( Window* pParent, const ResId& _rId ) :
     SetBorderStyle( WINDOW_BORDER_MONO );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxDescriptionEdit::SetNewText( const OUString& _rText )
 {
@@ -4663,7 +4663,7 @@ SvTreeListEntry* SvxToolbarConfigPage::AddFunction(
     return pNewLBEntry;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(
     Window* pParent, const ResId& aResId )
@@ -4676,14 +4676,14 @@ SvxToolbarEntriesListBox::SvxToolbarEntriesListBox(
     EnableCheckButton( m_pButtonData );
 }
 
-// --------------------------------------------------------
+
 
 SvxToolbarEntriesListBox::~SvxToolbarEntriesListBox()
 {
     delete m_pButtonData;
 }
 
-// --------------------------------------------------------
+
 
 void SvxToolbarEntriesListBox::BuildCheckBoxButtonImages( SvLBoxButtonData* pData )
 {
@@ -4753,7 +4753,7 @@ void SvxToolbarEntriesListBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// --------------------------------------------------------
+
 
 void SvxToolbarEntriesListBox::ChangeVisibility( SvTreeListEntry* pEntry )
 {
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index a6e468e532f3..1f52c537d8bb 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -481,7 +481,7 @@ void SfxConfigGroupListBox::SetStylesInfo(SfxStylesInfo_Impl* pStyles)
     pStylesInfo = pStyles;
 }
 
-//-----------------------------------------------
+
 void SfxConfigGroupListBox::InitModule()
 {
     try
@@ -517,17 +517,17 @@ void SfxConfigGroupListBox::InitModule()
         {}
 }
 
-//-----------------------------------------------
+
 void SfxConfigGroupListBox::InitBasic()
 {
 }
 
-//-----------------------------------------------
+
 void SfxConfigGroupListBox::InitStyles()
 {
 }
 
-//-----------------------------------------------
+
 namespace
 {
     //...........................................
@@ -580,7 +580,7 @@ namespace
     }
 }
 
-//-----------------------------------------------
+
 void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponentContext >& xContext,
     const css::uno::Reference< css::frame::XFrame >& xFrame,
     const OUString& sModuleLongName,
@@ -845,7 +845,7 @@ SfxConfigGroupListBox::getDocumentModel( Reference< XComponentContext >& xCtx, O
     return xModel;
 }
 
-//-----------------------------------------------
+
 OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand)
 {
     OUString sUIName;
@@ -873,7 +873,7 @@ OUString SfxConfigGroupListBox::MapCommand2UIName(const OUString& sCommand)
     return sUIName;
 }
 
-//-----------------------------------------------
+
 void SfxConfigGroupListBox::GroupSelected()
 /*  Description
     A function group or a basic module has been selected.
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 397a493bfe1e..ea10378a8594 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -53,7 +53,7 @@
 
 
 using namespace ::com::sun::star;
-// -----------------------------------------------------------------------
+
 
 SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, SvxEventConfigPage::EarlyInit ) :
 
@@ -94,7 +94,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
     aSaveInListBox.SelectEntryPos( nPos, true );
 }
 
-// -----------------------------------------------------------------------
+
 void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFrame  )
 {
     SetFrame( _rxFrame );
@@ -105,7 +105,7 @@ void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFra
     SelectHdl_Impl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxEventConfigPage::~SvxEventConfigPage()
 {
@@ -126,7 +126,7 @@ SvxEventConfigPage::~SvxEventConfigPage()
     delete mpImpl->pDeletePB;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxEventConfigPage::ImplInitDocument()
 {
@@ -174,7 +174,7 @@ void SvxEventConfigPage::ImplInitDocument()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
 {
@@ -221,7 +221,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet )
 {
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index e3fcb2b1ca64..e4536547cc15 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -253,7 +253,7 @@ _SvxMacroTabPage::~_SvxMacroTabPage()
 {
     DELETEZ( mpImpl );
 }
-// -----------------------------------------------------------------------------
+
 void _SvxMacroTabPage::InitResources()
 {
     // Note: the order here controls the order in which the events are displayed in the UI!
@@ -907,7 +907,7 @@ AssignComponentDialog::~AssignComponentDialog()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
 {
@@ -917,7 +917,7 @@ IMPL_LINK( SvxMacroAssignSingleTabDialog, OKHdl_Impl, Button *, pButton )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMacroAssignSingleTabDialog::SvxMacroAssignSingleTabDialog(Window *pParent,
     const SfxItemSet& rSet)
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 46565fc5f6a7..18f0c0559644 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -236,7 +236,7 @@ void SvxConfigGroupListBox::ClearAll()
     Clear();
 }
 
-//-----------------------------------------------
+
 namespace
 {
     //...........................................
diff --git a/cui/source/dialogs/SpellAttrib.cxx b/cui/source/dialogs/SpellAttrib.cxx
index 5a6894126cce..be09cce60c51 100644
--- a/cui/source/dialogs/SpellAttrib.cxx
+++ b/cui/source/dialogs/SpellAttrib.cxx
@@ -26,7 +26,7 @@ using namespace com::sun::star::linguistic2;
 using namespace com::sun::star::uno;
 
 
-//-----------------------------------------------------------------------
+
 SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) :
     TextAttrib(TEXTATTR_SPELL_ERROR),
     m_aSpellErrorDescription( rDesc )
@@ -34,107 +34,107 @@ SpellErrorAttrib::SpellErrorAttrib( const SpellErrorDescription& rDesc ) :
 }
 
 
-//-----------------------------------------------------------------------
+
 SpellErrorAttrib::SpellErrorAttrib( const SpellErrorAttrib& rAttr ) :
     TextAttrib(TEXTATTR_SPELL_ERROR),
     m_aSpellErrorDescription( rAttr.m_aSpellErrorDescription )
 {
 }
 
-//-----------------------------------------------------------------------
+
 SpellErrorAttrib::~SpellErrorAttrib()
 {
 }
 
-//-----------------------------------------------------------------------
+
 void SpellErrorAttrib::SetFont( Font&  ) const
 {
     //this attribute doesn't have a visual effect
 }
 
-//-----------------------------------------------------------------------
+
 TextAttrib*     SpellErrorAttrib::Clone() const
 {
     return new SpellErrorAttrib(*this);
 }
 
-//-----------------------------------------------------------------------
+
 bool SpellErrorAttrib::operator==( const TextAttrib& rAttr ) const
 {
     return Which() == rAttr.Which() &&
             m_aSpellErrorDescription == static_cast<const SpellErrorAttrib&>(rAttr).m_aSpellErrorDescription;
 }
 
-//-----------------------------------------------------------------------
+
 SpellLanguageAttrib::SpellLanguageAttrib(LanguageType eLang) :
     TextAttrib(TEXTATTR_SPELL_LANGUAGE),
     m_eLanguage(eLang)
 {
 }
 
-//-----------------------------------------------------------------------
+
 SpellLanguageAttrib::SpellLanguageAttrib( const SpellLanguageAttrib& rAttr ) :
     TextAttrib(TEXTATTR_SPELL_LANGUAGE),
     m_eLanguage(rAttr.m_eLanguage)
 {
 }
 
-//-----------------------------------------------------------------------
+
 SpellLanguageAttrib::~SpellLanguageAttrib()
 {
 }
 
-//-----------------------------------------------------------------------
+
 void SpellLanguageAttrib::SetFont( Font&  ) const
 {
     //no visual effect
 }
 
-//-----------------------------------------------------------------------
+
 TextAttrib* SpellLanguageAttrib::Clone() const
 {
     return new SpellLanguageAttrib(*this);
 }
 
-//-----------------------------------------------------------------------
+
 bool SpellLanguageAttrib::operator==( const TextAttrib& rAttr ) const
 {
     return Which() == rAttr.Which() &&
             m_eLanguage == static_cast<const SpellLanguageAttrib&>(rAttr).m_eLanguage;
 }
 
-//-----------------------------------------------------------------------
+
 SpellBackgroundAttrib::SpellBackgroundAttrib(const Color& rCol) :
     TextAttrib(TEXTATTR_SPELL_BACKGROUND),
     m_aBackgroundColor(rCol)
 {
 }
 
-//-----------------------------------------------------------------------
+
 SpellBackgroundAttrib::SpellBackgroundAttrib( const SpellBackgroundAttrib& rAttr ) :
     TextAttrib(TEXTATTR_SPELL_BACKGROUND),
     m_aBackgroundColor(rAttr.m_aBackgroundColor)
 {
 }
 
-//-----------------------------------------------------------------------
+
 SpellBackgroundAttrib::~SpellBackgroundAttrib()
 {
 }
 
-//-----------------------------------------------------------------------
+
 void SpellBackgroundAttrib::SetFont( Font& rFont ) const
 {
     rFont.SetFillColor(m_aBackgroundColor);
 }
 
-//-----------------------------------------------------------------------
+
 TextAttrib* SpellBackgroundAttrib::Clone() const
 {
     return new SpellBackgroundAttrib(*this);
 }
 
-//-----------------------------------------------------------------------
+
 bool SpellBackgroundAttrib::operator==( const TextAttrib& rAttr ) const
 {
     return Which() == rAttr.Which() &&
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index c28f120ef5de..aeae64d3c98d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -72,7 +72,7 @@ struct SpellDialog_Impl
 {
     Sequence< Reference< XDictionary >  >   aDics;
 };
-// -----------------------------------------------------------------------
+
 
 #define SPELLUNDO_START                     200
 
@@ -161,18 +161,18 @@ public:
 }//namespace svx
 using namespace ::svx;
 
-//-----------------------------------------------------------------------
+
 SpellUndoAction_Impl::~SpellUndoAction_Impl()
 {
 }
 
-//-----------------------------------------------------------------------
+
 void SpellUndoAction_Impl::Undo()
 {
     m_rActionLink.Call(this);
 }
 
-//-----------------------------------------------------------------------
+
 sal_uInt16 SpellUndoAction_Impl::GetId()const
 {
     return m_nId;
@@ -248,7 +248,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
                         this, SpellDialog, InitHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SpellDialog::~SpellDialog()
 {
@@ -262,7 +262,7 @@ SpellDialog::~SpellDialog()
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpellDialog::Init_Impl()
 {
@@ -297,7 +297,7 @@ void SpellDialog::Init_Impl()
     SvxGetChangeAllList()->clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpellDialog::UpdateBoxes_Impl()
 {
@@ -379,7 +379,7 @@ void SpellDialog::UpdateBoxes_Impl()
     if (bOldShowExplain != (bool) m_pExplainLink->IsVisible() || bOldShowGrammar != (bool) m_pCheckGrammarCB->IsVisible())
         setOptimalLayoutSize();
 }
-// -----------------------------------------------------------------------
+
 
 void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrentError )
 {
@@ -450,7 +450,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
     return 0;
 };
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn )
 {
@@ -484,7 +484,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn )
     }
     return 0;
 }
-// -----------------------------------------------------------------------
+
 IMPL_LINK( SpellDialog, CheckGrammarHdl, CheckBox*, pBox )
 {
     rParent.SetGrammarChecking( pBox->IsChecked() );
@@ -551,7 +551,7 @@ OUString SpellDialog::getReplacementString() const
     return getDotReplacementString(sOrigString, sReplacement);
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SpellDialog, ChangeHdl)
 {
@@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SpellDialog, ChangeHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl)
 {
@@ -604,7 +604,7 @@ IMPL_LINK_NOARG(SpellDialog, ChangeAllHdl)
     m_pSentenceED->UndoActionEnd();
     return 1;
 }
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
 {
@@ -653,7 +653,7 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton )
     return 1;
 }
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SpellDialog, UndoHdl)
 {
     m_pSentenceED->Undo();
@@ -662,7 +662,7 @@ IMPL_LINK_NOARG(SpellDialog, UndoHdl)
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction )
 {
     switch(pAction->GetId())
@@ -709,7 +709,7 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction )
 
     return 0;
 }
-// -----------------------------------------------------------------------
+
 void SpellDialog::Impl_Restore()
 {
     //clear the "ChangeAllList"
@@ -740,7 +740,7 @@ IMPL_LINK_NOARG(SpellDialog, IgnoreHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SpellDialog::Close()
 {
@@ -749,14 +749,14 @@ bool SpellDialog::Close()
         SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD);
     return true;
 }
-// -----------------------------------------------------------------------
+
 
 void SpellDialog::SetSelectedLang_Impl( LanguageType nLang )
 {
     m_pLanguageLB->SelectLanguage( nLang );
 }
 
-// -----------------------------------------------------------------------
+
 
 LanguageType SpellDialog::GetSelectedLang_Impl() const
 {
@@ -764,7 +764,7 @@ LanguageType SpellDialog::GetSelectedLang_Impl() const
     return nLang;
 }
 
-//-------------------------------------------------
+
 IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
 {
     //If selected language changes, then add->list should be regenerated to
@@ -793,7 +793,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox)
     SpellDialog::UpdateBoxes_Impl();
     return 0;
 }
-// -----------------------------------------------------------------------
+
 
 void SpellDialog::SetLanguage( sal_uInt16 nLang )
 /*
@@ -886,19 +886,19 @@ int SpellDialog::InitUserDicts()
     return nDicts;
 }
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, EMPTYARG )
 {
     return AddToDictionaryExecute(1, m_pAddToDictMB->GetPopupMenu());
 }
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton )
 {
     return AddToDictionaryExecute(pButton->GetCurItemId(), pButton->GetPopupMenu());
 }
 
-//-----------------------------------------------------------------------
+
 int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
     m_pSentenceED->UndoActionStart( SPELLUNDO_CHANGE_GROUP );
@@ -947,7 +947,7 @@ int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu )
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
 {
     if (m_pSentenceED == pEd)
@@ -973,7 +973,7 @@ IMPL_LINK(SpellDialog, ModifyHdl, SentenceEditWindow_Impl*, pEd)
     return 0;
 };
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SpellDialog, CancelHdl)
 {
     //apply changes and ignored text parts first - if there are any
@@ -982,7 +982,7 @@ IMPL_LINK_NOARG(SpellDialog, CancelHdl)
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 bool SpellDialog::Notify( NotifyEvent& rNEvt )
 {
     /* #i38338#
@@ -1010,7 +1010,7 @@ bool SpellDialog::Notify( NotifyEvent& rNEvt )
     return SfxModelessDialog::Notify(rNEvt);
 }
 
-//-------------------------------------------------
+
 void SpellDialog::InvalidateDialog()
 {
     if( bFocusLocked )
@@ -1043,7 +1043,7 @@ void SpellDialog::InvalidateDialog()
     SfxModelessDialog::Deactivate();
 }
 
-//-----------------------------------------------------------------------
+
 bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
 {
     bool bRet = false;
@@ -1185,7 +1185,7 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& rSentence, bool &bHasRe
     return bRet;
 }
 
-//-----------------------------------------------------------------------
+
 SentenceEditWindow_Impl::SentenceEditWindow_Impl(Window * pParent, WinBits nBits)
     : VclMultiLineEdit(pParent, nBits)
     , m_nErrorStart(0)
@@ -1201,7 +1201,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSentenceEditWindow(Window *
     return new SentenceEditWindow_Impl(pParent, WB_BORDER|WB_VSCROLL|WB_IGNORETAB);
 }
 
-//-----------------------------------------------------------------------
+
 SentenceEditWindow_Impl::~SentenceEditWindow_Impl()
 {
 }
@@ -1545,7 +1545,7 @@ bool SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     return bChange || VclMultiLineEdit::PreNotify(rNEvt);
 }
 
-//-----------------------------------------------------------------------
+
 bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xSpell )
 {
     if (bIgnoreCurrentError)
@@ -1637,7 +1637,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError, com::sun:
     return bRet;
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd, bool bGrammarError)
 {
     TextEngine* pTextEngine = GetTextEngine();
@@ -1649,7 +1649,7 @@ void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd
     m_nErrorEnd = nEnd;
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, LanguageType eLanguage)
 {
     //calculate length changes
@@ -1712,13 +1712,13 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const OUString& rNewWord, Languag
     pTextEngine->UndoActionEnd();
 }
 
-//-------------------------------------------------
+
 OUString SentenceEditWindow_Impl::GetErrorText() const
 {
     return GetTextEngine()->GetText(TextSelection(TextPaM(0, m_nErrorStart), TextPaM(0, m_nErrorEnd) ));
 }
 
-//-----------------------------------------------------------------------
+
 const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives()
 {
     TextPaM aCursor(0, m_nErrorStart);
@@ -1727,7 +1727,7 @@ const SpellErrorDescription* SentenceEditWindow_Impl::GetAlternatives()
     return pAttrib ? &pAttrib->GetErrorDescription() : 0;
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::RestoreCurrentError()
 {
     TextPaM aCursor(0, m_nErrorStart);
@@ -1741,7 +1741,7 @@ void SentenceEditWindow_Impl::RestoreCurrentError()
     }
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xAlt )
 {
     TextPaM aCursor(0, m_nErrorStart);
@@ -1765,20 +1765,20 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
     GetTextEngine()->SetAttrib( SpellErrorAttrib(aDesc), 0, m_nErrorStart, m_nErrorEnd );
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
     GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd);
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::SetText( const OUString& rStr )
 {
     m_nErrorStart = m_nErrorEnd = 0;
     GetTextEngine()->SetText(rStr);
 }
 
-//-----------------------------------------------------------------------
+
 struct LanguagePosition_Impl
 {
     sal_uInt16          nPosition;
@@ -1919,7 +1919,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
     return aRet;
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::Undo()
 {
     ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
@@ -1939,13 +1939,13 @@ void SentenceEditWindow_Impl::Undo()
         GetSpellDialog()->UpdateBoxes_Impl();
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::ResetUndo()
 {
     GetTextEngine()->ResetUndo();
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg )
 {
     ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
@@ -1953,25 +1953,25 @@ void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bT
     GetSpellDialog()->m_pUndoPB->Enable();
 }
 
-//-----------------------------------------------------------------------
+
 sal_uInt16 SentenceEditWindow_Impl::GetUndoActionCount()
 {
     return GetTextEngine()->GetUndoManager().GetUndoActionCount();
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::UndoActionStart( sal_uInt16 nId )
 {
     GetTextEngine()->UndoActionStart(nId);
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::UndoActionEnd()
 {
     GetTextEngine()->UndoActionEnd();
 }
 
-//-----------------------------------------------------------------------
+
 void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset)
 {
     if(nOffset > 0)
@@ -1980,7 +1980,7 @@ void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset)
         m_nErrorEnd = m_nErrorEnd -(sal_uInt16)- nOffset;
 }
 
-//-----------------------------------------------------------------------
+
 void  SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
 {
     DBG_ASSERT(!bSet || m_bIsUndoEditMode != bSet, "SetUndoEditMode with equal values?");
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index 012895d388cf..a4b1ffab7dd5 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -30,7 +30,7 @@
 // SvxClickInfoCtr
 //=============================================================================
 
-//-----------------------------------------------------------------------------
+
 SvxClickInfoCtr::SvxClickInfoCtr( Window* pParent, const ResId& rResId ) :
         Control( pParent, rResId ),
         aFixedInfo( this)
@@ -39,13 +39,13 @@ SvxClickInfoCtr::SvxClickInfoCtr( Window* pParent, const ResId& rResId ) :
     aFixedInfo.Show();
 }
 
-//-----------------------------------------------------------------------------
+
 void SvxClickInfoCtr::MouseButtonDown( const MouseEvent& )
 {
     aActivateLink.Call(this);
 }
 
-//-----------------------------------------------------------------------------
+
 bool SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt )
 {
     if(rNEvt.GetType()==EVENT_GETFOCUS || rNEvt.GetType()==EVENT_MOUSEBUTTONDOWN)
@@ -56,19 +56,19 @@ bool SvxClickInfoCtr::PreNotify( NotifyEvent& rNEvt )
     return Control::PreNotify(rNEvt);
 }
 
-//-----------------------------------------------------------------------------
+
 void SvxClickInfoCtr::SetText( const OUString& rStr )
 {
     aFixedInfo.SetText(rStr );
 }
 
-//-----------------------------------------------------------------------------
+
 OUString SvxClickInfoCtr::GetText() const
 {
     return aFixedInfo.GetText();
 }
 
-//-----------------------------------------------------------------------------
+
 SvxClickInfoCtr::~SvxClickInfoCtr()
 {
 }
@@ -76,7 +76,7 @@ SvxClickInfoCtr::~SvxClickInfoCtr()
 //=============================================================================
 // SvxCommonLinguisticControl
 //=============================================================================
-//-----------------------------------------------------------------------------
+
 SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
     :Window( _pParent, CUI_RES( RID_SVX_WND_COMMON_LINGU ) )
     ,aWordText      ( this, CUI_RES( FT_WORD ) )
@@ -100,7 +100,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
     Show();
 }
 
-// -----------------------------------------------------------------------
+
 PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType  ) const
 {
     const PushButton* pButton = NULL;
@@ -116,7 +116,7 @@ PushButton* SvxCommonLinguisticControl::implGetButton( ButtonType _eType  ) cons
     return const_cast< PushButton* >( pButton );
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link& _rHandler )
 {
     Button* pButton = GetButton( _eType );
@@ -124,7 +124,7 @@ void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link
         pButton->SetClickHdl( _rHandler );
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEnable )
 {
     Button* pButton = GetButton( _eType );
@@ -132,7 +132,7 @@ void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEna
         pButton->Enable( _bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow, Window& _rLastGroupWindow, ControlGroup _eInsertAfter )
 {
     Window* pInsertAfter = NULL;    // will be the last window of our own "undividable" group, after which we insert the foreign group
@@ -170,7 +170,7 @@ void SvxCommonLinguisticControl::InsertControlGroup( Window& _rFirstGroupWindow,
         // (FirstWindow, LastWindow) was no valid control group
 }
 
-//-----------------------------------------------------------------------------
+
 void SvxCommonLinguisticControl::Paint( const Rectangle& rRect )
 {
     Window::Paint(rRect );
@@ -181,7 +181,7 @@ void SvxCommonLinguisticControl::Paint( const Rectangle& rRect )
     aDecoView.DrawButton( aRect, BUTTON_DRAW_NOFILL );
 }
 
-//-----------------------------------------------------------------------------
+
 void SvxCommonLinguisticControl::Enlarge( sal_Int32 _nX, sal_Int32 _nY )
 {
     Size aSize;
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 4159a31eaa33..207bef33cb98 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -104,34 +104,34 @@ SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItem
     CreateOutputItemSet( pSet ? *pSet->GetPool() : SFX_APP()->GetPool() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCharacterMap::~SvxCharacterMap()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 const Font& SvxCharacterMap::GetCharFont() const
 {
     return aFont;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharacterMap::SetChar( sal_UCS4 c )
 {
     m_pShowSet->SelectCharacter( c );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_UCS4 SvxCharacterMap::GetChar() const
 {
     return m_pShowSet->GetSelectCharacter();
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxCharacterMap::GetCharacters() const
 {
@@ -139,7 +139,7 @@ OUString SvxCharacterMap::GetCharacters() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharacterMap::DisableFontSelection()
 {
@@ -182,7 +182,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowText(Window *pParent
     return new SvxShowText(pParent);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShowText::Paint( const Rectangle& )
 {
@@ -266,7 +266,7 @@ void SvxShowText::Paint( const Rectangle& )
         Control::SetFont(aOrigFont);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShowText::SetFont( const Font& rFont )
 {
@@ -296,7 +296,7 @@ void SvxShowText::Resize()
     SetFont(GetFont()); //force recalculation of size
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShowText::SetText( const OUString& rText )
 {
@@ -304,7 +304,7 @@ void SvxShowText::SetText( const OUString& rText )
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxShowText::~SvxShowText()
 {}
@@ -382,7 +382,7 @@ void SvxCharacterMap::init()
         m_pOKBtn->Enable();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharacterMap::SetCharFont( const Font& rFont )
 {
@@ -401,7 +401,7 @@ void SvxCharacterMap::SetCharFont( const Font& rFont )
     ModalDialog::SetFont( aFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, OKHdl)
 {
@@ -430,7 +430,7 @@ void SvxCharacterMap::fillAllSubsets(ListBox &rListBox)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
 {
@@ -485,7 +485,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
 {
@@ -500,7 +500,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, SubsetSelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl)
 {
@@ -513,7 +513,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharDoubleClickHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl)
 {
@@ -535,7 +535,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharSelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl)
 {
@@ -574,7 +574,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl)
 {
@@ -591,7 +591,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharPreSelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharacterMap, DeleteLastHdl)
 {
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index dcd508d4f82d..b176f40b9568 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -52,9 +52,9 @@
 #include <svx/dialmgr.hxx>
 
 
-// --------------
+
 // - Namespaces -
-// --------------
+
 
 using namespace ::ucbhelper;
 using namespace ::rtl;
@@ -65,9 +65,9 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
-// ----------------
+
 // - SearchThread -
-// ----------------
+
 
 SearchThread::SearchThread( SearchProgress* pProgess,
                             TPGalleryThemeProperties* pBrowser,
@@ -79,13 +79,13 @@ SearchThread::SearchThread( SearchProgress* pProgess,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 SearchThread::~SearchThread()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void SearchThread::execute()
 {
@@ -114,7 +114,7 @@ void SearchThread::execute()
     Application::PostUserEvent( LINK( mpProgress, SearchProgress, CleanUpHdl ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SearchThread::ImplSearch( const INetURLObject& rStartURL,
                                const ::std::vector< OUString >& rFormats,
@@ -200,9 +200,9 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
     }
 }
 
-// ------------------
+
 // - SearchProgress -
-// ------------------
+
 
 SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL )
     : ModalDialog(pParent, "GallerySearchProgress", "cui/ui/gallerysearchprogress.ui")
@@ -216,7 +216,7 @@ SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL
     m_pBtnCancel->SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SearchProgress::Terminate()
 {
@@ -224,7 +224,7 @@ void SearchProgress::Terminate()
         maSearchThread->terminate();
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn)
 {
@@ -232,7 +232,7 @@ IMPL_LINK_NOARG(SearchProgress, ClickCancelBtn)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
 {
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 short SearchProgress::Execute()
 {
@@ -255,7 +255,7 @@ short SearchProgress::Execute()
     return RET_CANCEL;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl )
 {
@@ -266,9 +266,9 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl )
     ModalDialog::StartExecuteModal( rEndDialogHdl );
 }
 
-// --------------
+
 // - TakeThread -
-// --------------
+
 
 TakeThread::TakeThread(
     TakeProgress* pProgess,
@@ -282,13 +282,13 @@ TakeThread::TakeThread(
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 TakeThread::~TakeThread()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void TakeThread::execute()
 {
@@ -334,9 +334,9 @@ void TakeThread::execute()
     Application::PostUserEvent( LINK( mpProgress, TakeProgress, CleanUpHdl ) );
 }
 
-// ----------------
+
 // - TakeProgress -
-// ----------------
+
 
 TakeProgress::TakeProgress( Window* pWindow ) :
     ModalDialog     ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_TAKE_PROGRESS ) ),
@@ -349,7 +349,7 @@ TakeProgress::TakeProgress( Window* pWindow ) :
     aBtnCancel.SetClickHdl( LINK( this, TakeProgress, ClickCancelBtn ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 
 void TakeProgress::Terminate()
@@ -358,7 +358,7 @@ void TakeProgress::Terminate()
         maTakeThread->terminate();
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn)
 {
@@ -366,7 +366,7 @@ IMPL_LINK_NOARG(TakeProgress, ClickCancelBtn)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
 {
@@ -420,7 +420,7 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 short TakeProgress::Execute()
 {
@@ -430,7 +430,7 @@ short TakeProgress::Execute()
     return RET_CANCEL;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
 {
@@ -441,9 +441,9 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
     ModalDialog::StartExecuteModal( rEndDialogHdl );
 }
 
-// ---------------------
+
 // - ActualizeProgress -
-// ---------------------
+
 
 ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
     ModalDialog             ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
@@ -457,7 +457,7 @@ ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
     aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 short ActualizeProgress::Execute()
 {
@@ -477,7 +477,7 @@ short ActualizeProgress::Execute()
     return nRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn)
 {
@@ -487,7 +487,7 @@ IMPL_LINK_NOARG(ActualizeProgress, ClickCancelBtn)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer )
 {
@@ -503,7 +503,7 @@ IMPL_LINK( ActualizeProgress, TimeoutHdl, Timer*, _pTimer )
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
 {
@@ -531,9 +531,9 @@ TitleDialog::TitleDialog(Window* pParent, const OUString& rOldTitle)
     m_pEdit->GrabFocus();
 }
 
-// -------------------
+
 // - GalleryIdDialog -
-// -------------------
+
 
 GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm )
     : ModalDialog(pParent, "GalleryThemeIDDialog", "cui/ui/gallerythemeiddialog.ui")
@@ -552,7 +552,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm )
     m_pBtnOk->SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
 {
@@ -586,9 +586,9 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
 }
 
 
-// --------------------------
+
 // - GalleryThemeProperties -
-// --------------------------
+
 
 GalleryThemeProperties::GalleryThemeProperties(Window* pParent,
     ExchangeData* _pData, SfxItemSet* pItemSet)
@@ -614,7 +614,7 @@ GalleryThemeProperties::GalleryThemeProperties(Window* pParent,
     SetText( aText );
 }
 
-// ------------------------------------------------------------------------
+
 
 void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
@@ -624,9 +624,9 @@ void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
         ( (TPGalleryThemeProperties&) rPage ).SetXChgData( pData );
 }
 
-// -------------------------
+
 // - TPGalleryThemeGeneral -
-// -------------------------
+
 
 TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet ) :
             SfxTabPage              ( pParent, CUI_RES( RID_SVXTABPAGE_GALLERY_GENERAL ), rSet ),
@@ -652,7 +652,7 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet&
     aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage );
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
 {
@@ -711,7 +711,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
     aFiMSImage.SetImage( Image( Bitmap( CUI_RES( nId ) ), COL_LIGHTMAGENTA ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ )
 {
@@ -719,16 +719,16 @@ sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ )
     return sal_True;
 }
 
-// ------------------------------------------------------------------------
+
 
 SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new TPGalleryThemeGeneral( pParent, rSet );
 }
 
-// ----------------------------
+
 // - TPGalleryThemeProperties -
-// ----------------------------
+
 
 TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) :
         SfxTabPage          ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
@@ -755,7 +755,7 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxIt
     aLbxFound.SetAccessibleRelationLabeledBy(&aLbxFound);
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
 {
@@ -781,7 +781,7 @@ void TPGalleryThemeProperties::SetXChgData( ExchangeData* _pData )
     aCbxPreview.Disable();
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult )
 {
@@ -795,7 +795,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh
     nCurFilterPos = aCbbFileType.GetEntryPos( aCbbFileType.GetText() );
 }
 
-// ------------------------------------------------------------------------
+
 
 TPGalleryThemeProperties::~TPGalleryThemeProperties()
 {
@@ -807,14 +807,14 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new TPGalleryThemeProperties( pParent, rSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
 {
@@ -833,7 +833,7 @@ OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText,
     return sRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeProperties::FillFilterList()
 {
@@ -975,7 +975,7 @@ void TPGalleryThemeProperties::FillFilterList()
     aCbbFileType.SetText( pFilterEntry->aFilterName );
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
 {
@@ -992,7 +992,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeProperties::SearchFiles()
 {
@@ -1008,7 +1008,7 @@ void TPGalleryThemeProperties::SearchFiles()
     pProgress->StartExecuteModal( LINK( this, TPGalleryThemeProperties, EndSearchProgressHdl ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
 {
@@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeProperties::TakeFiles()
 {
@@ -1064,7 +1064,7 @@ void TPGalleryThemeProperties::TakeFiles()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl)
 {
@@ -1086,7 +1086,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TPGalleryThemeProperties::DoPreview()
 {
@@ -1115,7 +1115,7 @@ void TPGalleryThemeProperties::DoPreview()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
 {
@@ -1142,7 +1142,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
 {
@@ -1156,7 +1156,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
 {
@@ -1189,7 +1189,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
 {
@@ -1204,7 +1204,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, DClickFoundHdl)
         return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl)
 {
@@ -1213,7 +1213,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, PreviewTimerHdl)
     return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
 {
@@ -1234,7 +1234,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
   return 0L;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK( TPGalleryThemeProperties, DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent*, pEvt )
 {
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index c67d06439f47..ae2ada60750b 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -54,7 +54,7 @@ Size GraphicPreviewWindow::GetOptimalSize() const
     return LogicToPixel(Size(81, 73), MAP_APPFONT);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void GraphicPreviewWindow::Paint( const Rectangle& rRect )
 {
@@ -78,7 +78,7 @@ void GraphicPreviewWindow::Paint( const Rectangle& rRect )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void GraphicPreviewWindow::SetPreview( const Graphic& rGraphic )
 {
@@ -154,7 +154,7 @@ GraphicFilterDialog::GraphicFilterDialog(Window* pParent,
     mpPreview->init(&rGraphic, maModifyHdl);
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
 {
@@ -165,7 +165,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplPreviewTimeoutHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
 {
@@ -178,9 +178,9 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
     return 0;
 }
 
-// ----------------
+
 // - FilterMosaic -
-// ----------------
+
 
 GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges )
@@ -205,7 +205,7 @@ GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraph
     mpMtrWidth->GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double fScaleX, double fScaleY )
@@ -243,9 +243,9 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
     return aRet;
 }
 
-// ------------------
+
 // - GraphicFilterSmooth -
-// ------------------
+
 
 GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraphic, double nRadius)
     : GraphicFilterDialog(pParent, "SmoothDialog",
@@ -258,7 +258,7 @@ GraphicFilterSmooth::GraphicFilterSmooth( Window* pParent, const Graphic& rGraph
     mpMtrRadius->GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double /*fScaleX*/, double /*fScaleY*/ )
 {
@@ -287,9 +287,9 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
     return aRet;
 }
 
-// ------------------
+
 // - GraphicFilterSolarize -
-// ------------------
+
 
 GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
                                               sal_uInt8 cGreyThreshold, sal_Bool bInvert )
@@ -306,7 +306,7 @@ GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rG
     mpCbxInvert->SetToggleHdl( GetModifyHdl() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
                                                    double /*fScaleX*/, double /*fScaleY*/ )
@@ -342,9 +342,9 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
     return aRet;
 }
 
-// ----------------------
+
 // - GraphicFilterSepia -
-// ----------------------
+
 
 GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
                                         sal_uInt16 nSepiaPercent )
@@ -357,7 +357,7 @@ GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic
     mpMtrSepia->SetModifyHdl( GetModifyHdl() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
                                                 double /*fScaleX*/, double /*fScaleY*/ )
@@ -383,9 +383,9 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
     return aRet;
 }
 
-// -----------------------
+
 // - GraphicFilterPoster -
-// -----------------------
+
 
 GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphic,
                                           sal_uInt16 nPosterCount)
@@ -400,7 +400,7 @@ GraphicFilterPoster::GraphicFilterPoster(Window* pParent, const Graphic& rGraphi
     mpNumPoster->SetModifyHdl( GetModifyHdl() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double /*fScaleX*/, double /*fScaleY*/ )
@@ -426,9 +426,9 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
     return aRet;
 }
 
-// -----------------------
+
 // - GraphicFilterEmboss -
-// -----------------------
+
 
 void EmbossControl::MouseButtonDown( const MouseEvent& rEvt )
 {
@@ -450,7 +450,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeEmbossControl(Window *pPare
     return new EmbossControl(pParent);
 }
 
-// -----------------------------------------------------------------------------
+
 
 GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent,
     const Graphic& rGraphic, RECT_POINT eLightSource)
@@ -463,7 +463,7 @@ GraphicFilterEmboss::GraphicFilterEmboss(Window* pParent,
     mpCtlLight->GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
                                                  double /*fScaleX*/, double /*fScaleY*/ )
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 0f1efdaf8b50..666863ce0537 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -66,7 +66,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
 
 
 
-// -----------------------------------------------------------------------
+
 
 
 
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index ededbf44c363..d0bdd78a68e6 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -53,7 +53,7 @@ namespace svx
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::container;
 
-    //-------------------------------------------------------------------------
+
     namespace
     {
         class FontSwitch
@@ -103,7 +103,7 @@ namespace svx
             ::vcl::ControlLayoutData* _pLayoutData = NULL );
     };
 
-    //-------------------------------------------------------------------------
+
     PseudoRubyText::PseudoRubyText( const OUString& _rPrimary, const OUString& _rSecondary, const RubyPosition _ePosition )
         :m_sPrimaryText( _rPrimary )
         ,m_sSecondaryText( _rSecondary )
@@ -111,7 +111,7 @@ namespace svx
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle,
         Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData )
     {
@@ -220,7 +220,7 @@ namespace svx
         virtual void    Paint( const Rectangle& _rRect );
     };
 
-    //-------------------------------------------------------------------------
+
     RubyRadioButton::RubyRadioButton( Window* _pParent, const ResId& _rId,
         const OUString& _rSecondary, const PseudoRubyText::RubyPosition _ePosition )
         :RadioButton( _pParent, _rId )
@@ -228,7 +228,7 @@ namespace svx
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void RubyRadioButton::Paint( const Rectangle& )
     {
         HideFocus();
@@ -300,7 +300,7 @@ namespace svx
     //=========================================================================
     //= SuggestionSet
     //=========================================================================
-    //-------------------------------------------------------------------------
+
 
     SuggestionSet::SuggestionSet( Window* pParent )
                     : ValueSet( pParent, pParent->GetStyle() | WB_BORDER )
@@ -334,7 +334,7 @@ namespace svx
     //=========================================================================
     //= SuggestionDisplay
     //=========================================================================
-    //-------------------------------------------------------------------------
+
 
     SuggestionDisplay::SuggestionDisplay( Window* pParent, const ResId& rResId )
         : Control( pParent, rResId )
@@ -498,7 +498,7 @@ namespace svx
     //=========================================================================
     //= HangulHanjaConversionDialog
     //=========================================================================
-    //-------------------------------------------------------------------------
+
     HangulHanjaConversionDialog::HangulHanjaConversionDialog( Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
         :ModalDialog( _pParent, CUI_RES( RID_SVX_MDLG_HANGULHANJA ) )
         ,m_pPlayground( new SvxCommonLinguisticControl( this ) )
@@ -607,12 +607,12 @@ namespace svx
         m_aSuggestions.SetHelpIds();
     }
 
-    //-------------------------------------------------------------------------
+
     HangulHanjaConversionDialog::~HangulHanjaConversionDialog( )
     {
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::FillSuggestions( const ::com::sun::star::uno::Sequence< OUString >& _rSuggestions )
     {
         m_aSuggestions.Clear();
@@ -634,43 +634,43 @@ namespace svx
         OnSuggestionModified( &m_pPlayground->GetWordInputControl() );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetOptionsChangedHdl( const Link& _rHdl )
     {
         m_aOptionsChangedLink = _rHdl;
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetIgnoreHdl( const Link& _rHdl )
     {
         m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eIgnore, _rHdl );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetIgnoreAllHdl( const Link& _rHdl )
     {
         m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eIgnoreAll, _rHdl );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetChangeHdl( const Link& _rHdl )
     {
         m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eChange, _rHdl );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetChangeAllHdl( const Link& _rHdl )
     {
         m_pPlayground->SetButtonHandler( SvxCommonLinguisticControl::eChangeAll, _rHdl );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetFindHdl( const Link& _rHdl )
     {
         m_aFind.SetClickHdl( _rHdl );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link& _rHdl )
     {
         m_aSimpleConversion.SetClickHdl( _rHdl );
@@ -682,13 +682,13 @@ namespace svx
         m_pHangulBelow->SetClickHdl( _rHdl );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link& _rHdl )
     {
         m_aClickByCharacterLink = _rHdl;
     }
 
-    //-------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionSelected)
     {
         m_pPlayground->GetWordInputControl().SetText( m_aSuggestions.GetSelectEntry() );
@@ -696,7 +696,7 @@ namespace svx
         return 0L;
     }
 
-    //-------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
     {
         m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
@@ -708,7 +708,7 @@ namespace svx
         return 0L;
     }
 
-    //-------------------------------------------------------------------------
+
     IMPL_LINK( HangulHanjaConversionDialog, ClickByCharacterHdl, CheckBox *, pBox )
     {
         m_aClickByCharacterLink.Call(pBox);
@@ -719,7 +719,7 @@ namespace svx
         return 0L;
     }
 
-    //-------------------------------------------------------------------------
+
     IMPL_LINK( HangulHanjaConversionDialog, OnConversionDirectionClicked, CheckBox *, pBox )
     {
         CheckBox *pOtherBox = 0;
@@ -738,7 +738,7 @@ namespace svx
         return 0L;
     }
 
-    //-------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnClose)
     {
         Close();
@@ -753,19 +753,19 @@ namespace svx
         return 0L;
     }
 
-    //-------------------------------------------------------------------------
+
     OUString HangulHanjaConversionDialog::GetCurrentString( ) const
     {
         return m_pPlayground->GetCurrentText( );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::FocusSuggestion( )
     {
         m_pPlayground->GetWordInputControl().GrabFocus();
     }
 
-    //-------------------------------------------------------------------------
+
     namespace
     {
         void lcl_modifyWindowStyle( Window* _pWin, WinBits _nSet, WinBits _nReset )
@@ -776,7 +776,7 @@ namespace svx
         }
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetCurrentString( const OUString& _rNewString,
         const Sequence< OUString >& _rSuggestions, bool _bOriginatesFromDocument )
     {
@@ -821,20 +821,20 @@ namespace svx
         }
     }
 
-    //-------------------------------------------------------------------------
+
     OUString HangulHanjaConversionDialog::GetCurrentSuggestion( ) const
     {
         return m_pPlayground->GetWordInputControl().GetText();
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetByCharacter( bool _bByCharacter )
     {
         m_aReplaceByChar.Check( _bByCharacter );
         m_aSuggestions.DisplayListBox( !_bByCharacter );
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetConversionDirectionState(
             bool _bTryBothDirections,
             HHC::ConversionDirection _ePrimaryConversionDirection )
@@ -854,13 +854,13 @@ namespace svx
         }
     }
 
-    //-------------------------------------------------------------------------
+
     bool HangulHanjaConversionDialog::GetUseBothDirections( ) const
     {
         return !m_aHangulOnly.IsChecked() && !m_aHanjaOnly.IsChecked();
     }
 
-    //-------------------------------------------------------------------------
+
     HHC::ConversionDirection HangulHanjaConversionDialog::GetDirection(
             HHC::ConversionDirection eDefaultDirection ) const
     {
@@ -872,7 +872,7 @@ namespace svx
         return eDirection;
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::SetConversionFormat( HHC::ConversionFormat _eType )
     {
         switch ( _eType )
@@ -889,7 +889,7 @@ namespace svx
         }
     }
 
-    //-------------------------------------------------------------------------
+
     HHC::ConversionFormat HangulHanjaConversionDialog::GetConversionFormat( ) const
     {
         if ( m_aSimpleConversion.IsChecked() )
@@ -911,7 +911,7 @@ namespace svx
         return HHC::eSimpleConversion;
     }
 
-    //-------------------------------------------------------------------------
+
     void HangulHanjaConversionDialog::EnableRubySupport( bool bVal )
     {
         m_pHanjaAbove->Enable( bVal );
@@ -924,7 +924,7 @@ namespace svx
     //=========================================================================
     //= HangulHanjaOptionsDialog
     //=========================================================================
-    //-------------------------------------------------------------------------
+
 
     void HangulHanjaOptionsDialog::Init( void )
     {
@@ -1174,7 +1174,7 @@ namespace svx
     //=========================================================================
     //= HangulHanjaNewDictDialog
     //=========================================================================
-    //-------------------------------------------------------------------------
+
 
     IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl)
     {
@@ -1219,7 +1219,7 @@ namespace svx
     //=========================================================================
     //= HangulHanjaEditDictDialog
     //=========================================================================
-    //-------------------------------------------------------------------------
+
 
     class SuggestionList
     {
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 9b812960cfbe..a88ea1a55e43 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -76,7 +76,7 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId,
     SetStyle ( GetStyle()  | WB_DIALOGCONTROL | WB_HIDE );
 }
 
-// -----------------------------------------------------------------------
+
 
 IconChoicePage::~IconChoicePage()
 {
@@ -92,7 +92,7 @@ void IconChoicePage::ActivatePage( const SfxItemSet& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 int IconChoicePage::DeactivatePage( SfxItemSet* )
 {
@@ -109,14 +109,14 @@ void IconChoicePage::FillUserData()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool IconChoicePage::IsReadOnly() const
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool IconChoicePage::QueryClose()
 {
@@ -152,7 +152,7 @@ void IconChoicePage::ImplInitSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoicePage::StateChanged( StateChangedType nType )
 {
@@ -165,7 +165,7 @@ void IconChoicePage::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -248,7 +248,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
     SetPosSizeCtrls ( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 IconChoiceDialog ::~IconChoiceDialog ()
 {
@@ -396,7 +396,7 @@ void IconChoiceDialog::ShowPageImpl ( IconChoicePageData* pData )
         pData->pPage->Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
 {
@@ -404,7 +404,7 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
         pData->pPage->Hide();
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::ShowPage( sal_uInt16 nId )
 {
@@ -680,7 +680,7 @@ IMPL_LINK_NOARG(IconChoiceDialog, OkHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
 {
@@ -702,7 +702,7 @@ IMPL_LINK_NOARG(IconChoiceDialog, ResetHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(IconChoiceDialog, CancelHdl)
 {
@@ -774,7 +774,7 @@ void IconChoiceDialog::ActivatePageImpl ()
 
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool IconChoiceDialog::DeActivatePageImpl ()
 {
@@ -841,7 +841,7 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl ()
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::ResetPageImpl ()
 {
@@ -912,7 +912,7 @@ const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
 {
@@ -927,14 +927,14 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*/ )
 {
     // not interested in
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 )
 {
@@ -959,7 +959,7 @@ short IconChoiceDialog::Execute()
     return Dialog::Execute();
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::Start( sal_Bool bShow )
 {
@@ -974,7 +974,7 @@ void IconChoiceDialog::Start( sal_Bool bShow )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool IconChoiceDialog::QueryClose()
 {
@@ -991,7 +991,7 @@ sal_Bool IconChoiceDialog::QueryClose()
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::Start_Impl()
 {
@@ -1029,7 +1029,7 @@ void IconChoiceDialog::Start_Impl()
     ActivatePageImpl();
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxItemSet* IconChoiceDialog::GetRefreshedSet()
 {
@@ -1097,7 +1097,7 @@ sal_Bool IconChoiceDialog::OK_Impl()
     return bEnd;
 }
 
-// -----------------------------------------------------------------------
+
 
 short IconChoiceDialog::Ok()
 {
@@ -1146,7 +1146,7 @@ short IconChoiceDialog::Ok()
     return _bModified ? RET_OK : RET_CANCEL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId )
 {
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 98df52dadfde..b18821088f1f 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -100,7 +100,7 @@ InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const OString
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl)
 {
@@ -109,7 +109,7 @@ IMPL_LINK_NOARG_INLINE_START(SvInsertOleDlg, DoubleClickHdl)
 }
 IMPL_LINK_INLINE_END( SvInsertOleDlg, DoubleClickHdl, ListBox *, pListBox )
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
 {
@@ -140,7 +140,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl)
 {
@@ -157,14 +157,14 @@ IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvInsertOleDlg::SelectDefault()
 {
     m_pLbObjecttype->SelectEntryPos(0);
 }
 
-// -----------------------------------------------------------------------
+
 SvInsertOleDlg::SvInsertOleDlg
 (
     Window* pParent,
@@ -382,7 +382,7 @@ IMPL_LINK_NOARG(SvInsertPlugInDialog, BrowseHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvInsertPlugInDialog::SvInsertPlugInDialog(Window* pParent,
     const uno::Reference < embed::XStorage >& xStorage)
@@ -400,7 +400,7 @@ SvInsertPlugInDialog::~SvInsertPlugInDialog()
     delete m_pURL;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void Plugin_ImplFillCommandSequence( const OUString& aCommands, uno::Sequence< beans::PropertyValue >& aCommandSequence )
 {
@@ -692,7 +692,7 @@ short SfxInsertFloatingFrameDialog::Execute()
     return nRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
 {
@@ -715,7 +715,7 @@ IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, CheckHdl, CheckBox*, pCB )
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK( SfxInsertFloatingFrameDialog, OpenHdl, PushButton*, EMPTYARG )
 {
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index 0eca236620c3..a0b10a2f973b 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -124,7 +124,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl)
 {
@@ -143,7 +143,7 @@ IMPL_LINK_NOARG(SvxMultiFileDialog, DelHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed ) :
 
@@ -157,7 +157,7 @@ SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed
     aDelBtn.Enable();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMultiFileDialog::~SvxMultiFileDialog()
 {
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 1fa83cb323d4..21233dd573d9 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -65,7 +65,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, SelectHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox )
 {
@@ -76,7 +76,7 @@ IMPL_LINK( SvxMultiPathDialog, CheckHdl_Impl, svx::SvxRadioButtonListBox *, pBox
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
 {
@@ -128,7 +128,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, AddHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
 {
@@ -174,7 +174,7 @@ IMPL_LINK_NOARG(SvxMultiPathDialog, DelHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed ) :
 
@@ -214,7 +214,7 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed
     aDelBtn.SetAccessibleRelationMemberOf(&aPathLB);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMultiPathDialog::~SvxMultiPathDialog()
 {
@@ -230,7 +230,7 @@ SvxMultiPathDialog::~SvxMultiPathDialog()
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxMultiPathDialog::GetPath() const
 {
@@ -268,7 +268,7 @@ OUString SvxMultiPathDialog::GetPath() const
     return sNewPath;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMultiPathDialog::SetPath( const OUString& rPath )
 {
@@ -313,7 +313,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
     SelectHdl_Impl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMultiPathDialog::SetClassPathMode()
 {
@@ -322,14 +322,14 @@ void SvxMultiPathDialog::SetClassPathMode()
     aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxMultiPathDialog::IsClassPathMode() const
 {
     return pImpl->bIsClassPathMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMultiPathDialog::EnableRadioButtonMode()
 {
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index e4ba4c047b6a..d430bdb75c45 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -121,7 +121,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
         SetText( get<FixedText>("alttitle")->GetText() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPostItDialog::~SvxPostItDialog()
 {
@@ -129,7 +129,7 @@ SvxPostItDialog::~SvxPostItDialog()
     pOutSet = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rDate)
 {
@@ -139,7 +139,7 @@ void SvxPostItDialog::ShowLastAuthor(const OUString& rAuthor, const OUString& rD
     m_pLastEditFT->SetText( sTxt );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxPostItDialog::GetRanges()
 {
@@ -152,7 +152,7 @@ sal_uInt16* SvxPostItDialog::GetRanges()
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
 {
@@ -160,7 +160,7 @@ void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
     m_pNextBtn->Enable(bNext);
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl)
 {
@@ -169,7 +169,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, PrevHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, PrevHdl)
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl)
 {
@@ -178,7 +178,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPostItDialog, NextHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxPostItDialog, NextHdl)
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 {
@@ -208,7 +208,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPostItDialog, OKHdl)
 {
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index b47fa2e4fa51..5b22625109ab 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -423,9 +423,9 @@ void SFTreeListBox::ExpandedHdl()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 // CuiInputDialog ------------------------------------------------------------
-// ----------------------------------------------------------------------------
+
 CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode )
     : ModalDialog(pParent, "NewLibDialog",
         "cui/ui/newlibdialog.ui")
@@ -451,9 +451,9 @@ CuiInputDialog::CuiInputDialog(Window * pParent, sal_uInt16 nMode )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 // ScriptOrgDialog ------------------------------------------------------------
-// ----------------------------------------------------------------------------
+
 SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, OUString language )
     : SfxModalDialog(pParent, "ScriptOrganizerDialog",
         "cui/ui/scriptorganizer.ui")
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index d6d1ab001413..b16642e7b72f 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -34,7 +34,7 @@
 //  FmShowColsDialog
 //==========================================================================
 DBG_NAME(FmShowColsDialog)
-//--------------------------------------------------------------------------
+
 FmShowColsDialog::FmShowColsDialog(Window* pParent)
     : ModalDialog(pParent, "ShowColDialog", "cui/ui/showcoldialog.ui")
 {
@@ -46,7 +46,7 @@ FmShowColsDialog::FmShowColsDialog(Window* pParent)
     m_pOK->SetClickHdl( LINK( this, FmShowColsDialog, OnClickedOk ) );
 }
 
-//--------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
 {
     DBG_ASSERT(m_xColumns.is(), "FmShowColsDialog::OnClickedOk : you should call SetColumns before executing the dialog !");
@@ -74,7 +74,7 @@ IMPL_LINK_NOARG(FmShowColsDialog, OnClickedOk)
     return 0L;
 }
 
-//--------------------------------------------------------------------------
+
 void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>& xCols)
 {
     DBG_ASSERT(xCols.is(), "FmShowColsDialog::SetColumns : invalid columns !");
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 16a043428910..d13ce270845e 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -171,7 +171,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent,
     m_pAttrLB->SelectEntryPos( 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
 {
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 019e43c0b46b..e369d03ef2fa 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -48,7 +48,7 @@ sal_uInt16 SvxZoomDialog::GetFactor() const
         return SPECIAL_FACTOR;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId )
 {
@@ -91,7 +91,7 @@ void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomDialog::HideButton( sal_uInt16 nBtnId )
 {
@@ -114,7 +114,7 @@ void SvxZoomDialog::HideButton( sal_uInt16 nBtnId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax )
 {
@@ -125,7 +125,7 @@ void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax )
     m_pUserEdit->SetLast( nMax );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
     : SfxModalDialog(pParent, "ZoomDialog", "cui/ui/zoomdialog.ui")
@@ -285,7 +285,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomDialog::~SvxZoomDialog()
 {
@@ -293,7 +293,7 @@ SvxZoomDialog::~SvxZoomDialog()
     pOutSet = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
 {
@@ -309,7 +309,7 @@ IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
 {
@@ -319,7 +319,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
 {
@@ -351,7 +351,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt )
 {
@@ -371,7 +371,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk )
 {
@@ -383,7 +383,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
 {
diff --git a/cui/source/factory/init.cxx b/cui/source/factory/init.cxx
index a903d19269c8..12d1316f57cc 100644
--- a/cui/source/factory/init.cxx
+++ b/cui/source/factory/init.cxx
@@ -20,7 +20,7 @@
 #include <vcl/msgbox.hxx>
 #include "cuicharmap.hxx"
 
-// ------------------------------------------------------------------------
+
 // hook to call special character dialog for edits
 // caution: needs C-Linkage since dynamically loaded via symbol name
 extern "C"
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index b128312c182c..90122e166be4 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -272,9 +272,9 @@ void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >& )
 {
 }
 
-// --------------------
+
 // class SvxChartColorTableItem
-// --------------------
+
 
 SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, const SvxChartColorTable& aTable ) :
     SfxPoolItem( nWhich_ ),
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index 1f4a2b29cfdb..254fd12cee4f 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -36,42 +36,42 @@ namespace offapp
     using namespace ::utl;
     using namespace ::com::sun::star::uno;
 
-    //--------------------------------------------------------------------
+
     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& getDriverSettingsNodeName()
     {
         static OUString s_sNodeName("DriverSettings");
         return s_sNodeName;
     }
 
-    //--------------------------------------------------------------------
+
     static const OUString& getDriverNameNodeName()
     {
         static OUString s_sNodeName("DriverName");
         return s_sNodeName;
     }
 
-    //--------------------------------------------------------------------
+
     static const OUString& getEnableNodeName()
     {
         static OUString s_sNodeName("Enable");
         return s_sNodeName;
     }
 
-    //--------------------------------------------------------------------
+
     static const OUString& getTimeoutNodeName()
     {
         static OUString s_sNodeName("Timeout");
@@ -81,7 +81,7 @@ namespace offapp
     //====================================================================
     //= ConnectionPoolConfig
     //====================================================================
-    //--------------------------------------------------------------------
+
     void ConnectionPoolConfig::GetOptions(SfxItemSet& _rFillItems)
     {
         // the config node where all pooling relevant info are stored under
@@ -146,7 +146,7 @@ namespace offapp
         _rFillItems.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, aSettings));
     }
 
-    //--------------------------------------------------------------------
+
     void ConnectionPoolConfig::SetOptions(const SfxItemSet& _rSourceItems)
     {
         // the config node where all pooling relevant info are stored under
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index d58d38de284c..4c6adee5dc31 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -88,7 +88,7 @@ namespace offapp
         OUString implGetCellText(DriverPoolingSettings::const_iterator _rPos, sal_uInt16 _nColId) const;
     };
 
-    //--------------------------------------------------------------------
+
     DriverListControl::DriverListControl(Window* _pParent)
         :EditBrowseBox(_pParent, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL | BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL | WB_BORDER)
         ,m_aSeekRow(m_aSettings.end())
@@ -105,14 +105,14 @@ namespace offapp
         return new DriverListControl(pParent);
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DriverListControl::IsTabAllowed(sal_Bool /*_bForward*/) const
     {
         // no travinling within the fields via RETURN and TAB
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DriverListControl::isModified() const
     {
         if (m_aSettings.size() != m_aSavedSettings.size())
@@ -130,7 +130,7 @@ namespace offapp
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::Init()
     {
         EditBrowseBox::Init();
@@ -144,7 +144,7 @@ namespace offapp
             // Attention: the resource of the string is local to the resource of the enclosing dialog!
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::CursorMoved()
     {
         EditBrowseBox::CursorMoved();
@@ -159,7 +159,7 @@ namespace offapp
         }
     }
 
-    //--------------------------------------------------------------------
+
     const DriverPooling* DriverListControl::getCurrentRow() const
     {
         OSL_ENSURE( ( GetCurRow() < m_aSettings.size() ) && ( GetCurRow() >= 0 ),
@@ -171,7 +171,7 @@ namespace offapp
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     DriverPooling* DriverListControl::getCurrentRow()
     {
         OSL_ENSURE( ( GetCurRow() < m_aSettings.size() ) && ( GetCurRow() >= 0 ),
@@ -183,13 +183,13 @@ namespace offapp
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::updateCurrentRow()
     {
         Window::Invalidate( GetRowRectPixel( GetCurRow() ), INVALIDATE_UPDATE );
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::Update(const DriverPoolingSettings& _rSettings)
     {
         m_aSettings = _rSettings;
@@ -202,13 +202,13 @@ namespace offapp
         ActivateCell(1, 0);
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt32 DriverListControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
     {
         return GetDataWindow().GetTextWidth(GetCellText(nRow, nColId));
     }
 
-    //--------------------------------------------------------------------
+
     OUString DriverListControl::implGetCellText(DriverPoolingSettings::const_iterator _rPos, sal_uInt16 _nColId) const
     {
         OSL_ENSURE(_rPos < m_aSettings.end(), "DriverListControl::implGetCellText: invalid position!");
@@ -232,7 +232,7 @@ namespace offapp
         return sReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::StateChanged( StateChangedType nStateChange )
     {
         if (STATE_CHANGE_ENABLE == nStateChange)
@@ -240,7 +240,7 @@ namespace offapp
         EditBrowseBox::StateChanged( nStateChange );
     }
 
-    //--------------------------------------------------------------------
+
     OUString DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) const
     {
         OUString sReturn;
@@ -255,25 +255,25 @@ namespace offapp
         return sReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol )
     {
         rController->GetWindow().SetText(GetCellText(nRow, nCol));
     }
 
-    //--------------------------------------------------------------------
+
     ::svt::CellController* DriverListControl::GetController( long /*nRow*/, sal_uInt16 /*nCol*/ )
     {
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DriverListControl::SaveModified()
     {
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DriverListControl::SeekRow( long _nRow )
     {
         EditBrowseBox::SeekRow(_nRow);
@@ -286,7 +286,7 @@ namespace offapp
         return m_aSeekRow != m_aSettings.end();
     }
 
-    //--------------------------------------------------------------------
+
     void DriverListControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const
     {
         OSL_ENSURE(m_aSeekRow != m_aSettings.end(), "DriverListControl::PaintCell: invalid row!");
@@ -314,7 +314,7 @@ namespace offapp
     //====================================================================
     //= ConnectionPoolOptionsPage
     //====================================================================
-    //--------------------------------------------------------------------
+
     ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(Window* _pParent, const SfxItemSet& _rAttrSet)
         : SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", _rAttrSet)
     {
@@ -340,13 +340,13 @@ namespace offapp
         m_pDriverList->SetRowChangeHandler( LINK(this, ConnectionPoolOptionsPage, OnDriverRowChanged) );
     }
 
-    //--------------------------------------------------------------------
+
     SfxTabPage* ConnectionPoolOptionsPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet)
     {
         return new ConnectionPoolOptionsPage(_pParent, _rAttrSet);
     }
 
-    //--------------------------------------------------------------------
+
     void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet, sal_Bool /*_bFromReset*/)
     {
         // the enabled flag
@@ -371,7 +371,7 @@ namespace offapp
         OnEnabledDisabled(m_pEnablePooling);
     }
 
-    //--------------------------------------------------------------------
+
     bool ConnectionPoolOptionsPage::Notify( NotifyEvent& _rNEvt )
     {
         if (EVENT_LOSEFOCUS == _rNEvt.GetType())
@@ -381,7 +381,7 @@ namespace offapp
         return SfxTabPage::Notify(_rNEvt);
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
     {
         commitTimeoutField();
@@ -404,20 +404,20 @@ namespace offapp
         return bModified;
     }
 
-    //--------------------------------------------------------------------
+
     void ConnectionPoolOptionsPage::ActivatePage( const SfxItemSet& _rSet)
     {
         SfxTabPage::ActivatePage(_rSet);
         implInitControls(_rSet, sal_False);
     }
 
-    //--------------------------------------------------------------------
+
     void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet)
     {
         implInitControls(_rSet, sal_True);
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( ConnectionPoolOptionsPage, OnDriverRowChanged, const void*, _pRowIterator )
     {
         sal_Bool bValidRow = (NULL != _pRowIterator);
@@ -443,7 +443,7 @@ namespace offapp
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     void ConnectionPoolOptionsPage::commitTimeoutField()
     {
         if (DriverPooling* pCurrentDriver = m_pDriverList->getCurrentRow())
@@ -453,7 +453,7 @@ namespace offapp
         }
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, const CheckBox*, _pCheckBox )
     {
         sal_Bool bGloballyEnabled = m_pEnablePooling->IsChecked();
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 63a75b2f4f26..59a86c74f8cb 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -27,7 +27,7 @@ namespace offapp
     //====================================================================
     //= DriverPooling
     //====================================================================
-    //--------------------------------------------------------------------
+
     DriverPooling::DriverPooling( const OUString& _rName, sal_Bool _bEnabled, const sal_Int32 _nTimeout )
         :sName(_rName)
         ,bEnabled(_bEnabled)
@@ -35,7 +35,7 @@ namespace offapp
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DriverPooling::operator == (const DriverPooling& _rR) const
     {
         return  (sName == _rR.sName)
@@ -46,7 +46,7 @@ namespace offapp
     //====================================================================
     //= DriverPoolingSettings
     //====================================================================
-    //--------------------------------------------------------------------
+
     DriverPoolingSettings::DriverPoolingSettings()
     {
     }
@@ -55,14 +55,14 @@ namespace offapp
     //= DriverPoolingSettingsItem
     //====================================================================
     TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem )
-    //--------------------------------------------------------------------
+
     DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings )
         :SfxPoolItem(_nId)
         ,m_aSettings(_rSettings)
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool DriverPoolingSettingsItem::operator==( const SfxPoolItem& _rCompare ) const
     {
         const DriverPoolingSettingsItem* pItem = PTR_CAST(DriverPoolingSettingsItem, &_rCompare);
@@ -87,13 +87,13 @@ namespace offapp
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     SfxPoolItem* DriverPoolingSettingsItem::Clone( SfxItemPool * ) const
     {
         return new DriverPoolingSettingsItem(Which(), m_aSettings);
     }
 
-    //--------------------------------------------------------------------
+
 
 //........................................................................
 }   // namespace offapp
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 4ec978d07a05..5bdca4c442b2 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -163,7 +163,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx
     pPathBox->ShowTable();
 }
 
-// -----------------------------------------------------------------------
+
 
 DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
 {
@@ -172,7 +172,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
     delete pPathBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
                                     const SfxItemSet& rAttrSet )
@@ -180,7 +180,7 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
     return ( new DbRegistrationOptionsPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
 {
@@ -208,7 +208,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
 {
@@ -256,7 +256,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void DbRegistrationOptionsPage::FillUserData()
 {
@@ -268,7 +268,7 @@ void DbRegistrationOptionsPage::FillUserData()
     aUserData += (bUp ? OUString("1") : OUString("0"));
     SetUserData( aUserData );
 }
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
 {
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl)
     }
     return 0;
 }
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl)
 {
     OUString sNewName,sNewLocation;
@@ -289,7 +289,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
 {
@@ -309,7 +309,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
     return 1L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
 {
@@ -340,7 +340,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
 {
@@ -372,7 +372,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
     }
     return 1;
 }
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl)
 {
@@ -389,7 +389,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl)
     m_pDelete->Enable( !bReadOnly );
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly )
 {
     OUString aStr( _sName );
@@ -410,7 +410,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUS
     pEntry->SetUserData( new DatabaseRegistration( _sLocation, _bReadOnly ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const OUString& _sOldLocation,SvTreeListEntry* _pEntry)
 {
     ODocumentLinkDialog aDlg(this,_pEntry == NULL);
@@ -434,7 +434,7 @@ void DbRegistrationOptionsPage::openLinkDialog(const OUString& _sOldName,const O
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( DbRegistrationOptionsPage, NameValidator, OUString*, _pName )
 {
     if ( _pName )
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index b802ad981214..5f03c7339877 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -44,7 +44,7 @@ namespace svx
     //====================================================================
     //= DbRegisteredNamesConfig
     //====================================================================
-    //--------------------------------------------------------------------
+
     void DbRegisteredNamesConfig::GetOptions( SfxItemSet& _rFillItems )
     {
         DatabaseRegistrations aSettings;
@@ -73,7 +73,7 @@ namespace svx
         _rFillItems.Put( DatabaseMapItem( SID_SB_DB_REGISTER, aSettings ) );
     }
 
-    //--------------------------------------------------------------------
+
     void DbRegisteredNamesConfig::SetOptions(const SfxItemSet& _rSourceItems)
     {
         // the settings for the single drivers
diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index 6dac6e67c836..1b6b5b581ad0 100644
--- a/cui/source/options/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -30,14 +30,14 @@ namespace svx
     //= DatabaseMapItem
     //====================================================================
     TYPEINIT1( DatabaseMapItem, SfxPoolItem )
-    //--------------------------------------------------------------------
+
     DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations )
         :SfxPoolItem( _nId )
         ,m_aRegistrations( _rRegistrations )
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseMapItem::operator==( const SfxPoolItem& _rCompare ) const
     {
         const DatabaseMapItem* pItem = PTR_CAST(DatabaseMapItem, &_rCompare);
@@ -50,13 +50,13 @@ namespace svx
         return m_aRegistrations == pItem->m_aRegistrations;
     }
 
-    //--------------------------------------------------------------------
+
     SfxPoolItem* DatabaseMapItem::Clone( SfxItemPool* ) const
     {
         return new DatabaseMapItem( Which(), m_aRegistrations );
     }
 
-    //--------------------------------------------------------------------
+
 
 //........................................................................
 }   // namespace svx
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 3e9d2f6f136b..78e8901df9ee 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -42,7 +42,7 @@ namespace svx
     //==================================================================
     //= ODocumentLinkDialog
     //==================================================================
-    //------------------------------------------------------------------
+
     ODocumentLinkDialog::ODocumentLinkDialog( Window* _pParent, sal_Bool _bCreateNew )
         : ModalDialog(_pParent, "DatabaseLinkDialog",
             "cui/ui/databaselinkdialog.ui")
@@ -70,7 +70,7 @@ namespace svx
         m_pURL->SetDropDownLineCount( 5 );
     }
 
-    //------------------------------------------------------------------
+
     void ODocumentLinkDialog::setLink( const OUString& _rName, const OUString& _rURL )
     {
         m_pName->SetText(_rName);
@@ -78,21 +78,21 @@ namespace svx
         validate();
     }
 
-    //------------------------------------------------------------------
+
     void ODocumentLinkDialog::getLink( OUString& _rName, OUString& _rURL ) const
     {
         _rName = m_pName->GetText();
         _rURL = m_pURL->GetText();
     }
 
-    //------------------------------------------------------------------
+
     void ODocumentLinkDialog::validate( )
     {
 
         m_pOK->Enable( ( !m_pName->GetText().isEmpty()) && ( !m_pURL->GetText().isEmpty() ) );
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk)
     {
         // get the current URL
@@ -150,7 +150,7 @@ namespace svx
         return 0L;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK_NOARG(ODocumentLinkDialog, OnBrowseFile)
     {
         ::sfx2::FileDialogHelper aFileDlg(
@@ -195,7 +195,7 @@ namespace svx
         return 0L;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK_NOARG(ODocumentLinkDialog, OnTextModified)
     {
         validate( );
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index eb66e8bcf3bd..b0aef7426558 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -315,7 +315,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
     return 0;
 }
 
-//--------------------------------------------------------------------------
+
 IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
 {
     OUString sFontName = m_pFontNameLB->GetSelectEntry();
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 13255efa306f..2fb211d0c5eb 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -38,7 +38,7 @@ public:
         const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry);
 };
 
-// -----------------------------------------------------------------------
+
 
 void OptLBoxString_Impl::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
@@ -52,14 +52,14 @@ void OptLBoxString_Impl::Paint(
     rDev.DrawText( rPos, GetText() );
     rDev.SetFont( aOldFont );
 }
-// -----------------------------------------------------------------------------
+
 
 OptHeaderTabListBox::OptHeaderTabListBox(SvSimpleTableContainer& rParent, WinBits nWinStyle)
     : SvSimpleTable(rParent, nWinStyle)
 {
 }
 
-// -----------------------------------------------------------------------
+
 void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rTxt,
                                      const Image& rImg1, const Image& rImg2,
                                      SvLBoxButtonKind eButtonKind )
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index a9f5ff8af34f..3348c38f7a27 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -159,12 +159,12 @@ long SvxDefaultColorOptPage::GetColorIndex( const Color& rCol )
 
 
 
-// --------------------
+
 // event handlers
-// --------------------
+
 
 // ResetToDefaults
-// ---------------
+
 
 IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
 {
@@ -183,7 +183,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, ResetToDefaults)
 }
 
 // AddChartColor
-// ------------
+
 
 IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
 {
@@ -204,7 +204,7 @@ IMPL_LINK_NOARG(SvxDefaultColorOptPage, AddChartColor)
 }
 
 // RemoveChartColor
-// ----------------
+
 
 IMPL_LINK( SvxDefaultColorOptPage, RemoveChartColor, PushButton*, pButton )
 {
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 7223e3972663..ebd2e495c813 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -56,16 +56,16 @@ SvxCTLOptionsPage::SvxCTLOptionsPage( Window* pParent, const SfxItemSet& rSet )
 
     m_pNumeralsLB->SetDropDownLineCount( m_pNumeralsLB->GetEntryCount() );
 }
-// -----------------------------------------------------------------------------
+
 SvxCTLOptionsPage::~SvxCTLOptionsPage()
 {
 }
-// -----------------------------------------------------------------------------
+
 SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new SvxCTLOptionsPage( pParent, rAttrSet );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bModified = sal_False;
@@ -112,7 +112,7 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
 
     return bModified;
 }
-// -----------------------------------------------------------------------------
+
 void SvxCTLOptionsPage::Reset( const SfxItemSet& )
 {
     SvtCTLOptions aCTLOptions;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 5476f8d8d8c9..afd4b6386fd1 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -117,7 +117,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
     pLanguageLB->SelectEntryPos(0);
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
 {
@@ -191,7 +191,7 @@ IMPL_LINK_NOARG(SvxNewDictionaryDialog, OKHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxNewDictionaryDialog, ModifyHdl_Impl)
 {
@@ -330,13 +330,13 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxEditDictionaryDialog::~SvxEditDictionaryDialog()
 {
 }
 
-// -----------------------------------------------------------------------
+
 /*
 void SvxEditDictionaryDialog::Paint( const Rectangle& rRect )
 {
@@ -348,7 +348,7 @@ void SvxEditDictionaryDialog::Paint( const Rectangle& rRect )
 //    aDecoView.DrawButton( aRect, nStyle);
 }
 */
-// -----------------------------------------------------------------------
+
 
 void SvxEditDictionaryDialog::SetDicReadonly_Impl(
             Reference< XDictionary >  &xDic )
@@ -367,7 +367,7 @@ void SvxEditDictionaryDialog::SetDicReadonly_Impl(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxEditDictionaryDialog::SetLanguage_Impl( util::Language nLanguage )
 {
@@ -414,7 +414,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl)
 {
@@ -439,7 +439,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectBookHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
 {
@@ -474,7 +474,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
 {
@@ -546,7 +546,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
     LeaveWait();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
 {
@@ -573,7 +573,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
     return 0;
 };
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
 {
@@ -671,7 +671,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
 {
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 951ac053f5dd..a1c10e088d61 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -36,7 +36,7 @@ enum MSFltrPg2_CheckBoxEntries {
     InvalidCBEntry
 };
 
-// -----------------------------------------------------------------------
+
 
 OfaMSFilterTabPage::OfaMSFilterTabPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage( pParent, "OptFltrPage", "cui/ui/optfltrpage.ui", rSet )
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3e4cdf57c5bd..83bb0eeb8436 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -181,7 +181,7 @@ namespace
         }
 }
 
-// -----------------------------------------------------------------------
+
 
 OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", rSet)
@@ -227,20 +227,20 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
     m_pToolTipsCB->SetClickHdl( aLink );
 }
 
-// -----------------------------------------------------------------------
+
 
 OfaMiscTabPage::~OfaMiscTabPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaMiscTabPage( pParent, rAttrSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -294,7 +294,7 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -329,7 +329,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd )
 {
@@ -353,7 +353,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd )
 {
@@ -365,7 +365,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl)
 {
@@ -373,7 +373,7 @@ IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 class CanvasSettings
 {
@@ -393,7 +393,7 @@ private:
     mutable sal_Bool           mbHWAccelChecked;
 };
 
-// -------------------------------------------------------------------
+
 CanvasSettings::CanvasSettings() :
     mxForceFlagNameAccess(),
     mbHWAccelAvailable(sal_False),
@@ -452,7 +452,7 @@ CanvasSettings::CanvasSettings() :
     }
 }
 
-// -------------------------------------------------------------------
+
 sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const
 {
     if( !mbHWAccelChecked )
@@ -499,7 +499,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const
     return mbHWAccelAvailable;
 }
 
-// -------------------------------------------------------------------
+
 sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const
 {
     bool bForceLastEntry(false);
@@ -512,7 +512,7 @@ sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const
     return !bForceLastEntry;
 }
 
-// -------------------------------------------------------------------
+
 void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const
 {
     Reference< XNameReplace > xNameReplace(
@@ -1414,7 +1414,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
 
     return sal_False;
 }
-//-----------------------------------------------------------------------------
+
 void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
 {
     OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 0ff50b94a03e..1894b14a4555 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -157,7 +157,7 @@ const vFieldInfo[] =
 
 } // namespace
 
-// -----------------------------------------------------------------------
+
 
 //
 // Row
@@ -182,7 +182,7 @@ public:
     }
 };
 
-// -----------------------------------------------------------------------
+
 
 //
 // Field
@@ -208,7 +208,7 @@ public:
     }
 };
 
-// -----------------------------------------------------------------------
+
 
 SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet)
 
@@ -220,12 +220,12 @@ SvxGeneralTabPage::SvxGeneralTabPage(Window* pParent, const SfxItemSet& rCoreSet
     SetLinks();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxGeneralTabPage::~SvxGeneralTabPage ()
 { }
 
-//------------------------------------------------------------------------
+
 
 // Initializes the titles and the edit boxes,
 // according to vRowInfo[] and vFieldInfo[] above.
@@ -284,7 +284,7 @@ void SvxGeneralTabPage::InitControls ()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxGeneralTabPage::SetLinks ()
 {
@@ -295,14 +295,14 @@ void SvxGeneralTabPage::SetLinks ()
         vFields[i]->pEdit->SetModifyHdl(aLink);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new SvxGeneralTabPage( pParent, rAttrSet ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
 {
@@ -321,7 +321,7 @@ sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
     return bModified;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxGeneralTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -344,7 +344,7 @@ void SvxGeneralTabPage::Reset( const SfxItemSet& rSet )
     m_pUseDataCB->Check( SvtSaveOptions().IsUseUserData() );
 }
 
-//------------------------------------------------------------------------
+
 
 // ModifyHdl_Impl()
 // This handler updates the initials (short name)
@@ -381,7 +381,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxGeneralTabPage::GetAddress_Impl()
 {
@@ -400,7 +400,7 @@ sal_Bool SvxGeneralTabPage::GetAddress_Impl()
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxGeneralTabPage::SetAddress_Impl()
 {
@@ -430,7 +430,7 @@ void SvxGeneralTabPage::SetAddress_Impl()
         vFields[i]->pEdit->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ )
 {
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 1ae7df384f98..9b5ecba3a71b 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -40,7 +40,7 @@ const sal_uInt16 aExportToPosArr[] =
     2,  //StarWriter
     1   //Netscape Navigator 4.0
 };
-// -----------------------------------------------------------------------
+
 
 OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
 SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", rSet )
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 382d902f5c88..ebe2cfc487dc 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -96,7 +96,7 @@ using namespace ::sfx2;
 
 #include <sal/config.h>
 
-// -----------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxNoSpaceEdit(Window *pParent, VclBuilder::stringmap &)
 {
@@ -122,7 +122,7 @@ void SvxNoSpaceEdit::KeyInput( const KeyEvent& rKEvent )
         Edit::KeyInput(rKEvent);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNoSpaceEdit::Modify()
 {
@@ -505,7 +505,7 @@ void SvxProxyTabPage::EnableControls_Impl(sal_Bool bEnable)
     m_pNoProxyDescFT->Enable(bEnable);
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox )
 {
@@ -521,7 +521,7 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit )
 {
@@ -1290,6 +1290,6 @@ IMPL_LINK(  SvxEMailTabPage, FileDialogHdl_Impl, PushButton*, pButton )
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index e5ec7b8d6334..4fa9192bae4e 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
-// -----------------------------------------------------------------------
+
 
 bool areListsEqual( const Sequence< OUString >& rListA, const Sequence< OUString >& rListB )
 {
@@ -197,7 +197,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxJavaOptionsPage::~SvxJavaOptionsPage()
 {
@@ -217,7 +217,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage()
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl)
 {
@@ -227,7 +227,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList )
 {
@@ -238,7 +238,7 @@ IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvSimpleTable *, pList )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
 {
@@ -254,7 +254,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
 {
@@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
 {
@@ -330,7 +330,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
 {
@@ -375,7 +375,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl)
 {
@@ -383,7 +383,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ResetHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl)
 {
@@ -403,7 +403,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, StartFolderPickerHdl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
 {
@@ -416,7 +416,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
 {
@@ -431,7 +431,7 @@ IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::ClearJavaInfo()
 {
@@ -452,7 +452,7 @@ void SvxJavaOptionsPage::ClearJavaInfo()
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::ClearJavaList()
 {
@@ -466,7 +466,7 @@ void SvxJavaOptionsPage::ClearJavaList()
     m_pJavaList->Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::LoadJREs()
 {
@@ -512,7 +512,7 @@ void SvxJavaOptionsPage::LoadJREs()
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
 {
@@ -534,7 +534,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry )
 {
@@ -556,7 +556,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry )
         m_pJavaList->SetCheckButtonState( _pEntry, SV_BUTTON_CHECKED );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
 {
@@ -631,14 +631,14 @@ void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new SvxJavaOptionsPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
 {
@@ -745,7 +745,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
 {
@@ -774,7 +774,7 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
     m_aResetTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaOptionsPage::FillUserData()
 {
@@ -806,13 +806,13 @@ SvxJavaParameterDlg::SvxJavaParameterDlg( Window* pParent ) :
     EnableRemoveButton();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxJavaParameterDlg::~SvxJavaParameterDlg()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
 {
@@ -822,7 +822,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
 {
@@ -841,7 +841,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl)
 {
@@ -849,7 +849,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, SelectHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl)
 {
@@ -859,7 +859,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, DblClickHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
 {
@@ -880,7 +880,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, RemoveHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 short SvxJavaParameterDlg::Execute()
 {
@@ -889,7 +889,7 @@ short SvxJavaParameterDlg::Execute()
     return ModalDialog::Execute();
 }
 
-// -----------------------------------------------------------------------
+
 
 Sequence< OUString > SvxJavaParameterDlg::GetParameters() const
 {
@@ -901,7 +901,7 @@ Sequence< OUString > SvxJavaParameterDlg::GetParameters() const
     return aParamList;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams )
 {
@@ -936,7 +936,7 @@ SvxJavaClassPathDlg::SvxJavaClassPathDlg(Window* pParent)
     m_pPathList->GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
 {
@@ -945,7 +945,7 @@ SvxJavaClassPathDlg::~SvxJavaClassPathDlg()
         delete static_cast< OUString* >( m_pPathList->GetEntryData(i) );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
 {
@@ -982,7 +982,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
 {
@@ -1019,7 +1019,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddPathHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
 {
@@ -1040,7 +1040,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, RemoveHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl)
 {
@@ -1048,7 +1048,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, SelectHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath )
 {
@@ -1068,7 +1068,7 @@ bool SvxJavaClassPathDlg::IsPathDuplicate( const OUString& _rPath )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxJavaClassPathDlg::GetClassPath() const
 {
@@ -1087,7 +1087,7 @@ OUString SvxJavaClassPathDlg::GetClassPath() const
     return sPath;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxJavaClassPathDlg::SetClassPath( const OUString& _rPath )
 {
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 8b6a21c2377e..c4037bee0e7c 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -654,7 +654,7 @@ ServiceInfo_Impl * SvxLinguData_Impl::GetInfoByImplName( const OUString &rSvcImp
 }
 
 
-//-----------------------------------------------------------------------------
+
 
 static void lcl_MergeLocales(Sequence< Locale >& aAllLocales, const Sequence< Locale >& rAdd)
 {
@@ -1163,7 +1163,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, const SfxItemSet& rSet ) :
         pItem = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLinguTabPage::~SvxLinguTabPage()
 {
@@ -1171,7 +1171,7 @@ SvxLinguTabPage::~SvxLinguTabPage()
         delete pLinguData;
 }
 
-//------------------------------------------------------------------------
+
 
 // don't throw away overloaded
 sal_uInt16* SvxLinguTabPage::GetRanges()
@@ -1180,7 +1180,7 @@ sal_uInt16* SvxLinguTabPage::GetRanges()
     return pRanges;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
                                      const SfxItemSet& rAttrSet )
@@ -1188,7 +1188,7 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
     return ( new SvxLinguTabPage( pParent, rAttrSet ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
@@ -1353,7 +1353,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
     return bModified;
 }
 
-// ----------------------------------------------------------------------
+
 
 sal_uLong SvxLinguTabPage::GetDicUserData( const uno::Reference< XDictionary > &rxDic, sal_uInt16 nIdx )
 {
@@ -1396,7 +1396,7 @@ void SvxLinguTabPage::AddDicBoxEntry(
     m_pLinguDicsCLB->SetUpdateMode(sal_True);
 }
 
-// ----------------------------------------------------------------------
+
 
 void SvxLinguTabPage::UpdateDicBox_Impl()
 {
@@ -1415,7 +1415,7 @@ void SvxLinguTabPage::UpdateDicBox_Impl()
     m_pLinguDicsCLB->SetUpdateMode(sal_True);
 }
 
-// ----------------------------------------------------------------------
+
 
 void SvxLinguTabPage::UpdateModulesBox_Impl()
 {
@@ -1438,7 +1438,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -1549,7 +1549,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
     m_pLinguOptionsCLB->SetUpdateMode(sal_True);
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox )
 {
@@ -1568,7 +1568,7 @@ IMPL_LINK( SvxLinguTabPage, BoxDoubleClickHdl_Impl, SvTreeListBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl)
 {
@@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, PostDblClickHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl)
 {
@@ -1585,7 +1585,7 @@ IMPL_LINK_NOARG(SvxLinguTabPage, OpenURLHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
 {
@@ -1616,7 +1616,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
 {
@@ -1800,7 +1800,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox )
 {
@@ -1836,7 +1836,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol )
 {
@@ -1856,7 +1856,7 @@ SvTreeListEntry* SvxLinguTabPage::CreateEntry( OUString& rTxt, sal_uInt16 nCol )
     return pEntry;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLinguTabPage::HideGroups( sal_uInt16 nGrp )
 {
@@ -2339,7 +2339,7 @@ IMPL_LINK_NOARG(SvxEditModulesDlg, BackHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxEditModulesDlg, OpenURLHdl_Impl)
 {
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index e912183e3f3e..80249e37e940 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -109,7 +109,7 @@ int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rSet)
     : SfxTabPage(pParent, "OptMemoryPage", "cui/ui/optmemorypage.ui", rSet)
@@ -140,20 +140,20 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS
     m_pNfGraphicCache->SetModifyHdl( LINK( this, OfaMemoryOptionsPage, GraphicCacheConfigHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 OfaMemoryOptionsPage::~OfaMemoryOptionsPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return new OfaMemoryOptionsPage( pParent, rAttrSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -205,7 +205,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
 {
@@ -251,7 +251,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
     m_pQuickLaunchCB->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(OfaMemoryOptionsPage, GraphicCacheConfigHdl)
 {
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5aa07b462a18..8e8758d4e93c 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -244,7 +244,7 @@ SvxPathTabPage::SvxPathTabPage(Window* pParent, const SfxItemSet& rSet)
     xDialogListener->SetDialogClosedLink( LINK( this, SvxPathTabPage, DialogClosedHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPathTabPage::~SvxPathTabPage()
 {
@@ -254,7 +254,7 @@ SvxPathTabPage::~SvxPathTabPage()
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxPathTabPage::Create( Window* pParent,
                                     const SfxItemSet& rAttrSet )
@@ -262,7 +262,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent,
     return ( new SvxPathTabPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& )
 {
@@ -276,7 +276,7 @@ sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPathTabPage::Reset( const SfxItemSet& )
 {
@@ -370,7 +370,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& )
     PathSelect_Impl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPathTabPage::FillUserData()
 {
@@ -383,7 +383,7 @@ void SvxPathTabPage::FillUserData()
     SetUserData( aUserData );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
 {
@@ -406,7 +406,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
 {
@@ -462,7 +462,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
 {
@@ -527,7 +527,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const OUString& _rFolder )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
 {
@@ -634,7 +634,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
 {
@@ -663,7 +663,7 @@ IMPL_LINK( SvxPathTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
 {
@@ -694,7 +694,7 @@ IMPL_LINK( SvxPathTabPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
 {
@@ -708,7 +708,7 @@ IMPL_LINK( SvxPathTabPage, DialogClosedHdl, DialogClosedEvent*, pEvt )
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPathTabPage::GetPathList(
     sal_uInt16 _nPathHandle, OUString& _rInternalPath,
@@ -778,7 +778,7 @@ void SvxPathTabPage::GetPathList(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPathTabPage::SetPathList(
     sal_uInt16 _nPathHandle, const OUString& _rUserPath, const OUString& _rWritablePath )
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 27d8da1de675..e4b6e58a6706 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -54,7 +54,7 @@ using namespace comphelper;
 
 #define CFG_PAGE_AND_GROUP          OUString("General"), OUString("LoadSave")
 
-// ----------------------------------------------------------------------
+
 
 struct SvxSaveTabPage_Impl
 {
@@ -196,14 +196,14 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
     DetectHiddenControls();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxSaveTabPage::~SfxSaveTabPage()
 {
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
                                     const SfxItemSet& rAttrSet )
@@ -211,7 +211,7 @@ SfxTabPage* SfxSaveTabPage::Create( Window* pParent,
     return ( new SfxSaveTabPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 void SfxSaveTabPage::DetectHiddenControls()
 {
     SvtOptionsDialogOptions aOptionsDlgOpt;
@@ -237,7 +237,7 @@ void SfxSaveTabPage::DetectHiddenControls()
     }
 
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
 {
     sal_Bool bModified = sal_False;
@@ -343,7 +343,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool isODFFormat( OUString sFilter )
 {
@@ -497,7 +497,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
     aODFVersionLB->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
 {
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 01a14d330f5c..41f875cccca7 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -82,13 +82,13 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet
     UpdateLastCheckedText();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
 {
     OUString aDateStr;
@@ -146,7 +146,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
     m_pLastChecked->SetText( aText );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage*
 SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
@@ -154,7 +154,7 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
     return new SvxOnlineUpdateTabPage( pParent, rAttrSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 
 sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
@@ -218,7 +218,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& )
 {
@@ -260,13 +260,13 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& )
     m_pAutoDownloadCheckBox->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxOnlineUpdateTabPage::FillUserData()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox )
 {
@@ -279,7 +279,7 @@ IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
 {
@@ -303,7 +303,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
 {
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 3a0bc110ce9a..e15be1bcdc90 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -47,7 +47,7 @@ namespace offapp
         const ::std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; }
     };
 
-    //--------------------------------------------------------------------
+
     ODriverEnumerationImpl::ODriverEnumerationImpl()
     {
         try
@@ -76,25 +76,25 @@ namespace offapp
     //====================================================================
     //= ODriverEnumeration
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODriverEnumeration::ODriverEnumeration() throw()
         :m_pImpl(new ODriverEnumerationImpl)
     {
     }
 
-    //--------------------------------------------------------------------
+
     ODriverEnumeration::~ODriverEnumeration() throw()
     {
         delete m_pImpl;
     }
 
-    //--------------------------------------------------------------------
+
     ODriverEnumeration::const_iterator ODriverEnumeration::begin() const throw()
     {
         return m_pImpl->getDriverImplNames().begin();
     }
 
-    //--------------------------------------------------------------------
+
     ODriverEnumeration::const_iterator ODriverEnumeration::end() const throw()
     {
         return m_pImpl->getDriverImplNames().end();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index d0f10f9cbad7..057f014689b9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -488,7 +488,7 @@ struct OptionsGroupInfo
     ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; }
 };
 
-// -----------------------------------------------------------------------
+
 
 #define INI_LIST() \
     pCurrentPageEntry   ( NULL ),\
@@ -951,7 +951,7 @@ IMPL_LINK( OfaTreeOptionsDialog, ImplHandleTreeLayoutTimerHdl, void*, EMPTYARG )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 void OfaTreeOptionsDialog::SetPaneSize(Window *pPane)
 {
     //The OfaTreeOptionsDialog is not fully widget layout enabled
@@ -1369,9 +1369,9 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
                 SFX_APP()->SetOptions( aOptSet );
             // get dispatcher anew, because SetOptions() might have destroyed the dispatcher
             SfxViewFrame *pViewFrame = SfxViewFrame::Current();
-// -------------------------------------------------------------------------
+
 //          evaluate Year2000
-// -------------------------------------------------------------------------
+
             sal_uInt16 nY2K = USHRT_MAX;
             if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
                 nY2K = ((const SfxUInt16Item*)pItem)->GetValue();
@@ -1385,9 +1385,9 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
                 aMisc.SetYear2000(nY2K);
             }
 
-// -------------------------------------------------------------------------
+
 //          evaluate print
-// -------------------------------------------------------------------------
+
             if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, false, &pItem))
                 aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue());
 
@@ -1397,9 +1397,9 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet
                 aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() &  SFX_PRINTER_CHG_SIZE ));
                 aMisc.SetPaperOrientationWarning(0 !=  (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION ));
             }
-// -------------------------------------------------------------------------
+
 //          evaluate help options
-// -------------------------------------------------------------------------
+
             if ( SvtHelpOptions().IsHelpTips() != Help::IsQuickHelpEnabled() )
                 SvtHelpOptions().IsHelpTips() ? Help::EnableQuickHelp() : Help::DisableQuickHelp();
             if ( SvtHelpOptions().IsExtendedHelp() != Help::IsBalloonHelpEnabled() )
@@ -2289,7 +2289,7 @@ ExtensionsTabPage::ExtensionsTabPage(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ExtensionsTabPage::~ExtensionsTabPage()
 {
@@ -2297,7 +2297,7 @@ ExtensionsTabPage::~ExtensionsTabPage()
     DeactivatePage();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtensionsTabPage::CreateDialogWithHandler()
 {
@@ -2342,7 +2342,7 @@ void ExtensionsTabPage::CreateDialogWithHandler()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction )
 {
@@ -2361,7 +2361,7 @@ sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtensionsTabPage::ActivatePage()
 {
@@ -2389,7 +2389,7 @@ void ExtensionsTabPage::ActivatePage()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtensionsTabPage::DeactivatePage()
 {
@@ -2399,7 +2399,7 @@ void ExtensionsTabPage::DeactivatePage()
         m_xPage->setVisible( sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtensionsTabPage::ResetPage()
 {
@@ -2407,7 +2407,7 @@ void ExtensionsTabPage::ResetPage()
     ActivatePage();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtensionsTabPage::SavePage()
 {
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 27b4cc9acac0..8fe16ad97964 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -101,7 +101,7 @@ void PasswordTable::setColWidths()
 
 // class WebConnectionInfoDialog -----------------------------------------
 
-// -----------------------------------------------------------------------
+
 WebConnectionInfoDialog::WebConnectionInfoDialog(Window* pParent)
     : ModalDialog(pParent, "StoredWebConnectionDialog", "cui/ui/storedwebconnectiondialog.ui")
     , m_nPos( -1 )
@@ -145,14 +145,14 @@ WebConnectionInfoDialog::~WebConnectionInfoDialog()
     delete m_pPasswordsLB;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( WebConnectionInfoDialog, HeaderBarClickedHdl, SvSimpleTable*, pTable )
 {
     m_pPasswordsLB->Resort( NULL == pTable );
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 void WebConnectionInfoDialog::FillPasswordList()
 {
     try
@@ -200,7 +200,7 @@ void WebConnectionInfoDialog::FillPasswordList()
     {}
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
 {
     try
@@ -232,7 +232,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
 {
     try
@@ -256,7 +256,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemoveAllPasswordsHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
 {
     try
@@ -295,7 +295,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl)
 {
     SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 9e6492aa1215..9e0d8b0cbc0e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2055,7 +2055,7 @@ IMPL_LINK( OfaQuoteTabPage, StdQuoteHdl, PushButton*, pBtn )
     return 0;
 }
 
-// --------------------------------------------------
+
 
 OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
 {
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 842ddf042f98..5b0717ccdd2f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -147,7 +147,7 @@ static void lcl_setFillStyle(ListBox* pLbSelect, XFillStyle eStyle)
             return;
         }
 }
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 GetItemId_Impl( ValueSet& rValueSet, const Color& rCol )
 {
@@ -225,14 +225,14 @@ void BackgroundPreviewImpl::setBmp(bool bBmp)
     Invalidate();
 }
 
-//-----------------------------------------------------------------------
+
 
 BackgroundPreviewImpl::~BackgroundPreviewImpl()
 {
     delete pBitmap;
 }
 
-//-----------------------------------------------------------------------
+
 void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
 {
     if ( !bIsBmp )
@@ -246,7 +246,7 @@ void BackgroundPreviewImpl::NotifyChange( const Color& rColor )
     }
 }
 
-//-----------------------------------------------------------------------
+
 
 void BackgroundPreviewImpl::NotifyChange( const Bitmap* pNewBitmap )
 {
@@ -313,7 +313,7 @@ void BackgroundPreviewImpl::Resize()
     recalcDrawPos();
 }
 
-//-----------------------------------------------------------------------
+
 
 void BackgroundPreviewImpl::Paint( const Rectangle& )
 {
@@ -431,7 +431,7 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, const SfxItemSet& rC
     m_pBackgroundColorSet->SetText(SVX_RESSTR(RID_SVXSTR_TRANSPARENT));
 }
 
-//------------------------------------------------------------------------
+
 
 SvxBackgroundTabPage::~SvxBackgroundTabPage()
 {
@@ -455,7 +455,7 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxBackgroundTabPage::GetRanges()
 
@@ -468,7 +468,7 @@ sal_uInt16* SvxBackgroundTabPage::GetRanges()
     return pRanges;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet )
@@ -482,7 +482,7 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
     return ( new SvxBackgroundTabPage( pParent, rAttrSet ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -715,7 +715,7 @@ void SvxBackgroundTabPage::ResetFromWallpaperItem( const SfxItemSet& rSet )
 
 
 
-//------------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::FillUserData()
 
@@ -731,7 +731,7 @@ void SvxBackgroundTabPage::FillUserData()
     SetUserData( m_pBtnPreview->IsChecked() ? OUString('1') : OUString('0') );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
@@ -1088,7 +1088,7 @@ sal_Bool SvxBackgroundTabPage::FillItemSetWithWallpaperItem( SfxItemSet& rCoreSe
     return bModified;
 }
 
-//-----------------------------------------------------------------------
+
 
 int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
 
@@ -1107,14 +1107,14 @@ int SvxBackgroundTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-//-----------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::PointChanged( Window* , RECT_POINT  )
 {
     // has to be implemented so that position control can work
 }
 
-//-----------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::ShowSelector()
 {
@@ -1147,7 +1147,7 @@ void SvxBackgroundTabPage::ShowSelector()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 
 void SvxBackgroundTabPage::RaiseLoadError_Impl()
@@ -1163,7 +1163,7 @@ void SvxBackgroundTabPage::RaiseLoadError_Impl()
                               aBgdGraphicPath ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
 {
@@ -1174,7 +1174,7 @@ sal_Bool SvxBackgroundTabPage::LoadLinkedGraphic_Impl()
     return bResult;
 }
 
-//------------------------------------------------------------------------
+
 
 
 void SvxBackgroundTabPage::FillColorValueSets_Impl()
@@ -1201,11 +1201,11 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
     m_pBackgroundColorSet->SetColCount(m_pBackgroundColorSet->getColumnCount());
 }
 
-//------------------------------------------------------------------------
 
 
 
-//------------------------------------------------------------------------
+
+
 
 void SvxBackgroundTabPage::ShowColorUI_Impl()
 
@@ -1235,7 +1235,7 @@ void SvxBackgroundTabPage::HideColorUI_Impl()
         m_pBackGroundColorFrame->Hide();
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::ShowBitmapUI_Impl()
 
@@ -1307,7 +1307,7 @@ void SvxBackgroundTabPage::HideGradientUI_Impl()
     m_pBackGroundGradientFrame->Hide();
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
 {
@@ -1353,7 +1353,7 @@ void SvxBackgroundTabPage::SetGraphicPosition_Impl( SvxGraphicPosition ePos )
     m_pWndPosition->Invalidate();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
 {
@@ -1379,9 +1379,9 @@ SvxGraphicPosition SvxBackgroundTabPage::GetGraphicPosition_Impl()
     return GPOS_MM;
 }
 
-//-----------------------------------------------------------------------
+
 // Handler
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl)
 /*
@@ -1398,7 +1398,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BackgroundColorHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
 {
@@ -1419,7 +1419,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, SelectHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
 {
@@ -1468,7 +1468,7 @@ IMPL_LINK( SvxBackgroundTabPage, FileClickHdl_Impl, CheckBox*, pBox )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBackgroundTabPage, RadioClickHdl_Impl, RadioButton*, pBtn )
 {
@@ -1503,7 +1503,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, ModifyGradientHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
 
@@ -1545,7 +1545,7 @@ IMPL_LINK_NOARG(SvxBackgroundTabPage, BrowseHdl_Impl)
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
 
@@ -1606,7 +1606,7 @@ IMPL_LINK( SvxBackgroundTabPage, LoadTimerHdl_Impl, Timer* , pTimer )
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::ShowTblControl()
 {
@@ -1617,7 +1617,7 @@ void SvxBackgroundTabPage::ShowTblControl()
     m_pAsGrid->Show();
 }
 
-//-----------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly)
 {
@@ -1631,7 +1631,7 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool bCharOnly)
     }
     m_pParaLBox->SetData(m_pParaLBox); // here it can be recognized that this mode is turned on
 }
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
 {
@@ -1723,7 +1723,7 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
 {
@@ -1787,7 +1787,7 @@ IMPL_LINK( SvxBackgroundTabPage, ParaDestinationHdl_Impl, ListBox*, pBox )
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr,
                                               const OUString& rUserData )
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 10462b3f7617..6f4b1d6e8bf8 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -47,7 +47,7 @@
 
 using namespace ::editeng;
 
-// -----------------------------------------------------------------------
+
 
 /*
  * [Description:]
@@ -75,14 +75,14 @@ static sal_uInt16 pRanges[] =
     0
 };
 
-// -----------------------------------------------------------------------
+
 static void lcl_SetDecimalDigitsTo1(MetricField& rField)
 {
     sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
     rField.SetDecimalDigits(1);
     rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP );
 }
-// -----------------------------------------------------------------------
+
 
 SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs)
     : SfxTabPage(pParent, "BorderPage", "cui/ui/borderpage.ui", rCoreAttrs)
@@ -326,20 +326,20 @@ SvxBorderTabPage::SvxBorderTabPage(Window* pParent, const SfxItemSet& rCoreAttrs
     m_pMergeAdjacentBordersCB->Hide();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBorderTabPage::~SvxBorderTabPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxBorderTabPage::GetRanges()
 {
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxBorderTabPage::Create( Window* pParent,
                                       const SfxItemSet& rAttrSet )
@@ -347,7 +347,7 @@ SfxTabPage* SvxBorderTabPage::Create( Window* pParent,
     return ( new SvxBorderTabPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid )
 {
@@ -369,7 +369,7 @@ bool SvxBorderTabPage::IsBorderLineStyleAllowed( sal_Int16 nStyle ) const
     return maUsedBorderStyles.count(nStyle) > 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -395,9 +395,9 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
         ResetFrameLine_Impl( svx::FRAMEBORDER_VER,    pBoxInfoItem->GetVert(), pBoxInfoItem->IsValid( VALID_VERT ) );
         ResetFrameLine_Impl( svx::FRAMEBORDER_HOR,    pBoxInfoItem->GetHori(), pBoxInfoItem->IsValid( VALID_HORI ) );
 
-        //-------------------
+
         // distance inside
-        //-------------------
+
         if( !mbUseMarginItem )
         {
             if ( m_pLeftMF->IsVisible() )
@@ -481,9 +481,9 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
         m_pFrameSel->HideAllBorders();
     }
 
-    //-------------------------------------------------------------
+
     // depict line (color) in controllers if unambiguous:
-    //-------------------------------------------------------------
+
     {
         // Do all visible lines show the same line widths?
         long nWidth;
@@ -573,7 +573,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
     m_pSynchronizeCB->Check(mbSync);
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -583,7 +583,7 @@ int SvxBorderTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
 {
@@ -599,9 +599,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
 
     SfxMapUnit eCoreUnit = rOldSet.GetPool()->GetMetric( nBoxWhich );
 
-    //------------------
+
     // outer border:
-    //------------------
+
     typedef ::std::pair<svx::FrameBorderType,sal_uInt16> TBorderPair;
     TBorderPair eTypes1[] = {
                                 TBorderPair(svx::FRAMEBORDER_TOP,BOX_LINE_TOP),
@@ -613,9 +613,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(eTypes1); ++i)
         aBoxItem.SetLine( m_pFrameSel->GetFrameBorderStyle( eTypes1[i].first ), eTypes1[i].second );
 
-    //--------------------------------
+
     // border hor/ver and TableFlag
-    //--------------------------------
+
     TBorderPair eTypes2[] = {
                                 TBorderPair(svx::FRAMEBORDER_HOR,BOXINFO_LINE_HORI),
                                 TBorderPair(svx::FRAMEBORDER_VER,BOXINFO_LINE_VERT)
@@ -626,9 +626,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     aBoxInfoItem.EnableHor( mbHorEnabled );
     aBoxInfoItem.EnableVer( mbVerEnabled );
 
-    //-------------------
+
     // inner distance
-    //-------------------
+
     if( m_pLeftMF->IsVisible() )
     {
         // #i40405# enable distance controls for next dialog call
@@ -683,9 +683,9 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
         }
     }
 
-    //------------------------------------------
+
     // note Don't Care Status in the Info-Item:
-    //------------------------------------------
+
     aBoxInfoItem.SetValid( VALID_TOP,    m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_TOP )    != svx::FRAMESTATE_DONTCARE );
     aBoxInfoItem.SetValid( VALID_BOTTOM, m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_BOTTOM ) != svx::FRAMESTATE_DONTCARE );
     aBoxInfoItem.SetValid( VALID_LEFT,   m_pFrameSel->GetFrameBorderState( svx::FRAMEBORDER_LEFT )   != svx::FRAMESTATE_DONTCARE );
@@ -736,14 +736,14 @@ sal_Bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
     return bAttrsChanged;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBorderTabPage::HideShadowControls()
 {
     m_pShadowFrame->Hide();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl)
 {
@@ -815,7 +815,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelPreHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl)
 {
@@ -827,7 +827,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, SelSdwHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb )
 {
@@ -856,7 +856,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBorderTabPage, SelStyleHdl_Impl, ListBox *, pLb )
 {
@@ -883,7 +883,7 @@ const sal_uInt16 SVX_BORDER_PRESET_COUNT = 5;
 // number of shadow images to show
 const sal_uInt16 SVX_BORDER_SHADOW_COUNT = 5;
 
-// ----------------------------------------------------------------------------
+
 
 sal_uInt16 SvxBorderTabPage::GetPresetImageId( sal_uInt16 nValueSetIdx ) const
 {
@@ -951,7 +951,7 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 nValueSetIdx ) const
     return pnStrIds[ GetPresetImageId( nValueSetIdx ) - 1 ];
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SvxBorderTabPage::FillPresetVS()
 {
@@ -974,7 +974,7 @@ void SvxBorderTabPage::FillPresetVS()
     m_pWndPresets->Show();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SvxBorderTabPage::FillShadowVS()
 {
@@ -1004,7 +1004,7 @@ void SvxBorderTabPage::FillShadowVS()
     m_pWndShadows->Show();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SvxBorderTabPage::FillValueSets()
 {
@@ -1072,7 +1072,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
     m_pLbLineStyle->SetWidth( nVal );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
 {
     if(!mbUseMarginItem && m_pLeftMF->IsVisible())
@@ -1149,7 +1149,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, LinesChanged_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, MetricField*, pField)
 {
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 011765ef774a..b5b05ae0a7b3 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -159,20 +159,20 @@ inline SvxFont& SvxCharBasePage::GetPreviewFont()
     return m_pPreviewWin->GetFont();
 }
 
-// -----------------------------------------------------------------------
+
 
 inline SvxFont& SvxCharBasePage::GetPreviewCJKFont()
 {
     return m_pPreviewWin->GetCJKFont();
 }
-// -----------------------------------------------------------------------
+
 
 inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
 {
     return m_pPreviewWin->GetCTLFont();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset)
     : SfxTabPage( pParent, rID, rUIXMLDescription, rItemset )
@@ -181,13 +181,13 @@ SvxCharBasePage::SvxCharBasePage(Window* pParent, const OString& rID, const OUSt
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCharBasePage::~SvxCharBasePage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -195,7 +195,7 @@ void SvxCharBasePage::ActivatePage( const SfxItemSet& rSet )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet )
 {
@@ -207,20 +207,20 @@ void SvxCharBasePage::SetPrevFontWidthScale( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 namespace
 {
-    // -----------------------------------------------------------------------
+
     void setPrevFontEscapement(SvxFont& _rFont,sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc )
     {
         _rFont.SetPropr( nProp );
         _rFont.SetProprRel( nEscProp );
         _rFont.SetEscapement( nEsc );
     }
-    // -----------------------------------------------------------------------
-    // -----------------------------------------------------------------------
+
+
 }
-// -----------------------------------------------------------------------
+
 
 void SvxCharBasePage::SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc )
 {
@@ -369,14 +369,14 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet )
     Initialize();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCharNamePage::~SvxCharNamePage()
 {
     delete m_pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::Initialize()
 {
@@ -400,7 +400,7 @@ void SvxCharNamePage::Initialize()
     m_pImpl->m_aUpdateTimer.SetTimeoutHdl( LINK( this, SvxCharNamePage, UpdateHdl_Impl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 const FontList* SvxCharNamePage::GetFontList() const
 {
@@ -432,7 +432,7 @@ const FontList* SvxCharNamePage::GetFontList() const
     return m_pImpl->m_pFontList;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     FontInfo calcFontInfo(  SvxFont& _rFont,
@@ -503,7 +503,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::UpdatePreview_Impl()
 {
@@ -541,7 +541,7 @@ void SvxCharNamePage::UpdatePreview_Impl()
     m_pPreviewWin->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
 {
@@ -578,7 +578,7 @@ void SvxCharNamePage::FillStyleBox_Impl( const FontNameBox* pNameBox )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
 {
@@ -613,7 +613,7 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
     pSizeBox->Fill( &_aFontInfo, pFontList );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp )
 {
@@ -837,7 +837,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
     pLangBox->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp )
 {
@@ -1111,7 +1111,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl)
 {
@@ -1119,7 +1119,7 @@ IMPL_LINK_NOARG(SvxCharNamePage, UpdateHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox )
 {
@@ -1133,7 +1133,7 @@ IMPL_LINK( SvxCharNamePage, FontModifyHdl_Impl, void*, pNameBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -1142,7 +1142,7 @@ void SvxCharNamePage::ActivatePage( const SfxItemSet& rSet )
     UpdatePreview_Impl();       // instead of asynchronous calling in ctor
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -1151,21 +1151,21 @@ int SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxCharNamePage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxCharNamePage( pParent, rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxCharNamePage::GetRanges()
 {
     return pNameRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::Reset( const SfxItemSet& rSet )
 {
@@ -1177,7 +1177,7 @@ void SvxCharNamePage::Reset( const SfxItemSet& rSet )
     UpdatePreview_Impl();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet )
 {
@@ -1187,7 +1187,7 @@ sal_Bool SvxCharNamePage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem )
 {
@@ -1199,7 +1199,7 @@ void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem )
     m_pImpl->m_bMustDelete = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 namespace
 {
     void enableRelativeMode( SvxCharNamePage* _pPage, FontSizeBox* _pFontSizeLB, sal_uInt16 _nHeightWhich )
@@ -1218,7 +1218,7 @@ namespace
         _pFontSizeLB->EnablePtRelativeMode( sal::static_int_cast< short >(-(nCurHeight - 20)), (9999 - nCurHeight), 10 );
     }
 }
-// -----------------------------------------------------------------------------
+
 
 void SvxCharNamePage::EnableRelativeMode()
 {
@@ -1228,13 +1228,13 @@ void SvxCharNamePage::EnableRelativeMode()
     enableRelativeMode(this,m_pCTLFontSizeLB,GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharNamePage::EnableSearchMode()
 {
     m_pImpl->m_bInSearchMode = sal_True;
 }
-// -----------------------------------------------------------------------
+
 void SvxCharNamePage::DisableControls( sal_uInt16 nDisable )
 {
     if ( DISABLE_LANGUAGE & nDisable )
@@ -1258,13 +1258,13 @@ void SvxCharNamePage::DisableControls( sal_uInt16 nDisable )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharNamePage::SetPreviewBackgroundToCharacter()
 {
     m_bPreviewBackgroundToCharacter = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharNamePage::PageCreated (SfxAllItemSet aSet)
 {
     SFX_ITEMSET_ARG (&aSet,pFontListItem,SvxFontListItem,SID_ATTR_CHAR_FONTLIST,false);
@@ -1317,7 +1317,7 @@ SvxCharEffectsPage::SvxCharEffectsPage( Window* pParent, const SfxItemSet& rInSe
     Initialize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharEffectsPage::Initialize()
 {
@@ -1424,7 +1424,7 @@ SvxCharEffectsPage::~SvxCharEffectsPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharEffectsPage::UpdatePreview_Impl()
 {
@@ -1491,7 +1491,7 @@ void SvxCharEffectsPage::UpdatePreview_Impl()
     m_pPreviewWin->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap )
 {
@@ -1507,7 +1507,7 @@ void SvxCharEffectsPage::SetCaseMap_Impl( SvxCaseMap eCaseMap )
     UpdatePreview_Impl();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet )
 {
@@ -1565,7 +1565,7 @@ void SvxCharEffectsPage::ResetColor_Impl( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
 {
@@ -1606,7 +1606,7 @@ sal_Bool SvxCharEffectsPage::FillItemSetColor_Impl( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox )
 {
@@ -1640,7 +1640,7 @@ IMPL_LINK( SvxCharEffectsPage, SelectHdl_Impl, ListBox*, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl)
 {
@@ -1653,7 +1653,7 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, UpdatePreview_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl)
 {
@@ -1661,7 +1661,7 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, CbClickHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl)
 {
@@ -1669,7 +1669,7 @@ IMPL_LINK_NOARG(SvxCharEffectsPage, TristClickHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox )
 {
@@ -1689,7 +1689,7 @@ IMPL_LINK( SvxCharEffectsPage, ColorBoxSelectHdl_Impl, ColorListBox*, pBox )
     m_pPreviewWin->Invalidate();
     return 0;
 }
-// -----------------------------------------------------------------------
+
 
 int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -1698,21 +1698,21 @@ int SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxCharEffectsPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxCharEffectsPage( pParent, rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxCharEffectsPage::GetRanges()
 {
     return pEffectsRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
 {
@@ -2159,7 +2159,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
     m_pFontColorLB->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -2511,13 +2511,13 @@ void SvxCharEffectsPage::EnableFlash()
     m_pBlinkingBtn->Show();
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharEffectsPage::SetPreviewBackgroundToCharacter()
 {
     m_bPreviewBackgroundToCharacter = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharEffectsPage::PageCreated (SfxAllItemSet aSet)
 {
     SFX_ITEMSET_ARG (&aSet,pDisableCtlItem,SfxUInt16Item,SID_DISABLE_CTL,false);
@@ -2572,7 +2572,7 @@ SvxCharPositionPage::SvxCharPositionPage( Window* pParent, const SfxItemSet& rIn
     Initialize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharPositionPage::Initialize()
 {
@@ -2618,14 +2618,14 @@ SvxCharPositionPage::~SvxCharPositionPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharPositionPage::UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc )
 {
     SetPrevFontEscapement( nProp, nEscProp, nEsc );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc )
 {
@@ -2673,7 +2673,7 @@ void SvxCharPositionPage::SetEscapement_Impl( sal_uInt16 nEsc )
     UpdatePreview_Impl( 100, aEscItm.GetProp(), aEscItm.GetEsc() );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn )
 {
@@ -2688,7 +2688,7 @@ IMPL_LINK( SvxCharPositionPage, PositionHdl_Impl, RadioButton*, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn )
 {
@@ -2701,7 +2701,7 @@ IMPL_LINK( SvxCharPositionPage, RotationHdl_Impl, RadioButton*, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl)
 {
@@ -2712,7 +2712,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, FontModifyHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox )
 {
@@ -2728,7 +2728,7 @@ IMPL_LINK( SvxCharPositionPage, AutoPositionHdl_Impl, CheckBox*, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox )
 {
@@ -2744,7 +2744,7 @@ IMPL_LINK( SvxCharPositionPage, FitToLineHdl_Impl, CheckBox*, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharPositionPage, KerningSelectHdl_Impl)
 {
@@ -2779,7 +2779,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningSelectHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl)
 {
@@ -2802,14 +2802,14 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharPositionPage, PairKerningHdl_Impl)
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField )
 {
@@ -2836,7 +2836,7 @@ IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharPositionPage, ScaleWidthModifyHdl_Impl)
 {
@@ -2863,7 +2863,7 @@ void  SvxCharPositionPage::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -2872,21 +2872,21 @@ int SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxCharPositionPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxCharPositionPage( pParent, rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxCharPositionPage::GetRanges()
 {
     return pPositionRanges;
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
 {
     OUString sUser = GetUserData();
@@ -3117,7 +3117,7 @@ void SvxCharPositionPage::Reset( const SfxItemSet& rSet )
     m_pPairKerningBtn->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -3250,7 +3250,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharPositionPage::FillUserData()
 {
@@ -3263,12 +3263,12 @@ void SvxCharPositionPage::FillUserData()
     SetUserData( sUser );
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharPositionPage::SetPreviewBackgroundToCharacter()
 {
     m_bPreviewBackgroundToCharacter = sal_True;
 }
-// -----------------------------------------------------------------------
+
 void SvxCharPositionPage::PageCreated (SfxAllItemSet aSet)
 {
     SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false);
@@ -3300,7 +3300,7 @@ SvxCharTwoLinesPage::~SvxCharTwoLinesPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharTwoLinesPage::Initialize()
 {
@@ -3321,7 +3321,7 @@ void SvxCharTwoLinesPage::Initialize()
     rCTLFont.SetSize( Size( 0, 220 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox )
 {
@@ -3341,7 +3341,7 @@ void SvxCharTwoLinesPage::SelectCharacter( ListBox* pBox )
     delete aDlg;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
 {
@@ -3379,7 +3379,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
         m_nEndBracketPosition = nEntryPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl)
 {
@@ -3390,7 +3390,7 @@ IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox*, pBox )
 {
@@ -3409,14 +3409,14 @@ IMPL_LINK( SvxCharTwoLinesPage, CharacterMapHdl_Impl, ListBox*, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharTwoLinesPage::ActivatePage( const SfxItemSet& rSet )
 {
     SvxCharBasePage::ActivatePage( rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -3425,21 +3425,21 @@ int SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxCharTwoLinesPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxCharTwoLinesPage( pParent, rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxCharTwoLinesPage::GetRanges()
 {
     return pTwoLinesRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet )
 {
@@ -3463,7 +3463,7 @@ void SvxCharTwoLinesPage::Reset( const SfxItemSet& rSet )
     SetPrevFontWidthScale( rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -3506,13 +3506,13 @@ void    SvxCharTwoLinesPage::UpdatePreview_Impl()
     m_pPreviewWin->SetTwoLines(m_pTwoLinesBtn->IsChecked());
     m_pPreviewWin->Invalidate();
 }
-// -----------------------------------------------------------------------
+
 void SvxCharTwoLinesPage::SetPreviewBackgroundToCharacter()
 {
     m_bPreviewBackgroundToCharacter = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 void SvxCharTwoLinesPage::PageCreated (SfxAllItemSet aSet)
 {
     SFX_ITEMSET_ARG (&aSet,pFlagItem,SfxUInt32Item,SID_FLAG_TYPE,false);
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 4795f177e742..dac480293290 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -71,7 +71,7 @@ static sal_uInt16 pCaptionRanges[] =
     0
 };
 
-// -----------------------------------------------------------------------
+
 
 SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs)
     : SfxTabPage(pParent, "CalloutPage", "cui/ui/calloutpage.ui", rInAttrs)
@@ -130,7 +130,7 @@ SvxCaptionTabPage::SvxCaptionTabPage(Window* pParent, const SfxItemSet& rInAttrs
     m_pCB_LAENGE->SetClickHdl(LINK(this,SvxCaptionTabPage,LineOptHdl_Impl));
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCaptionTabPage::Construct()
 {
@@ -138,7 +138,7 @@ void SvxCaptionTabPage::Construct()
     DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet&  _rOutAttrs)
 {
@@ -210,7 +210,7 @@ sal_Bool SvxCaptionTabPage::FillItemSet( SfxItemSet&  _rOutAttrs)
     return( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCaptionTabPage::Reset( const SfxItemSet&  )
 {
@@ -328,7 +328,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet&  )
     SetupType_Impl( nCaptionType+1 );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow,
                 const SfxItemSet& rOutAttrs )
@@ -336,14 +336,14 @@ SfxTabPage* SvxCaptionTabPage::Create( Window* pWindow,
     return( new SvxCaptionTabPage( pWindow, rOutAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxCaptionTabPage::GetRanges()
 {
     return( pCaptionRanges );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
 {
@@ -401,7 +401,7 @@ void SvxCaptionTabPage::SetupAnsatz_Impl( sal_uInt16 nType )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox )
 {
@@ -413,7 +413,7 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pLis
 }
 IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzSelectHdl_Impl, ListBox *, pListBox )
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
 {
@@ -425,7 +425,7 @@ IMPL_LINK_INLINE_START( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, p
 }
 IMPL_LINK_INLINE_END( SvxCaptionTabPage, AnsatzRelSelectHdl_Impl, ListBox *, pListBox )
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
 {
@@ -445,7 +445,7 @@ IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, Button *, pButton )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
 {
@@ -454,7 +454,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxCaptionTabPage, SelectCaptTypeHdl_Impl)
 
-//------------------------------------------------------------------------
+
 
 void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType )
 {
@@ -486,7 +486,7 @@ void SvxCaptionTabPage::SetupType_Impl( sal_uInt16 nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -496,7 +496,7 @@ void SvxCaptionTabPage::DataChanged( const DataChangedEvent& rDCEvt )
             FillValueSet();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCaptionTabPage::FillValueSet()
 {
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 09fb9cd22953..f66104725ec9 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -161,7 +161,7 @@ void SvxNumberPreview::Paint( const Rectangle& )
     DrawText( aPosText, aTmpStr );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberPreview::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
 {
@@ -187,7 +187,7 @@ void SvxNumberPreview::InitSettings( sal_Bool bForeground, sal_Bool bBackground
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberPreview::StateChanged( StateChangedType nType )
 {
@@ -199,7 +199,7 @@ void SvxNumberPreview::StateChanged( StateChangedType nType )
     Window::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberPreview::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -712,9 +712,9 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
             pNumFmtShell->FindEntry(aFormat, &nCurKey);
         }
 
-        //---------------------------------------------------------------
+
         // Chosen format:
-        // --------------
+
         if ( bDataChanged )
         {
             bDataChanged = ( nInitFormat != nCurKey );
@@ -729,9 +729,9 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
             }
         }
 
-        // --------------------------------------------------------------
+
         // List of changed user defined formats:
-        // -------------------------------------
+
         const size_t nDelCount = pNumFmtShell->GetUpdateDataCount();
 
         if ( nDelCount > 0 )
@@ -758,9 +758,9 @@ sal_Bool SvxNumberFormatTabPage::FillItemSet( SfxItemSet& rCoreAttrs )
             delete [] pDelArr;
         }
 
-        //---------------------------------------------------------------
+
         // Whether source format is to be taken or not:
-        // --------------------------------------------
+
         if ( m_pCbSourceFormat->IsEnabled() )
         {
             sal_uInt16 _nWhich = GetWhich( SID_ATTR_NUMBERFORMAT_SOURCE );
@@ -1170,7 +1170,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
         pNumFmtShell->SetCurrencySymbol(nCurrencyPos);
     }
 
-    //--------------------------------------------------------------------
+
     // Format-ListBox ----------------------------------------------------
     if (pLb == m_pLbFormat)
     {
@@ -1220,7 +1220,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     // category-ListBox -------------------------------------------------
     if (pLb == m_pLbCategory || pLb == m_pLbCurrency)
     {
@@ -1231,7 +1231,7 @@ IMPL_LINK( SvxNumberFormatTabPage, SelFormatHdl_Impl, void *, pLb )
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     // language/country-ListBox ----------------------------------------------
     if (pLb == m_pLbLanguage)
     {
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index df72d04516b8..0b20ad2266dc 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -85,7 +85,7 @@ sal_uInt16 aArr[] =
     SVX_PAGE_LEFT
 };
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage )
 {
@@ -95,7 +95,7 @@ sal_uInt16 PageUsageToPos_Impl( sal_uInt16 nUsage )
     return SVX_PAGE_ALL;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos )
 {
@@ -104,7 +104,7 @@ sal_uInt16 PosToPageUsage_Impl( sal_uInt16 nPos )
     return aArr[nPos];
 }
 
-// -----------------------------------------------------------------------
+
 
 Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBox )
 {
@@ -116,7 +116,7 @@ Size GetMinBorderSpace_Impl( const SvxShadowItem& rShadow, const SvxBoxItem& rBo
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ConvertLong_Impl( const long nIn, SfxMapUnit eUnit )
 {
@@ -136,7 +136,7 @@ sal_Bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 #define MARGIN_LEFT     ( (MarginPosition)0x0001 )
 #define MARGIN_RIGHT    ( (MarginPosition)0x0002 )
@@ -165,14 +165,14 @@ sal_uInt16* SvxPageDescPage::GetRanges()
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxPageDescPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxPageDescPage( pParent, rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
 
@@ -357,14 +357,14 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     SvxNumOptionsTabPage::GetI18nNumbering( *m_pNumberFormatBox, ::std::numeric_limits<sal_uInt16>::max());
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPageDescPage::~SvxPageDescPage()
 {
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::Init_Impl()
 {
@@ -398,7 +398,7 @@ void SvxPageDescPage::Init_Impl()
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::Reset( const SfxItemSet& rSet )
 {
@@ -650,7 +650,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::FillUserData()
 {
@@ -659,7 +659,7 @@ void SvxPageDescPage::FillUserData()
 
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -884,7 +884,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
 {
@@ -909,7 +909,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
 {
@@ -946,7 +946,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
 {
@@ -1018,7 +1018,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl)
 {
@@ -1043,7 +1043,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn )
 {
@@ -1072,7 +1072,7 @@ IMPL_LINK( SvxPageDescPage, SwapOrientation_Impl, RadioButton *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
 {
@@ -1141,7 +1141,7 @@ void SvxPageDescPage::SwapFirstValues_Impl( bool bSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl)
 {
@@ -1152,7 +1152,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, BorderModify_Impl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, BorderModify_Impl)
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
 {
@@ -1175,7 +1175,7 @@ void SvxPageDescPage::UpdateExample_Impl( bool bResetbackground )
     m_pBspWin->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet )
 {
@@ -1263,7 +1263,7 @@ void SvxPageDescPage::ResetBackground_Impl( const SfxItemSet& rSet )
         m_pBspWin->SetBorder( (SvxBoxItem&)*pItem );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
 {
@@ -1370,7 +1370,7 @@ void SvxPageDescPage::InitHeadFoot_Impl( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -1379,7 +1379,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet )
     RangeHdl_Impl( 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -1433,7 +1433,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
 {
@@ -1506,7 +1506,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::CalcMargin_Impl()
 {
@@ -1549,7 +1549,7 @@ void SvxPageDescPage::CalcMargin_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl)
 {
@@ -1560,7 +1560,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxPageDescPage, CenterHdl_Impl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxPageDescPage, CenterHdl_Impl)
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
 {
@@ -1576,7 +1576,7 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList)
     m_pRegisterCB->SetClickHdl(LINK(this, SvxPageDescPage, RegisterModify));
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox )
 {
@@ -1592,7 +1592,7 @@ IMPL_LINK( SvxPageDescPage, RegisterModify, CheckBox*, pBox )
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SvxPageDescPage::DisableVerticalPageDir()
 {
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 34a1687935e6..2a764fa0f87e 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -86,14 +86,14 @@ SvxAreaTabDialog::SvxAreaTabDialog
     rBtnCancel.SetClickHdl( LINK( this, SvxAreaTabDialog, CancelHdlImpl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxAreaTabDialog::~SvxAreaTabDialog()
 {
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxAreaTabDialog::SavePalettes()
 {
@@ -201,7 +201,7 @@ void SvxAreaTabDialog::SavePalettes()
         }
     }
 }
-// -----------------------------------------------------------------------
+
 
 short SvxAreaTabDialog::Ok()
 {
@@ -213,7 +213,7 @@ short SvxAreaTabDialog::Ok()
     return( SfxTabDialog::Ok() );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl)
 {
@@ -224,7 +224,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxAreaTabDialog, CancelHdlImpl)
 }
 IMPL_LINK_INLINE_END( SvxAreaTabDialog, CancelHdlImpl, void *, p )
 
-// -----------------------------------------------------------------------
+
 
 void SvxAreaTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 8c640fe51cc8..d5ccddf8fcb8 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -103,13 +103,13 @@ SvxLineTabDialog::SvxLineTabDialog
     rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineTabDialog::~SvxLineTabDialog()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineTabDialog::SavePalettes()
 {
@@ -171,7 +171,7 @@ void SvxLineTabDialog::SavePalettes()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 short SvxLineTabDialog::Ok()
 {
@@ -182,7 +182,7 @@ short SvxLineTabDialog::Ok()
     return( SfxTabDialog::Ok() );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl)
 {
@@ -193,7 +193,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxLineTabDialog, CancelHdlImpl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxLineTabDialog, CancelHdlImpl)
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 0b487060437b..6ce623593122 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -186,20 +186,20 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rAt
     aAktTab.GetDecimal() = rLocaleWrapper.getNumDecimalSep()[0];
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTabulatorTabPage::~SvxTabulatorTabPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16* SvxTabulatorTabPage::GetRanges()
 {
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -258,7 +258,7 @@ sal_Bool SvxTabulatorTabPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent,
                                          const SfxItemSet& rSet)
@@ -266,7 +266,7 @@ SfxTabPage* SvxTabulatorTabPage::Create( Window* pParent,
     return ( new SvxTabulatorTabPage( pParent, rSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -314,7 +314,7 @@ void SvxTabulatorTabPage::Reset( const SfxItemSet& rSet )
     InitTabPos_Impl( nTabPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
 {
@@ -359,7 +359,7 @@ void SvxTabulatorTabPage::DisableControls( const sal_uInt16 nFlag )
          m_pFillFrame->Disable();
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -368,7 +368,7 @@ int SvxTabulatorTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
 {
@@ -424,7 +424,7 @@ void SvxTabulatorTabPage::InitTabPos_Impl( sal_uInt16 nTabPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTabulatorTabPage::SetFillAndTabType_Impl()
 {
@@ -471,7 +471,7 @@ void SvxTabulatorTabPage::SetFillAndTabType_Impl()
     pFillBtn->Check();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
 {
@@ -529,7 +529,7 @@ IMPL_LINK( SvxTabulatorTabPage, NewHdl_Impl, Button *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl)
 {
@@ -572,7 +572,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl)
 {
@@ -587,7 +587,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
 {
@@ -622,7 +622,7 @@ IMPL_LINK( SvxTabulatorTabPage, TabTypeCheckHdl_Impl, RadioButton *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox )
 {
@@ -653,7 +653,7 @@ IMPL_LINK( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, RadioButton *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit )
 {
@@ -671,7 +671,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit )
 {
@@ -688,7 +688,7 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl)
 {
@@ -702,7 +702,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxTabulatorTabPage, ModifyHdl_Impl)
 {
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 8f6f3ad8335f..49beef783e04 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -752,7 +752,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
     m_pCtlXRectPreview->set_height_request(aSize2.Height());
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAreaTabPage::Construct()
 {
@@ -765,7 +765,7 @@ void SvxAreaTabPage::Construct()
     m_pLbBitmap->Fill( pBitmapList );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -912,7 +912,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -964,7 +964,7 @@ int SvxAreaTabPage::DeactivatePage( SfxItemSet* _pSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -1401,7 +1401,7 @@ sal_Bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs )
     return( bModified );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
 {
@@ -1720,7 +1720,7 @@ void SvxAreaTabPage::Reset( const SfxItemSet& rAttrs )
     m_pMtrFldYOffset->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxAreaTabPage::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
@@ -1728,14 +1728,14 @@ SfxTabPage* SvxAreaTabPage::Create( Window* pWindow,
     return( new SvxAreaTabPage( pWindow, rAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxAreaTabPage::GetRanges()
 {
     return( pAreaRanges );
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SvxAreaTabPage, SelectDialogTypeHdl_Impl)
 {
     switch( (XFillStyle)m_pTypeLB->GetSelectEntryPos() )
@@ -1772,7 +1772,7 @@ void SvxAreaTabPage::ClickInvisibleHdl_Impl()
     m_pCtlBitmapPreview->Invalidate();
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxAreaTabPage::ClickColorHdl_Impl()
 {
@@ -1811,7 +1811,7 @@ void SvxAreaTabPage::ClickColorHdl_Impl()
     ModifyColorHdl_Impl( this );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
 {
@@ -1838,7 +1838,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyColorHdl_Impl)
 
     return( 0L );
 }
-//------------------------------------------------------------------------
+
 
 void SvxAreaTabPage::ClickGradientHdl_Impl()
 {
@@ -1882,7 +1882,7 @@ void SvxAreaTabPage::ClickGradientHdl_Impl()
     ModifyStepCountHdl_Impl( m_pTsbStepCount );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
 {
@@ -1910,7 +1910,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyGradientHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxAreaTabPage::ClickHatchingHdl_Impl()
 {
@@ -1953,7 +1953,7 @@ void SvxAreaTabPage::ClickHatchingHdl_Impl()
     ToggleHatchBckgrdColorHdl_Impl( this );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl)
 {
@@ -1981,7 +1981,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchingHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl)
 {
@@ -2006,7 +2006,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyHatchBckgrdColorHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl)
 {
@@ -2031,7 +2031,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ToggleHatchBckgrdColorHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxAreaTabPage::ClickBitmapHdl_Impl()
 {
@@ -2080,7 +2080,7 @@ void SvxAreaTabPage::ClickBitmapHdl_Impl()
     ModifyTileHdl_Impl( m_pTsbOriginal );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
 {
@@ -2108,7 +2108,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyBitmapHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
 {
@@ -2139,7 +2139,7 @@ IMPL_LINK( SvxAreaTabPage, ModifyStepCountHdl_Impl, void *, p )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
 {
@@ -2278,7 +2278,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl)
 {
@@ -2316,7 +2316,7 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ClickScaleHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxAreaTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
 {
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index fff7dcf1756a..991d663916f9 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -122,7 +122,7 @@ SvxBitmapTabPage::~SvxBitmapTabPage()
     delete m_pBitmapCtl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBitmapTabPage::Construct()
 {
@@ -132,7 +132,7 @@ void SvxBitmapTabPage::Construct()
     m_pLbBitmaps->Fill( pBitmapList );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBitmapTabPage::ActivatePage( const SfxItemSet&  )
 {
@@ -210,7 +210,7 @@ void SvxBitmapTabPage::ActivatePage( const SfxItemSet&  )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
 {
@@ -223,7 +223,7 @@ int SvxBitmapTabPage::DeactivatePage( SfxItemSet* _pSet)
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
 {
@@ -252,7 +252,7 @@ sal_Bool SvxBitmapTabPage::FillItemSet( SfxItemSet& _rOutAttrs )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBitmapTabPage::Reset( const SfxItemSet&  )
 {
@@ -287,7 +287,7 @@ void SvxBitmapTabPage::Reset( const SfxItemSet&  )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow,
                 const SfxItemSet& rSet )
@@ -295,7 +295,7 @@ SfxTabPage* SvxBitmapTabPage::Create( Window* pWindow,
     return new SvxBitmapTabPage( pWindow, rSet );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
 {
@@ -415,7 +415,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBitmapHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 long SvxBitmapTabPage::CheckChanges_Impl()
 {
@@ -463,7 +463,7 @@ long SvxBitmapTabPage::CheckChanges_Impl()
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
 {
@@ -573,7 +573,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl)
 /******************************************************************************/
 
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
 {
@@ -657,7 +657,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
 {
@@ -722,7 +722,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickModifyHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl)
 {
@@ -756,7 +756,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickDeleteHdl_Impl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
 {
@@ -848,7 +848,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
 {
@@ -908,7 +908,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl)
 {
@@ -927,7 +927,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangePixelColorHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl)
 {
@@ -946,7 +946,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxBitmapTabPage::PointChanged( Window* pWindow, RECT_POINT )
 {
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index b5b3aff04649..3ec439a461dd 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -127,7 +127,7 @@ void SvxColorTabPage::UpdateTableName()
     m_pTableName->SetText( aString );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, ClickLoadHdl_Impl)
 {
@@ -197,7 +197,7 @@ void SvxColorTabPage::EnableSave( bool bCanSave )
         m_pBtnSave->Disable();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, ClickSaveHdl_Impl)
 {
@@ -291,7 +291,7 @@ struct SvxColorTabPageShadow
     }
 };
 
-// -----------------------------------------------------------------------
+
 
 SvxColorTabPage::SvxColorTabPage(Window* pParent, const SfxItemSet& rInAttrs)
     : SfxTabPage(pParent, "ColorPage", "cui/ui/colorpage.ui", rInAttrs)
@@ -394,7 +394,7 @@ SvxColorTabPage::~SvxColorTabPage()
     delete pShadow;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorTabPage::ImpColorCountChanged()
 {
@@ -403,7 +403,7 @@ void SvxColorTabPage::ImpColorCountChanged()
     m_pValSetColorList->SetColCount(m_pValSetColorList->getColumnCount());
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorTabPage::Construct()
 {
@@ -416,7 +416,7 @@ void SvxColorTabPage::Construct()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorTabPage::ActivatePage( const SfxItemSet& )
 {
@@ -470,7 +470,7 @@ void SvxColorTabPage::ActivatePage( const SfxItemSet& )
         HideLoadSaveEmbed();
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -483,7 +483,7 @@ int SvxColorTabPage::DeactivatePage( SfxItemSet* _pSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 long SvxColorTabPage::CheckChanges_Impl()
 {
@@ -554,7 +554,7 @@ long SvxColorTabPage::CheckChanges_Impl()
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxColorTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -592,7 +592,7 @@ void SvxColorTabPage::UpdateModified()
     EnableSave( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -617,7 +617,7 @@ void SvxColorTabPage::Reset( const SfxItemSet& rSet )
     UpdateModified();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxColorTabPage::Create( Window* pWindow,
                 const SfxItemSet& rOutAttrs )
@@ -625,7 +625,7 @@ SfxTabPage* SvxColorTabPage::Create( Window* pWindow,
     return( new SvxColorTabPage( pWindow, rOutAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 //
 // is called when the content of the MtrFields is changed for color values
@@ -661,7 +661,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ModifiedHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
 {
@@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickAddHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
 {
@@ -813,7 +813,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickModifyHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
 {
@@ -858,7 +858,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickWorkOnHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
 {
@@ -895,7 +895,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, ClickDeleteHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl)
 {
@@ -918,7 +918,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorLBHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl)
 {
@@ -941,7 +941,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectValSetHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell)
 {
@@ -1011,7 +1011,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 long SvxColorTabPage::ChangeColorHdl_Impl( void* )
 {
@@ -1046,7 +1046,7 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 //void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs )
 //{
@@ -1063,7 +1063,7 @@ long SvxColorTabPage::ChangeColorHdl_Impl( void* )
 //    }
 //}
 
-//------------------------------------------------------------------------
+
 
 // A RGB value is converted to a CMYK value - not in an ideal way as
 // R is converted into C, G into M and B into Y. The K value is held in an
@@ -1083,7 +1083,7 @@ void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK )
     rColor.SetBlue( sal::static_int_cast< sal_uInt8 >( nColor3 - rK ) );
 }
 
-//------------------------------------------------------------------------
+
 
 // reverse case to RgbToCmyk_Impl (see above)
 
@@ -1110,7 +1110,7 @@ void SvxColorTabPage::CmykToRgb_Impl( Color& rColor, const sal_uInt16 nK )
     rColor.SetBlue( (sal_uInt8)lTemp );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor )
 {
@@ -1130,7 +1130,7 @@ sal_uInt16 SvxColorTabPage::ColorToPercent_Impl( sal_uInt16 nColor )
     return ( nWert );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent )
 {
@@ -1150,7 +1150,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( sal_uInt16 nPercent )
     return ( nWert );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxColorTabPage::FillUserData()
 {
@@ -1158,7 +1158,7 @@ void SvxColorTabPage::FillUserData()
     SetUserData( OUString::number( eCM ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxColorTabPage::SetupForViewFrame( SfxViewFrame *pViewFrame )
 {
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 8eaf6b698234..3fd8650c558c 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -137,7 +137,7 @@ SvxGradientTabPage::SvxGradientTabPage
     setPreviewsToSamePlace(pParent, this);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxGradientTabPage::Construct()
 {
@@ -147,7 +147,7 @@ void SvxGradientTabPage::Construct()
     m_pLbGradients->Fill( pGradientList );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
 {
@@ -224,7 +224,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet&  )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -237,7 +237,7 @@ int SvxGradientTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 long SvxGradientTabPage::CheckChanges_Impl()
 {
@@ -304,7 +304,7 @@ long SvxGradientTabPage::CheckChanges_Impl()
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -343,7 +343,7 @@ sal_Bool SvxGradientTabPage::FillItemSet( SfxItemSet& rSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxGradientTabPage::Reset( const SfxItemSet& )
 {
@@ -365,7 +365,7 @@ void SvxGradientTabPage::Reset( const SfxItemSet& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxGradientTabPage::Create( Window* pWindow,
                 const SfxItemSet& rOutAttrs )
@@ -373,7 +373,7 @@ SfxTabPage* SvxGradientTabPage::Create( Window* pWindow,
     return new SvxGradientTabPage( pWindow, rOutAttrs );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
 {
@@ -402,7 +402,7 @@ IMPL_LINK( SvxGradientTabPage, ModifiedHdl_Impl, void *, pControl )
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
 {
@@ -505,7 +505,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickAddHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
 {
@@ -575,7 +575,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickModifyHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl)
 {
@@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickDeleteHdl_Impl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
 {
@@ -703,7 +703,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickLoadHdl_Impl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
 {
@@ -764,7 +764,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ClickSaveHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
 {
@@ -839,7 +839,7 @@ IMPL_LINK_NOARG(SvxGradientTabPage, ChangeGradientHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxGradientTabPage::SetControlState_Impl( XGradientStyle eXGS )
 {
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 327d58203d42..711a782cc3af 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -135,7 +135,7 @@ SvxHatchTabPage::SvxHatchTabPage
     setPreviewsToSamePlace(pParent, this);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxHatchTabPage::Construct()
 {
@@ -143,7 +143,7 @@ void SvxHatchTabPage::Construct()
     m_pLbHatchings->Fill( pHatchingList );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -213,7 +213,7 @@ void SvxHatchTabPage::ActivatePage( const SfxItemSet& rSet )
     m_pCtlPreview->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -226,7 +226,7 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 long SvxHatchTabPage::CheckChanges_Impl()
 {
@@ -276,7 +276,7 @@ long SvxHatchTabPage::CheckChanges_Impl()
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -312,7 +312,7 @@ sal_Bool SvxHatchTabPage::FillItemSet( SfxItemSet& rSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxHatchTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -338,7 +338,7 @@ void SvxHatchTabPage::Reset( const SfxItemSet& rSet )
     m_pCtlPreview->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxHatchTabPage::Create( Window* pWindow,
                 const SfxItemSet& rSet )
@@ -346,7 +346,7 @@ SfxTabPage* SvxHatchTabPage::Create( Window* pWindow,
     return new SvxHatchTabPage( pWindow, rSet );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
 {
@@ -379,7 +379,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedHdl_Impl, void *, p )
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
 {
@@ -452,7 +452,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ChangeHatchHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
 {
@@ -549,7 +549,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickAddHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
 {
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickModifyHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
 {
@@ -652,7 +652,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickDeleteHdl_Impl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
 {
@@ -738,7 +738,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickLoadHdl_Impl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
 {
@@ -798,7 +798,7 @@ IMPL_LINK_NOARG(SvxHatchTabPage, ClickSaveHdl_Impl)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxHatchTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
 {
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index a17a774884fb..238919cd3108 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -513,7 +513,7 @@ void SvxLineTabPage::FillListboxes()
     m_pLbEndStyle->SelectEntryPos( nOldSelect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -644,7 +644,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -664,7 +664,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -957,7 +957,7 @@ sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
     return( bModified );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxLineTabPage::FillXLSet_Impl()
 {
@@ -1082,7 +1082,7 @@ sal_Bool SvxLineTabPage::FillXLSet_Impl()
     return( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
 {
@@ -1486,7 +1486,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
     ChangePreviewHdl_Impl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
@@ -1494,14 +1494,14 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
     return( new SvxLineTabPage( pWindow, rAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxLineTabPage::GetRanges()
 {
     return pLineRanges;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
 {
@@ -1566,7 +1566,7 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p )
 {
@@ -1585,7 +1585,7 @@ IMPL_LINK( SvxLineTabPage, ChangeStartHdl_Impl, void *, p )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 // #116827#
 
 IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl)
@@ -1595,7 +1595,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeEdgeStyleHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 // fdo#43209
 
 IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG )
@@ -1604,7 +1604,7 @@ IMPL_LINK( SvxLineTabPage, ChangeCapStyleHdl_Impl, void *, EMPTYARG )
 
     return( 0L );
 }
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl)
 {
@@ -1641,7 +1641,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, ClickInvisibleHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p )
 {
@@ -1660,7 +1660,7 @@ IMPL_LINK( SvxLineTabPage, ChangeEndHdl_Impl, void *, p )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl)
 {
@@ -1677,14 +1677,14 @@ IMPL_LINK_NOARG(SvxLineTabPage, ChangeTransparentHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLineTabPage::PointChanged( Window*, RECT_POINT eRcPt )
 {
     eRP = eRcPt;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLineTabPage::FillUserData()
 {
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index e3b3de8f0b0f..f2d9ab92b182 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -147,7 +147,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineDefTabPage::Construct()
 {
@@ -155,7 +155,7 @@ void SvxLineDefTabPage::Construct()
     m_pLbLineStyles->Fill( pDashList );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
 {
@@ -187,7 +187,7 @@ void SvxLineDefTabPage::ActivatePage( const SfxItemSet& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -199,7 +199,7 @@ int SvxLineDefTabPage::DeactivatePage( SfxItemSet* _pSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineDefTabPage::CheckChanges_Impl()
 {
@@ -255,7 +255,7 @@ void SvxLineDefTabPage::CheckChanges_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -273,7 +273,7 @@ sal_Bool SvxLineDefTabPage::FillItemSet( SfxItemSet& rAttrs )
     return( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs )
 {
@@ -319,14 +319,14 @@ void SvxLineDefTabPage::Reset( const SfxItemSet& rAttrs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs )
 {
     return( new SvxLineDefTabPage( pWindow, rOutAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
 {
@@ -360,7 +360,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl)
 {
@@ -371,7 +371,7 @@ IMPL_LINK_NOARG_INLINE_START(SvxLineDefTabPage, ChangePreviewHdl_Impl)
 }
 IMPL_LINK_NOARG_INLINE_END(SvxLineDefTabPage, ChangePreviewHdl_Impl)
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
 {
@@ -391,7 +391,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber1Hdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
 {
@@ -412,7 +412,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl)
 }
 
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
 {
@@ -482,7 +482,7 @@ IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, void *, p )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p )
 {
@@ -517,7 +517,7 @@ IMPL_LINK( SvxLineDefTabPage, SelectTypeHdl_Impl, void *, p )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
 {
@@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickAddHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
 {
@@ -680,7 +680,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickModifyHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
 {
@@ -717,7 +717,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickDeleteHdl_Impl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
 {
@@ -790,7 +790,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
 {
@@ -837,7 +837,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickSaveHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLineDefTabPage::FillDash_Impl()
 {
@@ -861,7 +861,7 @@ void SvxLineDefTabPage::FillDash_Impl()
     m_pCtlPreview->SetLineAttributes(aXLineAttr.GetItemSet());
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLineDefTabPage::FillDialog_Impl()
 {
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index e12ded378d06..946ef7635f1f 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -107,13 +107,13 @@ void SvxLineEndDefTabPage::Resize()
     SfxTabPage::Resize();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxLineEndDefTabPage::~SvxLineEndDefTabPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndDefTabPage::Construct()
 {
@@ -141,7 +141,7 @@ void SvxLineEndDefTabPage::Construct()
         m_pBtnAdd->Disable();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
 {
@@ -165,7 +165,7 @@ void SvxLineEndDefTabPage::ActivatePage( const SfxItemSet& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -177,7 +177,7 @@ int SvxLineEndDefTabPage::DeactivatePage( SfxItemSet* _pSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndDefTabPage::CheckChanges_Impl()
 {
@@ -203,7 +203,7 @@ void SvxLineEndDefTabPage::CheckChanges_Impl()
         *pPosLineEndLb = nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -223,7 +223,7 @@ sal_Bool SvxLineEndDefTabPage::FillItemSet( SfxItemSet& rSet )
     return( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndDefTabPage::Reset( const SfxItemSet& )
 {
@@ -262,14 +262,14 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxLineEndDefTabPage::Create( Window* pWindow, const SfxItemSet& rSet )
 {
     return( new SvxLineEndDefTabPage( pWindow, rSet ) );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl)
 {
@@ -296,7 +296,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, SelectLineEndHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* )
 {
@@ -304,7 +304,7 @@ long SvxLineEndDefTabPage::ChangePreviewHdl_Impl( void* )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
 {
@@ -386,7 +386,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickModifyHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
 {
@@ -502,7 +502,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickAddHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
 {
@@ -538,7 +538,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickDeleteHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
 {
@@ -608,7 +608,7 @@ IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickLoadHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndDefTabPage, ClickSaveHdl_Impl)
 {
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 22c2d4fda335..1da2af8ddbf5 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -165,7 +165,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShadowTabPage::Construct()
 {
@@ -178,7 +178,7 @@ void SvxShadowTabPage::Construct()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -232,7 +232,7 @@ void SvxShadowTabPage::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -242,7 +242,7 @@ int SvxShadowTabPage::DeactivatePage( SfxItemSet* _pSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -351,7 +351,7 @@ sal_Bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs )
     return( bModified );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
 {
@@ -454,7 +454,7 @@ void SvxShadowTabPage::Reset( const SfxItemSet& rAttrs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxShadowTabPage::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
@@ -462,14 +462,14 @@ SfxTabPage* SvxShadowTabPage::Create( Window* pWindow,
     return( new SvxShadowTabPage( pWindow, rAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxShadowTabPage::GetRanges()
 {
     return( pShadowRanges );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
 {
@@ -488,7 +488,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
 {
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG(SvxShadowTabPage, ModifyShadowHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxShadowTabPage::PointChanged( Window* pWindow, RECT_POINT eRcPt )
 {
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 3a0b0ec7c73e..7fd60dc65b6c 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -132,13 +132,13 @@ SvxTransformTabDialog::SvxTransformTabDialog( Window* pParent, const SfxItemSet*
     nSlant = AddTabPage("RID_SVXPAGE_SLANT", SvxSlantTabPage::Create, SvxSlantTabPage::GetRanges);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTransformTabDialog::~SvxTransformTabDialog()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
 {
@@ -185,7 +185,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
         }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTransformTabDialog::SetValidateFramePosLink(const Link& rLink)
 {
@@ -223,7 +223,7 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  )
     m_pCtlAngle->SetLinkedField( m_pNfAngle, 2 );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAngleTabPage::Construct()
 {
@@ -293,7 +293,7 @@ sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet& rSet)
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs)
 {
@@ -333,27 +333,27 @@ void SvxAngleTabPage::Reset(const SfxItemSet& rAttrs)
     m_pCtlAngle->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxAngleTabPage::Create( Window* pWindow, const SfxItemSet& rSet)
 {
     return(new SvxAngleTabPage(pWindow, rSet));
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxAngleTabPage::GetRanges()
 {
     return(pAngleRanges);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAngleTabPage::ActivatePage(const SfxItemSet& /*rSet*/)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -365,7 +365,7 @@ int SvxAngleTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxAngleTabPage::PointChanged(Window* pWindow, RECT_POINT eRP)
 {
@@ -458,7 +458,7 @@ SvxSlantTabPage::SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs  )
     ePoolUnit = pPool->GetMetric( SID_ATTR_TRANSFORM_POS_X );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSlantTabPage::Construct()
 {
@@ -474,7 +474,7 @@ void SvxSlantTabPage::Construct()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
 {
@@ -516,7 +516,7 @@ sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs)
     return( bModified );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs)
 {
@@ -570,21 +570,21 @@ void SvxSlantTabPage::Reset(const SfxItemSet& rAttrs)
     m_pMtrAngle->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxSlantTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs )
 {
     return( new SvxSlantTabPage( pWindow, rOutAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxSlantTabPage::GetRanges()
 {
     return( pSlantRanges );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -597,7 +597,7 @@ void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -609,7 +609,7 @@ int SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxSlantTabPage::PointChanged( Window* , RECT_POINT  )
 {
@@ -682,7 +682,7 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::Construct()
 {
@@ -780,7 +780,7 @@ void SvxPositionSizeTabPage::Construct()
     SetMinMaxPosition();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
@@ -904,7 +904,7 @@ sal_Bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs )
     return bModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::Reset( const SfxItemSet&  )
 {
@@ -1011,21 +1011,21 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet&  )
     ChangeSizeProtectHdl( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxPositionSizeTabPage::Create( Window* pWindow, const SfxItemSet& rOutAttrs )
 {
     return( new SvxPositionSizeTabPage( pWindow, rOutAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxPositionSizeTabPage::GetRanges()
 {
     return( pPosSizeRanges );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -1042,7 +1042,7 @@ void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
 {
@@ -1063,7 +1063,7 @@ int SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet )
     return LEAVE_PAGE;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl)
 {
@@ -1073,7 +1073,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::UpdateControlStates()
 {
@@ -1107,7 +1107,7 @@ void SvxPositionSizeTabPage::UpdateControlStates()
 
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl)
 {
@@ -1129,7 +1129,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::SetMinMaxPosition()
 {
@@ -1300,7 +1300,7 @@ void SvxPositionSizeTabPage::SetMinMaxPosition()
     m_pMtrHeight->SetLast(basegfx::fround64(fNewY));
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange)
 {
@@ -1357,7 +1357,7 @@ void SvxPositionSizeTabPage::GetTopLeftPosition(double& rfX, double& rfY, const
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP )
 {
@@ -1429,21 +1429,21 @@ void SvxPositionSizeTabPage::PointChanged( Window* pWindow, RECT_POINT eRP )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::DisableResize()
 {
     mbSizeDisabled = true;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::DisableProtect()
 {
     mbProtectDisabled = true;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl)
 {
@@ -1468,7 +1468,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl)
 {
@@ -1493,7 +1493,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl)
 {
@@ -1501,7 +1501,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl)
 {
@@ -1514,7 +1514,7 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxPositionSizeTabPage::FillUserData()
 {
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 0e9c68d14240..e4cf2969071c 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -759,7 +759,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
     if ( xGridSet.is() )
         xGridSet->setPropertyValue(PROPERTY_BORDER, makeAny((sal_Int16)2));
 
-    // ----------
+
     // marry them
     Reference< ::com::sun::star::container::XNameContainer >  xNameCont(m_xRowSet, UNO_QUERY);
     {
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 4ae9f848e82c..de516292be6e 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -32,13 +32,11 @@
 
 namespace dbaui
 {
-
     struct BooleanSettingDesc;
     typedef ::std::vector< BooleanSettingDesc > BooleanSettingDescs;
 
     // SpecialSettingsPage
-    /** implements the "Special Settings" page of the advanced database settings
-    */
+    // implements the "Special Settings" page of the advanced database settings
     class SpecialSettingsPage : public OGenericAdministrationPage
     {
     protected:
@@ -115,7 +113,7 @@ namespace dbaui
         GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
     protected:
 
-            // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
+        // nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
         virtual ~GeneratedValuesPage();
 
         // must be overloaded by subclasses, but it isn't pure virtual
@@ -131,7 +129,7 @@ namespace dbaui
         DECL_LINK( OnCheckBoxClick, CheckBox * );
     };
 
-} // namespace dbaui
+}
 
 #endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX
 
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
index f84984f28304..c05f561c2515 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx
@@ -35,7 +35,7 @@ ORelationTableConnection::ORelationTableConnection( ORelationTableView* pContain
 ORelationTableConnection::ORelationTableConnection( const ORelationTableConnection& rConn )
     : OTableConnection( rConn )
 {
-    // keine eigenen Members, also reicht die Basisklassenfunktionalitaet
+    // no own members, thus the base class functionality is enough
 }
 
 ORelationTableConnection::~ORelationTableConnection()
@@ -44,7 +44,7 @@ ORelationTableConnection::~ORelationTableConnection()
 
 ORelationTableConnection& ORelationTableConnection::operator=( const ORelationTableConnection& rConn )
 {
-    // nicht dass es was aendern wuerde, da die Basisklasse das auch testet und ich keine eigenen Members zu kopieren habe
+    // this doesn't change anything, since the base class tests this, too and I don't have my own members to copy
     if (&rConn == this)
         return *this;
 
@@ -59,7 +59,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
     if ( pData && (pData->GetCardinality() == CARDINAL_UNDEFINED) )
         return;
 
-    // Linien nach oberster Linie durchsuchen
+    // search lines for top line
     Rectangle aBoundingRect;
     long nTop = GetBoundingRect().Bottom();
     long nTemp;
@@ -82,7 +82,7 @@ void ORelationTableConnection::Draw( const Rectangle& rRect )
         }
     }
 
-    // Kardinalitaet antragen
+    // cardinality
     if( !pTopLine )
         return;
 
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index aa7c5c83a606..a046a0ea9675 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -78,7 +78,7 @@ ORelationTableConnectionData::~ORelationTableConnectionData()
 sal_Bool ORelationTableConnectionData::DropRelation()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    // Relation loeschen
+    // delete relation
     Reference< XIndexAccess> xKeys = getReferencingTable()->getKeys();
     if( !m_aConnName.isEmpty() && xKeys.is() )
     {
@@ -107,7 +107,7 @@ sal_Bool ORelationTableConnectionData::DropRelation()
 
 void ORelationTableConnectionData::ChangeOrientation()
 {
-    // Source- und DestFieldName der Linien austauschen
+    // exchange Source- and DestFieldName of the lines
     OUString sTempString;
     OConnectionLineDataVec::iterator aIter = m_vConnLineData.begin();
     OConnectionLineDataVec::iterator aEnd = m_vConnLineData.end();
@@ -118,7 +118,7 @@ void ORelationTableConnectionData::ChangeOrientation()
         (*aIter)->SetDestFieldName( sTempString );
     }
 
-    // Member anpassen
+    // adapt member
     TTableWindowData::value_type pTemp = m_pReferencingTable;
     m_pReferencingTable = m_pReferencedTable;
     m_pReferencedTable = pTemp;
@@ -184,7 +184,7 @@ sal_Bool ORelationTableConnectionData::IsConnectionPossible()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    // Wenn die SourceFelder ein PrimKey sind, ist nur die Orientierung falsch
+    // if the SourceFields are a PrimKey, it's only the orientation which is wrong
     if ( IsSourcePrimKey() && !IsDestPrimKey() )
         ChangeOrientation();
 
@@ -203,7 +203,7 @@ OConnectionLineDataRef ORelationTableConnectionData::CreateLineDataObj( const OC
 
 void ORelationTableConnectionData::CopyFrom(const OTableConnectionData& rSource)
 {
-    // wie in der Basisklasse zurueckziehen auf das (nicht-virtuelle) operator=
+    // retract to the (non-virtual) operator= like in the base class
     *this = *static_cast<const ORelationTableConnectionData*>(&rSource);
 }
 
@@ -251,7 +251,7 @@ bool operator==(const ORelationTableConnectionData& lhs, const ORelationTableCon
 sal_Bool ORelationTableConnectionData::Update()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
-    // Alte Relation loeschen
+    // delete old relation
     {
         DropRelation();
         if( !IsConnectionPossible() )
@@ -264,7 +264,7 @@ sal_Bool ORelationTableConnectionData::Update()
 
     if ( !xKeys.is() )
         return sal_False;
-    // Neue Relation erzeugen
+    // create new relation
     Reference<XDataDescriptorFactory> xKeyFactory(xKeys,UNO_QUERY);
     OSL_ENSURE(xKeyFactory.is(),"No XDataDescriptorFactory Interface!");
     Reference<XAppend> xAppend(xKeyFactory,UNO_QUERY);
@@ -318,7 +318,7 @@ sal_Bool ORelationTableConnectionData::Update()
         // to get the key we have to reget it because after append it is no longer valid
     }
 
-    // get the name of foreign key // search for columns
+    // get the name of foreign key; search for columns
     m_aConnName = OUString();
 xKey.clear();
     bool bDropRelation = false;
@@ -418,7 +418,7 @@ xKey.clear();
     }
     // NOTE : the caller is responsible for updating any other objects referencing the old LineDatas (for instance a ConnLine)
 
-    // Kardinalitaet bestimmen
+    // determine cardinality
     SetCardinality();
 
     return sal_True;
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index ea7b14200f73..dece62710d8a 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -114,14 +114,14 @@ void ORelationTableView::ReSync()
         }
 
         (*GetTabWinMap())[pData->GetComposedName()] = pTabWin;  // am Anfang einfuegen, da ich die DataList ja rueckwaerts durchlaufe
-        // wenn in den Daten keine Position oder Groesse steht -> Default
+        // if there's no position or size contained in the data -> Default
         if (!pData->HasPosition() && !pData->HasSize())
             SetDefaultTabWinPosSize(pTabWin);
 
         pTabWin->Show();
     }
 
-    // Verbindungen einfuegen
+    // insert connection
     TTableConnectionData* pTabConnDataList = m_pView->getController().getTableConnectionData();
     TTableConnectionData::reverse_iterator aConIter = pTabConnDataList->rbegin();
 
@@ -137,7 +137,8 @@ void ORelationTableView::ReSync()
             bInvalid = bInvalid || ::std::find(arrInvalidTables.begin(),arrInvalidTables.end(),strTabExistenceTest) != arrInvalidTables.end();
 
             if (bInvalid)
-            {   // nein -> Pech gehabt, die Connection faellt weg
+            {
+                // no -> bad luck, die Connection faellt weg
                 pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() );
                 continue;
             }
@@ -176,15 +177,14 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
         }
     }
     // insert table connection into view
-
     TTableConnectionData::value_type pTabConnData(new ORelationTableConnectionData(pSourceWin->GetData(),
                                                                                    pDestWin->GetData()));
 
-    // die Namen der betroffenen Felder
+    // the names of the affected fields
     OUString sSourceFieldName = jxdSource.pListBox->GetEntryText(jxdSource.pEntry);
     OUString sDestFieldName = jxdDest.pListBox->GetEntryText(jxdDest.pEntry);
 
-    // die Anzahl der PKey-Felder in der Quelle
+    // the number of PKey-Fields in the source
     const Reference< XNameAccess> xPrimaryKeyColumns = getPrimaryKeyColumns_throw(pSourceWin->GetData()->getTable());
     bool bAskUser = xPrimaryKeyColumns.is() && Reference< XIndexAccess>(xPrimaryKeyColumns,UNO_QUERY)->getCount() > 1;
 
@@ -196,10 +196,10 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const
     {
         try
         {
-            // Daten der Datenbank uebergeben
+            // hand over data to the database
             if( pTabConnData->Update() )
             {
-                // UI-Object in ConnListe eintragen
+                // enter UI-object into ConnList
                 addConnection( new ORelationTableConnection( this, pTabConnData ) );
             }
         }
@@ -288,7 +288,7 @@ void ORelationTableView::AddTabWin(const OUString& _rComposedName, const OUStrin
         return;
     }
 
-    // Neue Datenstruktur in DocShell eintragen
+    // enter the new data structure into DocShell
     TTableWindowData::value_type pNewTabWinData(createTableWindowData( _rComposedName, rWinName,rWinName ));
     pNewTabWinData->ShowAll(sal_False);
 
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index 980da26282f7..058ae3489cf8 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -28,7 +28,6 @@
 using namespace dbaui;
 
 // class OFieldDescGenWin
-
 OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp ) :
      TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL )
 {
@@ -69,7 +68,7 @@ OUString OFieldDescGenWin::GetControlText( sal_uInt16 nControlId )
 
 void OFieldDescGenWin::SetControlText( sal_uInt16 nControlId, const OUString& rText )
 {
-    // Texte der Controls setzen
+    // set texts of the controls
     m_pFieldControl->SetControlText(nControlId,rText);
 }
 
@@ -94,7 +93,7 @@ void OFieldDescGenWin::SaveData( OFieldDescription* pFieldDescr )
 
 void OFieldDescGenWin::GetFocus()
 {
-    // Setzt den Focus auf das zuletzt aktive Control
+    // sets the focus to the control that was active last
     TabPage::GetFocus();
     if(m_pFieldControl)
         m_pFieldControl->GetFocus();
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 545e89aa132d..40f8e071d543 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
@@ -52,8 +52,8 @@ namespace dbaui
 #if OSL_DEBUG_LEVEL > 0
         OTableEditorCtrl* GetEditorCtrl();
 #endif
-        //  short GetFormatCategory(OFieldDescription* pFieldDescr);
-            // liefert zum am Feld eingestellten Format einen der CAT_xxx-Werte (CAT_NUMBER, CAT_DATE ...)
+        // short GetFormatCategory(OFieldDescription* pFieldDescr);
+        // gives you one of the CAT_xxx-values (CAT_NUMBER, CAT_DATE ...) belonging to the format specified by the field
 
         OUString BoolStringPersistent(const OUString& rUIString) const;
         OUString BoolStringUI(const OUString& rPersistentString) const;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index fe794e2d9ac4..f0b549243c46 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -105,7 +105,7 @@ void OTableEditorCtrl::Init()
 {
     OTableRowView::Init();
 
-    // Should it be opened ReadOnly ?
+    // Should it be opened ReadOnly?
     sal_Bool bRead(GetView()->getController().isReadOnly());
 
     SetReadOnly( bRead );
@@ -474,7 +474,7 @@ void OTableEditorCtrl::DisplayData(long nRow, sal_Bool bGrabFocus)
 
 void OTableEditorCtrl::CursorMoved()
 {
-    // New line ?
+    // New line?
     m_nDataPos = GetCurRow();
     if( m_nDataPos != nOldDataPos && m_nDataPos != -1)
     {
@@ -549,7 +549,7 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId)
         // Store DescrCell
         case HELP_TEXT:
         {
-            // Wenn aktuelle Feldbeschreibung NULL, Default setzen
+            // if the current field description is NULL, set Default
             if( !pActFieldDescr )
             {
                 pHelpTextCell->SetText(OUString());
diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx
index f6dace202c9f..d47bbe71338d 100644
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@ -94,7 +94,7 @@ using namespace ::dbtools;
 using namespace ::dbaui;
 using namespace ::comphelper;
 
-// Anzahl Spalten beim Neuanlegen
+// number of columns when creating it from scratch
 #define NEWCOLS        128
 
 namespace
@@ -182,7 +182,7 @@ void OTableController::disposing()
 FeatureState OTableController::GetState(sal_uInt16 _nId) const
 {
     FeatureState aReturn;
-    // (disabled automatically)
+    // disabled automatically
 
     switch (_nId)
     {
@@ -785,12 +785,12 @@ void OTableController::appendPrimaryKey(Reference<XKeysSupplier>& _rxSup,sal_Boo
 
 void OTableController::loadData()
 {
-    // Wenn Datenstruktur bereits vorhanden, Struktur leeren
+    // if the data structure already exists, empty it
     m_vRowList.clear();
 
     ::boost::shared_ptr<OTableRow>  pTabEdRow;
     Reference< XDatabaseMetaData> xMetaData = getMetaData( );
-    // Datenstruktur mit Daten aus DatenDefinitionsObjekt fuellen
+    // fill data structure with data from DataDefinitionObject
     if(m_xTable.is() && xMetaData.is())
     {
         Reference<XColumnsSupplier> xColSup(m_xTable,UNO_QUERY);
@@ -798,9 +798,9 @@ void OTableController::loadData()
         Reference<XNameAccess> xColumns = xColSup->getColumns();
         OFieldDescription* pActFieldDescr = NULL;
         // ReadOnly-Flag
-        // Bei Drop darf keine Zeile editierbar sein.
-        // Bei Add duerfen nur die leeren Zeilen editierbar sein.
-        // Bei Add und Drop koennen alle Zeilen editiert werden.
+        // For Drop no row may be editable
+        // For Add only the empty rows may be editable
+        // For Add and Drop all rows can be edited
         //  sal_Bool bReadOldRow = xMetaData->supportsAlterTableWithAddColumn() && xMetaData->supportsAlterTableWithDropColumn();
         sal_Bool bIsAlterAllowed = isAlterAllowed();
         Sequence< OUString> aColumns = xColumns->getElementNames();
@@ -865,7 +865,7 @@ void OTableController::loadData()
                 pActFieldDescr->SetHorJustify(dbaui::mapTextJustify(nAlign));
                 pActFieldDescr->SetCurrency(bIsCurrency);
 
-                // Spezielle Daten
+                // special data
                 pActFieldDescr->SetIsNullable(nNullable);
                 pActFieldDescr->SetControlDefault(aControlDefault);
                 pActFieldDescr->SetPrecision(nPrecision);
@@ -897,7 +897,7 @@ void OTableController::loadData()
         }
     }
 
-    // Leere Zeilen fuellen
+    // fill empty rows
 
     OTypeInfoMap::iterator aTypeIter = m_aTypeInfo.find(DataType::VARCHAR);
     if(aTypeIter == m_aTypeInfo.end())
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index ec7986dac4d1..90dafa2287be 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -31,7 +31,7 @@ using namespace ::svt;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
-//--- Defines
+// Defines
 #define HANDLE_ID 0
 
 OTableRowView::OTableRowView(Window* pParent)
@@ -61,12 +61,12 @@ void OTableRowView::Init()
     aFont.SetWeight( WEIGHT_NORMAL );
     GetDataWindow().SetFont( aFont );
 
-    // Font fuer die Ueberschriften auf Light setzen
+    // set font for the headings to light
     aFont = GetFont();
     aFont.SetWeight( WEIGHT_LIGHT );
     SetFont(aFont);
 
-    // HandleColumn, fuer maximal fuenf Ziffern einrichten
+    // set up HandleColumn for at maximum 5 digits
     InsertHandleColumn(static_cast<sal_uInt16>(GetTextWidth(OUString('0')) * 4)/*, sal_True */);
 
     BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION |
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index 08e7d9230a48..4cceb45dcae7 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
@@ -32,7 +32,7 @@ namespace dbaui
     protected:
         virtual void        ActivateAggregate( EControlType eType );
         virtual void        DeactivateAggregate( EControlType eType );
-        // Sind von den abgeleiteten Klassen zu impl.
+        // are to be implemented by the derived classes
         virtual void        CellModified(long nRow, sal_uInt16 nColId );
         virtual sal_Bool        IsReadOnly();
         virtual void        SetModified(sal_Bool bModified);
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 2f28b09333ea..b87c9994c389 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -66,7 +66,7 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent)
 
 OTableFieldDescWin::~OTableFieldDescWin()
 {
-    // Children zerstoeren
+    // destroy children
     m_pHelpBar->Hide();
     getGenPage()->Hide();
     m_pHeader->Hide();
@@ -108,13 +108,13 @@ void OTableFieldDescWin::SaveData( OFieldDescription* pFieldDescr )
 
 void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ )
 {
-    // 3D-Linie am oberen Fensterrand
+    // 3D-line at the top window border
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
 
     SetLineColor( rStyleSettings.GetLightColor() );
     DrawLine( Point(0,0), Point(GetSizePixel().Width(),0) );
 
-    // 3D-Linie zum Abtrennen des Headers
+    // 3D-line for the separation of the header
     DrawLine( Point(3, DETAILS_HEADER_HEIGHT), Point(GetSizePixel().Width()-6, DETAILS_HEADER_HEIGHT) );
     SetLineColor( rStyleSettings.GetShadowColor() );
     DrawLine( Point(3, DETAILS_HEADER_HEIGHT-1), Point(GetSizePixel().Width()-6, DETAILS_HEADER_HEIGHT-1) );
@@ -122,56 +122,56 @@ void OTableFieldDescWin::Paint( const Rectangle& /*rRect*/ )
 
 void OTableFieldDescWin::Resize()
 {
-    // Abmessungen parent window
+    // dimensions of the parent window
     Size aOutputSize( GetOutputSizePixel() );
     long nOutputWidth = aOutputSize.Width();
     long nOutputHeight = aOutputSize.Height();
 
-    // da die GenPage scrollen kann, ich selber aber nicht, positioniere ich das HelpFenster, wenn ich zu schmal werde,
-    // _unter_ der Genpage, nicht rechts daneben. Zuvor versuche ich aber noch, es etwas schmaler zu machen
+    // since the GenPage can scroll, but I can't, I position the HelpWindow, in case I become too slim,
+    // _below_ the Genpage, not on the right side. But before that I try to make it a bit smaller
 
     long nHelpX, nHelpY;
     long nHelpWidth, nHelpHeight;
     long nPageWidth, nPageHeight;
 
-    // passen beide nebeneinander (Rand + Page + Rand + Help) ?
+    // do both fit next to each other (margin + page + margin + help)?
     if (STANDARD_MARGIN + DETAILS_OPT_PAGE_WIDTH + STANDARD_MARGIN + DETAILS_MIN_HELP_WIDTH <= nOutputWidth)
-    {   // ja -> dann ist die Frage, ob man der Hilfe ihre Optimal-Breite geben kann
+    {   // yes -> then we wonder if can give the help its optimum width
         nHelpWidth = DETAILS_OPT_HELP_WIDTH;
         nPageWidth = nOutputWidth - nHelpWidth - STANDARD_MARGIN - STANDARD_MARGIN;
         if (nPageWidth < DETAILS_OPT_PAGE_WIDTH)
-        {   // dann doch lieber die Hilfe von ihrer optimalen in Richtung auf die minimale Groesse
+        {   // rather resize the help from its optimal width to it's minimum width
             long nTransfer = DETAILS_OPT_PAGE_WIDTH - nPageWidth;
             nPageWidth += nTransfer;
             nHelpWidth -= nTransfer;
         }
         nHelpX = nOutputWidth - nHelpWidth;
-        // die Hoehen sind dann einfach ...
+        // the heights are simple in that case...
         nHelpY = DETAILS_HEADER_HEIGHT + 1;
         nHelpHeight = nOutputHeight - nHelpY;
         nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN;
     }
     else
-    {   // nebeneinander geht nicht, also untereinander (Rand + Header + Page + Help)
+    {   // doesn't work next to each other, thus below each other (margin + header + page + help)
         if (STANDARD_MARGIN + DETAILS_HEADER_HEIGHT + DETAILS_OPT_PAGE_HEIGHT + DETAILS_MIN_HELP_HEIGHT <= nOutputHeight)
-        {   // es reicht zumindest, um beide untereinander (Page optimal, Help minimal) unterzubringen
+        {   // it's at least enough, to fit both below each other (page optimal, help minimal)
             nHelpHeight = DETAILS_OPT_HELP_HEIGHT;
             nPageHeight = nOutputHeight - nHelpHeight - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN;
             if (nPageHeight < DETAILS_OPT_PAGE_HEIGHT)
-            {   // wie oben : Page optimal, Hilfe soviel wie eben bleibt (das ist groesser/gleich ihrem Minimum)
+            {   // like above: page optimal, help gets whatever is left (which is bigger/equal to its minimum)
                 long nTransfer = DETAILS_OPT_PAGE_HEIGHT - nPageHeight;
                 nPageHeight += nTransfer;
                 nHelpHeight -= nTransfer;
             }
             nHelpY = nOutputHeight - nHelpHeight;
-            // und ueber die ganze Breite
-            nHelpX = 0;                 // ohne Margin, da das HelpCtrl einen eigenen hat
+            // and across the entire width
+            nHelpX = 0;                 // without margin, since the HelpCtrl has its own one
             nHelpWidth = nOutputWidth;  // dito
             nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN;
         }
         else
-        {   // dummerweise reicht es nicht mal, um Page optimal und Help minimal zu zeigen
-            nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // -> kein Help-Fenster
+        {   // unfortunately that's not even enough, to show page at its optimum and help with minimum widthn
+            nHelpX = nHelpY = nHelpWidth = nHelpHeight = 0; // thus no help window
             nPageWidth = nOutputWidth - STANDARD_MARGIN - STANDARD_MARGIN;
             nPageHeight = nOutputHeight - STANDARD_MARGIN - DETAILS_HEADER_HEIGHT - STANDARD_MARGIN;
         }
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 31d84a779cb7..d079c82a9342 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -116,7 +116,7 @@ namespace dbaui
     void BasicInteractionHandler::implHandle(const ParametersRequest& _rParamRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations)
     {
         SolarMutexGuard aGuard;
-            // want to open a dialog ....
+        // want to open a dialog...
 
         sal_Int32 nAbortPos = getContinuation(ABORT, _rContinuations);
         sal_Int32 nParamPos = getContinuation(SUPPLY_PARAMETERS, _rContinuations);
@@ -154,7 +154,7 @@ namespace dbaui
     void BasicInteractionHandler::implHandle(const SQLExceptionInfo& _rSqlInfo, const Sequence< Reference< XInteractionContinuation > >& _rContinuations)
     {
         SolarMutexGuard aGuard;
-            // want to open a dialog ....
+        // want to open a dialog...
 
         sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations);
         sal_Int32 nDisapprovePos = getContinuation(DISAPPROVE, _rContinuations);
@@ -182,7 +182,7 @@ namespace dbaui
 
         // execute the dialog
         OSQLMessageBox aDialog(NULL, _rSqlInfo, nDialogStyle);
-            // TODO: need a way to specify the parent window
+        // TODO: need a way to specify the parent window
         sal_Int16 nResult = aDialog.Execute();
         try
         {
@@ -227,7 +227,7 @@ namespace dbaui
     void BasicInteractionHandler::implHandle(const DocumentSaveRequest& _rDocuRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations)
     {
         SolarMutexGuard aGuard;
-            // want to open a dialog ....
+        // want to open a dialog ....
 
         sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations);
         sal_Int32 nDisApprovePos = getContinuation(DISAPPROVE, _rContinuations);
@@ -236,7 +236,7 @@ namespace dbaui
         short nRet = RET_YES;
         if ( -1 != nApprovePos )
         {
-            // fragen, ob gespeichert werden soll
+            // ask whether it should be saved
             nRet = ExecuteQuerySaveDocument(NULL,_rDocuRequest.Name);
         }
 
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 6a5030bd9c3f..702138310548 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -32,7 +32,7 @@
 // --- needed because of the solar mutex
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-// ---
+
 
 namespace dbaui
 {
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 9ffe7648c011..91b3157950d7 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -366,7 +366,7 @@ void DoRestartActionsIfNecessary(bool quickstart) {
 
 }
 
-// ----------------------------------------------------------------------------
+
 
 ResMgr* Desktop::GetDesktopResManager()
 {
@@ -397,7 +397,7 @@ ResMgr* Desktop::GetDesktopResManager()
 
 namespace {
 
-// ----------------------------------------------------------------------------
+
 // Get a message string securely. There is a fallback string if the resource
 // is not available.
 
@@ -1078,7 +1078,7 @@ sal_Bool Desktop::isUIOnSessionShutdownAllowed()
         ::get();
 }
 
-//-----------------------------------------------
+
 /** @short  check if recovery must be started or not.
 
     @param  bCrashed [boolean ... out!]
@@ -1108,7 +1108,7 @@ void impl_checkRecoveryState(sal_Bool& bCrashed           ,
     bSessionDataExists = elements && session;
 }
 
-//-----------------------------------------------
+
 /*  @short  start the recovery wizard.
 
     @param  bEmergencySave
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index cec9b910721a..68f7aa026d22 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::ucb;
 namespace desktop
 {
 
-// -----------------------------------------------------------------------------
+
 
 static void configureUcb()
 {
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 30c2946586ac..148609b250ec 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -99,7 +99,7 @@ public:
     virtual void SAL_CALL pop() throw (uno::RuntimeException);
 };
 
-//-----------------------------------------------------------------------------
+
 SilentCommandEnv::SilentCommandEnv(
     uno::Reference<uno::XComponentContext> const & xContext,
     Desktop* pDesktop ):
@@ -109,27 +109,27 @@ SilentCommandEnv::SilentCommandEnv(
     mnProgress( 25 )
 {}
 
-//-----------------------------------------------------------------------------
+
 SilentCommandEnv::~SilentCommandEnv()
 {
     mpDesktop->SetSplashScreenText( OUString() );
 }
 
-//-----------------------------------------------------------------------------
+
 Reference<task::XInteractionHandler> SilentCommandEnv::getInteractionHandler()
     throw (uno::RuntimeException)
 {
     return this;
 }
 
-//-----------------------------------------------------------------------------
+
 Reference<ucb::XProgressHandler> SilentCommandEnv::getProgressHandler()
     throw (uno::RuntimeException)
 {
     return this;
 }
 
-//-----------------------------------------------------------------------------
+
 // XInteractionHandler
 void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRequest )
     throw (uno::RuntimeException)
@@ -178,7 +178,7 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe
     }
 }
 
-//-----------------------------------------------------------------------------
+
 // XProgressHandler
 void SilentCommandEnv::push( uno::Any const & rStatus )
     throw (uno::RuntimeException)
@@ -195,7 +195,7 @@ void SilentCommandEnv::push( uno::Any const & rStatus )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SilentCommandEnv::update( uno::Any const & rStatus )
     throw (uno::RuntimeException)
 {
@@ -206,7 +206,7 @@ void SilentCommandEnv::update( uno::Any const & rStatus )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SilentCommandEnv::pop() throw (uno::RuntimeException)
 {
     mnLevel -= 1;
@@ -236,9 +236,9 @@ static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContex
     return nRet;
 }
 
-//------------------------------------------------------------------------------
+
 // Check dependencies of all packages
-//------------------------------------------------------------------------------
+
 static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext > &xContext )
 {
     uno::Sequence< uno::Sequence< uno::Reference< deployment::XPackage > > > xAllPackages;
@@ -314,9 +314,9 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 // resets the 'check needed' flag (needed, if aborted)
-//------------------------------------------------------------------------------
+
 static void impl_setNeedsCompatCheck()
 {
     try {
@@ -339,10 +339,10 @@ static void impl_setNeedsCompatCheck()
     catch (const Exception&) {}
 }
 
-//------------------------------------------------------------------------------
+
 // to check if we need checking the dependencies of the extensions again, we compare
 // the build id of the office with the one of the last check
-//------------------------------------------------------------------------------
+
 static bool impl_needsCompatCheck()
 {
     bool bNeedsCheck = false;
@@ -381,7 +381,7 @@ static bool impl_needsCompatCheck()
     return bNeedsCheck;
 }
 
-//------------------------------------------------------------------------------
+
 // Do we need to check the dependencies of the extensions?
 // When there are unresolved issues, we can't continue with startup
 sal_Bool Desktop::CheckExtensionDependencies()
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 047c01b3f5e2..894fb80931a9 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -128,7 +128,7 @@ CommandLineArgs::CommandLineArgs( Supplier& supplier )
     ParseCommandLine_Impl( supplier );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
 {
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 11ee1f858f1b..b53b93bf981e 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -29,21 +29,21 @@
 #include <stdio.h>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
-// ----------------------------------------------------------------------------
+
 
 namespace uno           = ::com::sun::star::uno;
 namespace lang          = ::com::sun::star::lang;
 using uno::UNO_QUERY;
 
-// ----------------------------------------------------------------------------
+
 
 // must be aligned with configmgr/source/misc/configinteractionhandler
 static char const CONFIG_ERROR_HANDLER[] = "configuration.interaction-handler";
-// ----------------------------------------------------------------------------
 
-// ----------------------------------------------------------------------------
+
+
 // ConfigurationErrorHandler
-// ----------------------------------------------------------------------------
+
 
 namespace
 {
@@ -82,7 +82,7 @@ namespace
 
 }
 
-// ----------------------------------------------------------------------------
+
 class ConfigurationErrorHandler::Context : public SimpleCurrentContext
 {
 public:
@@ -104,7 +104,7 @@ private:
     InteractionHandler  m_xHandler;
 };
 
-//------------------------------------------------------------------------------
+
 uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString const & aName)
         throw (uno::RuntimeException)
 {
@@ -117,13 +117,13 @@ uno::Any SAL_CALL ConfigurationErrorHandler::Context::getValueByName( OUString c
     return SimpleCurrentContext::getValueByName( aName );
 }
 
-//------------------------------------------------------------------------------
+
 ConfigurationErrorHandler::~ConfigurationErrorHandler()
 {
     deactivate();
 }
 
-//------------------------------------------------------------------------------
+
 /// installs the handler into the current context
 void ConfigurationErrorHandler::activate()
 {
@@ -135,7 +135,7 @@ void ConfigurationErrorHandler::activate()
     m_pContext->install();
 }
 
-//------------------------------------------------------------------------------
+
 /// deinstalls the handler from the current context, restoring the previous context
 void ConfigurationErrorHandler::deactivate()
 {
@@ -146,7 +146,7 @@ void ConfigurationErrorHandler::deactivate()
         m_pContext = 0;
     }
 }
-//------------------------------------------------------------------------------
+
 
 ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefaultInteractionHandler()
 {
@@ -154,7 +154,7 @@ ConfigurationErrorHandler::InteractionHandler ConfigurationErrorHandler::getDefa
     InteractionHandler xHandler( com::sun::star::task::InteractionHandler::createWithParent(xContext, 0), UNO_QUERY );
     return xHandler;
 }
-//------------------------------------------------------------------------------
+
 
 
 
diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx
index 8018c9ed72d4..87784a83cbe5 100644
--- a/desktop/source/app/desktopresid.cxx
+++ b/desktop/source/app/desktopresid.cxx
@@ -20,7 +20,7 @@
 #include "desktopresid.hxx"
 #include "app.hxx"
 
-// -----------------------------------------------------------------------
+
 namespace desktop
 {
 
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 44d8c893bb6f..2f2ce3e47ff0 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -325,7 +325,7 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign
     return osl_Signal_ActCallNextHdl;
 }
 
-// ----------------------------------------------------------------------------
+
 
 // The OfficeIPCThreadController implementation is a bookkeeper for all pending requests
 // that were created by the OfficeIPCThread. The requests are waiting to be processed by
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 663ffa0458fd..b5a29ed42b80 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -62,12 +62,12 @@ public:
     virtual void SAL_CALL pop() throw (RuntimeException);
 };
 
-//______________________________________________________________________________
+
 ProgressLogImpl::~ProgressLogImpl()
 {
 }
 
-//______________________________________________________________________________
+
 void ProgressLogImpl::disposing()
 {
     try {
@@ -83,7 +83,7 @@ void ProgressLogImpl::disposing()
     }
 }
 
-//______________________________________________________________________________
+
 ProgressLogImpl::ProgressLogImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xContext )
@@ -125,7 +125,7 @@ ProgressLogImpl::ProgressLogImpl(
     log_write( buf.makeStringAndClear() );
 }
 
-//______________________________________________________________________________
+
 void ProgressLogImpl::log_write( OString const & text )
 {
     try {
@@ -144,7 +144,7 @@ void ProgressLogImpl::log_write( OString const & text )
 }
 
 // XProgressHandler
-//______________________________________________________________________________
+
 void ProgressLogImpl::push( Any const & Status )
     throw (RuntimeException)
 {
@@ -153,7 +153,7 @@ void ProgressLogImpl::push( Any const & Status )
     ++m_log_level;
 }
 
-//______________________________________________________________________________
+
 void ProgressLogImpl::update( Any const & Status )
     throw (RuntimeException)
 {
@@ -178,7 +178,7 @@ void ProgressLogImpl::update( Any const & Status )
                    buf.makeStringAndClear(), osl_getThreadTextEncoding() ) );
 }
 
-//______________________________________________________________________________
+
 void ProgressLogImpl::pop() throw (RuntimeException)
 {
     OSL_ASSERT( m_log_level > 0 );
diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx
index 637d0b996f86..850bdb3e068a 100644
--- a/desktop/source/deployment/dp_persmap.cxx
+++ b/desktop/source/deployment/dp_persmap.cxx
@@ -169,7 +169,7 @@ bool PersistentMap::open()
     return readAll();
 }
 
-//______________________________________________________________________________
+
 bool PersistentMap::readAll()
 {
     // prepare for re-reading the map-file
@@ -293,7 +293,7 @@ void PersistentMap::add( OString const & key, OString const & value )
     m_bIsDirty = r.second;
 }
 
-//______________________________________________________________________________
+
 void PersistentMap::put( OString const & key, OString const & value )
 {
     add( key, value);
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
index 0a30de2f0e0b..019202f89fe0 100644
--- a/desktop/source/deployment/gui/descedit.cxx
+++ b/desktop/source/deployment/gui/descedit.cxx
@@ -40,7 +40,7 @@ DescriptionEdit::DescriptionEdit( Window* pParent, const ResId& rResId ) :
     Init();
 }
 
-// -----------------------------------------------------------------------
+
 
 void DescriptionEdit::Init()
 {
@@ -53,7 +53,7 @@ void DescriptionEdit::Init()
     EnableCursor( false );
 }
 
-// -----------------------------------------------------------------------
+
 
 void DescriptionEdit::Clear()
 {
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 66cdab2ed355..b887cb7a2047 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -89,7 +89,7 @@ namespace dp_gui {
 #define SHARED_PACKAGE_MANAGER  "shared"
 #define BUNDLED_PACKAGE_MANAGER "bundled"
 
-//------------------------------------------------------------------------------
+
 struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
 {
     const OUString operator () () {
@@ -100,9 +100,9 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles >
     }
 };
 
-//------------------------------------------------------------------------------
+
 //                            ExtBoxWithBtns_Impl
-//------------------------------------------------------------------------------
+
 
 enum MENU_COMMAND
 {
@@ -130,7 +130,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl
     bool            HandleTabKey( bool bReverse );
     MENU_COMMAND    ShowPopupMenu( const Point &rPos, const long nPos );
 
-    //-----------------
+
     DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar * );
 
     DECL_DLLPRIVATE_LINK( HandleOptionsBtn, void * );
@@ -151,7 +151,7 @@ public:
 
     virtual void    RecalcAll();
     virtual void    selectEntry( const long nPos );
-    //-----------------
+
     void            enableButtons( bool bEnable );
 };
 
@@ -170,7 +170,7 @@ Size ExtBoxWithBtns_Impl::GetOptimalSize() const
     return LogicToPixel(Size(250, 150), MAP_APPFONT);
 }
 
-//------------------------------------------------------------------------------
+
 void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
 {
     setExtensionManager(pParentDialog->getExtensionManager());
@@ -211,7 +211,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeExtBoxWithBtns(Window *pPar
     return new ExtBoxWithBtns_Impl(pParent);
 }
 
-//------------------------------------------------------------------------------
+
 ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
 {
     delete m_pOptionsBtn;
@@ -219,7 +219,7 @@ ExtBoxWithBtns_Impl::~ExtBoxWithBtns_Impl()
     delete m_pRemoveBtn;
 }
 
-// -----------------------------------------------------------------------
+
 void ExtBoxWithBtns_Impl::RecalcAll()
 {
     const sal_Int32 nActive = getSelIndex();
@@ -242,7 +242,7 @@ void ExtBoxWithBtns_Impl::RecalcAll()
 }
 
 
-//------------------------------------------------------------------------------
+
 //This function may be called with nPos < 0
 void ExtBoxWithBtns_Impl::selectEntry( const long nPos )
 {
@@ -252,7 +252,7 @@ void ExtBoxWithBtns_Impl::selectEntry( const long nPos )
     ExtensionBox_Impl::selectEntry( nPos );
 }
 
-// -----------------------------------------------------------------------
+
 void ExtBoxWithBtns_Impl::SetButtonPos( const Rectangle& rRect )
 {
     Size  aBtnSize( m_pOptionsBtn->GetSizePixel() );
@@ -266,7 +266,7 @@ void ExtBoxWithBtns_Impl::SetButtonPos( const Rectangle& rRect )
     m_pEnableBtn->SetPosPixel( aBtnPos );
 }
 
-// -----------------------------------------------------------------------
+
 void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry )
 {
     bool bShowOptionBtn = true;
@@ -313,7 +313,7 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry )
         m_pRemoveBtn->Hide();
 }
 
-// -----------------------------------------------------------------------
+
 bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse )
 {
     sal_Int32 nIndex = getSelIndex();
@@ -360,7 +360,7 @@ bool ExtBoxWithBtns_Impl::HandleTabKey( bool bReverse )
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long nPos )
 {
     if ( nPos >= (long) getItemCount() )
@@ -388,7 +388,7 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long
     return (MENU_COMMAND) aPopup.Execute( this, rPos );
 }
 
-//------------------------------------------------------------------------------
+
 void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( m_bInterfaceLocked )
@@ -429,7 +429,7 @@ void ExtBoxWithBtns_Impl::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
 {
     bool bHandled = false;
@@ -450,7 +450,7 @@ bool ExtBoxWithBtns_Impl::Notify( NotifyEvent& rNEvt )
         return true;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtBoxWithBtns_Impl::enableButtons( bool bEnable )
 {
     m_bInterfaceLocked = ! bEnable;
@@ -469,7 +469,7 @@ void ExtBoxWithBtns_Impl::enableButtons( bool bEnable )
     }
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar )
 {
     long nDelta = pScrBar->GetDelta();
@@ -487,7 +487,7 @@ IMPL_LINK( ExtBoxWithBtns_Impl, ScrollHdl, ScrollBar*, pScrBar )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn)
 {
     const sal_Int32 nActive = getSelIndex();
@@ -510,7 +510,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn)
 {
     const sal_Int32 nActive = getSelIndex();
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleEnableBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn)
 {
     const sal_Int32 nActive = getSelIndex();
@@ -545,9 +545,9 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleRemoveBtn)
     return 1;
 }
 
-//------------------------------------------------------------------------------
+
 //                             DialogHelper
-//------------------------------------------------------------------------------
+
 DialogHelper::DialogHelper( const uno::Reference< uno::XComponentContext > &xContext,
                             Dialog *pWindow ) :
     m_pVCLWindow( pWindow ),
@@ -557,21 +557,21 @@ DialogHelper::DialogHelper( const uno::Reference< uno::XComponentContext > &xCon
     m_xContext = xContext;
 }
 
-//------------------------------------------------------------------------------
+
 DialogHelper::~DialogHelper()
 {
     if ( m_nEventID )
         Application::RemoveUserEvent( m_nEventID );
 }
 
-//------------------------------------------------------------------------------
+
 ResId DialogHelper::getResId( sal_uInt16 nId )
 {
     const SolarMutexGuard guard;
     return ResId( nId, *DeploymentGuiResMgr::get() );
 }
 
-//------------------------------------------------------------------------------
+
 OUString DialogHelper::getResourceString(sal_uInt16 id)
 {
     const SolarMutexGuard guard;
@@ -583,7 +583,7 @@ OUString DialogHelper::getResourceString(sal_uInt16 id)
     return ret;
 }
 
-//------------------------------------------------------------------------------
+
 bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > &xPackage )
 {
     if ( xPackage->getRepositoryName() == SHARED_PACKAGE_MANAGER )
@@ -592,7 +592,7 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage >
         return false;
 }
 
-//------------------------------------------------------------------------------
+
 bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage,
                                               Window *pParent,
                                               const sal_uInt16 nResID,
@@ -618,7 +618,7 @@ bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::
         return true;
 }
 
-//------------------------------------------------------------------------------
+
 void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle ) const
 {
     if ( sURL.isEmpty() ) // Nothing to do, when the URL is empty
@@ -642,7 +642,7 @@ void DialogHelper::openWebBrowser( const OUString & sURL, const OUString &sTitle
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
 {
     const SolarMutexGuard guard;
@@ -655,7 +655,7 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const
     return ( RET_OK == aInfo.Execute() );
 }
 
-//------------------------------------------------------------------------------
+
 bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
 {
     const SolarMutexGuard guard;
@@ -683,7 +683,7 @@ bool DialogHelper::installForAllUsers( bool &bInstallForAll ) const
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
 {
     if ( m_nEventID )
@@ -692,9 +692,9 @@ void DialogHelper::PostUserEvent( const Link& rLink, void* pCaller )
     m_nEventID = Application::PostUserEvent( rLink, pCaller );
 }
 
-//------------------------------------------------------------------------------
+
 //                             ExtMgrDialog
-//------------------------------------------------------------------------------
+
 ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager)
     : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui")
     , DialogHelper(pManager->getContext(), (Dialog*) this)
@@ -747,19 +747,19 @@ ExtMgrDialog::ExtMgrDialog(Window *pParent, TheExtensionManager *pManager)
     m_aTimeoutTimer.SetTimeoutHdl( LINK( this, ExtMgrDialog, TimeOutHdl ) );
 }
 
-//------------------------------------------------------------------------------
+
 ExtMgrDialog::~ExtMgrDialog()
 {
     m_aTimeoutTimer.Stop();
 }
 
-//------------------------------------------------------------------------------
+
 void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL )
 {
     m_pGetExtensions->SetURL( rURL );
 }
 
-//------------------------------------------------------------------------------
+
 long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
                                      bool bLicenseMissing )
 {
@@ -788,20 +788,20 @@ long ExtMgrDialog::addPackageToList( const uno::Reference< deployment::XPackage
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtMgrDialog::prepareChecking()
 {
     m_pExtensionBox->prepareChecking();
 }
 
-//------------------------------------------------------------------------------
+
 void ExtMgrDialog::checkEntries()
 {
     const SolarMutexGuard guard;
     m_pExtensionBox->checkEntries();
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
 {
     const SolarMutexGuard guard;
@@ -814,7 +814,7 @@ bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const
     return ( RET_OK == aInfo.Execute() );
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage,
                                   bool bEnable )
 {
@@ -837,7 +837,7 @@ bool ExtMgrDialog::enablePackage( const uno::Reference< deployment::XPackage > &
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtMgrDialog::removePackage( const uno::Reference< deployment::XPackage > &xPackage )
 {
     if ( !xPackage.is() )
@@ -857,7 +857,7 @@ bool ExtMgrDialog::removePackage( const uno::Reference< deployment::XPackage > &
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > &xPackage )
 {
     if ( !xPackage.is() )
@@ -878,7 +878,7 @@ bool ExtMgrDialog::updatePackage( const uno::Reference< deployment::XPackage > &
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtMgrDialog::acceptLicense( const uno::Reference< deployment::XPackage > &xPackage )
 {
     if ( !xPackage.is() )
@@ -889,7 +889,7 @@ bool ExtMgrDialog::acceptLicense( const uno::Reference< deployment::XPackage > &
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
 {
     const uno::Reference< uno::XComponentContext > xContext( m_pManager->getContext() );
@@ -956,7 +956,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker()
     return files;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtMgrDialog, HandleCancelBtn)
 {
     if ( m_xAbortChannel.is() )
@@ -980,7 +980,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleCloseBtn)
 }
 
 
-// ------------------------------------------------------------------------------
+
 IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1012,7 +1012,7 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 void ExtMgrDialog::showProgress( bool _bStart )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1035,7 +1035,7 @@ void ExtMgrDialog::showProgress( bool _bStart )
     DialogHelper::PostUserEvent( LINK( this, ExtMgrDialog, startProgress ), (void*) bStart );
 }
 
-// -----------------------------------------------------------------------
+
 void ExtMgrDialog::updateProgress( const long nProgress )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1043,7 +1043,7 @@ void ExtMgrDialog::updateProgress( const long nProgress )
     m_nProgress = nProgress;
 }
 
-// -----------------------------------------------------------------------
+
 void ExtMgrDialog::updateProgress( const OUString &rText,
                                    const uno::Reference< task::XAbortChannel > &xAbortChannel)
 {
@@ -1054,14 +1054,14 @@ void ExtMgrDialog::updateProgress( const OUString &rText,
     m_bProgressChanged = true;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtMgrDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage )
 {
     const SolarMutexGuard aGuard;
     m_pExtensionBox->updateEntry( xPackage );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn)
 {
     setBusy( true );
@@ -1077,14 +1077,14 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleAddBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx)
 {
     // re-creates the list of packages with addEntry selecting the packages
     m_pManager->createPackageList();
     return 1;
 }
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn)
 {
     m_pManager->checkUpdates( false, true );
@@ -1092,7 +1092,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleUpdateBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
 {
     openWebBrowser( pHyperlink->GetURL(), GetText() );
@@ -1100,7 +1100,7 @@ IMPL_LINK( ExtMgrDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl)
 {
     if ( m_bStopProgress )
@@ -1138,7 +1138,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, TimeOutHdl)
     return 1;
 }
 
-//------------------------------------------------------------------------------
+
 // VCL::Window / Dialog
 
 bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
@@ -1175,7 +1175,7 @@ bool ExtMgrDialog::Notify( NotifyEvent& rNEvt )
         return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtMgrDialog::Close()
 {
     bool bRet = m_pManager->queryTermination();
@@ -1187,9 +1187,9 @@ bool ExtMgrDialog::Close()
     return bRet;
 }
 
-//------------------------------------------------------------------------------
+
 //                             UpdateRequiredDialog
-//------------------------------------------------------------------------------
+
 UpdateRequiredDialog::UpdateRequiredDialog( Window *pParent, TheExtensionManager *pManager ) :
     ModalDialog( pParent,   getResId( RID_DLG_UPDATE_REQUIRED ) ),
     DialogHelper( pManager->getContext(), (Dialog*) this ),
@@ -1264,7 +1264,7 @@ UpdateRequiredDialog::UpdateRequiredDialog( Window *pParent, TheExtensionManager
     m_aTimeoutTimer.SetTimeoutHdl( LINK( this, UpdateRequiredDialog, TimeOutHdl ) );
 }
 
-//------------------------------------------------------------------------------
+
 UpdateRequiredDialog::~UpdateRequiredDialog()
 {
     m_aTimeoutTimer.Stop();
@@ -1272,7 +1272,7 @@ UpdateRequiredDialog::~UpdateRequiredDialog()
     delete m_pExtensionBox;
 }
 
-//------------------------------------------------------------------------------
+
 long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::XPackage > &xPackage,
                                              bool bLicenseMissing )
 {
@@ -1287,13 +1287,13 @@ long UpdateRequiredDialog::addPackageToList( const uno::Reference< deployment::X
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateRequiredDialog::prepareChecking()
 {
     m_pExtensionBox->prepareChecking();
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateRequiredDialog::checkEntries()
 {
     const SolarMutexGuard guard;
@@ -1306,7 +1306,7 @@ void UpdateRequiredDialog::checkEntries()
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPackage > &xPackage,
                                           bool bEnable )
 {
@@ -1315,7 +1315,7 @@ bool UpdateRequiredDialog::enablePackage( const uno::Reference< deployment::XPac
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn)
 {
     if ( m_xAbortChannel.is() )
@@ -1332,7 +1332,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCancelBtn)
     return 1;
 }
 
-// ------------------------------------------------------------------------------
+
 IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1360,7 +1360,7 @@ IMPL_LINK( UpdateRequiredDialog, startProgress, void*, _bLockInterface )
     return 0;
 }
 
-// ------------------------------------------------------------------------------
+
 void UpdateRequiredDialog::showProgress( bool _bStart )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1383,7 +1383,7 @@ void UpdateRequiredDialog::showProgress( bool _bStart )
     DialogHelper::PostUserEvent( LINK( this, UpdateRequiredDialog, startProgress ), (void*) bStart );
 }
 
-// -----------------------------------------------------------------------
+
 void UpdateRequiredDialog::updateProgress( const long nProgress )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1391,7 +1391,7 @@ void UpdateRequiredDialog::updateProgress( const long nProgress )
     m_nProgress = nProgress;
 }
 
-// -----------------------------------------------------------------------
+
 void UpdateRequiredDialog::updateProgress( const OUString &rText,
                                            const uno::Reference< task::XAbortChannel > &xAbortChannel)
 {
@@ -1402,7 +1402,7 @@ void UpdateRequiredDialog::updateProgress( const OUString &rText,
     m_bProgressChanged = true;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::XPackage > &xPackage )
 {
     // We will remove all updated packages with satisfied dependencies, but
@@ -1421,7 +1421,7 @@ void UpdateRequiredDialog::updatePackageInfo( const uno::Reference< deployment::
     }
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -1442,7 +1442,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleUpdateBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1460,7 +1460,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, HandleCloseBtn)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
 {
     openWebBrowser( pHyperlink->GetURL(), GetText() );
@@ -1468,7 +1468,7 @@ IMPL_LINK( UpdateRequiredDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl)
 {
     if ( m_bStopProgress )
@@ -1506,7 +1506,7 @@ IMPL_LINK_NOARG(UpdateRequiredDialog, TimeOutHdl)
     return 1;
 }
 
-//------------------------------------------------------------------------------
+
 // VCL::Window / Dialog
 void UpdateRequiredDialog::Resize()
 {
@@ -1575,7 +1575,7 @@ void UpdateRequiredDialog::Resize()
     m_aProgressText.SetPosSizePixel( aPos, aFTSize );
 }
 
-//------------------------------------------------------------------------------
+
 // VCL::Dialog
 short UpdateRequiredDialog::Execute()
 {
@@ -1599,7 +1599,7 @@ short UpdateRequiredDialog::Execute()
     return Dialog::Execute();
 }
 
-//------------------------------------------------------------------------------
+
 // VCL::Dialog
 bool UpdateRequiredDialog::Close()
 {
@@ -1618,9 +1618,9 @@ bool UpdateRequiredDialog::Close()
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 // Check dependencies of all packages
-//------------------------------------------------------------------------------
+
 bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage > &xPackage ) const
 {
     bool bRegistered = false;
@@ -1659,7 +1659,7 @@ bool UpdateRequiredDialog::checkDependencies( const uno::Reference< deployment::
     return bDependenciesValid;
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateRequiredDialog::hasActiveEntries()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1680,7 +1680,7 @@ bool UpdateRequiredDialog::hasActiveEntries()
     return bRet;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateRequiredDialog::disableAllEntries()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1700,9 +1700,9 @@ void UpdateRequiredDialog::disableAllEntries()
         m_aCloseBtn.SetText( m_sCloseText );
 }
 
-//------------------------------------------------------------------------------
+
 //                             ShowLicenseDialog
-//------------------------------------------------------------------------------
+
 ShowLicenseDialog::ShowLicenseDialog( Window * pParent,
                                       const uno::Reference< deployment::XPackage > &xPackage )
     : ModalDialog(pParent, "ShowLicenseDialog", "desktop/ui/showlicensedialog.ui")
@@ -1723,14 +1723,14 @@ UpdateRequiredDialogService::UpdateRequiredDialogService( uno::Sequence< uno::An
 {
 }
 
-//------------------------------------------------------------------------------
+
 // XExecutableDialog
-//------------------------------------------------------------------------------
+
 void UpdateRequiredDialogService::setTitle( OUString const & ) throw ( uno::RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException )
 {
     ::rtl::Reference< ::dp_gui::TheExtensionManager > xManager( TheExtensionManager::get(
@@ -1743,7 +1743,7 @@ sal_Int16 UpdateRequiredDialogService::execute() throw ( uno::RuntimeException )
     return nRet;
 }
 
-//------------------------------------------------------------------------------
+
 SelectedPackage::~SelectedPackage() {}
 
 } //namespace dp_gui
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index fb5e42c3bf5c..51afc8a3d1db 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -181,7 +181,7 @@ public:
     virtual void SAL_CALL pop() throw ( uno::RuntimeException );
 };
 
-//------------------------------------------------------------------------------
+
 struct ExtensionCmd
 {
     enum E_CMD_TYPE { ADD, ENABLE, DISABLE, REMOVE, CHECK_FOR_UPDATES, ACCEPT_LICENSE };
@@ -215,7 +215,7 @@ struct ExtensionCmd
 
 typedef ::boost::shared_ptr< ExtensionCmd > TExtensionCmd;
 
-//------------------------------------------------------------------------------
+
 class ExtensionCmdQueue::Thread: public salhelper::Thread
 {
 public:
@@ -276,7 +276,7 @@ private:
     bool             m_bWorking;
 };
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::startProgress()
 {
     m_nCurrentProgress = 0;
@@ -285,14 +285,14 @@ void ProgressCmdEnv::startProgress()
         m_pDialogHelper->showProgress( true );
 }
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::stopProgress()
 {
     if ( m_pDialogHelper )
         m_pDialogHelper->showProgress( false );
 }
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::progressSection( const OUString &rText,
                                       const uno::Reference< task::XAbortChannel > &xAbortChannel )
 {
@@ -308,7 +308,7 @@ void ProgressCmdEnv::progressSection( const OUString &rText,
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::updateProgress()
 {
     if ( ! m_bAborted )
@@ -319,32 +319,32 @@ void ProgressCmdEnv::updateProgress()
     }
 }
 
-//------------------------------------------------------------------------------
+
 ProgressCmdEnv::~ProgressCmdEnv()
 {
     // TODO: stop all threads and wait
 }
 
 
-//------------------------------------------------------------------------------
+
 // XCommandEnvironment
-//------------------------------------------------------------------------------
+
 uno::Reference< task::XInteractionHandler > ProgressCmdEnv::getInteractionHandler()
     throw ( uno::RuntimeException )
 {
     return this;
 }
 
-//------------------------------------------------------------------------------
+
 uno::Reference< ucb::XProgressHandler > ProgressCmdEnv::getProgressHandler()
     throw ( uno::RuntimeException )
 {
     return this;
 }
 
-//------------------------------------------------------------------------------
+
 // XInteractionHandler
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & xRequest )
     throw ( uno::RuntimeException )
 {
@@ -549,16 +549,16 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const &
     }
 }
 
-//------------------------------------------------------------------------------
+
 // XProgressHandler
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::push( uno::Any const & rStatus )
     throw( uno::RuntimeException )
 {
     update_( rStatus );
 }
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::update_( uno::Any const & rStatus )
     throw( uno::RuntimeException )
 {
@@ -578,21 +578,21 @@ void ProgressCmdEnv::update_( uno::Any const & rStatus )
     updateProgress();
 }
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::update( uno::Any const & rStatus )
     throw( uno::RuntimeException )
 {
     update_( rStatus );
 }
 
-//------------------------------------------------------------------------------
+
 void ProgressCmdEnv::pop()
     throw( uno::RuntimeException )
 {
     update_( uno::Any() ); // no message
 }
 
-//------------------------------------------------------------------------------
+
 ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper,
                                    TheExtensionManager *pManager,
                                    const uno::Reference< uno::XComponentContext > & rContext ) :
@@ -613,7 +613,7 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper,
     OSL_ASSERT( pDialogHelper );
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL,
                                               const OUString &rRepository,
                                               const bool bWarnUser )
@@ -625,7 +625,7 @@ void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL,
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::removeExtension( const uno::Reference< deployment::XPackage > &rPackage )
 {
     if ( rPackage.is() )
@@ -635,7 +635,7 @@ void ExtensionCmdQueue::Thread::removeExtension( const uno::Reference< deploymen
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment::XPackage > &rPackage )
 {
     if ( rPackage.is() )
@@ -645,7 +645,7 @@ void ExtensionCmdQueue::Thread::acceptLicense( const uno::Reference< deployment:
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deployment::XPackage > &rPackage,
                                                  const bool bEnable )
 {
@@ -658,7 +658,7 @@ void ExtensionCmdQueue::Thread::enableExtension( const uno::Reference< deploymen
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::checkForUpdates(
     const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList )
 {
@@ -666,7 +666,7 @@ void ExtensionCmdQueue::Thread::checkForUpdates(
     _insert( pEntry );
 }
 
-//------------------------------------------------------------------------------
+
 //Stopping this thread will not abort the installation of extensions.
 void ExtensionCmdQueue::Thread::stop()
 {
@@ -676,17 +676,17 @@ void ExtensionCmdQueue::Thread::stop()
     m_wakeup.set();
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtensionCmdQueue::Thread::isBusy()
 {
     osl::MutexGuard aGuard( m_mutex );
     return m_bWorking;
 }
 
-//------------------------------------------------------------------------------
+
 ExtensionCmdQueue::Thread::~Thread() {}
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::execute()
 {
 #ifdef WNT
@@ -841,7 +841,7 @@ void ExtensionCmdQueue::Thread::execute()
 #endif
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
                                                const OUString &rPackageURL,
                                                const OUString &rRepository,
@@ -891,7 +891,7 @@ void ExtensionCmdQueue::Thread::_addExtension( ::rtl::Reference< ProgressCmdEnv
     rCmdEnv->setWarnUser( false );
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
                                                   const uno::Reference< deployment::XPackage > &xPackage )
 {
@@ -919,7 +919,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE
     UpdateDialog::createNotifyJob( false, aItemList );
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::_checkForUpdates(
     const std::vector<uno::Reference<deployment::XPackage > > &vExtensionList )
 {
@@ -973,7 +973,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates(
     delete pUpdateDialog;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
                                                   const uno::Reference< deployment::XPackage > &xPackage )
 {
@@ -997,7 +997,7 @@ void ExtensionCmdQueue::Thread::_enableExtension( ::rtl::Reference< ProgressCmdE
     {}
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
                                                    const uno::Reference< deployment::XPackage > &xPackage )
 {
@@ -1021,7 +1021,7 @@ void ExtensionCmdQueue::Thread::_disableExtension( ::rtl::Reference< ProgressCmd
     {}
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionCmdQueue::Thread::_acceptLicense( ::rtl::Reference< ProgressCmdEnv > &rCmdEnv,
                                                 const uno::Reference< deployment::XPackage > &xPackage )
 {
@@ -1058,7 +1058,7 @@ void ExtensionCmdQueue::Thread::_insert(const TExtensionCmd& rExtCmd)
     m_wakeup.set();
 }
 
-//------------------------------------------------------------------------------
+
 ExtensionCmdQueue::ExtensionCmdQueue( DialogHelper * pDialogHelper,
                                       TheExtensionManager *pManager,
                                       const uno::Reference< uno::XComponentContext > &rContext )
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 8a12b207b5c5..18e4f84b9342 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -58,9 +58,9 @@ bool FindWeakRef::operator () (uno::WeakReference< deployment::XPackage >  const
 }
 
 } // end namespace
-//------------------------------------------------------------------------------
+
 //                          struct Entry_Impl
-//------------------------------------------------------------------------------
+
 Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
                         const PackageState eState, const bool bReadOnly ) :
     m_bActive( false ),
@@ -108,11 +108,11 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
     catch (const uno::RuntimeException &) {}
 }
 
-//------------------------------------------------------------------------------
+
 Entry_Impl::~Entry_Impl()
 {}
 
-//------------------------------------------------------------------------------
+
 sal_Int32 Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const
 {
     sal_Int32 eCompare = pCollator->compareString( m_sTitle, pEntry->m_sTitle );
@@ -131,7 +131,7 @@ sal_Int32 Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_
     return eCompare;
 }
 
-//------------------------------------------------------------------------------
+
 void Entry_Impl::checkDependencies()
 {
     try {
@@ -154,9 +154,9 @@ void Entry_Impl::checkDependencies()
         }
     }
 }
-//------------------------------------------------------------------------------
+
 // ExtensionRemovedListener
-//------------------------------------------------------------------------------
+
 void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
 {
@@ -168,14 +168,14 @@ void ExtensionRemovedListener::disposing( lang::EventObject const & rEvt )
     }
 }
 
-//------------------------------------------------------------------------------
+
 ExtensionRemovedListener::~ExtensionRemovedListener()
 {
 }
 
-//------------------------------------------------------------------------------
+
 // ExtensionBox_Impl
-//------------------------------------------------------------------------------
+
 ExtensionBox_Impl::ExtensionBox_Impl( Window* pParent, TheExtensionManager *pManager ) :
     IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
     m_bHasScrollBar( false ),
@@ -259,7 +259,7 @@ void ExtensionBox_Impl::Init()
     Show();
 }
 
-//------------------------------------------------------------------------------
+
 ExtensionBox_Impl::~ExtensionBox_Impl()
 {
     if ( ! m_bInDelete )
@@ -289,13 +289,13 @@ ExtensionBox_Impl::~ExtensionBox_Impl()
     delete m_pCollator;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 ExtensionBox_Impl::getItemCount() const
 {
     return static_cast< sal_Int32 >( m_vEntries.size() );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 ExtensionBox_Impl::getSelIndex() const
 {
     if ( m_bHasActive )
@@ -307,7 +307,7 @@ sal_Int32 ExtensionBox_Impl::getSelIndex() const
         return ENTRY_NOTFOUND;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const
 {
     if ( nIndex < 0 )
@@ -316,7 +316,7 @@ void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const
         throw lang::IllegalArgumentException( "There is no element at the provided position. The position exceeds the number of available list entries",0, 0 );
 }
 
-//------------------------------------------------------------------------------
+
 OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -324,7 +324,7 @@ OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const
     return m_vEntries[ nIndex ]->m_sTitle;
 }
 
-//------------------------------------------------------------------------------
+
 OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -332,7 +332,7 @@ OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const
     return m_vEntries[ nIndex ]->m_sVersion;
 }
 
-//------------------------------------------------------------------------------
+
 OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -340,7 +340,7 @@ OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const
     return m_vEntries[ nIndex ]->m_sDescription;
 }
 
-//------------------------------------------------------------------------------
+
 OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -348,7 +348,7 @@ OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const
     return m_vEntries[ nIndex ]->m_sPublisher;
 }
 
-//------------------------------------------------------------------------------
+
 OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -356,7 +356,7 @@ OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const
     return m_vEntries[ nIndex ]->m_sPublisherURL;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::select( sal_Int32 nIndex )
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -364,7 +364,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex )
     selectEntry( nIndex );
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::select( const OUString & sName )
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -381,7 +381,7 @@ void ExtensionBox_Impl::select( const OUString & sName )
     }
 }
 
-//------------------------------------------------------------------------------
+
 // Title + description
 void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
 {
@@ -422,13 +422,13 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
         m_nActiveHeight = aTextHeight + 2;
 }
 
-//------------------------------------------------------------------------------
+
 const Size ExtensionBox_Impl::GetMinOutputSizePixel() const
 {
     return Size( 200, 80 );
 }
 
-//------------------------------------------------------------------------------
+
 Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -450,7 +450,7 @@ Rectangle ExtensionBox_Impl::GetEntryRect( const long nPos ) const
     return Rectangle( aPos, aSize );
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::DeleteRemoved()
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -476,7 +476,7 @@ void ExtensionBox_Impl::DeleteRemoved()
     m_bInDelete = false;
 }
 
-//------------------------------------------------------------------------------
+
 //This function may be called with nPos < 0
 void ExtensionBox_Impl::selectEntry( const long nPos )
 {
@@ -521,7 +521,7 @@ void ExtensionBox_Impl::selectEntry( const long nPos )
     guard.clear();
 }
 
-// -----------------------------------------------------------------------
+
 void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -681,7 +681,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr
     DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
 }
 
-// -----------------------------------------------------------------------
+
 void ExtensionBox_Impl::RecalcAll()
 {
     if ( m_bHasActive )
@@ -732,13 +732,13 @@ void ExtensionBox_Impl::RecalcAll()
     m_bNeedsRecalc = false;
 }
 
-// -----------------------------------------------------------------------
+
 bool ExtensionBox_Impl::HandleTabKey( bool )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
 {
     if ( m_vEntries.empty() )
@@ -783,7 +783,7 @@ bool ExtensionBox_Impl::HandleCursorKey( sal_uInt16 nKeyCode )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ )
 {
     if ( !m_bInDelete )
@@ -810,7 +810,7 @@ void ExtensionBox_Impl::Paint( const Rectangle &/*rPaintRect*/ )
     }
 }
 
-// -----------------------------------------------------------------------
+
 long ExtensionBox_Impl::GetTotalHeight() const
 {
     long nHeight = m_vEntries.size() * m_nStdHeight;
@@ -823,7 +823,7 @@ long ExtensionBox_Impl::GetTotalHeight() const
     return nHeight;
 }
 
-// -----------------------------------------------------------------------
+
 void ExtensionBox_Impl::SetupScrollBar()
 {
     const Size aSize = GetOutputSizePixel();
@@ -856,13 +856,13 @@ void ExtensionBox_Impl::SetupScrollBar()
     m_bHasScrollBar = bNeedsScrollBar;
 }
 
-// -----------------------------------------------------------------------
+
 void ExtensionBox_Impl::Resize()
 {
     RecalcAll();
 }
 
-//------------------------------------------------------------------------------
+
 long ExtensionBox_Impl::PointToPos( const Point& rPos )
 {
     long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;
@@ -878,7 +878,7 @@ long ExtensionBox_Impl::PointToPos( const Point& rPos )
     return nPos;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
 {
     long nPos = PointToPos( rMEvt.GetPosPixel() );
@@ -892,7 +892,7 @@ void ExtensionBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
 {
     if ( !m_bInDelete )
@@ -936,7 +936,7 @@ bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt )
         return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart,
                                       const long nEnd, long &nPos )
 {
@@ -1017,7 +1017,7 @@ void ExtensionBox_Impl::addEventListenerOnce(
     }
 }
 
-//------------------------------------------------------------------------------
+
 long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &xPackage,
                                   bool bLicenseMissing )
 {
@@ -1073,7 +1073,7 @@ long ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > &
     return nPos;
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage > &xPackage )
 {
     typedef std::vector< TEntry_Impl >::iterator ITER;
@@ -1103,7 +1103,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage
     }
 }
 
-//------------------------------------------------------------------------------
+
 //This function is also called as a result of removing an extension.
 //see PackageManagerImpl::removePackage
 //The gui is a registered as listener on the package. Removing it will cause the
@@ -1156,7 +1156,7 @@ void ExtensionBox_Impl::removeEntry( const uno::Reference< deployment::XPackage
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::RemoveUnlocked()
 {
     bool bAllRemoved = false;
@@ -1183,7 +1183,7 @@ void ExtensionBox_Impl::RemoveUnlocked()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::prepareChecking()
 {
     m_bInCheckMode = true;
@@ -1195,7 +1195,7 @@ void ExtensionBox_Impl::prepareChecking()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::checkEntries()
 {
     long nNewPos = -1;
@@ -1255,14 +1255,14 @@ void ExtensionBox_Impl::checkEntries()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ExtensionBox_Impl::SetScrollHdl( const Link& rLink )
 {
     if ( m_pScrollBar )
         m_pScrollBar->SetScrollHdl( rLink );
 }
 
-// -----------------------------------------------------------------------
+
 void ExtensionBox_Impl::DoScroll( long nDelta )
 {
     m_nTopIndex += nDelta;
@@ -1275,7 +1275,7 @@ void ExtensionBox_Impl::DoScroll( long nDelta )
     m_pScrollBar->SetPosPixel( aNewSBPt );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( ExtensionBox_Impl, ScrollHdl, ScrollBar*, pScrBar )
 {
     DoScroll( pScrBar->GetDelta() );
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index d19f175bf365..44083b4d2d7e 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -60,17 +60,17 @@ public:
     virtual void DeInit();
 };
 
-//______________________________________________________________________________
+
 MyApp::~MyApp()
 {
 }
 
-//______________________________________________________________________________
+
 MyApp::MyApp()
 {
 }
 
-//______________________________________________________________________________
+
 int MyApp::Main()
 {
     return EXIT_SUCCESS;
@@ -166,7 +166,7 @@ public:
         throw (RuntimeException);
 };
 
-//______________________________________________________________________________
+
 ServiceImpl::ServiceImpl( Sequence<Any> const& args,
                           Reference<XComponentContext> const& xComponentContext)
     : m_xComponentContext(xComponentContext),
@@ -188,7 +188,7 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args,
 }
 
 // XAsynchronousExecutableDialog
-//______________________________________________________________________________
+
 void ServiceImpl::setDialogTitle( OUString const & title )
     throw (RuntimeException)
 {
@@ -205,7 +205,7 @@ void ServiceImpl::setDialogTitle( OUString const & title )
         m_initialTitle = title;
 }
 
-//______________________________________________________________________________
+
 void ServiceImpl::startExecuteModal(
     Reference< ui::dialogs::XDialogClosedListener > const & xListener )
     throw (RuntimeException)
@@ -296,7 +296,7 @@ void ServiceImpl::startExecuteModal(
 }
 
 // XJobExecutor
-//______________________________________________________________________________
+
 void ServiceImpl::trigger( OUString const &rEvent ) throw (RuntimeException)
 {
     if ( rEvent == "SHOW_UPDATE_DIALOG" )
diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
index 21964b4a9096..189f397efc6d 100644
--- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
+++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx
@@ -41,13 +41,13 @@ using namespace ::com::sun::star;
 
 namespace dp_gui {
 
-//------------------------------------------------------------------------------
+
 
 ::rtl::Reference< TheExtensionManager > TheExtensionManager::s_ExtMgr;
 
-//------------------------------------------------------------------------------
+
 //                             TheExtensionManager
-//------------------------------------------------------------------------------
+
 
 TheExtensionManager::TheExtensionManager( Window *pParent,
                                           const uno::Reference< uno::XComponentContext > &xContext ) :
@@ -95,7 +95,7 @@ TheExtensionManager::TheExtensionManager( Window *pParent,
     }
 }
 
-//------------------------------------------------------------------------------
+
 TheExtensionManager::~TheExtensionManager()
 {
     delete m_pUpdReqDialog;
@@ -103,7 +103,7 @@ TheExtensionManager::~TheExtensionManager()
     delete m_pExecuteCmdQueue;
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
 {
     const SolarMutexGuard guard;
@@ -128,7 +128,7 @@ void TheExtensionManager::createDialog( const bool bCreateUpdDlg )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::Show()
 {
     const SolarMutexGuard guard;
@@ -136,7 +136,7 @@ void TheExtensionManager::Show()
     getDialog()->Show();
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::SetText( const OUString &rTitle )
 {
     const SolarMutexGuard guard;
@@ -144,7 +144,7 @@ void TheExtensionManager::SetText( const OUString &rTitle )
     getDialog()->SetText( rTitle );
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::ToTop( sal_uInt16 nFlags )
 {
     const SolarMutexGuard guard;
@@ -152,7 +152,7 @@ void TheExtensionManager::ToTop( sal_uInt16 nFlags )
     getDialog()->ToTop( nFlags );
 }
 
-//------------------------------------------------------------------------------
+
 bool TheExtensionManager::Close()
 {
     if ( m_pExtMgrDialog )
@@ -163,7 +163,7 @@ bool TheExtensionManager::Close()
         return true;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 TheExtensionManager::execute()
 {
     sal_Int16 nRet = 0;
@@ -178,13 +178,13 @@ sal_Int16 TheExtensionManager::execute()
     return nRet;
 }
 
-//------------------------------------------------------------------------------
+
 bool TheExtensionManager::isVisible()
 {
     return getDialog()->IsVisible();
 }
 
-//------------------------------------------------------------------------------
+
 bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bParentVisible*/ )
 {
     std::vector< uno::Reference< deployment::XPackage >  > vEntries;
@@ -217,7 +217,7 @@ bool TheExtensionManager::checkUpdates( bool /* bShowUpdateOnly */, bool /*bPare
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool TheExtensionManager::installPackage( const OUString &rPackageURL, bool bWarnUser )
 {
     if ( rPackageURL.isEmpty() )
@@ -243,7 +243,7 @@ bool TheExtensionManager::installPackage( const OUString &rPackageURL, bool bWar
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool TheExtensionManager::queryTermination()
 {
     if ( dp_misc::office_is_running() )
@@ -253,7 +253,7 @@ bool TheExtensionManager::queryTermination()
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::terminateDialog()
 {
     if ( ! dp_misc::office_is_running() )
@@ -267,7 +267,7 @@ void TheExtensionManager::terminateDialog()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::createPackageList()
 {
     uno::Sequence< uno::Sequence< uno::Reference< deployment::XPackage > > > xAllPackages;
@@ -317,7 +317,7 @@ void TheExtensionManager::createPackageList()
     }
 }
 
-//------------------------------------------------------------------------------
+
 PackageState TheExtensionManager::getPackageState( const uno::Reference< deployment::XPackage > &xPackage ) const
 {
     try {
@@ -345,7 +345,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool TheExtensionManager::isReadOnly( const uno::Reference< deployment::XPackage > &xPackage ) const
 {
     if ( m_xExtensionManager.is() && xPackage.is() )
@@ -356,7 +356,7 @@ bool TheExtensionManager::isReadOnly( const uno::Reference< deployment::XPackage
         return true;
 }
 
-//------------------------------------------------------------------------------
+
 // The function investigates if the extension supports options.
 bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPackage > &xPackage ) const
 {
@@ -408,7 +408,7 @@ bool TheExtensionManager::supportsOptions( const uno::Reference< deployment::XPa
     return bOptions;
 }
 
-//------------------------------------------------------------------------------
+
 // XEventListener
 void TheExtensionManager::disposing( lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
@@ -435,7 +435,7 @@ void TheExtensionManager::disposing( lang::EventObject const & rEvt )
     }
 }
 
-//------------------------------------------------------------------------------
+
 // XTerminateListener
 void TheExtensionManager::queryTermination( ::lang::EventObject const & )
     throw ( frame::TerminationVetoException, uno::RuntimeException )
@@ -458,14 +458,14 @@ void TheExtensionManager::queryTermination( ::lang::EventObject const & )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void TheExtensionManager::notifyTermination( ::lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
 {
     disposing( rEvt );
 }
 
-//------------------------------------------------------------------------------
+
 // XModifyListener
 void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
     throw ( uno::RuntimeException )
@@ -475,7 +475,7 @@ void TheExtensionManager::modified( ::lang::EventObject const & /*rEvt*/ )
     getDialogHelper()->checkEntries();
 }
 
-//------------------------------------------------------------------------------
+
 ::rtl::Reference< TheExtensionManager > TheExtensionManager::get( const uno::Reference< uno::XComponentContext > &xContext,
                                                                   const uno::Reference< awt::XWindow > &xParent,
                                                                   const OUString & extensionURL )
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index d91dd066c15c..d8839023e3a1 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -160,7 +160,7 @@ struct UpdateDialog::SpecificError {
     sal_uInt16 m_nID;
 };
 
-//------------------------------------------------------------------------------
+
 struct UpdateDialog::IgnoredUpdate {
     OUString sExtensionID;
     OUString sVersion;
@@ -169,14 +169,14 @@ struct UpdateDialog::IgnoredUpdate {
     IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion );
 };
 
-//------------------------------------------------------------------------------
+
 UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ):
     sExtensionID( rExtensionID ),
     sVersion( rVersion ),
     bRemoved( false )
 {}
 
-//------------------------------------------------------------------------------
+
 struct UpdateDialog::Index
 {
     Kind          m_eKind;
@@ -188,7 +188,7 @@ struct UpdateDialog::Index
     Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName );
 };
 
-//------------------------------------------------------------------------------
+
 UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ):
     m_eKind( theKind ),
     m_bIgnored( false ),
@@ -197,9 +197,9 @@ UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, con
     m_aName( rName )
 {}
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 class UpdateDialog::Thread: public salhelper::Thread {
 public:
     Thread(
@@ -562,7 +562,7 @@ UpdateDialog::UpdateDialog(
     getIgnoredUpdates();
 }
 
-//------------------------------------------------------------------------------
+
 UpdateDialog::~UpdateDialog()
 {
     storeIgnoredUpdates();
@@ -577,7 +577,7 @@ UpdateDialog::~UpdateDialog()
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateDialog::Close() {
     m_thread->stop();
     return ModalDialog::Close();
@@ -589,9 +589,9 @@ short UpdateDialog::Execute() {
     return ModalDialog::Execute();
 }
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & resource,
                                           Image const & normalStaticImage ):
     SvxCheckListBox( &dialog, resource, normalStaticImage ),
@@ -601,17 +601,17 @@ UpdateDialog::CheckListBox::CheckListBox( UpdateDialog & dialog, ResId const & r
     m_dialog(dialog)
 {}
 
-//------------------------------------------------------------------------------
+
 UpdateDialog::CheckListBox::~CheckListBox() {}
 
-//------------------------------------------------------------------------------
+
 sal_uInt16 UpdateDialog::CheckListBox::getItemCount() const {
     sal_uLong i = GetEntryCount();
     OSL_ASSERT(i <= std::numeric_limits< sal_uInt16 >::max());
     return sal::static_int_cast< sal_uInt16 >(i);
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event )
 {
     // When clicking on a selected entry in an SvxCheckListBox, the entry's
@@ -626,7 +626,7 @@ void UpdateDialog::CheckListBox::MouseButtonDown( MouseEvent const & event )
     m_dialog.enableOk();
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::CheckListBox::MouseButtonUp(MouseEvent const & event) {
     // When clicking on an entry's checkbox in an SvxCheckListBox, the entry's
     // checkbox is toggled on mouse button up:
@@ -639,7 +639,7 @@ void UpdateDialog::CheckListBox::KeyInput(KeyEvent const & event) {
     m_dialog.enableOk();
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
 {
     SvTreeListEntry *pData = GetEntry( rPos );
@@ -690,9 +690,9 @@ void UpdateDialog::CheckListBox::handlePopupMenu( const Point &rPos )
     }
 }
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKind kind )
 {
     m_updates.InsertEntry( pEntry->m_aName, LISTBOX_APPEND, static_cast< void * >( pEntry ), kind );
@@ -708,7 +708,7 @@ sal_uInt16 UpdateDialog::insertItem( UpdateDialog::Index *pEntry, SvLBoxButtonKi
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind kind )
 {
     m_all.Enable();
@@ -722,7 +722,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind
     }
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::addEnabledUpdate( OUString const & name,
                                      dp_gui::UpdateData & data )
 {
@@ -749,7 +749,7 @@ void UpdateDialog::addEnabledUpdate( OUString const & name,
     m_descriptions.Enable();
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
 {
     sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_disabledUpdates.size() );
@@ -765,7 +765,7 @@ void UpdateDialog::addDisabledUpdate( UpdateDialog::DisabledUpdate & data )
     addAdditional( pEntry, SvLBoxButtonKind_disabledCheckbox );
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::addSpecificError( UpdateDialog::SpecificError & data )
 {
     sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_specificErrors.size() );
@@ -1045,7 +1045,7 @@ bool UpdateDialog::showDescription( const OUString& rDescription, bool bWithPubl
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::getIgnoredUpdates()
 {
     uno::Reference< lang::XMultiServiceFactory > xConfig(
@@ -1069,7 +1069,7 @@ void UpdateDialog::getIgnoredUpdates()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::storeIgnoredUpdates()
 {
     if ( m_bModified && ( !m_ignoredUpdates.empty() ) )
@@ -1108,7 +1108,7 @@ void UpdateDialog::storeIgnoredUpdates()
     m_bModified = false;
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
 {
     bool bIsIgnored = false;
@@ -1153,7 +1153,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index )
     return bIsIgnored;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll )
 {
     OUString aExtensionID;
@@ -1200,7 +1200,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore,
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(UpdateDialog, selectionHandler)
 {
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index a0c3c18548c1..9a63b1e97dc7 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -294,13 +294,13 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args,
 }
 
 // XExecutableDialog
-//______________________________________________________________________________
+
 void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException)
 {
 
 }
 
-//______________________________________________________________________________
+
 sal_Int16 LicenseDialog::execute() throw (RuntimeException)
 {
     return vcl::solarthread::syncExecute(
diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx
index a57c531d82c6..4b328bf2fdaf 100644
--- a/desktop/source/deployment/manager/dp_commandenvironments.cxx
+++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx
@@ -53,14 +53,14 @@ BaseCommandEnv::~BaseCommandEnv()
 {
 }
 // XCommandEnvironment
-//______________________________________________________________________________
+
 Reference<task::XInteractionHandler> BaseCommandEnv::getInteractionHandler()
 throw (uno::RuntimeException)
 {
     return this;
 }
 
-//______________________________________________________________________________
+
 Reference<ucb::XProgressHandler> BaseCommandEnv::getProgressHandler()
 throw (uno::RuntimeException)
 {
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index d900b2d5ba59..7f52de4726ec 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -161,7 +161,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard()
 
 namespace dp_manager {
 
-//------------------------------------------------------------------------------
+
 
 //ToDo: bundled extension
 ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& xContext) :
@@ -176,7 +176,7 @@ ExtensionManager::ExtensionManager( Reference< uno::XComponentContext > const& x
     m_repositoryNames.push_back("bundled");
 }
 
-//------------------------------------------------------------------------------
+
 
 ExtensionManager::~ExtensionManager()
 {
@@ -1452,7 +1452,7 @@ sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository)
 {
     return getPackageManager(repository)->isReadOnly();
 }
-//------------------------------------------------------------------------------
+
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<ExtensionManager> servicePIP;
@@ -1463,7 +1463,7 @@ extern sdecl::ServiceDecl const serviceDecl(
     "com.sun.star.comp.deployment.ExtensionManager");
 
 // XModifyBroadcaster
-//______________________________________________________________________________
+
 void ExtensionManager::addModifyListener(
     Reference<util::XModifyListener> const & xListener )
     throw (uno::RuntimeException)
@@ -1472,7 +1472,7 @@ void ExtensionManager::addModifyListener(
      rBHelper.addListener( ::getCppuType( &xListener ), xListener );
 }
 
-//______________________________________________________________________________
+
 void ExtensionManager::removeModifyListener(
     Reference<util::XModifyListener> const & xListener )
     throw (uno::RuntimeException)
diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx
index f6f71643c21a..66fd651ca185 100644
--- a/desktop/source/deployment/manager/dp_informationprovider.cxx
+++ b/desktop/source/deployment/manager/dp_informationprovider.cxx
@@ -74,7 +74,7 @@ class PackageInformationProvider :
         throw ( uno::RuntimeException );
     virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList()
         throw ( uno::RuntimeException );
-//---------
+
 private:
 
     uno::Reference< uno::XComponentContext> mxContext;
@@ -85,7 +85,7 @@ private:
     uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation;
 };
 
-//------------------------------------------------------------------------------
+
 
 PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XComponentContext > const& xContext) :
     mxContext( xContext ),
@@ -93,13 +93,13 @@ PackageInformationProvider::PackageInformationProvider( uno::Reference< uno::XCo
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 PackageInformationProvider::~PackageInformationProvider()
 {
 }
 
-//------------------------------------------------------------------------------
+
 OUString PackageInformationProvider::getPackageLocation(
     const OUString & repository,
     const OUString& _rExtensionId )
@@ -134,7 +134,7 @@ OUString PackageInformationProvider::getPackageLocation(
     return aLocationURL;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL
 PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
@@ -158,7 +158,7 @@ PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId )
     return aLocationURL;
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< uno::Sequence< OUString > > SAL_CALL
 PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
@@ -271,7 +271,7 @@ PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId )
     return aList;
 }
 
-//------------------------------------------------------------------------------
+
 uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList()
     throw ( uno::RuntimeException )
 {
@@ -318,7 +318,7 @@ uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::
 }
 
 
-//------------------------------------------------------------------------------
+
 
 namespace sdecl = comphelper::service_decl;
 sdecl::class_<PackageInformationProvider> servicePIP;
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 3bc0c7895979..e1d6effae671 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -108,7 +108,7 @@ OUString getExtensionFolder(OUString const &  parentFolder,
     return title;
 }
 }
-//______________________________________________________________________________
+
 void PackageManagerImpl::initActivationLayer(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
@@ -280,7 +280,7 @@ void PackageManagerImpl::initActivationLayer(
     }
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::initRegistryBackends()
 {
     if (!m_registryCache.isEmpty())
@@ -326,7 +326,7 @@ static bool isMacroURLReadOnly( const OUString &rMacro )
     return bError;
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackageManager> PackageManagerImpl::create(
     Reference<XComponentContext> const & xComponentContext,
     OUString const & context )
@@ -430,12 +430,12 @@ Reference<deployment::XPackageManager> PackageManagerImpl::create(
     }
 }
 
-//______________________________________________________________________________
+
 PackageManagerImpl::~PackageManagerImpl()
 {
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::fireModified()
 {
     ::cppu::OInterfaceContainerHelper * pContainer = rBHelper.getContainer(
@@ -447,7 +447,7 @@ void PackageManagerImpl::fireModified()
     }
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::disposing()
 {
     try {
@@ -475,7 +475,7 @@ void PackageManagerImpl::disposing()
 }
 
 // XComponent
-//______________________________________________________________________________
+
 void PackageManagerImpl::dispose() throw (RuntimeException)
 {
     //Do not call check here. We must not throw an exception here if the object
@@ -483,7 +483,7 @@ void PackageManagerImpl::dispose() throw (RuntimeException)
     WeakComponentImplHelperBase::dispose();
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::addEventListener(
     Reference<lang::XEventListener> const & xListener ) throw (RuntimeException)
 {
@@ -492,7 +492,7 @@ void PackageManagerImpl::addEventListener(
     WeakComponentImplHelperBase::addEventListener( xListener );
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::removeEventListener(
     Reference<lang::XEventListener> const & xListener ) throw (RuntimeException)
 {
@@ -502,14 +502,14 @@ void PackageManagerImpl::removeEventListener(
 }
 
 // XPackageManager
-//______________________________________________________________________________
+
 OUString PackageManagerImpl::getContext() throw (RuntimeException)
 {
     check();
     return m_context;
 }
 
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -517,7 +517,7 @@ PackageManagerImpl::getSupportedPackageTypes() throw (RuntimeException)
     return m_xRegistry->getSupportedPackageTypes();
 }
 
-//______________________________________________________________________________
+
 Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
     throw (RuntimeException)
 {
@@ -526,7 +526,7 @@ Reference<task::XAbortChannel> PackageManagerImpl::createAbortChannel()
 }
 
 // XModifyBroadcaster
-//______________________________________________________________________________
+
 void PackageManagerImpl::addModifyListener(
     Reference<util::XModifyListener> const & xListener )
     throw (RuntimeException)
@@ -535,7 +535,7 @@ void PackageManagerImpl::addModifyListener(
     rBHelper.addListener( ::getCppuType( &xListener ), xListener );
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::removeModifyListener(
     Reference<util::XModifyListener> const & xListener )
     throw (RuntimeException)
@@ -544,7 +544,7 @@ void PackageManagerImpl::removeModifyListener(
     rBHelper.removeListener( ::getCppuType( &xListener ), xListener );
 }
 
-//______________________________________________________________________________
+
 OUString PackageManagerImpl::detectMediaType(
     ::ucbhelper::Content const & ucbContent_, bool throw_exc )
 {
@@ -583,7 +583,7 @@ OUString PackageManagerImpl::detectMediaType(
     return mediaType;
 }
 
-//______________________________________________________________________________
+
 OUString PackageManagerImpl::insertToActivationLayer(
     Sequence<beans::NamedValue> const & properties,
     OUString const & mediaType, ::ucbhelper::Content const & sourceContent_,
@@ -652,7 +652,7 @@ OUString PackageManagerImpl::insertToActivationLayer(
     return destFolder;
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::insertToActivationLayerDB(
     OUString const & id, ActivePackages::Data const & dbData )
 {
@@ -661,7 +661,7 @@ void PackageManagerImpl::insertToActivationLayerDB(
     m_activePackagesDB->put( id, dbData );
 }
 
-//______________________________________________________________________________
+
 /* The function returns true if there is an extension with the same id already
     installed which needs to be uninstalled, before the new extension can be installed.
 */
@@ -679,7 +679,7 @@ bool PackageManagerImpl::isInstalled(
 }
 
 // XPackageManager
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> PackageManagerImpl::importExtension(
     Reference<deployment::XPackage> const & extension,
     Reference<task::XAbortChannel> const & xAbortChannel,
@@ -850,7 +850,7 @@ void PackageManagerImpl::deletePackageFromCache(
         false /* no throw: ignore errors */ );
 
 }
-//______________________________________________________________________________
+
 void PackageManagerImpl::removePackage(
     OUString const & id, OUString const & fileName,
     Reference<task::XAbortChannel> const & /*xAbortChannel*/,
@@ -938,7 +938,7 @@ void PackageManagerImpl::removePackage(
     }
 }
 
-//______________________________________________________________________________
+
 OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
 {
     OUStringBuffer buf;
@@ -956,7 +956,7 @@ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data )
     return makeURL( m_activePackages, buf.makeStringAndClear() );
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
     OUString const & id, OUString const & fileName,
     Reference<XCommandEnvironment> const & xCmdEnv )
@@ -971,7 +971,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
         static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
     OUString const & id, ActivePackages::Data const & data,
     Reference<XCommandEnvironment> const & xCmdEnv, bool ignoreAlienPlatforms )
@@ -1009,7 +1009,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_(
     return xExtension;
 }
 
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackage> >
 PackageManagerImpl::getDeployedPackages_(
     Reference<XCommandEnvironment> const & xCmdEnv )
@@ -1045,7 +1045,7 @@ PackageManagerImpl::getDeployedPackages_(
     return comphelper::containerToSequence(packages);
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
     OUString const & id, OUString const & fileName,
     Reference<XCommandEnvironment> const & xCmdEnv_ )
@@ -1088,7 +1088,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage(
     }
 }
 
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackage> >
 PackageManagerImpl::getDeployedPackages(
     Reference<task::XAbortChannel> const &,
@@ -1133,7 +1133,7 @@ PackageManagerImpl::getDeployedPackages(
     }
 }
 
-//______________________________________________________________________________
+
 
 
 //ToDo: the function must not call registerPackage, do this in
@@ -1562,12 +1562,12 @@ sal_Int32 PackageManagerImpl::checkPrerequisites(
 }
 
 
-//______________________________________________________________________________
+
 PackageManagerImpl::CmdEnvWrapperImpl::~CmdEnvWrapperImpl()
 {
 }
 
-//______________________________________________________________________________
+
 PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl(
     Reference<XCommandEnvironment> const & xUserCmdEnv,
     Reference<XProgressHandler> const & xLogFile )
@@ -1580,7 +1580,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::CmdEnvWrapperImpl(
 }
 
 // XCommandEnvironment
-//______________________________________________________________________________
+
 Reference<task::XInteractionHandler>
 PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
     throw (RuntimeException)
@@ -1588,7 +1588,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getInteractionHandler()
     return m_xUserInteractionHandler;
 }
 
-//______________________________________________________________________________
+
 Reference<XProgressHandler>
 PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
     throw (RuntimeException)
@@ -1597,7 +1597,7 @@ PackageManagerImpl::CmdEnvWrapperImpl::getProgressHandler()
 }
 
 // XProgressHandler
-//______________________________________________________________________________
+
 void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
     throw (RuntimeException)
 {
@@ -1607,7 +1607,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::push( Any const & Status )
         m_xUserProgress->push( Status );
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
     throw (RuntimeException)
 {
@@ -1617,7 +1617,7 @@ void PackageManagerImpl::CmdEnvWrapperImpl::update( Any const & Status )
         m_xUserProgress->update( Status );
 }
 
-//______________________________________________________________________________
+
 void PackageManagerImpl::CmdEnvWrapperImpl::pop() throw (RuntimeException)
 {
     if (m_xLogFile.is())
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index e2d1259fd3cc..e23dba62a555 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -74,7 +74,7 @@ extern sdecl::ServiceDecl const serviceDecl(
     "com.sun.star.comp.deployment.PackageManagerFactory",
     "com.sun.star.comp.deployment.PackageManagerFactory" );
 
-//______________________________________________________________________________
+
 PackageManagerFactoryImpl::PackageManagerFactoryImpl(
     Reference<XComponentContext> const & xComponentContext )
     : t_pmfac_helper( getMutex() ),
@@ -82,12 +82,12 @@ PackageManagerFactoryImpl::PackageManagerFactoryImpl(
 {
 }
 
-//______________________________________________________________________________
+
 PackageManagerFactoryImpl::~PackageManagerFactoryImpl()
 {
 }
 
-//______________________________________________________________________________
+
 inline void PackageManagerFactoryImpl::check()
 {
     ::osl::MutexGuard guard( getMutex() );
@@ -99,7 +99,7 @@ inline void PackageManagerFactoryImpl::check()
     }
 }
 
-//______________________________________________________________________________
+
 void PackageManagerFactoryImpl::disposing()
 {
     // dispose all managers:
@@ -118,7 +118,7 @@ void PackageManagerFactoryImpl::disposing()
 }
 
 // XPackageManagerFactory
-//______________________________________________________________________________
+
 Reference<deployment::XPackageManager>
 PackageManagerFactoryImpl::getPackageManager( OUString const & context )
     throw (RuntimeException)
diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx
index f25165e4eff4..92c4cf97eed2 100644
--- a/desktop/source/deployment/misc/dp_interact.cxx
+++ b/desktop/source/deployment/misc/dp_interact.cxx
@@ -58,19 +58,19 @@ public:
 };
 
 // XInterface
-//______________________________________________________________________________
+
 void InteractionContinuationImpl::acquire() throw ()
 {
     OWeakObject::acquire();
 }
 
-//______________________________________________________________________________
+
 void InteractionContinuationImpl::release() throw ()
 {
     OWeakObject::release();
 }
 
-//______________________________________________________________________________
+
 Any InteractionContinuationImpl::queryInterface( Type const & type )
     throw (RuntimeException)
 {
@@ -83,7 +83,7 @@ Any InteractionContinuationImpl::queryInterface( Type const & type )
 }
 
 // XInteractionContinuation
-//______________________________________________________________________________
+
 void InteractionContinuationImpl::select() throw (RuntimeException)
 {
     *m_pselect = true;
@@ -112,13 +112,13 @@ public:
 };
 
 // XInteractionRequest
-//______________________________________________________________________________
+
 Any InteractionRequest::getRequest() throw (RuntimeException)
 {
     return m_request;
 }
 
-//______________________________________________________________________________
+
 Sequence< Reference< task::XInteractionContinuation > >
 InteractionRequest::getContinuations() throw (RuntimeException)
 {
@@ -162,7 +162,7 @@ bool interactContinuation( Any const & request,
 }
 
 // XAbortChannel
-//______________________________________________________________________________
+
 void AbortChannel::sendAbort() throw (RuntimeException)
 {
     m_aborted = true;
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index f148d4cfbb0c..f79aeb1f8461 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -335,7 +335,7 @@ public:
     void initServiceRdbFiles();
 };
 
-//______________________________________________________________________________
+
 
 BackendImpl::ComponentPackageImpl::ComponentPackageImpl(
     ::rtl::Reference<PackageRegistryBackend> const & myBackend,
@@ -389,19 +389,19 @@ BackendImpl * BackendImpl::ComponentPackageImpl::getMyBackend() const
 }
 
 
-//______________________________________________________________________________
+
 void BackendImpl::ComponentPackageImpl::disposing()
 {
     Package::disposing();
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::TypelibraryPackageImpl::disposing()
 {
     Package::disposing();
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::disposing()
 {
     try {
@@ -599,7 +599,7 @@ void BackendImpl::revokeEntryFromDb(OUString const & url)
 }
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -615,7 +615,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
 }
 
 // PackageRegistryBackend
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType_,
     sal_Bool bRemoved, OUString const & identifier,
@@ -746,7 +746,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
 }
 
 
-//______________________________________________________________________________
+
 void BackendImpl::unorc_verify_init(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
@@ -866,7 +866,7 @@ void BackendImpl::unorc_verify_init(
     }
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
 {
     if (transientMode())
@@ -990,7 +990,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv )
     m_unorc_modified = false;
 }
 
-//______________________________________________________________________________
+
 bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
                               Reference<XCommandEnvironment> const & xCmdEnv )
 {
@@ -1009,7 +1009,7 @@ bool BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
         return false;
 }
 
-//______________________________________________________________________________
+
 bool BackendImpl::removeFromUnoRc(
     RcItem kind, OUString const & url_,
     Reference<XCommandEnvironment> const & xCmdEnv )
@@ -1024,7 +1024,7 @@ bool BackendImpl::removeFromUnoRc(
     return true;
 }
 
-//______________________________________________________________________________
+
 bool BackendImpl::hasInUnoRc(
     RcItem kind, OUString const & url_ )
 {
@@ -1043,14 +1043,14 @@ css::uno::Reference< css::uno::XComponentContext > BackendImpl::getRootContext()
     return rootContext.is() ? rootContext : getComponentContext();
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::releaseObject( OUString const & id )
 {
     const ::osl::MutexGuard guard( getMutex() );
     m_backendObjects.erase( id );
 }
 
-//______________________________________________________________________________
+
 Reference<XInterface> BackendImpl::getObject( OUString const & id )
 {
     const ::osl::MutexGuard guard( getMutex() );
@@ -1061,7 +1061,7 @@ Reference<XInterface> BackendImpl::getObject( OUString const & id )
         return iFind->second;
 }
 
-//______________________________________________________________________________
+
 Reference<XInterface> BackendImpl::insertObject(
     OUString const & id, Reference<XInterface> const & xObject )
 {
@@ -1072,7 +1072,7 @@ Reference<XInterface> BackendImpl::insertObject(
     return insertion.first->second;
 }
 
-//------------------------------------------------------------------------------
+
 Reference<XComponentContext> raise_uno_process(
     Reference<XComponentContext> const & xContext,
     ::rtl::Reference<AbortChannel> const & abortChannel )
@@ -1123,7 +1123,7 @@ Reference<XComponentContext> raise_uno_process(
     }
 }
 
-//------------------------------------------------------------------------------
+
 namespace {
 
 void extractComponentData(
@@ -1294,7 +1294,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveRemoval(
 }
 
 // Package
-//______________________________________________________________________________
+
 //We could use here BackendImpl::hasActiveEntry. However, this check is just as well.
 //And it also shows the problem if another extension has overwritten an implementation
 //entry, because it contains the same service implementation
@@ -1375,7 +1375,7 @@ BackendImpl::ComponentPackageImpl::isRegistered_(
             m_registered == REG_REGISTERED, bAmbiguous) );
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::ComponentPackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
@@ -1488,7 +1488,7 @@ BackendImpl * BackendImpl::TypelibraryPackageImpl::getMyBackend() const
     }
     return pBackend;
 }
-//______________________________________________________________________________
+
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::TypelibraryPackageImpl::isRegistered_(
     ::osl::ResettableMutexGuard &,
@@ -1504,7 +1504,7 @@ BackendImpl::TypelibraryPackageImpl::isRegistered_(
             false /* IsAmbiguous */ ) );
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::TypelibraryPackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index d3bee88724a9..a133cb5e2b3a 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -155,7 +155,7 @@ public:
     using PackageRegistryBackend::disposing;
 };
 
-//______________________________________________________________________________
+
 void BackendImpl::disposing()
 {
     try {
@@ -174,7 +174,7 @@ void BackendImpl::disposing()
     }
 }
 
-//______________________________________________________________________________
+
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xComponentContext )
@@ -284,7 +284,7 @@ bool BackendImpl::activateEntry(OUString const & url)
 
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -299,7 +299,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
 }
 
 // PackageRegistryBackend
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType_,
     sal_Bool bRemoved, OUString const & identifier,
@@ -360,7 +360,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
 }
 
 
-//______________________________________________________________________________
+
 void BackendImpl::configmgrini_verify_init(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
@@ -417,7 +417,7 @@ void BackendImpl::configmgrini_verify_init(
     }
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::configmgrini_flush(
     Reference<XCommandEnvironment> const & xCmdEnv )
 {
@@ -473,7 +473,7 @@ void BackendImpl::configmgrini_flush(
     m_configmgrini_modified = false;
 }
 
-//______________________________________________________________________________
+
 bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const & url_,
                               Reference<XCommandEnvironment> const & xCmdEnv )
 {
@@ -492,7 +492,7 @@ bool BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const &
         return false;
 }
 
-//______________________________________________________________________________
+
 bool BackendImpl::removeFromConfigmgrIni(
     bool isSchema, OUString const & url_,
     Reference<XCommandEnvironment> const & xCmdEnv )
@@ -524,7 +524,7 @@ bool BackendImpl::removeFromConfigmgrIni(
 
 
 // Package
-//______________________________________________________________________________
+
 
 BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
 {
@@ -566,7 +566,7 @@ BackendImpl::PackageImpl::isRegistered_(
         true, beans::Ambiguous<sal_Bool>( bReg, false ) );
 }
 
-//------------------------------------------------------------------------------
+
 OUString encodeForXml( OUString const & text )
 {
     // encode conforming xml:
@@ -599,7 +599,7 @@ OUString encodeForXml( OUString const & text )
     return buf.makeStringAndClear();
 }
 
-//______________________________________________________________________________
+
 OUString replaceOrigin(
     OUString const & url, OUString const & destFolder, Reference< XCommandEnvironment > const & xCmdEnv, Reference< XComponentContext > const & xContext, bool & out_replaced)
 {
@@ -686,7 +686,7 @@ OUString replaceOrigin(
     return newUrl;
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 41daf4a15c1c..ad4a63d99ac6 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -50,12 +50,12 @@ using namespace ::com::sun::star::ucb;
 namespace dp_registry {
 namespace backend {
 
-//______________________________________________________________________________
+
 PackageRegistryBackend::~PackageRegistryBackend()
 {
 }
 
-//______________________________________________________________________________
+
 void PackageRegistryBackend::disposing( lang::EventObject const & event )
     throw (RuntimeException)
 {
@@ -69,7 +69,7 @@ void PackageRegistryBackend::disposing( lang::EventObject const & event )
     }
 }
 
-//______________________________________________________________________________
+
 PackageRegistryBackend::PackageRegistryBackend(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xContext )
@@ -101,7 +101,7 @@ PackageRegistryBackend::PackageRegistryBackend(
         m_eContext = CONTEXT_UNKNOWN;
 }
 
-//______________________________________________________________________________
+
 void PackageRegistryBackend::check()
 {
     ::osl::MutexGuard guard( getMutex() );
@@ -112,7 +112,7 @@ void PackageRegistryBackend::check()
     }
 }
 
-//______________________________________________________________________________
+
 void PackageRegistryBackend::disposing()
 {
     try {
@@ -134,7 +134,7 @@ void PackageRegistryBackend::disposing()
 }
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
     OUString const & url, OUString const & mediaType, sal_Bool  bRemoved,
     OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
@@ -301,12 +301,12 @@ void PackageRegistryBackend::deleteUnusedFolders(
 }
 
 
-//______________________________________________________________________________
+
 Package::~Package()
 {
 }
 
-//______________________________________________________________________________
+
 Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
                   OUString const & url,
                   OUString const & rName,
@@ -336,14 +336,14 @@ Package::Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend,
     }
 }
 
-//______________________________________________________________________________
+
 void Package::disposing()
 {
     m_myBackend.clear();
     WeakComponentImplHelperBase::disposing();
 }
 
-//______________________________________________________________________________
+
 void Package::check() const
 {
     ::osl::MutexGuard guard( getMutex() );
@@ -355,7 +355,7 @@ void Package::check() const
 }
 
 // XComponent
-//______________________________________________________________________________
+
 void Package::dispose() throw (RuntimeException)
 {
     //Do not call check here. We must not throw an exception here if the object
@@ -363,7 +363,7 @@ void Package::dispose() throw (RuntimeException)
     WeakComponentImplHelperBase::dispose();
 }
 
-//______________________________________________________________________________
+
 void Package::addEventListener(
     Reference<lang::XEventListener> const & xListener ) throw (RuntimeException)
 {
@@ -372,7 +372,7 @@ void Package::addEventListener(
     WeakComponentImplHelperBase::addEventListener( xListener );
 }
 
-//______________________________________________________________________________
+
 void Package::removeEventListener(
     Reference<lang::XEventListener> const & xListener ) throw (RuntimeException)
 {
@@ -382,7 +382,7 @@ void Package::removeEventListener(
 }
 
 // XModifyBroadcaster
-//______________________________________________________________________________
+
 void Package::addModifyListener(
     Reference<util::XModifyListener> const & xListener )
     throw (RuntimeException)
@@ -391,7 +391,7 @@ void Package::addModifyListener(
     rBHelper.addListener( ::getCppuType( &xListener ), xListener );
 }
 
-//______________________________________________________________________________
+
 void Package::removeModifyListener(
     Reference<util::XModifyListener> const & xListener )
     throw (RuntimeException)
@@ -400,7 +400,7 @@ void Package::removeModifyListener(
     rBHelper.removeListener( ::getCppuType( &xListener ), xListener );
 }
 
-//______________________________________________________________________________
+
 void Package::checkAborted(
     ::rtl::Reference<AbortChannel> const & abortChannel )
 {
@@ -411,7 +411,7 @@ void Package::checkAborted(
 }
 
 // XPackage
-//______________________________________________________________________________
+
 Reference<task::XAbortChannel> Package::createAbortChannel()
     throw (RuntimeException)
 {
@@ -419,13 +419,13 @@ Reference<task::XAbortChannel> Package::createAbortChannel()
     return new AbortChannel;
 }
 
-//______________________________________________________________________________
+
 sal_Bool Package::isBundle() throw (RuntimeException)
 {
     return false; // default
 }
 
-//______________________________________________________________________________
+
 ::sal_Int32 Package::checkPrerequisites(
         const css::uno::Reference< css::task::XAbortChannel >&,
         const css::uno::Reference< css::ucb::XCommandEnvironment >&,
@@ -441,7 +441,7 @@ sal_Bool Package::isBundle() throw (RuntimeException)
     return 0;
 }
 
-//______________________________________________________________________________
+
 ::sal_Bool Package::checkDependencies(
         const css::uno::Reference< css::ucb::XCommandEnvironment >& )
         throw (css::deployment::DeploymentException,
@@ -455,7 +455,7 @@ sal_Bool Package::isBundle() throw (RuntimeException)
 }
 
 
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackage> > Package::getBundle(
     Reference<task::XAbortChannel> const &,
     Reference<XCommandEnvironment> const & )
@@ -466,7 +466,7 @@ Sequence< Reference<deployment::XPackage> > Package::getBundle(
     return Sequence< Reference<deployment::XPackage> >();
 }
 
-//______________________________________________________________________________
+
 OUString Package::getName() throw (RuntimeException)
 {
     return m_name;
@@ -480,7 +480,7 @@ beans::Optional<OUString> Package::getIdentifier() throw (RuntimeException)
     return beans::Optional<OUString>();
 }
 
-//______________________________________________________________________________
+
 OUString Package::getVersion() throw (
     deployment::ExtensionRemovedException,
     RuntimeException)
@@ -490,13 +490,13 @@ OUString Package::getVersion() throw (
     return OUString();
 }
 
-//______________________________________________________________________________
+
 OUString Package::getURL() throw (RuntimeException)
 {
     return m_url;
 }
 
-//______________________________________________________________________________
+
 OUString Package::getDisplayName() throw (
     deployment::ExtensionRemovedException, RuntimeException)
 {
@@ -505,7 +505,7 @@ OUString Package::getDisplayName() throw (
     return m_displayName;
 }
 
-//______________________________________________________________________________
+
 OUString Package::getDescription() throw (
     deployment::ExtensionRemovedException,RuntimeException)
 {
@@ -514,7 +514,7 @@ OUString Package::getDescription() throw (
     return OUString();
 }
 
-//______________________________________________________________________________
+
 OUString Package::getLicenseText() throw (
     deployment::ExtensionRemovedException,RuntimeException)
 {
@@ -523,7 +523,7 @@ OUString Package::getLicenseText() throw (
     return OUString();
 }
 
-//______________________________________________________________________________
+
 Sequence<OUString> Package::getUpdateInformationURLs() throw (
     deployment::ExtensionRemovedException, RuntimeException)
 {
@@ -532,7 +532,7 @@ Sequence<OUString> Package::getUpdateInformationURLs() throw (
     return Sequence<OUString>();
 }
 
-//______________________________________________________________________________
+
 css::beans::StringPair Package::getPublisherInfo() throw (
     deployment::ExtensionRemovedException, RuntimeException)
 {
@@ -542,7 +542,7 @@ css::beans::StringPair Package::getPublisherInfo() throw (
     return aEmptyPair;
 }
 
-//______________________________________________________________________________
+
 uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContrast*/ )
     throw (deployment::ExtensionRemovedException, RuntimeException )
 {
@@ -553,14 +553,14 @@ uno::Reference< css::graphic::XGraphic > Package::getIcon( sal_Bool /*bHighContr
     return aEmpty;
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackageTypeInfo> Package::getPackageType()
     throw (RuntimeException)
 {
     return m_xPackageType;
 }
 
-//______________________________________________________________________________
+
 void Package::exportTo(
     OUString const & destFolderURL, OUString const & newTitle,
     sal_Int32 nameClashAction, Reference<XCommandEnvironment> const & xCmdEnv )
@@ -578,7 +578,7 @@ void Package::exportTo(
         throw RuntimeException( "UCB transferContent() failed!", 0 );
 }
 
-//______________________________________________________________________________
+
 void Package::fireModified()
 {
     ::cppu::OInterfaceContainerHelper * container = rBHelper.getContainer(
@@ -599,7 +599,7 @@ void Package::fireModified()
 }
 
 // XPackage
-//______________________________________________________________________________
+
 beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<XCommandEnvironment> const & xCmdEnv )
@@ -632,7 +632,7 @@ beans::Optional< beans::Ambiguous<sal_Bool> > Package::isRegistered(
     }
 }
 
-//______________________________________________________________________________
+
 void Package::processPackage_impl(
     bool doRegisterPackage,
     bool startup,
@@ -710,7 +710,7 @@ void Package::processPackage_impl(
         fireModified();
 }
 
-//______________________________________________________________________________
+
 void Package::registerPackage(
     sal_Bool startup,
     Reference<task::XAbortChannel> const & xAbortChannel,
@@ -725,7 +725,7 @@ void Package::registerPackage(
     processPackage_impl( true /* register */, startup, xAbortChannel, xCmdEnv );
 }
 
-//______________________________________________________________________________
+
 void Package::revokePackage(
     sal_Bool startup,
     Reference<task::XAbortChannel> const & xAbortChannel,
@@ -775,39 +775,39 @@ sal_Bool Package::isRemoved()
 }
 
 
-//______________________________________________________________________________
+
 Package::TypeInfo::~TypeInfo()
 {
 }
 
 // XPackageTypeInfo
-//______________________________________________________________________________
+
 OUString Package::TypeInfo::getMediaType() throw (RuntimeException)
 {
     return m_mediaType;
 }
 
-//______________________________________________________________________________
+
 OUString Package::TypeInfo::getDescription()
     throw (deployment::ExtensionRemovedException, RuntimeException)
 {
     return getShortDescription();
 }
 
-//______________________________________________________________________________
+
 OUString Package::TypeInfo::getShortDescription()
     throw (deployment::ExtensionRemovedException, RuntimeException)
 {
     return m_shortDescr;
 }
 
-//______________________________________________________________________________
+
 OUString Package::TypeInfo::getFileFilter() throw (RuntimeException)
 {
     return m_fileFilter;
 }
 
-//______________________________________________________________________________
+
 /**************************
  * Get Icon
  *
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index cc1584865967..deeefa1cb2f3 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -129,7 +129,7 @@ public:
 
 };
 
-//______________________________________________________________________________
+
 inline void PackageRegistryImpl::check()
 {
     ::osl::MutexGuard guard( getMutex() );
@@ -140,7 +140,7 @@ inline void PackageRegistryImpl::check()
     }
 }
 
-//______________________________________________________________________________
+
 void PackageRegistryImpl::disposing()
 {
     // dispose all backends:
@@ -156,12 +156,12 @@ void PackageRegistryImpl::disposing()
     t_helper::disposing();
 }
 
-//______________________________________________________________________________
+
 PackageRegistryImpl::~PackageRegistryImpl()
 {
 }
 
-//______________________________________________________________________________
+
 OUString normalizeMediaType( OUString const & mediaType )
 {
     OUStringBuffer buf;
@@ -175,7 +175,7 @@ OUString normalizeMediaType( OUString const & mediaType )
     return buf.makeStringAndClear();
 }
 
-//______________________________________________________________________________
+
 
 void PackageRegistryImpl::packageRemoved(
     OUString const & url, OUString const & mediaType)
@@ -294,7 +294,7 @@ void PackageRegistryImpl::insertBackend(
     }
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
     OUString const & context,
     OUString const & cachePath, bool readOnly,
@@ -443,7 +443,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create(
 }
 
 // XUpdatable: broadcast to backends
-//______________________________________________________________________________
+
 void PackageRegistryImpl::update() throw (RuntimeException)
 {
     check();
@@ -457,7 +457,7 @@ void PackageRegistryImpl::update() throw (RuntimeException)
 }
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
     OUString const & url, OUString const & mediaType_, sal_Bool bRemoved,
     OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
@@ -533,7 +533,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage(
     }
 }
 
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 PackageRegistryImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index bdcafdd63cfa..4b89487ea703 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -125,7 +125,7 @@ public:
 
 };
 
-//______________________________________________________________________________
+
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xComponentContext )
@@ -154,7 +154,7 @@ BackendImpl::BackendImpl(
 }
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -170,7 +170,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
 }
 
 // PackageRegistryBackend
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType_,
     sal_Bool bRemoved, OUString const & identifier,
@@ -323,7 +323,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
     return bCompiled;
 }
 
-//______________________________________________________________________________
+
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::PackageImpl::isRegistered_(
     ::osl::ResettableMutexGuard &,
@@ -339,7 +339,7 @@ BackendImpl::PackageImpl::isRegistered_(
     return beans::Optional< beans::Ambiguous<sal_Bool> >( true, beans::Ambiguous<sal_Bool>( bReg, false ) );
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 0b6dece25682..f5c954ead33c 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -285,7 +285,7 @@ public:
     }
 };
 
-//______________________________________________________________________________
+
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xComponentContext,
@@ -316,7 +316,7 @@ BackendImpl::BackendImpl(
    }
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::disposing()
 {
     m_xRootRegistry.clear();
@@ -343,7 +343,7 @@ Sequence<OUString> BackendImpl::getSupportedServiceNames()
 }
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -368,7 +368,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
 
 
 // PackageRegistryBackend
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType_,
     sal_Bool bRemoved, OUString const & identifier,
@@ -498,7 +498,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
     }
     return pBackend;
 }
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::disposing()
 {
     sal_Int32 len = m_bundle.getLength();
@@ -511,7 +511,7 @@ void BackendImpl::PackageImpl::disposing()
 }
 
 // Package
-//______________________________________________________________________________
+
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::PackageImpl::isRegistered_(
     ::osl::ResettableMutexGuard &,
@@ -683,7 +683,7 @@ bool BackendImpl::PackageImpl::checkDependencies(
         //Only use interaction if there is no version of this extension already installed
         //and the suppress-on-update flag is not set for the new extension
         // alreadyInstalled | bSuppressOnUpdate | show license
-        //----------------------------------------
+
         //      0     |      0            |     1
         //      0     |      1            |     1
         //      1     |      0            |     1
@@ -808,7 +808,7 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo()
     return aStrPair;
 }
 
-//______________________________________________________________________________
+
 uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool bHighContrast )
     throw (deployment::ExtensionRemovedException, RuntimeException )
 {
@@ -835,7 +835,7 @@ uno::Reference< graphic::XGraphic > BackendImpl::PackageImpl::getIcon( sal_Bool
     return xGraphic;
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
@@ -968,7 +968,7 @@ void BackendImpl::PackageImpl::processPackage_(
     }
 }
 
-//______________________________________________________________________________
+
 OUString BackendImpl::PackageImpl::getDescription()
     throw (deployment::ExtensionRemovedException, RuntimeException)
 {
@@ -996,7 +996,7 @@ OUString BackendImpl::PackageImpl::getDescription()
     return m_oldDescription;
 }
 
-//______________________________________________________________________________
+
 OUString BackendImpl::PackageImpl::getLicenseText()
     throw (deployment::ExtensionRemovedException, RuntimeException)
 {
@@ -1021,7 +1021,7 @@ OUString BackendImpl::PackageImpl::getLicenseText()
      return sLicense;
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::exportTo(
     OUString const & destFolderURL, OUString const & newTitle,
     sal_Int32 nameClashAction, Reference<ucb::XCommandEnvironment> const & xCmdEnv )
@@ -1209,13 +1209,13 @@ void BackendImpl::PackageImpl::exportTo(
     }
 }
 
-//______________________________________________________________________________
+
 sal_Bool BackendImpl::PackageImpl::isBundle() throw (RuntimeException)
 {
     return true;
 }
 
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackage> > BackendImpl::PackageImpl::getBundle(
     Reference<task::XAbortChannel> const & xAbortChannel,
     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
@@ -1344,7 +1344,7 @@ inline bool isBundle_( OUString const & mediaType )
          mediaType.matchIgnoreAsciiCase( "application/vnd.sun.star.legacy-package-bundle"));
 }
 
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem(
     OUString const & url, OUString const & mediaType,
     sal_Bool bRemoved, OUString const & identifier,
@@ -1398,7 +1398,7 @@ Reference<deployment::XPackage> BackendImpl::PackageImpl::bindBundleItem(
     return xPackage;
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::scanBundle(
     t_packagevec & bundle,
     ::rtl::Reference<AbortChannel> const & abortChannel,
@@ -1543,7 +1543,7 @@ void BackendImpl::PackageImpl::scanBundle(
     }
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::scanLegacyBundle(
     t_packagevec & bundle,
     OUString const & url,
diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx
index 42d917a3eb78..00817957e153 100644
--- a/desktop/source/deployment/registry/script/dp_lib_container.cxx
+++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx
@@ -45,7 +45,7 @@ struct StrCannotDetermineLibName : public StaticResourceString<
     StrCannotDetermineLibName, RID_STR_CANNOT_DETERMINE_LIBNAME> {};
 }
 
-//______________________________________________________________________________
+
 OUString LibraryContainer::get_libname(
     OUString const & url,
     Reference<XCommandEnvironment> const & xCmdEnv,
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 5bd7239b61c8..d85093cd3e43 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -110,7 +110,7 @@ public:
 
 };
 
-//______________________________________________________________________________
+
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<BackendImpl> const & myBackend,
     OUString const & url,
@@ -138,7 +138,7 @@ BackendImpl::PackageImpl::PackageImpl(
     m_displayName = m_name;
 }
 
-//______________________________________________________________________________
+
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xComponentContext )
@@ -182,14 +182,14 @@ bool BackendImpl::hasActiveEntry(OUString const & url)
 }
 
 // XUpdatable
-//______________________________________________________________________________
+
 void BackendImpl::update() throw (RuntimeException)
 {
     // Nothing to do here after fixing i70283!?
 }
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -210,7 +210,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
 }
 
 // PackageRegistryBackend
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType_,
     sal_Bool bRemoved, OUString const & identifier,
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 7486909aefdf..c2d5442be957 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -115,7 +115,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const
     }
     return pBackend;
 }
-//______________________________________________________________________________
+
 OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
 {
     if (m_descr.isEmpty())
@@ -124,13 +124,13 @@ OUString BackendImpl::PackageImpl::getDescription() throw (RuntimeException)
         return m_descr;
 }
 
-//______________________________________________________________________________
+
 OUString BackendImpl::PackageImpl::getLicenseText() throw (RuntimeException)
 {
     return Package::getDescription();
 }
 
-//______________________________________________________________________________
+
 BackendImpl::PackageImpl::PackageImpl(
     ::rtl::Reference<BackendImpl> const & myBackend,
     OUString const & url, OUString const & libType, bool bRemoved,
@@ -156,7 +156,7 @@ BackendImpl::PackageImpl::PackageImpl(
     dp_misc::TRACE("PakageImpl displayName is " + m_displayName);
 }
 
-//______________________________________________________________________________
+
 BackendImpl::BackendImpl(
     Sequence<Any> const & args,
     Reference<XComponentContext> const & xComponentContext )
@@ -175,7 +175,7 @@ BackendImpl::BackendImpl(
 
 
 // XPackageRegistry
-//______________________________________________________________________________
+
 Sequence< Reference<deployment::XPackageTypeInfo> >
 BackendImpl::getSupportedPackageTypes() throw (RuntimeException)
 {
@@ -189,7 +189,7 @@ void BackendImpl::packageRemoved(OUString const & /*url*/, OUString const & /*me
 }
 
 // PackageRegistryBackend
-//______________________________________________________________________________
+
 Reference<deployment::XPackage> BackendImpl::bindPackage_(
     OUString const & url, OUString const & mediaType_, sal_Bool bRemoved,
     OUString const & identifier, Reference<XCommandEnvironment> const & xCmdEnv )
@@ -314,7 +314,7 @@ void BackendImpl::PackageImpl:: initPackageHandler()
 }
 
 // Package
-//______________________________________________________________________________
+
 beans::Optional< beans::Ambiguous<sal_Bool> >
 BackendImpl::PackageImpl::isRegistered_(
     ::osl::ResettableMutexGuard &,
@@ -329,7 +329,7 @@ BackendImpl::PackageImpl::isRegistered_(
             false /* IsAmbiguous */ ) );
 }
 
-//______________________________________________________________________________
+
 void BackendImpl::PackageImpl::processPackage_(
     ::osl::ResettableMutexGuard &,
     bool doRegisterPackage,
diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx
index c35a167e8a94..e61607d5d6bc 100644
--- a/desktop/source/migration/services/basicmigration.cxx
+++ b/desktop/source/migration/services/basicmigration.cxx
@@ -45,7 +45,7 @@ namespace migration
         return OUString("com.sun.star.comp.desktop.migration.Basic");
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > BasicMigration_getSupportedServiceNames()
     {
@@ -62,13 +62,13 @@ namespace migration
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     BasicMigration::~BasicMigration()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const
     {
@@ -105,7 +105,7 @@ namespace migration
         return aResult;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     ::osl::FileBase::RC BasicMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
     {
@@ -123,7 +123,7 @@ namespace migration
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void BasicMigration::copyFiles()
     {
@@ -158,16 +158,16 @@ namespace migration
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
 
     OUString BasicMigration::getImplementationName() throw (RuntimeException)
     {
         return BasicMigration_getImplementationName();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicMigration::supportsService(OUString const & ServiceName)
         throw (css::uno::RuntimeException)
@@ -175,16 +175,16 @@ namespace migration
         return cppu::supportsService(this, ServiceName);
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException)
     {
         return BasicMigration_getSupportedServiceNames();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInitialization
-    // -----------------------------------------------------------------------------
+
 
     void BasicMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
     {
@@ -208,9 +208,9 @@ namespace migration
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XJob
-    // -----------------------------------------------------------------------------
+
 
     Any BasicMigration::execute( const Sequence< beans::NamedValue >& )
         throw (lang::IllegalArgumentException, Exception, RuntimeException)
@@ -233,7 +233,7 @@ namespace migration
         return static_cast< lang::XTypeProvider * >( new BasicMigration() );
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace migration
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 849bb8863e41..05f1cd523790 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -196,7 +196,7 @@ public:
 
 
 
-    //----------------
+
     ~JavaMigration();
 
 private:
@@ -340,7 +340,7 @@ void SAL_CALL JavaMigration::startLayer()
     throw(css::lang::WrappedTargetException)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL JavaMigration::endLayer()
     throw(
@@ -348,7 +348,7 @@ void SAL_CALL JavaMigration::endLayer()
         WrappedTargetException )
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL JavaMigration::overrideNode(
         const OUString&,
@@ -361,7 +361,7 @@ void SAL_CALL JavaMigration::overrideNode(
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL JavaMigration::addOrReplaceNode(
         const OUString&,
@@ -378,7 +378,7 @@ void SAL_CALL  JavaMigration::endNode()
         WrappedTargetException )
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL  JavaMigration::dropNode(
         const OUString& )
@@ -387,7 +387,7 @@ void SAL_CALL  JavaMigration::dropNode(
         WrappedTargetException )
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL  JavaMigration::overrideProperty(
         const OUString& aName,
@@ -403,7 +403,7 @@ void SAL_CALL  JavaMigration::overrideProperty(
     else if ( aName == "UserClassPath" )
         m_aStack.push(TElementStack::value_type(aName, USER_CLASS_PATH));
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL  JavaMigration::setPropertyValue(
         const Any& aValue )
@@ -448,7 +448,7 @@ void SAL_CALL  JavaMigration::setPropertyValue(
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL JavaMigration::setPropertyValueForLocale(
         const Any&,
@@ -458,7 +458,7 @@ void SAL_CALL JavaMigration::setPropertyValueForLocale(
         WrappedTargetException )
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL  JavaMigration::endProperty()
     throw(
@@ -468,7 +468,7 @@ void SAL_CALL  JavaMigration::endProperty()
             if (!m_aStack.empty())
                 m_aStack.pop();
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL  JavaMigration::addProperty(
         const OUString&,
@@ -479,7 +479,7 @@ void SAL_CALL  JavaMigration::addProperty(
         WrappedTargetException )
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL  JavaMigration::addPropertyWithValue(
         const OUString&,
@@ -501,7 +501,7 @@ void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate(
 {
 }
 
-// -----------------------------------------------------------------------------
+
 //ToDo enable java, user class path
 
 } //end namespace jfw
diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx
index 5d03d2258491..720054b5aef5 100644
--- a/desktop/source/migration/services/oo3extensionmigration.cxx
+++ b/desktop/source/migration/services/oo3extensionmigration.cxx
@@ -73,7 +73,7 @@ OUString OO3ExtensionMigration_getImplementationName()
     return *pImplName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames()
 {
@@ -100,7 +100,7 @@ m_ctx(ctx)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 OO3ExtensionMigration::~OO3ExtensionMigration()
 {
@@ -322,16 +322,16 @@ void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir )
 }
 
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException)
 {
     return OO3ExtensionMigration_getImplementationName();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
     throw (css::uno::RuntimeException)
@@ -339,16 +339,16 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName)
     return cppu::supportsService(this, ServiceName);
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException)
 {
     return OO3ExtensionMigration_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------------
+
 // XInitialization
-// -----------------------------------------------------------------------------
+
 
 void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
 {
@@ -408,9 +408,9 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& )
     return Any();
 }
 
-// -----------------------------------------------------------------------------
+
 // TmpRepositoryCommandEnv
-// -----------------------------------------------------------------------------
+
 
 TmpRepositoryCommandEnv::TmpRepositoryCommandEnv()
 {
@@ -420,14 +420,14 @@ TmpRepositoryCommandEnv::~TmpRepositoryCommandEnv()
 {
 }
 // XCommandEnvironment
-//______________________________________________________________________________
+
 uno::Reference< task::XInteractionHandler > TmpRepositoryCommandEnv::getInteractionHandler()
 throw ( uno::RuntimeException )
 {
     return this;
 }
 
-//______________________________________________________________________________
+
 uno::Reference< ucb::XProgressHandler > TmpRepositoryCommandEnv::getProgressHandler()
 throw ( uno::RuntimeException )
 {
@@ -491,7 +491,7 @@ Reference< XInterface > SAL_CALL OO3ExtensionMigration_create(
         ctx) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 }   // namespace migration
 
diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx
index 1f4c05121f6b..38ccca46c2b0 100644
--- a/desktop/source/migration/services/wordbookmigration.cxx
+++ b/desktop/source/migration/services/wordbookmigration.cxx
@@ -56,7 +56,7 @@ namespace migration
         return *pImplName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > WordbookMigration_getSupportedServiceNames()
     {
@@ -82,13 +82,13 @@ namespace migration
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     WordbookMigration::~WordbookMigration()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const
     {
@@ -125,7 +125,7 @@ namespace migration
         return aResult;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     ::osl::FileBase::RC WordbookMigration::checkAndCreateDirectory( INetURLObject& rDirURL )
     {
@@ -186,7 +186,7 @@ bool IsUserWordbook( const OUString& rFile )
 }
 
 
-    // -----------------------------------------------------------------------------
+
 
     void WordbookMigration::copyFiles()
     {
@@ -224,16 +224,16 @@ bool IsUserWordbook( const OUString& rFile )
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
 
     OUString WordbookMigration::getImplementationName() throw (RuntimeException)
     {
         return WordbookMigration_getImplementationName();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool WordbookMigration::supportsService(OUString const & ServiceName)
         throw (css::uno::RuntimeException)
@@ -241,16 +241,16 @@ bool IsUserWordbook( const OUString& rFile )
         return cppu::supportsService(this, ServiceName);
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException)
     {
         return WordbookMigration_getSupportedServiceNames();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInitialization
-    // -----------------------------------------------------------------------------
+
 
     void WordbookMigration::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
     {
@@ -274,9 +274,9 @@ bool IsUserWordbook( const OUString& rFile )
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XJob
-    // -----------------------------------------------------------------------------
+
 
     Any WordbookMigration::execute( const Sequence< beans::NamedValue >& )
         throw (lang::IllegalArgumentException, Exception, RuntimeException)
@@ -299,7 +299,7 @@ bool IsUserWordbook( const OUString& rFile )
         return static_cast< lang::XTypeProvider * >( new WordbookMigration() );
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace migration
diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx
index 5d11e0f9cebb..68a26d565fc9 100644
--- a/desktop/source/offacc/acceptor.cxx
+++ b/desktop/source/offacc/acceptor.cxx
@@ -258,7 +258,7 @@ Reference<XInterface> AccInstanceProvider::getInstance (const OUString& aName )
 }
 
 // component management stuff...
-// ----------------------------------------------------------------------------
+
 extern "C"
 {
 using namespace desktop;
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 9b4ec1acb5d1..3ad157bd0a4f 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -64,7 +64,7 @@ struct ExtensionName
     }
 };
 
-//------------------------------------------------------------------------------
+
 const char s_usingText [] =
 "\n"
 "using: " APP_NAME " add <options> extension-path...\n"
@@ -104,7 +104,7 @@ const char s_usingText [] =
 "To learn more about the Extension Manager and extensions, see:\n"
 "http://wiki.openoffice.org/wiki/Documentation/DevGuide/Extensions/Extensions\n\n";
 
-//------------------------------------------------------------------------------
+
 const OptionInfo s_option_infos [] = {
     { RTL_CONSTASCII_STRINGPARAM("help"), 'h', false },
     { RTL_CONSTASCII_STRINGPARAM("version"), 'V', false },
diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
index dd35330a2c8f..046cce00bc7a 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx
@@ -94,7 +94,7 @@ public:
 };
 
 
-//______________________________________________________________________________
+
 CommandEnvironmentImpl::CommandEnvironmentImpl(
     Reference<XComponentContext> const & xComponentContext,
     OUString const & log_file,
@@ -118,7 +118,7 @@ CommandEnvironmentImpl::CommandEnvironmentImpl(
     }
 }
 
-//______________________________________________________________________________
+
 CommandEnvironmentImpl::~CommandEnvironmentImpl()
 {
     try {
@@ -186,14 +186,14 @@ void CommandEnvironmentImpl::printLicense(
 }
 
 // XCommandEnvironment
-//______________________________________________________________________________
+
 Reference< task::XInteractionHandler >
 CommandEnvironmentImpl::getInteractionHandler() throw (RuntimeException)
 {
     return this;
 }
 
-//______________________________________________________________________________
+
 Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler()
     throw (RuntimeException)
 {
@@ -201,7 +201,7 @@ Reference< XProgressHandler > CommandEnvironmentImpl::getProgressHandler()
 }
 
 // XInteractionHandler
-//______________________________________________________________________________
+
 void CommandEnvironmentImpl::handle(
     Reference<task::XInteractionRequest> const & xRequest )
     throw (RuntimeException)
@@ -321,7 +321,7 @@ void CommandEnvironmentImpl::handle(
 }
 
 // XProgressHandler
-//______________________________________________________________________________
+
 void CommandEnvironmentImpl::push( Any const & Status )
     throw (RuntimeException)
 {
@@ -332,7 +332,7 @@ void CommandEnvironmentImpl::push( Any const & Status )
         m_xLogFile->push( Status );
 }
 
-//______________________________________________________________________________
+
 void CommandEnvironmentImpl::update_( Any const & Status )
     throw (RuntimeException)
 {
@@ -374,7 +374,7 @@ void CommandEnvironmentImpl::update_( Any const & Status )
         dp_misc::writeConsole(msg + "\n");
 }
 
-//______________________________________________________________________________
+
 void CommandEnvironmentImpl::update( Any const & Status )
     throw (RuntimeException)
 {
@@ -383,7 +383,7 @@ void CommandEnvironmentImpl::update( Any const & Status )
         m_xLogFile->update( Status );
 }
 
-//______________________________________________________________________________
+
 void CommandEnvironmentImpl::pop() throw (RuntimeException)
 {
     OSL_ASSERT( m_logLevel > 0 );
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 2a72df64d377..97b32ada28d0 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -241,14 +241,14 @@ OUString makeAbsoluteFileUrl(
 
 namespace {
 
-//------------------------------------------------------------------------------
+
 inline void printf_space( sal_Int32 space )
 {
     while (space--)
         dp_misc::writeConsole("  ");
 }
 
-//------------------------------------------------------------------------------
+
 void printf_line(
     OUString const & name, OUString const & value, sal_Int32 level )
 {
@@ -256,7 +256,7 @@ void printf_line(
     dp_misc::writeConsole(name + ": " + value + "\n");
 }
 
-//------------------------------------------------------------------------------
+
 void printf_package(
     Reference<deployment::XPackage> const & xPackage,
     Reference<XCommandEnvironment> const & xCmdEnv, sal_Int32 level )
@@ -352,7 +352,7 @@ void printf_packages(
 
 namespace {
 
-//------------------------------------------------------------------------------
+
 Reference<XComponentContext> bootstrapStandAlone()
 {
     Reference<XComponentContext> xContext =
@@ -370,7 +370,7 @@ Reference<XComponentContext> bootstrapStandAlone()
     return xContext;
 }
 
-//------------------------------------------------------------------------------
+
 Reference<XComponentContext> connectToOffice(
     Reference<XComponentContext> const & xLocalComponentContext,
     bool verbose )
diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx
index 9f77cabbd4ad..e7584c0b0ac8 100644
--- a/desktop/win32/source/guiloader/genericloader.cxx
+++ b/desktop/win32/source/guiloader/genericloader.cxx
@@ -40,7 +40,7 @@
 #include "tools/pathutils.hxx"
 #include "../extendloaderenvironment.hxx"
 
-//---------------------------------------------------------------------------
+
 
 static int GenericMain()
 {
@@ -142,7 +142,7 @@ static int GenericMain()
     return dwExitCode;
 }
 
-//---------------------------------------------------------------------------
+
 
 #ifdef __MINGW32__
 int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR, int )
@@ -153,7 +153,7 @@ int WINAPI _tWinMain( HINSTANCE, HINSTANCE, LPTSTR, int )
     return GenericMain();
 }
 
-//---------------------------------------------------------------------------
+
 
 #ifdef __MINGW32__
 int __cdecl main()
diff --git a/desktop/win32/source/officeloader/officeloader.cxx b/desktop/win32/source/officeloader/officeloader.cxx
index 63cc0cc595e1..1dee9e90396a 100644
--- a/desktop/win32/source/officeloader/officeloader.cxx
+++ b/desktop/win32/source/officeloader/officeloader.cxx
@@ -115,7 +115,7 @@ BOOL WINAPI ConvertSidToStringSid( PSID pSid, LPTSTR* StringSid )
 }
 
 
-//---------------------------------------------------------------------------
+
 
 static LPTSTR   *GetCommandArgs( int *pArgc )
 {
@@ -127,7 +127,7 @@ static LPTSTR   *GetCommandArgs( int *pArgc )
 #endif
 }
 
-//---------------------------------------------------------------------------
+
 
 namespace {
 
diff --git a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
index 3136f59f4ad9..75f8e4ea6a58 100644
--- a/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
+++ b/drawinglayer/source/dumper/EnhancedShapeDumper.cxx
@@ -13,9 +13,9 @@
 
 using namespace com::sun::star;
 
-// ------------------------------------------------------
+
 // ---------- EnhancedCustomShapeExtrusion.idl ----------
-// ------------------------------------------------------
+
 
 void EnhancedShapeDumper::dumpEnhancedCustomShapeExtrusionService(uno::Reference< beans::XPropertySet > xPropSet)
 {
@@ -356,9 +356,9 @@ void EnhancedShapeDumper::dumpExtrusionColorAsAttribute(sal_Bool bExtrusionColor
         xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("extrusionColor"), "%s", "false");
 }
 
-// ------------------------------------------------------
+
 // ---------- EnhancedCustomShapeGeometry.idl -----------
-// ------------------------------------------------------
+
 
 void EnhancedShapeDumper::dumpEnhancedCustomShapeGeometryService(uno::Reference< beans::XPropertySet > xPropSet)
 {
@@ -613,9 +613,9 @@ void EnhancedShapeDumper::dumpHandlesAsElement(uno::Sequence< beans::PropertyVal
     xmlTextWriterEndElement( xmlWriter );
 }
 
-// ------------------------------------------------------
+
 // ---------- EnhancedCustomShapeHandle.idl -----------
-// ------------------------------------------------------
+
 
 void EnhancedShapeDumper::dumpEnhancedCustomShapeHandleService(uno::Reference< beans::XPropertySet > xPropSet)
 {
@@ -823,9 +823,9 @@ void EnhancedShapeDumper::dumpRadiusRangeMaximumAsElement(drawing::EnhancedCusto
     xmlTextWriterEndElement( xmlWriter );
 }
 
-// ------------------------------------------------------
+
 // ---------- EnhancedCustomShapePath.idl ---------------
-// ------------------------------------------------------
+
 
 void EnhancedShapeDumper::dumpEnhancedCustomShapePathService(uno::Reference< beans::XPropertySet > xPropSet)
 {
@@ -1030,9 +1030,9 @@ void EnhancedShapeDumper::dumpSubViewSizeAsElement(uno::Sequence< awt::Size > aS
     xmlTextWriterEndElement( xmlWriter );
 }
 
-// ----------------------------------------------------------
+
 // ---------- EnhancedCustomShapeTextPath.idl ---------------
-// ----------------------------------------------------------
+
 
 void EnhancedShapeDumper::dumpEnhancedCustomShapeTextPathService(uno::Reference< beans::XPropertySet > xPropSet)
 {
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx
index 43b335d47ef9..7a7d59859c61 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -174,9 +174,9 @@ int closeCallback(void* )
 
 bool m_bNameDumped;
 
-// ----------------------------------------
+
 // ---------- FillProperties.idl ----------
-// ----------------------------------------
+
 void dumpFillStyleAsAttribute(drawing::FillStyle eFillStyle, xmlTextWriterPtr xmlWriter)
 {
     switch(eFillStyle)
@@ -431,9 +431,9 @@ void dumpFillBitmapTileAsAttribute(sal_Bool bBitmapTile, xmlTextWriterPtr xmlWri
         xmlTextWriterWriteFormatAttribute( xmlWriter, BAD_CAST("fillBitmapTile"), "%s", "false");
 }
 
-// ----------------------------------------
+
 // ---------- LineProperties.idl ----------
-// ----------------------------------------
+
 
 void dumpLineStyleAsAttribute(drawing::LineStyle eLineStyle, xmlTextWriterPtr xmlWriter)
 {
@@ -583,9 +583,9 @@ void dumpLineEndWidthAsAttribute(sal_Int32 aLineEndWidth, xmlTextWriterPtr xmlWr
     xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("lineEndWidth"), "%" SAL_PRIdINT32, aLineEndWidth);
 }
 
-// -----------------------------------------------
+
 // ---------- PolyPolygonDescriptor.idl ----------
-// -----------------------------------------------
+
 
 void dumpPolygonKindAsAttribute(drawing::PolygonKind ePolygonKind, xmlTextWriterPtr xmlWriter)
 {
@@ -698,9 +698,9 @@ void dumpCharColorAsAttribute(sal_Int32 aColor, xmlTextWriterPtr xmlWriter)
     xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("fontColor"), "%06x", (unsigned int) aColor);
 }
 
-// ----------------------------------------
+
 // ---------- TextProperties.idl ----------
-// ----------------------------------------
+
 
 void dumpIsNumberingAsAttribute(sal_Bool bIsNumbering, xmlTextWriterPtr xmlWriter)
 {
@@ -931,9 +931,9 @@ void dumpTextWritingModeAsAttribute(text::WritingMode eTextWritingMode, xmlTextW
     }
 }
 
-// ------------------------------------------
+
 // ---------- ShadowProperties.idl ----------
-// ------------------------------------------
+
 
 void dumpShadowAsAttribute(sal_Bool bShadow, xmlTextWriterPtr xmlWriter)
 {
@@ -963,9 +963,9 @@ void dumpShadowYDistanceAsAttribute(sal_Int32 aShadowYDistance, xmlTextWriterPtr
     xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("shadowYDistance"), "%" SAL_PRIdINT32, aShadowYDistance);
 }
 
-// -------------------------------
+
 // ---------- Shape.idl ----------
-// -------------------------------
+
 
 void dumpZOrderAsAttribute(sal_Int32 aZOrder, xmlTextWriterPtr xmlWriter)
 {
@@ -1070,9 +1070,9 @@ void dumpInteropGrabBagAsElement(uno::Sequence< beans::PropertyValue> aInteropGr
     xmlTextWriterEndElement( xmlWriter );
 }
 
-// --------------------------------
+
 // ---------- XShape.idl ----------
-// --------------------------------
+
 
 void dumpPositionAsAttribute(const awt::Point& rPoint, xmlTextWriterPtr xmlWriter)
 {
@@ -1092,9 +1092,9 @@ void dumpShapeDescriptorAsAttribute( uno::Reference< drawing::XShapeDescriptor >
         OUStringToOString(xDescr->getShapeType(), RTL_TEXTENCODING_UTF8).getStr());
 }
 
-// -------------------------------------
+
 // ---------- CustomShape.idl ----------
-// -------------------------------------
+
 
 void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter)
 {
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 6d955d262245..7bb69a31f1ae 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.cxx
@@ -24,9 +24,9 @@
 
 #define MIMECONTENTTYPEFACTORY_IMPL_NAME  "com.sun.star.datatransfer.MimeCntTypeFactory"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::osl;
@@ -35,9 +35,9 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::datatransfer;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -49,17 +49,17 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CMimeContentTypeFactory::CMimeContentTypeFactory()
 {
 }
 
-//------------------------------------------------------------------------
+
 // createMimeContentType
-//------------------------------------------------------------------------
+
 
 Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( const OUString& aContentType )
     throw( IllegalArgumentException, RuntimeException )
@@ -68,9 +68,9 @@ Reference< XMimeContentType > CMimeContentTypeFactory::createMimeContentType( co
     return Reference< XMimeContentType >( new CMimeContentType( aContentType ) );
 }
 
-// -------------------------------------------------
+
 // XServiceInfo
-// -------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentTypeFactory::getImplementationName(  )
     throw( RuntimeException )
@@ -85,9 +85,9 @@ sal_Bool SAL_CALL CMimeContentTypeFactory::supportsService( const OUString& Serv
     return cppu::supportsService(this, ServiceName);
 }
 
-// -------------------------------------------------
+
 //  XServiceInfo
-// -------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CMimeContentTypeFactory::getSupportedServiceNames( )
     throw( RuntimeException )
diff --git a/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index 150668d94895..7381e3660efa 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.cxx
@@ -19,9 +19,9 @@
 
 #include "mcnttype.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -30,54 +30,54 @@ using namespace std;
 using namespace osl;
 
 
-//------------------------------------------------------------------------
+
 // constants
-//------------------------------------------------------------------------
+
 
 const char TSPECIALS[] =  "()<>@,;:\\\"/[]?=";
 const char TOKEN[] = "!#$%&'*+-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ^_`abcdefghijklmnopqrstuvwxyz{|}~.";
 const char SPACE[] = " ";
 const char SEMICOLON[] = ";";
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CMimeContentType::CMimeContentType( const OUString& aCntType )
 {
     init( aCntType );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::getMediaType( ) throw(RuntimeException)
 {
     return m_MediaType;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::getMediaSubtype( ) throw(RuntimeException)
 {
     return m_MediaSubtype;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::getFullMediaType( ) throw(RuntimeException)
 {
     return m_MediaType + "/" + m_MediaSubtype;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeException)
 {
@@ -97,9 +97,9 @@ Sequence< OUString > SAL_CALL CMimeContentType::getParameters( ) throw(RuntimeEx
     return seqParams;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(RuntimeException)
 {
@@ -107,9 +107,9 @@ sal_Bool SAL_CALL CMimeContentType::hasParameter( const OUString& aName ) throw(
     return ( m_ParameterMap.end( ) != m_ParameterMap.find( aName ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) throw(NoSuchElementException, RuntimeException)
 {
@@ -121,9 +121,9 @@ OUString SAL_CALL CMimeContentType::getParameterValue( const OUString& aName ) t
     return m_ParameterMap.find( aName )->second;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalArgumentException )
 {
@@ -136,9 +136,9 @@ void SAL_CALL CMimeContentType::init( const OUString& aCntType ) throw( IllegalA
     type();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::getSym( void )
 {
@@ -152,9 +152,9 @@ void SAL_CALL CMimeContentType::getSym( void )
     m_nxtSym = OUString( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
 {
@@ -164,9 +164,9 @@ void SAL_CALL CMimeContentType::acceptSym( const OUString& pSymTlb )
     getSym();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::skipSpaces( void )
 {
@@ -174,9 +174,9 @@ void SAL_CALL CMimeContentType::skipSpaces( void )
         getSym( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::type( void )
 {
@@ -207,9 +207,9 @@ void SAL_CALL CMimeContentType::type( void )
     subtype( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::subtype( void )
 {
@@ -237,9 +237,9 @@ void SAL_CALL CMimeContentType::subtype( void )
     trailer();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::trailer( void )
 {
@@ -282,9 +282,9 @@ void SAL_CALL CMimeContentType::trailer( void )
     }
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::pName( )
 {
@@ -305,9 +305,9 @@ OUString SAL_CALL CMimeContentType::pName( )
     return pname;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::pValue( )
 {
@@ -339,11 +339,11 @@ OUString SAL_CALL CMimeContentType::pValue( )
     return pvalue;
 }
 
-//------------------------------------------------------------------------
+
 // the following combinations within a quoted value are not allowed:
 // '";' (quote sign followed by semicolon) and '" ' (quote sign followed
 // by space)
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::quotedPValue( )
 {
@@ -375,9 +375,9 @@ OUString SAL_CALL CMimeContentType::quotedPValue( )
     return pvalue;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CMimeContentType::nonquotedPValue( )
 {
@@ -398,9 +398,9 @@ OUString SAL_CALL CMimeContentType::nonquotedPValue( )
     return pvalue;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CMimeContentType::comment( void )
 {
@@ -415,9 +415,9 @@ void SAL_CALL CMimeContentType::comment( void )
     }
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CMimeContentType::isInRange( const OUString& aChr, const OUString& aRange )
 {
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index a8e68ae48d9f..87ff14bf872d 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
 #include "mcnttfactory.hxx"
 
-//-----------------------------------------------------------------
+
 // some defines
-//-----------------------------------------------------------------
+
 
 // the service names
 #define MIMECONTENTTYPEFACTORY_SERVICE_NAME  "com.sun.star.datatransfer.MimeContentTypeFactory"
@@ -33,9 +33,9 @@
 // the implementation names
 #define MIMECONTENTTYPEFACTORY_IMPL_NAME  "com.sun.star.datatransfer.MimeCntTypeFactory"
 
-//-----------------------------------------------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::cppu                      ;
@@ -44,18 +44,18 @@ using namespace ::com::sun::star::registry  ;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer;
 
-//-----------------------------------------------------------------
+
 // create a static object to initialize the shell9x library
-//-----------------------------------------------------------------
+
 
 namespace
 {
 
-    //-----------------------------------------------------------------------------------------------------------
+
     // functions to create a new Clipboad instance; is needed by factory helper implementation
     // @param rServiceManager - service manager, useful if the component needs other uno services
     // so we should give it to every UNO-Implementation component
-    //-----------------------------------------------------------------------------------------------------------
+
 
     Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >&  )
     {
@@ -65,10 +65,10 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
 // returns a factory to create XFilePicker-Services
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index 2bc3e990b626..1c55c2b7f1a5 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.cxx
@@ -32,16 +32,16 @@
 
 #include <vector>
 
-//-------------------------------------------------------------
+
 // my defines
-//-------------------------------------------------------------
+
 
 #define TEST_CLIPBOARD
 #define RDB_SYSPATH  "d:\\projects\\src621\\dtrans\\wntmsci7\\bin\\applicat.rdb"
 
-//------------------------------------------------------------
+
 //  namesapces
-//------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::std;
@@ -51,9 +51,9 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-//----------------------------------------------------------------
+
 //
-//----------------------------------------------------------------
+
 
 void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
 {
@@ -68,9 +68,9 @@ void ShutdownServiceMgr( Reference< XMultiServiceFactory >& SrvMgr )
     SrvMgr.clear();
 }
 
-//----------------------------------------------------------------
+
 //
-//----------------------------------------------------------------
+
 
 sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData )
 {
@@ -95,9 +95,9 @@ sal_Bool readCntTypesFromFileIntoVector( char* fname, vector< string >& vecData
     return sal_True;
 }
 
-//----------------------------------------------------------------
+
 //
-//----------------------------------------------------------------
+
 
 sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& vecData, Reference< XMimeContentTypeFactory > cnttypeFactory )
 {
@@ -152,18 +152,18 @@ sal_Bool processCntTypesAndWriteResultIntoFile( char* fname, vector< string >& v
     return sal_True;
 }
 
-//----------------------------------------------------------------
+
 //  main
-//----------------------------------------------------------------
+
 
 int SAL_CALL main( int nArgc, char* argv[] )
 {
     if ( nArgc != 3 )
         printf( "Start with: testcnttype input-file output-file\n" );
 
-    //-------------------------------------------------
+
     // get the global service-manager
-    //-------------------------------------------------
+
     OUString rdbName = OUString(  RDB_SYSPATH  );
     Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
 
@@ -198,9 +198,9 @@ int SAL_CALL main( int nArgc, char* argv[] )
         ShutdownServiceMgr( g_xFactory );
     }
 
-    //--------------------------------------------------
+
     // shutdown the service manager
-    //--------------------------------------------------
+
 
     ShutdownServiceMgr( g_xFactory );
 
diff --git a/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 6d130615d61a..01955d60acd6 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.cxx
@@ -32,7 +32,7 @@ using namespace std;
 
 using ::dtrans::ClipboardManager;
 
-// ------------------------------------------------------------------------
+
 
 ClipboardManager::ClipboardManager():
     WeakComponentImplHelper3< XClipboardManager, XEventListener, XServiceInfo > (m_aMutex),
@@ -40,13 +40,13 @@ ClipboardManager::ClipboardManager():
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 ClipboardManager::~ClipboardManager()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SAL_CALL ClipboardManager::getImplementationName(  )
     throw(RuntimeException)
@@ -60,7 +60,7 @@ sal_Bool SAL_CALL ClipboardManager::supportsService( const OUString& ServiceName
     return cppu::supportsService(this, ServiceName);
 }
 
-// ------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  )
     throw(RuntimeException)
@@ -68,7 +68,7 @@ Sequence< OUString > SAL_CALL ClipboardManager::getSupportedServiceNames(  )
     return ClipboardManager_getSupportedServiceNames();
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString& aName )
     throw(NoSuchElementException, RuntimeException)
@@ -89,7 +89,7 @@ Reference< XClipboard > SAL_CALL ClipboardManager::getClipboard( const OUString&
     throw NoSuchElementException(aName, static_cast < XClipboardManager * > (this));
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xClipboard )
     throw(IllegalArgumentException, ElementExistException, RuntimeException)
@@ -129,7 +129,7 @@ void SAL_CALL ClipboardManager::addClipboard( const Reference< XClipboard >& xCl
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
      throw(RuntimeException)
@@ -139,7 +139,7 @@ void SAL_CALL ClipboardManager::removeClipboard( const OUString& aName )
         m_aClipboardMap.erase(aName.getLength() ? aName : m_aDefaultName );
 }
 
-// ------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
     throw(RuntimeException)
@@ -163,7 +163,7 @@ Sequence< OUString > SAL_CALL ClipboardManager::listClipboardNames()
     return aRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL ClipboardManager::dispose()
     throw(RuntimeException)
@@ -211,7 +211,7 @@ void SAL_CALL ClipboardManager::dispose()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
     throw(RuntimeException)
@@ -222,7 +222,7 @@ void SAL_CALL  ClipboardManager::disposing( const EventObject& event )
         removeClipboard(xClipboard->getName());
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
     const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
@@ -230,7 +230,7 @@ Reference< XInterface > SAL_CALL ClipboardManager_createInstance(
     return Reference < XInterface >( ( OWeakObject * ) new ClipboardManager());
 }
 
-// ------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ClipboardManager_getSupportedServiceNames()
 {
diff --git a/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index b79f3d98a695..1f22408555e6 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.cxx
@@ -37,13 +37,13 @@ GenericClipboard::GenericClipboard() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 GenericClipboard::~GenericClipboard()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
     throw(Exception, RuntimeException)
@@ -59,7 +59,7 @@ void SAL_CALL GenericClipboard::initialize( const Sequence< Any >& aArguments )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SAL_CALL GenericClipboard::getImplementationName(  )
     throw(RuntimeException)
@@ -73,7 +73,7 @@ sal_Bool SAL_CALL GenericClipboard::supportsService( const OUString& ServiceName
     return cppu::supportsService(this, ServiceName);
 }
 
-// ------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(    )
     throw(RuntimeException)
@@ -81,7 +81,7 @@ Sequence< OUString > SAL_CALL GenericClipboard::getSupportedServiceNames(    )
     return GenericClipboard_getSupportedServiceNames();
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
     throw(RuntimeException)
@@ -90,7 +90,7 @@ Reference< XTransferable > SAL_CALL GenericClipboard::getContents()
     return m_aContents;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xTrans,
                                       const Reference< XClipboardOwner >& xClipboardOwner )
@@ -128,7 +128,7 @@ void SAL_CALL GenericClipboard::setContents(const Reference< XTransferable >& xT
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SAL_CALL GenericClipboard::getName()
     throw(RuntimeException)
@@ -136,7 +136,7 @@ OUString SAL_CALL GenericClipboard::getName()
     return m_aName;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities()
     throw(RuntimeException)
@@ -145,7 +145,7 @@ sal_Int8 SAL_CALL GenericClipboard::getRenderingCapabilities()
 }
 
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
     throw(RuntimeException)
@@ -157,7 +157,7 @@ void SAL_CALL GenericClipboard::addClipboardListener( const Reference< XClipboar
         rBHelper.aLC.addInterface( getCppuType( (const ::com::sun::star::uno::Reference< XClipboardListener > *) 0), listener );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
     throw(RuntimeException)
@@ -168,7 +168,7 @@ void SAL_CALL GenericClipboard::removeClipboardListener( const Reference< XClipb
         rBHelper.aLC.removeInterface( getCppuType( (const Reference< XClipboardListener > *) 0 ), listener ); \
 }
 
-// ------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
 {
@@ -177,7 +177,7 @@ Sequence< OUString > SAL_CALL GenericClipboard_getSupportedServiceNames()
     return aRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL GenericClipboard_createInstance(
     const Reference< XMultiServiceFactory > & /*xMultiServiceFactory*/)
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 7ba4de90e328..11ac2174915b 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -34,9 +34,9 @@
 #include <stdio.h>
 #include <string.h>
 
-//------------------------------------------------------------------------
+
 // my defines
-//------------------------------------------------------------------------
+
 
 #ifdef UNX
 #define PATH_SEPARATOR '/'
@@ -49,9 +49,9 @@
 #define PERFORM( a, b ) fprintf( stderr, "Performing " a); b; fprintf( stderr, "done\n" )
 #define TRACE( a ) fprintf( stderr, a )
 
-//------------------------------------------------------------------------
+
 //  namespaces
-//------------------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::std;
@@ -63,15 +63,15 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 
-//------------------------------------------------------------------------
+
 //  globals
-//------------------------------------------------------------------------
+
 
 const char * app = NULL;
 
-//------------------------------------------------------------------------
+
 //  ClipboardOwner
-//------------------------------------------------------------------------
+
 
 class ClipboardOwner : public WeakImplHelper1< XClipboardOwner >
 {
@@ -83,9 +83,9 @@ class ClipboardOwner : public WeakImplHelper1< XClipboardOwner >
 public:
     ClipboardOwner();
 
-    //--------------------------------------------------------------------
+
     // XClipboardOwner
-    //--------------------------------------------------------------------
+
 
     virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
 
@@ -94,18 +94,18 @@ public:
     Reference< XTransferable > lostOwnershipTransferableValue() { return m_xTransferable; };
 };
 
-//------------------------------------------------------------------------
+
 //  ctor
-//------------------------------------------------------------------------
+
 
 ClipboardOwner::ClipboardOwner():
     m_nReceivedLostOwnerships( 0 )
 {
 }
 
-//------------------------------------------------------------------------
+
 //  lostOwnership
-//------------------------------------------------------------------------
+
 
 void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
     throw(RuntimeException)
@@ -115,9 +115,9 @@ void SAL_CALL ClipboardOwner::lostOwnership( const Reference< XClipboard >& xCli
     m_xTransferable = xTrans;
 }
 
-//------------------------------------------------------------------------
+
 //  ClipboardListener
-//------------------------------------------------------------------------
+
 
 class ClipboardListener : public WeakImplHelper1< XClipboardListener >
 {
@@ -129,15 +129,15 @@ class ClipboardListener : public WeakImplHelper1< XClipboardListener >
 public:
     ClipboardListener();
 
-    //--------------------------------------------------------------------
+
     // XClipboardOwner
-    //--------------------------------------------------------------------
+
 
     virtual void SAL_CALL changedContents( const ClipboardEvent& event ) throw(RuntimeException);
 
-    //--------------------------------------------------------------------
+
     // XEventListener
-    //--------------------------------------------------------------------
+
 
     virtual void SAL_CALL disposing( const EventObject& event ) throw(RuntimeException);
 
@@ -146,18 +146,18 @@ public:
     Reference< XTransferable > changedContentsEventTransferableValue() { return m_xTransferable; };
 };
 
-//------------------------------------------------------------------------
+
 //  ctor
-//------------------------------------------------------------------------
+
 
 ClipboardListener::ClipboardListener():
     m_nReceivedChangedContentsEvents( 0 )
 {
 }
 
-//------------------------------------------------------------------------
+
 //  changedContents
-//------------------------------------------------------------------------
+
 
 void SAL_CALL ClipboardListener::changedContents( const ClipboardEvent& event )
     throw(RuntimeException)
@@ -167,35 +167,35 @@ void SAL_CALL ClipboardListener::changedContents( const ClipboardEvent& event )
     m_xTransferable = event.Contents;
 }
 
-//------------------------------------------------------------------------
+
 //  disposing
-//------------------------------------------------------------------------
+
 
 void SAL_CALL ClipboardListener::disposing( const EventObject& event )
     throw(RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------
+
 //  StringTransferable
-//------------------------------------------------------------------------
+
 
 class StringTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
 {
 public:
     StringTransferable( );
 
-    //--------------------------------------------------------------------
+
     // XTransferable
-    //--------------------------------------------------------------------
+
 
     virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
     virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors(  ) throw(RuntimeException);
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
 
-    //--------------------------------------------------------------------
+
     // XClipboardOwner
-    //--------------------------------------------------------------------
+
 
     virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
 
@@ -208,9 +208,9 @@ private:
     sal_Bool               m_receivedLostOwnership;
 };
 
-//------------------------------------------------------------------------
+
 //  ctor
-//------------------------------------------------------------------------
+
 
 StringTransferable::StringTransferable( ) :
     m_seqDFlv( 1 ),
@@ -233,9 +233,9 @@ StringTransferable::StringTransferable( ) :
     m_seqDFlv[0] = df;
 }
 
-//------------------------------------------------------------------------
+
 //  getTransferData
-//------------------------------------------------------------------------
+
 
 Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
     throw(UnsupportedFlavorException, IOException, RuntimeException)
@@ -250,9 +250,9 @@ Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
     return anyData;
 }
 
-//------------------------------------------------------------------------
+
 //  getTransferDataFlavors
-//------------------------------------------------------------------------
+
 
 Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
     throw(RuntimeException)
@@ -260,9 +260,9 @@ Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
     return m_seqDFlv;
 }
 
-//------------------------------------------------------------------------
+
 //  isDataFlavorSupported
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
     throw(RuntimeException)
@@ -282,9 +282,9 @@ sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& a
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 //  lostOwnership
-//------------------------------------------------------------------------
+
 
 void SAL_CALL StringTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
     throw(RuntimeException)
@@ -292,17 +292,17 @@ void SAL_CALL StringTransferable::lostOwnership( const Reference< XClipboard >&
     m_receivedLostOwnership = sal_True;
 }
 
-//------------------------------------------------------------------------
+
 //  main
-//------------------------------------------------------------------------
+
 
 int SAL_CALL main( int argc, const char* argv[] )
 {
     OUString aRegistry;
 
-    //------------------------------------------------------------------
+
     // check command line parameters
-    //------------------------------------------------------------------
+
 
     if ( NULL == ( app = strrchr( argv[0], PATH_SEPARATOR ) ) )
         app = argv[0];
@@ -323,9 +323,9 @@ int SAL_CALL main( int argc, const char* argv[] )
     if( aRegistry.isEmpty( ) )
         fprintf( stderr, "Usage: %s -r full-path-to-applicat.rdb\n", app );
 
-    //------------------------------------------------------------------
+
     // create service manager
-    //------------------------------------------------------------------
+
     Reference< XMultiServiceFactory > xServiceManager;
 
     try
@@ -333,9 +333,9 @@ int SAL_CALL main( int argc, const char* argv[] )
         xServiceManager = createRegistryServiceFactory( aRegistry, sal_True );
         ENSURE( xServiceManager.is(), "*** ERROR *** service manager could not be created." );
 
-        //--------------------------------------------------------------
+
         // create an instance of GenericClipboard service
-        //--------------------------------------------------------------
+
 
         Sequence< Any > arguments(1);
         arguments[0] = makeAny( OUString("generic") );
@@ -353,9 +353,9 @@ int SAL_CALL main( int argc, const char* argv[] )
         if( xClipboardNotifier.is() )
             xClipboardNotifier->addClipboardListener( xClipboardListener );
 
-        //--------------------------------------------------------------
+
         // run various tests on clipboard implementation
-        //--------------------------------------------------------------
+
 
         TRACE( "\n*** testing generic clipboard service ***\n" );
 
@@ -416,18 +416,18 @@ int SAL_CALL main( int argc, const char* argv[] )
             TEST( "if received changedContents notification for correct transferable: ", ! pListener->changedContentsEventTransferableValue().is() );
         }
 
-        //--------------------------------------------------------------
+
         // create an instance of ClipboardManager service
-        //--------------------------------------------------------------
+
 
         Reference< XClipboardManager > xClipboardManager( xServiceManager->createInstance(
             OUString("com.sun.star.datatransfer.clipboard.ClipboardManager") ), UNO_QUERY );
 
         ENSURE( xClipboardManager.is(), "*** ERROR *** clipboard manager service could not be created." );
 
-        //--------------------------------------------------------------
+
         // run various tests on clipboard manager implementation
-        //--------------------------------------------------------------
+
 
         TRACE( "\n*** testing clipboard manager service ***\n" );
 
@@ -455,9 +455,9 @@ int SAL_CALL main( int argc, const char* argv[] )
         ENSURE( sal_False, "*** ERROR *** exception caught." );
     }
 
-    //--------------------------------------------------------------------
+
     // shutdown the service manager
-    //--------------------------------------------------------------------
+
 
     // query XComponent interface
     Reference< XComponent > xComponent( xServiceManager, UNO_QUERY );
diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx
index 365e8696b7a4..59c9a8b8e0f1 100644
--- a/dtrans/source/win32/clipb/MtaOleClipb.cxx
+++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx
@@ -52,9 +52,9 @@
 #define __uuidof(I) IID_##I
 #endif
 
-//----------------------------------------------------------------
+
 //  namespace directives
-//----------------------------------------------------------------
+
 
 using osl::Condition;
 using osl::Mutex;
@@ -66,9 +66,9 @@ namespace /* private */
     char CLIPSRV_DLL_NAME[] = "sysdtrans.dll";
     char g_szWndClsName[]   = "MtaOleReqWnd###";
 
-    //--------------------------------------------------------
+
     // messages constants
-    //--------------------------------------------------------
+
 
     const sal_uInt32 MSG_SETCLIPBOARD               = WM_USER + 0x0001;
     const sal_uInt32 MSG_GETCLIPBOARD               = WM_USER + 0x0002;
@@ -84,7 +84,7 @@ namespace /* private */
     const sal_Bool AUTO_RESET                       = sal_False;
     const sal_Bool INIT_NONSIGNALED                 = sal_False;
 
-    //------------------------------------------------------
+
     /*  Cannot use osl conditions because they are blocking
         without waking up on messages sent by another thread
         this leads to deadlocks because we are blocking the
@@ -155,9 +155,9 @@ namespace /* private */
             Win32Condition& operator=(const Win32Condition&);
     };
 
-    //------------------------------------------
+
     // we use one condition for every request
-    //------------------------------------------
+
 
     struct MsgCtx
     {
@@ -167,15 +167,15 @@ namespace /* private */
 
 } /* namespace private */
 
-//----------------------------------------------------------------
+
 //  static member initialization
-//----------------------------------------------------------------
+
 
 CMtaOleClipboard* CMtaOleClipboard::s_theMtaOleClipboardInst = NULL;
 
-//--------------------------------------------------------------------
+
 // marshal an IDataObject
-//--------------------------------------------------------------------
+
 
 //inline
 HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject, LPSTREAM* ppStream )
@@ -191,9 +191,9 @@ HRESULT MarshalIDataObjectInStream( IDataObject* pIDataObject, LPSTREAM* ppStrea
         );
 }
 
-//--------------------------------------------------------------------
+
 // unmarshal an IDataObject
-//--------------------------------------------------------------------
+
 
 //inline
 HRESULT UnmarshalIDataObjectAndReleaseStream( LPSTREAM lpStream, IDataObject** ppIDataObject )
@@ -208,9 +208,9 @@ HRESULT UnmarshalIDataObjectAndReleaseStream( LPSTREAM lpStream, IDataObject** p
         reinterpret_cast<LPVOID*>(ppIDataObject));
 }
 
-//--------------------------------------------------------------------
+
 // helper class to ensure that the calling thread has com initialized
-//--------------------------------------------------------------------
+
 
 class CAutoComInit
 {
@@ -255,9 +255,9 @@ private:
     HRESULT m_hResult;
 };
 
-//--------------------------------------------------------------------
+
 // ctor
-//--------------------------------------------------------------------
+
 
 CMtaOleClipboard::CMtaOleClipboard( ) :
     m_hOleThread( NULL ),
@@ -283,9 +283,9 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
         NULL, 0, CMtaOleClipboard::oleThreadProc, this, 0, &m_uOleThreadId );
     OSL_ASSERT( NULL != m_hOleThread );
 
-    //----------------------------------------------
+
     // setup the clipboard changed notifier thread
-    //----------------------------------------------
+
 
     m_hClipboardChangedNotifierEvents[0] = CreateEventA( 0, MANUAL_RESET, INIT_NONSIGNALED, NULL );
     OSL_ASSERT( NULL != m_hClipboardChangedNotifierEvents[0] );
@@ -300,9 +300,9 @@ CMtaOleClipboard::CMtaOleClipboard( ) :
     OSL_ASSERT( NULL != m_hClipboardChangedNotifierThread );
 }
 
-//--------------------------------------------------------------------
+
 // dtor
-//--------------------------------------------------------------------
+
 
 CMtaOleClipboard::~CMtaOleClipboard( )
 {
@@ -355,9 +355,9 @@ CMtaOleClipboard::~CMtaOleClipboard( )
 }
 
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 HRESULT CMtaOleClipboard::flushClipboard( )
 {
@@ -381,9 +381,9 @@ HRESULT CMtaOleClipboard::flushClipboard( )
     return aMsgCtx.hr;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
 {
@@ -421,10 +421,10 @@ HRESULT CMtaOleClipboard::getClipboard( IDataObject** ppIDataObject )
     return hr;
 }
 
-//--------------------------------------------------------------------
+
 // this is an asynchronous method that's why we don't wait until the
 // request is completed
-//--------------------------------------------------------------------
+
 
 HRESULT CMtaOleClipboard::setClipboard( IDataObject* pIDataObject )
 {
@@ -460,9 +460,9 @@ HRESULT CMtaOleClipboard::setClipboard( IDataObject* pIDataObject )
     return S_OK;
 }
 
-//--------------------------------------------------------------------
+
 // register a clipboard viewer
-//--------------------------------------------------------------------
+
 
 bool CMtaOleClipboard::registerClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback )
 {
@@ -487,9 +487,9 @@ bool CMtaOleClipboard::registerClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipV
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 // register a clipboard viewer
-//--------------------------------------------------------------------
+
 
 bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback )
 {
@@ -528,18 +528,18 @@ bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncCli
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 LRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject )
 {
     return static_cast<LRESULT>( OleSetClipboard( pIDataObject ) );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
 {
@@ -557,18 +557,18 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
     return static_cast<LRESULT>(hr);
 }
 
-//--------------------------------------------------------------------
+
 // flush the ole-clipboard
-//--------------------------------------------------------------------
+
 
 LRESULT CMtaOleClipboard::onFlushClipboard( )
 {
     return static_cast<LRESULT>( OleFlushClipboard( ) );
 }
 
-//--------------------------------------------------------------------
+
 // handle clipboard chain change event
-//--------------------------------------------------------------------
+
 
 LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
 {
@@ -591,9 +591,9 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext )
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 // handle draw clipboard event
-//--------------------------------------------------------------------
+
 
 LRESULT CMtaOleClipboard::onDrawClipboard( )
 {
@@ -626,20 +626,20 @@ LRESULT CMtaOleClipboard::onDrawClipboard( )
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 // SendMessage so we don't need to supply the HWND if we send
 // something to our wrapped window
-//--------------------------------------------------------------------
+
 
 LRESULT CMtaOleClipboard::sendMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 {
     return ::SendMessageA( m_hwndMtaOleReqWnd, msg, wParam, lParam );
 }
 
-//--------------------------------------------------------------------
+
 // PostMessage so we don't need to supply the HWND if we send
 // something to our wrapped window
-//--------------------------------------------------------------------
+
 
 bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 {
@@ -647,9 +647,9 @@ bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam )
 }
 
 
-//--------------------------------------------------------------------
+
 // the window proc
-//--------------------------------------------------------------------
+
 
 LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
@@ -734,9 +734,9 @@ LRESULT CALLBACK CMtaOleClipboard::mtaOleReqWndProc( HWND hWnd, UINT uMsg, WPARA
     return lResult;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void CMtaOleClipboard::createMtaOleReqWnd( )
 {
@@ -767,9 +767,9 @@ void CMtaOleClipboard::createMtaOleReqWnd( )
             g_szWndClsName, NULL, 0, 0, 0, 0, 0, NULL, NULL, hInst, NULL );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 unsigned int CMtaOleClipboard::run( )
 {
@@ -803,9 +803,9 @@ unsigned int CMtaOleClipboard::run( )
     return nRet;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
 {
@@ -816,9 +816,9 @@ unsigned int WINAPI CMtaOleClipboard::oleThreadProc( LPVOID pParam )
     return pInst->run( );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID pParam )
 {
@@ -860,9 +860,9 @@ unsigned int WINAPI CMtaOleClipboard::clipboardChangedNotifierThreadProc( LPVOID
     return ( 0 );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 bool CMtaOleClipboard::WaitForThreadReady( ) const
 {
diff --git a/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index f10b3e5e66af..441338925848 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.cxx
@@ -37,9 +37,9 @@
 #pragma warning(pop)
 #endif
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace osl;
 using namespace std;
@@ -55,9 +55,9 @@ using namespace com::sun::star::datatransfer::clipboard::RenderingCapabilities;
 CWinClipbImpl* CWinClipbImpl::s_pCWinClipbImpl = NULL;
 osl::Mutex     CWinClipbImpl::s_aMutex;
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CWinClipbImpl::CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* theWinClipboard ) :
     m_itsName( aClipboardName ),
@@ -72,9 +72,9 @@ CWinClipbImpl::CWinClipbImpl( const OUString& aClipboardName, CWinClipboard* the
     registerClipboardViewer( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CWinClipbImpl::~CWinClipbImpl( )
 {
@@ -85,9 +85,9 @@ CWinClipbImpl::~CWinClipbImpl( )
     unregisterClipboardViewer( );
 }
 
-//------------------------------------------------------------------------
+
 // getContent
-//------------------------------------------------------------------------
+
 
 Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( RuntimeException )
 {
@@ -125,9 +125,9 @@ Reference< XTransferable > SAL_CALL CWinClipbImpl::getContents( ) throw( Runtime
     return rClipContent;
 }
 
-//------------------------------------------------------------------------
+
 // setContent
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipbImpl::setContents(
     const Reference< XTransferable >& xTransferable,
@@ -155,27 +155,27 @@ void SAL_CALL CWinClipbImpl::setContents(
     m_MtaOleClipboard.setClipboard(pIDataObj.get());
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CWinClipbImpl::getName(  ) throw( RuntimeException )
 {
     return m_itsName;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL CWinClipbImpl::getRenderingCapabilities(  ) throw( RuntimeException )
 {
     return ( Delayed | Persistant );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
 {
@@ -193,36 +193,36 @@ void SAL_CALL CWinClipbImpl::flushClipboard( ) throw( RuntimeException )
         m_MtaOleClipboard.flushClipboard( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipbImpl::registerClipboardViewer( )
 {
     m_MtaOleClipboard.registerClipViewer( CWinClipbImpl::onClipboardContentChanged );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipbImpl::unregisterClipboardViewer( )
 {
     m_MtaOleClipboard.registerClipViewer( NULL );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipbImpl::dispose() throw( RuntimeException )
 {
     OSL_ENSURE( !m_pCurrentClipContent, "Clipboard was not flushed before shutdown!" );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void WINAPI CWinClipbImpl::onClipboardContentChanged( void )
 {
@@ -233,9 +233,9 @@ void WINAPI CWinClipbImpl::onClipboardContentChanged( void )
         s_pCWinClipbImpl->m_pWinClipboard->notifyAllClipboardListener( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipbImpl::onReleaseDataObject( CXNotifyingDataObject* theCaller )
 {
diff --git a/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 59bc8be8ccf6..66b3f582eaf2 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.cxx
@@ -25,9 +25,9 @@
 #include <cppuhelper/supportsservice.hxx>
 #include "WinClipbImpl.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace osl;
 using namespace std;
@@ -41,9 +41,9 @@ using namespace com::sun::star::lang;
 
 #define WINCLIPBOARD_IMPL_NAME  "com.sun.star.datatransfer.clipboard.ClipboardW32"
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -55,9 +55,9 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 /*XEventListener,*/
 CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, const OUString& aClipboardName ) :
     WeakComponentImplHelper3< XSystemClipboard, XFlushableClipboard, XServiceInfo >( m_aCbListenerMutex ),
@@ -70,14 +70,14 @@ CWinClipboard::CWinClipboard( const Reference< XComponentContext >& rxContext, c
 // XClipboard
 //========================================================================
 
-//------------------------------------------------------------------------
+
 // getContent
 // to avoid unecessary traffic we check first if there is a clipboard
 // content which was set via setContent, in this case we don't need
 // to query the content from the clipboard, create a new wrapper object
 // and so on, we simply return the orignial XTransferable instead of our
 // DOTransferable
-//------------------------------------------------------------------------
+
 
 Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( RuntimeException )
 {
@@ -93,9 +93,9 @@ Reference< XTransferable > SAL_CALL CWinClipboard::getContents( ) throw( Runtime
     return Reference< XTransferable >( );
 }
 
-//------------------------------------------------------------------------
+
 // setContent
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTransferable,
                                           const Reference< XClipboardOwner >& xClipboardOwner )
@@ -111,9 +111,9 @@ void SAL_CALL CWinClipboard::setContents( const Reference< XTransferable >& xTra
         m_pImpl->setContents( xTransferable, xClipboardOwner );
 }
 
-//------------------------------------------------------------------------
+
 // getName
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CWinClipboard::getName(  ) throw( RuntimeException )
 {
@@ -163,9 +163,9 @@ sal_Int8 SAL_CALL CWinClipboard::getRenderingCapabilities(  ) throw( RuntimeExce
 // XClipboardNotifier
 //========================================================================
 
-//------------------------------------------------------------------------
+
 // getName
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
     throw( RuntimeException )
@@ -183,9 +183,9 @@ void SAL_CALL CWinClipboard::addClipboardListener( const Reference< XClipboardLi
     rBHelper.aLC.addInterface( getCppuType( &listener ), listener );
 }
 
-//------------------------------------------------------------------------
+
 // getName
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
     throw( RuntimeException )
@@ -203,9 +203,9 @@ void SAL_CALL CWinClipboard::removeClipboardListener( const Reference< XClipboar
     rBHelper.aLC.removeInterface( getCppuType( &listener ), listener );
 }
 
-//------------------------------------------------------------------------
+
 // getName
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
 {
@@ -254,10 +254,10 @@ void SAL_CALL CWinClipboard::notifyAllClipboardListener( )
     } // end if
 }
 
-//------------------------------------------------
+
 // overwritten base class method which will be
 // called by the base class dispose method
-//------------------------------------------------
+
 
 void SAL_CALL CWinClipboard::disposing()
 {
@@ -268,9 +268,9 @@ void SAL_CALL CWinClipboard::disposing()
     m_pImpl.reset();
 }
 
-// -------------------------------------------------
+
 // XServiceInfo
-// -------------------------------------------------
+
 
 OUString SAL_CALL CWinClipboard::getImplementationName(  )
     throw(RuntimeException)
@@ -285,9 +285,9 @@ sal_Bool SAL_CALL CWinClipboard::supportsService( const OUString& ServiceName )
     return cppu::supportsService(this, ServiceName);
 }
 
-// -------------------------------------------------
+
 //  XServiceInfo
-// -------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CWinClipboard::getSupportedServiceNames(   )
     throw(RuntimeException)
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index e13a109a220b..8ca8563008b6 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.cxx
@@ -23,9 +23,9 @@
 #include <osl/diagnose.h>
 #include "WinClipboard.hxx"
 
-//-----------------------------------------------------------------
+
 // some defines
-//-----------------------------------------------------------------
+
 
 // the service names
 #define WINCLIPBOARD_SERVICE_NAME  "com.sun.star.datatransfer.clipboard.SystemClipboard"
@@ -33,9 +33,9 @@
 // the implementation names
 #define WINCLIPBOARD_IMPL_NAME  "com.sun.star.datatransfer.clipboard.ClipboardW32"
 
-//-----------------------------------------------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::com::sun::star::uno       ;
@@ -44,18 +44,18 @@ using namespace ::cppu                      ;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer::clipboard;
 
-//-----------------------------------------------------------------
+
 // create a static object to initialize the shell9x library
-//-----------------------------------------------------------------
+
 
 namespace
 {
 
-    //-----------------------------------------------------------------------------------------------------------
+
     // functions to create a new Clipboad instance; is needed by factory helper implementation
     // @param rServiceManager - service manager, useful if the component needs other uno services
     // so we should give it to every UNO-Implementation component
-    //-----------------------------------------------------------------------------------------------------------
+
 
     Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
     {
@@ -65,10 +65,10 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
 // returns a factory to create XFilePicker-Services
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL sysdtrans_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index bdc0b05a51b2..036ae9686124 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.cxx
@@ -624,5 +624,4 @@ inline sal_Int8 DropTarget::getFilteredActions( DWORD grfKeyState, DWORD dwEffec
     return actions &  m_nDefaultActions;
 }
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index eefa2fe17cb8..9428b52a47e5 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -31,9 +31,9 @@
 #define FREE_HGLOB_ON_RELEASE   TRUE
 #define KEEP_HGLOB_ON_RELEASE   FALSE
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CAPNDataObject::CAPNDataObject( IDataObjectPtr rIDataObject ) :
     m_rIDataObjectOrg( rIDataObject ),
@@ -106,9 +106,9 @@ CAPNDataObject::~CAPNDataObject( )
     }
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -130,18 +130,18 @@ STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CAPNDataObject::AddRef( )
 {
     return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) );
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->Release
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
 {
@@ -155,9 +155,9 @@ STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
     return nRefCnt;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
 {
@@ -174,9 +174,9 @@ STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
 {
@@ -193,9 +193,9 @@ STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC**
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->QueryGetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
 {
@@ -212,9 +212,9 @@ STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetDataHere
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
 {
@@ -231,9 +231,9 @@ STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pm
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetCanonicalFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut)
 {
@@ -250,9 +250,9 @@ STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPF
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->SetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease )
 {
@@ -269,9 +269,9 @@ STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD * pdwConnection )
 {
@@ -288,9 +288,9 @@ STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVI
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DUnadvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection )
 {
@@ -307,9 +307,9 @@ STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumDAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
 {
@@ -326,18 +326,18 @@ STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // for our convenience
-//------------------------------------------------------------------------
+
 
 CAPNDataObject::operator IDataObject*( )
 {
     return static_cast< IDataObject* >( this );
 }
 
-//------------------------------------------------------------------------
+
 // helper function
-//------------------------------------------------------------------------
+
 
 HRESULT CAPNDataObject::MarshalIDataObjectIntoCurrentApartment( IDataObject** ppIDataObj )
 {
diff --git a/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index ff1e8bb1fceb..56c5dde01ca0 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.cxx
@@ -31,9 +31,9 @@
 #include <com/sun/star/datatransfer/MimeContentTypeFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace std;
 using namespace osl;
@@ -45,9 +45,9 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -65,9 +65,9 @@ namespace
 } // end namespace
 
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CDOTransferable::CDOTransferable(
     const Reference< XComponentContext >& rxContext, IDataObjectPtr rDataObject ) :
@@ -79,9 +79,9 @@ CDOTransferable::CDOTransferable(
 {
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
         throw( UnsupportedFlavorException, IOException, RuntimeException )
@@ -90,16 +90,16 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
 
     MutexGuard aGuard( m_aMutex );
 
-    //------------------------------------------------
+
     // convert dataflavor to formatetc
-    //------------------------------------------------
+
 
     CFormatEtc fetc = m_DataFormatTranslator.getFormatEtcFromDataFlavor( aFlavor );
     OSL_ASSERT( CF_INVALID != fetc.getClipformat() );
 
-    //------------------------------------------------
+
     //  get the data from clipboard in a byte stream
-    //------------------------------------------------
+
 
     ByteSequence_t clipDataStream;
 
@@ -137,16 +137,16 @@ Any SAL_CALL CDOTransferable::getTransferData( const DataFlavor& aFlavor )
             throw; // pass through exception
     }
 
-    //------------------------------------------------
+
     // return the data as any
-    //------------------------------------------------
+
 
     return byteStreamToAny( clipDataStream, aFlavor.DataType );
 }
 
-//------------------------------------------------------------------------
+
 // getTransferDataFlavors
-//------------------------------------------------------------------------
+
 
 Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors(  )
     throw( RuntimeException )
@@ -154,11 +154,11 @@ Sequence< DataFlavor > SAL_CALL CDOTransferable::getTransferDataFlavors(  )
     return m_FlavorList;
 }
 
-//------------------------------------------------------------------------
+
 // isDataFlavorSupported
 // returns true if we find a DataFlavor with the same MimeType and
 // DataType
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
     throw( RuntimeException )
@@ -172,7 +172,7 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 // helper function
 // the list of datafalvors currently on the clipboard will be initialized
 // only once; if the client of this Transferable will hold a reference
@@ -182,7 +182,7 @@ sal_Bool SAL_CALL CDOTransferable::isDataFlavorSupported( const DataFlavor& aFla
 // an synthesize this format on the fly if requested, to accomplish this
 // we save the first offered text format which we will later use for the
 // conversion
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CDOTransferable::initFlavorList( )
 {
@@ -231,9 +231,9 @@ void SAL_CALL CDOTransferable::initFlavorList( )
     }
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor )
@@ -248,9 +248,9 @@ void SAL_CALL CDOTransferable::addSupportedFlavor( const DataFlavor& aFlavor )
     }
 }
 
-//------------------------------------------------------------------------
+
 // helper function
-//------------------------------------------------------------------------
+
 
 //inline
 DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFormatEtc )
@@ -268,10 +268,10 @@ DataFlavor SAL_CALL CDOTransferable::formatEtcToDataFlavor( const FORMATETC& aFo
     return m_DataFormatTranslator.getDataFlavorFromFormatEtc( aFormatEtc, lcid );
 }
 
-//------------------------------------------------------------------------
+
 // returns the current locale on clipboard; if there is no locale on
 // clipboard the function returns the current thread locale
-//------------------------------------------------------------------------
+
 
 LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( )
 {
@@ -297,11 +297,11 @@ LCID SAL_CALL CDOTransferable::getLocaleFromClipboard( )
     return lcid;
 }
 
-//------------------------------------------------------------------------
+
 // i think it's not necessary to call ReleaseStgMedium
 // in case of failures because nothing should have been
 // allocated etc.
-//------------------------------------------------------------------------
+
 
 CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFormatEtc& aFormatEtc )
 {
@@ -377,9 +377,9 @@ CDOTransferable::ByteSequence_t SAL_CALL CDOTransferable::getClipboardData( CFor
     return byteStream;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( )
 {
@@ -422,9 +422,9 @@ OUString SAL_CALL CDOTransferable::synthesizeUnicodeText( )
     return OUString(pWChar);
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium, ByteSequence_t& aByteSequence )
 {
@@ -458,9 +458,9 @@ void CDOTransferable::clipDataToByteStream( CLIPFORMAT cf, STGMEDIUM stgmedium,
     memTransferHelper.read( aByteSequence.getArray( ), nMemSize );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 Any CDOTransferable::byteStreamToAny( ByteSequence_t& aByteStream, const Type& aRequestedDataType )
@@ -478,9 +478,9 @@ Any CDOTransferable::byteStreamToAny( ByteSequence_t& aByteStream, const Type& a
     return aAny;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
@@ -498,9 +498,9 @@ OUString CDOTransferable::byteStreamToOUString( ByteSequence_t& aByteStream )
     return OUString( reinterpret_cast< sal_Unicode* >( aByteStream.getArray( ) ), nWChars );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
     const DataFlavor& lhs, const DataFlavor& rhs )
@@ -531,9 +531,9 @@ sal_Bool SAL_CALL CDOTransferable::compareDataFlavors(
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDOTransferable::cmpFullMediaType(
     const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs ) const
@@ -541,9 +541,9 @@ sal_Bool SAL_CALL CDOTransferable::cmpFullMediaType(
     return xLhs->getFullMediaType().equalsIgnoreAsciiCase( xRhs->getFullMediaType( ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDOTransferable::cmpAllContentTypeParameter(
     const Reference< XMimeContentType >& xLhs, const Reference< XMimeContentType >& xRhs ) const
diff --git a/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx
index ee7352c83f0f..6f7094351cdd 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.cxx
@@ -21,9 +21,9 @@
 #include <osl/diagnose.h>
 #include "DTransHelper.hxx"
 
-//------------------------------------------------------------------------
+
 // implementation
-//------------------------------------------------------------------------
+
 
 CStgTransferHelper::CStgTransferHelper( sal_Bool bAutoInit,
                                         HGLOBAL hGlob,
@@ -35,9 +35,9 @@ CStgTransferHelper::CStgTransferHelper( sal_Bool bAutoInit,
         init( hGlob, m_bDelStgOnRelease );
 }
 
-//------------------------------------------------------------------------
+
 // dtor
-//------------------------------------------------------------------------
+
 
 
 CStgTransferHelper::~CStgTransferHelper( )
@@ -46,9 +46,9 @@ CStgTransferHelper::~CStgTransferHelper( )
         m_lpStream->Release( );
 }
 
-//------------------------------------------------------------------------
+
 // TransferData into the
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cbWritten )
 {
@@ -71,9 +71,9 @@ void SAL_CALL CStgTransferHelper::write( const void* lpData, ULONG cb, ULONG* cb
 #endif
 }
 
-//------------------------------------------------------------------------
+
 // read
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead )
 {
@@ -86,9 +86,9 @@ void SAL_CALL CStgTransferHelper::read( LPVOID pv, ULONG cb, ULONG* pcbRead )
         throw CStgTransferException( hr );
 }
 
-//------------------------------------------------------------------------
+
 // GetHGlobal
-//------------------------------------------------------------------------
+
 
 HGLOBAL SAL_CALL CStgTransferHelper::getHGlobal( ) const
 {
@@ -106,9 +106,9 @@ HGLOBAL SAL_CALL CStgTransferHelper::getHGlobal( ) const
     return hGlob;
 }
 
-//------------------------------------------------------------------------
+
 // getIStream
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CStgTransferHelper::getIStream( LPSTREAM* ppStream )
 {
@@ -118,9 +118,9 @@ void SAL_CALL CStgTransferHelper::getIStream( LPSTREAM* ppStream )
         static_cast< LPUNKNOWN >( *ppStream )->AddRef( );
 }
 
-//------------------------------------------------------------------------
+
 // Init
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CStgTransferHelper::init( SIZE_T newSize,
                                         sal_uInt32 uiFlags,
@@ -149,9 +149,9 @@ void SAL_CALL CStgTransferHelper::init( SIZE_T newSize,
 #endif
 }
 
-//------------------------------------------------------------------------
+
 // Init
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CStgTransferHelper::init( HGLOBAL hGlob,
                                          sal_Bool bDelStgOnRelease )
@@ -165,9 +165,9 @@ void SAL_CALL CStgTransferHelper::init( HGLOBAL hGlob,
         throw CStgTransferException( hr );
 }
 
-//------------------------------------------------------------------------
+
 // free the global memory and invalidate the stream pointer
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CStgTransferHelper::cleanup( )
 {
@@ -185,9 +185,9 @@ void SAL_CALL CStgTransferHelper::cleanup( )
     }
 }
 
-//------------------------------------------------------------------------
+
 // return the size of memory we point to
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CStgTransferHelper::memSize( CLIPFORMAT cf ) const
 {
diff --git a/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 058ab5dc0f1b..90fa35d471aa 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
@@ -41,9 +41,9 @@
 #endif
 
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace std;
 using namespace com::sun::star::uno;
@@ -63,18 +63,18 @@ const OUString HPNAME_OEM_ANSI_TEXT ("OEM/ANSI Text");
 const OUString HTML_FORMAT_NAME_WINDOWS ("HTML Format");
 const OUString HTML_FORMAT_NAME_SOFFICE ("HTML (HyperText Markup Language)");
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CDataFormatTranslator::CDataFormatTranslator( const Reference< XComponentContext >& rxContext )
 {
     m_XDataFormatTranslator = DataFormatTranslator::create( rxContext );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor& aDataFlavor ) const
 {
@@ -116,9 +116,9 @@ CFormatEtc CDataFormatTranslator::getFormatEtcFromDataFlavor( const DataFlavor&
     return sal::static_int_cast<CFormatEtc>(getFormatEtcForClipformat( sal::static_int_cast<CLIPFORMAT>(cf) ));
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& aFormatEtc, LCID lcid ) const
 {
@@ -173,9 +173,9 @@ DataFlavor CDataFormatTranslator::getDataFlavorFromFormatEtc( const FORMATETC& a
     return aFlavor;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const OUString& aClipFmtName ) const
 {
@@ -187,9 +187,9 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformatName( const
     return getFormatEtcForClipformat( cf );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat ) const
 {
@@ -201,9 +201,9 @@ OUString CDataFormatTranslator::getClipboardFormatName( CLIPFORMAT aClipformat )
     return OUString( wBuff, nLen );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT cf ) const
 {
@@ -238,36 +238,36 @@ CFormatEtc SAL_CALL CDataFormatTranslator::getFormatEtcForClipformat( CLIPFORMAT
     return fetc;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDataFormatTranslator::isOemOrAnsiTextFormat( CLIPFORMAT cf ) const
 {
     return ( (cf == CF_TEXT) || (cf == CF_OEMTEXT) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDataFormatTranslator::isUnicodeTextFormat( CLIPFORMAT cf ) const
 {
     return ( cf == CF_UNICODETEXT );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDataFormatTranslator::isTextFormat( CLIPFORMAT cf ) const
 {
     return ( isOemOrAnsiTextFormat( cf ) || isUnicodeTextFormat( cf ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) const
 {
@@ -275,9 +275,9 @@ sal_Bool SAL_CALL CDataFormatTranslator::isHTMLFormat( CLIPFORMAT cf ) const
     return ( clipFormatName == HTML_FORMAT_NAME_WINDOWS );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf ) const
 {
@@ -285,9 +285,9 @@ sal_Bool SAL_CALL CDataFormatTranslator::isTextHtmlFormat( CLIPFORMAT cf ) const
     return ( clipFormatName.equalsIgnoreAsciiCase( HTML_FORMAT_NAME_SOFFICE ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CDataFormatTranslator::getTextCharsetFromLCID( LCID lcid, CLIPFORMAT aClipformat ) const
 {
diff --git a/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index 9909dfa489b5..174972463a21 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.cxx
@@ -23,17 +23,17 @@
 
 #include "DOTransferable.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::lang;
 
-//------------------------------------------------------------------------
+
 // implementation
-//------------------------------------------------------------------------
+
 
 IDataObjectPtr SAL_CALL CDTransObjFactory::createDataObjFromTransferable(const Reference<XComponentContext>& rxContext,
                                                                        const Reference< XTransferable >& refXTransferable)
diff --git a/dtrans/source/win32/dtobj/Fetc.cxx b/dtrans/source/win32/dtobj/Fetc.cxx
index 3a7284f60c62..b237b865f124 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/dtrans/source/win32/dtobj/Fetc.cxx
@@ -21,9 +21,9 @@
 #include "Fetc.hxx"
 #include "../misc/ImplHelper.hxx"
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc::CFormatEtc(  )
 {
@@ -34,27 +34,27 @@ CFormatEtc::CFormatEtc(  )
     m_FormatEtc.tymed    = TYMED_NULL;
 }
 
-//------------------------------------------------------------------------
+
 // transfer of ownership
-//------------------------------------------------------------------------
+
 
 CFormatEtc::CFormatEtc( const FORMATETC& aFormatEtc )
 {
     CopyFormatEtc( &m_FormatEtc, &const_cast< FORMATETC& >( aFormatEtc ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc::~CFormatEtc( )
 {
     DeleteTargetDevice( m_FormatEtc.ptd );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc::CFormatEtc( CLIPFORMAT cf, DWORD tymed, DVTARGETDEVICE* ptd, DWORD dwAspect, LONG lindex )
 {
@@ -65,9 +65,9 @@ CFormatEtc::CFormatEtc( CLIPFORMAT cf, DWORD tymed, DVTARGETDEVICE* ptd, DWORD d
     m_FormatEtc.tymed    = tymed;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc::CFormatEtc( const CFormatEtc& theOther )
 {
@@ -78,9 +78,9 @@ CFormatEtc::CFormatEtc( const CFormatEtc& theOther )
     m_FormatEtc.tymed    = theOther.m_FormatEtc.tymed;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc& CFormatEtc::operator=( const CFormatEtc& theOther )
 {
@@ -98,27 +98,27 @@ CFormatEtc& CFormatEtc::operator=( const CFormatEtc& theOther )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc::operator FORMATETC*( )
 {
     return &m_FormatEtc;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtc::operator FORMATETC( )
 {
     return m_FormatEtc;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::getFORMATETC( LPFORMATETC lpFormatEtc )
 {
@@ -128,27 +128,27 @@ void CFormatEtc::getFORMATETC( LPFORMATETC lpFormatEtc )
     CopyFormatEtc( lpFormatEtc, &m_FormatEtc );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CLIPFORMAT CFormatEtc::getClipformat( ) const
 {
     return m_FormatEtc.cfFormat;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 DWORD CFormatEtc::getTymed( ) const
 {
     return m_FormatEtc.tymed;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
 {
@@ -161,45 +161,45 @@ void CFormatEtc::getTargetDevice( DVTARGETDEVICE** lpDvTargetDevice ) const
         *lpDvTargetDevice = CopyTargetDevice( m_FormatEtc.ptd );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 DWORD CFormatEtc::getDvAspect( ) const
 {
     return m_FormatEtc.dwAspect;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 LONG CFormatEtc::getLindex( ) const
 {
     return m_FormatEtc.lindex;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::setClipformat( CLIPFORMAT cf )
 {
     m_FormatEtc.cfFormat = cf;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::setTymed( DWORD tymed )
 {
     m_FormatEtc.tymed = tymed;
 }
 
-//------------------------------------------------------------------------
+
 // transfer of ownership!
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::setTargetDevice( DVTARGETDEVICE* ptd )
 {
@@ -207,36 +207,36 @@ void CFormatEtc::setTargetDevice( DVTARGETDEVICE* ptd )
     m_FormatEtc.ptd = ptd;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::setDvAspect( DWORD dwAspect )
 {
     m_FormatEtc.dwAspect = dwAspect;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtc::setLindex( LONG lindex )
 {
     m_FormatEtc.lindex = lindex;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Int32 operator==( const CFormatEtc& lhs, const CFormatEtc& rhs )
 {
     return CompareFormatEtc( &lhs.m_FormatEtc, &rhs.m_FormatEtc );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Int32 operator!=( const CFormatEtc& lhs, const CFormatEtc& rhs )
 {
diff --git a/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 561f8945fa22..1ac231364011 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.cxx
@@ -31,9 +31,9 @@
 
 #include "MimeAttrib.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::datatransfer;
@@ -42,34 +42,34 @@ using namespace com::sun::star::container;
 using namespace std;
 
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 LCID       CFormatRegistrar::m_TxtLocale   = 0;
 sal_uInt32 CFormatRegistrar::m_TxtCodePage = GetACP( );
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatEtcContainer::CFormatEtcContainer( )
 {
     m_EnumIterator = m_FormatMap.begin( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtcContainer::addFormatEtc( const CFormatEtc& fetc )
 {
     m_FormatMap.push_back( CFormatEtc( fetc ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc )
 {
@@ -80,18 +80,18 @@ void SAL_CALL CFormatEtcContainer::removeFormatEtc( const CFormatEtc& fetc )
         m_FormatMap.erase( iter );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFormatEtcContainer::removeAllFormatEtc( )
 {
     m_FormatMap.clear( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool CFormatEtcContainer::hasFormatEtc( const CFormatEtc& fetc ) const
 {
@@ -101,27 +101,27 @@ sal_Bool CFormatEtcContainer::hasFormatEtc( const CFormatEtc& fetc ) const
     return ( iter != m_FormatMap.end( ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool CFormatEtcContainer::hasElements( ) const
 {
     return !m_FormatMap.empty();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFormatEtcContainer::beginEnumFormatEtc( )
 {
     m_EnumIterator = m_FormatMap.begin( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
                                                         sal_uInt32 aNum )
@@ -142,9 +142,9 @@ sal_uInt32 SAL_CALL CFormatEtcContainer::nextFormatEtc( LPFORMATETC lpFetc,
 }
 
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum )
 {
@@ -161,9 +161,9 @@ sal_Bool SAL_CALL CFormatEtcContainer::skipFormatEtc( sal_uInt32 aNum )
 //#########################################################################
 
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFormatRegistrar::CFormatRegistrar( const Reference< XComponentContext >& rxContext,
                                     const CDataFormatTranslator& aDataFormatTranslator ) :
@@ -173,7 +173,7 @@ CFormatRegistrar::CFormatRegistrar( const Reference< XComponentContext >& rxCont
 {
 }
 
-// ----------------------------------------------------------------------------------------
+
 // this function converts all DataFlavors of the given FlavorList into
 // an appropriate FORMATETC structure, for some formats like unicodetext,
 // text and text/html we will offer an accompany format e.g.:
@@ -193,7 +193,7 @@ CFormatRegistrar::CFormatRegistrar( const Reference< XComponentContext >& rxCont
 //
 // if some tries to register different text formats with different charsets the last
 // registered wins and the others are ignored
-// ----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFormatRegistrar::RegisterFormats(
     const Reference< XTransferable >& aXTransferable, CFormatEtcContainer& aFormatEtcContainer )
@@ -277,45 +277,45 @@ void SAL_CALL CFormatRegistrar::RegisterFormats(
     }
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFormatRegistrar::hasSynthesizedLocale( ) const
 {
     return m_bHasSynthesizedLocale;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 LCID SAL_CALL CFormatRegistrar::getSynthesizedLocale( ) const
 {
     return m_TxtLocale;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFormatRegistrar::getRegisteredTextCodePage( ) const
 {
     return m_TxtCodePage;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 DataFlavor SAL_CALL CFormatRegistrar::getRegisteredTextFlavor( ) const
 {
     return m_RegisteredTextFlavor;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aFormatEtc ) const
 {
@@ -324,9 +324,9 @@ sal_Bool SAL_CALL CFormatRegistrar::isSynthesizeableFormat( const CFormatEtc& aF
              m_DataFormatTranslator.isHTMLFormat( aFormatEtc.getClipformat() ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 sal_Bool SAL_CALL CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFormatEtc& aFormatEtc ) const
@@ -336,9 +336,9 @@ sal_Bool SAL_CALL CFormatRegistrar::needsToSynthesizeAccompanyFormats( const CFo
              m_DataFormatTranslator.isTextHtmlFormat( aFormatEtc.getClipformat( ) ) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor& aFlavor )
 {
@@ -367,9 +367,9 @@ OUString SAL_CALL CFormatRegistrar::getCharsetFromDataFlavor( const DataFlavor&
     return charset;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransferable >& aXTransferable ) const
 {
@@ -381,9 +381,9 @@ sal_Bool SAL_CALL CFormatRegistrar::hasUnicodeFlavor( const Reference< XTransfer
     return aXTransferable->isDataFlavorSupported( aFlavor );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 sal_Bool CFormatRegistrar::isEqualCurrentSystemCodePage( sal_uInt32 aCodePage ) const
@@ -391,9 +391,9 @@ sal_Bool CFormatRegistrar::isEqualCurrentSystemCodePage( sal_uInt32 aCodePage )
     return ( (aCodePage == GetOEMCP()) || (aCodePage == GetACP()) );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( )
 {
@@ -402,9 +402,9 @@ sal_Bool SAL_CALL CFormatRegistrar::findLocaleForTextCodePage( )
     return ( IsValidLocale( m_TxtLocale, LCID_INSTALLED ) ) ? sal_True : sal_False;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype, sal_uInt32 codepage )
 {
@@ -420,9 +420,9 @@ sal_Bool SAL_CALL CFormatRegistrar::isLocaleCodePage( LCID lcid, LCTYPE lctype,
     return ( localeCodePage == codepage );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 sal_Bool SAL_CALL CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 codepage )
@@ -430,9 +430,9 @@ sal_Bool SAL_CALL CFormatRegistrar::isLocaleOemCodePage( LCID lcid, sal_uInt32 c
     return isLocaleCodePage( lcid, LOCALE_IDEFAULTCODEPAGE, codepage );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 sal_Bool SAL_CALL CFormatRegistrar::isLocaleAnsiCodePage( LCID lcid, sal_uInt32 codepage )
@@ -440,9 +440,9 @@ sal_Bool SAL_CALL CFormatRegistrar::isLocaleAnsiCodePage( LCID lcid, sal_uInt32
     return isLocaleCodePage( lcid, LOCALE_IDEFAULTANSICODEPAGE, codepage );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 BOOL CALLBACK CFormatRegistrar::EnumLocalesProc( LPSTR lpLocaleStr )
 {
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 4adbc933dfc1..27842aeac7b8 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -56,9 +56,9 @@ struct METAFILEHEADER
 };
 #pragma pack()
 
-//------------------------------------------------------------------------
+
 // convert a windows metafile picture to a openoffice metafile picture
-//------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFilePict )
 {
@@ -128,9 +128,9 @@ Sequence< sal_Int8 > SAL_CALL WinMFPictToOOMFPict( Sequence< sal_Int8 >& aMetaFi
     return mfpictStream;
 }
 
-//-------------------------------------------------------------
+
 // convert a windows enhanced metafile to a openoffice metafile
-//-------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile )
 {
@@ -149,9 +149,9 @@ Sequence< sal_Int8 > SAL_CALL WinENHMFPictToOOMFPict( HENHMETAFILE hEnhMetaFile
     return aRet;
 }
 
-//------------------------------------------------------------------------
+
 // convert a openoffice metafile picture to a windows metafile picture
-//------------------------------------------------------------------------
+
 
 HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 >& aOOMetaFilePict )
 {
@@ -173,9 +173,9 @@ HMETAFILEPICT SAL_CALL OOMFPictToWinMFPict( Sequence< sal_Int8 >& aOOMetaFilePic
     return hPict;
 }
 
-//-----------------------------------------------------------------------------
+
 // convert a openoffice metafile picture to a windows enhanced metafile picture
-//-----------------------------------------------------------------------------
+
 
 HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 >& aOOMetaFilePict )
 {
@@ -184,9 +184,9 @@ HENHMETAFILE SAL_CALL OOMFPictToWinENHMFPict( Sequence< sal_Int8 >& aOOMetaFileP
     return hEnhMtf;
 }
 
-//------------------------------------------------------------------------
+
 // convert a windows device independent bitmap into a openoffice bitmap
-//------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB )
 {
@@ -219,9 +219,9 @@ Sequence< sal_Int8 > SAL_CALL WinDIBToOOBMP( const Sequence< sal_Int8 >& aWinDIB
     return ooBmpStream;
 }
 
-//------------------------------------------------------------------------
+
 // convert a openoffice bitmap into a windows device independent bitmap
-//------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
 {
@@ -234,7 +234,7 @@ Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
     return winDIBStream;
 }
 
-//------------------------------------------------------------------------------
+
 // converts the openoffice text/html clipboard format to the HTML Format
 // well known under MS Windows
 // the MS HTML Format has a header before the real html data
@@ -257,7 +257,7 @@ Sequence< sal_Int8 > SAL_CALL OOBmpToWinDIB( Sequence< sal_Int8 >& aOOBmp )
 // The fragment should be preceded and followed by the HTML comments
 // <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the
 // text
-//------------------------------------------------------------------------------
+
 /*
 Sequence< sal_Int8 > SAL_CALL TextHtmlToHTMLFormat( Sequence< sal_Int8 >& aTextHtml )
 {
@@ -525,9 +525,9 @@ ByteSequence_t CF_HDROPToFileList(HGLOBAL hGlobal)
     return FileListToByteSequence(files);
 }
 
-//------------------------------------------------------------------------
+
 // convert a windows bitmap handle into a openoffice bitmap
-//------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL WinBITMAPToOOBMP( HBITMAP aHBMP )
 {
diff --git a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
index 2f5128c5f59d..2a0dfe78f604 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
@@ -25,9 +25,9 @@
 using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::uno;
 
-//------------------------------------------------------------------
+
 // assuming a '\0' terminated string if no length specified
-//------------------------------------------------------------------
+
 
 int CalcBuffSizeForTextConversion( UINT code_page, LPCSTR lpMultiByteString, int nLen = -1 )
 {
@@ -39,9 +39,9 @@ int CalcBuffSizeForTextConversion( UINT code_page, LPCSTR lpMultiByteString, int
                                 0 ) * sizeof( sal_Unicode ) );
 }
 
-//------------------------------------------------------------------
+
 // assuming a '\0' terminated string if no length specified
-//------------------------------------------------------------------
+
 
 int CalcBuffSizeForTextConversion( UINT code_page, LPCWSTR lpWideCharString, int nLen = -1 )
 {
@@ -55,11 +55,11 @@ int CalcBuffSizeForTextConversion( UINT code_page, LPCWSTR lpWideCharString, int
                                 NULL );
 }
 
-//------------------------------------------------------------------
+
 // converts text in one code page into unicode text
 // automatically calculates the necessary buffer size and allocates
 // the buffer
-//------------------------------------------------------------------
+
 
 int MultiByteToWideCharEx( UINT cp_src,
                            LPCSTR lpMultiByteString,
@@ -91,11 +91,11 @@ int MultiByteToWideCharEx( UINT cp_src,
                                 ptrHGlob.MemSize( ) );
 }
 
-//------------------------------------------------------------------
+
 // converts unicode text into text of the specified code page
 // automatically calculates the necessary buffer size and allocates
 // the buffer
-//------------------------------------------------------------------
+
 
 int WideCharToMultiByteEx( UINT cp_dest,
                            LPCWSTR lpWideCharString,
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 2ba89c176f5d..754beadaa505 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -45,9 +45,9 @@
 #define __uuidof(I) IID_##I
 #endif
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::datatransfer::clipboard;
@@ -55,9 +55,9 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
 
-//------------------------------------------------------------------------
+
 // a helper class that will be thrown by the function validateFormatEtc
-//------------------------------------------------------------------------
+
 
 class CInvalidFormatEtcException
 {
@@ -66,9 +66,9 @@ public:
     CInvalidFormatEtcException( HRESULT hr ) : m_hr( hr ) {};
 };
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CXTDataObject::CXTDataObject( const Reference< XComponentContext >& rxContext,
                               const Reference< XTransferable >& aXTransferable )
@@ -80,9 +80,9 @@ CXTDataObject::CXTDataObject( const Reference< XComponentContext >& rxContext,
 {
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -103,18 +103,18 @@ STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CXTDataObject::AddRef( )
 {
     return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) );
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->Release
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CXTDataObject::Release( )
 {
@@ -127,9 +127,9 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
     return nRefCnt;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
 {
@@ -175,9 +175,9 @@ STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
     return S_OK;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 // inline
 void SAL_CALL CXTDataObject::renderDataAndSetupStgMedium(
@@ -204,9 +204,9 @@ void SAL_CALL CXTDataObject::renderDataAndSetupStgMedium(
     setupStgMedium( fetc, stgTransfHelper, stgmedium );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 //inline
 void SAL_CALL CXTDataObject::renderLocaleAndSetupStgMedium(
@@ -226,9 +226,9 @@ void SAL_CALL CXTDataObject::renderLocaleAndSetupStgMedium(
         throw CInvalidFormatEtcException( DV_E_FORMATETC );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 //inline
 void SAL_CALL CXTDataObject::renderUnicodeAndSetupStgMedium(
@@ -263,9 +263,9 @@ void SAL_CALL CXTDataObject::renderUnicodeAndSetupStgMedium(
         stgmedium );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 //inline
 void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium(
@@ -337,9 +337,9 @@ void SAL_CALL CXTDataObject::renderAnyDataAndSetupStgMedium(
             stgmedium );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 HRESULT SAL_CALL CXTDataObject::renderSynthesizedFormatAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium )
 {
@@ -377,9 +377,9 @@ HRESULT SAL_CALL CXTDataObject::renderSynthesizedFormatAndSetupStgMedium( FORMAT
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // the transferable must have only text, so we will synthesize unicode text
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CXTDataObject::renderSynthesizedUnicodeAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium )
 {
@@ -410,9 +410,9 @@ void SAL_CALL CXTDataObject::renderSynthesizedUnicodeAndSetupStgMedium( FORMATET
     setupStgMedium( fetc, stgTransfHelper, stgmedium );
 }
 
-//------------------------------------------------------------------------
+
 // the transferable must have only unicode text so we will sythesize text
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CXTDataObject::renderSynthesizedTextAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium )
 {
@@ -446,9 +446,9 @@ void SAL_CALL CXTDataObject::renderSynthesizedTextAndSetupStgMedium( FORMATETC&
     setupStgMedium( fetc, stgTransfHelper, stgmedium );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC& fetc, STGMEDIUM& stgmedium )
 {
@@ -486,9 +486,9 @@ void SAL_CALL CXTDataObject::renderSynthesizedHtmlAndSetupStgMedium( FORMATETC&
         stgmedium );
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::EnumFormatEtc(
     DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
@@ -517,9 +517,9 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc(
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->QueryGetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
 {
@@ -531,72 +531,72 @@ STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
     return m_FormatEtcContainer.hasFormatEtc( *pFormatetc ) ? S_OK : S_FALSE;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetDataHere
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetCanonicalFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->SetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DUnadvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::DUnadvise( DWORD )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumDAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // for our convenience
-//------------------------------------------------------------------------
+
 
 CXTDataObject::operator IDataObject*( )
 {
     return static_cast< IDataObject* >( this );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 DataFlavor SAL_CALL CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aFormatEtc ) const
@@ -615,9 +615,9 @@ DataFlavor SAL_CALL CXTDataObject::formatEtcToDataFlavor( const FORMATETC& aForm
     return aFlavor;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 void CXTDataObject::validateFormatEtc( LPFORMATETC lpFormatEtc ) const
@@ -646,9 +646,9 @@ void CXTDataObject::validateFormatEtc( LPFORMATETC lpFormatEtc ) const
         throw CInvalidFormatEtcException( DV_E_TYMED );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 //inline
 void SAL_CALL CXTDataObject::setupStgMedium( const FORMATETC& fetc,
@@ -681,9 +681,9 @@ void SAL_CALL CXTDataObject::setupStgMedium( const FORMATETC& fetc,
         OSL_ASSERT( sal_False );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 void SAL_CALL CXTDataObject::invalidateStgMedium( STGMEDIUM& stgmedium ) const
@@ -691,9 +691,9 @@ void SAL_CALL CXTDataObject::invalidateStgMedium( STGMEDIUM& stgmedium ) const
     stgmedium.tymed = TYMED_NULL;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline
 HRESULT SAL_CALL CXTDataObject::translateStgExceptionCode( HRESULT hr ) const
@@ -714,9 +714,9 @@ HRESULT SAL_CALL CXTDataObject::translateStgExceptionCode( HRESULT hr ) const
     return hrTransl;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 inline void SAL_CALL CXTDataObject::InitializeFormatEtcContainer( )
 {
@@ -731,9 +731,9 @@ inline void SAL_CALL CXTDataObject::InitializeFormatEtcContainer( )
 // CEnumFormatEtc
 //============================================================================
 
-//----------------------------------------------------------------------------
+
 // ctor
-//----------------------------------------------------------------------------
+
 
 CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN lpUnkOuter, const CFormatEtcContainer& aFormatEtcContainer ) :
     m_nRefCnt( 0 ),
@@ -743,9 +743,9 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN lpUnkOuter, const CFormatEtcContainer&
     Reset( );
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -767,9 +767,9 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 {
@@ -778,9 +778,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
     return InterlockedIncrement( &m_nRefCnt );
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->Release
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 {
@@ -794,9 +794,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
     return nRefCnt;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Next
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched )
 {
@@ -813,18 +813,18 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, LPFORMATETC lpDest, ULONG*
     return (nFetched == nRequested) ? S_OK : S_FALSE;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Skip
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
 {
     return m_FormatEtcContainer.skipFormatEtc( celt ) ? S_OK : S_FALSE;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Reset
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Reset( )
 {
@@ -832,9 +832,9 @@ STDMETHODIMP CEnumFormatEtc::Reset( )
     return S_OK;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Clone
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
 {
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index f0f5daf6e266..13efa57f694e 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -48,9 +48,9 @@ const OUString Windows_FormatName ("windows_formatname");
 const com::sun::star::uno::Type CppuType_ByteSequence = ::getCppuType((const com::sun::star::uno::Sequence<sal_Int8>*)0);
 const com::sun::star::uno::Type CppuType_String       = ::getCppuType((const OUString*)0);
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace osl;
 using namespace cppu;
@@ -60,9 +60,9 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::container;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace MODULE_PRIVATE
 {
@@ -74,17 +74,17 @@ namespace MODULE_PRIVATE
     }
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 FormatEntry::FormatEntry()
 {
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 FormatEntry::FormatEntry(
     const char* mime_content_type,
@@ -105,9 +105,9 @@ FormatEntry::FormatEntry(
     aStandardFormatId = std_clipboard_format_id;
 }
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CDataFormatTranslator::CDataFormatTranslator( const Reference< XComponentContext >& rxContext ) :
     m_xContext( rxContext )
@@ -115,9 +115,9 @@ CDataFormatTranslator::CDataFormatTranslator( const Reference< XComponentContext
     initTranslationTable( );
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataFlavor& aDataFlavor )
     throw( RuntimeException )
@@ -174,9 +174,9 @@ Any SAL_CALL CDataFormatTranslator::getSystemDataTypeFromDataFlavor( const DataF
     return aAny;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( const Any& aSysDataType )
     throw( RuntimeException )
@@ -205,9 +205,9 @@ DataFlavor SAL_CALL CDataFormatTranslator::getDataFlavorFromSystemDataType( cons
     return aFlavor;
 }
 
-// -------------------------------------------------
+
 // XServiceInfo
-// -------------------------------------------------
+
 
 OUString SAL_CALL CDataFormatTranslator::getImplementationName(  )
     throw( RuntimeException )
@@ -222,9 +222,9 @@ sal_Bool SAL_CALL CDataFormatTranslator::supportsService( const OUString& Servic
     return cppu::supportsService(this, ServiceName);
 }
 
-// -------------------------------------------------
+
 //  XServiceInfo
-// -------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( )
     throw( RuntimeException )
@@ -232,14 +232,14 @@ Sequence< OUString > SAL_CALL CDataFormatTranslator::getSupportedServiceNames( )
     return DataFormatTranslator_getSupportedServiceNames( );
 }
 
-// -------------------------------------------------
+
 // to optimize searching we add all entries with a
 // standard clipboard format number first, in the
 // table before the entries with CF_INVALID
 // if we are searching for a standard clipboard
 // format number we can stop if we find the first
 // CF_INVALID
-// -------------------------------------------------
+
 
 void SAL_CALL CDataFormatTranslator::initTranslationTable()
 {
@@ -492,9 +492,9 @@ void SAL_CALL CDataFormatTranslator::initTranslationTable()
     m_TranslTable.push_back(FormatEntry("application/x-openoffice-dummy4;windows_formatname=\"SO_DUMMYFORMAT_4\"", "SO_DUMMYFORMAT_4", NULL, CF_INVALID, CPPUTYPE_DEFAULT));
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 void SAL_CALL CDataFormatTranslator::findDataFlavorForStandardFormatId( sal_Int32 aStandardFormatId, DataFlavor& aDataFlavor ) const
 {
@@ -518,9 +518,9 @@ void SAL_CALL CDataFormatTranslator::findDataFlavorForStandardFormatId( sal_Int3
     }
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const OUString& aNativeFormatName, DataFlavor& aDataFlavor ) const
 {
@@ -537,9 +537,9 @@ void SAL_CALL CDataFormatTranslator::findDataFlavorForNativeFormatName( const OU
     }
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const OUString& aCharset, Any& aAny ) const
 {
@@ -553,9 +553,9 @@ void SAL_CALL CDataFormatTranslator::findStandardFormatIdForCharset( const OUStr
     }
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 void SAL_CALL CDataFormatTranslator::setStandardFormatIdForNativeFormatName( const OUString& aNativeFormatName, Any& aAny ) const
 {
@@ -571,9 +571,9 @@ void SAL_CALL CDataFormatTranslator::setStandardFormatIdForNativeFormatName( con
     }
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 void SAL_CALL CDataFormatTranslator::findStdFormatIdOrNativeFormatNameForFullMediaType(
     const Reference< XMimeContentTypeFactory >& aRefXMimeFactory,
@@ -601,18 +601,18 @@ void SAL_CALL CDataFormatTranslator::findStdFormatIdOrNativeFormatNameForFullMed
     }
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 inline sal_Bool CDataFormatTranslator::isTextPlainMediaType( const OUString& fullMediaType ) const
 {
     return fullMediaType.equalsIgnoreAsciiCase("text/plain");
 }
 
-// -------------------------------------------------
+
 //
-// -------------------------------------------------
+
 
 DataFlavor SAL_CALL CDataFormatTranslator::mkDataFlv(const OUString& cnttype, const OUString& hpname, Type dtype)
 {
diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index efa971528cff..b0bc48cc722e 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.cxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/datatransfer/XDataFormatTranslator.hpp>
 #include "ftransl.hxx"
 
-//-----------------------------------------------------------------
+
 // some defines
-//-----------------------------------------------------------------
+
 
 // the service names
 #define SERVICE_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
@@ -35,9 +35,9 @@
 // the implementation names
 #define IMPL_NAME  "com.sun.star.datatransfer.DataFormatTranslator"
 
-//-----------------------------------------------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::cppu                      ;
@@ -46,18 +46,18 @@ using namespace ::com::sun::star::registry  ;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer;
 
-//-----------------------------------------------------------------
+
 // create a static object to initialize the shell9x library
-//-----------------------------------------------------------------
+
 
 namespace
 {
 
-    //-----------------------------------------------------------------------------------------------------------
+
     // functions to create a new Clipboad instance; is needed by factory helper implementation
     // @param rServiceManager - service manager, useful if the component needs other uno services
     // so we should give it to every UNO-Implementation component
-    //-----------------------------------------------------------------------------------------------------------
+
 
     Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
     {
@@ -67,10 +67,10 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
 // returns a factory to create XFilePicker-Services
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL ftransl_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index 3337644f63ab..3b6c75ce010a 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -41,15 +41,15 @@
 #define FORMATETC_PARTIAL_MATCH -1
 #define FORMATETC_NO_MATCH       0
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
 
 
-//------------------------------------------------------------------------
+
+
 // returns a windows codepage appropriate to the
 // given mime charset parameter value
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
 {
@@ -79,10 +79,10 @@ sal_uInt32 SAL_CALL getWinCPFromMimeCharset( const OUString& charset )
     return winCP;
 }
 
-//--------------------------------------------------
+
 // returns a windows codepage appropriate to the
 // given locale and locale type
-//--------------------------------------------------
+
 
 OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
 {
@@ -129,22 +129,22 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE lctype )
     return winCP;
 }
 
-//--------------------------------------------------
+
 // returns a mime charset parameter value appropriate
 // to the given codepage, optional a prefix can be
 // given, e.g. "windows-" or "cp"
-//--------------------------------------------------
+
 
 OUString SAL_CALL getMimeCharsetFromWinCP( sal_uInt32 cp, const OUString& aPrefix )
 {
     return aPrefix + cptostr( cp );
 }
 
-//--------------------------------------------------
+
 // returns a mime charset parameter value appropriate
 // to the given locale id and locale type, optional a
 // prefix can be given, e.g. "windows-" or "cp"
-//--------------------------------------------------
+
 
 OUString SAL_CALL getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OUString& aPrefix  )
 {
@@ -152,9 +152,9 @@ OUString SAL_CALL getMimeCharsetFromLocaleId( LCID lcid, LCTYPE lctype, const OU
     return aPrefix + charset;
 }
 
-//------------------------------------------------------------------------
+
 // IsOEMCP
-//------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
 {
@@ -172,9 +172,9 @@ sal_Bool SAL_CALL IsOEMCP( sal_uInt32 codepage )
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 // converts a codepage into its string representation
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL cptostr( sal_uInt32 codepage )
 {
@@ -183,7 +183,7 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage )
     return OUString::number( static_cast<sal_Int64>( codepage ) );
 }
 
-//-------------------------------------------------------------------------
+
 // OleStdDeleteTargetDevice()
 //
 // Purpose:
@@ -192,7 +192,7 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage )
 //
 // Return Value:
 //    SCODE  -  S_OK if successful
-//-------------------------------------------------------------------------
+
 
 void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
 {
@@ -223,7 +223,7 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
 
 
 
-//-------------------------------------------------------------------------
+
 // OleStdCopyTargetDevice()
 //
 // Purpose:
@@ -239,7 +239,7 @@ void SAL_CALL DeleteTargetDevice( DVTARGETDEVICE* ptd )
 //    pointer to allocated copy of ptdSrc
 //    if ptdSrc==NULL then retuns NULL is returned.
 //    if ptdSrc!=NULL and memory allocation fails, then NULL is returned
-//-------------------------------------------------------------------------
+
 
 DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 {
@@ -273,7 +273,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 }
 
 
-//-------------------------------------------------------------------------
+
 // OleStdCopyFormatEtc()
 //
 // Purpose:
@@ -297,7 +297,7 @@ DVTARGETDEVICE* SAL_CALL CopyTargetDevice( DVTARGETDEVICE* ptdSrc )
 //  returns TRUE if copy was successful;
 //  retuns FALSE if not successful, e.g. one or both of the pointers
 //  were invalid or the pointers were equal
-//-------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
 {
@@ -344,13 +344,13 @@ sal_Bool SAL_CALL CopyFormatEtc( LPFORMATETC petcDest, LPFORMATETC petcSrc )
     return bRet;
 }
 
-//-------------------------------------------------------------------------
+
 // returns:
 //  1 for exact match,
 //  0 for no match,
 // -1 for partial match (which is defined to mean the left is a subset
 //    of the right: fewer aspects, null target device, fewer medium).
-//-------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC* pFetcRhs )
 {
@@ -420,9 +420,9 @@ sal_Int32 SAL_CALL CompareFormatEtc( const FORMATETC* pFetcLhs, const FORMATETC*
 }
 
 
-//-------------------------------------------------------------------------
+
 //
-//-------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CompareTargetDevice( DVTARGETDEVICE* ptdLeft, DVTARGETDEVICE* ptdRight )
 {
diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx
index 20ac2f0dae8e..b4d2b10dbf09 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/dtrans/source/win32/workbench/XTDo.cxx
@@ -34,9 +34,9 @@
 #include <memory>
 #include <tchar.h>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace ::std;
 
@@ -44,9 +44,9 @@ using namespace ::std;
 // OTWrapperDataObject
 //============================================================================
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 /*
     in the constructor we enumerate all formats offered by the transferable
     and convert the formats into formatetc structures
@@ -64,9 +64,9 @@ CXTDataObject::CXTDataObject( ) :
 
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -89,18 +89,18 @@ STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CXTDataObject::AddRef( )
 {
     return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) );
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->Release
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CXTDataObject::Release( )
 {
@@ -156,9 +156,9 @@ STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
 {
@@ -179,72 +179,72 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** p
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->QueryGetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetDataHere
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetCanonicalFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->SetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DUnadvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::DUnadvise( DWORD )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumDAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // for our convenience
-//------------------------------------------------------------------------
+
 
 CXTDataObject::operator IDataObject*( )
 {
@@ -256,9 +256,9 @@ CXTDataObject::operator IDataObject*( )
 // CEnumFormatEtc
 //============================================================================
 
-//----------------------------------------------------------------------------
+
 // ctor
-//----------------------------------------------------------------------------
+
 
 CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) :
     m_nRefCnt( 0 ),
@@ -267,9 +267,9 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) :
 {
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -290,9 +290,9 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 {
@@ -301,9 +301,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
     return InterlockedIncrement( &m_nRefCnt );
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->Release
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 {
@@ -320,9 +320,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
     return nRefCnt;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Next
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched )
 {
@@ -358,9 +358,9 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Skip
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
 {
@@ -377,9 +377,9 @@ STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Reset
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Reset( )
 {
@@ -387,9 +387,9 @@ STDMETHODIMP CEnumFormatEtc::Reset( )
     return S_OK;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Clone
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
 {
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 9dae8556c490..175c58b0ac44 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.cxx
@@ -46,9 +46,9 @@
 
 #include <process.h>
 
-//-------------------------------------------------------------
+
 // my defines
-//-------------------------------------------------------------
+
 
 #define TEST_CLIPBOARD
 #define RDB_SYSPATH  "d:\\projects\\src623\\dtrans\\wntmsci7\\bin\\applicat.rdb"
@@ -58,9 +58,9 @@
 #define EVT_INIT_NONSIGNALED FALSE
 #define EVT_NONAME           ""
 
-//------------------------------------------------------------
+
 //  namesapces
-//------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::std;
@@ -71,25 +71,25 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 
-//------------------------------------------------------------
+
 //  globales
-//------------------------------------------------------------
+
 
 Reference< XTransferable > rXTransfRead;
 HANDLE  g_hEvtThreadWakeup;
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 class CClipboardListener : public WeakImplHelper1 < XClipboardListener >
 {
 public:
     ~CClipboardListener( );
 
-    //-------------------------------------------------
+
     // XClipboardListener
-    //-------------------------------------------------
+
 
     virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException);
     virtual void SAL_CALL changedContents( const ClipboardEvent& event ) throw( RuntimeException );
@@ -109,18 +109,18 @@ void SAL_CALL CClipboardListener::changedContents( const ClipboardEvent& event )
     //MessageBox( NULL, TEXT("Clipboard content changed"), TEXT("Info"), MB_OK | MB_ICONINFORMATION );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 class CTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
 {
 public:
     CTransferable( );
 
-    //-------------------------------------------------
+
     // XTransferable
-    //-------------------------------------------------
+
 
     virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor )
         throw(UnsupportedFlavorException, IOException, RuntimeException);
@@ -129,9 +129,9 @@ public:
 
     virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
 
-    //-------------------------------------------------
+
     // XClipboardOwner
-    //-------------------------------------------------
+
 
     virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
         throw(RuntimeException);
@@ -141,9 +141,9 @@ private:
     OUString               m_Data;
 };
 
-//----------------------------------------------------------------
+
 //  ctor
-//----------------------------------------------------------------
+
 
 CTransferable::CTransferable( ) :
     m_FlavorList( 1 ),
@@ -160,9 +160,9 @@ CTransferable::CTransferable( ) :
     m_FlavorList[0] = df;
 }
 
-//----------------------------------------------------------------
+
 //  getTransferData
-//----------------------------------------------------------------
+
 
 Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
     throw(UnsupportedFlavorException, IOException, RuntimeException)
@@ -192,9 +192,9 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
     return anyData;
 }
 
-//----------------------------------------------------------------
+
 //  getTransferDataFlavors
-//----------------------------------------------------------------
+
 
 Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  )
     throw(RuntimeException)
@@ -202,9 +202,9 @@ Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  )
     return m_FlavorList;
 }
 
-//----------------------------------------------------------------
+
 //  isDataFlavorSupported
-//----------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
     throw(RuntimeException)
@@ -218,9 +218,9 @@ sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavo
     return sal_False;
 }
 
-//----------------------------------------------------------------
+
 //  lostOwnership
-//----------------------------------------------------------------
+
 
 void SAL_CALL CTransferable::lostOwnership(
     const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
@@ -229,9 +229,9 @@ void SAL_CALL CTransferable::lostOwnership(
     //MessageBox( NULL, TEXT("No longer clipboard owner"), TEXT("Info"), MB_OK | MB_ICONINFORMATION );
 }
 
-//----------------------------------------------------------------
+
 //  main
-//----------------------------------------------------------------
+
 
 int SAL_CALL main( int nArgc, char* Argv[] )
 {
@@ -249,9 +249,9 @@ int SAL_CALL main( int nArgc, char* Argv[] )
     BOOL bValid = IsValidLocale( lcid, LCID_SUPPORTED );
     GetLocaleInfoA( lcid, LOCALE_IDEFAULTANSICODEPAGE, buff, sizeof( buff ) );
 
-    //-------------------------------------------------
+
     // get the global service-manager
-    //-------------------------------------------------
+
 
     OUString rdbName = OUString(  RDB_SYSPATH  );
     Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
@@ -263,9 +263,9 @@ int SAL_CALL main( int nArgc, char* Argv[] )
         return(-1);
     }
 
-    //-------------------------------------------------
+
     // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
+
 
     Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new CTransferable ) );
 
@@ -305,9 +305,9 @@ int SAL_CALL main( int nArgc, char* Argv[] )
     rXClipListener.clear();
     xClipNotifier.clear();
 
-    //--------------------------------------------------
+
     // shutdown the service manager
-    //--------------------------------------------------
+
 
     // Cast factory to XComponent
     Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
diff --git a/dtrans/source/win32/workbench/testmarshal.cxx b/dtrans/source/win32/workbench/testmarshal.cxx
index 30d8fe48b2c1..0789b0d41b76 100644
--- a/dtrans/source/win32/workbench/testmarshal.cxx
+++ b/dtrans/source/win32/workbench/testmarshal.cxx
@@ -36,9 +36,9 @@
 #include <process.h>
 #include "XTDo.hxx"
 
-//-------------------------------------------------------------
+
 // my defines
-//-------------------------------------------------------------
+
 
 #define WRITE_CB
 #define EVT_MANUAL_RESET     TRUE
@@ -47,16 +47,16 @@
 #define WAIT_MSGLOOP
 #define RAW_MARSHALING
 
-//------------------------------------------------------------
+
 //  namesapces
-//------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::std;
 
-//------------------------------------------------------------
+
 //  globales
-//------------------------------------------------------------
+
 
 HANDLE  g_hEvtThreadWakeup;
 
@@ -116,9 +116,9 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
 
 //################################################################
 
-//----------------------------------------------------------------
+
 //  main
-//----------------------------------------------------------------
+
 
 int SAL_CALL main( int nArgc, char* Argv[] )
 {
diff --git a/dtrans/test/win32/dnd/transferable.cxx b/dtrans/test/win32/dnd/transferable.cxx
index 28af74e0dbbe..90a50b7a879a 100644
--- a/dtrans/test/win32/dnd/transferable.cxx
+++ b/dtrans/test/win32/dnd/transferable.cxx
@@ -19,9 +19,9 @@
 
 #include "transferable.hxx"
 
-//----------------------------------------------------------------
+
 //  ctor
-//----------------------------------------------------------------
+
 
 CTransferable::CTransferable( wchar_t* dataString ) :
     m_seqDFlv( 1 ),
@@ -44,9 +44,9 @@ CTransferable::CTransferable( wchar_t* dataString ) :
     m_seqDFlv[0] = df;
 }
 
-//----------------------------------------------------------------
+
 //  getTransferData
-//----------------------------------------------------------------
+
 
 Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
     throw(UnsupportedFlavorException, IOException, RuntimeException)
@@ -72,9 +72,9 @@ Any SAL_CALL CTransferable::getTransferData( const DataFlavor& aFlavor )
     return anyData;
 }
 
-//----------------------------------------------------------------
+
 //  getTransferDataFlavors
-//----------------------------------------------------------------
+
 
 Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  )
     throw(RuntimeException)
@@ -82,9 +82,9 @@ Sequence< DataFlavor > SAL_CALL CTransferable::getTransferDataFlavors(  )
     return m_seqDFlv;
 }
 
-//----------------------------------------------------------------
+
 //  isDataFlavorSupported
-//----------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
     throw(RuntimeException)
@@ -104,9 +104,9 @@ sal_Bool SAL_CALL CTransferable::isDataFlavorSupported( const DataFlavor& aFlavo
     return bRet;
 }
 
-//----------------------------------------------------------------
+
 //  lostOwnership
-//----------------------------------------------------------------
+
 
 void SAL_CALL CTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
     throw(RuntimeException)
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 16ab1eacc1d1..2863deb1718a 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -18,11 +18,11 @@
  */
 
 
-//------------------------------------------------------------------------
+
 //
 // Global header
 //
-//------------------------------------------------------------------------
+
 
 #include <limits.h>
 #include <vector>
@@ -55,11 +55,11 @@
 #include <editeng/outliner.hxx>
 #include <svl/intitem.hxx>
 
-//------------------------------------------------------------------------
+
 //
 // Project-local header
 //
-//------------------------------------------------------------------------
+
 
 #include <com/sun/star/beans/PropertyState.hpp>
 
@@ -78,11 +78,11 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::accessibility;
 
-//------------------------------------------------------------------------
+
 //
 // AccessibleEditableTextPara implementation
 //
-//------------------------------------------------------------------------
+
 
 namespace accessibility
 {
@@ -2888,6 +2888,6 @@ namespace accessibility
 
 }  // end of namespace accessibility
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleHyperlink.cxx b/editeng/source/accessibility/AccessibleHyperlink.cxx
index 0407c88b019c..2773d7bfffa5 100644
--- a/editeng/source/accessibility/AccessibleHyperlink.cxx
+++ b/editeng/source/accessibility/AccessibleHyperlink.cxx
@@ -30,11 +30,11 @@
 using namespace ::com::sun::star;
 
 
-//------------------------------------------------------------------------
+
 //
 // AccessibleHyperlink implementation
 //
-//------------------------------------------------------------------------
+
 
 namespace accessibility
 {
@@ -130,6 +130,6 @@ namespace accessibility
 
 }  // end of namespace accessibility
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx b/editeng/source/accessibility/AccessibleParaManager.cxx
index 65d728097dd6..39f4a561e5b4 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -18,22 +18,22 @@
  */
 
 
-//------------------------------------------------------------------------
+
 //
 // Global header
 //
-//------------------------------------------------------------------------
+
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
-//------------------------------------------------------------------------
+
 //
 // Project-local header
 //
-//------------------------------------------------------------------------
+
 
 #include <editeng/unoedhlp.hxx>
 #include <editeng/unopracc.hxx>
@@ -415,6 +415,6 @@ namespace accessibility
 
 }
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 4f9936e71688..3f3b62c0c3e5 100644
--- a/editeng/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -25,21 +25,21 @@ using namespace ::com::sun::star::accessibility;
 
 namespace accessibility
 {
-    // ---------------------------
+
     // - AccessibleSelectionBase -
-    // ---------------------------
+
 
     AccessibleSelectionBase::AccessibleSelectionBase()
     {
     }
 
-    //--------------------------------------------------------------------
+
 
     AccessibleSelectionBase::~AccessibleSelectionBase()
     {
     }
 
-    //--------------------------------------------------------------------
+
 
     void SAL_CALL AccessibleSelectionBase::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
@@ -47,7 +47,7 @@ namespace accessibility
         OCommonAccessibleSelection::selectAccessibleChild( nChildIndex );
     }
 
-    //--------------------------------------------------------------------
+
 
     sal_Bool SAL_CALL AccessibleSelectionBase::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
@@ -55,7 +55,7 @@ namespace accessibility
         return( OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ) );
     }
 
-    //--------------------------------------------------------------------
+
 
     void SAL_CALL AccessibleSelectionBase::clearAccessibleSelection(  ) throw (uno::RuntimeException)
     {
@@ -63,7 +63,7 @@ namespace accessibility
         OCommonAccessibleSelection::clearAccessibleSelection();
     }
 
-    //--------------------------------------------------------------------
+
 
     void SAL_CALL AccessibleSelectionBase::selectAllAccessibleChildren(  ) throw (uno::RuntimeException)
     {
@@ -71,7 +71,7 @@ namespace accessibility
         OCommonAccessibleSelection::selectAllAccessibleChildren();
     }
 
-    //--------------------------------------------------------------------
+
 
     sal_Int32 SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChildCount(  ) throw (uno::RuntimeException)
     {
@@ -79,7 +79,7 @@ namespace accessibility
         return( OCommonAccessibleSelection::getSelectedAccessibleChildCount() );
     }
 
-    //--------------------------------------------------------------------
+
 
     uno::Reference< XAccessible > SAL_CALL AccessibleSelectionBase::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
@@ -87,7 +87,7 @@ namespace accessibility
         return( OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ) );
     }
 
-    //--------------------------------------------------------------------
+
 
     void SAL_CALL AccessibleSelectionBase::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
     {
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index a973a5e77fd4..e931b2e9ea19 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -18,11 +18,11 @@
  */
 
 
-//------------------------------------------------------------------------
+
 //
 // Global header
 //
-//------------------------------------------------------------------------
+
 
 #include <limits.h>
 #include <vector>
@@ -38,11 +38,11 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 
-//------------------------------------------------------------------------
+
 //
 // Project-local header
 //
-//------------------------------------------------------------------------
+
 
 #include <editeng/editdata.hxx>
 #include <editeng/unopracc.hxx>
@@ -78,11 +78,11 @@ namespace accessibility
         }
     };
     sal_Unicode cNewLine(0x0a);
-    //------------------------------------------------------------------------
+
     //
     // Static Helper
     //
-    //------------------------------------------------------------------------
+
     ESelection MakeSelection( sal_Int32 nStartPara, sal_Int32 nStartIndex,
                               sal_Int32 nEndPara, sal_Int32 nEndIndex )
     {
@@ -96,11 +96,11 @@ namespace accessibility
                            nEndPara, static_cast< sal_uInt16 >(nEndIndex) );
     }
 
-    //------------------------------------------------------------------------
+
     //
     // AccessibleStaticTextBase_Impl declaration
     //
-    //------------------------------------------------------------------------
+
 
 
     /** AccessibleStaticTextBase_Impl
@@ -208,11 +208,11 @@ namespace accessibility
 
     };
 
-    //------------------------------------------------------------------------
+
     //
     // AccessibleStaticTextBase_Impl implementation
     //
-    //------------------------------------------------------------------------
+
 
     AccessibleStaticTextBase_Impl::AccessibleStaticTextBase_Impl() :
         mxThis( NULL ),
@@ -492,11 +492,11 @@ namespace accessibility
         }
         return sal_False;
     }
-    //------------------------------------------------------------------------
+
     //
     // AccessibleStaticTextBase implementation
     //
-    //------------------------------------------------------------------------
+
 
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AccessibleStaticTextBase::AccessibleStaticTextBase( ::std::auto_ptr< SvxEditSource >        pEditSource ) :
@@ -1126,6 +1126,6 @@ namespace accessibility
 
 }  // end of namespace accessibility
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/accessibility/AccessibleStringWrap.cxx b/editeng/source/accessibility/AccessibleStringWrap.cxx
index b923d39bf6d2..566e8bd0ad19 100644
--- a/editeng/source/accessibility/AccessibleStringWrap.cxx
+++ b/editeng/source/accessibility/AccessibleStringWrap.cxx
@@ -25,11 +25,11 @@
 #include <editeng/svxfont.hxx>
 #include <editeng/AccessibleStringWrap.hxx>
 
-//------------------------------------------------------------------------
+
 //
 // AccessibleStringWrap implementation
 //
-//------------------------------------------------------------------------
+
 
 AccessibleStringWrap::AccessibleStringWrap( OutputDevice& rDev, SvxFont& rFont, const OUString& rText ) :
     mrDev( rDev ),
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 5a8f0a6b6325..71c8593bdb7e 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
 #include <vcl/wrkwin.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/msgbox.hxx>
@@ -94,9 +93,6 @@ static bool bDebugPaint = false;
 
 static SfxItemPool* pGlobalPool=0;
 
-// ----------------------------------------------------------------------
-// EditEngine
-// ----------------------------------------------------------------------
 EditEngine::EditEngine( SfxItemPool* pItemPool )
 {
     pImpEditEngine = new ImpEditEngine( this, pItemPool );
@@ -248,7 +244,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P
 #endif
 
     // Align to the pixel boundary, so that it becomes exactly the same
-    // as Paint ().
+    // as Paint ()
     Rectangle aOutRect( pOutDev->LogicToPixel( rOutRect ) );
     aOutRect = pOutDev->PixelToLogic( aOutRect );
 
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 0c91733ac868..cba107f40ac2 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -57,7 +57,7 @@ using std::endl;
 using namespace com::sun::star;
 
 
-//--------------------------------------------------------------
+
 
 XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem, sal_uInt16 nStart, sal_uInt16 nEnd )
 {
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index b640a3b26877..7d5d15d15644 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -64,7 +64,7 @@ static inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, shor
     rPoint = pOutDev->PixelToLogic( rPoint );
 }
 
-// ----------------------------------------------------------------------
+
 //  class ImpEditView
 //  ----------------------------------------------------------------------
 ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 43d3f702482c..782402108ea9 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3057,9 +3057,9 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace )
     long nMaxWidth = 0;
     long nCurWidth = 0;
 
-    // --------------------------------------------------
+
     // Over all the paragraphs ...
-    // --------------------------------------------------
+
     sal_Int32 nParas = GetParaPortions().Count();
     for ( sal_Int32 nPara = 0; nPara < nParas; nPara++ )
     {
@@ -3069,9 +3069,9 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( sal_Bool bIgnoreExtraSpace )
             const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pPortion->GetNode() );
             sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pPortion->GetNode() );
 
-            // --------------------------------------------------
+
             // On the lines of the paragraph ...
-            // --------------------------------------------------
+
             sal_Int32 nLines = (sal_Int32)pPortion->GetLines().Count();
             for ( sal_Int32 nLine = 0; nLine < nLines; nLine++ )
             {
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 88337a915341..ab8c3d800611 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -594,9 +594,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
     bool bProcessingEmptyLine = ( pParaPortion->GetNode()->Len() == 0 );
     bool bEmptyNodeWithPolygon = ( pParaPortion->GetNode()->Len() == 0 ) && GetTextRanger();
 
-    // ---------------------------------------------------------------
+
     // Fast special treatment for empty paragraphs ...
-    // ---------------------------------------------------------------
+
     if ( ( pParaPortion->GetNode()->Len() == 0 ) && !GetTextRanger() )
     {
         // fast special treatment ...
@@ -608,9 +608,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
         return FinishCreateLines( pParaPortion );
     }
 
-    // ---------------------------------------------------------------
+
     // Initialization ......
-    // ---------------------------------------------------------------
+
 
     // Always format for 100%:
     bool bMapChanged = ImpCheckRefMapMode();
@@ -621,9 +621,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
         pParaPortion->GetLines().Append(pL);
     }
 
-    // ---------------------------------------------------------------
+
     // Get Paragraph attributes  ......
-    // ---------------------------------------------------------------
+
     ContentNode* const pNode = pParaPortion->GetNode();
 
     sal_Bool bRightToLeftPara = IsRightToLeft( nPara );
@@ -697,10 +697,10 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
     }
 
 
-    // ---------------------------------------------------------------
+
     // Search for line with InvalidPos, start one line before
     // Flag the line => do not remove it !
-    // ---------------------------------------------------------------
+
 
     sal_Int32 nLine = pParaPortion->GetLines().Count()-1;
     for ( sal_Int32 nL = 0; nL <= nLine; nL++ )
@@ -731,9 +731,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
             pParaPortion->SetBulletX( 0 ); // if Bullet is set incorrectly
     }
 
-    // ---------------------------------------------------------------
+
     // Reformat all lines from here ...
-    // ---------------------------------------------------------------
+
     sal_Int32 nDelFromLine = -1;
     bool bLineBreak = false;
 
@@ -1275,9 +1275,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
                                                 nRemainingWidth, bCanHyphenate && bHyphenatePara );
         }
 
-        // ------------------------------------------------------------------
+
         // Line finished => adjust
-        // ------------------------------------------------------------------
+
 
         // CalcTextSize should be replaced by a continuous registering!
         Size aTextSize = pLine->CalcTextSize( *pParaPortion );
@@ -1440,9 +1440,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
             break;
         }
 
-        // -----------------------------------------------------------------
+
         // Check whether the line must be re-issued ...
-        // -----------------------------------------------------------------
+
         pLine->SetInvalid();
 
         // If a portion was wrapped there may be far too many positions in
@@ -2879,9 +2879,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
 
     long nVertLineSpacing = CalcVertLineSpacing(aStartPos);
 
-    // --------------------------------------------------
+
     // Over all the paragraphs ...
-    // --------------------------------------------------
+
     for ( sal_Int32 n = 0; n < GetParaPortions().Count(); n++ )
     {
         const ParaPortion* pPortion = GetParaPortions()[n];
@@ -2901,9 +2901,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                 ( IsVertical() && ( ( aStartPos.X() - nParaHeight ) < aClipRect.Right() ) ) ) )
 
         {
-            // --------------------------------------------------
+
             // Over the lines of the paragraph ...
-            // --------------------------------------------------
+
             sal_Int32 nLines = pPortion->GetLines().Count();
             sal_Int32 nLastLine = nLines-1;
 
@@ -2964,9 +2964,9 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt
                         bPaintBullet = rBulletState.GetValue() ? true : false;
                     }
 
-                    // --------------------------------------------------
+
                     // Over the Portions of the line ...
-                    // --------------------------------------------------
+
                     bool bParsingFields = false;
                     ::std::vector< sal_Int32 >::iterator itSubLines;
 
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 4a59051ee76f..2da1753d4f20 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -382,14 +382,14 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle nStyle )
     return aImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBorderLine::SvxBorderLine( const SvxBorderLine& r )
 {
     *this = r;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
 {
@@ -407,7 +407,7 @@ SvxBorderLine& SvxBorderLine::operator=( const SvxBorderLine& r )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBorderLine::ScaleMetrics( long nMult, long nDiv )
 {
@@ -514,7 +514,7 @@ sal_uInt16 SvxBorderLine::GetDistance() const
     return (sal_uInt16)Scale( m_aWidthImpl.GetGap( m_nWidth ), m_nMult, m_nDiv );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBorderLine::operator==( const SvxBorderLine& rCmp ) const
 {
@@ -611,7 +611,7 @@ Color SvxBorderLine::GetColorGap( ) const
     return aResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
                                       SfxMapUnit eDestUnit,
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index b9d687df002e..c2dfcbd9d07b 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -28,11 +28,11 @@
 
 #define BULITEM_VERSION     ((sal_uInt16)2)
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(SvxBulletItem,SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
 {
@@ -59,7 +59,7 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
     rStream.WriteUChar( rFont.IsTransparent() );
 }
 
-// -----------------------------------------------------------------------
+
 
 Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
 {
@@ -100,7 +100,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
 {
@@ -109,7 +109,7 @@ SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
     nValidMask = 0xFFFF;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
     : SfxPoolItem(_nWhich)
@@ -166,7 +166,7 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich )
     nValidMask = 0xFFFF;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem )
 {
@@ -183,7 +183,7 @@ SvxBulletItem::SvxBulletItem( const SvxBulletItem& rItem) : SfxPoolItem( rItem )
     nValidMask      = rItem.nValidMask;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBulletItem::~SvxBulletItem()
 {
@@ -191,21 +191,21 @@ SvxBulletItem::~SvxBulletItem()
         delete pGraphicObject;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SvxBulletItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const
 {
     return new SvxBulletItem( rStrm, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBulletItem::SetDefaultFont_Impl()
 {
@@ -214,7 +214,7 @@ void SvxBulletItem::SetDefaultFont_Impl()
     aFont.SetTransparent( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBulletItem::SetDefaults_Impl()
 {
@@ -227,14 +227,14 @@ void SvxBulletItem::SetDefaults_Impl()
     nScale          = 75;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const
 {
     return BULITEM_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
 {
@@ -267,7 +267,7 @@ void SvxBulletItem::CopyValidProperties( const SvxBulletItem& rCopyFrom )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -305,7 +305,7 @@ bool SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -367,7 +367,7 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
     return rStrm;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString SvxBulletItem::GetFullText() const
 {
@@ -377,7 +377,7 @@ OUString SvxBulletItem::GetFullText() const
     return aStr.makeStringAndClear();
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxBulletItem::GetPresentation
 (
@@ -405,7 +405,7 @@ SfxItemPresentation SvxBulletItem::GetPresentation
     return eRet;
 }
 
-//------------------------------------------------------------------------
+
 
 const GraphicObject& SvxBulletItem::GetGraphicObject() const
 {
@@ -418,7 +418,7 @@ const GraphicObject& SvxBulletItem::GetGraphicObject() const
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxBulletItem::SetGraphicObject( const GraphicObject& rGraphicObject )
 {
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 9887a5a72105..99f05750bb56 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -223,26 +223,26 @@ TYPEINIT1( SvxFieldItem, SfxPoolItem );
 
 SV_IMPL_PERSIST1( SvxFieldData, SvPersistBase );
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldData::SvxFieldData()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldData::~SvxFieldData()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldData* SvxFieldData::Clone() const
 {
     return new SvxFieldData;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFieldData::operator==( const SvxFieldData& rFld ) const
 {
@@ -251,13 +251,13 @@ bool SvxFieldData::operator==( const SvxFieldData& rFld ) const
     return true;    // Basic class is always the same.
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFieldData::Load( SvPersistStream & /*rStm*/ )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFieldData::Save( SvPersistStream & /*rStm*/ )
 {
@@ -274,7 +274,7 @@ MetaAction* SvxFieldData::createEndComment() const
     return new MetaCommentAction( "FIELD_SEQ_END" );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
@@ -282,7 +282,7 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
     pField = pFld;  // belongs directly to the item
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
@@ -290,7 +290,7 @@ SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
     pField = rField.Clone();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) :
     SfxPoolItem ( rItem )
@@ -298,21 +298,21 @@ SvxFieldItem::SvxFieldItem( const SvxFieldItem& rItem ) :
     pField = rItem.GetField() ? rItem.GetField()->Clone() : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldItem::~SvxFieldItem()
 {
     delete pField;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const
 {
     return new SvxFieldItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -329,7 +329,7 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxFieldItem( pData, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -350,7 +350,7 @@ SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) co
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -373,7 +373,7 @@ bool SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
 
 SV_IMPL_PERSIST1( SvxDateField, SvxFieldData );
 
-// -----------------------------------------------------------------------
+
 
 SvxDateField::SvxDateField()
 {
@@ -382,7 +382,7 @@ SvxDateField::SvxDateField()
     eFormat = SVXDATEFORMAT_STDSMALL;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF )
 {
@@ -391,14 +391,14 @@ SvxDateField::SvxDateField( const Date& rDate, SvxDateType eT, SvxDateFormat eF
     eFormat = eF;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldData* SvxDateField::Clone() const
 {
     return new SvxDateField( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxDateField::operator==( const SvxFieldData& rOther ) const
 {
@@ -411,7 +411,7 @@ bool SvxDateField::operator==( const SvxFieldData& rOther ) const
                 ( eFormat == rOtherFld.eFormat ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxDateField::Load( SvPersistStream & rStm )
 {
@@ -425,7 +425,7 @@ void SvxDateField::Load( SvPersistStream & rStm )
     eFormat= (SvxDateFormat)nFormat;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxDateField::Save( SvPersistStream & rStm )
 {
@@ -434,7 +434,7 @@ void SvxDateField::Save( SvPersistStream & rStm )
     rStm.WriteUInt16( (sal_uInt16)eFormat );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxDateField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
@@ -514,14 +514,14 @@ MetaAction* SvxDateField::createBeginComment() const
 
 SV_IMPL_PERSIST1( SvxURLField, SvxFieldData );
 
-// -----------------------------------------------------------------------
+
 
 SvxURLField::SvxURLField()
 {
     eFormat = SVXURLFORMAT_URL;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLFormat eFmt )
     : aURL( rURL ), aRepresentation( rRepres )
@@ -529,14 +529,14 @@ SvxURLField::SvxURLField( const OUString& rURL, const OUString& rRepres, SvxURLF
     eFormat = eFmt;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFieldData* SvxURLField::Clone() const
 {
     return new SvxURLField( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxURLField::operator==( const SvxFieldData& rOther ) const
 {
@@ -550,7 +550,7 @@ bool SvxURLField::operator==( const SvxFieldData& rOther ) const
                 ( aTargetFrame == rOtherFld.aTargetFrame ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void write_unicode( SvPersistStream & rStm, const OUString& rString )
 {
@@ -587,7 +587,7 @@ void SvxURLField::Load( SvPersistStream & rStm )
     aTargetFrame = read_unicode( rStm );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxURLField::Save( SvPersistStream & rStm )
 {
@@ -747,13 +747,13 @@ void SvxTableField::Save( SvPersistStream & /*rStm*/ )
 {
 }
 
-//----------------------------------------------------------------------------
+
 //      SvxExtTimeField
-//----------------------------------------------------------------------------
+
 
 SV_IMPL_PERSIST1( SvxExtTimeField, SvxFieldData );
 
-//----------------------------------------------------------------------------
+
 
 SvxExtTimeField::SvxExtTimeField()
     : m_nFixTime( Time(Time::SYSTEM).GetTime() )
@@ -762,7 +762,7 @@ SvxExtTimeField::SvxExtTimeField()
     eFormat = SVXTIMEFORMAT_STANDARD;
 }
 
-//----------------------------------------------------------------------------
+
 
 SvxExtTimeField::SvxExtTimeField( const Time& rTime, SvxTimeType eT, SvxTimeFormat eF )
     : m_nFixTime( rTime.GetTime() )
@@ -771,14 +771,14 @@ SvxExtTimeField::SvxExtTimeField( const Time& rTime, SvxTimeType eT, SvxTimeForm
     eFormat = eF;
 }
 
-//----------------------------------------------------------------------------
+
 
 SvxFieldData* SvxExtTimeField::Clone() const
 {
     return new SvxExtTimeField( *this );
 }
 
-//----------------------------------------------------------------------------
+
 
 bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
 {
@@ -791,7 +791,7 @@ bool SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
                 ( eFormat == rOtherFld.eFormat ) );
 }
 
-//----------------------------------------------------------------------------
+
 
 void SvxExtTimeField::Load( SvPersistStream & rStm )
 {
@@ -805,7 +805,7 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
     eFormat= (SvxTimeFormat) nFormat;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SvxExtTimeField::Save( SvPersistStream & rStm )
 {
@@ -814,7 +814,7 @@ void SvxExtTimeField::Save( SvPersistStream & rStm )
     rStm.WriteUInt16( (sal_uInt16) eFormat );
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString SvxExtTimeField::GetFormatted( SvNumberFormatter& rFormatter, LanguageType eLang ) const
 {
@@ -892,13 +892,13 @@ MetaAction* SvxExtTimeField::createBeginComment() const
     return new MetaCommentAction( "FIELD_SEQ_BEGIN" );
 }
 
-//----------------------------------------------------------------------------
+
 //      SvxExtFileField
-//----------------------------------------------------------------------------
+
 
 SV_IMPL_PERSIST1( SvxExtFileField, SvxFieldData );
 
-//----------------------------------------------------------------------------
+
 
 SvxExtFileField::SvxExtFileField()
 {
@@ -906,7 +906,7 @@ SvxExtFileField::SvxExtFileField()
     eFormat = SVXFILEFORMAT_FULLPATH;
 }
 
-//----------------------------------------------------------------------------
+
 
 SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileFormat eF )
 {
@@ -915,14 +915,14 @@ SvxExtFileField::SvxExtFileField( const OUString& rStr, SvxFileType eT, SvxFileF
     eFormat = eF;
 }
 
-//----------------------------------------------------------------------------
+
 
 SvxFieldData* SvxExtFileField::Clone() const
 {
     return new SvxExtFileField( *this );
 }
 
-//----------------------------------------------------------------------------
+
 
 bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const
 {
@@ -935,7 +935,7 @@ bool SvxExtFileField::operator==( const SvxFieldData& rOther ) const
                 ( eFormat == rOtherFld.eFormat ) );
 }
 
-//----------------------------------------------------------------------------
+
 
 void SvxExtFileField::Load( SvPersistStream & rStm )
 {
@@ -951,7 +951,7 @@ void SvxExtFileField::Load( SvPersistStream & rStm )
     eFormat= (SvxFileFormat) nFormat;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SvxExtFileField::Save( SvPersistStream & rStm )
 {
@@ -962,7 +962,7 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
     rStm.WriteUInt16( (sal_uInt16) eFormat );
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString SvxExtFileField::GetFormatted() const
 {
@@ -1039,13 +1039,13 @@ OUString SvxExtFileField::GetFormatted() const
     return aString;
 }
 
-//----------------------------------------------------------------------------
+
 //      SvxAuthorField
-//----------------------------------------------------------------------------
+
 
 SV_IMPL_PERSIST1( SvxAuthorField, SvxFieldData );
 
-//----------------------------------------------------------------------------
+
 
 SvxAuthorField::SvxAuthorField()
 {
@@ -1053,7 +1053,7 @@ SvxAuthorField::SvxAuthorField()
     eFormat = SVXAUTHORFORMAT_FULLNAME;
 }
 
-//----------------------------------------------------------------------------
+
 
 SvxAuthorField::SvxAuthorField( const OUString& rFirstName,
                                 const OUString& rLastName,
@@ -1067,14 +1067,14 @@ SvxAuthorField::SvxAuthorField( const OUString& rFirstName,
     eFormat = eF;
 }
 
-//----------------------------------------------------------------------------
+
 
 SvxFieldData* SvxAuthorField::Clone() const
 {
     return new SvxAuthorField( *this );
 }
 
-//----------------------------------------------------------------------------
+
 
 bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const
 {
@@ -1089,7 +1089,7 @@ bool SvxAuthorField::operator==( const SvxFieldData& rOther ) const
                 ( eFormat == rOtherFld.eFormat ) );
 }
 
-//----------------------------------------------------------------------------
+
 
 void SvxAuthorField::Load( SvPersistStream & rStm )
 {
@@ -1106,7 +1106,7 @@ void SvxAuthorField::Load( SvPersistStream & rStm )
     eFormat= (SvxAuthorFormat) nFormat;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SvxAuthorField::Save( SvPersistStream & rStm )
 {
@@ -1118,7 +1118,7 @@ void SvxAuthorField::Save( SvPersistStream & rStm )
     rStm.WriteUInt16( (sal_uInt16) eFormat );
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString SvxAuthorField::GetFormatted() const
 {
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index c70dd1d0b956..23c1177f2ed6 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -166,7 +166,7 @@ SfxPoolItem* SvxPaperBinItem::Clone( SfxItemPool* ) const
     return new SvxPaperBinItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -174,7 +174,7 @@ SvStream& SvxPaperBinItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -183,7 +183,7 @@ SfxPoolItem* SvxPaperBinItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxPaperBinItem( Which(), nBin );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPaperBinItem::GetPresentation
 (
@@ -232,7 +232,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -255,7 +255,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 
     return true;
 }
-// -----------------------------------------------------------------------
+
 bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -305,7 +305,7 @@ bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
 
@@ -313,7 +313,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -322,14 +322,14 @@ bool SvxSizeItem::operator==( const SfxPoolItem& rAttr ) const
     return ( aSize == ( (SvxSizeItem&)rAttr ).GetSize() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxSizeItem::Clone( SfxItemPool* ) const
 {
     return new SvxSizeItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxSizeItem::GetPresentation
 (
@@ -368,7 +368,7 @@ SfxItemPresentation SvxSizeItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -378,7 +378,7 @@ SvStream& SvxSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxSizeItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -387,14 +387,14 @@ bool SvxSizeItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxSizeItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxSizeItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -427,7 +427,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
                                 const long nTLeft, const short nOfset,
@@ -448,7 +448,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
 {
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     bool bRet = true;
@@ -493,7 +493,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -551,7 +551,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 // Adapt nLeftMargin and nTxtLeft.
 
@@ -563,7 +563,7 @@ void SvxLRSpaceItem::AdjustLeft()
         nLeftMargin = nTxtLeft;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -584,14 +584,14 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
         bExplicitZeroMarginValLeft == rOther.IsExplicitZeroMarginValLeft() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLRSpaceItem::Clone( SfxItemPool* ) const
 {
     return new SvxLRSpaceItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxLRSpaceItem::GetPresentation
 (
@@ -682,7 +682,7 @@ SfxItemPresentation SvxLRSpaceItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 // BulletFI: Before 501 in the Outliner the bullet was not on the position of
 // the FI, so in older documents one must set FI to 0.
@@ -736,7 +736,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
@@ -800,7 +800,7 @@ SfxPoolItem* SvxLRSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const
 {
@@ -809,7 +809,7 @@ sal_uInt16 SvxLRSpaceItem::GetVersion( sal_uInt16 nFileVersion ) const
                : LRSPACE_NEGATIVE_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -820,7 +820,7 @@ bool SvxLRSpaceItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLRSpaceItem::HasMetrics() const
 {
@@ -839,7 +839,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
                                 const sal_uInt16 nId )
@@ -852,7 +852,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
 {
 }
 
-// -----------------------------------------------------------------------
+
 bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -879,7 +879,7 @@ bool    SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -941,7 +941,7 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -954,14 +954,14 @@ bool SvxULSpaceItem::operator==( const SfxPoolItem& rAttr ) const
              nPropLower == ( (SvxULSpaceItem&)rAttr ).nPropLower );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxULSpaceItem::Clone( SfxItemPool* ) const
 {
     return new SvxULSpaceItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxULSpaceItem::GetPresentation
 (
@@ -1028,7 +1028,7 @@ SfxItemPresentation SvxULSpaceItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1039,7 +1039,7 @@ SvStream& SvxULSpaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
@@ -1063,14 +1063,14 @@ SfxPoolItem* SvxULSpaceItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) cons
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxULSpaceItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
     return ULSPACE_16_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -1079,7 +1079,7 @@ bool SvxULSpaceItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxULSpaceItem::HasMetrics() const
 {
@@ -1093,7 +1093,7 @@ SfxPoolItem* SvxPrintItem::Clone( SfxItemPool* ) const
     return new SvxPrintItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1101,7 +1101,7 @@ SvStream& SvxPrintItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -1110,7 +1110,7 @@ SfxPoolItem* SvxPrintItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxPrintItem( Which(), sal_Bool( bIsPrint != 0 ) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPrintItem::GetPresentation
 (
@@ -1148,7 +1148,7 @@ SfxPoolItem* SvxOpaqueItem::Clone( SfxItemPool* ) const
     return new SvxOpaqueItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1156,7 +1156,7 @@ SvStream& SvxOpaqueItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -1165,7 +1165,7 @@ SfxPoolItem* SvxOpaqueItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxOpaqueItem( Which(), sal_Bool( bIsOpaque != 0 ) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxOpaqueItem::GetPresentation
 (
@@ -1241,14 +1241,14 @@ bool    SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxProtectItem::Clone( SfxItemPool* ) const
 {
     return new SvxProtectItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxProtectItem::GetPresentation
 (
@@ -1289,7 +1289,7 @@ SfxItemPresentation SvxProtectItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1301,7 +1301,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -1328,7 +1328,7 @@ SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
         aShadowColor = *pColor;
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1364,7 +1364,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 
     return true;
 }
-// -----------------------------------------------------------------------
+
 bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1426,7 +1426,7 @@ bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -1437,14 +1437,14 @@ bool SvxShadowItem::operator==( const SfxPoolItem& rAttr ) const
              ( eLocation == ( (SvxShadowItem&)rAttr ).GetLocation() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxShadowItem::Clone( SfxItemPool* ) const
 {
     return new SvxShadowItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const
 {
@@ -1482,7 +1482,7 @@ sal_uInt16 SvxShadowItem::CalcShadowSpace( sal_uInt16 nShadow ) const
     return nSpace;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxShadowItem::GetPresentation
 (
@@ -1536,7 +1536,7 @@ SfxItemPresentation SvxShadowItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1549,7 +1549,7 @@ SvStream& SvxShadowItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxShadowItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -1557,14 +1557,14 @@ bool SvxShadowItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxShadowItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -1582,14 +1582,14 @@ SfxPoolItem* SvxShadowItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxShadowItem( Which(), &aColor, _nWidth, (SvxShadowLocation)cLoc );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxShadowItem::GetValueCount() const
 {
     return SVX_SHADOW_END;  // SVX_SHADOW_BOTTOMRIGHT + 1
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -1597,14 +1597,14 @@ OUString SvxShadowItem::GetValueTextByPos( sal_uInt16 nPos ) const
     return EE_RESSTR(RID_SVXITEMS_SHADOW_BEGIN + nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxShadowItem::GetEnumValue() const
 {
     return (sal_uInt16)GetLocation();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShadowItem::SetEnumValue( sal_uInt16 nVal )
 {
@@ -1628,7 +1628,7 @@ SvxBoxItem::SvxBoxItem( const SvxBoxItem& rCpy ) :
     pRight  = rCpy.GetRight()   ? new SvxBorderLine( *rCpy.GetRight() )  : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
@@ -1645,7 +1645,7 @@ SvxBoxItem::SvxBoxItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBoxItem::~SvxBoxItem()
 {
@@ -1655,7 +1655,7 @@ SvxBoxItem::~SvxBoxItem()
     delete pRight;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox )
 {
@@ -1670,7 +1670,7 @@ SvxBoxItem& SvxBoxItem::operator=( const SvxBoxItem& rBox )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline sal_Bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2 )
 {
@@ -1685,7 +1685,7 @@ inline sal_Bool CmpBrdLn( const SvxBorderLine* pBrd1, const SvxBorderLine* pBrd2
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -1702,7 +1702,7 @@ bool SvxBoxItem::operator==( const SfxPoolItem& rAttr ) const
         CmpBrdLn( pRight, ( (SvxBoxItem&)rAttr ).GetRight() ) );
 }
 
-// -----------------------------------------------------------------------
+
 table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, bool bConvert)
 {
     table::BorderLine2 aLine;
@@ -1719,7 +1719,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, bool bC
         aLine.Color          = aLine.InnerLineWidth = aLine.OuterLineWidth = aLine.LineDistance  = 0;
     return aLine;
 }
-// -----------------------------------------------------------------------
+
 bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId  ) const
 {
     sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -1812,7 +1812,7 @@ lcl_lineToSvxLine(const table::BorderLine& rLine, SvxBorderLine& rSvxLine, sal_B
 
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rLine, SvxBorderLine& rSvxLine, bool bConvert)
 {
     return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, sal_True);
@@ -1841,7 +1841,7 @@ SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, Svx
     return lcl_lineToSvxLine(rLine, rSvxLine, bConvert, bGuessWidth);
 }
 
-// -----------------------------------------------------------------------
+
 
 namespace
 {
@@ -2078,14 +2078,14 @@ bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBoxItem::Clone( SfxItemPool* ) const
 {
     return new SvxBoxItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxBoxItem::GetPresentation
 (
@@ -2228,7 +2228,7 @@ SfxItemPresentation SvxBoxItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
@@ -2270,7 +2270,7 @@ SvStream& SvxBoxItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const
 {
@@ -2282,7 +2282,7 @@ sal_uInt16 SvxBoxItem::GetVersion( sal_uInt16 nFFVer ) const
            SOFFICE_FILEFORMAT_40==nFFVer ? 0 : BOX_BORDER_STYLE_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -2297,14 +2297,14 @@ bool SvxBoxItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
 {
@@ -2344,7 +2344,7 @@ SfxPoolItem* SvxBoxItem::Create( SvStream& rStrm, sal_uInt16 nIVersion ) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 const SvxBorderLine *SvxBoxItem::GetLine( sal_uInt16 nLine ) const
 {
@@ -2372,7 +2372,7 @@ const SvxBorderLine *SvxBoxItem::GetLine( sal_uInt16 nLine ) const
     return pRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBoxItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine )
 {
@@ -2402,7 +2402,7 @@ void SvxBoxItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxBoxItem::GetDistance() const
 {
@@ -2418,7 +2418,7 @@ sal_uInt16 SvxBoxItem::GetDistance() const
     return nDist;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxBoxItem::GetDistance( sal_uInt16 nLine ) const
 {
@@ -2444,7 +2444,7 @@ sal_uInt16 SvxBoxItem::GetDistance( sal_uInt16 nLine ) const
     return nDist;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBoxItem::SetDistance( sal_uInt16 nNew, sal_uInt16 nLine )
 {
@@ -2467,7 +2467,7 @@ void SvxBoxItem::SetDistance( sal_uInt16 nNew, sal_uInt16 nLine )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, bool bIgnoreLine ) const
 {
@@ -2518,7 +2518,7 @@ SvxBoxInfoItem::SvxBoxInfoItem( const sal_uInt16 nId ) :
     ResetFlags();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) :
     SfxPoolItem( rCpy ),
@@ -2533,7 +2533,7 @@ SvxBoxInfoItem::SvxBoxInfoItem( const SvxBoxInfoItem& rCpy ) :
     nDefDist    = rCpy.GetDefDist();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBoxInfoItem::~SvxBoxInfoItem()
 {
@@ -2541,7 +2541,7 @@ SvxBoxInfoItem::~SvxBoxInfoItem()
     delete pVert;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy )
 {
@@ -2558,7 +2558,7 @@ SvxBoxInfoItem &SvxBoxInfoItem::operator=( const SvxBoxInfoItem& rCpy )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -2577,7 +2577,7 @@ bool SvxBoxInfoItem::operator==( const SfxPoolItem& rAttr ) const
            );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine )
 {
@@ -2600,14 +2600,14 @@ void SvxBoxInfoItem::SetLine( const SvxBorderLine* pNew, sal_uInt16 nLine )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBoxInfoItem::Clone( SfxItemPool* ) const
 {
     return new SvxBoxInfoItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxBoxInfoItem::GetPresentation
 (
@@ -2621,7 +2621,7 @@ SfxItemPresentation SvxBoxInfoItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2655,7 +2655,7 @@ SvStream& SvxBoxInfoItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -2665,14 +2665,14 @@ bool SvxBoxInfoItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxInfoItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -2709,7 +2709,7 @@ SfxPoolItem* SvxBoxInfoItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBoxInfoItem::ResetFlags()
 {
@@ -2779,7 +2779,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId  ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
@@ -2953,7 +2953,7 @@ bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
     return GetValue() == ( (SvxFmtBreakItem&)rAttr ).GetValue();
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFmtBreakItem::GetPresentation
 (
@@ -2978,7 +2978,7 @@ SfxItemPresentation SvxFmtBreakItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -2986,7 +2986,7 @@ OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
     return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     style::BreakType eBreak = style::BreakType_NONE;
@@ -3003,7 +3003,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons
     rVal <<= eBreak;
     return true;
 }
-// -----------------------------------------------------------------------
+
 bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     style::BreakType nBreak;
@@ -3033,14 +3033,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
 {
     return new SvxFmtBreakItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
@@ -3050,7 +3050,7 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
 {
@@ -3062,7 +3062,7 @@ sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
            SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
@@ -3073,7 +3073,7 @@ SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) con
     return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxFmtBreakItem::GetValueCount() const
 {
@@ -3087,7 +3087,7 @@ SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
     return new SvxFmtKeepItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -3095,7 +3095,7 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -3104,7 +3104,7 @@ SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxFmtKeepItem( sal_Bool( bIsKeep != 0 ), Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFmtKeepItem::GetPresentation
 (
@@ -3145,7 +3145,7 @@ SvxLineItem::SvxLineItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) :
 
@@ -3154,14 +3154,14 @@ SvxLineItem::SvxLineItem( const SvxLineItem& rCpy ) :
     pLine = rCpy.GetLine() ? new SvxBorderLine( *rCpy.GetLine() ) : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineItem::~SvxLineItem()
 {
     delete pLine;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine )
 {
@@ -3170,7 +3170,7 @@ SvxLineItem& SvxLineItem::operator=( const SvxLineItem& rLine )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -3179,7 +3179,7 @@ bool SvxLineItem::operator==( const SfxPoolItem& rAttr ) const
     return CmpBrdLn( pLine, ((SvxLineItem&)rAttr).GetLine() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
 {
@@ -3212,7 +3212,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
 {
@@ -3254,7 +3254,7 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxLineItem::GetPresentation
 (
@@ -3283,7 +3283,7 @@ SfxItemPresentation SvxLineItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -3302,7 +3302,7 @@ SvStream& SvxLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -3310,14 +3310,14 @@ bool SvxLineItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -3335,7 +3335,7 @@ SfxPoolItem* SvxLineItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return _pLine;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineItem::SetLine( const SvxBorderLine* pNew )
 {
@@ -3363,14 +3363,14 @@ public:
     SvxBrushItem_Impl( GraphicObject* p ) : pGraphicObject( p ), nGraphicTransparency(0), pStream(0) {}
 };
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::SetDoneLink( const Link& rLink )
 {
     pImpl->aDoneLink = rLink;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
 
@@ -3387,7 +3387,7 @@ SvxBrushItem::SvxBrushItem( sal_uInt16 _nWhich ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) :
 
@@ -3404,7 +3404,7 @@ SvxBrushItem::SvxBrushItem( const Color& rColor, sal_uInt16 _nWhich) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos,
                             sal_uInt16 _nWhich ) :
@@ -3423,7 +3423,7 @@ SvxBrushItem::SvxBrushItem( const Graphic& rGraphic, SvxGraphicPosition ePos,
     DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj,
                             SvxGraphicPosition ePos, sal_uInt16 _nWhich ) :
@@ -3442,7 +3442,7 @@ SvxBrushItem::SvxBrushItem( const GraphicObject& rGraphicObj,
     DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem(
     const OUString& rLink, const OUString& rFilter,
@@ -3462,7 +3462,7 @@ SvxBrushItem::SvxBrushItem(
     DBG_ASSERT( GPOS_NONE != ePos, "SvxBrushItem-Ctor with GPOS_NONE == ePos" );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
                             sal_uInt16 _nWhich )
@@ -3577,7 +3577,7 @@ SvxBrushItem::SvxBrushItem( SvStream& rStream, sal_uInt16 nVersion,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
 
@@ -3593,7 +3593,7 @@ SvxBrushItem::SvxBrushItem( const SvxBrushItem& rItem ) :
     *this = rItem;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem::~SvxBrushItem()
 {
@@ -3601,14 +3601,14 @@ SvxBrushItem::~SvxBrushItem()
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxBrushItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
 {
     return BRUSH_GRAPHIC_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 static inline sal_Int8 lcl_PercentToTransparency(long nPercent)
 {
     //0xff must not be returned!
@@ -3683,7 +3683,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
@@ -3804,7 +3804,7 @@ bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SvxBrushItem::GetPresentation
 (
@@ -3845,7 +3845,7 @@ SfxItemPresentation SvxBrushItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem )
 {
@@ -3872,7 +3872,7 @@ SvxBrushItem& SvxBrushItem::operator=( const SvxBrushItem& rItem )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -3912,21 +3912,21 @@ bool SvxBrushItem::operator==( const SfxPoolItem& rAttr ) const
     return bEqual;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBrushItem::Clone( SfxItemPool* ) const
 {
     return new SvxBrushItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBrushItem::Create( SvStream& rStream, sal_uInt16 nVersion ) const
 {
     return new SvxBrushItem( rStream, nVersion, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -3964,14 +3964,14 @@ SvStream& SvxBrushItem::Store( SvStream& rStream , sal_uInt16 /*nItemVersion*/ )
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::PurgeMedium() const
 {
     DELETEZ( pImpl->pStream );
 }
 
-// -----------------------------------------------------------------------
+
 const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) const
 {
     if ( bLoadAgain && !maStrLink.isEmpty() && !pImpl->pGraphicObject )
@@ -4010,7 +4010,7 @@ const GraphicObject* SvxBrushItem::GetGraphicObject(OUString const & referer) co
     return pImpl->pGraphicObject;
 }
 
-// -----------------------------------------------------------------------
+
 
 const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const
 {
@@ -4018,7 +4018,7 @@ const Graphic* SvxBrushItem::GetGraphic(OUString const & referer) const
     return( pGrafObj ? &( pGrafObj->GetGraphic() ) : NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew )
 {
@@ -4039,7 +4039,7 @@ void SvxBrushItem::SetGraphicPos( SvxGraphicPosition eNew )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::SetGraphic( const Graphic& rNew )
 {
@@ -4061,7 +4061,7 @@ void SvxBrushItem::SetGraphic( const Graphic& rNew )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj )
 {
@@ -4083,7 +4083,7 @@ void SvxBrushItem::SetGraphicObject( const GraphicObject& rNewObj )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::SetGraphicLink( const OUString& rNew )
 {
@@ -4096,7 +4096,7 @@ void SvxBrushItem::SetGraphicLink( const OUString& rNew )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxBrushItem::SetGraphicFilter( const OUString& rNew )
 {
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index ec28bbbd9c7a..8b32cb02ae45 100644
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
@@ -25,7 +25,7 @@
 #include <editeng/eerdll.hxx>
 #include <rtl/ustrbuf.hxx>
 
-// -----------------------------------------------------------------------
+
 
 OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, const IntlWrapper* pIntl )
 {
@@ -128,14 +128,14 @@ OUString GetMetricText( long nVal, SfxMapUnit eSrcUnit, SfxMapUnit eDestUnit, co
     return sRet.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString GetSvxString( sal_uInt16 nId )
 {
     return EE_RESSTR( nId );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString GetColorString( const Color& rCol )
 {
@@ -170,7 +170,7 @@ OUString GetColorString( const Color& rCol )
     return sStr;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 GetMetricId( SfxMapUnit eUnit )
 {
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 0fcb3d31b32a..dfe61a8582f8 100644
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
@@ -47,7 +47,7 @@ SfxSpellCheckItem::SfxSpellCheckItem
     xSpellCheck = xChecker;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) :
 
@@ -56,7 +56,7 @@ SfxSpellCheckItem::SfxSpellCheckItem( const SfxSpellCheckItem& rItem ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SfxSpellCheckItem::GetPresentation
 (
@@ -83,14 +83,14 @@ SfxItemPresentation SfxSpellCheckItem::GetPresentation
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxSpellCheckItem::Clone( SfxItemPool* ) const
 {
     return new SfxSpellCheckItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxSpellCheckItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -107,7 +107,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const sal_uInt16 nId ) :
     nMinLead = nMinTrail = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) :
 
@@ -118,7 +118,7 @@ SfxHyphenRegionItem::SfxHyphenRegionItem( const SfxHyphenRegionItem& rItem ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -128,14 +128,14 @@ bool SfxHyphenRegionItem::operator==( const SfxPoolItem& rAttr ) const
              ( ( (SfxHyphenRegionItem&)rAttr ).nMinTrail == nMinTrail ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxHyphenRegionItem::Clone( SfxItemPool* ) const
 {
     return new SfxHyphenRegionItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SfxHyphenRegionItem::GetPresentation
 (
@@ -166,7 +166,7 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const
 {
@@ -178,7 +178,7 @@ SfxPoolItem* SfxHyphenRegionItem::Create(SvStream& rStrm, sal_uInt16 ) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxHyphenRegionItem::Store( SvStream& rStrm, sal_uInt16 ) const
 {
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 76b29bf559e5..ebce024c6bc0 100644
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -33,7 +33,7 @@ inline sal_Bool IsValidPrinter( const Printer* pPtr )
     return pPtr->GetName().isEmpty() ? sal_False : sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 Size SvxPaperInfo::GetPaperSize( Paper ePaper, MapUnit eUnit )
 {
@@ -84,7 +84,7 @@ Size SvxPaperInfo::GetPaperSize( const Printer* pPrinter )
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy )
 {
@@ -95,7 +95,7 @@ Paper SvxPaperInfo::GetSvxPaper( const Size &rSize, MapUnit eUnit, bool bSloppy
     return aInfo.getPaper();
 }
 
-// -----------------------------------------------------------------------
+
 
 long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit )
 {
@@ -104,7 +104,7 @@ long SvxPaperInfo::GetSloppyPaperDimension( long nSize, MapUnit eUnit )
     return eUnit == MAP_100TH_MM ? nSize : OutputDevice::LogicToLogic(nSize, MAP_100TH_MM, eUnit);
 }
 
-// -----------------------------------------------------------------------
+
 
 Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
 {
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 64b75294193b..9c0748d0d880 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -63,7 +63,7 @@ using namespace ::com::sun::star;
 // STATIC DATA -----------------------------------------------------------
 
 
-// -----------------------------------------------------------------------
+
 
 
 TYPEINIT1_FACTORY(SvxLineSpacingItem, SfxPoolItem , new SvxLineSpacingItem(LINE_SPACE_DEFAULT_HEIGHT, 0));
@@ -80,7 +80,7 @@ TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(sa
 TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0));
 TYPEINIT1_FACTORY(SvxParaGridItem, SfxBoolItem, new SvxParaGridItem(sal_True, 0));
 
-// -----------------------------------------------------------------------
+
 
 SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId )
     : SfxEnumItemInterface( nId )
@@ -92,7 +92,7 @@ SvxLineSpacingItem::SvxLineSpacingItem( sal_uInt16 nHeight, const sal_uInt16 nId
     eInterLineSpace = SVX_INTER_LINE_SPACE_OFF;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -226,14 +226,14 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLineSpacingItem::Clone( SfxItemPool * ) const
 {
     return new SvxLineSpacingItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxLineSpacingItem::GetPresentation
 (
@@ -251,7 +251,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -274,7 +274,7 @@ SfxPoolItem* SvxLineSpacingItem::Create(SvStream& rStrm, sal_uInt16) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -286,14 +286,14 @@ SvStream& SvxLineSpacingItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxLineSpacingItem::GetValueCount() const
 {
     return SVX_LINESPACE_END;   // SVX_LINESPACE_TWO_LINES + 1
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -317,7 +317,7 @@ OUString SvxLineSpacingItem::GetValueTextByPos( sal_uInt16 nPos ) const
     return aText;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxLineSpacingItem::GetEnumValue() const
 {
@@ -332,7 +332,7 @@ sal_uInt16 SvxLineSpacingItem::GetEnumValue() const
     return nVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineSpacingItem::SetEnumValue( sal_uInt16 nVal )
 {
@@ -353,7 +353,7 @@ SvxAdjustItem::SvxAdjustItem(const SvxAdjust eAdjst, const sal_uInt16 nId )
     SetAdjust( eAdjst );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -419,14 +419,14 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId  )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxAdjustItem::Clone( SfxItemPool * ) const
 {
     return new SvxAdjustItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxAdjustItem::GetPresentation
 (
@@ -450,14 +450,14 @@ SfxItemPresentation SvxAdjustItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxAdjustItem::GetValueCount() const
 {
     return SVX_ADJUST_END;  // SVX_ADJUST_BLOCKLINE + 1
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -465,21 +465,21 @@ OUString SvxAdjustItem::GetValueTextByPos( sal_uInt16 nPos ) const
     return EE_RESSTR(RID_SVXITEMS_ADJUST_BEGIN + nPos);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxAdjustItem::GetEnumValue() const
 {
     return (sal_uInt16)GetAdjust();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxAdjustItem::SetEnumValue( sal_uInt16 nVal )
 {
     SetAdjust( (const SvxAdjust)nVal );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const
 {
@@ -487,7 +487,7 @@ sal_uInt16 SvxAdjustItem::GetVersion( sal_uInt16 nFileVersion ) const
                ? 0 : ADJUST_LASTBLOCK_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const
 {
@@ -505,7 +505,7 @@ SfxPoolItem* SvxAdjustItem::Create(SvStream& rStrm, sal_uInt16 nVersion) const
     return pRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
 {
@@ -531,14 +531,14 @@ SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxWidowsItem::Clone( SfxItemPool * ) const
 {
     return new SvxWidowsItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -547,7 +547,7 @@ SfxPoolItem* SvxWidowsItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxWidowsItem( nLines, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -555,7 +555,7 @@ SvStream& SvxWidowsItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) c
     return rStrm;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxWidowsItem::GetPresentation
 (
@@ -602,14 +602,14 @@ SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOrphansItem::Clone( SfxItemPool * ) const
 {
     return new SvxOrphansItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -618,7 +618,7 @@ SfxPoolItem* SvxOrphansItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxOrphansItem( nLines, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -626,7 +626,7 @@ SvStream& SvxOrphansItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxOrphansItem::GetPresentation
 (
@@ -677,7 +677,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const bool bHyph, const sal_uInt16 nId ) :
     nMaxHyphens = 255;
 }
 
-// -----------------------------------------------------------------------
+
 bool    SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     nMemberId &= ~CONVERT_TWIPS;
@@ -698,7 +698,7 @@ bool    SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) con
     }
     return true;
 }
-// -----------------------------------------------------------------------
+
 bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     nMemberId &= ~CONVERT_TWIPS;
@@ -726,7 +726,7 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -739,14 +739,14 @@ bool SvxHyphenZoneItem::operator==( const SfxPoolItem& rAttr ) const
             && (((SvxHyphenZoneItem&)rAttr).nMaxHyphens == nMaxHyphens) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxHyphenZoneItem::Clone( SfxItemPool * ) const
 {
     return new SvxHyphenZoneItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxHyphenZoneItem::GetPresentation
 (
@@ -805,7 +805,7 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -821,7 +821,7 @@ SfxPoolItem* SvxHyphenZoneItem::Create(SvStream& rStrm, sal_uInt16) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxHyphenZoneItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -843,7 +843,7 @@ SvxTabStop::SvxTabStop()
     cFill = cDfltFillChar;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst,
                         const sal_Unicode cDec, const sal_Unicode cFil )
@@ -853,13 +853,13 @@ SvxTabStop::SvxTabStop( const sal_Int32 nPos, const SvxTabAdjust eAdjst,
     m_cDecimal = cDec;
     cFill = cFil;
 }
-// -----------------------------------------------------------------------------
+
 void SvxTabStop::fillDecimal() const
 {
     if ( cDfltDecimalChar == m_cDecimal )
         m_cDecimal = SvtSysLocale().GetLocaleData().getNumDecimalSep()[0];
 }
-// -----------------------------------------------------------------------
+
 
 OUString SvxTabStop::GetValueString() const
 {
@@ -894,7 +894,7 @@ SvxTabStopItem::SvxTabStopItem( sal_uInt16 _nWhich ) :
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs,
                                 const sal_uInt16 nDist,
@@ -910,7 +910,7 @@ SvxTabStopItem::SvxTabStopItem( const sal_uInt16 nTabs,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) :
     SfxPoolItem( rTSI.Which() ),
@@ -918,7 +918,7 @@ SvxTabStopItem::SvxTabStopItem( const SvxTabStopItem& rTSI ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const
 {
@@ -926,7 +926,7 @@ sal_uInt16 SvxTabStopItem::GetPos( const SvxTabStop& rTab ) const
     return it != maTabStops.end() ? it - maTabStops.begin() : SVX_TAB_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const
 {
@@ -934,7 +934,7 @@ sal_uInt16 SvxTabStopItem::GetPos( const sal_Int32 nPos ) const
     return it != maTabStops.end() ? it - maTabStops.begin() : SVX_TAB_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI )
 {
@@ -1077,7 +1077,7 @@ bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     }
     return true;
 }
-// -----------------------------------------------------------------------
+
 
 bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -1094,14 +1094,14 @@ bool SvxTabStopItem::operator==( const SfxPoolItem& rAttr ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxTabStopItem::Clone( SfxItemPool * ) const
 {
     return new SvxTabStopItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxTabStopItem::GetPresentation
 (
@@ -1136,7 +1136,7 @@ SfxItemPresentation SvxTabStopItem::GetPresentation
     return ePres;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -1158,7 +1158,7 @@ SfxPoolItem* SvxTabStopItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1215,7 +1215,7 @@ SvStream& SvxTabStopItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxTabStopItem::Insert( const SvxTabStop& rTab )
 {
     sal_uInt16 nTabPos = GetPos(rTab);
@@ -1223,7 +1223,7 @@ bool SvxTabStopItem::Insert( const SvxTabStop& rTab )
         Remove(nTabPos);
     return maTabStops.insert( rTab ).second;
 }
-// -----------------------------------------------------------------------
+
 void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
                             sal_uInt16 nEnd )
 {
@@ -1246,13 +1246,13 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
 SvxFmtSplitItem::~SvxFmtSplitItem()
 {
 }
-// -----------------------------------------------------------------------
+
 SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
 {
     return new SvxFmtSplitItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1260,7 +1260,7 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -1269,7 +1269,7 @@ SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxFmtSplitItem( sal_Bool( bIsSplit != 0 ), Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFmtSplitItem::GetPresentation
 (
@@ -1299,14 +1299,14 @@ SfxItemPresentation SvxFmtSplitItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// --------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
 {
     return new SvxPageModelItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
@@ -1369,7 +1369,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxScriptSpaceItem::SvxScriptSpaceItem( sal_Bool bOn, const sal_uInt16 nId )
     : SfxBoolItem( nId, bOn )
@@ -1421,7 +1421,7 @@ SfxItemPresentation SvxScriptSpaceItem::GetPresentation(
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxHangingPunctuationItem::SvxHangingPunctuationItem(
                                     bool bOn, const sal_uInt16 nId )
@@ -1474,7 +1474,7 @@ SfxItemPresentation SvxHangingPunctuationItem::GetPresentation(
     }
     return SFX_ITEM_PRESENTATION_NONE;
 }
-//------------------------------------------------------------------------
+
 
 SvxForbiddenRuleItem::SvxForbiddenRuleItem(
                                     sal_Bool bOn, const sal_uInt16 nId )
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 157ac624ed99..6d9b8288f519 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -109,7 +109,7 @@ sal_Bool SvxFontItem::bEnableStoreUnicodeNames = sal_False;
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(SvxFontListItem, SfxPoolItem);
 TYPEINIT1_FACTORY(SvxFontItem, SfxPoolItem, new SvxFontItem(0));
@@ -164,7 +164,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) :
 
@@ -174,14 +174,14 @@ SvxFontListItem::SvxFontListItem( const SvxFontListItem& rItem ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontListItem::Clone( SfxItemPool* ) const
 {
     return new SvxFontListItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -196,7 +196,7 @@ bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFontListItem::GetPresentation
 (
@@ -220,7 +220,7 @@ SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
     eTextEncoding = RTL_TEXTENCODING_DONTKNOW;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName,
                   const OUString& aStName, const FontPitch eFontPitch,
@@ -236,7 +236,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const OUString& aName,
     eTextEncoding = eFontTextEncoding;
 }
 
-// -----------------------------------------------------------------------
+
 SvxFontItem& SvxFontItem::operator=(const SvxFontItem& rFont)
 {
     aFamilyName =  rFont.GetFamilyName();
@@ -246,7 +246,7 @@ SvxFontItem& SvxFontItem::operator=(const SvxFontItem& rFont)
     eTextEncoding = rFont.GetCharSet();
     return *this;
 }
-// -----------------------------------------------------------------------
+
 
 bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
@@ -276,7 +276,7 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     }
     return true;
 }
-// -----------------------------------------------------------------------
+
 bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
 {
     nMemberId &= ~CONVERT_TWIPS;
@@ -339,7 +339,7 @@ bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -362,14 +362,14 @@ bool SvxFontItem::operator==( const SfxPoolItem& rAttr ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const
 {
     return new SvxFontItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -396,7 +396,7 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) co
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -439,7 +439,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
                             (FontPitch)eFontPitch, (rtl_TextEncoding)eFontTextEncoding, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFontItem::GetPresentation
 (
@@ -463,7 +463,7 @@ SfxItemPresentation SvxFontItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxFontItem::EnableStoreUnicodeNames( sal_Bool bEnable )
 {
@@ -477,21 +477,21 @@ SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const
 {
     return new SvxPostureItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxPostureItem::GetValueCount() const
 {
     return ITALIC_NORMAL + 1;   // ITALIC_NONE also belongs here
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -499,7 +499,7 @@ SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -508,7 +508,7 @@ SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxPostureItem( (const FontItalic)nPosture, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPostureItem::GetPresentation
 (
@@ -532,7 +532,7 @@ SfxItemPresentation SvxPostureItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -591,21 +591,21 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     }
     return true;
 }
-// -----------------------------------------------------------------------
+
 
 bool SvxPostureItem::HasBoolValue() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxPostureItem::GetBoolValue() const
 {
     return ( (FontItalic)GetValue() >= ITALIC_OBLIQUE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPostureItem::SetBoolValue( sal_Bool bVal )
 {
@@ -621,42 +621,42 @@ SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
 
 
 
-// -----------------------------------------------------------------------
+
 
 bool SvxWeightItem::HasBoolValue() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxWeightItem::GetBoolValue() const
 {
     return  (FontWeight)GetValue() >= WEIGHT_BOLD;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxWeightItem::SetBoolValue( sal_Bool bVal )
 {
     SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxWeightItem::GetValueCount() const
 {
     return WEIGHT_BLACK;    // WEIGHT_DONTKNOW does not belong
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
 {
     return new SvxWeightItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -664,7 +664,7 @@ SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -673,7 +673,7 @@ SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxWeightItem( (FontWeight)nWeight, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxWeightItem::GetPresentation
 (
@@ -697,7 +697,7 @@ SfxItemPresentation SvxWeightItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -757,14 +757,14 @@ SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
     SetHeight( nSz,nPrp );  // calculate in percentage
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
 {
     return new SvxFontHeightItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
@@ -784,7 +784,7 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
                                                  sal_uInt16 nVersion ) const
@@ -810,7 +810,7 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
     return pItem;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -1037,7 +1037,7 @@ bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFontHeightItem::GetPresentation
 (
@@ -1077,7 +1077,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const
 {
@@ -1086,7 +1086,7 @@ sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const
                : FONTHEIGHT_UNIT_VERSION;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -1094,7 +1094,7 @@ bool SvxFontHeightItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontHeightItem::HasMetrics() const
 {
@@ -1146,14 +1146,14 @@ SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp,
     nProp = nPrp;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
 {
     return new SvxFontWidthItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1161,7 +1161,7 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -1169,14 +1169,14 @@ bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontWidthItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
                                                  sal_uInt16 /*nVersion*/ ) const
@@ -1191,7 +1191,7 @@ SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
     return pItem;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -1236,7 +1236,7 @@ bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxFontWidthItem::GetPresentation
 (
@@ -1276,28 +1276,28 @@ SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxTextLineItem::HasBoolValue() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxTextLineItem::GetBoolValue() const
 {
     return  (FontUnderline)GetValue() != UNDERLINE_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTextLineItem::SetBoolValue( sal_Bool bVal )
 {
     SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
 {
@@ -1306,14 +1306,14 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
     return pNew;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxTextLineItem::GetValueCount() const
 {
     return UNDERLINE_DOTTED + 1;    // UNDERLINE_NONE also belongs here
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1321,7 +1321,7 @@ SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1330,7 +1330,7 @@ SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxTextLineItem(  (FontUnderline)nState, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxTextLineItem::GetPresentation
 (
@@ -1356,7 +1356,7 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
 {
@@ -1440,7 +1440,7 @@ SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nI
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
 {
@@ -1449,7 +1449,7 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
     return pNew;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1458,7 +1458,7 @@ SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxUnderlineItem(  (FontUnderline)nState, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -1473,7 +1473,7 @@ SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
 {
@@ -1482,7 +1482,7 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
     return pNew;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1491,7 +1491,7 @@ SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxOverlineItem(  (FontUnderline)nState, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -1506,42 +1506,42 @@ SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxCrossedOutItem::HasBoolValue() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxCrossedOutItem::GetBoolValue() const
 {
     return (FontStrikeout)GetValue() != STRIKEOUT_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal )
 {
     SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxCrossedOutItem::GetValueCount() const
 {
     return STRIKEOUT_DOUBLE + 1;    // STRIKEOUT_NONE belongs also here
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
 {
     return new SvxCrossedOutItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1549,7 +1549,7 @@ SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1558,7 +1558,7 @@ SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxCrossedOutItem(  (FontStrikeout)eCross, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxCrossedOutItem::GetPresentation
 (
@@ -1582,7 +1582,7 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -1631,14 +1631,14 @@ SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const sal_uInt16 nId
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
 {
     return new SvxShadowedItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1646,7 +1646,7 @@ SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1655,7 +1655,7 @@ SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxShadowedItem( nState, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxShadowedItem::GetPresentation
 (
@@ -1692,14 +1692,14 @@ SvxAutoKernItem::SvxAutoKernItem( const bool bAutoKern, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
 {
     return new SvxAutoKernItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1707,7 +1707,7 @@ SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1716,7 +1716,7 @@ SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxAutoKernItem( nState, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxAutoKernItem::GetPresentation
 (
@@ -1754,14 +1754,14 @@ SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
 {
     return new SvxWordLineModeItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1769,7 +1769,7 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1778,7 +1778,7 @@ SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxWordLineModeItem( bValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxWordLineModeItem::GetPresentation
 (
@@ -1815,14 +1815,14 @@ SvxContourItem::SvxContourItem( const bool bContoured, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
 {
     return new SvxContourItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1830,7 +1830,7 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1839,7 +1839,7 @@ SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxContourItem( bValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxContourItem::GetPresentation
 (
@@ -1876,14 +1876,14 @@ SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nI
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const
 {
     return new SvxPropSizeItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -1891,7 +1891,7 @@ SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -1900,7 +1900,7 @@ SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxPropSizeItem( nSize, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPropSizeItem::GetPresentation
 (
@@ -1922,7 +1922,7 @@ SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
     SfxPoolItem( nId ),
@@ -1930,7 +1930,7 @@ SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
     SfxPoolItem( nId )
@@ -1940,7 +1940,7 @@ SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
     mColor = aColor;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorItem::SvxColorItem( const SvxColorItem &rCopy ) :
     SfxPoolItem( rCopy ),
@@ -1948,13 +1948,13 @@ SvxColorItem::SvxColorItem( const SvxColorItem &rCopy ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorItem::~SvxColorItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
 {
     DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
@@ -1964,7 +1964,7 @@ sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
     return  SOFFICE_FILEFORMAT_50 >= nFFVer ? VERSION_USEAUTOCOLOR : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -1973,7 +1973,7 @@ bool SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
     return  mColor == ( (const SvxColorItem&)rAttr ).mColor;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
@@ -1981,7 +1981,7 @@ bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
@@ -1993,14 +1993,14 @@ bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const
 {
     return new SvxColorItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
 {
@@ -2012,14 +2012,14 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const
 {
     return new SvxColorItem( rStrm, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxColorItem::GetPresentation
 (
@@ -2043,7 +2043,7 @@ SfxItemPresentation SvxColorItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorItem::SetValue( const Color& rNewCol )
 {
@@ -2059,7 +2059,7 @@ SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
                                           const rtl_TextEncoding _eFrom,
@@ -2071,14 +2071,14 @@ SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
 {
     return new SvxCharSetColorItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2087,7 +2087,7 @@ SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersio
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2098,7 +2098,7 @@ SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxCharSetColorItem( aColor,  (rtl_TextEncoding)cSet, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxCharSetColorItem::GetPresentation
 (
@@ -2119,14 +2119,14 @@ SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
 {
     return new SvxKerningItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2134,7 +2134,7 @@ SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxKerningItem::ScaleMetrics( long nMult, long nDiv )
 {
@@ -2142,14 +2142,14 @@ bool SvxKerningItem::ScaleMetrics( long nMult, long nDiv )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxKerningItem::HasMetrics() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2158,7 +2158,7 @@ SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxKerningItem( nValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxKerningItem::GetPresentation
 (
@@ -2207,7 +2207,7 @@ bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     rVal <<= nVal;
     return true;
 }
-// -----------------------------------------------------------------------
+
 bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
 {
     sal_Int16 nVal = sal_Int16();
@@ -2226,21 +2226,21 @@ SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxCaseMapItem::GetValueCount() const
 {
     return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
 {
     return new SvxCaseMapItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2248,7 +2248,7 @@ SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2257,7 +2257,7 @@ SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxCaseMapItem::GetPresentation
 (
@@ -2281,7 +2281,7 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -2331,7 +2331,7 @@ SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
                                       const sal_uInt16 nId ) :
@@ -2343,7 +2343,7 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
         nProp = 58;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxEscapementItem::SvxEscapementItem( const short _nEsc,
                                       const sal_uInt8 _nProp,
@@ -2354,7 +2354,7 @@ SvxEscapementItem::SvxEscapementItem( const short _nEsc,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -2364,14 +2364,14 @@ bool SvxEscapementItem::operator==( const SfxPoolItem& rAttr ) const
             nProp == ((SvxEscapementItem&)rAttr).nProp );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const
 {
     return new SvxEscapementItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2388,7 +2388,7 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2398,14 +2398,14 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxEscapementItem( _nEsc, _nProp, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxEscapementItem::GetValueCount() const
 {
     return SVX_ESCAPEMENT_END;  // SVX_ESCAPEMENT_SUBSCRIPT + 1
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxEscapementItem::GetPresentation
 (
@@ -2439,7 +2439,7 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -2447,7 +2447,7 @@ OUString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
     return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxEscapementItem::GetEnumValue() const
 {
@@ -2458,7 +2458,7 @@ sal_uInt16 SvxEscapementItem::GetEnumValue() const
     return SVX_ESCAPEMENT_OFF;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal )
 {
@@ -2534,7 +2534,7 @@ SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageItem::GetValueCount() const
 {
@@ -2546,14 +2546,14 @@ sal_uInt16 SvxLanguageItem::GetValueCount() const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
 {
     return new SvxLanguageItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2561,7 +2561,7 @@ SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2570,7 +2570,7 @@ SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxLanguageItem( (LanguageType)nValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxLanguageItem::GetPresentation
 (
@@ -2646,14 +2646,14 @@ SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const sal_uInt16
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const
 {
     return new SvxNoLinebreakItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2661,7 +2661,7 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2670,7 +2670,7 @@ SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxNoLinebreakItem( bValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxNoLinebreakItem::GetPresentation
 (
@@ -2691,14 +2691,14 @@ SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const sal_uInt16 nId )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
 {
     return new SvxNoHyphenItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2706,7 +2706,7 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -2715,7 +2715,7 @@ SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxNoHyphenItem( bValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxNoHyphenItem::GetPresentation
 (
@@ -2734,29 +2734,29 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation
  *
  */
 
-// -----------------------------------------------------------------------
+
 // class SvxLineColorItem (== SvxColorItem)
-// -----------------------------------------------------------------------
+
 
 SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) :
     SvxColorItem( nId )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineColorItem::SvxLineColorItem( const SvxLineColorItem &rCopy ) :
     SvxColorItem( rCopy )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineColorItem::~SvxLineColorItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxLineColorItem::GetPresentation
 (
@@ -2779,14 +2779,14 @@ SvxBlinkItem::SvxBlinkItem( const bool bBlink, const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
 {
     return new SvxBlinkItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -2794,7 +2794,7 @@ SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) c
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
 {
@@ -2803,7 +2803,7 @@ SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
     return new SvxBlinkItem( nState, Which() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SvxBlinkItem::GetPresentation
 (
@@ -2841,14 +2841,14 @@ SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
 {
     return new SvxEmphasisMarkItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
                                      sal_uInt16 /*nItemVersion*/ ) const
@@ -2857,7 +2857,7 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
 {
@@ -2866,7 +2866,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
     return new SvxEmphasisMarkItem( (FontEmphasisMark)nValue, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
 (
@@ -2902,7 +2902,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 730f7eca4371..95b6f4195f9c 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -168,7 +168,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
     bEndDone   = bReverse && bStart && !bOther;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
         Reference< XHyphenator >  &xHyphenator,
@@ -189,7 +189,7 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int16 SvxSpellWrapper::CheckSpellLang(
         Reference< XSpellChecker1 > xSpell, sal_Int16 nLang)
@@ -241,14 +241,14 @@ sal_Int16 SvxSpellWrapper::CheckHyphLang(
     return (sal_Int16) nVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ )
 { // Here, the necessary preparations be made for SpellContinue in the
 } // given area.
 
-// -----------------------------------------------------------------------
+
 
 
 sal_Bool SvxSpellWrapper::HasOtherCnt()
@@ -256,7 +256,7 @@ sal_Bool SvxSpellWrapper::HasOtherCnt()
     return sal_False; // Is there a special area?
 }
 
-// -----------------------------------------------------------------------
+
 
 
 sal_Bool SvxSpellWrapper::SpellMore()
@@ -264,7 +264,7 @@ sal_Bool SvxSpellWrapper::SpellMore()
     return sal_False; // Should additional documents be examined?
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::SpellEnd()
@@ -274,7 +274,7 @@ void SvxSpellWrapper::SpellEnd()
     ShowLanguageErrors();
 }
 
-// -----------------------------------------------------------------------
+
 
 
 sal_Bool SvxSpellWrapper::SpellContinue()
@@ -282,27 +282,27 @@ sal_Bool SvxSpellWrapper::SpellContinue()
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSpellWrapper::AutoCorrect( const OUString&, const OUString& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::ScrollArea()
 {   // Set Scroll area
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::ChangeWord( const OUString&, const sal_uInt16 )
 {   // Insert Word
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::ChangeThesWord( const OUString& )
@@ -310,7 +310,7 @@ void SvxSpellWrapper::ChangeThesWord( const OUString& )
     // replace word due to Thesaurus.
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSpellWrapper::StartThesaurus( const OUString &rWord, sal_uInt16 nLanguage )
 {
@@ -332,27 +332,27 @@ void SvxSpellWrapper::StartThesaurus( const OUString &rWord, sal_uInt16 nLanguag
     delete pDlg;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSpellWrapper::ReplaceAll( const OUString &, sal_Int16 )
 {   // Replace Word from the Replace list
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::SetLanguage( const sal_uInt16 )
 {   // Set Language
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxSpellWrapper::InsertHyphen( const sal_uInt16 )
 {   // inserting and deleting Hyphae
 }
 
-// -----------------------------------------------------------------------
+
 // Testing of the document areas in the order specified by the flags
 
 
@@ -392,7 +392,7 @@ void SvxSpellWrapper::SpellDocument( )
     };
 }
 
-// -----------------------------------------------------------------------
+
 // Select the next area
 
 
@@ -484,7 +484,7 @@ sal_Bool SvxSpellWrapper::SpellNext( )
     return bGoOn;
 }
 
-// -----------------------------------------------------------------------
+
 
 Reference< XDictionary >  SvxSpellWrapper::GetAllRightDic() const
 {
@@ -528,7 +528,7 @@ Reference< XDictionary >  SvxSpellWrapper::GetAllRightDic() const
     return xDic;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxSpellWrapper::FindSpellError()
 {
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index d018737769de..1dec1eaf538f 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -56,9 +56,9 @@
 #include <cassert>
 using ::std::advance;
 
-// ----------------------------------------------------------------------
+
 // Outliner
-// ----------------------------------------------------------------------
+
 
 void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const
 {
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 9c9248c45199..3722a8bfe673 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -203,7 +203,7 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
     }
 }
 
-// --------------------
+
 
 void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
 {
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index da17745587c7..b2025f658239 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -22,7 +22,7 @@
 #include <editeng/editeng.hxx>
 #include <svl/itemset.hxx>
 
-//------------------------------------------------------------------------
+
 
 TYPEINIT1( SvxEditSourceHint, TextHint );
 
@@ -55,7 +55,7 @@ sal_Int32 SvxEditSourceHint::GetEndValue() const
     return mnEnd;
 }
 TYPEINIT1( SvxEditSourceHintEndPara , SvxEditSourceHint );
-//------------------------------------------------------------------------
+
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<SfxHint> SvxEditSourceHelper::EENotification2Hint( EENotify* aNotify )
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 00b155d09a46..1512635c5ee2 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -18,11 +18,11 @@
  */
 
 
-//------------------------------------------------------------------------
+
 //
 // Global header
 //
-//------------------------------------------------------------------------
+
 
 #include <limits.h>
 #include <vector>
@@ -33,11 +33,11 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-//------------------------------------------------------------------------
+
 //
 // Project-local header
 //
-//------------------------------------------------------------------------
+
 #include "editeng/unoedprx.hxx"
 #include <editeng/unotext.hxx>
 #include <editeng/unoedhlp.hxx>
@@ -300,7 +300,7 @@ sal_Bool SvxAccessibleTextIndex::IsEditableRange( const SvxAccessibleTextIndex&
     return sal_True;
 }
 
-//---------------------------------------------------------------------------------
+
 
 SvxEditSourceAdapter::SvxEditSourceAdapter() : mbEditSourceValid( sal_False )
 {
@@ -428,7 +428,7 @@ sal_Bool SvxEditSourceAdapter::IsValid() const
 }
 
 
-//--------------------------------------------------------------------------------------
+
 
 SvxAccessibleTextAdapter::SvxAccessibleTextAdapter() : mpTextForwarder( NULL )
 {
@@ -1173,7 +1173,7 @@ void        SvxAccessibleTextAdapter::CopyText(const SvxTextForwarder&)
 
 
 
-//---------------------------------------------------------------------------------------
+
 
 SvxAccessibleTextEditViewAdapter::SvxAccessibleTextEditViewAdapter()
     : mpViewForwarder(NULL)
diff --git a/editeng/source/uno/unoedsrc.cxx b/editeng/source/uno/unoedsrc.cxx
index ebeb6f4622ce..afeacc492198 100644
--- a/editeng/source/uno/unoedsrc.cxx
+++ b/editeng/source/uno/unoedsrc.cxx
@@ -22,19 +22,19 @@
 #include <editeng/unoedsrc.hxx>
 
 
-//------------------------------------------------------------------------
+
 
 void SvxEditSource::addRange( SvxUnoTextRangeBase* )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxEditSource::removeRange( SvxUnoTextRangeBase* )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const
 {
@@ -42,19 +42,19 @@ const SvxUnoTextRangeBaseList& SvxEditSource::getRanges() const
     return gList;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextForwarder::~SvxTextForwarder()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvxViewForwarder::~SvxViewForwarder()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvxEditSource::~SvxEditSource()
 {
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index 4b6774dc46c9..c0b3fbff90bf 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -34,7 +34,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 SvxEditEngineForwarder::SvxEditEngineForwarder( EditEngine& rEngine ) :
     rEditEngine( rEngine )
@@ -502,6 +502,6 @@ void SvxEditEngineForwarder::CopyText(const SvxTextForwarder& rSource)
     delete pNewTextObject;
 }
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index b7ddc3da8f23..72b73cf45429 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -37,7 +37,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 SvxOutlinerForwarder::SvxOutlinerForwarder( Outliner& rOutl, sal_Bool bOutlText /* = sal_False */ ) :
     rOutliner( rOutl ),
@@ -577,7 +577,7 @@ void  SvxOutlinerForwarder::CopyText(const SvxTextForwarder& rSource)
     delete pNewOutlinerParaObject;
 }
 
-//------------------------------------------------------------------------
+
 
 
 sal_Int32 SvxTextForwarder::GetNumberingStartValue( sal_Int32 )
@@ -598,6 +598,6 @@ void SvxTextForwarder::SetParaIsNumberingRestart( sal_Int32, sal_Bool )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index 4363c54cb1df..6975695dcb05 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -34,14 +34,14 @@ using namespace ::rtl;
 
 using ::std::vector;
 
-//----------------------------------------------------------------------
+
 
 struct SfxItemPropertyMapEntryHash
 {
     size_t operator()(const SfxItemPropertyMapEntry* pMap) const { return (size_t)pMap; }
 };
 
-//----------------------------------------------------------------------
+
 
 struct SvxIDPropertyCombine
 {
@@ -56,13 +56,13 @@ SvxItemPropertySet::SvxItemPropertySet( const SfxItemPropertyMapEntry* pMap, Sfx
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxItemPropertySet::~SvxItemPropertySet()
 {
     ClearAllUsrAny();
 }
 
-//----------------------------------------------------------------------
+
 uno::Any* SvxItemPropertySet::GetUsrAnyForID(sal_uInt16 nWID) const
 {
     for ( size_t i = 0, n = aCombineList.size(); i < n; ++i )
@@ -74,7 +74,7 @@ uno::Any* SvxItemPropertySet::GetUsrAnyForID(sal_uInt16 nWID) const
     return NULL;
 }
 
-//----------------------------------------------------------------------
+
 void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID)
 {
     SvxIDPropertyCombine* pNew = new SvxIDPropertyCombine;
@@ -83,7 +83,7 @@ void SvxItemPropertySet::AddUsrAnyForID(const uno::Any& rAny, sal_uInt16 nWID)
     aCombineList.push_back( pNew );
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxItemPropertySet::ClearAllUsrAny()
 {
@@ -92,7 +92,7 @@ void SvxItemPropertySet::ClearAllUsrAny()
     aCombineList.clear();
 }
 
-//----------------------------------------------------------------------
+
 
 sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal )
 {
@@ -104,7 +104,7 @@ sal_Bool SvxUnoCheckForPositiveValue( const uno::Any& rVal )
 }
 
 
-//----------------------------------------------------------------------
+
 uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const
 {
     uno::Any aVal;
@@ -150,7 +150,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     return aVal;
 }
 
-//----------------------------------------------------------------------
+
 void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const
 {
     if(!pMap || !pMap->nWID)
@@ -202,7 +202,7 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
     }
 }
 
-//----------------------------------------------------------------------
+
 uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const
 {
     // Already entered a value? Then finish quickly
@@ -257,7 +257,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry*
     return aVal;
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal ) const
 {
@@ -268,14 +268,14 @@ void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMa
         *pUsrAny = rVal;
 }
 
-//----------------------------------------------------------------------
+
 
 const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(const OUString &rName) const
 {
     return m_aPropertyMap.getByName( rName );
  }
 
-//----------------------------------------------------------------------
+
 
 uno::Reference< beans::XPropertySetInfo >  SvxItemPropertySet::getPropertySetInfo() const
 {
@@ -284,7 +284,7 @@ uno::Reference< beans::XPropertySetInfo >  SvxItemPropertySet::getPropertySetInf
     return m_xInfo;
 }
 
-//----------------------------------------------------------------------
+
 
 #ifndef TWIPS_TO_MM
 #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72)
@@ -330,7 +330,7 @@ void SvxUnoConvertToMM( const SfxMapUnit eSourceMapUnit, uno::Any & rMetric ) th
     }
 }
 
-//----------------------------------------------------------------------
+
 
 /** converts the given any with a metric from 100th/mm to the given metric if needed */
 void SvxUnoConvertFromMM( const SfxMapUnit eDestinationMapUnit, uno::Any & rMetric ) throw()
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 0461b378073d..e7bfb33e667d 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2317,7 +2317,7 @@ sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >
     }
 }
 
-// --------------------------------------------------------------------
+
 
 SvxUnoText::SvxUnoText( ) throw()
 {
@@ -2413,7 +2413,7 @@ sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rI
 }
 
 
-// --------------------------------------------------------------------
+
 
 SvxDummyTextSource::~SvxDummyTextSource()
 {
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index d37c8a994805..f086a226bb33 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -86,7 +86,7 @@ public:
 ///////////////////////////////////////////////////////////////////////
 
 
-//------------------------------------------------------------------------
+
 
 SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine )
 : maRefCount(0),
@@ -95,21 +95,21 @@ SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl()
 {
     delete mpTextForwarder;
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL SvxEditEngineSourceImpl::acquire()
 {
     osl_atomic_increment( &maRefCount );
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL SvxEditEngineSourceImpl::release()
 {
@@ -117,7 +117,7 @@ void SAL_CALL SvxEditEngineSourceImpl::release()
         delete this;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder()
 {
@@ -127,9 +127,9 @@ SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder()
     return mpTextForwarder;
 }
 
-// --------------------------------------------------------------------
+
 // SvxTextEditSource
-// --------------------------------------------------------------------
+
 
 SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine )
 {
@@ -137,7 +137,7 @@ SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine )
     mpImpl->acquire();
 }
 
-// --------------------------------------------------------------------
+
 
 SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl )
 {
@@ -145,28 +145,28 @@ SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl )
     mpImpl->acquire();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxEditEngineSource::~SvxEditEngineSource()
 {
     mpImpl->release();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxEditSource* SvxEditEngineSource::Clone() const
 {
     return new SvxEditEngineSource( mpImpl );
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextForwarder* SvxEditEngineSource::GetTextForwarder()
 {
     return mpImpl->GetTextForwarder();
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxEditEngineSource::UpdateData()
 {
diff --git a/editeng/source/xml/xmltxtimp.cxx b/editeng/source/xml/xmltxtimp.cxx
index bf764daaddab..d18961fb2d0d 100644
--- a/editeng/source/xml/xmltxtimp.cxx
+++ b/editeng/source/xml/xmltxtimp.cxx
@@ -122,7 +122,7 @@ private:
     const uno::Reference< XText > mxText;
 };
 
-// --------------------------------------------------------------------
+
 
 SvxXMLXTextImportComponent::SvxXMLXTextImportComponent(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx
index 6983fc0de2e3..9347de8bbbdf 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -69,7 +69,7 @@ awt::Rectangle GetRectangleInterception( const awt::Rectangle& aRect1, const awt
     return aResult;
 }
 
-//----------------------------------------------
+
 sal_Int32 OCommonEmbeddedObject::ConvertVerbToState_Impl( sal_Int32 nVerb )
 {
     for ( sal_Int32 nInd = 0; nInd < m_aVerbTable.getLength(); nInd++ )
@@ -79,7 +79,7 @@ sal_Int32 OCommonEmbeddedObject::ConvertVerbToState_Impl( sal_Int32 nVerb )
     throw lang::IllegalArgumentException(); // TODO: unexpected verb provided
 }
 
-//----------------------------------------------
+
 void OCommonEmbeddedObject::Deactivate()
 {
     uno::Reference< util::XModifiable > xModif( m_pDocHolder->GetComponent(), uno::UNO_QUERY );
@@ -112,7 +112,7 @@ void OCommonEmbeddedObject::Deactivate()
     xClientSite->visibilityChanged( sal_False );
 }
 
-//----------------------------------------------
+
 void OCommonEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState ,::osl::ResettableMutexGuard& rGuard )
 {
     if ( m_pInterfaceContainer )
@@ -150,7 +150,7 @@ void OCommonEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange
     }
 }
 
-//----------------------------------------------
+
 void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
 {
     // TODO: may be needs interaction handler to detect wherether the object state
@@ -390,7 +390,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState )
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_Impl( sal_Int32 nNewState )
 {
     sal_Int32 nCurInd = 0;
@@ -417,7 +417,7 @@ uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_
     return m_pIntermediateStatesSeqs[nCurInd][nDestInd];
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
         throw ( embed::UnreachableStateException,
                 embed::WrongStateException,
@@ -490,7 +490,7 @@ void SAL_CALL OCommonEmbeddedObject::changeState( sal_Int32 nNewState )
     }
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -505,7 +505,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OCommonEmbeddedObject::getReachableStates()
     return m_aAcceptedStates;
 }
 
-//----------------------------------------------
+
 sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -520,7 +520,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject::getCurrentState()
     return m_nObjectState;
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
         throw ( lang::IllegalArgumentException,
                 embed::WrongStateException,
@@ -569,7 +569,7 @@ void SAL_CALL OCommonEmbeddedObject::doVerb( sal_Int32 nVerbID )
     }
 }
 
-//----------------------------------------------
+
 uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSupportedVerbs()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -584,7 +584,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OCommonEmbeddedObject::getSuppor
     return m_aObjectVerbs;
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::setClientSite(
                 const uno::Reference< embed::XEmbeddedClient >& xClient )
         throw ( embed::WrongStateException,
@@ -605,7 +605,7 @@ void SAL_CALL OCommonEmbeddedObject::setClientSite(
     }
 }
 
-//----------------------------------------------
+
 uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClientSite()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -620,7 +620,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OCommonEmbeddedObject::getClie
     return m_xClientSite;
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::update()
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -637,7 +637,7 @@ void SAL_CALL OCommonEmbeddedObject::update()
     PostEvent_Impl( OUString( "OnVisAreaChanged" ) );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode )
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -656,7 +656,7 @@ void SAL_CALL OCommonEmbeddedObject::setUpdateMode( sal_Int32 nMode )
     m_nUpdateMode = nMode;
 }
 
-//----------------------------------------------
+
 sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 )
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -667,7 +667,7 @@ sal_Int64 SAL_CALL OCommonEmbeddedObject::getStatus( sal_Int64 )
     return m_nMiscStatus;
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::setContainerName( const OUString& sName )
         throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index e21b38657731..e8849f17dc6f 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
 uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< beans::PropertyValue >& aMedDescr,
                                                             sal_Bool bCanUseDocumentBaseURL );
 
-//------------------------------------------------------
+
 OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XComponentContext >& rxContext,
                                                 const uno::Sequence< beans::NamedValue >& aObjProps )
 : m_pDocHolder( NULL )
@@ -64,7 +64,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject( const uno::Reference< uno::XCompon
     CommonInit_Impl( aObjProps );
 }
 
-//------------------------------------------------------
+
 OCommonEmbeddedObject::OCommonEmbeddedObject(
         const uno::Reference< uno::XComponentContext >& rxContext,
         const uno::Sequence< beans::NamedValue >& aObjProps,
@@ -92,7 +92,7 @@ OCommonEmbeddedObject::OCommonEmbeddedObject(
     LinkInit_Impl( aObjProps, aMediaDescr, aObjectDescr );
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedValue >& aObjectProps )
 {
     OSL_ENSURE( m_xContext.is(), "No ServiceFactory is provided!\n" );
@@ -215,7 +215,7 @@ void OCommonEmbeddedObject::CommonInit_Impl( const uno::Sequence< beans::NamedVa
     }
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::LinkInit_Impl(
                                 const uno::Sequence< beans::NamedValue >& aObjectProps,
                                 const uno::Sequence< beans::PropertyValue >& aMediaDescr,
@@ -259,7 +259,7 @@ void OCommonEmbeddedObject::LinkInit_Impl(
         m_pDocHolder->SetOutplaceDispatchInterceptor( xDispatchInterceptor );
 }
 
-//------------------------------------------------------
+
 OCommonEmbeddedObject::~OCommonEmbeddedObject()
 {
     if ( m_pInterfaceContainer || m_pDocHolder )
@@ -293,7 +293,7 @@ OCommonEmbeddedObject::~OCommonEmbeddedObject()
     }
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect )
 {
     // the method is called in case object is inplace active and the object window was resized
@@ -317,7 +317,7 @@ void OCommonEmbeddedObject::requestPositioning( const awt::Rectangle& aRect )
     }
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
 {
     if ( m_pInterfaceContainer )
@@ -352,7 +352,7 @@ void OCommonEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     }
 }
 
-//------------------------------------------------------
+
 uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( const uno::Type& rType )
         throw( uno::RuntimeException )
 {
@@ -386,21 +386,21 @@ uno::Any SAL_CALL OCommonEmbeddedObject::queryInterface( const uno::Type& rType
 
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::acquire()
         throw()
 {
     ::cppu::OWeakObject::acquire() ;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::release()
         throw()
 {
     ::cppu::OWeakObject::release() ;
 }
 
-//------------------------------------------------------
+
 uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes()
         throw( uno::RuntimeException )
 {
@@ -442,7 +442,7 @@ uno::Sequence< uno::Type > SAL_CALL OCommonEmbeddedObject::getTypes()
 
 }
 
-//------------------------------------------------------
+
 uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getImplementationId()
         throw( uno::RuntimeException )
 {
@@ -461,7 +461,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getImplementationId()
     return pID->getImplementationId() ;
 }
 
-//------------------------------------------------------
+
 uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
         throw ( uno::RuntimeException )
 {
@@ -471,7 +471,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OCommonEmbeddedObject::getClassID()
     return m_aClassID;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL OCommonEmbeddedObject::getClassName()
         throw ( uno::RuntimeException )
 {
@@ -481,7 +481,7 @@ OUString SAL_CALL OCommonEmbeddedObject::getClassName()
     return m_aClassName;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::setClassInfo(
                 const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ )
         throw ( lang::NoSupportException,
@@ -491,7 +491,7 @@ void SAL_CALL OCommonEmbeddedObject::setClassInfo(
     throw lang::NoSupportException(); //TODO:
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent()
         throw ( uno::RuntimeException )
 {
@@ -510,7 +510,7 @@ uno::Reference< util::XCloseable > SAL_CALL OCommonEmbeddedObject::getComponent(
     return uno::Reference< util::XCloseable >( m_pDocHolder->GetComponent(), uno::UNO_QUERY );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -525,7 +525,7 @@ void SAL_CALL OCommonEmbeddedObject::addStateChangeListener( const uno::Referenc
                                                         xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener(
                     const uno::Reference< embed::XStateChangeListener >& xListener )
     throw (uno::RuntimeException)
@@ -536,7 +536,7 @@ void SAL_CALL OCommonEmbeddedObject::removeStateChangeListener(
                                                 xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
     throw ( util::CloseVetoException,
             uno::RuntimeException )
@@ -641,7 +641,7 @@ void SAL_CALL OCommonEmbeddedObject::close( sal_Bool bDeliverOwnership )
     m_bClosed = sal_True; // the closing succeeded
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -655,7 +655,7 @@ void SAL_CALL OCommonEmbeddedObject::addCloseListener( const uno::Reference< uti
     m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw (uno::RuntimeException)
 {
@@ -665,7 +665,7 @@ void SAL_CALL OCommonEmbeddedObject::removeCloseListener( const uno::Reference<
                                                 xListener );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
         throw ( uno::RuntimeException )
 {
@@ -679,7 +679,7 @@ void SAL_CALL OCommonEmbeddedObject::addEventListener( const uno::Reference< doc
     m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
         throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 1a09f57b5569..97d788a412af 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -57,7 +57,7 @@
 using namespace ::com::sun::star;
 
 
-//------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence< beans::PropertyValue >& aMedDescr,
                                                             sal_Bool bCanUseDocumentBaseURL )
 {
@@ -84,7 +84,7 @@ uno::Sequence< beans::PropertyValue > GetValuableArgs_Impl( const uno::Sequence<
     return aResult;
 }
 
-//------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans::PropertyValue >& aOrig )
 {
     sal_Bool bAsTemplateSet = sal_False;
@@ -113,7 +113,7 @@ uno::Sequence< beans::PropertyValue > addAsTemplate( const uno::Sequence< beans:
     return aResult;
 }
 
-//------------------------------------------------------
+
 uno::Reference< io::XInputStream > createTempInpStreamFromStor(
                                                             const uno::Reference< embed::XStorage >& xStorage,
                                                             const uno::Reference< uno::XComponentContext >& xContext )
@@ -170,7 +170,7 @@ uno::Reference< io::XInputStream > createTempInpStreamFromStor(
 
 }
 
-//------------------------------------------------------
+
 static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSource, const uno::Reference< embed::XStorage >& i_rTarget )
 {
     try
@@ -186,7 +186,7 @@ static void TransferMediaType( const uno::Reference< embed::XStorage >& i_rSourc
     }
 }
 
-//------------------------------------------------------
+
 static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference< uno::XComponentContext >& _rxContext,
     const OUString& _rDocumentServiceName, bool _bEmbeddedScriptSupport, const bool i_bDocumentRecoverySupport )
 {
@@ -215,7 +215,7 @@ static uno::Reference< util::XCloseable > CreateDocument( const uno::Reference<
     return uno::Reference< util::XCloseable >( xDocument, uno::UNO_QUERY );
 }
 
-//------------------------------------------------------
+
 static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, const OUString& aModuleName )
 {
     if ( xDocument.is() )
@@ -238,7 +238,7 @@ static void SetDocToEmbedded( const uno::Reference< frame::XModel > xDocument, c
     }
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
                                                   const uno::Reference< embed::XStorage >& xNewObjectStorage,
                                                   const OUString& aNewName )
@@ -273,7 +273,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
     }
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
                                                   const OUString& aNewName )
 {
@@ -288,7 +288,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
     SwitchOwnPersistence( xNewParentStorage, xNewOwnStorage, aNewName );
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::EmbedAndReparentDoc_Impl( const uno::Reference< util::XCloseable >& i_rxDocument ) const
 {
     SetDocToEmbedded( uno::Reference< frame::XModel >( i_rxDocument, uno::UNO_QUERY ), m_aModuleName );
@@ -305,7 +305,7 @@ void OCommonEmbeddedObject::EmbedAndReparentDoc_Impl( const uno::Reference< util
     }
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > OCommonEmbeddedObject::InitNewDocument_Impl()
 {
     uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xContext, GetDocumentServiceName(),
@@ -365,7 +365,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::InitNewDocument_Impl()
     return xDocument;
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl()
 {
     uno::Reference< util::XCloseable > xDocument( CreateDocument( m_xContext, GetDocumentServiceName(),
@@ -437,7 +437,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadLink_Impl()
 
 }
 
-//------------------------------------------------------
+
 OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const
 {
     OUString aFilterName = GetPresetFilterName();
@@ -453,7 +453,7 @@ OUString OCommonEmbeddedObject::GetFilterName( sal_Int32 nVersion ) const
     return aFilterName;
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::FillDefaultLoadArgs_Impl( const uno::Reference< embed::XStorage >& i_rxStorage,
         ::comphelper::NamedValueCollection& o_rLoadArgs ) const
 {
@@ -469,7 +469,7 @@ void OCommonEmbeddedObject::FillDefaultLoadArgs_Impl( const uno::Reference< embe
     o_rLoadArgs.put( "FilterName", aFilterName );
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorage_Impl()
 {
     ENSURE_OR_THROW( m_xObjectStorage.is(), "no object storage" );
@@ -559,7 +559,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::LoadDocumentFromStorag
     return xDocument;
 }
 
-//------------------------------------------------------
+
 uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStream_Impl(
                                                                             sal_Int32 nStorageFormat,
                                                                             const OUString& aBaseURL,
@@ -612,7 +612,7 @@ uno::Reference< io::XInputStream > OCommonEmbeddedObject::StoreDocumentToTempStr
     return aResult;
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::SaveObject_Impl()
 {
     if ( m_xClientSite.is() )
@@ -638,7 +638,7 @@ void OCommonEmbeddedObject::SaveObject_Impl()
     }
 }
 
-//------------------------------------------------------
+
 OUString OCommonEmbeddedObject::GetBaseURL_Impl() const
 {
     OUString aBaseURL;
@@ -681,7 +681,7 @@ OUString OCommonEmbeddedObject::GetBaseURL_Impl() const
     return aBaseURL;
 }
 
-//------------------------------------------------------
+
 OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl(
                     const uno::Sequence< beans::PropertyValue >& lArguments,
                     const uno::Sequence< beans::PropertyValue >& lObjArgs )
@@ -710,7 +710,7 @@ OUString OCommonEmbeddedObject::GetBaseURLFrom_Impl(
 }
 
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::SwitchDocToStorage_Impl( const uno::Reference< document::XStorageBasedDocument >& xDoc, const uno::Reference< embed::XStorage >& xStorage )
 {
     xDoc->switchToStorage( xStorage );
@@ -723,7 +723,7 @@ void OCommonEmbeddedObject::SwitchDocToStorage_Impl( const uno::Reference< docum
         m_xRecoveryStorage.clear();
 }
 
-//------------------------------------------------------
+
 void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed::XStorage >& xStorage,
                                                     sal_Int32 nStorageFormat,
                                                     const OUString& aBaseURL,
@@ -784,7 +784,7 @@ void OCommonEmbeddedObject::StoreDocToStorage_Impl( const uno::Reference< embed:
     }
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateDocFromMediaDescr_Impl(
                                         const uno::Sequence< beans::PropertyValue >& aMedDescr )
 {
@@ -822,7 +822,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateDocFromMediaDesc
     return xDocument;
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_Impl()
 {
     uno::Reference< util::XCloseable > xResult;
@@ -889,7 +889,7 @@ uno::Reference< util::XCloseable > OCommonEmbeddedObject::CreateTempDocFromLink_
     return xResult;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
                     const uno::Reference< embed::XStorage >& xStorage,
                     const OUString& sEntName,
@@ -1119,7 +1119,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
     }
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
@@ -1245,7 +1245,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
     // TODO: should the listener notification be done?
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
@@ -1387,7 +1387,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
     // TODO: should the listener notification be done here or in saveCompleted?
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -1470,7 +1470,7 @@ void SAL_CALL OCommonEmbeddedObject::saveCompleted( sal_Bool bUseNew )
     }
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1490,7 +1490,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
     return sal_False;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL OCommonEmbeddedObject::getEntryName()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1514,7 +1514,7 @@ OUString SAL_CALL OCommonEmbeddedObject::getEntryName()
     return m_aEntryName;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::storeOwn()
         throw ( embed::WrongStateException,
                 io::IOException,
@@ -1602,7 +1602,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
     PostEvent_Impl( OUString( "OnSaveDone" ) );
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1626,7 +1626,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
     return m_bReadOnly;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::reload(
                 const uno::Sequence< beans::PropertyValue >& lArguments,
                 const uno::Sequence< beans::PropertyValue >& lObjArgs )
@@ -1751,7 +1751,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
     }
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage,
                                                 const OUString& sEntName )
         throw ( lang::IllegalArgumentException,
@@ -1845,7 +1845,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
     m_aLinkURL = OUString();
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL  OCommonEmbeddedObject::isLink()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1857,7 +1857,7 @@ sal_Bool SAL_CALL  OCommonEmbeddedObject::isLink()
     return m_bIsLink;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL OCommonEmbeddedObject::getLinkURL()
         throw ( embed::WrongStateException,
                 uno::Exception,
diff --git a/embeddedobj/source/commonembedding/specialobject.cxx b/embeddedobj/source/commonembedding/specialobject.cxx
index 7aca13b50b65..b94c5321f469 100644
--- a/embeddedobj/source/commonembedding/specialobject.cxx
+++ b/embeddedobj/source/commonembedding/specialobject.cxx
@@ -50,7 +50,7 @@ OSpecialEmbeddedObject::OSpecialEmbeddedObject( const uno::Reference< uno::XComp
     m_nObjectState = embed::EmbedStates::LOADED;
 }
 
-//------------------------------------------------------
+
 uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType )
         throw( uno::RuntimeException )
 {
@@ -71,7 +71,7 @@ uno::Any SAL_CALL OSpecialEmbeddedObject::queryInterface( const uno::Type& rType
 
 }
 
-//------------------------------------------------------
+
 uno::Sequence< uno::Type > SAL_CALL OSpecialEmbeddedObject::getTypes()
         throw( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 1e3f7106884a..558d0179465b 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -188,7 +188,7 @@ DocumentHolder::DocumentHolder( const uno::Reference< uno::XComponentContext >&
     m_aOutplaceFrameProps[2] <<= aArg;
 }
 
-//---------------------------------------------------------------------------
+
 DocumentHolder::~DocumentHolder()
 {
     m_refCount++; // to allow deregistration as a listener
@@ -213,7 +213,7 @@ DocumentHolder::~DocumentHolder()
         FreeOffice();
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::CloseFrame()
 {
     uno::Reference< util::XCloseBroadcaster > xCloseBroadcaster( m_xFrame, uno::UNO_QUERY );
@@ -243,7 +243,7 @@ void DocumentHolder::CloseFrame()
     m_xFrame = uno::Reference< frame::XFrame >();
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::FreeOffice()
 {
     uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create( m_xContext );
@@ -269,7 +269,7 @@ void DocumentHolder::FreeOffice()
 //      }
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitForClose )
 {
     uno::Reference< util::XCloseBroadcaster > xBroadcaster( m_xComponent, uno::UNO_QUERY );
@@ -299,7 +299,7 @@ void DocumentHolder::CloseDocument( sal_Bool bDeliverOwnership, sal_Bool bWaitFo
     m_xComponent = 0;
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::PlaceFrame( const awt::Rectangle& aNewRect )
 {
     OSL_ENSURE( m_xFrame.is() && m_xOwnWindow.is(),
@@ -329,7 +329,7 @@ void DocumentHolder::PlaceFrame( const awt::Rectangle& aNewRect )
     }
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::ResizeWindows_Impl( const awt::Rectangle& aHatchRect )
 {
     OSL_ENSURE( m_xFrame.is() && m_xOwnWindow.is() /*&& m_xHatchWindow.is()*/,
@@ -357,7 +357,7 @@ void DocumentHolder::ResizeWindows_Impl( const awt::Rectangle& aHatchRect )
                                   awt::PosSize::POSSIZE );
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFrame >& xFrame, sal_Bool bVisible )
 {
     sal_Bool bResult = sal_False;
@@ -387,7 +387,7 @@ sal_Bool DocumentHolder::SetFrameLMVisibility( const uno::Reference< frame::XFra
     return bResult;
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >& xParent,
                                       const awt::Rectangle& aRectangleToShow,
                                       const uno::Reference< frame::XDispatchProvider >& xContDisp )
@@ -514,7 +514,7 @@ sal_Bool DocumentHolder::ShowInplace( const uno::Reference< awt::XWindowPeer >&
     return sal_False;
 }
 
-//---------------------------------------------------------------------------
+
 uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
 {
     uno::Reference< container::XIndexAccess > xResult;
@@ -568,7 +568,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::RetrieveOwnMenu_Impl()
     return xResult;
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::FindConnectPoints(
         const uno::Reference< container::XIndexAccess >& xMenu,
         sal_Int32 nConnectPoints[2] )
@@ -598,7 +598,7 @@ void DocumentHolder::FindConnectPoints(
     }
 }
 
-//---------------------------------------------------------------------------
+
 uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
         const uno::Reference< container::XIndexAccess >& xContMenu,
         const uno::Reference< frame::XDispatchProvider >& xContDisp,
@@ -645,7 +645,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
     return uno::Reference< container::XIndexAccess >( xMergedMenu, uno::UNO_QUERY_THROW );
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
                                                const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
                                             const uno::Reference< frame::XDispatchProvider >& xContDisp,
@@ -772,7 +772,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
     return bResult;
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContainerLM )
 {
     sal_Bool bResult = sal_False;
@@ -820,7 +820,7 @@ sal_Bool DocumentHolder::HideUI( const uno::Reference< ::com::sun::star::frame::
     return bResult;
 }
 
-//---------------------------------------------------------------------------
+
 uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
 {
     // the frame for outplace activation
@@ -916,7 +916,7 @@ uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame()
     return m_xFrame;
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDoc, sal_Bool bReadOnly )
 {
     if ( m_xComponent.is() )
@@ -953,7 +953,7 @@ void DocumentHolder::SetComponent( const uno::Reference< util::XCloseable >& xDo
         LoadDocToFrame(sal_False);
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
 {
     if ( m_xFrame.is() && m_xComponent.is() )
@@ -1002,7 +1002,7 @@ sal_Bool DocumentHolder::LoadDocToFrame( sal_Bool bInPlace )
     return sal_True;
 }
 
-//---------------------------------------------------------------------------
+
 void DocumentHolder::Show()
 {
     if( m_xFrame.is() )
@@ -1016,7 +1016,7 @@ void DocumentHolder::Show()
         GetDocFrame();
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
 {
     uno::Reference< embed::XVisualObject > xDocVis( m_xComponent, uno::UNO_QUERY );
@@ -1036,7 +1036,7 @@ sal_Bool DocumentHolder::SetExtent( sal_Int64 nAspect, const awt::Size& aSize )
     return sal_False;
 }
 
-//---------------------------------------------------------------------------
+
 sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
 {
     uno::Reference< embed::XVisualObject > xDocVis( m_xComponent, uno::UNO_QUERY );
@@ -1056,7 +1056,7 @@ sal_Bool DocumentHolder::GetExtent( sal_Int64 nAspect, awt::Size *pSize )
     return sal_False;
 }
 
-//---------------------------------------------------------------------------
+
 sal_Int32 DocumentHolder::GetMapUnit( sal_Int64 nAspect )
 {
     uno::Reference< embed::XVisualObject > xDocVis( m_xComponent, uno::UNO_QUERY );
@@ -1075,7 +1075,7 @@ sal_Int32 DocumentHolder::GetMapUnit( sal_Int64 nAspect )
     return 0;
 }
 
-//---------------------------------------------------------------------------
+
 awt::Rectangle DocumentHolder::CalculateBorderedArea( const awt::Rectangle& aRect )
 {
     return awt::Rectangle( aRect.X + m_aBorderWidths.Left + HATCH_BORDER_WIDTH,
@@ -1084,7 +1084,7 @@ awt::Rectangle DocumentHolder::CalculateBorderedArea( const awt::Rectangle& aRec
                              aRect.Height - m_aBorderWidths.Top - m_aBorderWidths.Bottom - 2*HATCH_BORDER_WIDTH );
 }
 
-//---------------------------------------------------------------------------
+
 awt::Rectangle DocumentHolder::AddBorderToArea( const awt::Rectangle& aRect )
 {
     return awt::Rectangle( aRect.X - m_aBorderWidths.Left - HATCH_BORDER_WIDTH,
@@ -1093,7 +1093,7 @@ awt::Rectangle DocumentHolder::AddBorderToArea( const awt::Rectangle& aRect )
                              aRect.Height + m_aBorderWidths.Top + m_aBorderWidths.Bottom + 2*HATCH_BORDER_WIDTH );
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject& aSource )
         throw (uno::RuntimeException)
 {
@@ -1116,7 +1116,7 @@ void SAL_CALL DocumentHolder::disposing( const com::sun::star::lang::EventObject
 }
 
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sal_Bool /*bGetsOwnership*/ )
         throw (util::CloseVetoException, uno::RuntimeException)
 {
@@ -1124,7 +1124,7 @@ void SAL_CALL DocumentHolder::queryClosing( const lang::EventObject& aSource, sa
         throw util::CloseVetoException();
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
         throw (uno::RuntimeException)
 {
@@ -1146,7 +1146,7 @@ void SAL_CALL DocumentHolder::notifyClosing( const lang::EventObject& aSource )
     }
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& )
         throw (frame::TerminationVetoException, uno::RuntimeException)
 {
@@ -1154,7 +1154,7 @@ void SAL_CALL DocumentHolder::queryTermination( const lang::EventObject& )
         throw frame::TerminationVetoException();
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSource )
         throw (uno::RuntimeException)
 {
@@ -1166,7 +1166,7 @@ void SAL_CALL DocumentHolder::notifyTermination( const lang::EventObject& aSourc
         xDesktop->removeTerminateListener( ( frame::XTerminateListener* )this );
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent )
     throw ( uno::RuntimeException )
 {
@@ -1176,7 +1176,7 @@ void SAL_CALL DocumentHolder::modified( const lang::EventObject& aEvent )
         m_pEmbedObj->PostEvent_Impl( OUString( "OnVisAreaChanged" ) );
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event )
     throw ( uno::RuntimeException )
 {
@@ -1192,7 +1192,7 @@ void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event )
     }
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::borderWidthsChanged( const uno::Reference< uno::XInterface >& aObject,
                                                     const frame::BorderWidths& aNewSize )
     throw ( uno::RuntimeException )
@@ -1212,7 +1212,7 @@ void SAL_CALL DocumentHolder::borderWidthsChanged( const uno::Reference< uno::XI
     }
 }
 
-//---------------------------------------------------------------------------
+
 void SAL_CALL DocumentHolder::requestPositioning( const awt::Rectangle& aRect )
     throw (uno::RuntimeException)
 {
@@ -1226,7 +1226,7 @@ void SAL_CALL DocumentHolder::requestPositioning( const awt::Rectangle& aRect )
     }
 }
 
-//---------------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL DocumentHolder::calcAdjustedRectangle( const awt::Rectangle& aRect )
     throw (uno::RuntimeException)
 {
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 94679bb145e0..cddbc0c3db78 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -37,7 +37,7 @@
 
 using namespace ::com::sun::star;
 
-//----------------------------------------------
+
 void ODummyEmbeddedObject::CheckInit()
 {
     if ( m_bDisposed )
@@ -48,7 +48,7 @@ void ODummyEmbeddedObject::CheckInit()
                                         uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
-//----------------------------------------------
+
 void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
 {
     if ( m_pInterfaceContainer )
@@ -83,12 +83,12 @@ void ODummyEmbeddedObject::PostEvent_Impl( const OUString& aEventName )
     }
 }
 
-//----------------------------------------------
+
 ODummyEmbeddedObject::~ODummyEmbeddedObject()
 {
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::changeState( sal_Int32 nNewState )
         throw ( embed::UnreachableStateException,
                 embed::WrongStateException,
@@ -104,7 +104,7 @@ void SAL_CALL ODummyEmbeddedObject::changeState( sal_Int32 nNewState )
     throw embed::UnreachableStateException();
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int32 > SAL_CALL ODummyEmbeddedObject::getReachableStates()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -118,7 +118,7 @@ uno::Sequence< sal_Int32 > SAL_CALL ODummyEmbeddedObject::getReachableStates()
     return aResult;
 }
 
-//----------------------------------------------
+
 sal_Int32 SAL_CALL ODummyEmbeddedObject::getCurrentState()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -129,7 +129,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getCurrentState()
     return m_nObjectState;
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::doVerb( sal_Int32 )
         throw ( lang::IllegalArgumentException,
                 embed::WrongStateException,
@@ -143,7 +143,7 @@ void SAL_CALL ODummyEmbeddedObject::doVerb( sal_Int32 )
     // no supported verbs
 }
 
-//----------------------------------------------
+
 uno::Sequence< embed::VerbDescriptor > SAL_CALL ODummyEmbeddedObject::getSupportedVerbs()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -154,7 +154,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL ODummyEmbeddedObject::getSupport
     return uno::Sequence< embed::VerbDescriptor >();
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::setClientSite(
                 const uno::Reference< embed::XEmbeddedClient >& xClient )
         throw ( embed::WrongStateException,
@@ -166,7 +166,7 @@ void SAL_CALL ODummyEmbeddedObject::setClientSite(
     m_xClientSite = xClient;
 }
 
-//----------------------------------------------
+
 uno::Reference< embed::XEmbeddedClient > SAL_CALL ODummyEmbeddedObject::getClientSite()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -177,7 +177,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL ODummyEmbeddedObject::getClien
     return m_xClientSite;
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::update()
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -187,7 +187,7 @@ void SAL_CALL ODummyEmbeddedObject::update()
     CheckInit();
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::setUpdateMode( sal_Int32 )
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -196,7 +196,7 @@ void SAL_CALL ODummyEmbeddedObject::setUpdateMode( sal_Int32 )
     CheckInit();
 }
 
-//----------------------------------------------
+
 sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 )
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -207,7 +207,7 @@ sal_Int64 SAL_CALL ODummyEmbeddedObject::getStatus( sal_Int64 )
     return 0;
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& )
         throw ( uno::RuntimeException )
 {
@@ -215,7 +215,7 @@ void SAL_CALL ODummyEmbeddedObject::setContainerName( const OUString& )
     CheckInit();
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
         throw ( lang::IllegalArgumentException,
                 embed::WrongStateException,
@@ -236,7 +236,7 @@ void SAL_CALL ODummyEmbeddedObject::setVisualAreaSize( sal_Int64 nAspect, const
     m_bHasCachedSize = sal_True;
 }
 
-//----------------------------------------------
+
 awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
         throw ( lang::IllegalArgumentException,
                 embed::WrongStateException,
@@ -260,7 +260,7 @@ awt::Size SAL_CALL ODummyEmbeddedObject::getVisualAreaSize( sal_Int64 nAspect )
     return m_aCachedSize;
 }
 
-//----------------------------------------------
+
 sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
         throw ( uno::Exception,
                 uno::RuntimeException)
@@ -277,7 +277,7 @@ sal_Int32 SAL_CALL ODummyEmbeddedObject::getMapUnit( sal_Int64 nAspect )
     return embed::EmbedMapUnits::ONE_100TH_MM;
 }
 
-//----------------------------------------------
+
 embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRepresentation( sal_Int64 )
         throw ( lang::IllegalArgumentException,
                 embed::WrongStateException,
@@ -292,7 +292,7 @@ embed::VisualRepresentation SAL_CALL ODummyEmbeddedObject::getPreferredVisualRep
                                 uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
                     const uno::Reference< embed::XStorage >& xStorage,
                     const OUString& sEntName,
@@ -359,7 +359,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
                                 3 );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& /* lArguments */,
@@ -381,7 +381,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X
     m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& /* lArguments */,
@@ -409,7 +409,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
     m_aNewEntryName = sEntName;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -443,7 +443,7 @@ void SAL_CALL ODummyEmbeddedObject::saveCompleted( sal_Bool bUseNew )
     m_bWaitSaveCompleted = sal_False;
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -462,7 +462,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
     return sal_False;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -478,7 +478,7 @@ OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
     return m_aEntryName;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::storeOwn()
         throw ( embed::WrongStateException,
                 io::IOException,
@@ -497,7 +497,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn()
     return;
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -514,7 +514,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
     return sal_True;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::reload(
                 const uno::Sequence< beans::PropertyValue >& /* lArguments */,
                 const uno::Sequence< beans::PropertyValue >& /* lObjArgs */ )
@@ -535,7 +535,7 @@ void SAL_CALL ODummyEmbeddedObject::reload(
     // nothing to reload
 }
 
-//------------------------------------------------------
+
 uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID()
         throw ( uno::RuntimeException )
 {
@@ -547,7 +547,7 @@ uno::Sequence< sal_Int8 > SAL_CALL ODummyEmbeddedObject::getClassID()
     return uno::Sequence< sal_Int8 >();
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL ODummyEmbeddedObject::getClassName()
         throw ( uno::RuntimeException )
 {
@@ -558,7 +558,7 @@ OUString SAL_CALL ODummyEmbeddedObject::getClassName()
     return OUString();
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::setClassInfo(
                 const uno::Sequence< sal_Int8 >& /*aClassID*/, const OUString& /*aClassName*/ )
         throw ( lang::NoSupportException,
@@ -567,7 +567,7 @@ void SAL_CALL ODummyEmbeddedObject::setClassInfo(
     throw lang::NoSupportException();
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > SAL_CALL ODummyEmbeddedObject::getComponent()
         throw ( uno::RuntimeException )
 {
@@ -577,7 +577,7 @@ uno::Reference< util::XCloseable > SAL_CALL ODummyEmbeddedObject::getComponent()
     return uno::Reference< util::XCloseable >();
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -592,7 +592,7 @@ void SAL_CALL ODummyEmbeddedObject::addStateChangeListener( const uno::Reference
                                                         xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::removeStateChangeListener(
                     const uno::Reference< embed::XStateChangeListener >& xListener )
     throw (uno::RuntimeException)
@@ -603,7 +603,7 @@ void SAL_CALL ODummyEmbeddedObject::removeStateChangeListener(
                                                 xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
     throw ( util::CloseVetoException,
             uno::RuntimeException )
@@ -659,7 +659,7 @@ void SAL_CALL ODummyEmbeddedObject::close( sal_Bool bDeliverOwnership )
     m_bDisposed = sal_True; // the object is disposed now for outside
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -673,7 +673,7 @@ void SAL_CALL ODummyEmbeddedObject::addCloseListener( const uno::Reference< util
     m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw (uno::RuntimeException)
 {
@@ -683,7 +683,7 @@ void SAL_CALL ODummyEmbeddedObject::removeCloseListener( const uno::Reference< u
                                                 xListener );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
         throw ( uno::RuntimeException )
 {
@@ -697,7 +697,7 @@ void SAL_CALL ODummyEmbeddedObject::addEventListener( const uno::Reference< docu
     m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL ODummyEmbeddedObject::removeEventListener( const uno::Reference< document::XEventListener >& xListener )
         throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx
index d79fcc58515d..521f97d6fce9 100644
--- a/embeddedobj/source/general/xcreator.cxx
+++ b/embeddedobj/source/general/xcreator.cxx
@@ -39,7 +39,7 @@
 using namespace ::com::sun::star;
 
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
@@ -48,20 +48,20 @@ uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetSuppo
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL UNOEmbeddedObjectCreator::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.embed.EmbeddedObjectCreator");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new UNOEmbeddedObjectCreator( comphelper::getComponentContext(xServiceManager) ) );
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitNew(
                                             const uno::Sequence< sal_Int8 >& aClassID,
                                             const OUString& aClassName,
@@ -106,7 +106,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     return xEmbFact->createInstanceUserInit( aClassID, aClassName, xStorage, sEntName, embed::EntryInitModes::TRUNCATE_INIT, uno::Sequence < beans::PropertyValue >(), lObjArgs);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromEntry(
                                                                     const uno::Reference< embed::XStorage >& xStorage,
                                                                     const OUString& sEntName,
@@ -226,7 +226,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceInitFromMediaDescriptor(
         const uno::Reference< embed::XStorage >& xStorage,
         const OUString& sEntName,
@@ -288,7 +288,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceUserInit(
         const uno::Sequence< sal_Int8 >& aClassID,
         const OUString& sClassName,
@@ -332,7 +332,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
                                                 aObjectArgs );
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLink(
                                             const uno::Reference< embed::XStorage >& xStorage,
                                             const OUString& sEntName,
@@ -405,7 +405,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInstanceLinkUserInit(
                                                 const uno::Sequence< sal_Int8 >& aClassID,
                                                 const OUString& aClassName,
@@ -438,7 +438,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta
 
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL UNOEmbeddedObjectCreator::getImplementationName()
     throw ( uno::RuntimeException )
 {
@@ -451,7 +451,7 @@ sal_Bool SAL_CALL UNOEmbeddedObjectCreator::supportsService( const OUString& Ser
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL UNOEmbeddedObjectCreator::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx
index 7181083246ae..1ebeca499422 100644
--- a/embeddedobj/source/msole/olecomponent.cxx
+++ b/embeddedobj/source/msole/olecomponent.cxx
@@ -227,7 +227,7 @@ struct OleComponentNative_Impl {
     uno::Sequence< datatransfer::DataFlavor > GetFlavorsForAspects( sal_uInt32 nSupportedAspects );
 };
 
-//----------------------------------------------
+
 DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor )
 {
     if ( aFlavor.MimeType.indexOf( ";Aspect=THUMBNAIL" ) != -1 )
@@ -240,7 +240,7 @@ DWORD GetAspectFromFlavor( const datatransfer::DataFlavor& aFlavor )
         return DVASPECT_CONTENT;
 }
 
-//----------------------------------------------
+
 OUString GetFlavorSuffixFromAspect( DWORD nAsp )
 {
     OUString aResult;
@@ -257,7 +257,7 @@ OUString GetFlavorSuffixFromAspect( DWORD nAsp )
     return aResult;
 }
 
-//----------------------------------------------
+
 HRESULT OpenIStorageFromURL_Impl( const OUString& aURL, IStorage** ppIStorage )
 {
     OSL_ENSURE( ppIStorage, "The pointer must not be empty!" );
@@ -274,7 +274,7 @@ HRESULT OpenIStorageFromURL_Impl( const OUString& aURL, IStorage** ppIStorage )
                              ppIStorage );
 }
 
-//----------------------------------------------
+
 sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium,
                                                         const datatransfer::DataFlavor& aFlavor,
                                                         uno::Any& aResult )
@@ -368,7 +368,7 @@ sal_Bool OleComponentNative_Impl::ConvertDataForFlavor( const STGMEDIUM& aMedium
     return bAnyIsReady;
 }
 
-//----------------------------------------------
+
 sal_Bool OleComponentNative_Impl::GraphicalFlavor( const datatransfer::DataFlavor& aFlavor )
 {
     // Actually all the required graphical formats must be supported
@@ -380,7 +380,7 @@ sal_Bool OleComponentNative_Impl::GraphicalFlavor( const datatransfer::DataFlavo
     return sal_False;
 }
 
-//----------------------------------------------
+
 sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aResult )
 {
     if ( aSeq.getLength() == 16 )
@@ -397,7 +397,7 @@ sal_Bool GetClassIDFromSequence_Impl( uno::Sequence< sal_Int8 > aSeq, CLSID& aRe
     return sal_False;
 }
 
-//----------------------------------------------
+
 OUString WinAccToVcl_Impl( const sal_Unicode* pStr )
 {
     OUString aResult;
@@ -422,7 +422,7 @@ OUString WinAccToVcl_Impl( const sal_Unicode* pStr )
     return aResult;
 }
 
-//----------------------------------------------
+
 OleComponent::OleComponent( const uno::Reference< lang::XMultiServiceFactory >& xFactory, OleEmbeddedObject* pUnoOleObject )
 : m_pInterfaceContainer( NULL )
 , m_bDisposed( sal_False )
@@ -452,7 +452,7 @@ OleComponent::OleComponent( const uno::Reference< lang::XMultiServiceFactory >&
 
 }
 
-//----------------------------------------------
+
 OleComponent::~OleComponent()
 {
     OSL_ENSURE( !m_pOleWrapClientSite && !m_pImplAdviseSink && !m_pInterfaceContainer && !m_bOleInitialized,
@@ -479,14 +479,14 @@ OleComponent::~OleComponent()
     delete m_pNativeImpl;
 }
 
-//----------------------------------------------
+
 void OleComponentNative_Impl::AddSupportedFormat( const FORMATETC& aFormatEtc )
 {
     FORMATETC* pFormatToInsert = new FORMATETC( aFormatEtc );
     m_aFormatsList.push_back( pFormatToInsert );
 }
 
-//----------------------------------------------
+
 FORMATETC* OleComponentNative_Impl::GetSupportedFormatForAspect( sal_uInt32 nRequestedAspect )
 {
     for ( FormatEtcList::iterator aIter = m_aFormatsList.begin();
@@ -498,7 +498,7 @@ FORMATETC* OleComponentNative_Impl::GetSupportedFormatForAspect( sal_uInt32 nReq
     return NULL;
 }
 
-//----------------------------------------------
+
 void OleComponent::Dispose()
 {
     // the mutex must be locked before this method is called
@@ -542,7 +542,7 @@ void OleComponent::Dispose()
     m_bDisposed = sal_True;
 }
 
-//----------------------------------------------
+
 void OleComponent::disconnectEmbeddedObject()
 {
     // must not be called from destructor of UNO OLE object!!!
@@ -550,7 +550,7 @@ void OleComponent::disconnectEmbeddedObject()
     m_pUnoOleObject = NULL;
 }
 
-//----------------------------------------------
+
 void OleComponent::CreateNewIStorage_Impl()
 {
     // TODO: in future a global memory could be used instead of file.
@@ -577,7 +577,7 @@ void OleComponent::CreateNewIStorage_Impl()
         throw io::IOException(); // TODO: transport error code?
 }
 
-//----------------------------------------------
+
 uno::Sequence< datatransfer::DataFlavor > OleComponentNative_Impl::GetFlavorsForAspects( sal_uInt32 nSupportedAspects )
 {
     uno::Sequence< datatransfer::DataFlavor > aResult;
@@ -600,7 +600,7 @@ uno::Sequence< datatransfer::DataFlavor > OleComponentNative_Impl::GetFlavorsFor
     return aResult;
 }
 
-//----------------------------------------------
+
 void OleComponent::RetrieveObjectDataFlavors_Impl()
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -652,7 +652,7 @@ void OleComponent::RetrieveObjectDataFlavors_Impl()
     }
 }
 
-//----------------------------------------------
+
 sal_Bool OleComponent::InitializeObject_Impl()
 // There will be no static objects!
 {
@@ -717,7 +717,7 @@ sal_Bool OleComponent::InitializeObject_Impl()
     return sal_True;
 }
 
-//----------------------------------------------
+
 void OleComponent::LoadEmbeddedObject( const OUString& aTempURL )
 {
     if ( !aTempURL.getLength() )
@@ -742,7 +742,7 @@ void OleComponent::LoadEmbeddedObject( const OUString& aTempURL )
         throw uno::RuntimeException(); // TODO
 }
 
-//----------------------------------------------
+
 void OleComponent::CreateObjectFromClipboard()
 {
     if ( m_pNativeImpl->m_pIStorage )
@@ -781,7 +781,7 @@ void OleComponent::CreateObjectFromClipboard()
         throw uno::RuntimeException(); // TODO
 }
 
-//----------------------------------------------
+
 void OleComponent::CreateNewEmbeddedObject( const uno::Sequence< sal_Int8 >& aSeqCLSID )
 {
     CLSID aClsID;
@@ -815,7 +815,7 @@ void OleComponent::CreateNewEmbeddedObject( const uno::Sequence< sal_Int8 >& aSe
     // TODO: getExtent???
 }
 
-//----------------------------------------------
+
 void OleComponent::CreateObjectFromData( const uno::Reference< datatransfer::XTransferable >& )
 // Static objects are not supported, they should be inserted as graphics
 {
@@ -826,7 +826,7 @@ void OleComponent::CreateObjectFromData( const uno::Reference< datatransfer::XTr
     // OleQueryCreateFromData...
 }
 
-//----------------------------------------------
+
 void OleComponent::CreateObjectFromFile( const OUString& aFileURL )
 {
     if ( m_pNativeImpl->m_pIStorage )
@@ -856,7 +856,7 @@ void OleComponent::CreateObjectFromFile( const OUString& aFileURL )
         throw uno::RuntimeException(); // TODO
 }
 
-//----------------------------------------------
+
 void OleComponent::CreateLinkFromFile( const OUString& aFileURL )
 {
     if ( m_pNativeImpl->m_pIStorage )
@@ -885,7 +885,7 @@ void OleComponent::CreateLinkFromFile( const OUString& aFileURL )
         throw uno::RuntimeException(); // TODO
 }
 
-//----------------------------------------------
+
 void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent )
 {
     if ( !pOleLinkComponent || !pOleLinkComponent->m_pNativeImpl->m_pObj )
@@ -979,7 +979,7 @@ void OleComponent::InitEmbeddedCopyOfLink( OleComponent* pOleLinkComponent )
         throw uno::RuntimeException(); // TODO
 }
 
-//----------------------------------------------
+
 void OleComponent::RunObject()
 {
     OSL_ENSURE( m_pNativeImpl->m_pOleObject, "The pointer can not be set to NULL here!\n" );
@@ -1000,7 +1000,7 @@ void OleComponent::RunObject()
     }
 }
 
-//----------------------------------------------
+
 awt::Size OleComponent::CalculateWithFactor( const awt::Size& aSize,
                                             const awt::Size& aMultiplier,
                                             const awt::Size& aDivisor )
@@ -1019,14 +1019,14 @@ awt::Size OleComponent::CalculateWithFactor( const awt::Size& aSize,
     return aResult;
 }
 
-//----------------------------------------------
+
 void OleComponent::CloseObject()
 {
     if ( m_pNativeImpl->m_pOleObject && OleIsRunning( m_pNativeImpl->m_pOleObject ) )
         m_pNativeImpl->m_pOleObject->Close( OLECLOSE_NOSAVE ); // must be saved before
 }
 
-//----------------------------------------------
+
 uno::Sequence< embed::VerbDescriptor > OleComponent::GetVerbList()
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1065,7 +1065,7 @@ uno::Sequence< embed::VerbDescriptor > OleComponent::GetVerbList()
     return m_aVerbList;
 }
 
-//----------------------------------------------
+
 void OleComponent::ExecuteVerb( sal_Int32 nVerbID )
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1086,7 +1086,7 @@ void OleComponent::ExecuteVerb( sal_Int32 nVerbID )
     m_pNativeImpl->m_pOleObject->SetHostNames( L"app name", L"untitled" );
 }
 
-//----------------------------------------------
+
 void OleComponent::SetHostName( const OUString&,
                                 const OUString& )
 {
@@ -1096,7 +1096,7 @@ void OleComponent::SetHostName( const OUString&,
     // TODO: use aContName and aEmbDocName in m_pNativeImpl->m_pOleObject->SetHostNames()
 }
 
-//----------------------------------------------
+
 void OleComponent::SetExtent( const awt::Size& aVisAreaSize, sal_Int64 nAspect )
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1118,7 +1118,7 @@ void OleComponent::SetExtent( const awt::Size& aVisAreaSize, sal_Int64 nAspect )
     }
 }
 
-//----------------------------------------------
+
 awt::Size OleComponent::GetExtent( sal_Int64 nAspect )
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1200,7 +1200,7 @@ awt::Size OleComponent::GetExtent( sal_Int64 nAspect )
     return aSize;
 }
 
-//----------------------------------------------
+
 awt::Size OleComponent::GetCachedExtent( sal_Int64 nAspect )
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1226,7 +1226,7 @@ awt::Size OleComponent::GetCachedExtent( sal_Int64 nAspect )
     return awt::Size( aSize.cx, aSize.cy );
 }
 
-//----------------------------------------------
+
 awt::Size OleComponent::GetReccomendedExtent( sal_Int64 nAspect )
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1241,7 +1241,7 @@ awt::Size OleComponent::GetReccomendedExtent( sal_Int64 nAspect )
     return awt::Size( aSize.cx, aSize.cy );
 }
 
-//----------------------------------------------
+
 sal_Int64 OleComponent::GetMiscStatus( sal_Int64 nAspect )
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1252,7 +1252,7 @@ sal_Int64 OleComponent::GetMiscStatus( sal_Int64 nAspect )
     return ( sal_Int64 )nResult; // first 32 bits are for MS flags
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int8 > OleComponent::GetCLSID()
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1270,7 +1270,7 @@ uno::Sequence< sal_Int8 > OleComponent::GetCLSID()
                                 aCLSID.Data4[6], aCLSID.Data4[7] );
 }
 
-//----------------------------------------------
+
 sal_Bool OleComponent::IsDirty()
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1288,7 +1288,7 @@ sal_Bool OleComponent::IsDirty()
     return ( hr != S_FALSE );
 }
 
-//----------------------------------------------
+
 void OleComponent::StoreOwnTmpIfNecessary()
 {
     if ( !m_pNativeImpl->m_pOleObject )
@@ -1334,7 +1334,7 @@ void OleComponent::StoreOwnTmpIfNecessary()
     }
 }
 
-//----------------------------------------------
+
 sal_Bool OleComponent::SaveObject_Impl()
 {
     sal_Bool bResult = sal_False;
@@ -1358,7 +1358,7 @@ sal_Bool OleComponent::SaveObject_Impl()
     return bResult;
 }
 
-//----------------------------------------------
+
 sal_Bool OleComponent::OnShowWindow_Impl( bool bShow )
 {
     sal_Bool bResult = sal_False;
@@ -1383,7 +1383,7 @@ sal_Bool OleComponent::OnShowWindow_Impl( bool bShow )
     return bResult;
 }
 
-//----------------------------------------------
+
 void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect )
 {
     // TODO: check if it is enough or may be saving notifications are required for Visio2000
@@ -1405,7 +1405,7 @@ void OleComponent::OnViewChange_Impl( sal_uInt32 dwAspect )
     }
 }
 
-//----------------------------------------------
+
 void OleComponent::OnClose_Impl()
 {
     ::rtl::Reference< OleEmbeddedObject > xLockObject;
@@ -1427,7 +1427,7 @@ void OleComponent::OnClose_Impl()
 }
 
 // XCloseable
-//----------------------------------------------
+
 void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
     throw ( util::CloseVetoException,
             uno::RuntimeException )
@@ -1481,7 +1481,7 @@ void SAL_CALL OleComponent::close( sal_Bool bDeliverOwnership )
     Dispose();
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -1495,7 +1495,7 @@ void SAL_CALL OleComponent::addCloseListener( const uno::Reference< util::XClose
     m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< util::XCloseListener >* )0 ), xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -1509,7 +1509,7 @@ void SAL_CALL OleComponent::removeCloseListener( const uno::Reference< util::XCl
 }
 
 // XTransferable
-//----------------------------------------------
+
 uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor& aFlavor )
     throw ( datatransfer::UnsupportedFlavorException,
             io::IOException,
@@ -1612,7 +1612,7 @@ uno::Any SAL_CALL OleComponent::getTransferData( const datatransfer::DataFlavor&
     return aResult;
 }
 
-//----------------------------------------------
+
 uno::Sequence< datatransfer::DataFlavor > SAL_CALL OleComponent::getTransferDataFlavors()
     throw ( uno::RuntimeException )
 {
@@ -1628,7 +1628,7 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OleComponent::getTransferData
     return m_aDataFlavors;
 }
 
-//----------------------------------------------
+
 sal_Bool SAL_CALL OleComponent::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
     throw ( uno::RuntimeException )
 {
@@ -1675,7 +1675,7 @@ void SAL_CALL OleComponent::addEventListener( const uno::Reference< lang::XEvent
     m_pInterfaceContainer->addInterface( ::getCppuType( ( const uno::Reference< lang::XEventListener >* )0 ), xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleComponent::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx
index b0c8abc0f88a..011306189be5 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -57,7 +57,7 @@
 using namespace ::com::sun::star;
 
 #ifdef WNT
-//----------------------------------------------
+
 void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
 {
     if ( m_pOleComponent )
@@ -83,7 +83,7 @@ void OleEmbeddedObject::SwitchComponentToRunningState_Impl()
     }
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int32 > OleEmbeddedObject::GetReachableStatesList_Impl(
                                                         const uno::Sequence< embed::VerbDescriptor >& aVerbList )
 {
@@ -100,7 +100,7 @@ uno::Sequence< sal_Int32 > OleEmbeddedObject::GetReachableStatesList_Impl(
     return aStates;
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int32 > OleEmbeddedObject::GetIntermediateVerbsSequence_Impl( sal_Int32 nNewState )
 {
     SAL_WARN_IF( m_nObjectState == embed::EmbedStates::LOADED, "embeddedobj.ole", "Loaded object is switched to running state without verbs using!" );
@@ -115,7 +115,7 @@ uno::Sequence< sal_Int32 > OleEmbeddedObject::GetIntermediateVerbsSequence_Impl(
     return uno::Sequence< sal_Int32 >();
 }
 #endif
-//----------------------------------------------
+
 void OleEmbeddedObject::MoveListeners()
 {
     if ( m_pInterfaceContainer )
@@ -200,7 +200,7 @@ void OleEmbeddedObject::MoveListeners()
     }
 }
 
-//----------------------------------------------
+
 uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage( OUString& o_aStorageName )
 {
     uno::Reference< embed::XStorage > xResult;
@@ -224,7 +224,7 @@ uno::Reference< embed::XStorage > OleEmbeddedObject::CreateTemporarySubstorage(
     return xResult;
 }
 
-//----------------------------------------------
+
 OUString OleEmbeddedObject::MoveToTemporarySubstream()
 {
     OUString aResult;
@@ -244,7 +244,7 @@ OUString OleEmbeddedObject::MoveToTemporarySubstream()
     return aResult;
 }
 
-//----------------------------------------------
+
 sal_Bool OleEmbeddedObject::TryToConvertToOOo()
 {
     sal_Bool bResult = sal_False;
@@ -433,7 +433,7 @@ sal_Bool OleEmbeddedObject::TryToConvertToOOo()
     return bResult;
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
         throw ( embed::UnreachableStateException,
                 embed::WrongStateException,
@@ -593,7 +593,7 @@ void SAL_CALL OleEmbeddedObject::changeState( sal_Int32 nNewState )
     }
 }
 
-//----------------------------------------------
+
 uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -637,7 +637,7 @@ uno::Sequence< sal_Int32 > SAL_CALL OleEmbeddedObject::getReachableStates()
     }
 }
 
-//----------------------------------------------
+
 sal_Int32 SAL_CALL OleEmbeddedObject::getCurrentState()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -749,7 +749,7 @@ namespace
     }
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
         throw ( lang::IllegalArgumentException,
                 embed::WrongStateException,
@@ -888,7 +888,7 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID )
     }
 }
 
-//----------------------------------------------
+
 uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedVerbs()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -930,7 +930,7 @@ uno::Sequence< embed::VerbDescriptor > SAL_CALL OleEmbeddedObject::getSupportedV
     }
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setClientSite(
                 const uno::Reference< embed::XEmbeddedClient >& xClient )
         throw ( embed::WrongStateException,
@@ -961,7 +961,7 @@ void SAL_CALL OleEmbeddedObject::setClientSite(
     }
 }
 
-//----------------------------------------------
+
 uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSite()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -986,7 +986,7 @@ uno::Reference< embed::XEmbeddedClient > SAL_CALL OleEmbeddedObject::getClientSi
     return m_xClientSite;
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::update()
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -1021,7 +1021,7 @@ void SAL_CALL OleEmbeddedObject::update()
     }
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1050,7 +1050,7 @@ void SAL_CALL OleEmbeddedObject::setUpdateMode( sal_Int32 nMode )
     m_nUpdateMode = nMode;
 }
 
-//----------------------------------------------
+
 sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
     nAspect
 )
@@ -1093,7 +1093,7 @@ sal_Int64 SAL_CALL OleEmbeddedObject::getStatus( sal_Int64
     return ( nResult | embed::EmbedMisc::EMBED_NEEDSSIZEONLOAD );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setContainerName( const OUString& sName )
         throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/msole/olemisc.cxx b/embeddedobj/source/msole/olemisc.cxx
index 7da5e94bc0ff..e1351c84ec06 100644
--- a/embeddedobj/source/msole/olemisc.cxx
+++ b/embeddedobj/source/msole/olemisc.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
 sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory );
 
 
-//------------------------------------------------------
+
 OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory,
                                       const uno::Sequence< sal_Int8 >& aClassID,
                                       const OUString& aClassName )
@@ -68,7 +68,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
 {
 }
 
-//------------------------------------------------------
+
 // In case of loading from persistent entry the classID of the object
 // will be retrieved from the entry, during construction it is unknown
 OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory, sal_Bool bLink )
@@ -100,7 +100,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
 {
 }
 #ifdef WNT
-//------------------------------------------------------
+
 // this constructor let object be initialized from clipboard
 OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
 : m_pOleComponent( NULL )
@@ -131,7 +131,7 @@ OleEmbeddedObject::OleEmbeddedObject( const uno::Reference< lang::XMultiServiceF
 {
 }
 #endif
-//------------------------------------------------------
+
 OleEmbeddedObject::~OleEmbeddedObject()
 {
     OSL_ENSURE( !m_pInterfaceContainer && !m_pOleComponent && !m_xObjectStream.is(),
@@ -153,7 +153,7 @@ OleEmbeddedObject::~OleEmbeddedObject()
            KillFile_Impl( m_aTempDumpURL, m_xFactory );
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEventName )
 {
     if ( m_pInterfaceContainer )
@@ -179,7 +179,7 @@ void OleEmbeddedObject::MakeEventListenerNotification_Impl( const OUString& aEve
     }
 }
 #ifdef WNT
-//----------------------------------------------
+
 void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sal_Int32 nOldState, sal_Int32 nNewState )
 {
     if ( m_pInterfaceContainer )
@@ -220,7 +220,7 @@ void OleEmbeddedObject::StateChangeNotification_Impl( sal_Bool bBeforeChange, sa
     }
 }
 #endif
-//------------------------------------------------------
+
 void OleEmbeddedObject::GetRidOfComponent()
 {
 #ifdef WNT
@@ -249,7 +249,7 @@ void OleEmbeddedObject::GetRidOfComponent()
 #endif
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::Dispose()
 {
     if ( m_pInterfaceContainer )
@@ -296,7 +296,7 @@ void OleEmbeddedObject::Dispose()
     m_bDisposed = true;
 }
 
-//------------------------------------------------------
+
 uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID()
         throw ( uno::RuntimeException )
 {
@@ -316,7 +316,7 @@ uno::Sequence< sal_Int8 > SAL_CALL OleEmbeddedObject::getClassID()
     return m_aClassID;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL OleEmbeddedObject::getClassName()
         throw ( uno::RuntimeException )
 {
@@ -336,7 +336,7 @@ OUString SAL_CALL OleEmbeddedObject::getClassName()
     return m_aClassName;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setClassInfo(
                 const uno::Sequence< sal_Int8 >& aClassID, const OUString& aClassName )
         throw ( lang::NoSupportException,
@@ -356,7 +356,7 @@ void SAL_CALL OleEmbeddedObject::setClassInfo(
     throw lang::NoSupportException(); //TODO:
 }
 
-//------------------------------------------------------
+
 uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
         throw ( uno::RuntimeException )
 {
@@ -390,7 +390,7 @@ uno::Reference< util::XCloseable > SAL_CALL OleEmbeddedObject::getComponent()
     return uno::Reference< util::XCloseable >( static_cast< ::cppu::OWeakObject* >( m_pOleComponent ), uno::UNO_QUERY );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< embed::XStateChangeListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -415,7 +415,7 @@ void SAL_CALL OleEmbeddedObject::addStateChangeListener( const uno::Reference< e
                                                         xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
                     const uno::Reference< embed::XStateChangeListener >& xListener )
     throw (uno::RuntimeException)
@@ -437,7 +437,7 @@ void SAL_CALL OleEmbeddedObject::removeStateChangeListener(
 }
 
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
     throw ( util::CloseVetoException,
             uno::RuntimeException )
@@ -501,7 +501,7 @@ void SAL_CALL OleEmbeddedObject::close( sal_Bool bDeliverOwnership )
     Dispose();
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw ( uno::RuntimeException )
 {
@@ -525,7 +525,7 @@ void SAL_CALL OleEmbeddedObject::addCloseListener( const uno::Reference< util::X
     m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< util::XCloseListener >*)0 ), xListener );
 }
 
-//----------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util::XCloseListener >& xListener )
     throw (uno::RuntimeException)
 {
@@ -548,7 +548,7 @@ void SAL_CALL OleEmbeddedObject::removeCloseListener( const uno::Reference< util
                                                 xListener );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< document::XEventListener >& xListener )
         throw ( uno::RuntimeException )
 {
@@ -572,7 +572,7 @@ void SAL_CALL OleEmbeddedObject::addEventListener( const uno::Reference< documen
     m_pInterfaceContainer->addInterface( ::getCppuType( (const uno::Reference< document::XEventListener >*)0 ), xListener );
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::removeEventListener(
                 const uno::Reference< document::XEventListener >& xListener )
         throw ( uno::RuntimeException )
@@ -597,7 +597,7 @@ void SAL_CALL OleEmbeddedObject::removeEventListener(
 }
 
 // XInplaceObject ( wrapper related implementation )
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPosRect,
                                                            const awt::Rectangle& aClipRect )
         throw ( embed::WrongStateException,
@@ -617,7 +617,7 @@ void SAL_CALL OleEmbeddedObject::setObjectRectangles( const awt::Rectangle& aPos
     throw embed::WrongStateException();
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::enableModeless( sal_Bool bEnable )
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -636,7 +636,7 @@ void SAL_CALL OleEmbeddedObject::enableModeless( sal_Bool bEnable )
     throw embed::WrongStateException();
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::translateAccelerators(
                     const uno::Sequence< awt::KeyEvent >& aKeys )
         throw ( embed::WrongStateException,
@@ -655,7 +655,7 @@ void SAL_CALL OleEmbeddedObject::translateAccelerators(
 }
 
 // XChild
-//------------------------------------------------------
+
 com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL OleEmbeddedObject::getParent() throw (::com::sun::star::uno::RuntimeException)
 {
     // begin wrapping related part ====================
@@ -670,7 +670,7 @@ com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL OleEm
     return m_xParent;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xParent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException)
 {
     // begin wrapping related part ====================
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index 528d0fc5bdfa..0f2b4db2bdd7 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -49,7 +49,7 @@
 using namespace ::com::sun::star;
 using namespace ::comphelper;
 
-//-------------------------------------------------------------------------
+
 sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
 {
     if ( !xFactory.is() )
@@ -72,7 +72,7 @@ sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference< lang::XMulti
     return bRet;
 }
 
-//----------------------------------------------
+
 OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
 {
     SAL_WARN_IF( !xFactory.is(), "embeddedobj.ole", "No factory is provided!" );
@@ -98,7 +98,7 @@ OUString GetNewTempFileURL_Impl( const uno::Reference< lang::XMultiServiceFactor
     return aResult;
 }
 
-//-----------------------------------------------
+
 OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >& xInStream,
                                       const uno::Reference< lang::XMultiServiceFactory >& xFactory )
         throw ( io::IOException,
@@ -182,7 +182,7 @@ OUString GetNewFilledTempFile_Impl( const uno::Reference< embed::XOptimizedStora
     return aResult;
 }
 
-//------------------------------------------------------
+
 void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, const OUString& aMediaType )
 {
     uno::Reference< beans::XPropertySet > xPropSet( xStream, uno::UNO_QUERY );
@@ -192,7 +192,7 @@ void SetStreamMediaType_Impl( const uno::Reference< io::XStream >& xStream, cons
     xPropSet->setPropertyValue("MediaType", uno::makeAny( aMediaType ) );
 }
 #endif
-//------------------------------------------------------
+
 void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStream )
 {
     uno::Reference< beans::XPropertySet > xPropSet( xStream, uno::UNO_QUERY );
@@ -203,7 +203,7 @@ void LetCommonStoragePassBeUsed_Impl( const uno::Reference< io::XStream >& xStre
                                 uno::makeAny( (sal_Bool)sal_True ) );
 }
 #ifdef WNT
-//------------------------------------------------------
+
 void VerbExecutionController::StartControlExecution()
 {
     osl::MutexGuard aGuard( m_aVerbExecutionMutex );
@@ -217,7 +217,7 @@ void VerbExecutionController::StartControlExecution()
     }
 }
 
-//------------------------------------------------------
+
 sal_Bool VerbExecutionController::EndControlExecution_WasModified()
 {
     osl::MutexGuard aGuard( m_aVerbExecutionMutex );
@@ -232,7 +232,7 @@ sal_Bool VerbExecutionController::EndControlExecution_WasModified()
     return bResult;
 }
 
-//------------------------------------------------------
+
 void VerbExecutionController::ModificationNotificationIsDone()
 {
     osl::MutexGuard aGuard( m_aVerbExecutionMutex );
@@ -241,7 +241,7 @@ void VerbExecutionController::ModificationNotificationIsDone()
         m_bChangedOnVerbExecution = sal_True;
 }
 #endif
-//-----------------------------------------------
+
 void VerbExecutionController::LockNotification()
 {
     osl::MutexGuard aGuard( m_aVerbExecutionMutex );
@@ -249,7 +249,7 @@ void VerbExecutionController::LockNotification()
         m_nNotificationLock++;
 }
 
-//-----------------------------------------------
+
 void VerbExecutionController::UnlockNotification()
 {
     osl::MutexGuard aGuard( m_aVerbExecutionMutex );
@@ -257,7 +257,7 @@ void VerbExecutionController::UnlockNotification()
         m_nNotificationLock--;
 }
 
-//-----------------------------------------------
+
 uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( const uno::Reference< io::XInputStream >& xInStream )
         throw( io::IOException )
 {
@@ -279,7 +279,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::GetNewFilledTempStream_Impl( co
     return xTempFile;
 }
 
-//------------------------------------------------------
+
 uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl( const uno::Reference< io::XStream >& xStream )
         throw ( uno::Exception )
 {
@@ -361,7 +361,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToGetAcceptableFormat_Impl(
     return uno::Reference< io::XStream >();
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream,
                                                 const uno::Reference< io::XStream >& xCachedVisualRepresentation )
         throw ( uno::Exception )
@@ -513,7 +513,7 @@ void OleEmbeddedObject::InsertVisualCache_Impl( const uno::Reference< io::XStrea
     xTransacted->commit();
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStream >& xTargetStream )
         throw ( uno::Exception )
 {
@@ -547,14 +547,14 @@ void OleEmbeddedObject::RemoveVisualCache_Impl( const uno::Reference< io::XStrea
     xTransacted->commit();
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::SetVisReplInStream( sal_Bool bExists )
 {
     m_bVisReplInitialized = sal_True;
     m_bVisReplInStream = bExists;
 }
 
-//------------------------------------------------------
+
 sal_Bool OleEmbeddedObject::HasVisReplInStream()
 {
     if ( !m_bVisReplInitialized )
@@ -620,7 +620,7 @@ sal_Bool OleEmbeddedObject::HasVisReplInStream()
     return m_bVisReplInStream;
 }
 
-//------------------------------------------------------
+
 uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepresentation_Impl(
         const uno::Reference< io::XStream >& xStream,
         sal_Bool bAllowToRepair50 )
@@ -755,7 +755,7 @@ uno::Reference< io::XStream > OleEmbeddedObject::TryToRetrieveCachedVisualRepres
     return xResult;
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
                                               const uno::Reference< io::XStream >& xNewObjectStream,
                                               const OUString& aNewName )
@@ -781,7 +781,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
     m_aEntryName = aNewName;
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
                                               const OUString& aNewName )
 {
@@ -797,7 +797,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
 }
 
 #ifdef WNT
-//----------------------------------------------
+
 sal_Bool OleEmbeddedObject::SaveObject_Impl()
 {
     sal_Bool bResult = sal_False;
@@ -817,7 +817,7 @@ sal_Bool OleEmbeddedObject::SaveObject_Impl()
     return bResult;
 }
 
-//----------------------------------------------
+
 sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow )
 {
     ::osl::ResettableMutexGuard aGuard( m_aMutex );
@@ -861,14 +861,14 @@ sal_Bool OleEmbeddedObject::OnShowWindow_Impl( sal_Bool bShow )
     return bResult;
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::OnIconChanged_Impl()
 {
     // TODO/LATER: currently this notification seems to be impossible
     // MakeEventListenerNotification_Impl( OUString( "OnIconChanged" ) );
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::OnViewChanged_Impl()
 {
     if ( m_bDisposed )
@@ -900,7 +900,7 @@ void OleEmbeddedObject::OnViewChanged_Impl()
     // ===============================================================
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::OnClosed_Impl()
 {
     if ( m_bDisposed )
@@ -914,7 +914,7 @@ void OleEmbeddedObject::OnClosed_Impl()
     }
 }
 
-//------------------------------------------------------
+
 OUString OleEmbeddedObject::CreateTempURLEmpty_Impl()
 {
     SAL_WARN_IF( !m_aTempURL.isEmpty(), "embeddedobj.ole", "The object has already the temporary file!" );
@@ -923,7 +923,7 @@ OUString OleEmbeddedObject::CreateTempURLEmpty_Impl()
     return m_aTempURL;
 }
 
-//------------------------------------------------------
+
 OUString OleEmbeddedObject::GetTempURL_Impl()
 {
     if ( m_aTempURL.isEmpty() )
@@ -950,7 +950,7 @@ OUString OleEmbeddedObject::GetTempURL_Impl()
     return m_aTempURL;
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::CreateOleComponent_Impl( OleComponent* pOleComponent )
 {
     if ( !m_pOleComponent )
@@ -967,7 +967,7 @@ void OleEmbeddedObject::CreateOleComponent_Impl( OleComponent* pOleComponent )
     }
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::CreateOleComponentAndLoad_Impl( OleComponent* pOleComponent )
 {
     if ( !m_pOleComponent )
@@ -988,7 +988,7 @@ void OleEmbeddedObject::CreateOleComponentAndLoad_Impl( OleComponent* pOleCompon
     }
 }
 
-//------------------------------------------------------
+
 void OleEmbeddedObject::CreateOleComponentFromClipboard_Impl( OleComponent* pOleComponent )
 {
     if ( !m_pOleComponent )
@@ -1004,7 +1004,7 @@ void OleEmbeddedObject::CreateOleComponentFromClipboard_Impl( OleComponent* pOle
     }
 }
 
-//------------------------------------------------------
+
 uno::Reference< io::XOutputStream > OleEmbeddedObject::GetStreamForSaving()
 {
     if ( !m_xObjectStream.is() )
@@ -1023,7 +1023,7 @@ uno::Reference< io::XOutputStream > OleEmbeddedObject::GetStreamForSaving()
     return xOutStream;
 }
 
-//----------------------------------------------
+
 void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream > xOutStream )
     throw ( uno::Exception )
 {
@@ -1062,7 +1062,7 @@ void OleEmbeddedObject::StoreObjectToStream( uno::Reference< io::XOutputStream >
     //       probably it must be specified on storing
 }
 #endif
-//------------------------------------------------------
+
 void OleEmbeddedObject::StoreToLocation_Impl(
                             const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
@@ -1274,7 +1274,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
     }
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::setPersistentEntry(
                     const uno::Reference< embed::XStorage >& xStorage,
                     const OUString& sEntName,
@@ -1484,7 +1484,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
 #endif
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
@@ -1518,7 +1518,7 @@ void SAL_CALL OleEmbeddedObject::storeToEntry( const uno::Reference< embed::XSto
     // TODO: should the listener notification be done?
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XStorage >& xStorage,
                             const OUString& sEntName,
                             const uno::Sequence< beans::PropertyValue >& lArguments,
@@ -1552,7 +1552,7 @@ void SAL_CALL OleEmbeddedObject::storeAsEntry( const uno::Reference< embed::XSto
     // TODO: should the listener notification be done here or in saveCompleted?
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
         throw ( embed::WrongStateException,
                 uno::Exception,
@@ -1653,7 +1653,7 @@ void SAL_CALL OleEmbeddedObject::saveCompleted( sal_Bool bUseNew )
     }
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1682,7 +1682,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
     return sal_False;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL OleEmbeddedObject::getEntryName()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1716,7 +1716,7 @@ OUString SAL_CALL OleEmbeddedObject::getEntryName()
 }
 
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::storeOwn()
         throw ( embed::WrongStateException,
                 io::IOException,
@@ -1836,7 +1836,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
         MakeEventListenerNotification_Impl( OUString( "OnVisAreaChanged" ));
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -1869,7 +1869,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
     return m_bReadOnly;
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::reload(
                 const uno::Sequence< beans::PropertyValue >& lArguments,
                 const uno::Sequence< beans::PropertyValue >& lObjArgs )
@@ -1913,7 +1913,7 @@ void SAL_CALL OleEmbeddedObject::reload(
     // use meaningfull part of lArguments
 }
 
-//------------------------------------------------------
+
 void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorage >& xStorage,
                                                 const OUString& sEntName )
         throw ( lang::IllegalArgumentException,
@@ -2033,7 +2033,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
     }
 }
 
-//------------------------------------------------------
+
 sal_Bool SAL_CALL  OleEmbeddedObject::isLink()
         throw ( embed::WrongStateException,
                 uno::RuntimeException )
@@ -2054,7 +2054,7 @@ sal_Bool SAL_CALL  OleEmbeddedObject::isLink()
     return m_bIsLink;
 }
 
-//------------------------------------------------------
+
 OUString SAL_CALL OleEmbeddedObject::getLinkURL()
         throw ( embed::WrongStateException,
                 uno::Exception,
diff --git a/embeddedobj/source/msole/ownview.cxx b/embeddedobj/source/msole/ownview.cxx
index 6bba050ea12e..bbfe1d44286f 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -56,7 +56,7 @@ uno::Reference< io::XStream > TryToGetAcceptableFormat_Impl( const uno::Referenc
 //========================================================
 // Dummy interaction handler
 //========================================================
-//--------------------------------------------------------
+
 class DummyHandler_Impl : public ::cppu::WeakImplHelper1< task::XInteractionHandler >
 {
 public:
@@ -67,12 +67,12 @@ public:
             throw( uno::RuntimeException );
 };
 
-//--------------------------------------------------------
+
 DummyHandler_Impl::~DummyHandler_Impl()
 {
 }
 
-//--------------------------------------------------------
+
 void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractionRequest >& )
         throw( uno::RuntimeException )
 {
@@ -82,7 +82,7 @@ void SAL_CALL DummyHandler_Impl::handle( const uno::Reference< task::XInteractio
 //========================================================
 // Object viewer
 //========================================================
-//--------------------------------------------------------
+
 OwnView_Impl::OwnView_Impl( const uno::Reference< lang::XMultiServiceFactory >& xFactory,
                             const uno::Reference< io::XInputStream >& xInputStream )
 : m_xFactory( xFactory )
@@ -95,7 +95,7 @@ OwnView_Impl::OwnView_Impl( const uno::Reference< lang::XMultiServiceFactory >&
     m_aTempFileURL = GetNewFilledTempFile_Impl( xInputStream, m_xFactory );
 }
 
-//--------------------------------------------------------
+
 OwnView_Impl::~OwnView_Impl()
 {
     try {
@@ -108,7 +108,7 @@ OwnView_Impl::~OwnView_Impl()
     } catch( uno::Exception& ) {}
 }
 
-//--------------------------------------------------------
+
 sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
 {
     sal_Bool bResult = sal_False;
@@ -177,7 +177,7 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const OUString& aFileURL )
     return bResult;
 }
 
-//--------------------------------------------------------
+
 sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
 {
     sal_Bool bResult = sal_False;
@@ -192,7 +192,7 @@ sal_Bool OwnView_Impl::CreateModel( sal_Bool bUseNative )
     return bResult;
 }
 
-//--------------------------------------------------------
+
 OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory,
                                                     const OUString& aNameWithExtention,
@@ -254,7 +254,7 @@ OUString OwnView_Impl::GetFilterNameFromExtentionAndInStream(
     return aFilterName;
 }
 
-//--------------------------------------------------------
+
 sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io::XInputStream >& xInStream,
                                                         sal_Bool bParseHeader )
 {
@@ -402,7 +402,7 @@ sal_Bool OwnView_Impl::ReadContentsAndGenerateTempFile( const uno::Reference< io
     return !bFailed;
 }
 
-//--------------------------------------------------------
+
 void OwnView_Impl::CreateNative()
 {
     if ( !m_aNativeTempURL.isEmpty() )
@@ -475,7 +475,7 @@ void OwnView_Impl::CreateNative()
     {}
 }
 
-//--------------------------------------------------------
+
 sal_Bool OwnView_Impl::Open()
 {
     sal_Bool bResult = sal_False;
@@ -540,7 +540,7 @@ sal_Bool OwnView_Impl::Open()
     return bResult;
 }
 
-//--------------------------------------------------------
+
 void OwnView_Impl::Close()
 {
     uno::Reference< frame::XModel > xModel;
@@ -580,7 +580,7 @@ void OwnView_Impl::Close()
     m_bBusy = sal_False;
 }
 
-//--------------------------------------------------------
+
 void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
         throw ( uno::RuntimeException )
 {
@@ -617,14 +617,14 @@ void SAL_CALL OwnView_Impl::notifyEvent( const document::EventObject& aEvent )
     }
 }
 
-//--------------------------------------------------------
+
 void SAL_CALL OwnView_Impl::queryClosing( const lang::EventObject&, sal_Bool )
         throw ( util::CloseVetoException,
                 uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------
+
 void SAL_CALL OwnView_Impl::notifyClosing( const lang::EventObject& Source )
         throw ( uno::RuntimeException )
 {
@@ -633,7 +633,7 @@ void SAL_CALL OwnView_Impl::notifyClosing( const lang::EventObject& Source )
         m_xModel = uno::Reference< frame::XModel >();
 }
 
-//--------------------------------------------------------
+
 void SAL_CALL OwnView_Impl::disposing( const lang::EventObject& Source )
         throw (uno::RuntimeException)
 {
diff --git a/embeddedobj/source/msole/xdialogcreator.cxx b/embeddedobj/source/msole/xdialogcreator.cxx
index c191075076db..c0f45fc556eb 100644
--- a/embeddedobj/source/msole/xdialogcreator.cxx
+++ b/embeddedobj/source/msole/xdialogcreator.cxx
@@ -69,7 +69,7 @@ typedef UINT STDAPICALLTYPE OleUIInsertObjectA_Type(LPOLEUIINSERTOBJECTA);
 
 using namespace ::com::sun::star;
 using namespace ::comphelper;
-//-------------------------------------------------------------------------
+
 uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_Int8 >& aClassID )
 {
     // Writer
@@ -105,7 +105,7 @@ uno::Sequence< sal_Int8 > GetRelatedInternalID_Impl( const uno::Sequence< sal_In
     return aClassID;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
@@ -114,20 +114,20 @@ uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::impl_staticGetSuppo
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL MSOLEDialogObjectCreator::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.embed.MSOLEObjectSystemCreator");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL MSOLEDialogObjectCreator::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new MSOLEDialogObjectCreator( xServiceManager ) );
 }
 
-//-------------------------------------------------------------------------
+
 embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDialog(
             const uno::Reference< embed::XStorage >& xStorage,
             const OUString& sEntName,
@@ -281,7 +281,7 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceByDia
 #endif
 }
 
-//-------------------------------------------------------------------------
+
 embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitFromClipboard(
                 const uno::Reference< embed::XStorage >& xStorage,
                 const OUString& sEntryName,
@@ -333,21 +333,21 @@ embed::InsertedObjectInfo SAL_CALL MSOLEDialogObjectCreator::createInstanceInitF
 #endif
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL MSOLEDialogObjectCreator::getImplementationName()
     throw ( uno::RuntimeException )
 {
     return impl_staticGetImplementationName();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL MSOLEDialogObjectCreator::supportsService( const OUString& ServiceName )
     throw ( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL MSOLEDialogObjectCreator::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/source/msole/xolefactory.cxx b/embeddedobj/source/msole/xolefactory.cxx
index 6545bdb6b895..7f9a87f54a6b 100644
--- a/embeddedobj/source/msole/xolefactory.cxx
+++ b/embeddedobj/source/msole/xolefactory.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
 
 // TODO: do not create OLE objects that represent OOo documents
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
@@ -42,20 +42,20 @@ uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::impl_staticGetSuppo
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL OleEmbeddedObjectFactory::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.embed.OLEEmbeddedObjectFactory");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new OleEmbeddedObjectFactory( xServiceManager ) );
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromEntry(
                                                                     const uno::Reference< embed::XStorage >& xStorage,
                                                                     const OUString& sEntName,
@@ -128,7 +128,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitFromMediaDescriptor(
         const uno::Reference< embed::XStorage >& xStorage,
         const OUString& sEntName,
@@ -169,7 +169,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceInitNew(
                                             const uno::Sequence< sal_Int8 >& aClassID,
                                             const OUString& aClassName,
@@ -211,7 +211,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceLink(
                                             const uno::Reference< embed::XStorage >& xStorage,
                                             const OUString& sEntName,
@@ -254,7 +254,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInstanceUserInit(
             const uno::Sequence< sal_Int8 >& aClassID,
             const OUString& aClassName,
@@ -301,7 +301,7 @@ uno::Reference< uno::XInterface > SAL_CALL OleEmbeddedObjectFactory::createInsta
     return xResult;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL OleEmbeddedObjectFactory::getImplementationName()
     throw ( uno::RuntimeException )
 {
@@ -314,7 +314,7 @@ sal_Bool SAL_CALL OleEmbeddedObjectFactory::supportsService( const OUString& Ser
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OleEmbeddedObjectFactory::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
index 1fdbb1092ac8..e696aaa25616 100644
--- a/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
+++ b/embeddedobj/test/MainThreadExecutor/xexecutor.cxx
@@ -52,7 +52,7 @@ MainThreadExecutor_Impl::MainThreadExecutor_Impl( const uno::Reference< task::XJ
 {
 }
 
-//-------------------------------------------------------------------------
+
 uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::NamedValue >& aArguments )
     throw ( lang::IllegalArgumentException,
             uno::Exception,
@@ -82,7 +82,7 @@ uno::Any SAL_CALL UNOMainThreadExecutor::execute( const uno::Sequence< beans::Na
     return uno::Any();
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(1);
@@ -90,20 +90,20 @@ uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::impl_staticGetSupporte
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL UNOMainThreadExecutor::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.thread.MainThreadExecutor");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL UNOMainThreadExecutor::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new UNOMainThreadExecutor( xServiceManager ) );
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL UNOMainThreadExecutor::getImplementationName()
     throw ( uno::RuntimeException )
 {
@@ -116,7 +116,7 @@ sal_Bool SAL_CALL UNOMainThreadExecutor::supportsService( const OUString& Servic
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL UNOMainThreadExecutor::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/test/mtexecutor/bitmapcreator.cxx b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
index 3c81ccaa41c7..1c75fd9655f7 100644
--- a/embeddedobj/test/mtexecutor/bitmapcreator.cxx
+++ b/embeddedobj/test/mtexecutor/bitmapcreator.cxx
@@ -26,7 +26,7 @@
 
 using namespace ::com::sun::star;
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
@@ -35,20 +35,20 @@ uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::impl_staticGetSupportedServ
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL VCLBitmapCreator::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.embed.BitmapCreator");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new VCLBitmapCreator( xServiceManager ) );
 }
 
-//-------------------------------------------------------------------------
+
 
 uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstance()
         throw ( uno::Exception,
@@ -60,7 +60,7 @@ uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstance()
     return aResult;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstanceWithArguments(
                                                 const uno::Sequence< uno::Any >& aArguments )
         throw ( uno::Exception,
@@ -84,7 +84,7 @@ uno::Reference< uno::XInterface > SAL_CALL VCLBitmapCreator::createInstanceWithA
     return aResult;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL VCLBitmapCreator::getImplementationName()
         throw ( uno::RuntimeException )
 {
@@ -97,7 +97,7 @@ sal_Bool SAL_CALL VCLBitmapCreator::supportsService( const OUString& ServiceName
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL VCLBitmapCreator::getSupportedServiceNames()
         throw ( uno::RuntimeException )
 {
diff --git a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
index 1a0b70f6fa64..f363295914f2 100644
--- a/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
+++ b/embeddedobj/test/mtexecutor/mainthreadexecutor.cxx
@@ -24,7 +24,7 @@
 
 using namespace ::com::sun::star;
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(2);
@@ -33,20 +33,20 @@ uno::Sequence< OUString > SAL_CALL MainThreadExecutor::impl_staticGetSupportedSe
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL MainThreadExecutor::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.thread.MainThreadExecutor");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL MainThreadExecutor::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new MainThreadExecutor( xServiceManager ) );
 }
 
-//-------------------------------------------------------------------------
+
 uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::NamedValue >& aArguments )
     throw ( lang::IllegalArgumentException,
             uno::Exception,
@@ -76,7 +76,7 @@ uno::Any SAL_CALL MainThreadExecutor::execute( const uno::Sequence< beans::Named
     return uno::Any();
 }
 
-//-------------------------------------------------------------------------
+
 IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThreadExecutorRequest )
 {
     pThreadExecutorRequest->doIt();
@@ -85,7 +85,7 @@ IMPL_STATIC_LINK( MainThreadExecutor, worker, MainThreadExecutorRequest*, pThrea
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL MainThreadExecutor::getImplementationName()
         throw ( uno::RuntimeException )
 {
@@ -98,14 +98,14 @@ sal_Bool SAL_CALL MainThreadExecutor::supportsService( const OUString& ServiceNa
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL MainThreadExecutor::getSupportedServiceNames()
         throw ( uno::RuntimeException )
 {
     return impl_staticGetSupportedServiceNames();
 }
 
-//-------------------------------------------------------------------------
+
 MainThreadExecutorRequest::MainThreadExecutorRequest( const uno::Reference< task::XJob >& xJob,
                                                     const uno::Sequence< beans::NamedValue >& aValues )
 : m_xJob( xJob )
@@ -113,7 +113,7 @@ MainThreadExecutorRequest::MainThreadExecutorRequest( const uno::Reference< task
 {
 }
 
-//-------------------------------------------------------------------------
+
 void MainThreadExecutorRequest::doIt()
 {
     if ( m_xJob.is() )
diff --git a/embedserv/source/embed/ed_idataobj.cxx b/embedserv/source/embed/ed_idataobj.cxx
index 254f7953f8a5..d659b2282f98 100644
--- a/embedserv/source/embed/ed_idataobj.cxx
+++ b/embedserv/source/embed/ed_idataobj.cxx
@@ -65,7 +65,7 @@ sal_uInt64 EmbedDocument_Impl::getMetaFileHandle_Impl( sal_Bool isEnhMeta )
     return pResult;
 }
 
-//-------------------------------------------------------------------------------
+
 // IDataObject
 
 STDMETHODIMP EmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
diff --git a/embedserv/source/embed/ed_ioleobject.cxx b/embedserv/source/embed/ed_ioleobject.cxx
index a0d2cf515209..6c2b053dfdd8 100644
--- a/embedserv/source/embed/ed_ioleobject.cxx
+++ b/embedserv/source/embed/ed_ioleobject.cxx
@@ -28,7 +28,7 @@ using namespace ::com::sun::star;
 
 extern OUString  getFilterNameFromGUID_Impl( GUID* );
 
-//-------------------------------------------------------------------------------
+
 // IOleObject
 
 
@@ -338,7 +338,7 @@ STDMETHODIMP EmbedDocument_Impl::SetColorScheme( LOGPALETTE * /*pLogpal*/ )
     return E_NOTIMPL;
 }
 
-//-------------------------------------------------------------------------------
+
 // IDispatch
 
 STDMETHODIMP EmbedDocument_Impl::GetTypeInfoCount( unsigned int FAR*  pctinfo )
@@ -394,7 +394,7 @@ STDMETHODIMP EmbedDocument_Impl::Invoke( DISPID dispIdMember,
     return DISP_E_MEMBERNOTFOUND;
 }
 
-//-------------------------------------------------------------------------------
+
 // IExternalConnection
 
 DWORD STDMETHODCALLTYPE EmbedDocument_Impl::AddConnection( DWORD , DWORD )
diff --git a/embedserv/source/embed/ed_ipersiststr.cxx b/embedserv/source/embed/ed_ipersiststr.cxx
index bbaa567f9a5c..9b59bd4f541b 100644
--- a/embedserv/source/embed/ed_ipersiststr.cxx
+++ b/embedserv/source/embed/ed_ipersiststr.cxx
@@ -274,7 +274,7 @@ HRESULT EmbedDocument_Impl::SaveTo_Impl( IStorage* pStg )
     return hr;
 }
 
-//-------------------------------------------------------------------------------
+
 // IUnknown
 
 STDMETHODIMP EmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
@@ -362,7 +362,7 @@ STDMETHODIMP_(ULONG) EmbedDocument_Impl::Release()
     return nCount;
 }
 
-//-------------------------------------------------------------------------------
+
 // IPersist
 
 STDMETHODIMP EmbedDocument_Impl::GetClassID( CLSID* pClassId )
@@ -371,7 +371,7 @@ STDMETHODIMP EmbedDocument_Impl::GetClassID( CLSID* pClassId )
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 // IPersistStorage
 
 STDMETHODIMP EmbedDocument_Impl::IsDirty()
@@ -738,7 +738,7 @@ STDMETHODIMP EmbedDocument_Impl::HandsOffStorage()
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 // IPersistFile
 
 STDMETHODIMP EmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD /*dwMode*/ )
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index e6421285f1eb..83af0b2a9afa 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -164,7 +164,7 @@ protected:
 // Entry points
 // ===========================
 
-// -------------------------------------------------------------------------------
+
 extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ )
 {
     if (dwReason == DLL_PROCESS_ATTACH)
@@ -178,7 +178,7 @@ extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwRe
     return TRUE;    // ok
 }
 
-// -------------------------------------------------------------------------------
+
 extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv )
 {
     for( int nInd = 0; nInd < SUPPORTED_FACTORIES_NUM; nInd++ )
@@ -195,7 +195,7 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID ri
     return E_FAIL;
 }
 
-// -------------------------------------------------------------------------------
+
 extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow()
 {
     if ( !g_nObj && !g_nLock )
@@ -204,7 +204,7 @@ extern "C" STDAPI INPROC_DLLPUBLIC DllCanUnloadNow()
     return S_FALSE;
 }
 
-// -------------------------------------------------------------------------------
+
 STDAPI INPROC_DLLPUBLIC DllRegisterServer( void )
 {
     HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" );
@@ -222,7 +222,7 @@ STDAPI INPROC_DLLPUBLIC DllRegisterServer( void )
     return E_FAIL;
 }
 
-// -------------------------------------------------------------------------------
+
 STDAPI INPROC_DLLPUBLIC DllUnregisterServer( void )
 {
     return WriteLibraryToRegistry( "ole32.dll", 10 );
@@ -239,13 +239,13 @@ namespace inprocserv
 // InprocCountedObject_Impl implementation
 // ===========================
 
-// -------------------------------------------------------------------------------
+
 InprocCountedObject_Impl::InprocCountedObject_Impl()
 {
     g_nObj++;
 }
 
-// -------------------------------------------------------------------------------
+
 InprocCountedObject_Impl::~InprocCountedObject_Impl()
 {
     g_nObj--;
@@ -255,20 +255,20 @@ InprocCountedObject_Impl::~InprocCountedObject_Impl()
 // InprocEmbedProvider_Impl implementation
 // ===========================
 
-// -------------------------------------------------------------------------------
+
 InprocEmbedProvider_Impl::InprocEmbedProvider_Impl( const GUID& guid )
 : m_refCount( 0 )
 , m_guid( guid )
 {
 }
 
-// -------------------------------------------------------------------------------
+
 InprocEmbedProvider_Impl::~InprocEmbedProvider_Impl()
 {
 }
 
 // IUnknown
-// -------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedProvider_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
 {
     if(IsEqualIID(riid, IID_IUnknown))
@@ -288,13 +288,13 @@ STDMETHODIMP InprocEmbedProvider_Impl::QueryInterface( REFIID riid, void FAR* FA
     return E_NOINTERFACE;
 }
 
-// -------------------------------------------------------------------------------
+
 STDMETHODIMP_(ULONG) InprocEmbedProvider_Impl::AddRef()
 {
     return ++m_refCount;
 }
 
-// -------------------------------------------------------------------------------
+
 STDMETHODIMP_(ULONG) InprocEmbedProvider_Impl::Release()
 {
     sal_Int32 nCount = --m_refCount;
@@ -303,7 +303,7 @@ STDMETHODIMP_(ULONG) InprocEmbedProvider_Impl::Release()
     return nCount;
 }
 
-// -------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter,
                                                        REFIID riid,
                                                        void FAR* FAR* ppv)
@@ -327,7 +327,7 @@ STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter,
     return hr;
 }
 
-// -------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedProvider_Impl::LockServer( int fLock )
 {
     if ( fLock )
diff --git a/embedserv/source/inprocserv/inprocembobj.cxx b/embedserv/source/inprocserv/inprocembobj.cxx
index 536095fcaf31..f06672571cf2 100644
--- a/embedserv/source/inprocserv/inprocembobj.cxx
+++ b/embedserv/source/inprocserv/inprocembobj.cxx
@@ -25,7 +25,7 @@
 namespace inprocserv
 {
 
-//-------------------------------------------------------------------------------
+
 BOOL StringsEqual( LPCOLESTR pszNameFromOutside, wchar_t* pOwnName )
 {
     BOOL bResult = TRUE;
@@ -47,13 +47,13 @@ BOOL StringsEqual( LPCOLESTR pszNameFromOutside, wchar_t* pOwnName )
     return bResult;
 }
 
-//-------------------------------------------------------------------------------
+
 HRESULT InprocEmbedDocument_Impl::Init()
 {
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 void InprocEmbedDocument_Impl::SetName( LPCOLESTR pszNameFromOutside, wchar_t*& pOwnName )
 {
     if ( !pszNameFromOutside )
@@ -76,7 +76,7 @@ void InprocEmbedDocument_Impl::SetName( LPCOLESTR pszNameFromOutside, wchar_t*&
     pOwnName[nLen] = 0;
 }
 
-//-------------------------------------------------------------------------------
+
 BOOL InprocEmbedDocument_Impl::CheckDefHandler()
 {
     // set the own listener
@@ -233,7 +233,7 @@ BOOL InprocEmbedDocument_Impl::CheckDefHandler()
     return TRUE;
 }
 
-//-------------------------------------------------------------------------------
+
 DWORD InprocEmbedDocument_Impl::InsertAdviseLinkToList( const ComSmart<OleWrapperAdviseSink>& pOwnAdvise, ComSmart< OleWrapperAdviseSink > pAdvises[] )
 {
     // the result should start from 1 in case of success, the element 0 can be used for own needs
@@ -258,7 +258,7 @@ DWORD InprocEmbedDocument_Impl::InsertAdviseLinkToList( const ComSmart<OleWrappe
     return nResult;
 }
 
-//-------------------------------------------------------------------------------
+
 void InprocEmbedDocument_Impl::Clean()
 {
     m_pDefHandler = (IUnknown*)NULL;
@@ -301,7 +301,7 @@ void InprocEmbedDocument_Impl::Clean()
 }
 
 // IUnknown
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
 {
     if(IsEqualIID(riid, IID_IUnknown))
@@ -393,13 +393,13 @@ STDMETHODIMP InprocEmbedDocument_Impl::QueryInterface( REFIID riid, void FAR* FA
     return ResultFromScode(E_NOINTERFACE);
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::AddRef()
 {
     return ++m_refCount;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::Release()
 {
     // unfortunately there are reentrance problems in mfc that have to be workarounded
@@ -416,7 +416,7 @@ STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::Release()
 }
 
 // IPersist
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetClassID( CLSID* pClassId )
 {
     *pClassId = *&m_guid;
@@ -424,7 +424,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClassID( CLSID* pClassId )
 }
 
 // IPersistStorage
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::IsDirty()
 {
     if ( m_pDefHandler == NULL || m_pOleAdvises[0] == NULL || m_pOleAdvises[0]->IsClosed() )
@@ -443,7 +443,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::IsDirty()
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InitNew( IStorage *pStg )
 {
     if ( CheckDefHandler() )
@@ -475,7 +475,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InitNew( IStorage *pStg )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Load( IStorage *pStg )
 {
     if ( CheckDefHandler() )
@@ -507,7 +507,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( IStorage *pStg )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoad )
 {
     if ( fSameAsLoad && ( m_pDefHandler == NULL || m_pOleAdvises[0] == NULL || m_pOleAdvises[0]->IsClosed() ) )
@@ -526,7 +526,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Save( IStorage *pStgSave, BOOL fSameAsLoa
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
 {
     if ( m_pDefHandler == NULL || m_pOleAdvises[0] == NULL || m_pOleAdvises[0]->IsClosed() )
@@ -569,7 +569,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( IStorage *pStgNew )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::HandsOffStorage()
 {
     if ( CheckDefHandler() )
@@ -594,7 +594,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::HandsOffStorage()
 }
 
 // IPersistFile
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode )
 {
     if ( CheckDefHandler() && pszFileName )
@@ -624,7 +624,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Load( LPCOLESTR pszFileName, DWORD dwMode
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRemember )
 {
     if ( CheckDefHandler() )
@@ -640,7 +640,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Save( LPCOLESTR pszFileName, BOOL fRememb
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
 {
     if ( CheckDefHandler() )
@@ -669,7 +669,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SaveCompleted( LPCOLESTR pszFileName )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
 {
     if ( CheckDefHandler() )
@@ -686,7 +686,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetCurFile( LPOLESTR *ppszFileName )
 }
 
 // IOleObject
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
 {
     if ( pSite == m_pClientSite )
@@ -733,7 +733,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetClientSite( IOleClientSite* pSite )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
 {
     if ( CheckDefHandler() )
@@ -749,7 +749,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClientSite( IOleClientSite** pSite )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, LPCOLESTR szContainerObj )
 {
 
@@ -768,7 +768,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetHostNames( LPCOLESTR szContainerApp, L
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
 {
     HRESULT ret = S_OK;
@@ -796,7 +796,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Close( DWORD dwSaveOption )
     return ret;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetMoniker( DWORD dwWhichMoniker, IMoniker * pmk )
 {
     if ( CheckDefHandler() )
@@ -812,7 +812,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetMoniker( DWORD dwWhichMoniker, IMonike
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetMoniker( DWORD dwAssign, DWORD dwWhichMoniker, IMoniker ** ppmk )
 {
     if ( CheckDefHandler() )
@@ -828,7 +828,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetMoniker( DWORD dwAssign, DWORD dwWhich
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InitFromData( IDataObject * pDataObject, BOOL fCreation, DWORD dwReserved )
 {
     if ( CheckDefHandler() )
@@ -844,7 +844,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InitFromData( IDataObject * pDataObject,
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetClipboardData( DWORD dwReserved, IDataObject ** ppDataObject )
 {
     if ( CheckDefHandler() )
@@ -860,7 +860,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetClipboardData( DWORD dwReserved, IData
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
     LONG iVerb,
     LPMSG pMsg,
@@ -890,7 +890,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::DoVerb(
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** ppEnumOleVerb )
 {
     if ( CheckDefHandler() )
@@ -906,7 +906,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumVerbs( IEnumOLEVERB ** ppEnumOleVerb
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Update()
 {
 
@@ -923,7 +923,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Update()
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::IsUpToDate()
 {
     if ( CheckDefHandler() )
@@ -939,7 +939,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::IsUpToDate()
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetUserClassID( CLSID *pClsid )
 {
     if ( pClsid )
@@ -948,7 +948,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetUserClassID( CLSID *pClsid )
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetUserType( DWORD dwFormOfType, LPOLESTR * pszUserType )
 {
     if ( CheckDefHandler() )
@@ -964,7 +964,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetUserType( DWORD dwFormOfType, LPOLESTR
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetExtent( DWORD dwDrawAspect, SIZEL *psizel )
 {
     if ( CheckDefHandler() )
@@ -980,7 +980,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetExtent( DWORD dwDrawAspect, SIZEL *psi
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * psizel )
 {
     if ( CheckDefHandler() )
@@ -996,7 +996,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, SIZEL * ps
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdwConnection )
 {
 
@@ -1037,7 +1037,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Advise( IAdviseSink *pAdvSink, DWORD *pdw
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Unadvise( DWORD dwConnection )
 {
     if ( DEFAULT_ARRAY_LEN > dwConnection && dwConnection > 0 && m_pOleAdvises[dwConnection] )
@@ -1064,13 +1064,13 @@ STDMETHODIMP InprocEmbedDocument_Impl::Unadvise( DWORD dwConnection )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::EnumAdvise( IEnumSTATDATA ** /*ppenumAdvise*/ )
 {
     return E_NOTIMPL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetMiscStatus( DWORD dwAspect, DWORD * pdwStatus )
 {
     if ( CheckDefHandler() )
@@ -1086,7 +1086,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetMiscStatus( DWORD dwAspect, DWORD * pd
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetColorScheme( LOGPALETTE * pLogpal )
 {
     if ( CheckDefHandler() )
@@ -1103,7 +1103,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetColorScheme( LOGPALETTE * pLogpal )
 }
 
 //IDataObject
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
 {
     if ( CheckDefHandler() )
@@ -1119,7 +1119,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetData( FORMATETC * pFormatetc, STGMEDIU
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pMedium )
 {
     if ( CheckDefHandler() )
@@ -1135,7 +1135,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetDataHere( FORMATETC * pFormatetc, STGM
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
 {
     if ( CheckDefHandler() )
@@ -1151,7 +1151,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::QueryGetData( FORMATETC * pFormatetc )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pFormatetcIn, FORMATETC * pFormatetcOut )
 {
     if ( CheckDefHandler() )
@@ -1167,7 +1167,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetCanonicalFormatEtc( FORMATETC * pForma
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetData( FORMATETC * pFormatetc, STGMEDIUM * pMedium, BOOL fRelease )
 {
     if ( CheckDefHandler() )
@@ -1183,7 +1183,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetData( FORMATETC * pFormatetc, STGMEDIU
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC ** ppFormatetc )
 {
     if ( CheckDefHandler() )
@@ -1199,7 +1199,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumFormatEtc( DWORD dwDirection, IEnumFO
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection )
 {
 
@@ -1240,7 +1240,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::DAdvise( FORMATETC * pFormatetc, DWORD ad
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::DUnadvise( DWORD dwConnection )
 {
     if ( m_pDefHandler && DEFAULT_ARRAY_LEN > dwConnection && dwConnection > 0 && m_pDataAdvises[dwConnection] )
@@ -1267,7 +1267,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::DUnadvise( DWORD dwConnection )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
 {
     if ( CheckDefHandler() )
@@ -1284,7 +1284,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::EnumDAdvise( IEnumSTATDATA ** ppenumAdvis
 }
 
 // IRunnableObject
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetRunningClass( LPCLSID lpClsid )
 {
     if ( CheckDefHandler() )
@@ -1300,7 +1300,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetRunningClass( LPCLSID lpClsid )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )
 {
     if ( CheckDefHandler() )
@@ -1316,7 +1316,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Run( LPBINDCTX pbc )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
 {
    if ( CheckDefHandler() )
@@ -1333,7 +1333,7 @@ BOOL STDMETHODCALLTYPE InprocEmbedDocument_Impl::IsRunning()
 
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlockCloses )
 {
    if ( CheckDefHandler() )
@@ -1349,7 +1349,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::LockRunning( BOOL fLock, BOOL fLastUnlock
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetContainedObject( BOOL fContained)
 {
    if ( CheckDefHandler() )
@@ -1367,7 +1367,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetContainedObject( BOOL fContained)
 
 
 // IViewObject methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Draw( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hdcTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, LPCRECTL lprcWBounds, BOOL ( STDMETHODCALLTYPE *pfnContinue )( ULONG_PTR dwContinue ), ULONG_PTR dwContinue )
 {
     if ( CheckDefHandler() )
@@ -1383,7 +1383,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Draw( DWORD dwDrawAspect, LONG lindex, vo
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetColorSet( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LOGPALETTE **ppColorSet )
 {
     if ( CheckDefHandler() )
@@ -1399,7 +1399,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetColorSet( DWORD dwDrawAspect, LONG lin
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Freeze( DWORD dwDrawAspect, LONG lindex, void *pvAspect, DWORD *pdwFreeze )
 {
     if ( CheckDefHandler() )
@@ -1415,7 +1415,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Freeze( DWORD dwDrawAspect, LONG lindex,
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Unfreeze( DWORD dwFreeze )
 {
     if ( CheckDefHandler() )
@@ -1431,7 +1431,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::Unfreeze( DWORD dwFreeze )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetAdvise( DWORD aspects, DWORD advf, IAdviseSink *pAdvSink )
 {
 
@@ -1463,7 +1463,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetAdvise( DWORD aspects, DWORD advf, IAd
     return S_OK;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetAdvise( DWORD *pAspects, DWORD *pAdvf, IAdviseSink **ppAdvSink )
 {
     if ( !ppAdvSink )
@@ -1488,7 +1488,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetAdvise( DWORD *pAspects, DWORD *pAdvf,
 }
 
 // IViewObject2 methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG lindex, DVTARGETDEVICE *ptd, LPSIZEL lpsizel )
 {
     if ( CheckDefHandler() )
@@ -1507,7 +1507,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetExtent( DWORD dwDrawAspect, LONG linde
 
 
 // IOleWindow methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetWindow( HWND *phwnd )
 {
     if ( CheckDefHandler() )
@@ -1523,7 +1523,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetWindow( HWND *phwnd )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode )
 {
     if ( CheckDefHandler() )
@@ -1541,7 +1541,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::ContextSensitiveHelp( BOOL fEnterMode )
 
 
 // IOleInPlaceObject methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void )
 {
     if ( CheckDefHandler() )
@@ -1557,7 +1557,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InPlaceDeactivate( void )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate( void )
 {
     if ( CheckDefHandler() )
@@ -1573,7 +1573,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::UIDeactivate( void )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCRECT lprcClipRect )
 {
     if ( CheckDefHandler() )
@@ -1589,7 +1589,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::SetObjectRects( LPCRECT lprcPosRect, LPCR
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo( void )
 {
     if ( CheckDefHandler() )
@@ -1607,7 +1607,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::ReactivateAndUndo( void )
 
 
 // IDispatch methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfoCount( UINT *pctinfo )
 {
     if ( CheckDefHandler() )
@@ -1623,7 +1623,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfoCount( UINT *pctinfo )
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfo( UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo )
 {
     if ( CheckDefHandler() )
@@ -1639,7 +1639,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetTypeInfo( UINT iTInfo, LCID lcid, ITyp
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::GetIDsOfNames( REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId )
 {
     if ( CheckDefHandler() )
@@ -1655,7 +1655,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::GetIDsOfNames( REFIID riid, LPOLESTR *rgs
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr )
 {
     if ( CheckDefHandler() )
@@ -1677,26 +1677,26 @@ STDMETHODIMP InprocEmbedDocument_Impl::Invoke( DISPID dispIdMember, REFIID riid,
 // ====
 
 // IUnknown
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::QueryInterface( REFIID riid, void FAR* FAR* ppv )
 {
     return m_rOwnDocument.QueryInterface( riid, ppv );
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::InternalCacheWrapper::AddRef()
 {
     return m_rOwnDocument.AddRef();
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP_(ULONG) InprocEmbedDocument_Impl::InternalCacheWrapper::Release()
 {
     return m_rOwnDocument.Release();
 }
 
 // IOleCache methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Cache( FORMATETC *pformatetc, DWORD advf, DWORD *pdwConnection )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
@@ -1712,7 +1712,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Cache( FORMATETC *p
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Uncache( DWORD dwConnection )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
@@ -1728,7 +1728,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::Uncache( DWORD dwCo
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::EnumCache( IEnumSTATDATA **ppenumSTATDATA )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
@@ -1744,7 +1744,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::EnumCache( IEnumSTA
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::InitCache( IDataObject *pDataObject )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
@@ -1760,7 +1760,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::InitCache( IDataObj
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::SetData( FORMATETC *pformatetc, STGMEDIUM *pmedium, BOOL fRelease )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
@@ -1777,7 +1777,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::SetData( FORMATETC
 }
 
 // IOleCache2 methods
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::UpdateCache( LPDATAOBJECT pDataObject, DWORD grfUpdf, LPVOID pReserved )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
@@ -1793,7 +1793,7 @@ STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::UpdateCache( LPDATA
     return E_FAIL;
 }
 
-//-------------------------------------------------------------------------------
+
 STDMETHODIMP InprocEmbedDocument_Impl::InternalCacheWrapper::DiscardCache( DWORD dwDiscardOptions )
 {
     if ( m_rOwnDocument.CheckDefHandler() )
diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx
index 6dc6b508816d..f1b7dd48d820 100644
--- a/eventattacher/source/eventattacher.cxx
+++ b/eventattacher/source/eventattacher.cxx
@@ -107,7 +107,7 @@ Reference< XInterface > createAllListenerAdapter
 }
 
 
-//--------------------------------------------------------------------------------------------------
+
 // InvocationToAllListenerMapper
 InvocationToAllListenerMapper::InvocationToAllListenerMapper
     ( const Reference< XIdlClass >& ListenerType, const Reference< XAllListener >& AllListener, const Any& Helper )
@@ -432,9 +432,9 @@ Reference< XTypeConverter > EventAttacherImpl::getConverter() throw( Exception )
     return m_xConverter;
 }
 
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
+
+
+
 // Implementation of an EventAttacher-related AllListeners, which brings
 // a few Events to a general AllListener
 class FilterAllListenerImpl : public WeakImplHelper1< XAllListener  >
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 62cacc19b6df..0006168c34b8 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -44,7 +44,7 @@ namespace abp
     //=====================================================================
     //= FinalPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     FinalPage::FinalPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_FINAL))
         ,m_aExplanation         ( this, ModuleRes( FT_FINISH_EXPL ) )
@@ -65,7 +65,7 @@ namespace abp
         m_aRegisterName.Check(true);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool FinalPage::isValidName() const
     {
         OUString sCurrentName(m_aName.GetText());
@@ -81,7 +81,7 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void FinalPage::setFields()
     {
         AddressSettings& rSettings = getSettings();
@@ -116,7 +116,7 @@ namespace abp
         OnRegister(&m_aRegisterName);
     }
 
-    //---------------------------------------------------------------------
+
     void FinalPage::initializePage()
     {
         AddressBookSourcePage::initializePage();
@@ -124,7 +124,7 @@ namespace abp
         setFields();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool FinalPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!AddressBookSourcePage::commitPage(_eReason))
@@ -144,7 +144,7 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void FinalPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
@@ -160,7 +160,7 @@ namespace abp
         getDialog()->defaultButton( WZB_FINISH );
     }
 
-    //---------------------------------------------------------------------
+
     void FinalPage::DeactivatePage()
     {
         AddressBookSourcePage::DeactivatePage();
@@ -171,13 +171,13 @@ namespace abp
         getDialog()->enableButtons( WZB_FINISH, sal_False );
     }
 
-    //---------------------------------------------------------------------
+
     bool FinalPage::canAdvance() const
     {
         return false;
     }
 
-    //---------------------------------------------------------------------
+
     void FinalPage::implCheckName()
     {
         sal_Bool bValidName = isValidName();
@@ -191,14 +191,14 @@ namespace abp
         m_aDuplicateNameError.Show( !bValidName && !bEmptyName );
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( FinalPage, OnNameModified, Edit*, /**/ )
     {
         implCheckName();
         return 0L;
     }
 
-    // -----------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(FinalPage, OnRegister)
     {
         sal_Bool bEnable = m_aRegisterName.IsChecked();
diff --git a/extensions/source/abpilot/abpservices.cxx b/extensions/source/abpilot/abpservices.cxx
index 14070045a298..4a2ef7fe53c5 100644
--- a/extensions/source/abpilot/abpservices.cxx
+++ b/extensions/source/abpilot/abpservices.cxx
@@ -19,18 +19,18 @@
 
 #include "componentmodule.hxx"
 
-//---------------------------------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-//---------------------------------------------------------------------------------------
+
 
 extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno();
 
-//---------------------------------------------------------------------------------------
+
 
 extern "C" void SAL_CALL abp_initializeModule()
 {
@@ -43,7 +43,7 @@ extern "C" void SAL_CALL abp_initializeModule()
     }
 }
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL abp_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index 3b3868402bca..27b41acce69a 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -36,38 +36,38 @@ namespace abp
     {
     }
 
-    //---------------------------------------------------------------------
+
     void AddressBookSourcePage::DeactivatePage()
     {
         AddressBookSourcePage_Base::DeactivatePage();
         getDialog()->enableButtons(WZB_NEXT, sal_True);
     }
 
-    //---------------------------------------------------------------------
+
     OAddessBookSourcePilot* AddressBookSourcePage::getDialog()
     {
         return static_cast<OAddessBookSourcePilot*>(GetParent());
     }
 
-    //---------------------------------------------------------------------
+
     const OAddessBookSourcePilot* AddressBookSourcePage::getDialog() const
     {
         return static_cast<const OAddessBookSourcePilot*>(GetParent());
     }
 
-    //---------------------------------------------------------------------
+
     AddressSettings& AddressBookSourcePage::getSettings()
     {
         return getDialog()->getSettings();
     }
 
-    //---------------------------------------------------------------------
+
     const AddressSettings&  AddressBookSourcePage::getSettings() const
     {
         return getDialog()->getSettings();
     }
 
-    //---------------------------------------------------------------------
+
     const Reference< XComponentContext > & AddressBookSourcePage::getORB()
     {
         return getDialog()->getORB();
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 0c3a07e2d3be..46893fcf131e 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -57,7 +57,7 @@ namespace abp
     //=====================================================================
     //= OAddessBookSourcePilot
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB)
         :OAddessBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ),
             WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS )
@@ -133,7 +133,7 @@ namespace abp
         FreeResource();
     }
 
-    //---------------------------------------------------------------------
+
     OUString OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
     {
         sal_uInt16 nResId = 0;
@@ -157,7 +157,7 @@ namespace abp
         return sDisplayName;
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::implCommitAll()
     {
         // in real, the data source already exists in the data source context
@@ -179,14 +179,14 @@ namespace abp
         fieldmapping::writeTemplateAddressFieldMapping( getORB(), m_aSettings.aFieldMapping );
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::implCleanup()
     {
         if ( m_aNewDataSource.isValid() )
             m_aNewDataSource.remove();
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OAddessBookSourcePilot, OnCancelClicked, void*, /*NOTINTERESTEDIN*/ )
     {
         // do cleanups
@@ -200,7 +200,7 @@ namespace abp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     bool OAddessBookSourcePilot::Close()
     {
         implCleanup();
@@ -208,7 +208,7 @@ namespace abp
         return OAddessBookSourcePilot_Base::Close();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OAddessBookSourcePilot::onFinish()
     {
         if ( !OAddessBookSourcePilot_Base::onFinish() )
@@ -221,7 +221,7 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::enterState( WizardState _nState )
     {
         switch ( _nState )
@@ -243,7 +243,7 @@ namespace abp
         OAddessBookSourcePilot_Base::enterState(_nState);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OAddessBookSourcePilot::prepareLeaveCurrentState( CommitPageReason _eReason )
     {
         if ( !OAddessBookSourcePilot_Base::prepareLeaveCurrentState( _eReason ) )
@@ -297,7 +297,7 @@ namespace abp
         return bAllow;
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::implDefaultTableName()
     {
         const StringBag& rTableNames = getDataSource().getTableNames();
@@ -323,7 +323,7 @@ namespace abp
             getSettings().sSelectedTable = sGuess;
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::implDoAutoFieldMapping()
     {
         DBG_ASSERT( !needManualFieldMapping( ), "OAddessBookSourcePilot::implDoAutoFieldMapping: invalid call!" );
@@ -331,7 +331,7 @@ namespace abp
         fieldmapping::defaultMapping( getORB(), m_aSettings.aFieldMapping );
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::implCreateDataSource()
     {
         if (m_aNewDataSource.isValid())
@@ -400,7 +400,7 @@ namespace abp
         m_eNewDataSourceType = m_aSettings.eType;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OAddessBookSourcePilot::connectToDataSource( sal_Bool _bForceReConnect )
     {
         DBG_ASSERT( m_aNewDataSource.isValid(), "OAddessBookSourcePilot::implConnect: invalid current data source!" );
@@ -412,7 +412,7 @@ namespace abp
         return m_aNewDataSource.connect( this );
     }
 
-    //---------------------------------------------------------------------
+
     OWizardPage* OAddessBookSourcePilot::createPage(WizardState _nState)
     {
         switch (_nState)
@@ -438,7 +438,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::impl_updateRoadmap( AddressSourceType _eType )
     {
         bool bSettingsPage = needAdminInvokationPage( _eType );
@@ -467,7 +467,7 @@ namespace abp
         );
     }
 
-    //---------------------------------------------------------------------
+
     void OAddessBookSourcePilot::typeSelectionChanged( AddressSourceType _eType )
     {
         PathId nCurrentPathID( PATH_COMPLETE );
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index fb39a208b184..143b567d0128 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -45,7 +45,7 @@ namespace abp
     //=====================================================================
     //= OAdminDialogInvokation
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OAdminDialogInvokation::OAdminDialogInvokation(const Reference< XComponentContext >& _rxContext
                     , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > _xDataSource
                     , Window* _pMessageParent)
@@ -58,7 +58,7 @@ namespace abp
         DBG_ASSERT(m_pMessageParent, "OAdminDialogInvokation::OAdminDialogInvokation: invalid message parent!");
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OAdminDialogInvokation::invokeAdministration( sal_Bool _bFixedType )
     {
         if (!m_xContext.is())
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index 9ce84904c5a3..543554626322 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -42,21 +42,21 @@ namespace abp
         m_aInvokeAdminDialog.SetClickHdl( LINK(this, AdminDialogInvokationPage, OnInvokeAdminDialog) );
     }
 
-    //---------------------------------------------------------------------
+
     void AdminDialogInvokationPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
         m_aInvokeAdminDialog.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void AdminDialogInvokationPage::implUpdateErrorMessage()
     {
         const sal_Bool bIsConnected = getDialog()->getDataSource().isConnected();
         m_aErrorMessage.Show( !bIsConnected );
     }
 
-    //---------------------------------------------------------------------
+
     void AdminDialogInvokationPage::initializePage()
     {
         AddressBookSourcePage::initializePage();
@@ -64,7 +64,7 @@ namespace abp
             // if we're entering this page, we assume we had no connection trial with this data source
     }
 
-    //---------------------------------------------------------------------
+
     void AdminDialogInvokationPage::implTryConnect()
     {
         getDialog()->connectToDataSource( sal_True );
@@ -80,13 +80,13 @@ namespace abp
             getDialog()->travelNext();
     }
 
-    //---------------------------------------------------------------------
+
     bool AdminDialogInvokationPage::canAdvance() const
     {
         return AddressBookSourcePage::canAdvance() && getDialog()->getDataSource().isConnected();
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( AdminDialogInvokationPage, OnInvokeAdminDialog, void*, /*NOTINTERESTEDIN*/ )
     {
         OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() );
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index fde1b3ace120..7945bd293778 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -67,14 +67,14 @@ namespace abp
     struct PackageAccessControl { };
 
     //=====================================================================
-    //---------------------------------------------------------------------
+
     static Reference< XDatabaseContext > lcl_getDataSourceContext( const Reference< XComponentContext >& _rxContext ) SAL_THROW (( Exception ))
     {
         Reference<XDatabaseContext> xContext = DatabaseContext::create(_rxContext);
         return xContext;
     }
 
-    //---------------------------------------------------------------------
+
     /// creates a new data source and inserts it into the context
     static void lcl_implCreateAndInsert(
         const Reference< XComponentContext >& _rxContext, const OUString& _rName,
@@ -104,7 +104,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     /// creates and inserts a data source, and sets it's URL property to the string given
     static ODataSource lcl_implCreateAndSetURL(
         const Reference< XComponentContext >& _rxORB, const OUString& _rName,
@@ -136,7 +136,7 @@ namespace abp
 
         return aReturn;
     }
-    //---------------------------------------------------------------------
+
     void lcl_registerDataSource(
         const Reference< XComponentContext >& _rxORB, const OUString& _sName,
         const OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception ))
@@ -177,7 +177,7 @@ namespace abp
     //=====================================================================
     //= ODataSourceContext
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ODataSourceContext::ODataSourceContext(const Reference< XComponentContext >& _rxORB)
         :m_pImpl( new ODataSourceContextImpl( _rxORB ) )
     {
@@ -209,7 +209,7 @@ namespace abp
         delete(m_pImpl);
     }
 
-    //---------------------------------------------------------------------
+
     OUString& ODataSourceContext::disambiguate(OUString& _rDataSourceName)
     {
         OUString sCheck( _rDataSourceName );
@@ -228,71 +228,71 @@ namespace abp
         return _rDataSourceName;
     }
 
-    //---------------------------------------------------------------------
+
     void ODataSourceContext::getDataSourceNames( StringBag& _rNames ) const SAL_THROW (( ))
     {
         _rNames = m_pImpl->aDataSourceNames;
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewLDAP( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:ldap:" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewMORK( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:mozilla" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewThunderbird( const OUString& _rName ) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:thunderbird" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewEvolutionLdap( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:ldap" );
     }
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewEvolutionGroupwise( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:groupwise" );
     }
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewEvolution( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:evolution:local" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewKab( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:kab" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewMacab( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:macab" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewOutlook( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlook" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewOE( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:address:outlookexp" );
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource ODataSourceContext::createNewDBase( const OUString& _rName) SAL_THROW (( ))
     {
         return lcl_implCreateAndSetURL( m_pImpl->xORB, _rName, "sdbc:dbase:" );
@@ -321,7 +321,7 @@ namespace abp
         ODataSourceImpl( const ODataSourceImpl& _rSource );
     };
 
-    //---------------------------------------------------------------------
+
     ODataSourceImpl::ODataSourceImpl( const ODataSourceImpl& _rSource )
         :xORB( _rSource.xORB )
         ,xDataSource( _rSource.xDataSource )
@@ -335,14 +335,14 @@ namespace abp
     //=====================================================================
     //= ODataSource
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ODataSource::ODataSource( const ODataSource& _rSource )
         :m_pImpl( NULL )
     {
         *this = _rSource;
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource& ODataSource::operator=( const ODataSource& _rSource )
     {
         if( this != &_rSource )
@@ -353,19 +353,19 @@ namespace abp
         return *this;
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource::ODataSource( const Reference< XComponentContext >& _rxORB )
         :m_pImpl(new ODataSourceImpl(_rxORB))
     {
     }
 
-    //---------------------------------------------------------------------
+
     ODataSource::~ODataSource( )
     {
         delete m_pImpl;
     }
 
-    //---------------------------------------------------------------------
+
     void ODataSource::store() SAL_THROW (( ))
     {
         if (!isValid())
@@ -386,7 +386,7 @@ namespace abp
             OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
         }
     }
-    //---------------------------------------------------------------------
+
     void ODataSource::registerDataSource( const OUString& _sRegisteredDataSourceName) SAL_THROW (( ))
     {
         if (!isValid())
@@ -404,7 +404,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void ODataSource::setDataSource( const Reference< XPropertySet >& _rxDS,const OUString& _sName, PackageAccessControl )
     {
         if (m_pImpl->xDataSource.get() == _rxDS.get())
@@ -418,7 +418,7 @@ namespace abp
         m_pImpl->xDataSource = _rxDS;
     }
 
-    //---------------------------------------------------------------------
+
     void ODataSource::remove() SAL_THROW (( ))
     {
         if (!isValid())
@@ -436,7 +436,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ODataSource::rename( const OUString& _rName ) SAL_THROW (( ))
     {
         if (!isValid())
@@ -447,7 +447,7 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     OUString ODataSource::getName() const SAL_THROW (( ))
     {
         if ( !isValid() )
@@ -455,7 +455,7 @@ namespace abp
         return m_pImpl->sName;
     }
 
-    //---------------------------------------------------------------------
+
     bool ODataSource::hasTable( const OUString& _rTableName ) const
     {
         if ( !isConnected() )
@@ -465,7 +465,7 @@ namespace abp
         return aTables.find( _rTableName ) != aTables.end();
     }
 
-    //---------------------------------------------------------------------
+
     const StringBag& ODataSource::getTableNames() const SAL_THROW (( ))
     {
         m_pImpl->aTables.clear();
@@ -505,7 +505,7 @@ namespace abp
         return m_pImpl->aTables;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ODataSource::connect( Window* _pMessageParent ) SAL_THROW (( ))
     {
         if ( isConnected( ) )
@@ -596,7 +596,7 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void ODataSource::disconnect( ) SAL_THROW (( ))
     {
         m_pImpl->xConnection.clear();
@@ -604,18 +604,18 @@ namespace abp
         m_pImpl->bTablesUpToDate = sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ODataSource::isConnected( ) const SAL_THROW (( ))
     {
         return m_pImpl->xConnection.is();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ODataSource::isValid() const SAL_THROW (( ))
     {
         return m_pImpl && m_pImpl->xDataSource.is();
     }
-    //---------------------------------------------------------------------
+
     Reference< XPropertySet > ODataSource::getDataSource() const SAL_THROW (( ))
     {
         return m_pImpl ? m_pImpl->xDataSource : Reference< XPropertySet >();
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index db330641d71c..0291d7380948 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -49,14 +49,14 @@ namespace abp
     using namespace ::com::sun::star::ui;
     using namespace ::com::sun::star::ui::dialogs;
 
-    //---------------------------------------------------------------------
+
     static const OUString& lcl_getDriverSettingsNodeName()
     {
         static const OUString s_sDriverSettingsNodeName( "/org.openoffice.Office.DataAccess/DriverSettings/com.sun.star.comp.sdbc.MozabDriver" );
         return s_sDriverSettingsNodeName;
     }
 
-    //---------------------------------------------------------------------
+
     static const OUString& lcl_getAddressBookNodeName()
     {
         static const OUString s_sAddressBookNodeName( "/org.openoffice.Office.DataAccess/AddressBook" );
@@ -68,7 +68,7 @@ namespace abp
     {
     //.....................................................................
 
-        //-----------------------------------------------------------------
+
         sal_Bool invokeDialog( const Reference< XComponentContext >& _rxORB, class Window* _pParent,
             const Reference< XPropertySet >& _rxDataSource, AddressSettings& _rSettings ) SAL_THROW ( ( ) )
         {
@@ -124,7 +124,7 @@ namespace abp
             return sal_False;
         }
 
-        //-----------------------------------------------------------------
+
         void defaultMapping(  const Reference< XComponentContext >& _rxContext, MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) )
         {
             _rFieldAssignment.clear();
@@ -217,7 +217,7 @@ namespace abp
             }
         }
 
-        //-----------------------------------------------------------------
+
         void writeTemplateAddressFieldMapping( const Reference< XComponentContext >& _rxContext, const MapString2String& _rFieldAssignment ) SAL_THROW ( ( ) )
         {
             // want to have a non-const map for easier handling
@@ -296,7 +296,7 @@ namespace abp
     {
     //.....................................................................
 
-        //-----------------------------------------------------------------
+
         void writeTemplateAddressSource( const Reference< XComponentContext >& _rxContext,
             const OUString& _rDataSourceName, const OUString& _rTableName ) SAL_THROW ( ( ) )
         {
@@ -315,7 +315,7 @@ namespace abp
             aAddressBookSettings.commit();
         }
 
-        //-----------------------------------------------------------------
+
         void markPilotSuccess( const Reference< XComponentContext >& _rxContext ) SAL_THROW ( ( ) )
         {
             // access the configuration information which the driver uses for determining it's column names
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index b33c15f53171..ec2b6507e99f 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -31,7 +31,7 @@ namespace abp
     //=====================================================================
     //= FieldMappingPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     FieldMappingPage::FieldMappingPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage( _pParent, ModuleRes( RID_PAGE_FIELDMAPPING ) )
         ,m_aExplanation     ( this, ModuleRes( FT_FIELDASSIGMENTEXPL ) )
@@ -56,27 +56,27 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void FieldMappingPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
         m_aInvokeDialog.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void FieldMappingPage::DeactivatePage()
     {
         AddressBookSourcePage::DeactivatePage();
     }
 
-    //---------------------------------------------------------------------
+
     void FieldMappingPage::initializePage()
     {
         AddressBookSourcePage::initializePage();
         implUpdateHint();
     }
 
-    //---------------------------------------------------------------------
+
     void FieldMappingPage::implUpdateHint()
     {
         const AddressSettings& rSettings = getSettings();
@@ -86,7 +86,7 @@ namespace abp
         m_aHint.SetText( sHint );
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( FieldMappingPage, OnInvokeDialog, void*, /*NOTINTERESTEDIN*/ )
     {
         AddressSettings& rSettings = getSettings();
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index 724cbd5571f8..1dcf8b8f19ab 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -31,7 +31,7 @@ namespace abp
     //=====================================================================
     //= TableSelectionPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     TableSelectionPage::TableSelectionPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION_AB))
         ,m_aLabel           ( this, ModuleRes( FL_TOOMUCHTABLES ) )
@@ -43,7 +43,7 @@ namespace abp
         m_aTableList.SetDoubleClickHdl( LINK( this, TableSelectionPage, OnTableDoubleClicked ) );
     }
 
-    //---------------------------------------------------------------------
+
     void TableSelectionPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
@@ -51,13 +51,13 @@ namespace abp
         m_aTableList.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void TableSelectionPage::DeactivatePage()
     {
         AddressBookSourcePage::DeactivatePage();
     }
 
-    //---------------------------------------------------------------------
+
     void TableSelectionPage::initializePage()
     {
         AddressBookSourcePage::initializePage();
@@ -82,7 +82,7 @@ namespace abp
         m_aTableList.SelectEntry( rSettings.sSelectedTable );
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( TableSelectionPage, OnTableDoubleClicked, void*, /*NOTINTERESTEDIN*/ )
     {
         if ( 1 == m_aTableList.GetSelectEntryCount() )
@@ -91,14 +91,14 @@ namespace abp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( TableSelectionPage, OnTableSelected, void*, /*NOTINTERESTEDIN*/ )
     {
         updateDialogTravelUI();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!AddressBookSourcePage::commitPage(_eReason))
@@ -110,7 +110,7 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     bool TableSelectionPage::canAdvance() const
     {
         return  AddressBookSourcePage::canAdvance()
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 00fba8317f41..e194d35a4089 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -36,7 +36,7 @@ namespace abp
     //=====================================================================
     //= TypeSelectionPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     TypeSelectionPage::TypeSelectionPage( OAddessBookSourcePilot* _pParent )
         :AddressBookSourcePage(_pParent, ModuleRes(RID_PAGE_SELECTABTYPE))
         ,m_aHint                (this,  ModuleRes(FT_TYPE_HINTS))
@@ -168,7 +168,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     TypeSelectionPage::~TypeSelectionPage()
     {
         for ( ::std::vector< ButtonItem >::iterator loop = m_aAllTypes.begin();
@@ -178,7 +178,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void TypeSelectionPage::ActivatePage()
     {
         AddressBookSourcePage::ActivatePage();
@@ -197,14 +197,14 @@ namespace abp
         getDialog()->enableButtons(WZB_PREVIOUS, sal_False);
     }
 
-    //---------------------------------------------------------------------
+
     void TypeSelectionPage::DeactivatePage()
     {
         AddressBookSourcePage::DeactivatePage();
         getDialog()->enableButtons(WZB_PREVIOUS, sal_True);
     }
 
-    //---------------------------------------------------------------------
+
     void TypeSelectionPage::selectType( AddressSourceType _eType )
     {
         for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
@@ -215,7 +215,7 @@ namespace abp
         }
     }
 
-    //---------------------------------------------------------------------
+
     AddressSourceType TypeSelectionPage::getSelectedType() const
     {
         for ( ::std::vector< ButtonItem >::const_iterator loop = m_aAllTypes.begin();
@@ -229,7 +229,7 @@ namespace abp
         return AST_INVALID;
     }
 
-    //---------------------------------------------------------------------
+
     void TypeSelectionPage::initializePage()
     {
         AddressBookSourcePage::initializePage();
@@ -238,7 +238,7 @@ namespace abp
         selectType(rSettings.eType);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TypeSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!AddressBookSourcePage::commitPage(_eReason))
@@ -257,14 +257,14 @@ namespace abp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     bool TypeSelectionPage::canAdvance() const
     {
         return  AddressBookSourcePage::canAdvance()
             &&  (AST_INVALID != getSelectedType());
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( TypeSelectionPage, OnTypeSelected, void*, /*NOTINTERESTEDIN*/ )
     {
         getDialog()->typeSelectionChanged( getSelectedType() );
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index 1acd41f16bf4..9aee1ea9f20f 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -44,7 +44,7 @@ namespace abp
     //=====================================================================
     //= OABSPilotUno
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB)
         :OGenericUnoDialog(_rxORB)
     {
@@ -52,26 +52,26 @@ namespace abp
             &m_sDataSourceName, ::getCppuType( &m_sDataSourceName ) );
     }
 
-    //--------------------------------------------------------------------------
+
     Any SAL_CALL OABSPilotUno::queryInterface( const Type& aType ) throw (RuntimeException)
     {
         Any aReturn = OABSPilotUno_DBase::queryInterface( aType );
         return aReturn.hasValue() ? aReturn : OABSPilotUno_JBase::queryInterface( aType );
     }
 
-    //--------------------------------------------------------------------------
+
     void SAL_CALL OABSPilotUno::acquire(  ) throw ()
     {
         OABSPilotUno_DBase::acquire();
     }
 
-    //--------------------------------------------------------------------------
+
     void SAL_CALL OABSPilotUno::release(  ) throw ()
     {
         OABSPilotUno_DBase::release();
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL OABSPilotUno::getTypes(  ) throw (RuntimeException)
     {
         return ::comphelper::concatSequences(
@@ -80,7 +80,7 @@ namespace abp
         );
     }
 
-    //---------------------------------------------------------------------
+
     Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId(  ) throw(RuntimeException)
     {
         static ::cppu::OImplementationId* s_pId;
@@ -96,31 +96,31 @@ namespace abp
         return s_pId->getImplementationId();
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OABSPilotUno::Create(const Reference< XMultiServiceFactory >& _rxFactory)
     {
         return *(new OABSPilotUno( comphelper::getComponentContext(_rxFactory) ));
     }
 
-    //---------------------------------------------------------------------
+
     OUString SAL_CALL OABSPilotUno::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
 
-    //---------------------------------------------------------------------
+
     OUString OABSPilotUno::getImplementationName_Static() throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.abp.OAddressBookSourcePilot");
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence SAL_CALL OABSPilotUno::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence OABSPilotUno::getSupportedServiceNames_Static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
@@ -128,20 +128,20 @@ namespace abp
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
     Reference<XPropertySetInfo>  SAL_CALL OABSPilotUno::getPropertySetInfo() throw(RuntimeException)
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //---------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& OABSPilotUno::getInfoHelper()
     {
         return *const_cast<OABSPilotUno*>(this)->getArrayHelper();
     }
 
-    //--------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OABSPilotUno::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -161,13 +161,13 @@ namespace abp
         }
     }
 
-    //--------------------------------------------------------------------------
+
     Dialog* OABSPilotUno::createDialog(Window* _pParent)
     {
         return new OAddessBookSourcePilot(_pParent, m_aContext );
     }
 
-    //--------------------------------------------------------------------------
+
     Any SAL_CALL OABSPilotUno::execute( const Sequence< NamedValue >& /*lArgs*/ ) throw (IllegalArgumentException, Exception, RuntimeException)
     {
         // not interested in the context, not interested in the args
@@ -184,7 +184,7 @@ namespace abp
         lProtocol[0].Value <<= sal_True;
         return makeAny( lProtocol );
     }
-    // -----------------------------------------------------------------------------
+
     void OABSPilotUno::executedDialog(sal_Int16 _nExecutionResult)
     {
         if ( _nExecutionResult == RET_OK )
diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx
index 2a7794311fbf..ee80ba44e009 100644
--- a/extensions/source/activex/SOActiveX.cxx
+++ b/extensions/source/activex/SOActiveX.cxx
@@ -1166,6 +1166,6 @@ HRESULT CSOActiveX::GetURL( const OLECHAR* url,
 }
 
 
-// ---------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 64ada453564c..590cc5107641 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -213,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
     nTblOrQuery = rDesc.nCommandType;
     SetModified();
 };
-//---------------------------------------------------------------------------
+
 void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& )
 {
 }
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index ef47bb9a2d9c..d8a81342183c 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -213,7 +213,7 @@ extern "C"
     }
 
 }
-// -----------------------------------------------------------------------
+
 void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeException)
 {
     //!
@@ -244,7 +244,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString
     }
 }
 
-// -----------------------------------------------------------------------
+
 void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUString& /*rURL*/,
         const Sequence< PropertyValue >& /*rArgs*/,
         const Reference< XLoadEventListener > & rListener)
@@ -440,7 +440,7 @@ static OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
         uRet = xCol->getString();
     return uRet;
 }
-//-----------------------------------------------------------------------------
+
 Any BibliographyLoader::getByName(const OUString& rName) throw
                         ( NoSuchElementException, WrappedTargetException, RuntimeException )
 {
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index d642e2620f42..cf66d7c7d92b 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -79,7 +79,7 @@ BibDataManager*  BibModul::createDataManager()
 {
     return new BibDataManager();
 }
-//-----------------------------------------------------------------------------
+
 BibConfig*  BibModul::GetConfig()
 {
     if(! pBibConfig)
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 30023e2e36be..82cf14141c66 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -47,7 +47,7 @@ namespace bib
 {
 //.........................................................................
 
-    // -----------------------------------------------------------------------
+
     BibView::BibView( Window* _pParent, BibDataManager* _pManager, WinBits _nStyle )
         :BibWindow( _pParent, _nStyle )
         ,m_pDatMan( _pManager )
@@ -58,7 +58,7 @@ namespace bib
             connectForm( m_xDatMan );
     }
 
-    // -----------------------------------------------------------------------
+
     BibView::~BibView()
     {
         BibGeneralPage* pGeneralPage = m_pGeneralPage;
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 49f020190c38..1beb2517a642 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -288,7 +288,7 @@ static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
     }
     return USHRT_MAX;
 }
-//-----------------------------------------------------------------------------
+
 MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
     ModalDialog(pParent, BibResId(RID_DLG_MAPPING) ),
     pDatMan(pMan),
@@ -661,7 +661,7 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun:
     xMasterDispatchProvider = xNewMasterDispatchProvider;
 }
 
-//-----------------------------------------------------------------------------
+
 #define STR_UID "uid"
 OUString gGridName("theGrid");
 OUString gViewName("theView");
@@ -704,7 +704,7 @@ BibDataManager::~BibDataManager()
         m_pInterceptorHelper = NULL;
     }
 }
-//------------------------------------------------------------------------
+
 void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
 {
     if ( !_rxGrid.is() )
@@ -906,7 +906,7 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
 
     return xResult;
 }
-//------------------------------------------------------------------------
+
 Sequence< OUString > BibDataManager::getDataSources()
 {
     Sequence< OUString > aTableNameSeq;
@@ -927,12 +927,12 @@ Sequence< OUString > BibDataManager::getDataSources()
 
     return aTableNameSeq;
 }
-//------------------------------------------------------------------------
+
 OUString BibDataManager::getActiveDataTable()
 {
     return aActiveDataTable;
 }
-//------------------------------------------------------------------------
+
 void BibDataManager::setFilter(const OUString& rQuery)
 {
     if(!m_xParser.is())
@@ -953,7 +953,7 @@ void BibDataManager::setFilter(const OUString& rQuery)
 
 
 }
-//------------------------------------------------------------------------
+
 OUString BibDataManager::getFilter()
 {
 
@@ -972,7 +972,7 @@ OUString BibDataManager::getFilter()
     return aQueryString;
 
 }
-//------------------------------------------------------------------------
+
 Sequence< OUString > BibDataManager::getQueryFields()
 {
     Sequence< OUString > aFieldSeq;
@@ -981,7 +981,7 @@ Sequence< OUString > BibDataManager::getQueryFields()
         aFieldSeq = xFields->getElementNames();
     return aFieldSeq;
 }
-//------------------------------------------------------------------------
+
 OUString BibDataManager::getQueryField()
 {
     BibConfig* pConfig = BibModul::GetConfig();
@@ -997,7 +997,7 @@ OUString BibDataManager::getQueryField()
     }
     return aFieldString;
 }
-//------------------------------------------------------------------------
+
 void BibDataManager::startQueryWith(const OUString& rQuery)
 {
     BibConfig* pConfig = BibModul::GetConfig();
@@ -1163,7 +1163,7 @@ void BibDataManager::setActiveDataTable(const OUString& rTable)
     }
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL BibDataManager::load(  ) throw (RuntimeException)
 {
     if ( isLoaded() )
@@ -1182,7 +1182,7 @@ void SAL_CALL BibDataManager::load(  ) throw (RuntimeException)
     }
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL BibDataManager::unload(  ) throw (RuntimeException)
 {
     if ( !isLoaded() )
@@ -1208,7 +1208,7 @@ void SAL_CALL BibDataManager::unload(  ) throw (RuntimeException)
     }
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL BibDataManager::reload(  ) throw (RuntimeException)
 {
     if ( !isLoaded() )
@@ -1233,7 +1233,7 @@ void SAL_CALL BibDataManager::reload(  ) throw (RuntimeException)
     }
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool SAL_CALL BibDataManager::isLoaded(  ) throw (RuntimeException)
 {
     Reference< XLoadable >xFormAsLoadable( m_xForm, UNO_QUERY );
@@ -1245,19 +1245,19 @@ sal_Bool SAL_CALL BibDataManager::isLoaded(  ) throw (RuntimeException)
     return bLoaded;
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL BibDataManager::addLoadListener( const Reference< XLoadListener >& aListener ) throw (RuntimeException)
 {
     m_aLoadListeners.addInterface( aListener );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener >& aListener ) throw (RuntimeException)
 {
     m_aLoadListeners.removeInterface( aListener );
 }
 
-//------------------------------------------------------------------------
+
 Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& rName)
 {
     Reference< awt::XControlModel > xModel;
@@ -1295,7 +1295,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString&
 
     return xModel;
 }
-//------------------------------------------------------------------------
+
 OUString BibDataManager::getControlName(sal_Int32 nFormatKey )
 {
     OUString aResStr;
@@ -1334,7 +1334,7 @@ OUString BibDataManager::getControlName(sal_Int32 nFormatKey )
     }
     return aResStr;
 }
-//------------------------------------------------------------------------
+
 Reference< awt::XControlModel > BibDataManager::loadControlModel(
                     const OUString& rName, sal_Bool bForceListBox)
 {
@@ -1413,19 +1413,19 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
     }
     return xModel;
 }
-//------------------------------------------------------------------------
+
 void SAL_CALL BibDataManager::disposing()
 {
     BibDataManager_Base::WeakComponentImplHelperBase::disposing();
 }
 
-//------------------------------------------------------------------------
+
 void BibDataManager::disposing( const EventObject& /*Source*/ ) throw( ::com::sun::star::uno::RuntimeException )
 {
     // not interested in
 }
 
-//------------------------------------------------------------------------
+
 void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw( RuntimeException )
 {
     try
@@ -1452,7 +1452,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw
     }
 }
 
-//------------------------------------------------------------------------
+
 void BibDataManager::SetMeAsUidListener()
 {
     try
@@ -1495,7 +1495,7 @@ void BibDataManager::SetMeAsUidListener()
     }
 }
 
-//------------------------------------------------------------------------
+
 void BibDataManager::RemoveMeAsUidListener()
 {
     try
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 13a792303c43..e388f9124aa0 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -36,7 +36,7 @@ namespace bib
     //=====================================================================
     //= FormControlContainer
     //=====================================================================
-    //---------------------------------------------------------------------
+
     FormControlContainer::FormControlContainer( )
         :OLoadListener( m_aMutex )
         ,m_pFormAdapter( NULL )
diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx
index 825b8b4a2d5c..c830c4396f48 100644
--- a/extensions/source/bibliography/loadlisteneradapter.cxx
+++ b/extensions/source/bibliography/loadlisteneradapter.cxx
@@ -33,7 +33,7 @@ namespace bib
     //=====================================================================
     //= OComponentListener
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OComponentListener::~OComponentListener()
     {
         {
@@ -43,13 +43,13 @@ namespace bib
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OComponentListener::_disposing( const EventObject& /*_rSource*/ ) throw( RuntimeException)
     {
         // nothing to do here, overrride if you're interested in
     }
 
-    //---------------------------------------------------------------------
+
     void OComponentListener::setAdapter( OComponentAdapterBase* pAdapter )
     {
         {
@@ -72,7 +72,7 @@ namespace bib
     //=====================================================================
     //= OComponentAdapterBase
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OComponentAdapterBase::OComponentAdapterBase( const Reference< XComponent >& _rxComp, sal_Bool _bAutoRelease )
         :m_xComponent( _rxComp )
         ,m_pListener( NULL )
@@ -83,7 +83,7 @@ namespace bib
         OSL_ENSURE( m_xComponent.is(), "OComponentAdapterBase::OComponentAdapterBase: invalid component!" );
     }
 
-    //---------------------------------------------------------------------
+
     void OComponentAdapterBase::Init( OComponentListener* _pListener )
     {
         OSL_ENSURE( !m_pListener, "OComponentAdapterBase::Init: already initialized!" );
@@ -97,12 +97,12 @@ namespace bib
         m_bListening = sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     OComponentAdapterBase::~OComponentAdapterBase()
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OComponentAdapterBase::dispose()
     {
         if ( m_bListening )
@@ -123,7 +123,7 @@ namespace bib
 
     // XEventListener
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OComponentAdapterBase::disposing( const EventObject& _rSource ) throw( RuntimeException )
     {
         if ( m_pListener )
@@ -147,13 +147,13 @@ namespace bib
     //=====================================================================
     //= OLoadListenerAdapter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OLoadListenerAdapter::OLoadListenerAdapter( const Reference< XLoadable >& _rxLoadable, sal_Bool _bAutoRelease )
         :OComponentAdapterBase( Reference< XComponent >( _rxLoadable, UNO_QUERY ), _bAutoRelease )
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OLoadListenerAdapter::startComponentListening()
     {
         Reference< XLoadable > xLoadable( getComponent(), UNO_QUERY );
@@ -162,25 +162,25 @@ namespace bib
             xLoadable->addLoadListener( this );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::acquire(  ) throw ()
     {
         OLoadListenerAdapter_Base::acquire();
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::release(  ) throw ()
     {
         OLoadListenerAdapter_Base::release();
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::disposing( const  EventObject& _rSource ) throw( RuntimeException)
     {
         OComponentAdapterBase::disposing( _rSource );
     }
 
-    //---------------------------------------------------------------------
+
     void OLoadListenerAdapter::disposing()
     {
         Reference< XLoadable > xLoadable( getComponent(), UNO_QUERY );
@@ -188,35 +188,35 @@ namespace bib
             xLoadable->removeLoadListener( this );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::loaded( const EventObject& _rEvent ) throw (RuntimeException)
     {
         if ( !locked() && getLoadListener( ) )
             getLoadListener( )->_loaded( _rEvent );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::unloading( const EventObject& _rEvent ) throw (RuntimeException)
     {
         if ( !locked() && getLoadListener( ) )
             getLoadListener( )->_unloading( _rEvent );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::unloaded( const EventObject& _rEvent ) throw (RuntimeException)
     {
         if ( !locked() && getLoadListener( ) )
             getLoadListener( )->_unloaded( _rEvent );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::reloading( const EventObject& _rEvent ) throw (RuntimeException)
     {
         if ( !locked() && getLoadListener( ) )
             getLoadListener( )->_reloading( _rEvent );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OLoadListenerAdapter::reloaded( const EventObject& _rEvent ) throw (RuntimeException)
     {
         if ( !locked() && getLoadListener( ) )
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 0d524c60fb16..c6f2df26bf4f 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -476,7 +476,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/)
 
     return 0;
 }
-//-----------------------------------------------------------------------------
+
 IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/)
 {
     sal_uInt16  nId=GetCurItemId();
@@ -513,7 +513,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/)
     }
     return 0;
 }
-//-----------------------------------------------------------------------------
+
 void    BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent)
                                             throw( uno::RuntimeException )
 {
@@ -554,7 +554,7 @@ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ )
     return 0L;
 }
 
-//-----------------------------------------------------------------------------
+
 
 IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ )
 {
@@ -569,7 +569,7 @@ IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ )
     return 0L;
 }
 
-//-----------------------------------------------------------------------------
+
 void BibToolBar::RebuildToolbar()
 {
     ApplyImageList();
@@ -577,7 +577,7 @@ void BibToolBar::RebuildToolbar()
     Application::PostUserEvent( aLayoutManager, 0 );
 }
 
-//-----------------------------------------------------------------------------
+
 
 void BibToolBar::ApplyImageList()
 {
diff --git a/extensions/source/config/ldap/componentdef.cxx b/extensions/source/config/ldap/componentdef.cxx
index 32dcbd05ead3..d8a27496090c 100644
--- a/extensions/source/config/ldap/componentdef.cxx
+++ b/extensions/source/config/ldap/componentdef.cxx
@@ -29,7 +29,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createLdapUserProfileBe(
                    const uno::Reference<uno::XComponentContext>& aContext) {
     return * new LdapUserProfileBe(aContext) ;
 }
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -43,7 +43,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     },
     { NULL, NULL, NULL, NULL, NULL, 0 }
 } ;
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(const sal_Char *aImplementationName,
                                       void *aServiceManager,
@@ -53,6 +53,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ldapbe2_component_getFactory(con
                                             aRegistryKey,
                                             kImplementations_entries) ;
 }
-//------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx
index 4b634acb41d1..984bdc88e956 100644
--- a/extensions/source/config/ldap/ldapaccess.cxx
+++ b/extensions/source/config/ldap/ldapaccess.cxx
@@ -26,9 +26,9 @@
 
 namespace extensions { namespace config { namespace ldap {
 
-//------------------------------------------------------------------------------
+
 typedef int LdapErrCode;
-//------------------------------------------------------------------------------
+
 struct LdapMessageHolder
 {
     LdapMessageHolder() : msg(0) {}
@@ -44,12 +44,12 @@ private:
     LdapMessageHolder(LdapMessageHolder const&);
     void operator=(LdapMessageHolder const&);
 };
-//------------------------------------------------------------------------------
+
 LdapConnection::~LdapConnection()
 {
     if (isValid()) disconnect();
 }
-//------------------------------------------------------------------------------
+
 
 void LdapConnection::disconnect()
 {
@@ -59,7 +59,7 @@ void LdapConnection::disconnect()
         mConnection = NULL;
     }
 }
-//------------------------------------------------------------------------------
+
 
 static void checkLdapReturnCode(const sal_Char *aOperation,
                                 LdapErrCode aRetCode,
@@ -95,7 +95,7 @@ static void checkLdapReturnCode(const sal_Char *aOperation,
     throw ldap::LdapGenericException(message.makeStringAndClear(),
                                      NULL, aRetCode) ;
 }
-//------------------------------------------------------------------------------
+
 void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
    throw (ldap::LdapConnectionException, ldap::LdapGenericException)
 {
@@ -105,7 +105,7 @@ void  LdapConnection::connectSimple(const LdapDefinition& aDefinition)
     mLdapDefinition = aDefinition;
     connectSimple();
 }
-//------------------------------------------------------------------------------
+
 void  LdapConnection::connectSimple()
    throw (ldap::LdapConnectionException, ldap::LdapGenericException)
 {
@@ -147,7 +147,7 @@ void  LdapConnection::connectSimple()
         checkLdapReturnCode("SimpleBind", retCode, mConnection) ;
     }
 }
-//------------------------------------------------------------------------------
+
 void LdapConnection::initConnection()
     throw (ldap::LdapConnectionException)
 {
@@ -180,7 +180,7 @@ void LdapConnection::initConnection()
                                             NULL) ;
     }
 }
-//------------------------------------------------------------------------------
+
  void LdapConnection::getUserProfile(
      const OUString& aUser, LdapData * data)
     throw (lang::IllegalArgumentException,
@@ -239,7 +239,7 @@ void LdapConnection::initConnection()
 #endif
     }
 }
-//------------------------------------------------------------------------------
+
  OUString LdapConnection::findUserDn(const OUString& aUser)
     throw (lang::IllegalArgumentException,
             ldap::LdapConnectionException, ldap::LdapGenericException)
@@ -300,7 +300,7 @@ void LdapConnection::initConnection()
     return userDn ;
 }
 
-//------------------------------------------------------------------------------
+
 
 } } } // extensions.config.ldap
 
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx
index e6d4eb8616a7..817110246157 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.cxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx
@@ -80,11 +80,11 @@ LdapUserProfileBe::LdapUserProfileBe( const uno::Reference<uno::XComponentContex
     connection.connectSimple(aDefinition);
     connection.getUserProfile(loggedOnUser, &data_);
 }
-//------------------------------------------------------------------------------
+
 LdapUserProfileBe::~LdapUserProfileBe()
 {
 }
-//------------------------------------------------------------------------------
+
 
 bool LdapUserProfileBe::readLdapConfiguration(
     css::uno::Reference< css::uno::XComponentContext > const & context,
@@ -159,7 +159,7 @@ bool LdapUserProfileBe::readLdapConfiguration(
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool LdapUserProfileBe::getLdapStringParam(
     uno::Reference<container::XNameAccess>& xAccess,
     const OUString& aLdapSetting,
@@ -169,7 +169,7 @@ bool LdapUserProfileBe::getLdapStringParam(
 
     return !aServerParameter.isEmpty();
 }
-//------------------------------------------------------------------------------
+
 void LdapUserProfileBe::setPropertyValue(
     OUString const &, css::uno::Any const &)
     throw (
@@ -211,18 +211,18 @@ css::uno::Any LdapUserProfileBe::getPropertyValue(
     return css::uno::makeAny(css::beans::Optional< css::uno::Any >());
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL LdapUserProfileBe::getLdapUserProfileBeName(void) {
     return OUString("com.sun.star.comp.configuration.backend.LdapUserProfileBe");
 }
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL LdapUserProfileBe::getImplementationName(void)
     throw (uno::RuntimeException)
 {
     return getLdapUserProfileBeName() ;
 }
-//------------------------------------------------------------------------------
+
 
 uno::Sequence<OUString> SAL_CALL LdapUserProfileBe::getLdapUserProfileBeServiceNames(void)
 {
@@ -243,8 +243,8 @@ SAL_CALL LdapUserProfileBe::getSupportedServiceNames(void)
 {
     return getLdapUserProfileBeServiceNames() ;
 }
-// ---------------------------------------------------------------------------------------
+
 }}}
-// ---------------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 4f22bb08a27f..c620a1a95c16 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -57,7 +57,7 @@ namespace dbp
     //=====================================================================
     //= OTableSelectionPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OTableSelectionPage::OTableSelectionPage(OControlWizard* _pParent)
         :OControlWizardPage(_pParent, ModuleRes(RID_PAGE_TABLESELECTION))
         ,m_aData            (this, ModuleRes(FL_DATA))
@@ -80,14 +80,14 @@ namespace dbp
         m_aDatasource.SetDropDownLineCount(10);
     }
 
-    //---------------------------------------------------------------------
+
     void OTableSelectionPage::ActivatePage()
     {
         OControlWizardPage::ActivatePage();
         m_aDatasource.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     bool OTableSelectionPage::canAdvance() const
     {
         if (!OControlWizardPage::canAdvance())
@@ -102,7 +102,7 @@ namespace dbp
         return true;
     }
 
-    //---------------------------------------------------------------------
+
     void OTableSelectionPage::initializePage()
     {
         OControlWizardPage::initializePage();
@@ -152,7 +152,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OTableSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OControlWizardPage::commitPage(_eReason))
@@ -189,7 +189,7 @@ namespace dbp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OTableSelectionPage, OnSearchClicked, PushButton*, /*_pButton*/ )
     {
         ::sfx2::FileDialogHelper aFileDlg(
@@ -214,7 +214,7 @@ namespace dbp
         }
         return 0L;
     }
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox*, _pBox )
     {
         if (_pBox->GetSelectEntryCount())
@@ -222,7 +222,7 @@ namespace dbp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OTableSelectionPage, OnListboxSelection, ListBox*, _pBox )
     {
         if (&m_aDatasource == _pBox)
@@ -238,7 +238,7 @@ namespace dbp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     namespace
     {
         void    lcl_fillEntries( ListBox& _rListBox, const Sequence< OUString >& _rNames, const Image& _rImage, sal_Int32 _nCommandType )
@@ -254,7 +254,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OTableSelectionPage::implFillTables(const Reference< XConnection >& _rxConn)
     {
         m_aTable.Clear();
@@ -369,7 +369,7 @@ namespace dbp
         lcl_fillEntries( m_aTable, aQueryNames, aQueryImage, CommandType::QUERY );
     }
 
-    //---------------------------------------------------------------------
+
     void OTableSelectionPage::implCollectDatasource()
     {
         try
@@ -387,7 +387,7 @@ namespace dbp
     //=====================================================================
     //= OMaybeListSelectionPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId )
         :OControlWizardPage(_pParent, _rId)
         ,m_pYes(NULL)
@@ -396,7 +396,7 @@ namespace dbp
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OMaybeListSelectionPage::announceControls(RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection)
     {
         m_pYes = &_rYesButton;
@@ -408,14 +408,14 @@ namespace dbp
         implEnableWindows();
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, /*NOTINTERESTEDIN*/ )
     {
         implEnableWindows();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     void OMaybeListSelectionPage::implInitialize(const OUString& _rSelection)
     {
         DBG_ASSERT(m_pYes, "OMaybeListSelectionPage::implInitialize: no controls announced!");
@@ -427,19 +427,19 @@ namespace dbp
         m_pList->SelectEntry(bIsSelection ? _rSelection : OUString());
     }
 
-    //---------------------------------------------------------------------
+
     void OMaybeListSelectionPage::implCommit(OUString& _rSelection)
     {
         _rSelection = m_pYes->IsChecked() ? m_pList->GetSelectEntry() : OUString();
     }
 
-    //---------------------------------------------------------------------
+
     void OMaybeListSelectionPage::implEnableWindows()
     {
         m_pList->Enable(m_pYes->IsChecked());
     }
 
-    //---------------------------------------------------------------------
+
     void OMaybeListSelectionPage::ActivatePage()
     {
         OControlWizardPage::ActivatePage();
@@ -454,7 +454,7 @@ namespace dbp
     //=====================================================================
     //= ODBFieldPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ODBFieldPage::ODBFieldPage( OControlWizard* _pParent )
         :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_OPTION_DBFIELD))
         ,m_aFrame           (this, ModuleRes(FL_DATABASEFIELD_EXPL))
@@ -469,7 +469,7 @@ namespace dbp
         m_aStoreWhere.SetDropDownLineCount(10);
     }
 
-    //---------------------------------------------------------------------
+
     void ODBFieldPage::initializePage()
     {
         OMaybeListSelectionPage::initializePage();
@@ -480,7 +480,7 @@ namespace dbp
         implInitialize(getDBFieldSetting());
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ODBFieldPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OMaybeListSelectionPage::commitPage(_eReason))
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 1b7b1d6c0248..68eb40f83366 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -81,7 +81,7 @@ namespace dbp
     //=====================================================================
     //= OControlWizardPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OControlWizardPage::OControlWizardPage( OControlWizard* _pParent, const ResId& _rResId )
         :OControlWizardPage_Base( _pParent, _rResId )
         ,m_pFormSettingsSeparator(NULL)
@@ -94,7 +94,7 @@ namespace dbp
     {
     }
 
-    //---------------------------------------------------------------------
+
     OControlWizardPage::~OControlWizardPage()
     {
         delete m_pFormSettingsSeparator;
@@ -106,43 +106,43 @@ namespace dbp
         delete m_pFormTable;
     }
 
-    //---------------------------------------------------------------------
+
     OControlWizard* OControlWizardPage::getDialog()
     {
         return static_cast< OControlWizard* >(GetParent());
     }
 
-    //---------------------------------------------------------------------
+
     const OControlWizard* OControlWizardPage::getDialog() const
     {
         return static_cast< OControlWizard* >(GetParent());
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OControlWizardPage::updateContext()
     {
         return getDialog()->updateContext(OAccessRegulator());
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XConnection > OControlWizardPage::getFormConnection() const
     {
         return getDialog()->getFormConnection(OAccessRegulator());
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizardPage::setFormConnection( const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose )
     {
         getDialog()->setFormConnection( OAccessRegulator(), _rxConn, _bAutoDispose );
     }
 
-    //---------------------------------------------------------------------
+
     const OControlWizardContext& OControlWizardPage::getContext()
     {
         return getDialog()->getContext();
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizardPage::fillListBox(ListBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear)
     {
         if (_bClear)
@@ -158,7 +158,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizardPage::fillListBox(ComboBox& _rList, const Sequence< OUString >& _rItems, sal_Bool _bClear)
     {
         if (_bClear)
@@ -174,7 +174,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizardPage::enableFormDatasourceDisplay()
     {
         if (m_pFormSettingsSeparator)
@@ -204,7 +204,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizardPage::adjustControlForNoDSDisplay(Control* _pControl, sal_Bool _bConstLowerDistance)
     {
         ::Size aDistanceToMove = LogicToPixel( ::Size( 0, 37 ), MAP_APPFONT );
@@ -221,7 +221,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizardPage::initializePage()
     {
         if (m_pFormDatasource && m_pFormContentTypeLabel && m_pFormTable)
@@ -271,7 +271,7 @@ namespace dbp
     //=====================================================================
     //= OControlWizard
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OControlWizard::OControlWizard( Window* _pParent, const ResId& _rId,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
         :OWizardMachine(_pParent, _rId, WZB_CANCEL | WZB_PREVIOUS | WZB_NEXT | WZB_FINISH)
@@ -286,12 +286,12 @@ namespace dbp
         enableButtons(WZB_FINISH, sal_False);
     }
 
-    //---------------------------------------------------------------------
+
     OControlWizard::~OControlWizard()
     {
     }
 
-    //---------------------------------------------------------------------
+
     short OControlWizard::Execute()
     {
         // get the class id of the control we're dealing with
@@ -315,13 +315,13 @@ namespace dbp
         return OControlWizard_Base::Execute();
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::ActivatePage()
     {
         OControlWizard_Base::ActivatePage();
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::implDetermineShape()
     {
         Reference< XIndexAccess > xPageObjects(m_aContext.xDrawPage, UNO_QUERY);
@@ -352,7 +352,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::implDetermineForm()
     {
         Reference< XChild > xModelAsChild(m_aContext.xObjectModel, UNO_QUERY);
@@ -367,7 +367,7 @@ namespace dbp
 
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::implDeterminePage()
     {
         try
@@ -430,7 +430,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::implGetDSContext()
     {
         try
@@ -445,12 +445,12 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XConnection > OControlWizard::getFormConnection(const OAccessRegulator&) const
     {
         return getFormConnection();
     }
-    //---------------------------------------------------------------------
+
     Reference< XConnection > OControlWizard::getFormConnection() const
     {
         Reference< XConnection > xConn;
@@ -466,7 +466,7 @@ namespace dbp
         return xConn;
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::setFormConnection( const OAccessRegulator& _rAccess, const Reference< XConnection >& _rxConn, sal_Bool _bAutoDispose )
     {
         try
@@ -496,12 +496,12 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OControlWizard::updateContext(const OAccessRegulator&)
     {
         return initContext();
     }
-    //---------------------------------------------------------------------
+
     Reference< XInteractionHandler > OControlWizard::getInteractionHandler(Window* _pWindow) const
     {
         Reference< XInteractionHandler > xHandler;
@@ -517,7 +517,7 @@ namespace dbp
         }
         return xHandler;
     }
-    //---------------------------------------------------------------------
+
     sal_Bool OControlWizard::initContext()
     {
         DBG_ASSERT(m_aContext.xObjectModel.is(), "OGroupBoxWizard::initContext: have no control model to work with!");
@@ -673,7 +673,7 @@ namespace dbp
         return 0 != m_aContext.aFieldNames.getLength();
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::commitControlSettings(OControlWizardSettings* _pSettings)
     {
         DBG_ASSERT(m_aContext.xObjectModel.is(), "OControlWizard::commitControlSettings: have no control model to work with!");
@@ -700,7 +700,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OControlWizard::initControlSettings(OControlWizardSettings* _pSettings)
     {
         DBG_ASSERT(m_aContext.xObjectModel.is(), "OControlWizard::initControlSettings: have no control model to work with!");
@@ -725,7 +725,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OControlWizard::needDatasourceSelection()
     {
         // lemme see ...
diff --git a/extensions/source/dbpilots/dbpservices.cxx b/extensions/source/dbpilots/dbpservices.cxx
index 7446afc84901..ea8841218874 100644
--- a/extensions/source/dbpilots/dbpservices.cxx
+++ b/extensions/source/dbpilots/dbpservices.cxx
@@ -19,20 +19,20 @@
 
 #include "componentmodule.hxx"
 
-//---------------------------------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-//---------------------------------------------------------------------------------------
+
 
 extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard();
 extern "C" void SAL_CALL createRegistryInfo_OListComboWizard();
 extern "C" void SAL_CALL createRegistryInfo_OGridWizard();
 
-//---------------------------------------------------------------------------------------
+
 
 extern "C" void SAL_CALL dbp_initializeModule()
 {
@@ -47,7 +47,7 @@ extern "C" void SAL_CALL dbp_initializeModule()
     }
 }
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index c6dafd944dd1..b19f6fc8916a 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -28,7 +28,7 @@ namespace dbp
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::container;
 
-    //---------------------------------------------------------------------
+
     void disambiguateName(const Reference< XNameAccess >& _rxContainer, OUString& _rElementsName)
     {
         DBG_ASSERT(_rxContainer.is(), "::dbp::disambiguateName: invalid container!");
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index a0be0271591b..dbddd51b2e28 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -51,7 +51,7 @@ namespace dbp
     //=====================================================================
     //= OGridWizard
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OGridWizard::OGridWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
         :OControlWizard(_pParent, ModuleRes(RID_DLG_GRIDWIZARD), _rxObjectModel, _rxContext)
@@ -72,7 +72,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OGridWizard::approveControl(sal_Int16 _nClassId)
     {
         if (FormComponentType::GRIDCONTROL != _nClassId)
@@ -85,7 +85,7 @@ namespace dbp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void OGridWizard::implApplySettings()
     {
         const OControlWizardContext& rContext = getContext();
@@ -225,7 +225,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     OWizardPage* OGridWizard::createPage(WizardState _nState)
     {
         switch (_nState)
@@ -239,7 +239,7 @@ namespace dbp
         return NULL;
     }
 
-    //---------------------------------------------------------------------
+
     WizardTypes::WizardState OGridWizard::determineNextState( WizardState _nCurrentState ) const
     {
         switch (_nCurrentState)
@@ -253,7 +253,7 @@ namespace dbp
         return WZS_INVALID_STATE;
     }
 
-    //---------------------------------------------------------------------
+
     void OGridWizard::enterState(WizardState _nState)
     {
         OControlWizard::enterState(_nState);
@@ -267,7 +267,7 @@ namespace dbp
             defaultButton(WZB_FINISH);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OGridWizard::leaveState(WizardState _nState)
     {
         if (!OControlWizard::leaveState(_nState))
@@ -279,7 +279,7 @@ namespace dbp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OGridWizard::onFinish()
     {
         if ( !OControlWizard::onFinish() )
@@ -293,7 +293,7 @@ namespace dbp
     //=====================================================================
     //= OGridFieldsSelection
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OGridFieldsSelection::OGridFieldsSelection( OGridWizard* _pParent )
         :OGridPage(_pParent, ModuleRes(RID_PAGE_GW_FIELDSELECTION))
         ,m_aFrame               (this, ModuleRes(FL_FRAME))
@@ -321,21 +321,21 @@ namespace dbp
         m_aSelFields.SetDoubleClickHdl(LINK(this, OGridFieldsSelection, OnEntryDoubleClicked));
     }
 
-    //---------------------------------------------------------------------
+
     void OGridFieldsSelection::ActivatePage()
     {
         OGridPage::ActivatePage();
         m_aExistFields.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     bool OGridFieldsSelection::canAdvance() const
     {
         return false;
             // we're the last page in our wizard
     }
 
-    //---------------------------------------------------------------------
+
     void OGridFieldsSelection::initializePage()
     {
         OGridPage::initializePage();
@@ -356,7 +356,7 @@ namespace dbp
         implCheckButtons();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OGridFieldsSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGridPage::commitPage(_eReason))
@@ -374,7 +374,7 @@ namespace dbp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void OGridFieldsSelection::implCheckButtons()
     {
         m_aSelectOne.Enable(m_aExistFields.GetSelectEntryCount() != 0);
@@ -386,7 +386,7 @@ namespace dbp
         getDialog()->enableButtons(WZB_FINISH, 0 != m_aSelFields.GetEntryCount());
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, ListBox*, _pList)
     {
         PushButton* pSimulateButton = &m_aExistFields == _pList ? &m_aSelectOne : &m_aDeselectOne;
@@ -396,14 +396,14 @@ namespace dbp
             return 1L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK(OGridFieldsSelection, OnEntrySelected, ListBox*, /*NOTINTERESTEDIN*/)
     {
         implCheckButtons();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK(OGridFieldsSelection, OnMoveOneEntry, PushButton*, _pButton)
     {
         sal_Bool bMoveRight = (&m_aSelectOne == _pButton);
@@ -458,7 +458,7 @@ namespace dbp
         return 0;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK(OGridFieldsSelection, OnMoveAllEntries, PushButton*, _pButton)
     {
         sal_Bool bMoveRight = (&m_aSelectAll == _pButton);
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 9f108883050e..7c142f81525b 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -46,7 +46,7 @@ namespace dbp
     //=====================================================================
     //= OGroupBoxWizard
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OGroupBoxWizard::OGroupBoxWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
         :OControlWizard(_pParent, ModuleRes(RID_DLG_GROUPBOXWIZARD), _rxObjectModel, _rxContext)
@@ -61,13 +61,13 @@ namespace dbp
         m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OGroupBoxWizard::approveControl(sal_Int16 _nClassId)
     {
         return FormComponentType::GROUPBOX == _nClassId;
     }
 
-    //---------------------------------------------------------------------
+
     OWizardPage* OGroupBoxWizard::createPage(::svt::WizardTypes::WizardState _nState)
     {
         switch (_nState)
@@ -91,7 +91,7 @@ namespace dbp
         return NULL;
     }
 
-    //---------------------------------------------------------------------
+
     WizardTypes::WizardState OGroupBoxWizard::determineNextState( ::svt::WizardTypes::WizardState _nCurrentState ) const
     {
         switch (_nCurrentState)
@@ -115,7 +115,7 @@ namespace dbp
         return WZS_INVALID_STATE;
     }
 
-    //---------------------------------------------------------------------
+
     void OGroupBoxWizard::enterState(::svt::WizardTypes::WizardState _nState)
     {
         // some stuff to do before calling the base class (modifying our settings)
@@ -155,7 +155,7 @@ namespace dbp
         OControlWizard::enterState(_nState);
     }
 
-    //---------------------------------------------------------------------
+
     void OGroupBoxWizard::createRadios()
     {
         try
@@ -169,7 +169,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OGroupBoxWizard::onFinish()
     {
         // commit the basic control setttings
@@ -184,7 +184,7 @@ namespace dbp
     //=====================================================================
     //= ORadioSelectionPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ORadioSelectionPage::ORadioSelectionPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, ModuleRes(RID_PAGE_GROUPRADIOSELECTION))
         ,m_aFrame               (this, ModuleRes(FL_DATA))
@@ -226,14 +226,14 @@ namespace dbp
         m_aExistingRadios.SetAccessibleRelationLabeledBy(&m_aExistingRadiosLabel);
     }
 
-    //---------------------------------------------------------------------
+
     void ORadioSelectionPage::ActivatePage()
     {
         OGBWPage::ActivatePage();
         m_aRadioName.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void ORadioSelectionPage::initializePage()
     {
         OGBWPage::initializePage();
@@ -247,7 +247,7 @@ namespace dbp
         implCheckMoveButtons();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ORadioSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGBWPage::commitPage(_eReason))
@@ -269,7 +269,7 @@ namespace dbp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( ORadioSelectionPage, OnMoveEntry, PushButton*, _pButton )
     {
         sal_Bool bMoveLeft = (&m_aMoveLeft == _pButton);
@@ -294,27 +294,27 @@ namespace dbp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( ORadioSelectionPage, OnEntrySelected, ListBox*, /*_pList*/ )
     {
         implCheckMoveButtons();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( ORadioSelectionPage, OnNameModified, Edit*, /*_pList*/ )
     {
         implCheckMoveButtons();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     bool ORadioSelectionPage::canAdvance() const
     {
         return 0 != m_aExistingRadios.GetEntryCount();
     }
 
-    //---------------------------------------------------------------------
+
     void ORadioSelectionPage::implCheckMoveButtons()
     {
         sal_Bool bHaveSome = (0 != m_aExistingRadios.GetEntryCount());
@@ -341,7 +341,7 @@ namespace dbp
     //=====================================================================
     //= ODefaultFieldSelectionPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ODefaultFieldSelectionPage::ODefaultFieldSelectionPage( OControlWizard* _pParent )
         :OMaybeListSelectionPage(_pParent, ModuleRes(RID_PAGE_DEFAULTFIELDSELECTION))
         ,m_aFrame                   (this, ModuleRes(FL_DEFAULTSELECTION))
@@ -358,7 +358,7 @@ namespace dbp
         m_aDefSelection.SetAccessibleRelationMemberOf(&m_aDefaultSelectionLabel);
     }
 
-    //---------------------------------------------------------------------
+
     void ODefaultFieldSelectionPage::initializePage()
     {
         OMaybeListSelectionPage::initializePage();
@@ -377,7 +377,7 @@ namespace dbp
         implInitialize(rSettings.sDefaultField);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ODefaultFieldSelectionPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OMaybeListSelectionPage::commitPage(_eReason))
@@ -392,7 +392,7 @@ namespace dbp
     //=====================================================================
     //= OOptionValuesPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OOptionValuesPage::OOptionValuesPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONVALUES))
         ,m_aFrame               (this, ModuleRes(FL_OPTIONVALUES))
@@ -411,21 +411,21 @@ namespace dbp
         m_aOptions.SetAccessibleRelationLabeledBy(&m_aOptionsLabel);
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OOptionValuesPage, OnOptionSelected, ListBox*, /*NOTINTERESTEDIN*/ )
     {
         implTraveledOptions();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     void OOptionValuesPage::ActivatePage()
     {
         OGBWPage::ActivatePage();
         m_aValue.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void OOptionValuesPage::implTraveledOptions()
     {
         if ((::svt::WizardTypes::WizardState)-1 != m_nLastSelection)
@@ -440,7 +440,7 @@ namespace dbp
         m_aValue.SetText(m_aUncommittedValues[m_nLastSelection]);
     }
 
-    //---------------------------------------------------------------------
+
     void OOptionValuesPage::initializePage()
     {
         OGBWPage::initializePage();
@@ -467,7 +467,7 @@ namespace dbp
         implTraveledOptions();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OOptionValuesPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGBWPage::commitPage(_eReason))
@@ -486,14 +486,14 @@ namespace dbp
     //=====================================================================
     //= OOptionDBFieldPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent )
         :ODBFieldPage(_pParent)
     {
         setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD).toString());
     }
 
-    //---------------------------------------------------------------------
+
     OUString& OOptionDBFieldPage::getDBFieldSetting()
     {
         return getSettings().sDBField;
@@ -502,7 +502,7 @@ namespace dbp
     //=====================================================================
     //= OFinalizeGBWPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OFinalizeGBWPage::OFinalizeGBWPage( OControlWizard* _pParent )
         :OGBWPage(_pParent, ModuleRes(RID_PAGE_OPTIONS_FINAL))
         ,m_aFrame           (this, ModuleRes(FL_NAMEIT))
@@ -513,20 +513,20 @@ namespace dbp
         FreeResource();
     }
 
-    //---------------------------------------------------------------------
+
     void OFinalizeGBWPage::ActivatePage()
     {
         OGBWPage::ActivatePage();
         m_aName.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     bool OFinalizeGBWPage::canAdvance() const
     {
         return false;
     }
 
-    //---------------------------------------------------------------------
+
     void OFinalizeGBWPage::initializePage()
     {
         OGBWPage::initializePage();
@@ -535,7 +535,7 @@ namespace dbp
         m_aName.SetText(rSettings.sControlLabel);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OFinalizeGBWPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OGBWPage::commitPage(_eReason))
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 9f42d6b7b855..d132c7651cfb 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -48,7 +48,7 @@ namespace dbp
     //=====================================================================
     //= OListComboWizard
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OListComboWizard::OListComboWizard( Window* _pParent,
             const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
         :OControlWizard(_pParent, ModuleRes(RID_DLG_LISTCOMBOWIZARD), _rxObjectModel, _rxContext)
@@ -70,7 +70,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OListComboWizard::approveControl(sal_Int16 _nClassId)
     {
         switch (_nClassId)
@@ -87,7 +87,7 @@ namespace dbp
         return sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     OWizardPage* OListComboWizard::createPage(WizardState _nState)
     {
         switch (_nState)
@@ -107,7 +107,7 @@ namespace dbp
         return NULL;
     }
 
-    //---------------------------------------------------------------------
+
     WizardTypes::WizardState OListComboWizard::determineNextState( WizardState _nCurrentState ) const
     {
         switch (_nCurrentState)
@@ -123,7 +123,7 @@ namespace dbp
         return WZS_INVALID_STATE;
     }
 
-    //---------------------------------------------------------------------
+
     void OListComboWizard::enterState(WizardState _nState)
     {
         OControlWizard::enterState(_nState);
@@ -137,7 +137,7 @@ namespace dbp
             defaultButton(WZB_FINISH);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OListComboWizard::leaveState(WizardState _nState)
     {
         if (!OControlWizard::leaveState(_nState))
@@ -149,7 +149,7 @@ namespace dbp
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void OListComboWizard::implApplySettings()
     {
         try
@@ -209,7 +209,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OListComboWizard::onFinish()
     {
         if ( !OControlWizard::onFinish() )
@@ -222,7 +222,7 @@ namespace dbp
     //=====================================================================
     //= OLCPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     Reference< XNameAccess > OLCPage::getTables(sal_Bool _bNeedIt)
     {
         Reference< XConnection > xConn = getFormConnection();
@@ -239,7 +239,7 @@ namespace dbp
         return xTables;
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< OUString > OLCPage::getTableFields(sal_Bool _bNeedIt)
     {
         Reference< XNameAccess > xTables = getTables(_bNeedIt);
@@ -273,7 +273,7 @@ namespace dbp
     //=====================================================================
     //= OContentTableSelection
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OContentTableSelection::OContentTableSelection( OListComboWizard* _pParent )
         :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_TABLE))
         ,m_aFrame               (this, ModuleRes(FL_FRAME))
@@ -288,14 +288,14 @@ namespace dbp
         m_aSelectTable.SetSelectHdl(LINK(this, OContentTableSelection, OnTableSelected));
     }
 
-    //---------------------------------------------------------------------
+
     void OContentTableSelection::ActivatePage()
     {
         OLCPage::ActivatePage();
         m_aSelectTable.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     bool OContentTableSelection::canAdvance() const
     {
         if (!OLCPage::canAdvance())
@@ -304,14 +304,14 @@ namespace dbp
         return 0 != m_aSelectTable.GetSelectEntryCount();
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OContentTableSelection, OnTableSelected, ListBox*, /*_pListBox*/ )
     {
         updateDialogTravelUI();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox*, _pListBox )
     {
         if (_pListBox->GetSelectEntryCount())
@@ -319,7 +319,7 @@ namespace dbp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     void OContentTableSelection::initializePage()
     {
         OLCPage::initializePage();
@@ -342,7 +342,7 @@ namespace dbp
         m_aSelectTable.SelectEntry(getSettings().sListContentTable);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OContentTableSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OLCPage::commitPage(_eReason))
@@ -360,7 +360,7 @@ namespace dbp
     //=====================================================================
     //= OContentFieldSelection
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OContentFieldSelection::OContentFieldSelection( OListComboWizard* _pParent )
         :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_CONTENTSELECTION_FIELD))
         ,m_aFrame               (this, ModuleRes(FL_FRAME))
@@ -376,14 +376,14 @@ namespace dbp
         m_aSelectTableField.SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked));
     }
 
-    //---------------------------------------------------------------------
+
     void OContentFieldSelection::ActivatePage()
     {
         OLCPage::ActivatePage();
         m_aTableFields.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void OContentFieldSelection::initializePage()
     {
         OLCPage::initializePage();
@@ -395,7 +395,7 @@ namespace dbp
         m_aDisplayedField.SetText(getSettings().sListContentField);
     }
 
-    //---------------------------------------------------------------------
+
     bool OContentFieldSelection::canAdvance() const
     {
         if (!OLCPage::canAdvance())
@@ -404,7 +404,7 @@ namespace dbp
         return 0 != m_aSelectTableField.GetSelectEntryCount();
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OContentFieldSelection, OnTableDoubleClicked, ListBox*, /*NOTINTERESTEDIN*/ )
     {
         if (m_aSelectTableField.GetSelectEntryCount())
@@ -412,7 +412,7 @@ namespace dbp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( OContentFieldSelection, OnFieldSelected, ListBox*, /*NOTINTERESTEDIN*/ )
     {
         updateDialogTravelUI();
@@ -420,7 +420,7 @@ namespace dbp
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OContentFieldSelection::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OLCPage::commitPage(_eReason))
@@ -434,7 +434,7 @@ namespace dbp
     //=====================================================================
     //= OLinkFieldsPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OLinkFieldsPage::OLinkFieldsPage( OListComboWizard* _pParent )
         :OLCPage(_pParent, ModuleRes(RID_PAGE_LCW_FIELDLINK))
         ,m_aDescription         (this, ModuleRes(FT_FIELDLINK_DESC))
@@ -452,14 +452,14 @@ namespace dbp
         m_aTableField.SetSelectHdl(LINK(this, OLinkFieldsPage, OnSelectionModified));
     }
 
-    //---------------------------------------------------------------------
+
     void OLinkFieldsPage::ActivatePage()
     {
         OLCPage::ActivatePage();
         m_aValueListField.GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void OLinkFieldsPage::initializePage()
     {
         OLCPage::initializePage();
@@ -476,14 +476,14 @@ namespace dbp
         implCheckFinish();
     }
 
-    //---------------------------------------------------------------------
+
     bool OLinkFieldsPage::canAdvance() const
     {
         // we're on the last page here, no travelNext allowed ...
         return false;
     }
 
-    //---------------------------------------------------------------------
+
     void OLinkFieldsPage::implCheckFinish()
     {
         bool bInvalidSelection = (COMBOBOX_ENTRY_NOTFOUND == m_aValueListField.GetEntryPos(m_aValueListField.GetText()));
@@ -491,14 +491,14 @@ namespace dbp
         getDialog()->enableButtons(WZB_FINISH, !bInvalidSelection);
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OLinkFieldsPage, OnSelectionModified)
     {
         implCheckFinish();
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OLinkFieldsPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
     {
         if (!OLCPage::commitPage(_eReason))
@@ -513,27 +513,27 @@ namespace dbp
     //=====================================================================
     //= OComboDBFieldPage
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent )
         :ODBFieldPage(_pParent)
     {
         setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD).toString());
     }
 
-    //---------------------------------------------------------------------
+
     OUString& OComboDBFieldPage::getDBFieldSetting()
     {
         return getSettings().sLinkedFormField;
     }
 
-    //---------------------------------------------------------------------
+
     void OComboDBFieldPage::ActivatePage()
     {
         ODBFieldPage::ActivatePage();
         getDialog()->enableButtons(WZB_FINISH, sal_True);
     }
 
-    //---------------------------------------------------------------------
+
     bool OComboDBFieldPage::canAdvance() const
     {
         // we're on the last page here, no travelNext allowed ...
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 34c3260daf81..91e929351b17 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -53,13 +53,13 @@ namespace dbp
     //=====================================================================
     //= OOptionGroupLayouter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OOptionGroupLayouter::OOptionGroupLayouter(const Reference< XComponentContext >& _rxContext)
         :mxContext(_rxContext)
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OOptionGroupLayouter::doLayout(const OControlWizardContext& _rContext, const OOptionGroupSettings& _rSettings)
     {
         Reference< XShapes > xPageShapes(_rContext.xDrawPage, UNO_QUERY);
@@ -185,7 +185,7 @@ namespace dbp
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OOptionGroupLayouter::implAnchorShape(const Reference< XPropertySet >& _rxShapeProps)
     {
         static const OUString s_sAnchorPropertyName("AnchorType");
diff --git a/extensions/source/dbpilots/wizardservices.cxx b/extensions/source/dbpilots/wizardservices.cxx
index abb0dcd94496..12e706d78cf6 100644
--- a/extensions/source/dbpilots/wizardservices.cxx
+++ b/extensions/source/dbpilots/wizardservices.cxx
@@ -56,13 +56,13 @@ namespace dbp
     //=====================================================================
     //= OGroupBoxSI
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OUString OGroupBoxSI::getImplementationName() const
     {
         return OUString("org.openoffice.comp.dbp.OGroupBoxWizard");
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< OUString > OGroupBoxSI::getServiceNames() const
     {
         Sequence< OUString > aReturn(1);
@@ -73,13 +73,13 @@ namespace dbp
     //=====================================================================
     //= OListComboSI
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OUString OListComboSI::getImplementationName() const
     {
         return OUString("org.openoffice.comp.dbp.OListComboWizard");
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< OUString > OListComboSI::getServiceNames() const
     {
         Sequence< OUString > aReturn(1);
@@ -90,13 +90,13 @@ namespace dbp
     //=====================================================================
     //= OGridSI
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OUString OGridSI::getImplementationName() const
     {
         return OUString("org.openoffice.comp.dbp.OGridWizard");
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< OUString > OGridSI::getServiceNames() const
     {
         Sequence< OUString > aReturn(1);
diff --git a/extensions/source/inc/componentmodule.cxx b/extensions/source/inc/componentmodule.cxx
index 44ac1c8a6ae3..57c29dc34b58 100644
--- a/extensions/source/inc/componentmodule.cxx
+++ b/extensions/source/inc/componentmodule.cxx
@@ -60,21 +60,21 @@ namespace COMPMOD_NAMESPACE
         void    setResourceFilePrefix(const OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
     };
 
-    //-------------------------------------------------------------------------
+
     OModuleImpl::OModuleImpl()
         :m_pResources(NULL)
         ,m_bInitialized(sal_False)
     {
     }
 
-    //-------------------------------------------------------------------------
+
     OModuleImpl::~OModuleImpl()
     {
         if (m_pResources)
             delete m_pResources;
     }
 
-    //-------------------------------------------------------------------------
+
     ResMgr* OModuleImpl::getResManager()
     {
         // note that this method is not threadsafe, which counts for the whole class !
@@ -100,14 +100,14 @@ namespace COMPMOD_NAMESPACE
     sal_Int32       OModule::s_nClients = 0;
     OModuleImpl*    OModule::s_pImpl = NULL;
     OString  OModule::s_sResPrefix;
-    //-------------------------------------------------------------------------
+
     ResMgr* OModule::getResManager()
     {
         ENTER_MOD_METHOD();
         return s_pImpl->getResManager();
     }
 
-    //-------------------------------------------------------------------------
+
     void OModule::setResourceFilePrefix(const OString& _rPrefix)
     {
         ::osl::MutexGuard aGuard(s_aMutex);
@@ -116,14 +116,14 @@ namespace COMPMOD_NAMESPACE
             s_pImpl->setResourceFilePrefix(_rPrefix);
     }
 
-    //-------------------------------------------------------------------------
+
     void OModule::registerClient()
     {
         ::osl::MutexGuard aGuard(s_aMutex);
         ++s_nClients;
     }
 
-    //-------------------------------------------------------------------------
+
     void OModule::revokeClient()
     {
         ::osl::MutexGuard aGuard(s_aMutex);
@@ -134,7 +134,7 @@ namespace COMPMOD_NAMESPACE
         }
     }
 
-    //-------------------------------------------------------------------------
+
     void OModule::ensureImpl()
     {
         if (s_pImpl)
@@ -143,16 +143,16 @@ namespace COMPMOD_NAMESPACE
         s_pImpl->setResourceFilePrefix(s_sResPrefix);
     }
 
-    //--------------------------------------------------------------------------
+
     //- registration helper
-    //--------------------------------------------------------------------------
+
 
     Sequence< OUString >*                OModule::s_pImplementationNames = NULL;
     Sequence< Sequence< OUString > >*    OModule::s_pSupportedServices = NULL;
     Sequence< sal_Int64 >*                      OModule::s_pCreationFunctionPointers = NULL;
     Sequence< sal_Int64 >*                      OModule::s_pFactoryFunctionPointers = NULL;
 
-    //--------------------------------------------------------------------------
+
     void OModule::registerComponent(
         const OUString& _rImplementationName,
         const Sequence< OUString >& _rServiceNames,
@@ -188,7 +188,7 @@ namespace COMPMOD_NAMESPACE
         s_pFactoryFunctionPointers->getArray()[nOldLen] = reinterpret_cast<sal_Int64>(_pFactoryFunction);
     }
 
-    //--------------------------------------------------------------------------
+
     void OModule::revokeComponent(const OUString& _rImplementationName)
     {
         if (!s_pImplementationNames)
@@ -226,7 +226,7 @@ namespace COMPMOD_NAMESPACE
         }
     }
 
-    //--------------------------------------------------------------------------
+
     Reference< XInterface > OModule::getComponentFactory(
         const OUString& _rImplementationName,
         const Reference< XMultiServiceFactory >& _rxServiceManager)
diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx
index 637a3a2a2f92..df3c11249e5b 100644
--- a/extensions/source/logging/consolehandler.cxx
+++ b/extensions/source/logging/consolehandler.cxx
@@ -63,7 +63,7 @@ namespace logging
     //====================================================================
     //= ConsoleHandler - declaration
     //====================================================================
-    //--------------------------------------------------------------------
+
     typedef ::cppu::WeakComponentImplHelper3    <   XConsoleHandler
                                                 ,   XServiceInfo
                                                 ,   XInitialization
@@ -119,7 +119,7 @@ namespace logging
     //====================================================================
     //= ConsoleHandler - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     ConsoleHandler::ConsoleHandler( const Reference< XComponentContext >& _rxContext )
         :ConsoleHandler_Base( m_aMutex )
         ,m_aHandlerHelper( _rxContext, m_aMutex, rBHelper )
@@ -127,7 +127,7 @@ namespace logging
     {
     }
 
-    //--------------------------------------------------------------------
+
     ConsoleHandler::~ConsoleHandler()
     {
         if ( !rBHelper.bDisposed )
@@ -137,39 +137,39 @@ namespace logging
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::disposing()
     {
         m_aHandlerHelper.setFormatter( NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void ConsoleHandler::enterMethod( MethodGuard::Access )
     {
         m_aHandlerHelper.enterMethod();
     }
 
-    //--------------------------------------------------------------------
+
     void ConsoleHandler::leaveMethod( MethodGuard::Access )
     {
         m_aMutex.release();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL ConsoleHandler::getThreshold() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_nThreshold;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_nThreshold = _threshold;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL ConsoleHandler::getEncoding() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -178,42 +178,42 @@ namespace logging
         return sEncoding;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XLogFormatter > SAL_CALL ConsoleHandler::getFormatter() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getFormatter();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setFormatter( _rxFormatter );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL ConsoleHandler::getLevel() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getLevel();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setLevel( _nLevel );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::flush(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -221,7 +221,7 @@ namespace logging
         fflush( stderr );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL ConsoleHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -238,7 +238,7 @@ namespace logging
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ConsoleHandler::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -268,31 +268,31 @@ namespace logging
         m_aHandlerHelper.setIsInitialized();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL ConsoleHandler::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL ConsoleHandler::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
     {
         return cppu::supportsService(this, _rServiceName);
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL ConsoleHandler::getImplementationName_static()
     {
         return OUString( "com.sun.star.comp.extensions.ConsoleHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ConsoleHandler::getSupportedServiceNames_static()
     {
         Sequence< OUString > aServiceNames(1);
@@ -300,13 +300,13 @@ namespace logging
         return aServiceNames;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > ConsoleHandler::Create( const Reference< XComponentContext >& _rxContext )
     {
         return *( new ConsoleHandler( _rxContext ) );
     }
 
-    //--------------------------------------------------------------------
+
     void createRegistryInfo_ConsoleHandler()
     {
         static OAutoRegistration< ConsoleHandler > aAutoRegistration;
diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index d2dc622dcf1a..61a2353f3e80 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -147,7 +147,7 @@ namespace logging
     //====================================================================
     //= FileHandler - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     FileHandler::FileHandler( const Reference< XComponentContext >& _rxContext )
         :FileHandler_Base( m_aMutex )
         ,m_xContext( _rxContext )
@@ -158,7 +158,7 @@ namespace logging
     {
     }
 
-    //--------------------------------------------------------------------
+
     FileHandler::~FileHandler()
     {
         if ( !rBHelper.bDisposed )
@@ -168,7 +168,7 @@ namespace logging
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool FileHandler::impl_prepareFile_nothrow()
     {
         if ( m_eFileValidity == eUnknown )
@@ -208,7 +208,7 @@ namespace logging
         return m_eFileValidity == eValid;
     }
 
-    //--------------------------------------------------------------------
+
     void FileHandler::impl_writeString_nothrow( const OString& _rEntry )
     {
         OSL_PRECOND( m_pFile.get(), "FileHandler::impl_writeString_nothrow: no file!" );
@@ -223,7 +223,7 @@ namespace logging
             "FileHandler::impl_writeString_nothrow: could not write the log entry!" );
     }
 
-    //--------------------------------------------------------------------
+
     void FileHandler::impl_doStringsubstitution_nothrow( OUString& _inout_rURL )
     {
         try
@@ -237,7 +237,7 @@ namespace logging
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FileHandler::disposing()
     {
         if ( m_eFileValidity == eValid )
@@ -251,19 +251,19 @@ namespace logging
         m_aHandlerHelper.setFormatter( NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void FileHandler::enterMethod( MethodGuard::Access )
     {
         m_aHandlerHelper.enterMethod();
     }
 
-    //--------------------------------------------------------------------
+
     void FileHandler::leaveMethod( MethodGuard::Access )
     {
         m_aMutex.release();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL FileHandler::getEncoding() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -272,42 +272,42 @@ namespace logging
         return sEncoding;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FileHandler::setEncoding( const OUString& _rEncoding ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         OSL_VERIFY( m_aHandlerHelper.setEncoding( _rEncoding ) );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XLogFormatter > SAL_CALL FileHandler::getFormatter() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getFormatter();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FileHandler::setFormatter( const Reference< XLogFormatter >& _rxFormatter ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setFormatter( _rxFormatter );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL FileHandler::getLevel() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aHandlerHelper.getLevel();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FileHandler::setLevel( ::sal_Int32 _nLevel ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aHandlerHelper.setLevel( _nLevel );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FileHandler::flush(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -323,7 +323,7 @@ namespace logging
         OSL_ENSURE(res == ::osl::FileBase::E_None, "FileHandler::flush: Could not sync logfile to filesystem.");
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL FileHandler::publish( const LogRecord& _rRecord ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -339,7 +339,7 @@ namespace logging
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FileHandler::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -371,7 +371,7 @@ namespace logging
         m_aHandlerHelper.setIsInitialized();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL FileHandler::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
@@ -382,19 +382,19 @@ namespace logging
         return cppu::supportsService(this, _rServiceName);
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL FileHandler::getImplementationName_static()
     {
         return OUString( "com.sun.star.comp.extensions.FileHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FileHandler::getSupportedServiceNames_static()
     {
         Sequence< OUString > aServiceNames(1);
@@ -402,13 +402,13 @@ namespace logging
         return aServiceNames;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > FileHandler::Create( const Reference< XComponentContext >& _rxContext )
     {
         return *( new FileHandler( _rxContext ) );
     }
 
-    //--------------------------------------------------------------------
+
     void createRegistryInfo_FileHandler()
     {
         static OAutoRegistration< FileHandler > aAutoRegistration;
diff --git a/extensions/source/logging/log_services.cxx b/extensions/source/logging/log_services.cxx
index da0376b6e667..35eb937f0e0c 100644
--- a/extensions/source/logging/log_services.cxx
+++ b/extensions/source/logging/log_services.cxx
@@ -24,7 +24,7 @@ namespace logging
 {
 //........................................................................
 
-    //--------------------------------------------------------------------
+
     extern void createRegistryInfo_LoggerPool();
     extern void createRegistryInfo_FileHandler();
     extern void createRegistryInfo_ConsoleHandler();
diff --git a/extensions/source/logging/loggerconfig.cxx b/extensions/source/logging/loggerconfig.cxx
index 0e3d19b553e7..dac25367497d 100644
--- a/extensions/source/logging/loggerconfig.cxx
+++ b/extensions/source/logging/loggerconfig.cxx
@@ -71,10 +71,10 @@ namespace logging
 
     namespace
     {
-        //----------------------------------------------------------------
+
         typedef void (*SettingTranslation)( const Reference< XLogger >&, const OUString&, Any& );
 
-        //----------------------------------------------------------------
+
         void    lcl_substituteFileHandlerURLVariables_nothrow( const Reference< XLogger >& _rxLogger, OUString& _inout_rFileURL )
         {
             struct Variable
@@ -157,7 +157,7 @@ namespace logging
             }
         }
 
-        //----------------------------------------------------------------
+
         void    lcl_transformFileHandlerSettings_nothrow( const Reference< XLogger >& _rxLogger, const OUString& _rSettingName, Any& _inout_rSettingValue )
         {
             if ( _rSettingName != "FileURL" )
@@ -170,7 +170,7 @@ namespace logging
             _inout_rSettingValue <<= sURL;
         }
 
-        //----------------------------------------------------------------
+
         Reference< XInterface > lcl_createInstanceFromSetting_throw(
                 const Reference<XComponentContext>& _rContext,
                 const Reference< XLogger >& _rxLogger,
@@ -234,7 +234,7 @@ namespace logging
         }
     }
 
-    //--------------------------------------------------------------------
+
     void initializeLoggerFromConfiguration( const Reference<XComponentContext>& _rContext, const Reference< XLogger >& _rxLogger )
     {
         try
diff --git a/extensions/source/logging/loghandler.cxx b/extensions/source/logging/loghandler.cxx
index 4184718f4532..eac7d59eda18 100644
--- a/extensions/source/logging/loghandler.cxx
+++ b/extensions/source/logging/loghandler.cxx
@@ -49,7 +49,7 @@ namespace logging
     //====================================================================
     //= LogHandlerHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     LogHandlerHelper::LogHandlerHelper( const Reference< XComponentContext >& _rxContext, ::osl::Mutex& _rMutex, ::cppu::OBroadcastHelper& _rBHelper )
         :m_eEncoding( RTL_TEXTENCODING_UTF8 )
         ,m_nLevel( LogLevel::SEVERE )
@@ -61,7 +61,7 @@ namespace logging
     {
     }
 
-    //--------------------------------------------------------------------
+
     void LogHandlerHelper::initFromSettings( const ::comphelper::NamedValueCollection& _rSettings )
     {
         OUString sEncoding;
@@ -75,7 +75,7 @@ namespace logging
         _rSettings.get_ensureType( "Level", m_nLevel );
     }
 
-    //--------------------------------------------------------------------
+
     void LogHandlerHelper::enterMethod()
     {
         m_rMutex.acquire();
@@ -101,7 +101,7 @@ namespace logging
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool LogHandlerHelper::getEncoding( OUString& _out_rEncoding ) const
     {
         const char* pMimeCharset = rtl_getMimeCharsetFromTextEncoding( m_eEncoding );
@@ -114,7 +114,7 @@ namespace logging
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool LogHandlerHelper::setEncoding( const OUString& _rEncoding )
     {
         OString sAsciiEncoding( OUStringToOString( _rEncoding, RTL_TEXTENCODING_ASCII_US ) );
@@ -127,7 +127,7 @@ namespace logging
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool LogHandlerHelper::formatForPublishing( const LogRecord& _rRecord, OString& _out_rEntry ) const
     {
         if ( _rRecord.Level < getLevel() )
@@ -148,7 +148,7 @@ namespace logging
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool LogHandlerHelper::getEncodedHead( OString& _out_rHead ) const
     {
         try
@@ -165,7 +165,7 @@ namespace logging
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool LogHandlerHelper::getEncodedTail( OString& _out_rTail ) const
     {
         try
diff --git a/extensions/source/logging/logrecord.cxx b/extensions/source/logging/logrecord.cxx
index a4a95ced4d08..b7ee720452e9 100644
--- a/extensions/source/logging/logrecord.cxx
+++ b/extensions/source/logging/logrecord.cxx
@@ -35,7 +35,7 @@ namespace logging
     //====================================================================
     //= helper
     //====================================================================
-    //--------------------------------------------------------------------
+
     namespace
     {
         /** returns a string representation of the current thread
@@ -51,7 +51,7 @@ namespace logging
         }
     }
 
-    //--------------------------------------------------------------------
+
     LogRecord createLogRecord( const OUString& _rLoggerName, const OUString& _rClassName,
         const OUString& _rMethodName, const OUString& _rMessage,
         sal_Int32 _nLogLevel, oslInterlockedCount _nEventNumber )
diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx
index 2f4e0a6eb381..7333c064d9df 100644
--- a/extensions/source/logging/plaintextformatter.cxx
+++ b/extensions/source/logging/plaintextformatter.cxx
@@ -79,17 +79,17 @@ namespace logging
     //====================================================================
     //= PlainTextFormatter - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     PlainTextFormatter::PlainTextFormatter()
     {
     }
 
-    //--------------------------------------------------------------------
+
     PlainTextFormatter::~PlainTextFormatter()
     {
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL PlainTextFormatter::getHead(  ) throw (RuntimeException)
     {
         OUStringBuffer aHeader;
@@ -106,7 +106,7 @@ namespace logging
         return aHeader.makeStringAndClear();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL PlainTextFormatter::format( const LogRecord& _rRecord ) throw (RuntimeException)
     {
         char buffer[ 30 ];
@@ -144,7 +144,7 @@ namespace logging
         return aLogEntry.makeStringAndClear();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL PlainTextFormatter::getTail(  ) throw (RuntimeException)
     {
         // no tail
@@ -156,25 +156,25 @@ namespace logging
         return cppu::supportsService(this, _rServiceName);
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL PlainTextFormatter::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL PlainTextFormatter::getImplementationName_static()
     {
         return OUString( "com.sun.star.comp.extensions.PlainTextFormatter" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL PlainTextFormatter::getSupportedServiceNames_static()
     {
         Sequence< OUString > aServiceNames(1);
@@ -182,13 +182,13 @@ namespace logging
         return aServiceNames;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > PlainTextFormatter::Create( const Reference< XComponentContext >& )
     {
         return *( new PlainTextFormatter );
     }
 
-    //--------------------------------------------------------------------
+
     void createRegistryInfo_PlainTextFormatter()
     {
         static OAutoRegistration< PlainTextFormatter > aAutoRegistration;
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 1118f43eb659..f94dba01b8a8 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -1226,7 +1226,7 @@ Any  IUnknownWrapper_Impl::invokeWithDispIdUnoTlb(const OUString& sFunctionName,
 
 
 
-// --------------------------
+
 // XInitialization
 void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
 {
@@ -1309,7 +1309,7 @@ void SAL_CALL IUnknownWrapper_Impl::initialize( const Sequence< Any >& aArgument
     }
 }
 
-// --------------------------
+
 // XDirectInvocation
 uno::Any SAL_CALL IUnknownWrapper_Impl::directInvoke( const OUString& aName, const uno::Sequence< uno::Any >& aParams )
     throw (lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException)
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 0689773d0a97..7769b1a6d6bf 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -301,7 +301,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
 // by either using type information or by help of a specialized ValueObject object.
 
 // A. Type Information
-// -----------------------------------------------------------------------------
+
 // With the help of type information the kind of parameter can be exactly determined
 // and an appropriate conversion can be choosen. A problem arises if a method expects
 // an Any. Then the type info does not tell what the type of the value, that is kept
@@ -311,7 +311,7 @@ STDMETHODIMP InterfaceOleWrapper_Impl::GetIDsOfNames(REFIID /*riid*/,
 // the JScript value objects within a JScript script on such an occasion.
 
 // B. JavaScript Value Object ( class JScriptValue )
-// -----------------------------------------------------------------------------
+
 // A JScriptValue (ValueObject) object is a COM object in that it implements IDispatch and the
 // IJScriptValue object interface. Such objects are provided by all UNO wrapper
 // objects used within a JScript script. To obtain an instance one has to call
@@ -1069,7 +1069,7 @@ HRESULT InterfaceOleWrapper_Impl::InvokeGeneral( DISPID dispidMember, unsigned s
                 ret= S_OK;
             }
         }
-// ---------
+
         // function: _GetValueObject
         else if( dispidMember == DISPID_JSCRIPT_VALUE_FUNC)
         {
diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx
index 022e1265acef..04d03bbce4cf 100644
--- a/extensions/source/plugin/base/plctrl.cxx
+++ b/extensions/source/plugin/base/plctrl.cxx
@@ -38,7 +38,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 
 
-//--------------------------------------------------------------------------------------------------
+
 PluginControl_Impl::PluginControl_Impl() :
     _pMultiplexer( NULL )
     , _nX( 0 )
@@ -52,7 +52,7 @@ PluginControl_Impl::PluginControl_Impl() :
 {
 }
 
-//--------------------------------------------------------------------------------------------------
+
 PluginControl_Impl::~PluginControl_Impl()
 {
 }
@@ -140,7 +140,7 @@ void PluginControl_Impl::setFocus(void) throw( RuntimeException )
 }
 
 
-//--------------------------------------------------------------------------------------------------
+
 void PluginControl_Impl::releasePeer()
 {
     if (_xPeer.is())
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 4f41e5289322..beae3b4119c3 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -69,7 +69,7 @@ void TRACEN( char const * s, long n );
     return ::boost::shared_ptr<SysPlugData>();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 PluginComm_Impl::PluginComm_Impl( const OUString& /*rMIME*/, const OUString& rName, HWND /*hWnd*/ )
     : PluginComm( OUStringToOString( rName, RTL_TEXTENCODING_MS_1252 ) )
 {
@@ -100,7 +100,7 @@ PluginComm_Impl::PluginComm_Impl( const OUString& /*rMIME*/, const OUString& rNa
     execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 PluginComm_Impl::~PluginComm_Impl()
 {
     if (_plDLL)
@@ -120,7 +120,7 @@ PluginComm_Impl::~PluginComm_Impl()
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 BOOL PluginComm_Impl::retrieveFunction( TCHAR const * pName, void** ppFunc ) const
 {
     if( ! _plDLL )
@@ -131,7 +131,7 @@ BOOL PluginComm_Impl::retrieveFunction( TCHAR const * pName, void** ppFunc ) con
     return (*ppFunc != NULL);
 }
 
-//--------------------------------------------------------------------------------------------------
+
 
 long PluginComm_Impl::doIt()
 {
@@ -287,7 +287,7 @@ long PluginComm_Impl::doIt()
     return nRet;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_Destroy( NPP instance, NPSavedData** save )
 {
     DBG_ASSERT( _NPPfuncs.destroy, "### NPP_Destroy(): null pointer in NPP functions table!" );
@@ -297,7 +297,7 @@ NPError PluginComm_Impl::NPP_Destroy( NPP instance, NPSavedData** save )
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_DestroyStream( NPP instance, NPStream* stream, NPError reason )
 {
     DBG_ASSERT( _NPPfuncs.destroystream, "### NPP_DestroyStream(): null pointer in NPP functions table!" );
@@ -308,7 +308,7 @@ NPError PluginComm_Impl::NPP_DestroyStream( NPP instance, NPStream* stream, NPEr
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc,
                                   char* argn[], char* argv[], NPSavedData *saved )
 {
@@ -324,7 +324,7 @@ NPError PluginComm_Impl::NPP_New( NPMIMEType pluginType, NPP instance, uint16_t
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream,
                                         NPBool seekable, uint16_t* stype )
 {
@@ -339,7 +339,7 @@ NPError PluginComm_Impl::NPP_NewStream( NPP instance, NPMIMEType type, NPStream*
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void PluginComm_Impl::NPP_Print( NPP instance, NPPrint* platformPrint )
 {
     DBG_ASSERT( _NPPfuncs.print, "### NPP_Print(): null pointer in NPP functions table!" );
@@ -349,7 +349,7 @@ void PluginComm_Impl::NPP_Print( NPP instance, NPPrint* platformPrint )
     execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_SetWindow( NPP instance, NPWindow* window )
 {
     DBG_ASSERT( _NPPfuncs.setwindow, "### NPP_SetWindow(): null pointer in NPP functions table!" );
@@ -359,7 +359,7 @@ NPError PluginComm_Impl::NPP_SetWindow( NPP instance, NPWindow* window )
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void PluginComm_Impl::NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname )
 {
     DBG_ASSERT( _NPPfuncs.asfile, "### NPP_StreamAsFile(): null pointer in NPP functions table!" );
@@ -370,7 +370,7 @@ void PluginComm_Impl::NPP_StreamAsFile( NPP instance, NPStream* stream, const ch
     execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void PluginComm_Impl::NPP_URLNotify( NPP instance, const char* url, NPReason reason, void* notifyData )
 {
     DBG_ASSERT( _NPPfuncs.urlnotify, "### NPP_URLNotify(): null pointer in NPP functions table!" );
@@ -382,7 +382,7 @@ void PluginComm_Impl::NPP_URLNotify( NPP instance, const char* url, NPReason rea
     execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 int32_t PluginComm_Impl::NPP_Write( NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer )
 {
     DBG_ASSERT( _NPPfuncs.write, "### NPP_Write(): null pointer in NPP functions table!" );
@@ -395,7 +395,7 @@ int32_t PluginComm_Impl::NPP_Write( NPP instance, NPStream* stream, int32_t offs
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 int32_t PluginComm_Impl::NPP_WriteReady( NPP instance, NPStream* stream )
 {
     DBG_ASSERT( _NPPfuncs.writeready, "### NPP_WriteReady(): null pointer in NPP functions table!" );
@@ -405,7 +405,7 @@ int32_t PluginComm_Impl::NPP_WriteReady( NPP instance, NPStream* stream )
     return execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_GetValue( NPP instance, NPPVariable variable, void *ret_value )
 {
     DBG_ASSERT( _NPPfuncs.getvalue, "### NPP_GetValue(): null pointer in NPP functions table!" );
@@ -416,7 +416,7 @@ NPError PluginComm_Impl::NPP_GetValue( NPP instance, NPPVariable variable, void
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void *set_value )
 {
     DBG_ASSERT( _NPPfuncs.setvalue, "### NPP_SetValue(): null pointer in NPP functions table!" );
@@ -427,20 +427,20 @@ NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void
     return (NPError)execute();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void * PluginComm_Impl::NPP_GetJavaClass()
 {
     OSL_FAIL( "no java class available!" );
     return 0;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 NPError PluginComm_Impl::NPP_Initialize()
 {
     return NPERR_NO_ERROR;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void PluginComm_Impl::NPP_Shutdown()
 {
     m_eCall = eNPP_Shutdown;
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index a5535dec0c6d..11aa92f31d0c 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -67,7 +67,7 @@ using namespace com::sun::star::plugin;
 
 typedef map< OString, OUString, less< OString > > PluginLocationMap;
 
-//__________________________________________________________________________________________________
+
 static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap & rPlugins )
 {
     // append dll name pattern we are looking for
@@ -118,7 +118,7 @@ static void addPluginsFromPath( const TCHAR * pPluginsPath, PluginLocationMap &
     if (hFind != INVALID_HANDLE_VALUE)
         ::FindClose( hFind );
 }
-//__________________________________________________________________________________________________
+
 static void addPluginsFromPath( const OUString & rPath, PluginLocationMap & rPlugins )
 {
     TCHAR arPluginsPath[MAX_PATH];
@@ -132,7 +132,7 @@ static void addPluginsFromPath( const OUString & rPath, PluginLocationMap & rPlu
 }
 
 
-//__________________________________________________________________________________________________
+
 static void add_IE_Plugins( PluginLocationMap & rPlugins )
 {
     HKEY hKey;
@@ -155,7 +155,7 @@ static void add_IE_Plugins( PluginLocationMap & rPlugins )
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void add_NS_keys( HKEY hKey, PluginLocationMap & rPlugins )
 {
     TCHAR value[MAX_PATH];
@@ -194,7 +194,7 @@ static void add_NS_keys( HKEY hKey, PluginLocationMap & rPlugins )
         addPluginsFromPath( value, rPlugins );
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static void add_NS_lookupRecursive( HKEY hKey, PluginLocationMap & rPlugins )
 {
     add_NS_keys( hKey, rPlugins );
@@ -214,7 +214,7 @@ static void add_NS_lookupRecursive( HKEY hKey, PluginLocationMap & rPlugins )
         ++dwIndex;
     }
 }
-//__________________________________________________________________________________________________
+
 static void add_MozPlugin( HKEY hKey, PluginLocationMap & rPlugins )
 {
     TCHAR value[MAX_PATH];
@@ -257,7 +257,7 @@ static void add_MozillaPlugin( HKEY hKey, PluginLocationMap & rPlugins )
         ++dwIndex;
     }
 }
-//__________________________________________________________________________________________________
+
 static void add_NS_Plugins( PluginLocationMap & rPlugins )
 {
     HKEY hKey;
@@ -287,7 +287,7 @@ static void add_NS_Plugins( PluginLocationMap & rPlugins )
     }
 }
 
-//__________________________________________________________________________________________________
+
 static void add_SO_Plugins( PluginLocationMap & rPlugins )
 {
     const Sequence< OUString > & rPaths = PluginManager::getAdditionalSearchPaths();
@@ -299,7 +299,7 @@ static void add_SO_Plugins( PluginLocationMap & rPlugins )
     }
 }
 
-//__________________________________________________________________________________________________
+
 Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(void) throw()
 {
     Guard< Mutex > aGuard( Mutex::getGlobalMutex() );
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index a664a61f4405..dcbd50edca3e 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -37,43 +37,43 @@ namespace pcr
     //====================================================================
     //= MasterDetailLinkDialog
     //====================================================================
-    //---------------------------------------------------------------------
+
     MasterDetailLinkDialog::MasterDetailLinkDialog(const Reference< XComponentContext >& _rxContext )
         :OGenericUnoDialog( _rxContext )
     {
     }
-//---------------------------------------------------------------------
+
     Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId(  ) throw(RuntimeException)
     {
         static ::cppu::OImplementationId aId;
         return aId.getImplementationId();
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL MasterDetailLinkDialog::Create( const Reference< XComponentContext >& _rxContext )
     {
         return *( new MasterDetailLinkDialog( _rxContext ) );
     }
 
-    //---------------------------------------------------------------------
+
     OUString SAL_CALL MasterDetailLinkDialog::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //---------------------------------------------------------------------
+
     OUString MasterDetailLinkDialog::getImplementationName_static() throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.form.ui.MasterDetailLinkDialog");
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence SAL_CALL MasterDetailLinkDialog::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence MasterDetailLinkDialog::getSupportedServiceNames_static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
@@ -81,20 +81,20 @@ namespace pcr
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
     Reference<XPropertySetInfo>  SAL_CALL MasterDetailLinkDialog::getPropertySetInfo() throw(RuntimeException)
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //---------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& MasterDetailLinkDialog::getInfoHelper()
     {
         return *const_cast<MasterDetailLinkDialog*>(this)->getArrayHelper();
     }
 
-    //--------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* MasterDetailLinkDialog::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -102,13 +102,13 @@ namespace pcr
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
 
-    //--------------------------------------------------------------------------
+
     Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent)
     {
         return new FormLinkDialog(_pParent,m_xDetail,m_xMaster, m_aContext
             ,m_sExplanation,m_sDetailLabel,m_sMasterLabel);
     }
-    //---------------------------------------------------------------------
+
     void MasterDetailLinkDialog::implInitialize(const Any& _rValue)
     {
         PropertyValue aProperty;
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 5ebeac6e2a3d..e44f1493c2b9 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -55,7 +55,7 @@ namespace pcr
     //= OBrowserLine
     //==================================================================
     DBG_NAME(OBrowserLine)
-    //------------------------------------------------------------------
+
 
     OBrowserLine::OBrowserLine( const OUString& _rEntryName, Window* pParent )
             :m_sEntryName( _rEntryName )
@@ -74,7 +74,7 @@ namespace pcr
         m_aFtTitle.Show();
     }
 
-    //------------------------------------------------------------------
+
     OBrowserLine::~OBrowserLine()
     {
         implHideBrowseButton( true, false );
@@ -83,7 +83,7 @@ namespace pcr
         DBG_DTOR(OBrowserLine,NULL);
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::IndentTitle( bool _bIndent )
     {
         if ( m_bIndentTitle != _bIndent )
@@ -93,7 +93,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetComponentHelpIds( const OString& _rHelpId, const OString& _sPrimaryButtonId, const OString& _sSecondaryButtonId )
     {
         if ( m_pControlWindow )
@@ -112,7 +112,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::setControl( const Reference< XPropertyControl >& _rxControl )
     {
         m_xControl = _rxControl;
@@ -127,7 +127,7 @@ namespace pcr
         impl_layoutComponents();
     }
 
-    //------------------------------------------------------------------
+
     Window* OBrowserLine::GetRefWindow()
     {
         Window* pRefWindow=&m_aFtTitle;
@@ -143,7 +143,7 @@ namespace pcr
         return pRefWindow;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetTabOrder(Window* pRefWindow, sal_uInt16 nFlags )
     {
         m_aFtTitle.SetZOrder(pRefWindow,nFlags);
@@ -157,7 +157,7 @@ namespace pcr
             m_pAdditionalBrowseButton->SetZOrder( m_pBrowseButton, WINDOW_ZORDER_BEHIND );
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool OBrowserLine::GrabFocus()
     {
         sal_Bool bRes=sal_False;
@@ -180,7 +180,7 @@ namespace pcr
         return bRes;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetPosSizePixel( Point _rPos, Size _rSize )
     {
         m_aLinePos = _rPos;
@@ -189,7 +189,7 @@ namespace pcr
         impl_layoutComponents();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::Show(sal_Bool bFlag)
     {
         m_aFtTitle.Show(bFlag);
@@ -201,19 +201,19 @@ namespace pcr
             m_pAdditionalBrowseButton->Show( bFlag );
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::Hide()
     {
         Show(sal_False);
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool OBrowserLine::IsVisible()
     {
         return m_aFtTitle.IsVisible();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::impl_layoutComponents()
     {
         {
@@ -256,7 +256,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetTitle(const OUString& _rNewTtile )
     {
         if ( GetTitle() == _rNewTtile )
@@ -291,7 +291,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     OUString OBrowserLine::GetTitle() const
     {
         OUString sDisplayName = m_aFtTitle.GetText();
@@ -308,7 +308,7 @@ namespace pcr
         return sDisplayName;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetReadOnly( bool _bReadOnly )
     {
         if ( m_bReadOnly != _bReadOnly )
@@ -318,7 +318,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     namespace
     {
         void implSetBitIfAffected( sal_uInt16& _nEnabledBits, sal_Int16 _nAffectedMask, sal_Int16 _nTestBit, bool _bSet )
@@ -345,7 +345,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::implUpdateEnabledDisabled()
     {
         implEnable( &m_aFtTitle,                m_nEnableFlags, PropertyLineElement::CompleteLine );
@@ -364,14 +364,14 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::EnablePropertyLine( bool _bEnable )
     {
         implSetBitIfAffected( m_nEnableFlags, PropertyLineElement::CompleteLine, PropertyLineElement::CompleteLine, _bEnable );
         implUpdateEnabledDisabled();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::EnablePropertyControls( sal_Int16 _nControls, bool _bEnable )
     {
         implSetBitIfAffected( m_nEnableFlags, _nControls, PropertyLineElement::InputControl, _bEnable );
@@ -380,7 +380,7 @@ namespace pcr
         implUpdateEnabledDisabled();
     }
 
-    //------------------------------------------------------------------
+
     PushButton& OBrowserLine::impl_ensureButton( bool _bPrimary )
     {
         PushButton*& rpButton = _bPrimary ? m_pBrowseButton : m_pAdditionalBrowseButton;
@@ -400,7 +400,7 @@ namespace pcr
         return *rpButton;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::impl_getImagesFromURL_nothrow( const OUString& _rImageURL, Image& _out_rImage )
     {
         try
@@ -421,7 +421,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::ShowBrowseButton( const OUString& _rImageURL, sal_Bool _bPrimary )
     {
         PushButton& rButton( impl_ensureButton( _bPrimary ) );
@@ -433,7 +433,7 @@ namespace pcr
         rButton.SetModeImage( aImage );
    }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::ShowBrowseButton( const Image& _rImage, sal_Bool _bPrimary )
     {
         PushButton& rButton( impl_ensureButton( _bPrimary ) );
@@ -441,13 +441,13 @@ namespace pcr
             rButton.SetModeImage( _rImage );
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::ShowBrowseButton( sal_Bool _bPrimary )
     {
         impl_ensureButton( _bPrimary );
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::implHideBrowseButton( sal_Bool _bPrimary, bool _bReLayout )
     {
         PushButton*& rpButton = _bPrimary ? m_pBrowseButton : m_pAdditionalBrowseButton;
@@ -463,13 +463,13 @@ namespace pcr
             impl_layoutComponents();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::HideBrowseButton( sal_Bool _bPrimary )
     {
         implHideBrowseButton( _bPrimary, true );
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetTitleWidth(sal_uInt16 nWidth)
     {
         if (m_nNameWidth != nWidth+10)
@@ -481,13 +481,13 @@ namespace pcr
         FullFillTitleString();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserLine::SetClickListener( IButtonClickListener* _pListener )
     {
         m_pClickListener = _pListener;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( OBrowserLine, OnButtonClicked, PushButton*, _pButton )
     {
         if ( m_pClickListener )
@@ -496,7 +496,7 @@ namespace pcr
         return 0L;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( OBrowserLine, OnButtonFocus, PushButton*, /*pPB*/ )
     {
         if ( m_xControl.is() )
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 3841a6430f80..5e5e3e5e05f4 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -98,17 +98,17 @@ namespace pcr
         SharedNotifier& operator=( const SharedNotifier& ); // never implemented
     };
 
-    //------------------------------------------------------------------
+
     ::rtl::Reference< ::comphelper::AsyncEventNotifier > SharedNotifier::s_pNotifier;
 
-    //------------------------------------------------------------------
+
     ::osl::Mutex& SharedNotifier::getMutex()
     {
         static ::osl::Mutex s_aMutex;
         return s_aMutex;
     }
 
-    //------------------------------------------------------------------
+
     const ::rtl::Reference< ::comphelper::AsyncEventNotifier >& SharedNotifier::getNotifier()
     {
         ::osl::MutexGuard aGuard( getMutex() );
@@ -211,28 +211,28 @@ namespace pcr
         void impl_notify_throw( const Reference< XPropertyControl >& _rxControl, ControlEventType _eType );
     };
 
-    //--------------------------------------------------------------------
+
     PropertyControlContext_Impl::PropertyControlContext_Impl( IControlContext& _rContextImpl )
         :m_pContext( &_rContextImpl )
         ,m_eMode( eAsynchronously )
     {
     }
 
-    //--------------------------------------------------------------------
+
     PropertyControlContext_Impl::~PropertyControlContext_Impl()
     {
         if ( !impl_isDisposed_nothrow() )
             dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyControlContext_Impl::impl_checkAlive_throw() const
     {
         if ( impl_isDisposed_nothrow() )
             throw DisposedException( OUString(), *const_cast< PropertyControlContext_Impl* >( this ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlContext_Impl::dispose()
     {
         SolarMutexGuard aGuard;
@@ -243,14 +243,14 @@ namespace pcr
         m_pContext = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyControlContext_Impl::setNotificationMode( NotifcationMode _eMode )
     {
         SolarMutexGuard aGuard;
         m_eMode = _eMode;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyControlContext_Impl::impl_notify_throw( const Reference< XPropertyControl >& _rxControl, ControlEventType _eType )
     {
         ::comphelper::AnyEventRef pEvent;
@@ -270,40 +270,40 @@ namespace pcr
         SharedNotifier::getNotifier()->addEvent( pEvent, this );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlContext_Impl::focusGained( const Reference< XPropertyControl >& Control ) throw (RuntimeException)
     {
         OSL_TRACE( "PropertyControlContext_Impl: FOCUS_GAINED" );
         impl_notify_throw( Control, FOCUS_GAINED );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlContext_Impl::valueChanged( const Reference< XPropertyControl >& Control ) throw (RuntimeException)
     {
         OSL_TRACE( "PropertyControlContext_Impl: VALUE_CHANGED" );
         impl_notify_throw( Control, VALUE_CHANGED );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlContext_Impl::activateNextControl( const Reference< XPropertyControl >& CurrentControl ) throw (RuntimeException)
     {
         OSL_TRACE( "PropertyControlContext_Impl: ACTIVATE_NEXT" );
         impl_notify_throw( CurrentControl, ACTIVATE_NEXT );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlContext_Impl::acquire() throw()
     {
         PropertyControlContext_Impl_Base::acquire();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlContext_Impl::release() throw()
     {
         PropertyControlContext_Impl_Base::release();
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyControlContext_Impl::processEvent( const ::comphelper::AnyEvent& _rEvent )
     {
         SolarMutexGuard aGuard;
@@ -322,7 +322,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyControlContext_Impl::impl_processEvent_throw( const ::comphelper::AnyEvent& _rEvent )
     {
         const ControlEvent& rControlEvent = static_cast< const ControlEvent& >( _rEvent );
@@ -347,7 +347,7 @@ namespace pcr
     //= OBrowserListBox
     //==================================================================
     DBG_NAME(OBrowserListBox)
-    //------------------------------------------------------------------
+
     OBrowserListBox::OBrowserListBox( Window* pParent, WinBits nWinStyle)
             :Control(pParent, nWinStyle| WB_CLIPCHILDREN)
             ,m_aLinesPlayground(this,WB_DIALOGCONTROL | WB_CLIPCHILDREN)
@@ -377,7 +377,7 @@ namespace pcr
         m_aVScroll.SetScrollHdl(LINK(this, OBrowserListBox, ScrollHdl));
     }
 
-    //------------------------------------------------------------------
+
     OBrowserListBox::~OBrowserListBox()
     {
         OSL_ENSURE( !IsModified(), "OBrowserListBox::~OBrowserListBox: still modified - should have been committed before!" );
@@ -394,7 +394,7 @@ namespace pcr
         DBG_DTOR(OBrowserListBox,NULL);
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool OBrowserListBox::IsModified( ) const
     {
         sal_Bool bModified = sal_False;
@@ -405,7 +405,7 @@ namespace pcr
         return bModified;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::CommitModified( )
     {
         if ( IsModified() && m_xActiveControl.is() )
@@ -425,7 +425,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::ActivateListBox(sal_Bool _bActive)
     {
         m_bIsActive = _bActive;
@@ -438,13 +438,13 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     long OBrowserListBox::impl_getPrefererredHelpHeight()
     {
         return HasHelpSection() ? m_pHelpWindow->GetOptimalHeightPixel() : 0;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::Resize()
     {
         Rectangle aPlayground( Point( 0, 0 ), GetOutputSizePixel() );
@@ -507,32 +507,32 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::SetListener( IPropertyLineListener* _pListener )
     {
         m_pLineListener = _pListener;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::SetObserver( IPropertyControlObserver* _pObserver )
     {
         m_pControlObserver = _pObserver;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::EnableHelpSection( bool _bEnable )
     {
         m_pHelpWindow->Show( _bEnable );
         Resize();
     }
 
-    //------------------------------------------------------------------
+
     bool OBrowserListBox::HasHelpSection() const
     {
         return m_pHelpWindow->IsVisible();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::SetHelpText( const OUString& _rHelpText )
     {
         OSL_ENSURE( HasHelpSection(), "OBrowserListBox::SetHelpText: help section not visible!" );
@@ -541,13 +541,13 @@ namespace pcr
             Resize();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines )
     {
         m_pHelpWindow->SetLimits( _nMinLines, _nMaxLines );
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OBrowserListBox::CalcVisibleLines()
     {
         Size aSize(m_aLinesPlayground.GetOutputSizePixel());
@@ -558,7 +558,7 @@ namespace pcr
         return nResult;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::UpdateVScroll()
     {
         sal_uInt16 nLines = CalcVisibleLines();
@@ -578,7 +578,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::PositionLine( sal_uInt16 _nIndex )
     {
         Size aSize(m_aLinesPlayground.GetOutputSizePixel());
@@ -601,7 +601,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::UpdatePosNSize()
     {
         for  (  ::std::set< sal_uInt16 >::const_iterator aLoop = m_aOutOfDateLines.begin();
@@ -616,7 +616,7 @@ namespace pcr
         m_aOutOfDateLines.clear();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::UpdatePlayGround()
     {
         sal_Int32 nThumbPos = m_aVScroll.GetThumbPos();
@@ -634,26 +634,26 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::UpdateAll()
     {
         Resize();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::DisableUpdate()
     {
         m_bUpdate = sal_False;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::EnableUpdate()
     {
         m_bUpdate = sal_True;
         UpdateAll();
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::SetPropertyValue(const OUString& _rEntryName, const Any& _rValue, bool _bUnknownValue )
     {
         ListBoxLines::iterator line = m_aLines.begin();
@@ -674,7 +674,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     sal_uInt16 OBrowserListBox::GetPropertyPos( const OUString& _rEntryName ) const
     {
         sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND;
@@ -693,7 +693,7 @@ namespace pcr
         return nRet;
     }
 
-    //------------------------------------------------------------------------
+
     bool OBrowserListBox::impl_getBrowserLineForName( const OUString& _rEntryName, BrowserLinePointer& _out_rpLine ) const
     {
         ListBoxLines::const_iterator line = m_aLines.begin();
@@ -707,7 +707,7 @@ namespace pcr
         return ( NULL != _out_rpLine.get() );
     }
 
-    //------------------------------------------------------------------------
+
     void OBrowserListBox::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable )
     {
         BrowserLinePointer pLine;
@@ -715,7 +715,7 @@ namespace pcr
             pLine->EnablePropertyControls( _nControls, _bEnable );
     }
 
-    //------------------------------------------------------------------------
+
     void OBrowserListBox::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable )
     {
         BrowserLinePointer pLine;
@@ -723,7 +723,7 @@ namespace pcr
             pLine->EnablePropertyLine( _bEnable );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XPropertyControl > OBrowserListBox::GetPropertyControl( const OUString& _rEntryName )
     {
         BrowserLinePointer pLine;
@@ -732,7 +732,7 @@ namespace pcr
         return NULL;
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OBrowserListBox::InsertEntry(const OLineDescriptor& _rPropertyData, sal_uInt16 _nPos)
     {
         // create a new line
@@ -773,13 +773,13 @@ namespace pcr
         return nInsertPos;
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OBrowserListBox::GetMinimumWidth()
     {
         return m_nTheNameSize + 2 * FRAME_OFFSET + (m_nRowHeight - 4) * 8;
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OBrowserListBox::GetMinimumHeight()
     {
         // assume that we want to display 5 rows, at least
@@ -796,7 +796,7 @@ namespace pcr
         return nMinHeight;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::ShowEntry(sal_uInt16 _nPos)
     {
         if ( _nPos < m_aLines.size() )
@@ -815,7 +815,7 @@ namespace pcr
 
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::MoveThumbTo(sal_Int32 _nNewThumbPos)
     {
         // disable painting to prevent flicker
@@ -852,7 +852,7 @@ namespace pcr
         m_aLinesPlayground.Invalidate(INVALIDATE_CHILDREN);
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK(OBrowserListBox, ScrollHdl, ScrollBar*, _pScrollBar )
     {
         DBG_ASSERT(_pScrollBar == &m_aVScroll, "OBrowserListBox::ScrollHdl: where does this come from?");
@@ -888,7 +888,7 @@ namespace pcr
         return 0;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::buttonClicked( OBrowserLine* _pLine, sal_Bool _bPrimary )
     {
         DBG_ASSERT( _pLine, "OBrowserListBox::buttonClicked: invalid browser line!" );
@@ -898,7 +898,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::impl_setControlAsPropertyValue( const ListBoxLine& _rLine, const Any& _rPropertyValue )
     {
         Reference< XPropertyControl > xControl( _rLine.pLine->getControl() );
@@ -934,7 +934,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Any OBrowserListBox::impl_getControlAsPropertyValue( const ListBoxLine& _rLine ) const
     {
         Reference< XPropertyControl > xControl( _rLine.pLine->getControl() );
@@ -963,7 +963,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OBrowserListBox::impl_getControlPos( const Reference< XPropertyControl >& _rxControl ) const
     {
         for ( ListBoxLines::const_iterator search = m_aLines.begin(); search != m_aLines.end(); ++search )
@@ -974,7 +974,7 @@ namespace pcr
         return (sal_uInt16)-1;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OBrowserListBox::focusGained( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException)
     {
         DBG_TESTSOLARMUTEX();
@@ -990,7 +990,7 @@ namespace pcr
         ShowEntry( impl_getControlPos( m_xActiveControl ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OBrowserListBox::valueChanged( const Reference< XPropertyControl >& _rxControl ) throw (RuntimeException)
     {
         DBG_TESTSOLARMUTEX();
@@ -1012,7 +1012,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OBrowserListBox::activateNextControl( const Reference< XPropertyControl >& _rxCurrentControl ) throw (RuntimeException)
     {
         DBG_TESTSOLARMUTEX();
@@ -1033,7 +1033,7 @@ namespace pcr
             m_aLines[0].pLine->GrabFocus();
     }
 
-    //------------------------------------------------------------------
+
     namespace
     {
         //..............................................................
@@ -1055,7 +1055,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::Clear()
     {
         for ( ListBoxLines::iterator loop = m_aLines.begin(); loop != m_aLines.end(); ++loop )
@@ -1069,7 +1069,7 @@ namespace pcr
         clearContainer( m_aLines );
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool OBrowserListBox::RemoveEntry( const OUString& _rName )
     {
         sal_uInt16 nPos = 0;
@@ -1091,7 +1091,7 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserListBox::ChangeEntry( const OLineDescriptor& _rPropertyData, sal_uInt16 nPos )
     {
         OSL_PRECOND( _rPropertyData.Control.is(), "OBrowserListBox::ChangeEntry: invalid control!" );
@@ -1206,7 +1206,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     bool OBrowserListBox::PreNotify( NotifyEvent& _rNEvt )
     {
         switch ( _rNEvt.GetType() )
@@ -1264,7 +1264,7 @@ namespace pcr
         return Control::PreNotify( _rNEvt );
     }
 
-    //------------------------------------------------------------------
+
     bool OBrowserListBox::Notify( NotifyEvent& _rNEvt )
     {
         switch ( _rNEvt.GetType() )
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index a46c97c3b78f..f30b4af85b45 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -32,7 +32,7 @@ namespace pcr
     //==================================================================
     // class OBrowserPage
     //==================================================================
-    //------------------------------------------------------------------
+
     OBrowserPage::OBrowserPage(Window* pParent,WinBits nWinStyle)
             :TabPage(pParent,nWinStyle)
             ,m_aListBox(this)
@@ -42,12 +42,12 @@ namespace pcr
         m_aListBox.Show();
     }
 
-    //------------------------------------------------------------------
+
     OBrowserPage::~OBrowserPage()
     {
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserPage::Resize()
     {
         Size aSize( GetOutputSizePixel() );
@@ -56,19 +56,19 @@ namespace pcr
         m_aListBox.SetPosSizePixel( Point( LAYOUT_BORDER_LEFT, LAYOUT_BORDER_TOP ), aSize );
     }
 
-    //------------------------------------------------------------------
+
     OBrowserListBox& OBrowserPage::getListBox()
     {
         return m_aListBox;
     }
 
-    //------------------------------------------------------------------
+
     const OBrowserListBox& OBrowserPage::getListBox() const
     {
         return m_aListBox;
     }
 
-    //------------------------------------------------------------------
+
     void OBrowserPage::StateChanged(StateChangedType nType)
     {
         Window::StateChanged( nType);
@@ -76,13 +76,13 @@ namespace pcr
             m_aListBox.ActivateListBox(IsVisible());
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OBrowserPage::getMinimumWidth()
     {
         return m_aListBox.GetMinimumWidth() + LAYOUT_BORDER_LEFT + LAYOUT_BORDER_RIGHT;
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OBrowserPage::getMinimumHeight()
     {
         return m_aListBox.GetMinimumHeight() + LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM;
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index cec411bb3273..070092c478fb 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -36,7 +36,7 @@ namespace pcr
     //= class OPropertyBrowserView
     //========================================================================
     DBG_NAME(OPropertyBrowserView)
-    //------------------------------------------------------------------------
+
     OPropertyBrowserView::OPropertyBrowserView(Window* _pParent, WinBits nBits)
                   :Window(_pParent, nBits | WB_3DLOOK)
                   ,m_nActivePage(0)
@@ -50,7 +50,7 @@ namespace pcr
         m_pPropBox->Show();
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OPropertyBrowserView, OnPageActivation)
     {
         m_nActivePage = m_pPropBox->GetCurPage();
@@ -59,7 +59,7 @@ namespace pcr
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     OPropertyBrowserView::~OPropertyBrowserView()
     {
         if(m_pPropBox)
@@ -74,14 +74,14 @@ namespace pcr
         DBG_DTOR(OPropertyBrowserView, NULL);
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserView::activatePage(sal_uInt16 _nPage)
     {
         m_nActivePage = _nPage;
         getPropertyBox().SetPage(m_nActivePage);
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserView::GetFocus()
     {
         if (m_pPropBox)
@@ -90,7 +90,7 @@ namespace pcr
             Window::GetFocus();
     }
 
-    //------------------------------------------------------------------------
+
     bool OPropertyBrowserView::Notify( NotifyEvent& _rNEvt )
     {
         if ( EVENT_KEYINPUT == _rNEvt.GetType() )
@@ -106,7 +106,7 @@ namespace pcr
         return Window::Notify( _rNEvt );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserView::Resize()
     {
         Size aSize = GetOutputSizePixel();
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 4f7446bcde69..9717aa30ca24 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/form/inspection/FormComponentPropertyHandler.hpp>
 #include <tools/debug.hxx>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ButtonNavigationHandler()
 {
     ::pcr::ButtonNavigationHandler::registerImplementation();
@@ -47,7 +47,7 @@ namespace pcr
     //= ButtonNavigationHandler
     //====================================================================
     DBG_NAME( ButtonNavigationHandler )
-    //--------------------------------------------------------------------
+
     ButtonNavigationHandler::ButtonNavigationHandler( const Reference< XComponentContext >& _rxContext )
         :ButtonNavigationHandler_Base( _rxContext )
     {
@@ -56,19 +56,19 @@ namespace pcr
         m_xSlaveHandler = css::form::inspection::FormComponentPropertyHandler::create( m_xContext );
     }
 
-    //--------------------------------------------------------------------
+
     ButtonNavigationHandler::~ButtonNavigationHandler( )
     {
         DBG_DTOR( ButtonNavigationHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL ButtonNavigationHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.ButtonNavigationHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ButtonNavigationHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -76,14 +76,14 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ButtonNavigationHandler::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException)
     {
         ButtonNavigationHandler_Base::inspect( _rxIntrospectee );
         m_xSlaveHandler->inspect( _rxIntrospectee );
     }
 
-    //--------------------------------------------------------------------
+
     PropertyState  SAL_CALL ButtonNavigationHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -112,7 +112,7 @@ namespace pcr
         return eState;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL ButtonNavigationHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -143,7 +143,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ButtonNavigationHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -169,7 +169,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ButtonNavigationHandler::isNavigationCapableButton( const Reference< XPropertySet >& _rxComponent )
     {
         Reference< XPropertySetInfo > xPSI;
@@ -181,7 +181,7 @@ namespace pcr
             && xPSI->hasPropertyByName( PROPERTY_BUTTONTYPE );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL ButtonNavigationHandler::doDescribeSupportedProperties() const
     {
         ::std::vector< Property > aProperties;
@@ -197,7 +197,7 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ButtonNavigationHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         Sequence< OUString > aActuating( 2 );
@@ -206,7 +206,7 @@ namespace pcr
         return aActuating;
     }
 
-    //--------------------------------------------------------------------
+
     InteractiveSelectionResult SAL_CALL ButtonNavigationHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -227,7 +227,7 @@ namespace pcr
         return eReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ButtonNavigationHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -253,7 +253,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL ButtonNavigationHandler::describePropertyLine( const OUString& _rPropertyName, const Reference< XPropertyControlFactory >& _rxControlFactory ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 5aa52a448578..aad30a032594 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/inspection/XObjectInspectorUI.hpp>
 #include <tools/debug.hxx>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_CellBindingPropertyHandler()
 {
     ::pcr::CellBindingPropertyHandler::registerImplementation();
@@ -52,7 +52,7 @@ namespace pcr
     //= CellBindingPropertyHandler
     //====================================================================
     DBG_NAME( CellBindingPropertyHandler )
-    //--------------------------------------------------------------------
+
     CellBindingPropertyHandler::CellBindingPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :CellBindingPropertyHandler_Base( _rxContext )
         ,m_pCellExchangeConverter( new DefaultEnumRepresentation( *m_pInfoService, ::getCppuType( static_cast< sal_Int16* >( NULL ) ), PROPERTY_ID_CELL_EXCHANGE_TYPE ) )
@@ -60,13 +60,13 @@ namespace pcr
         DBG_CTOR( CellBindingPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL CellBindingPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.CellBindingPropertyHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -74,7 +74,7 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     void CellBindingPropertyHandler::onNewComponent()
     {
         PropertyHandlerComponent::onNewComponent();
@@ -85,13 +85,13 @@ namespace pcr
             m_pHelper.reset( new CellBindingHelper( m_xComponent, xDocument ) );
     }
 
-    //--------------------------------------------------------------------
+
     CellBindingPropertyHandler::~CellBindingPropertyHandler( )
     {
         DBG_DTOR( CellBindingPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL CellBindingPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         Sequence< OUString > aInterestingProperties( 3 );
@@ -101,7 +101,7 @@ namespace pcr
         return aInterestingProperties;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CellBindingPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -201,7 +201,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void CellBindingPropertyHandler::impl_updateDependentProperty_nothrow( PropertyId _nPropId, const Reference< XObjectInspectorUI >& _rxInspectorUI ) const
     {
         try
@@ -229,7 +229,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL CellBindingPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -275,7 +275,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CellBindingPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -347,7 +347,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL CellBindingPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -395,7 +395,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL CellBindingPropertyHandler::convertToControlValue( const OUString& _rPropertyName,
         const Any& _rPropertyValue, const Type& /*_rControlValueType*/ ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -450,7 +450,7 @@ namespace pcr
         return aControlValue;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL CellBindingPropertyHandler::doDescribeSupportedProperties() const
     {
         ::std::vector< Property > aProperties;
diff --git a/extensions/source/propctrlr/cellbindinghelper.cxx b/extensions/source/propctrlr/cellbindinghelper.cxx
index 8339951fe390..07a0ccb9865a 100644
--- a/extensions/source/propctrlr/cellbindinghelper.cxx
+++ b/extensions/source/propctrlr/cellbindinghelper.cxx
@@ -78,7 +78,7 @@ namespace pcr
     //========================================================================
     //= CellBindingHelper
     //========================================================================
-    //------------------------------------------------------------------------
+
     CellBindingHelper::CellBindingHelper( const Reference< XPropertySet >& _rxControlModel, const Reference< XModel >& _rxContextDocument )
         :m_xControlModel( _rxControlModel )
     {
@@ -91,13 +91,13 @@ namespace pcr
             "CellBindingHelper::CellBindingHelper: the document cannot convert address representations!" );
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool CellBindingHelper::isSpreadsheetDocument( const Reference< XModel >& _rxContextDocument )
     {
         return Reference< XSpreadsheetDocument >::query( _rxContextDocument ).is();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int16 CellBindingHelper::getControlSheetIndex( Reference< XSpreadsheet >& _out_rxSheet ) const
     {
         sal_Int16 nSheetIndex = -1;
@@ -146,7 +146,7 @@ namespace pcr
         return nSheetIndex;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription, CellAddress& /* [out] */ _rAddress ) const
     {
         Any aAddress;
@@ -160,7 +160,7 @@ namespace pcr
            &&  ( aAddress >>= _rAddress );
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::doConvertAddressRepresentations( const OUString& _rInputProperty, const Any& _rInputValue,
         const OUString& _rOutputProperty, Any& _rOutputValue, bool _bIsRange ) const SAL_THROW(())
     {
@@ -194,7 +194,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::convertStringAddress( const OUString& _rAddressDescription,
                             CellRangeAddress& /* [out] */ _rAddress ) const
     {
@@ -209,7 +209,7 @@ namespace pcr
            &&  ( aAddress >>= _rAddress );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XValueBinding > CellBindingHelper::createCellBindingFromAddress( const CellAddress& _rAddress, bool _bSupportIntegerExchange ) const
     {
         Reference< XValueBinding > xBinding( createDocumentDependentInstance(
@@ -221,7 +221,7 @@ namespace pcr
         return xBinding;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XValueBinding > CellBindingHelper::createCellBindingFromStringAddress( const OUString& _rAddress, bool _bSupportIntegerExchange ) const
     {
         Reference< XValueBinding > xBinding;
@@ -237,7 +237,7 @@ namespace pcr
         return createCellBindingFromAddress( aAddress, _bSupportIntegerExchange );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XListEntrySource > CellBindingHelper::createCellListSourceFromStringAddress( const OUString& _rAddress ) const
     {
         Reference< XListEntrySource > xSource;
@@ -256,7 +256,7 @@ namespace pcr
         return xSource;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XInterface > CellBindingHelper::createDocumentDependentInstance( const OUString& _rService, const OUString& _rArgumentName,
         const Any& _rArgumentValue ) const
     {
@@ -292,7 +292,7 @@ namespace pcr
         return xReturn;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::getAddressFromCellBinding(
         const Reference< XValueBinding >& _rxBinding, CellAddress& _rAddress ) const
     {
@@ -321,7 +321,7 @@ namespace pcr
         return bReturn;
     }
 
-    //------------------------------------------------------------------------
+
     OUString CellBindingHelper::getStringAddressFromCellBinding( const Reference< XValueBinding >& _rxBinding ) const
     {
         CellAddress aAddress;
@@ -338,7 +338,7 @@ namespace pcr
         return sAddress;
     }
 
-    //------------------------------------------------------------------------
+
     OUString CellBindingHelper::getStringAddressFromCellListSource( const Reference< XListEntrySource >& _rxSource ) const
     {
         OSL_PRECOND( !_rxSource.is() || isCellRangeListSource( _rxSource ), "CellBindingHelper::getStringAddressFromCellListSource: this is no cell list source!" );
@@ -371,7 +371,7 @@ namespace pcr
         return sAddress;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isSpreadsheetDocumentWhichSupplies( const OUString& _rService ) const
     {
         bool bYesItIs = false;
@@ -400,7 +400,7 @@ namespace pcr
         return bYesItIs;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isListCellRangeAllowed( ) const
     {
         bool bAllow( false );
@@ -414,7 +414,7 @@ namespace pcr
         return bAllow;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isCellIntegerBindingAllowed( ) const
     {
         bool bAllow( true );
@@ -451,7 +451,7 @@ namespace pcr
         return bAllow;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isCellBindingAllowed( ) const
     {
         bool bAllow( false );
@@ -485,25 +485,25 @@ namespace pcr
         return bAllow;
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isCellBinding( const Reference< XValueBinding >& _rxBinding ) const
     {
         return doesComponentSupport( _rxBinding.get(), SERVICE_SHEET_CELL_BINDING );
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isCellIntegerBinding( const Reference< XValueBinding >& _rxBinding ) const
     {
         return doesComponentSupport( _rxBinding.get(), SERVICE_SHEET_CELL_INT_BINDING );
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::isCellRangeListSource( const Reference< XListEntrySource >& _rxSource ) const
     {
         return doesComponentSupport( _rxSource.get(), SERVICE_SHEET_CELLRANGE_LISTSOURCE );
     }
 
-    //------------------------------------------------------------------------
+
     bool CellBindingHelper::doesComponentSupport( const Reference< XInterface >& _rxComponent, const OUString& _rService ) const
     {
         Reference< XServiceInfo > xSI( _rxComponent, UNO_QUERY );
@@ -511,7 +511,7 @@ namespace pcr
         return bDoes;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XValueBinding > CellBindingHelper::getCurrentBinding( ) const
     {
         Reference< XValueBinding > xBinding;
@@ -521,7 +521,7 @@ namespace pcr
         return xBinding;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XListEntrySource > CellBindingHelper::getCurrentListSource( ) const
     {
         Reference< XListEntrySource > xSource;
@@ -531,7 +531,7 @@ namespace pcr
         return xSource;
     }
 
-    //------------------------------------------------------------------------
+
     void CellBindingHelper::setBinding( const Reference< XValueBinding >& _rxBinding )
     {
         Reference< XBindableValue > xBindable( m_xControlModel, UNO_QUERY );
@@ -540,7 +540,7 @@ namespace pcr
             xBindable->setValueBinding( _rxBinding );
     }
 
-    //------------------------------------------------------------------------
+
     void CellBindingHelper::setListSource( const Reference< XListEntrySource >& _rxSource )
     {
         Reference< XListEntrySink > xSink( m_xControlModel, UNO_QUERY );
diff --git a/extensions/source/propctrlr/commoncontrol.cxx b/extensions/source/propctrlr/commoncontrol.cxx
index 49be61875ef7..218348fb8862 100644
--- a/extensions/source/propctrlr/commoncontrol.cxx
+++ b/extensions/source/propctrlr/commoncontrol.cxx
@@ -39,7 +39,7 @@ namespace pcr
     //==================================================================
     //= ControlHelper
     //==================================================================
-    //------------------------------------------------------------------
+
     ControlHelper::ControlHelper( Window* _pControlWindow, sal_Int16 _nControlType, XPropertyControl& _rAntiImpl, IModifyListener* _pModifyListener )
         :m_pControlWindow( _pControlWindow )
         ,m_nControlType( _nControlType )
@@ -50,42 +50,42 @@ namespace pcr
         DBG_ASSERT( m_pControlWindow != NULL, "ControlHelper::ControlHelper: invalid window!" );
     }
 
-    //------------------------------------------------------------------
+
     ControlHelper::~ControlHelper()
     {
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL ControlHelper::getControlType() throw (RuntimeException)
     {
         return m_nControlType;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertyControlContext > SAL_CALL ControlHelper::getControlContext() throw (RuntimeException)
     {
         return m_xContext;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ControlHelper::setControlContext( const Reference< XPropertyControlContext >& _controlcontext ) throw (RuntimeException)
     {
         m_xContext = _controlcontext;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XWindow > SAL_CALL ControlHelper::getControlWindow() throw (RuntimeException)
     {
         return VCLUnoHelper::GetInterface( m_pControlWindow );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL ControlHelper::isModified(  ) throw (RuntimeException)
     {
         return m_bModified;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ControlHelper::notifyModifiedValue(  ) throw (RuntimeException)
     {
         if ( isModified() && m_xContext.is() )
@@ -102,13 +102,13 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ControlHelper::dispose()
     {
         DELETEZ( m_pControlWindow );
     }
 
-    //------------------------------------------------------------------
+
     void ControlHelper::autoSizeWindow()
     {
         OSL_PRECOND( m_pControlWindow, "ControlHelper::autoSizeWindow: no window!" );
@@ -123,7 +123,7 @@ namespace pcr
         // of the browser listbox/line?
     }
 
-    //------------------------------------------------------------------
+
     void ControlHelper::impl_activateNextControl_nothrow() const
     {
         try
@@ -137,7 +137,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     bool ControlHelper::handlePreNotify(NotifyEvent& rNEvt)
     {
         if (EVENT_KEYINPUT == rNEvt.GetType())
@@ -155,7 +155,7 @@ namespace pcr
         return false;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( ControlHelper, ModifiedHdl, Window*, /*_pWin*/ )
     {
         if ( m_pModifyListener )
@@ -163,7 +163,7 @@ namespace pcr
         return 0;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( ControlHelper, GetFocusHdl, Window*, /*_pWin*/ )
     {
         try
@@ -178,7 +178,7 @@ namespace pcr
         return 0;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( ControlHelper, LoseFocusHdl, Window*, /*_pWin*/ )
     {
         // TODO/UNOize: should this be outside the default control's implementations? If somebody
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 1a32827c1e76..be598abf53f3 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -187,7 +187,7 @@ namespace pcr
         };
     };
 
-    //----------------------------------------------------------------
+
     CachedInspectorUI::CachedInspectorUI( ComposedPropertyUIUpdate& _rMaster, FNotifySingleUIChange _pUIChangeNotification )
         :m_refCount( 0 )
         ,m_bDisposed( false )
@@ -196,12 +196,12 @@ namespace pcr
     {
     }
 
-    //----------------------------------------------------------------
+
     CachedInspectorUI::~CachedInspectorUI()
     {
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::dispose()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -218,13 +218,13 @@ namespace pcr
         clearContainer( aDisabledElements );
     }
 
-    //----------------------------------------------------------------
+
     void SAL_CALL CachedInspectorUI::acquire() throw()
     {
         osl_atomic_increment( &m_refCount );
     }
 
-    //----------------------------------------------------------------
+
     void SAL_CALL CachedInspectorUI::release() throw()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -232,14 +232,14 @@ namespace pcr
     }
 
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::checkDisposed() const
     {
         if ( isDisposed() )
             throw DisposedException();
     }
 
-    //----------------------------------------------------------------
+
     namespace
     {
         void lcl_markStringKeyPositiveOrNegative( const OUString& _rKeyName, StringBag& _rPositives, StringBag& _rNegatives, sal_Bool _bMarkPositive )
@@ -255,7 +255,7 @@ namespace pcr
         }
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -266,7 +266,7 @@ namespace pcr
         impl_notifySingleUIChange();
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::impl_markElementEnabledOrDisabled( const OUString& _rPropertyName, sal_Int16 _nElementIdOrZero, sal_Bool _bEnable )
     {
         if ( _nElementIdOrZero == 0 )
@@ -280,13 +280,13 @@ namespace pcr
         );
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::impl_notifySingleUIChange() const
     {
         (m_rMaster.*m_pUIChangeNotification)();
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -300,7 +300,7 @@ namespace pcr
         impl_notifySingleUIChange();
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -312,7 +312,7 @@ namespace pcr
         impl_notifySingleUIChange();
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -326,7 +326,7 @@ namespace pcr
         impl_notifySingleUIChange();
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -337,7 +337,7 @@ namespace pcr
         impl_notifySingleUIChange();
     }
 
-    //----------------------------------------------------------------
+
     void CachedInspectorUI::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -346,7 +346,7 @@ namespace pcr
         impl_notifySingleUIChange();
     }
 
-    //----------------------------------------------------------------
+
     Reference< XPropertyControl > SAL_CALL CachedInspectorUI::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -356,7 +356,7 @@ namespace pcr
         return m_rMaster.getDelegatorUI()->getPropertyControl( _rPropertyName );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CachedInspectorUI::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
     {
         OSL_FAIL( "CachedInspectorUI::registerControlObserver: not expected to be called!" );
@@ -365,7 +365,7 @@ namespace pcr
         m_rMaster.getDelegatorUI()->registerControlObserver( _Observer );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CachedInspectorUI::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
     {
         OSL_FAIL( "CachedInspectorUI::revokeControlObserver: not expected to be called!" );
@@ -374,7 +374,7 @@ namespace pcr
         m_rMaster.getDelegatorUI()->revokeControlObserver( _Observer );
     }
 
-    //----------------------------------------------------------------
+
     void SAL_CALL CachedInspectorUI::setHelpSectionText( const OUString& _HelpText ) throw (NoSupportException, RuntimeException)
     {
         m_rMaster.getDelegatorUI()->setHelpSectionText( _HelpText );
@@ -395,7 +395,7 @@ namespace pcr
     //====================================================================
     //= ComposedPropertyUIUpdate
     //====================================================================
-    //----------------------------------------------------------------
+
     ComposedPropertyUIUpdate::ComposedPropertyUIUpdate( const Reference< XObjectInspectorUI >& _rxDelegatorUI,
         IPropertyExistenceCheck* _pPropertyCheck )
         :m_pCollectedUIs( new MapHandlerToUI )
@@ -407,12 +407,12 @@ namespace pcr
             throw NullPointerException();
     }
 
-    //----------------------------------------------------------------
+
     ComposedPropertyUIUpdate::~ComposedPropertyUIUpdate( )
     {
     }
 
-    //----------------------------------------------------------------
+
     Reference< XObjectInspectorUI > ComposedPropertyUIUpdate::getUIForPropertyHandler( const Reference< XPropertyHandler >& _rxHandler )
     {
         impl_checkDisposed();
@@ -423,7 +423,7 @@ namespace pcr
         return rUI.get();
     }
 
-    //----------------------------------------------------------------
+
     namespace
     {
         //============================================================
@@ -681,7 +681,7 @@ namespace pcr
         }
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_fireEnablePropertyUI_throw()
     {
         lcl_fireUIStateFlag(
@@ -692,7 +692,7 @@ namespace pcr
         );
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_fireRebuildPropertyUI_throw()
     {
         // collect all properties for which a rebuild request has been made
@@ -706,7 +706,7 @@ namespace pcr
         StringBagClearer::clearAll( m_pCollectedUIs->aHandlers, &CachedInspectorUI::getRebuiltProperties );
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_fireShowHidePropertyUI_throw()
     {
         // all properties which have been shown by at least one handler
@@ -726,7 +726,7 @@ namespace pcr
         PropertyUIOperator::forEach( aAllShown, m_xDelegatorUI, &XObjectInspectorUI::showPropertyUI );
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_fireShowCategory_throw()
     {
         lcl_fireUIStateFlag(
@@ -737,7 +737,7 @@ namespace pcr
         );
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_fireEnablePropertyUIElements_throw()
     {
         lcl_fireUIStateFlag(
@@ -762,7 +762,7 @@ namespace pcr
         );
     }
 
-    //--------------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_fireAll_throw()
     {
         OSL_PRECOND( !impl_isDisposed(), "ComposedPropertyUIUpdate::impl_fireAll_throw: already disposed, this will crash!" );
@@ -774,14 +774,14 @@ namespace pcr
         impl_fireEnablePropertyUIElements_throw();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ComposedPropertyUIUpdate::suspendAutoFire()
     {
         impl_checkDisposed();
         osl_atomic_increment( &m_nSuspendCounter );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ComposedPropertyUIUpdate::resumeAutoFire()
     {
         impl_checkDisposed();
@@ -789,28 +789,28 @@ namespace pcr
             impl_fireAll_throw();
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::impl_checkDisposed() const
     {
         if ( impl_isDisposed() )
             throw DisposedException();
     }
 
-    //----------------------------------------------------------------
+
     void ComposedPropertyUIUpdate::callback_inspectorUIChanged_throw()
     {
         if ( 0 == m_nSuspendCounter )
             impl_fireAll_throw();
     }
 
-    //----------------------------------------------------------------
+
     Reference< XObjectInspectorUI > ComposedPropertyUIUpdate::getDelegatorUI() const
     {
         impl_checkDisposed();
         return m_xDelegatorUI;
     }
 
-    //----------------------------------------------------------------
+
     void SAL_CALL ComposedPropertyUIUpdate::dispose()
     {
         if ( impl_isDisposed() )
@@ -829,7 +829,7 @@ namespace pcr
         m_xDelegatorUI.set( NULL );
     }
 
-    //----------------------------------------------------------------
+
     bool ComposedPropertyUIUpdate::shouldContinuePropertyHandling( const OUString& _rName ) const
     {
         if ( !m_pPropertyCheck )
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index ff6c2985a200..7b3b602ea1c3 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -41,7 +41,7 @@ namespace pcr
     //====================================================================
     //= OControlFontDialog
     //====================================================================
-    //---------------------------------------------------------------------
+
     OControlFontDialog::OControlFontDialog(const Reference< XComponentContext >& _rxContext )
         :OGenericUnoDialog( _rxContext )
         ,m_pFontItems(NULL)
@@ -53,7 +53,7 @@ namespace pcr
             &m_xControlModel, ::getCppuType(&m_xControlModel));
     }
 
-    //---------------------------------------------------------------------
+
     OControlFontDialog::~OControlFontDialog()
     {
         if (m_pDialog)
@@ -64,38 +64,38 @@ namespace pcr
         }
     }
 
-    //---------------------------------------------------------------------
+
     Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId(  ) throw(RuntimeException)
     {
         static ::cppu::OImplementationId aId;
         return aId.getImplementationId();
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OControlFontDialog::Create( const Reference< XComponentContext >& _rxContext )
     {
         return *( new OControlFontDialog( _rxContext ) );
     }
 
-    //---------------------------------------------------------------------
+
     OUString SAL_CALL OControlFontDialog::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //---------------------------------------------------------------------
+
     OUString OControlFontDialog::getImplementationName_static() throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.form.ui.OControlFontDialog");
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence SAL_CALL OControlFontDialog::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence OControlFontDialog::getSupportedServiceNames_static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
@@ -119,20 +119,20 @@ namespace pcr
             OControlFontDialog_DBase::initialize(aArguments);
     }
 
-    //---------------------------------------------------------------------
+
     Reference<XPropertySetInfo>  SAL_CALL OControlFontDialog::getPropertySetInfo() throw(RuntimeException)
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //---------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& OControlFontDialog::getInfoHelper()
     {
         return *const_cast<OControlFontDialog*>(this)->getArrayHelper();
     }
 
-    //--------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OControlFontDialog::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -140,7 +140,7 @@ namespace pcr
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
 
-    //--------------------------------------------------------------------------
+
     Dialog* OControlFontDialog::createDialog(Window* _pParent)
     {
         ControlCharacterDialog::createItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults);
@@ -156,14 +156,14 @@ namespace pcr
         return pDialog;
     }
 
-    //-------------------------------------------------------------------------
+
     void OControlFontDialog::destroyDialog()
     {
         OGenericUnoDialog::destroyDialog();
         ControlCharacterDialog::destroyItemSet(m_pFontItems, m_pItemPool, m_pItemPoolDefaults);
     }
 
-    //-------------------------------------------------------------------------
+
     void OControlFontDialog::executedDialog(sal_Int16 _nExecutionResult)
     {
         OSL_ENSURE(m_pDialog, "OControlFontDialog::executedDialog: no dialog anymore?!!");
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index 3169ea678234..897162231f37 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -31,7 +31,7 @@
 #include <osl/diagnose.h>
 #include <sal/macros.h>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_DefaultFormComponentInspectorModel()
 {
     ::pcr::OAutoRegistration< ::pcr::DefaultFormComponentInspectorModel > aAutoRegistration;
@@ -58,7 +58,7 @@ namespace pcr
     //====================================================================
     //= DefaultFormComponentInspectorModel
     //====================================================================
-    //--------------------------------------------------------------------
+
     DefaultFormComponentInspectorModel::DefaultFormComponentInspectorModel( bool _bUseFormFormComponentHandlers )
         :ImplInspectorModel()
         ,m_bUseFormComponentHandlers( _bUseFormFormComponentHandlers )
@@ -67,30 +67,30 @@ namespace pcr
     {
     }
 
-    //------------------------------------------------------------------------
+
     DefaultFormComponentInspectorModel::~DefaultFormComponentInspectorModel()
     {
     }
 
-    //------------------------------------------------------------------------
+
     OUString SAL_CALL DefaultFormComponentInspectorModel::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL DefaultFormComponentInspectorModel::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //------------------------------------------------------------------------
+
     OUString DefaultFormComponentInspectorModel::getImplementationName_static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.extensions.DefaultFormComponentInspectorModel");
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > DefaultFormComponentInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -98,13 +98,13 @@ namespace pcr
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL DefaultFormComponentInspectorModel::Create( const Reference< XComponentContext >& )
     {
         return *new DefaultFormComponentInspectorModel();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Any > SAL_CALL DefaultFormComponentInspectorModel::getHandlerFactories() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -159,7 +159,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultFormComponentInspectorModel::describeCategories(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -188,7 +188,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultFormComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         sal_Int32 nPropertyId( m_pInfoService->getPropertyId( _rPropertyName ) );
@@ -204,7 +204,7 @@ namespace pcr
         return m_pInfoService->getPropertyPos( nPropertyId );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultFormComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         if ( m_bConstructed )
@@ -229,13 +229,13 @@ namespace pcr
         throw IllegalArgumentException( OUString(), *this, 0 );
     }
 
-    //--------------------------------------------------------------------
+
     void DefaultFormComponentInspectorModel::createDefault()
     {
         m_bConstructed = true;
     }
 
-    //--------------------------------------------------------------------
+
     void DefaultFormComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines )
     {
         if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) )
diff --git a/extensions/source/propctrlr/defaulthelpprovider.cxx b/extensions/source/propctrlr/defaulthelpprovider.cxx
index f9257ddf95fe..cdb74d3ec235 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.cxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.cxx
@@ -30,7 +30,7 @@
 #include <vcl/window.hxx>
 #include <tools/diagnose_ex.h>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_DefaultHelpProvider()
 {
     ::pcr::OAutoRegistration< ::pcr::DefaultHelpProvider > aAutoRegistration;
@@ -60,24 +60,24 @@ namespace pcr
     //====================================================================
     //= DefaultHelpProvider
     //====================================================================
-    //--------------------------------------------------------------------
+
     DefaultHelpProvider::DefaultHelpProvider()
         :m_bConstructed( false )
     {
     }
 
-    //--------------------------------------------------------------------
+
     DefaultHelpProvider::~DefaultHelpProvider()
     {
     }
 
-    //------------------------------------------------------------------------
+
     OUString DefaultHelpProvider::getImplementationName_static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.extensions.DefaultHelpProvider");
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > DefaultHelpProvider::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -85,13 +85,13 @@ namespace pcr
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL DefaultHelpProvider::Create( const Reference< XComponentContext >& )
     {
         return *new DefaultHelpProvider;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultHelpProvider::focusGained( const Reference< XPropertyControl >& _Control ) throw (RuntimeException)
     {
         if ( !m_xInspectorUI.is() )
@@ -107,13 +107,13 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultHelpProvider::valueChanged( const Reference< XPropertyControl >& /*_Control*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultHelpProvider::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         if ( m_bConstructed )
@@ -130,7 +130,7 @@ namespace pcr
         throw IllegalArgumentException( OUString(), *this, 0 );
     }
 
-    //--------------------------------------------------------------------
+
     void DefaultHelpProvider::create( const Reference< XObjectInspectorUI >& _rxUI )
     {
         if ( !_rxUI.is() )
@@ -149,7 +149,7 @@ namespace pcr
         m_bConstructed = true;
     }
 
-    //--------------------------------------------------------------------
+
     Window* DefaultHelpProvider::impl_getVclControlWindow_nothrow( const Reference< XPropertyControl >& _rxControl )
     {
         Window* pControlWindow = NULL;
@@ -170,7 +170,7 @@ namespace pcr
         return pControlWindow;
     }
 
-    //--------------------------------------------------------------------
+
     OUString DefaultHelpProvider::impl_getHelpText_nothrow( const Reference< XPropertyControl >& _rxControl )
     {
         OUString sHelpText;
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index 7e00aac66e20..16a555f388c2 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -28,7 +28,7 @@
 #define TEXTTYPE_MULTILINE      1
 #define TEXTTYPE_RICHTEXT       2
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_EditPropertyHandler()
 {
     ::pcr::EditPropertyHandler::registerImplementation();
@@ -50,26 +50,26 @@ namespace pcr
     //= EditPropertyHandler
     //====================================================================
     DBG_NAME( EditPropertyHandler )
-    //--------------------------------------------------------------------
+
     EditPropertyHandler::EditPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :EditPropertyHandler_Base( _rxContext )
     {
         DBG_CTOR( EditPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     EditPropertyHandler::~EditPropertyHandler( )
     {
         DBG_DTOR( EditPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL EditPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.EditPropertyHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EditPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -77,7 +77,7 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EditPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -133,7 +133,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EditPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -186,7 +186,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool EditPropertyHandler::implHaveBothScrollBarProperties() const
     {
         // have a "Scrollbars" property if the object supports both "HScroll" and "VScroll"
@@ -199,7 +199,7 @@ namespace pcr
             && xPSI->hasPropertyByName( PROPERTY_VSCROLL );
     }
 
-    //--------------------------------------------------------------------
+
     bool EditPropertyHandler::implHaveTextTypeProperty() const
     {
         // have a "Scrollbars" property if the object supports both "HScroll" and "VScroll"
@@ -212,7 +212,7 @@ namespace pcr
             && xPSI->hasPropertyByName( PROPERTY_MULTILINE );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL EditPropertyHandler::doDescribeSupportedProperties() const
     {
         ::std::vector< Property > aProperties;
@@ -228,7 +228,7 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EditPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -248,7 +248,7 @@ namespace pcr
         return Sequence< OUString >( &(*aSuperseded.begin()), aSuperseded.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EditPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -259,7 +259,7 @@ namespace pcr
         return Sequence< OUString >( &(*aInterestingActuatingProps.begin()), aInterestingActuatingProps.size() );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EditPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index 101ee1a40c42..aaef4080ccb1 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -55,7 +55,7 @@ namespace pcr
     //====================================================================
     namespace
     {
-        //--------------------------------------------------------------------
+
         OUString composeModelElementUIName( const OUString& _rModelName, const OUString& _rElementName )
         {
             OUStringBuffer aBuffer;
@@ -70,7 +70,7 @@ namespace pcr
     //====================================================================
     //= EFormsHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     EFormsHelper::EFormsHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxControlModel, const Reference< frame::XModel >& _rxContextDocument )
         :m_xControlModel( _rxControlModel )
         ,m_aPropertyListeners( _rMutex )
@@ -83,7 +83,7 @@ namespace pcr
 
     }
 
-    //--------------------------------------------------------------------
+
     bool EFormsHelper::isEForm( const Reference< frame::XModel >& _rxContextDocument )
     {
         try
@@ -101,7 +101,7 @@ namespace pcr
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool EFormsHelper::canBindToDataType( sal_Int32 _nDataType ) const SAL_THROW(())
     {
         if ( !m_xBindableControl.is() )
@@ -195,7 +195,7 @@ namespace pcr
         return bCan;
     }
 
-    //--------------------------------------------------------------------
+
     bool EFormsHelper::isListEntrySink() const SAL_THROW(())
     {
         bool bIs = false;
@@ -211,7 +211,7 @@ namespace pcr
         return bIs;
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::impl_switchBindingListening_throw( bool _bDoListening, const Reference< XPropertyChangeListener >& _rxListener )
     {
         Reference< XPropertySet > xBindingProps;
@@ -230,7 +230,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::registerBindingListener( const Reference< XPropertyChangeListener >& _rxBindingListener )
     {
         if ( !_rxBindingListener.is() )
@@ -238,7 +238,7 @@ namespace pcr
         impl_toggleBindingPropertyListening_throw( true, _rxBindingListener );
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::impl_toggleBindingPropertyListening_throw( bool _bDoListen, const Reference< XPropertyChangeListener >& _rxConcreteListenerOrNull )
     {
         if ( !_bDoListen )
@@ -291,13 +291,13 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::revokeBindingListener( const Reference< XPropertyChangeListener >& _rxBindingListener )
     {
         impl_toggleBindingPropertyListening_throw( false, _rxBindingListener );
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::getFormModelNames( ::std::vector< OUString >& /* [out] */ _rModelNames ) const SAL_THROW(())
     {
         if ( m_xDocument.is() )
@@ -324,7 +324,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::getBindingNames( const OUString& _rModelName, ::std::vector< OUString >& /* [out] */ _rBindingNames ) const SAL_THROW(())
     {
         _rBindingNames.resize( 0 );
@@ -349,7 +349,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< xforms::XModel > EFormsHelper::getFormModelByName( const OUString& _rModelName ) const SAL_THROW(())
     {
         Reference< xforms::XModel > xReturn;
@@ -367,7 +367,7 @@ namespace pcr
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< xforms::XModel > EFormsHelper::getCurrentFormModel() const SAL_THROW(())
     {
         Reference< xforms::XModel > xModel;
@@ -386,7 +386,7 @@ namespace pcr
         return xModel;
     }
 
-    //--------------------------------------------------------------------
+
     OUString EFormsHelper::getCurrentFormModelName() const SAL_THROW(())
     {
         OUString sModelName;
@@ -403,7 +403,7 @@ namespace pcr
         return sModelName;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySet > EFormsHelper::getCurrentBinding() const SAL_THROW(())
     {
         Reference< XPropertySet > xBinding;
@@ -421,7 +421,7 @@ namespace pcr
         return xBinding;
     }
 
-    //--------------------------------------------------------------------
+
     OUString EFormsHelper::getCurrentBindingName() const SAL_THROW(())
     {
         OUString sBindingName;
@@ -438,7 +438,7 @@ namespace pcr
         return sBindingName;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XListEntrySource > EFormsHelper::getCurrentListSourceBinding() const SAL_THROW(())
     {
         Reference< XListEntrySource > xReturn;
@@ -456,7 +456,7 @@ namespace pcr
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::setListSourceBinding( const Reference< XListEntrySource >& _rxListSource ) SAL_THROW(())
     {
         try
@@ -472,7 +472,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::setBinding( const Reference< ::com::sun::star::beans::XPropertySet >& _rxBinding ) SAL_THROW(())
     {
         if ( !m_xBindableControl.is() )
@@ -498,14 +498,14 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySet > EFormsHelper::getOrCreateBindingForModel( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(())
     {
         OSL_ENSURE( !_rBindingName.isEmpty(), "EFormsHelper::getOrCreateBindingForModel: invalid binding name!" );
         return implGetOrCreateBinding( _rTargetModel, _rBindingName );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySet > EFormsHelper::implGetOrCreateBinding( const OUString& _rTargetModel, const OUString& _rBindingName ) const SAL_THROW(())
     {
         OSL_ENSURE( !( _rTargetModel.isEmpty() && !_rBindingName.isEmpty() ), "EFormsHelper::implGetOrCreateBinding: no model, but a binding name?" );
@@ -573,7 +573,7 @@ namespace pcr
         return xBinding;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -608,7 +608,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString EFormsHelper::getModelElementUIName( const EFormsHelper::ModelElementType _eType, const Reference< XPropertySet >& _rxElement ) const SAL_THROW(())
     {
         OUString sUIName;
@@ -634,7 +634,7 @@ namespace pcr
         return sUIName;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySet > EFormsHelper::getModelElementFromUIName( const EFormsHelper::ModelElementType _eType, const OUString& _rUIName ) const SAL_THROW(())
     {
         const MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames );
@@ -644,7 +644,7 @@ namespace pcr
         return ( pos != rMapUINameToElement.end() ) ? pos->second : Reference< XPropertySet >();
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::getAllElementUINames( const ModelElementType _eType, ::std::vector< OUString >& /* [out] */ _rElementNames, bool _bPrepentEmptyEntry )
     {
         MapStringToPropertySet& rMapUINameToElement( ( _eType == Submission ) ? m_aSubmissionUINames : m_aBindingUINames );
@@ -710,7 +710,7 @@ namespace pcr
         ::std::transform( rMapUINameToElement.begin(), rMapUINameToElement.end(), _rElementNames.begin(), ::o3tl::select1st< MapStringToPropertySet::value_type >() );
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::firePropertyChange( const OUString& _rName, const Any& _rOldValue, const Any& _rNewValue ) const
     {
         if ( m_aPropertyListeners.empty() )
@@ -736,7 +736,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsHelper::firePropertyChanges( const Reference< XPropertySet >& _rxOldProps, const Reference< XPropertySet >& _rxNewProps, ::std::set< OUString >& _rFilter ) const
     {
         if ( m_aPropertyListeners.empty() )
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 4eb799677624..e6d55943009b 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -32,7 +32,7 @@
 
 #include <functional>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_EFormsPropertyHandler()
 {
     ::pcr::EFormsPropertyHandler::registerImplementation();
@@ -57,7 +57,7 @@ namespace pcr
     //= EFormsPropertyHandler
     //====================================================================
     DBG_NAME( EFormsPropertyHandler )
-    //--------------------------------------------------------------------
+
     EFormsPropertyHandler::EFormsPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :EFormsPropertyHandler_Base( _rxContext )
         ,m_bSimulatingModelChange( false )
@@ -65,19 +65,19 @@ namespace pcr
         DBG_CTOR( EFormsPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     EFormsPropertyHandler::~EFormsPropertyHandler( )
     {
         DBG_DTOR( EFormsPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL EFormsPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.EFormsPropertyHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -85,7 +85,7 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     OUString EFormsPropertyHandler::getModelNamePropertyValue() const
     {
         OUString sModelName = m_pHelper->getCurrentFormModelName();
@@ -94,7 +94,7 @@ namespace pcr
         return sModelName;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EFormsPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -157,7 +157,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EFormsPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -271,7 +271,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void EFormsPropertyHandler::onNewComponent()
     {
         EFormsPropertyHandler_Base::onNewComponent();
@@ -284,7 +284,7 @@ namespace pcr
             m_pHelper.reset();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL EFormsPropertyHandler::doDescribeSupportedProperties() const
     {
         ::std::vector< Property > aProperties;
@@ -315,7 +315,7 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EFormsPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -348,7 +348,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL EFormsPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -381,7 +381,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EFormsPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -394,7 +394,7 @@ namespace pcr
         return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL EFormsPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -406,7 +406,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL EFormsPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
@@ -473,7 +473,7 @@ namespace pcr
         return aDescriptor;
     }
 
-    //--------------------------------------------------------------------
+
     InteractiveSelectionResult SAL_CALL EFormsPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -532,7 +532,7 @@ namespace pcr
         return InteractiveSelectionResult_Cancelled;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EFormsPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -541,7 +541,7 @@ namespace pcr
             m_pHelper->registerBindingListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EFormsPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -550,7 +550,7 @@ namespace pcr
         EFormsPropertyHandler_Base::removePropertyChangeListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL EFormsPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 1692ab554fff..59fb8a8ddf93 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -94,7 +94,7 @@ namespace pcr
                             sal_Bool _bForceInvalidation = sal_False);
     };
 
-    //------------------------------------------------------------------------
+
     OFontPropertyExtractor::OFontPropertyExtractor(const Reference< XPropertySet >& _rxProps)
         :m_xPropValueAccess(_rxProps)
         ,m_xPropStateAccess(_rxProps, UNO_QUERY)
@@ -102,7 +102,7 @@ namespace pcr
         OSL_ENSURE(m_xPropValueAccess.is(), "OFontPropertyExtractor::OFontPropertyExtractor: invalid property set!");
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool OFontPropertyExtractor::getCheckFontProperty(const OUString& _rPropName, Any& _rValue)
     {
         _rValue = m_xPropValueAccess->getPropertyValue(_rPropName);
@@ -112,7 +112,7 @@ namespace pcr
         return sal_False;
     }
 
-    //------------------------------------------------------------------------
+
     OUString OFontPropertyExtractor::getStringFontProperty(const OUString& _rPropName, const OUString& _rDefault)
     {
         Any aValue;
@@ -122,7 +122,7 @@ namespace pcr
         return ::comphelper::getString(aValue);
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int16 OFontPropertyExtractor::getInt16FontProperty(const OUString& _rPropName, const sal_Int16 _nDefault)
     {
         Any aValue;
@@ -134,7 +134,7 @@ namespace pcr
         return (sal_Int16)nValue;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int32 OFontPropertyExtractor::getInt32FontProperty(const OUString& _rPropName, const sal_Int32 _nDefault)
     {
         Any aValue;
@@ -146,7 +146,7 @@ namespace pcr
         return nValue;
     }
 
-    //------------------------------------------------------------------------
+
     float OFontPropertyExtractor::getFloatFontProperty(const OUString& _rPropName, const float _nDefault)
     {
         Any aValue;
@@ -156,7 +156,7 @@ namespace pcr
         return ::comphelper::getFloat(aValue);
     }
 
-    //------------------------------------------------------------------------
+
     void OFontPropertyExtractor::invalidateItem(const OUString& _rPropName, sal_uInt16 _nItemId, SfxItemSet& _rSet, sal_Bool _bForceInvalidation)
     {
         if  (   _bForceInvalidation
@@ -170,7 +170,7 @@ namespace pcr
     //========================================================================
     //= ControlCharacterDialog
     //========================================================================
-    //------------------------------------------------------------------------
+
     ControlCharacterDialog::ControlCharacterDialog(Window* _pParent, const SfxItemSet& _rCoreSet)
         : SfxTabDialog(_pParent, "ControlFontDialog",
             "modules/spropctrlr/ui/controlfontdialog.ui", &_rCoreSet)
@@ -182,12 +182,12 @@ namespace pcr
         AddTabPage("fonteffects", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_CHAR_EFFECTS), 0 );
     }
 
-    //------------------------------------------------------------------------
+
     ControlCharacterDialog::~ControlCharacterDialog()
     {
     }
 
-    //------------------------------------------------------------------------
+
     void ControlCharacterDialog::translatePropertiesToItems(const Reference< XPropertySet >& _rxModel, SfxItemSet* _pSet)
     {
         OSL_ENSURE(_pSet && _rxModel.is(), "ControlCharacterDialog::translatePropertiesToItems: invalid arguments!");
@@ -288,7 +288,7 @@ namespace pcr
 
     }
 
-    //------------------------------------------------------------------------
+
     namespace
     {
         void lcl_pushBackPropertyValue( Sequence< NamedValue >& _out_properties, const OUString& _name, const Any& _value )
@@ -298,7 +298,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void ControlCharacterDialog::translateItemsToProperties( const SfxItemSet& _rSet, Sequence< NamedValue >& _out_properties )
     {
         _out_properties.realloc( 0 );
@@ -457,7 +457,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void ControlCharacterDialog::translateItemsToProperties( const SfxItemSet& _rSet, const Reference< XPropertySet >& _rxModel)
     {
         OSL_ENSURE( _rxModel.is(), "ControlCharacterDialog::translateItemsToProperties: invalid arguments!" );
@@ -479,7 +479,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     SfxItemSet* ControlCharacterDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
     {
         // just to be sure ....
@@ -552,7 +552,7 @@ namespace pcr
         return _rpSet;
     }
 
-    //-------------------------------------------------------------------------
+
     void ControlCharacterDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, SfxPoolItem**& _rppDefaults)
     {
         // from the pool, get and remember the font list (needs to be deleted)
@@ -579,7 +579,7 @@ namespace pcr
         delete pFontList;
     }
 
-    //------------------------------------------------------------------------
+
     void ControlCharacterDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage )
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/extensions/source/propctrlr/formbrowsertools.cxx b/extensions/source/propctrlr/formbrowsertools.cxx
index 10193bc456ef..d03a7946af90 100644
--- a/extensions/source/propctrlr/formbrowsertools.cxx
+++ b/extensions/source/propctrlr/formbrowsertools.cxx
@@ -35,7 +35,7 @@ namespace pcr
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
 
-    //------------------------------------------------------------------------
+
     OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
     {
         PcrClient aResourceAccess;
@@ -113,7 +113,7 @@ namespace pcr
         return sClassName;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int16 classifyComponent( const Reference< XInterface >& _rxComponent )
     {
         Reference< XPropertySet > xComponentProps( _rxComponent, UNO_QUERY_THROW );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 5fe9417e8be5..19a277bcc3b0 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -102,7 +102,7 @@
 #include <limits>
 
 #define GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_FormComponentPropertyHandler()
 {
     ::pcr::FormComponentPropertyHandler::registerImplementation();
@@ -137,7 +137,7 @@ namespace pcr
     //====================================================================
     DBG_NAME( FormComponentPropertyHandler )
 #define PROPERTY_ID_ROWSET 1
-    //--------------------------------------------------------------------
+
     FormComponentPropertyHandler::FormComponentPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :FormComponentPropertyHandler_Base( _rxContext )
         ,::comphelper::OPropertyContainer(FormComponentPropertyHandler_Base::rBHelper)
@@ -152,20 +152,20 @@ namespace pcr
         registerProperty(PROPERTY_ROWSET,PROPERTY_ID_ROWSET,0,&m_xRowSet,::getCppuType(&m_xRowSet));
     }
 
-    //--------------------------------------------------------------------
+
     FormComponentPropertyHandler::~FormComponentPropertyHandler()
     {
         DBG_DTOR( FormComponentPropertyHandler, NULL );
     }
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2(FormComponentPropertyHandler,FormComponentPropertyHandler_Base,::comphelper::OPropertyContainer)
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString(  "com.sun.star.comp.extensions.FormComponentPropertyHandler"  );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -242,7 +242,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any FormComponentPropertyHandler::impl_getPropertyValue_throw( const OUString& _rPropertyName ) const
     {
         const PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) );
@@ -303,7 +303,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         if( _rPropertyName == PROPERTY_ROWSET )
@@ -313,7 +313,7 @@ namespace pcr
         return impl_getPropertyValue_throw( _rPropertyName );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         if( _rPropertyName == PROPERTY_ROWSET )
@@ -490,7 +490,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -625,7 +625,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -806,7 +806,7 @@ namespace pcr
         return aControlValue;
     }
 
-    //--------------------------------------------------------------------
+
     PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -815,7 +815,7 @@ namespace pcr
         return PropertyState_DIRECT_VALUE;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormComponentPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -824,7 +824,7 @@ namespace pcr
             m_xComponent->addPropertyChangeListener( OUString(), _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormComponentPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -833,7 +833,7 @@ namespace pcr
         FormComponentPropertyHandler_Base::removePropertyChangeListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void FormComponentPropertyHandler::onNewComponent()
     {
         FormComponentPropertyHandler_Base::onNewComponent();
@@ -848,7 +848,7 @@ namespace pcr
         impl_initComponentMetaData_throw();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL FormComponentPropertyHandler::doDescribeSupportedProperties() const
     {
         if ( !m_xComponentPropertyInfo.is() )
@@ -925,13 +925,13 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
     {
         return Sequence< OUString >( );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -961,7 +961,7 @@ namespace pcr
         return Sequence< OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL FormComponentPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
@@ -1413,7 +1413,7 @@ namespace pcr
         return aDescriptor;
     }
 
-    //--------------------------------------------------------------------
+
     InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -1504,7 +1504,7 @@ namespace pcr
         return eResult;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void lcl_rebuildAndResetCommand( const Reference< XObjectInspectorUI >& _rxInspectorUI, const Reference< XPropertyHandler >& _rxHandler )
@@ -1516,7 +1516,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -1800,7 +1800,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_updateDependentProperty_nothrow( PropertyId _nPropId, const Reference< XObjectInspectorUI >& _rxInspectorUI ) const
     {
         try
@@ -2006,7 +2006,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL FormComponentPropertyHandler::disposing()
     {
         FormComponentPropertyHandler_Base::disposing();
@@ -2014,7 +2014,7 @@ namespace pcr
             m_xCommandDesigner->dispose();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool SAL_CALL FormComponentPropertyHandler::suspend( sal_Bool _bSuspend ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -2024,7 +2024,7 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_initComponentMetaData_throw()
     {
         try
@@ -2078,7 +2078,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_classifyControlModel_throw( )
     {
         if ( impl_componentHasProperty_throw( PROPERTY_CLASSID ) )
@@ -2162,7 +2162,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_normalizePropertyValue_nothrow( Any& _rValue, PropertyId _nPropId ) const
     {
         switch ( _nPropId )
@@ -2196,7 +2196,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_shouldExcludeProperty_nothrow( const Property& _rProperty ) const
     {
         OSL_ENSURE( _rProperty.Handle == m_pInfoService->getPropertyId( _rProperty.Name ),
@@ -2289,7 +2289,7 @@ namespace pcr
         return false;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XRowSet > FormComponentPropertyHandler::impl_getRowSet_throw( ) const
     {
         Reference< XRowSet > xRowSet = m_xRowSet;
@@ -2317,7 +2317,7 @@ namespace pcr
         return xRowSet;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XRowSet > FormComponentPropertyHandler::impl_getRowSet_nothrow( ) const
     {
         Reference< XRowSet > xReturn;
@@ -2333,7 +2333,7 @@ namespace pcr
         return xReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_initFieldList_nothrow( ::std::vector< OUString >& _rFieldNames ) const
     {
         clearContainer( _rFieldNames );
@@ -2372,19 +2372,19 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_clearRowsetConnection_nothrow()
     {
         m_xRowSetConnection.clear();
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_displaySQLError_nothrow( const ::dbtools::SQLExceptionInfo& _rErrorDescriptor ) const
     {
         ::dbtools::showError( _rErrorDescriptor, VCLUnoHelper::GetInterface( impl_getDefaultDialogParent_nothrow() ), m_xContext );
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow() const
     {
         if ( !m_xRowSetConnection.is() )
@@ -2441,7 +2441,7 @@ namespace pcr
         return m_xRowSetConnection.is();
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_describeCursorSource_nothrow( LineDescriptor& _out_rProperty, const Reference< XPropertyControlFactory >& _rxControlFactory ) const
     {
         try
@@ -2488,7 +2488,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const
     {
         OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillTableNames_throw: need a connection!" );
@@ -2510,7 +2510,7 @@ namespace pcr
             _out_rNames.push_back( *pTableNames );
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const
     {
         OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: need a connection!" );
@@ -2524,7 +2524,7 @@ namespace pcr
             impl_fillQueryNames_throw(xQueryNames,_out_rNames);
         }
     }
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,::std::vector< OUString >& _out_rNames,const OUString& _sName ) const
     {
         DBG_ASSERT( _xQueryNames.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: no way to obtain the queries of the connection!" );
@@ -2553,7 +2553,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormComponentPropertyHandler::impl_describeListSourceUI_throw( LineDescriptor& _out_rDescriptor, const Reference< XPropertyControlFactory >& _rxControlFactory ) const
     {
         OSL_PRECOND( m_xComponent.is(), "FormComponentPropertyHandler::impl_describeListSourceUI_throw: no component!" );
@@ -2599,7 +2599,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogListSelection_nothrow( const OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         OSL_PRECOND( m_pInfoService.get(), "FormComponentPropertyHandler::impl_dialogListSelection_nothrow: no property meta data!" );
@@ -2610,7 +2610,7 @@ namespace pcr
         return ( RET_OK == aDialog.Execute() );
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         OSL_PRECOND( Reference< XRowSet >( m_xComponent, UNO_QUERY ).is(),
@@ -2671,7 +2671,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogLinkedFormFields_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         Reference< XForm > xDetailForm( m_xComponent, UNO_QUERY );
@@ -2687,7 +2687,7 @@ namespace pcr
         return ( RET_OK == aDialog.Execute() );
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogFormatting_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         bool bChanged = false;
@@ -2762,7 +2762,7 @@ namespace pcr
         return bChanged;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_browseForImage_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         OUString aStrTrans = m_pInfoService->getPropertyTranslation( PROPERTY_ID_IMAGE_URL );
@@ -2805,7 +2805,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_browseForTargetURL_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         ::sfx2::FileDialogHelper aFileDlg(
@@ -2826,7 +2826,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_executeFontDialog_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         bool bSuccess = false;
@@ -2859,7 +2859,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_browseForDatabaseDocument_throw( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         ::sfx2::FileDialogHelper aFileDlg(
@@ -2889,7 +2889,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogColorChooser_throw( sal_Int32 _nColorPropertyId, Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         sal_Int32 nColor = 0;
@@ -2908,7 +2908,7 @@ namespace pcr
         return true;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogChooseLabelControl_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         OSelectLabelDialog dlgSelectLabel( impl_getDefaultDialogParent_nothrow(), m_xComponent );
@@ -2919,7 +2919,7 @@ namespace pcr
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XControlContainer > FormComponentPropertyHandler::impl_getContextControlContainer_nothrow() const
     {
         Reference< XControlContainer > xControlContext;
@@ -2928,7 +2928,7 @@ namespace pcr
         return xControlContext;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_dialogChangeTabOrder_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
     {
         OSL_PRECOND( impl_getContextControlContainer_nothrow().is(), "FormComponentPropertyHandler::impl_dialogChangeTabOrder_nothrow: invalid control context!" );
@@ -2944,12 +2944,12 @@ namespace pcr
         return ( RET_OK == aDialog.Execute() );
     }
 
-    //------------------------------------------------------------------------
+
     namespace
     {
-        //--------------------------------------------------------------------
+
         //- ISQLCommandPropertyUI
-        //--------------------------------------------------------------------
+
         class ISQLCommandPropertyUI : public ISQLCommandAdapter
         {
         public:
@@ -2960,9 +2960,9 @@ namespace pcr
             virtual OUString*    getPropertiesToDisable() = 0;
         };
 
-        //--------------------------------------------------------------------
+
         //- SQLCommandPropertyUI
-        //--------------------------------------------------------------------
+
         class SQLCommandPropertyUI : public ISQLCommandPropertyUI
         {
         protected:
@@ -2996,9 +2996,9 @@ namespace pcr
             oslInterlockedCount         m_refCount;
         };
 
-        //--------------------------------------------------------------------
+
         //- FormSQLCommandUI - declaration
-        //--------------------------------------------------------------------
+
         class FormSQLCommandUI : public SQLCommandPropertyUI
         {
         public:
@@ -3014,9 +3014,9 @@ namespace pcr
             virtual OUString*    getPropertiesToDisable();
         };
 
-        //--------------------------------------------------------------------
+
         //- FormSQLCommandUI - implementation
-        //--------------------------------------------------------------------
+
         //....................................................................
         FormSQLCommandUI::FormSQLCommandUI( const Reference< XPropertySet >& _rxForm )
             :SQLCommandPropertyUI( _rxForm )
@@ -3063,9 +3063,9 @@ namespace pcr
             };
             return s_aCommandProps;
         }
-        //--------------------------------------------------------------------
+
         //- ValueListCommandUI - declaration
-        //--------------------------------------------------------------------
+
         class ValueListCommandUI : public SQLCommandPropertyUI
         {
         public:
@@ -3083,9 +3083,9 @@ namespace pcr
             mutable bool    m_bPropertyValueIsList;
         };
 
-        //--------------------------------------------------------------------
+
         //- ValueListCommandUI - implementation
-        //--------------------------------------------------------------------
+
         //....................................................................
         ValueListCommandUI::ValueListCommandUI( const Reference< XPropertySet >& _rxListOrCombo )
             :SQLCommandPropertyUI( _rxListOrCombo )
@@ -3157,7 +3157,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_doDesignSQLCommand_nothrow( const Reference< XObjectInspectorUI >& _rxInspectorUI, PropertyId _nDesignForProperty )
     {
         try
@@ -3217,7 +3217,7 @@ namespace pcr
         return m_xCommandDesigner.is();
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( FormComponentPropertyHandler, OnDesignerClosed, void*, /*NOTINTERESTEDIN*/ )
     {
         OSL_ENSURE( m_xBrowserUI.is() && m_xCommandDesigner.is(), "FormComponentPropertyHandler::OnDesignerClosed: too many NULLs!" );
@@ -3245,7 +3245,7 @@ namespace pcr
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     bool FormComponentPropertyHandler::impl_hasValidDataSourceSignature_nothrow( const Reference< XPropertySet >& _xFormProperties, bool _bAllowEmptyDataSourceName ) SAL_THROW(())
     {
         bool bHas = false;
@@ -3275,7 +3275,7 @@ namespace pcr
         }
         return bHas;
     }
-    //------------------------------------------------------------------------
+
     OUString FormComponentPropertyHandler::impl_getDocumentURL_nothrow() const
     {
         OUString sURL;
@@ -3291,7 +3291,7 @@ namespace pcr
         }
         return sURL;
     }
-    // -------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* FormComponentPropertyHandler::createArrayHelper( ) const
     {
         uno::Sequence< beans::Property > aProps;
@@ -3299,12 +3299,12 @@ namespace pcr
         return new ::cppu::OPropertyArrayHelper(aProps);
 
     }
-    // -------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper & FormComponentPropertyHandler::getInfoHelper()
     {
         return *const_cast<FormComponentPropertyHandler*>(this)->getArrayHelper();
     }
-    // -----------------------------------------------------------------------------
+
     uno::Reference< beans::XPropertySetInfo > SAL_CALL FormComponentPropertyHandler::getPropertySetInfo(  ) throw(uno::RuntimeException)
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 0cf7fd5bb1ac..c3e2b6b45393 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -30,7 +30,7 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_FormController()
 {
     ::pcr::OAutoRegistration< ::pcr::FormController > aFormControllerRegistration;
@@ -72,7 +72,7 @@ namespace pcr
     //====================================================================
     //= FormController
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormController::FormController( const Reference< XComponentContext >& _rxContext, ServiceDescriptor _aServiceDescriptor,
             bool _bUseFormFormComponentHandlers )
         :OPropertyBrowserController( _rxContext )
@@ -90,15 +90,15 @@ namespace pcr
         osl_atomic_decrement( &m_refCount );
     }
 
-    //------------------------------------------------------------------------
+
     FormController::~FormController()
     {
     }
 
-    //------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( FormController, OPropertyBrowserController, FormController_PropertyBase1 )
 
-    //------------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL FormController::getTypes(  ) throw(RuntimeException)
     {
         ::cppu::OTypeCollection aTypes(
@@ -109,16 +109,16 @@ namespace pcr
         return aTypes.getTypes();
     }
 
-    //------------------------------------------------------------------------
+
     IMPLEMENT_GET_IMPLEMENTATION_ID( FormController )
 
-    //------------------------------------------------------------------------
+
     OUString SAL_CALL FormController::getImplementationName(  ) throw(RuntimeException)
     {
         return m_aServiceDescriptor.GetImplementationName();
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FormController::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported( m_aServiceDescriptor.GetSupportedServiceNames() );
@@ -127,13 +127,13 @@ namespace pcr
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
+
     OUString FormController::getImplementationName_static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.extensions.FormController");
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > FormController::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -141,7 +141,7 @@ namespace pcr
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL FormController::Create(const Reference< XComponentContext >& _rxContext )
     {
         ServiceDescriptor aService;
@@ -150,19 +150,19 @@ namespace pcr
         return *(new FormController( _rxContext, aService, true ) );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL FormController::getPropertySetInfo(  ) throw(RuntimeException)
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
     }
 
-    //------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL FormController::getInfoHelper()
     {
         return *getArrayHelper();
     }
 
-    //------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* FormController::createArrayHelper( ) const
     {
         Sequence< Property > aProps( 2 );
@@ -181,7 +181,7 @@ namespace pcr
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool SAL_CALL FormController::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException)
     {
         switch ( nHandle )
@@ -201,7 +201,7 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL FormController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception)
     {
         switch ( _nHandle )
@@ -237,7 +237,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL FormController::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const
     {
         switch ( nHandle )
@@ -255,13 +255,13 @@ namespace pcr
     //====================================================================
     //= DialogController
     //====================================================================
-    //------------------------------------------------------------------------
+
     OUString DialogController::getImplementationName_static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.extensions.DialogController");
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > DialogController::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -269,7 +269,7 @@ namespace pcr
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL DialogController::Create(const Reference< XComponentContext >& _rxContext)
     {
         ServiceDescriptor aService;
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 3995229df83c..b444cfabb4a4 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -254,14 +254,14 @@ namespace pcr
     //= FormGeometryHandler - implementation
     //====================================================================
     DBG_NAME( FormGeometryHandler )
-    //--------------------------------------------------------------------
+
     FormGeometryHandler::FormGeometryHandler( const Reference< XComponentContext >& _rxContext )
         :FormGeometryHandler_Base( _rxContext )
     {
         DBG_CTOR( FormGeometryHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     FormGeometryHandler::~FormGeometryHandler( )
     {
         if ( !rBHelper.bDisposed )
@@ -273,7 +273,7 @@ namespace pcr
         DBG_DTOR( FormGeometryHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void FormGeometryHandler::onNewComponent()
     {
         if ( m_xChangeNotifier.is() )
@@ -313,13 +313,13 @@ namespace pcr
             m_xChangeNotifier = new ShapeGeometryChangeNotifier( *this, m_aMutex, m_xAssociatedShape.get() );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL FormGeometryHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.FormGeometryHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FormGeometryHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -327,7 +327,7 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL FormGeometryHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -376,7 +376,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormGeometryHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -442,7 +442,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL FormGeometryHandler::describePropertyLine( const OUString& _rPropertyName,
             const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
@@ -491,7 +491,7 @@ namespace pcr
         return aLineDesc;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormGeometryHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -500,7 +500,7 @@ namespace pcr
             m_xChangeNotifier->addPropertyChangeListener( _listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormGeometryHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _listener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -509,7 +509,7 @@ namespace pcr
             m_xChangeNotifier->removePropertyChangeListener( _listener );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL FormGeometryHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         Sequence< OUString > aInterestedIn(1);
@@ -517,7 +517,7 @@ namespace pcr
         return aInterestedIn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormGeometryHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -541,7 +541,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL FormGeometryHandler::doDescribeSupportedProperties() const
     {
         if ( !m_xAssociatedShape.is() )
@@ -563,7 +563,7 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormGeometryHandler::disposing()
     {
         FormGeometryHandler_Base::disposing();
@@ -575,7 +575,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool FormGeometryHandler::impl_haveTextAnchorType_nothrow() const
     {
         ENSURE_OR_THROW( m_xShapeProperties.is(), "not to be called without shape properties" );
@@ -592,7 +592,7 @@ namespace pcr
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool FormGeometryHandler::impl_haveSheetAnchorType_nothrow() const
     {
         ENSURE_OR_THROW( m_xShapeProperties.is(), "not to be called without shape properties" );
@@ -612,7 +612,7 @@ namespace pcr
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         static sal_Int32 lcl_getLowerBoundRowOrColumn( const Reference< XIndexAccess >& _rxRowsOrColumns, const bool _bRows,
@@ -646,7 +646,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FormGeometryHandler::impl_setSheetAnchorType_nothrow( const sal_Int32 _nAnchorType ) const
     {
         ENSURE_OR_THROW( m_xShapeProperties.is(), "illegal to be called without shape properties." );
@@ -722,7 +722,7 @@ namespace pcr
         };
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ShapeGeometryChangeNotifier::propertyChange( const PropertyChangeEvent& _event ) throw (RuntimeException)
     {
         ::comphelper::ComponentMethodGuard aGuard( *this );
@@ -766,14 +766,14 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ShapeGeometryChangeNotifier::disposing( const EventObject& /*_event*/ ) throw (RuntimeException)
     {
         ::comphelper::ComponentMethodGuard aGuard( *this );
         impl_dispose_nothrow();
     }
 
-    //--------------------------------------------------------------------
+
     void ShapeGeometryChangeNotifier::impl_init_nothrow()
     {
         osl_atomic_increment( &m_refCount );
@@ -789,7 +789,7 @@ namespace pcr
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     void ShapeGeometryChangeNotifier::impl_dispose_nothrow()
     {
         try
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 047747737de9..9fd09141ae72 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -92,7 +92,7 @@ namespace pcr
         DECL_LINK( OnFieldNameChanged, ComboBox* );
     };
 
-    //------------------------------------------------------------------------
+
     FieldLinkRow::FieldLinkRow( Window* _pParent, const ResId& _rId )
         :Window( _pParent, _rId )
         ,m_aDetailColumn( this, ResId( 1, *_rId.GetResMgr() ) )
@@ -108,7 +108,7 @@ namespace pcr
         m_aMasterColumn.SetModifyHdl( LINK( this, FieldLinkRow, OnFieldNameChanged ) );
     }
 
-    //------------------------------------------------------------------------
+
     void FieldLinkRow::fillList( LinkParticipant _eWhich, const Sequence< OUString >& _rFieldNames )
     {
         ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn;
@@ -119,7 +119,7 @@ namespace pcr
             pBox->InsertEntry( *pFieldName );
     }
 
-    //------------------------------------------------------------------------
+
     bool FieldLinkRow::GetFieldName( LinkParticipant _eWhich, OUString& /* [out] */ _rName ) const
     {
         const ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn;
@@ -127,14 +127,14 @@ namespace pcr
         return !_rName.isEmpty();
     }
 
-    //------------------------------------------------------------------------
+
     void FieldLinkRow::SetFieldName( LinkParticipant _eWhich, const OUString& _rName )
     {
         ComboBox* pBox = ( _eWhich == eDetailField ) ? &m_aDetailColumn : &m_aMasterColumn;
         pBox->SetText( _rName );
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( FieldLinkRow, OnFieldNameChanged, ComboBox*, /*_pBox*/ )
     {
         if ( m_aLinkChangeHandler.IsSet() )
@@ -146,7 +146,7 @@ namespace pcr
     //========================================================================
     //= FormLinkDialog
     //========================================================================
-    //------------------------------------------------------------------------
+
     FormLinkDialog::FormLinkDialog( Window* _pParent, const Reference< XPropertySet >& _rxDetailForm,
             const Reference< XPropertySet >& _rxMasterForm, const Reference< XComponentContext >& _rxContext,
             const OUString& _sExplanation,
@@ -185,12 +185,12 @@ namespace pcr
         updateOkButton();
     }
 
-    //------------------------------------------------------------------------
+
     FormLinkDialog::~FormLinkDialog( )
     {
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::commitLinkPairs()
     {
         // collect the field lists from the rows
@@ -231,7 +231,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     short FormLinkDialog::Execute()
     {
         short nResult = ModalDialog::Execute();
@@ -242,7 +242,7 @@ namespace pcr
         return nResult;
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::initializeFieldLists()
     {
         Sequence< OUString > sDetailFields;
@@ -262,7 +262,7 @@ namespace pcr
 
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::initializeColumnLabels()
     {
         // label for the detail form
@@ -292,7 +292,7 @@ namespace pcr
         m_aMasterLabel.SetText( sMasterType );
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::initializeFieldRowsFrom( Sequence< OUString >& _rDetailFields, Sequence< OUString >& _rMasterFields )
     {
         // our UI does allow 4 fields max
@@ -312,7 +312,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::initializeLinks()
     {
         try
@@ -335,7 +335,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::updateOkButton()
     {
         // in all rows, there must be either two valid selections, or none at all
@@ -359,7 +359,7 @@ namespace pcr
         m_aOK.Enable( bEnable );
     }
 
-    //------------------------------------------------------------------------
+
     OUString FormLinkDialog::getFormDataSourceType( const Reference< XPropertySet >& _rxForm ) const SAL_THROW(())
     {
         OUString sReturn;
@@ -386,7 +386,7 @@ namespace pcr
         return sReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::getFormFields( const Reference< XPropertySet >& _rxForm, Sequence< OUString >& /* [out] */ _rNames ) const SAL_THROW(( ))
     {
         _rNames.realloc( 0 );
@@ -438,7 +438,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::ensureFormConnection( const Reference< XPropertySet >& _rxFormProps, Reference< XConnection >& /* [out] */ _rxConnection ) const SAL_THROW(( Exception ))
     {
         OSL_PRECOND( _rxFormProps.is(), "FormLinkDialog::ensureFormConnection: invalid form!" );
@@ -451,7 +451,7 @@ namespace pcr
             _rxConnection = ::dbtools::connectRowset( Reference< XRowSet >( _rxFormProps, UNO_QUERY ), m_xContext, sal_True );
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::getConnectionMetaData( const Reference< XPropertySet >& _rxFormProps, Reference< XDatabaseMetaData >& /* [out] */ _rxMeta ) const SAL_THROW(( Exception ))
     {
         if ( _rxFormProps.is() )
@@ -464,7 +464,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XPropertySet > FormLinkDialog::getCanonicUnderlyingTable( const Reference< XPropertySet >& _rxFormProps ) const
     {
         Reference< XPropertySet > xTable;
@@ -491,7 +491,7 @@ namespace pcr
         return xTable;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool FormLinkDialog::getExistingRelation( const Reference< XPropertySet >& _rxLHS, const Reference< XPropertySet >& /*_rxRHS*/,
             // TODO: fix the usage of _rxRHS. This is issue #i81956#.
         Sequence< OUString >& _rLeftFields, Sequence< OUString >& _rRightFields ) const
@@ -557,7 +557,7 @@ namespace pcr
         return ( _rLeftFields.getLength() > 0 ) && ( !_rLeftFields[ 0 ].isEmpty() );
     }
 
-    //------------------------------------------------------------------------
+
     void FormLinkDialog::initializeSuggest()
     {
         Reference< XPropertySet > xDetailFormProps( m_xDetailForm, UNO_QUERY );
@@ -631,21 +631,21 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( FormLinkDialog, OnSuggest, void*, /*_pNotInterestedIn*/ )
     {
         initializeFieldRowsFrom( m_aRelationDetailColumns, m_aRelationMasterColumns );
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( FormLinkDialog, OnFieldChanged, FieldLinkRow*, /*_pRow*/ )
     {
         updateOkButton();
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( FormLinkDialog, OnInitialize, void*, /*_pNotInterestedIn*/ )
     {
         initializeColumnLabels();
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 971c0c7ac971..e161bf6fbbea 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -56,7 +56,7 @@ namespace pcr
                         sal_uInt32                  _nUIFlags);
     };
 
-    //------------------------------------------------------------------------
+
     OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId,
                                    const OUString& aString, sal_uInt16 nP, const OString& sHid, sal_uInt32 _nUIFlags)
        :sName(_rName)
@@ -68,7 +68,7 @@ namespace pcr
     {
     }
 
-    //------------------------------------------------------------------------
+
     // Compare PropertyInfo
     struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool >
     {
@@ -99,7 +99,7 @@ namespace pcr
 
     sal_uInt16              OPropertyInfoService::s_nCount = 0;
     OPropertyInfoImpl*      OPropertyInfoService::s_pPropertyInfos = NULL;
-    //------------------------------------------------------------------------
+
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo()
     {
         if ( s_pPropertyInfos )
@@ -362,49 +362,49 @@ namespace pcr
         return s_pPropertyInfos;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName);
         return pInfo ? pInfo->nId : -1;
     }
 
-    //------------------------------------------------------------------------
+
     OUString OPropertyInfoService::getPropertyName( sal_Int32 _nPropId )
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nPropId);
         return pInfo ? pInfo->sName : OUString();
     }
 
-    //------------------------------------------------------------------------
+
     OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->sTranslation : OUString();
     }
 
-    //------------------------------------------------------------------------
+
     OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->sHelpId : OString();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int16 OPropertyInfoService::getPropertyPos(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->nPos : 0xFFFF;
     }
 
-    //------------------------------------------------------------------------
+
     sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->nUIFlags : 0;
     }
 
-    //------------------------------------------------------------------------
+
     ::std::vector< OUString > OPropertyInfoService::getPropertyEnumRepresentations(sal_Int32 _nId) const
     {
         OSL_ENSURE( ( ( getPropertyUIFlags( _nId ) & PROP_FLAG_ENUM ) != 0 ) || ( _nId == PROPERTY_ID_TARGET_FRAME ),
@@ -528,7 +528,7 @@ namespace pcr
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool OPropertyInfoService::isComposeable( const OUString& _rPropertyName ) const
     {
         sal_Int32 nId = getPropertyId( _rPropertyName );
@@ -539,7 +539,7 @@ namespace pcr
         return ( nFlags & PROP_FLAG_COMPOSEABLE ) != 0;
     }
 
-    //------------------------------------------------------------------------
+
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const OUString& _rName)
     {
         // Initialization
@@ -560,7 +560,7 @@ namespace pcr
     }
 
 
-    //------------------------------------------------------------------------
+
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId)
     {
         // Initialization
@@ -579,7 +579,7 @@ namespace pcr
     //= DefaultEnumRepresentation
     //====================================================================
     DBG_NAME( DefaultEnumRepresentation )
-    //--------------------------------------------------------------------
+
     DefaultEnumRepresentation::DefaultEnumRepresentation( const IPropertyInfoService& _rInfo, const Type& _rType, sal_Int32 _nPropertyId )
         :m_refCount( 0 )
         ,m_rMetaData( _rInfo )
@@ -589,19 +589,19 @@ namespace pcr
         DBG_CTOR( DefaultEnumRepresentation, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     DefaultEnumRepresentation::~DefaultEnumRepresentation()
     {
         DBG_DTOR( DefaultEnumRepresentation, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     ::std::vector< OUString > SAL_CALL DefaultEnumRepresentation::getDescriptions() const
     {
         return m_rMetaData.getPropertyEnumRepresentations( m_nPropertyId );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultEnumRepresentation::getValueFromDescription( const OUString& _rDescription, Any& _out_rValue ) const
     {
         sal_uInt32  nPropertyUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId );
@@ -644,7 +644,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL DefaultEnumRepresentation::getDescriptionForValue( const Any& _rEnumValue ) const
     {
         OUString sReturn;
@@ -668,13 +668,13 @@ namespace pcr
         return sReturn;
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL DefaultEnumRepresentation::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL DefaultEnumRepresentation::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 7a257bc6ae57..6362a6227567 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -57,7 +57,7 @@ namespace pcr
     //====================================================================
     //= PropertyHandlerHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     void PropertyHandlerHelper::describePropertyLine( const Property& _rProperty,
         LineDescriptor& /* [out] */ _out_rDescriptor, const Reference< XPropertyControlFactory >& _rxControlFactory )
     {
@@ -111,7 +111,7 @@ namespace pcr
         _out_rDescriptor.Control = _rxControlFactory->createPropertyControl( nControlType, bReadOnlyControl );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         Reference< XPropertyControl > lcl_implCreateListLikeControl(
@@ -142,21 +142,21 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertyControl > PropertyHandlerHelper::createListBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
                 const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted )
     {
         return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertyControl > PropertyHandlerHelper::createComboBoxControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
                 const ::std::vector< OUString >& _rInitialListEntries, sal_Bool _bReadOnlyControl, sal_Bool _bSorted )
     {
         return lcl_implCreateListLikeControl( _rxControlFactory, _rInitialListEntries, _bReadOnlyControl, _bSorted, sal_False );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertyControl > PropertyHandlerHelper::createNumericControl( const Reference< XPropertyControlFactory >& _rxControlFactory,
             sal_Int16 _nDigits, const Optional< double >& _rMinValue, const Optional< double >& _rMaxValue, sal_Bool _bReadOnlyControl )
     {
@@ -172,7 +172,7 @@ namespace pcr
         return xNumericControl.get();
     }
 
-    //--------------------------------------------------------------------
+
     Any PropertyHandlerHelper::convertToPropertyValue( const Reference< XComponentContext >& _rxContext,const Reference< XTypeConverter >& _rxTypeConverter,
         const Property& _rProperty, const Any& _rControlValue )
     {
@@ -209,7 +209,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    //--------------------------------------------------------------------
+
     Any PropertyHandlerHelper::convertToControlValue( const Reference< XComponentContext >& _rxContext,const Reference< XTypeConverter >& _rxTypeConverter,
         const Any& _rPropertyValue, const Type& _rControlValueType )
     {
@@ -239,7 +239,7 @@ namespace pcr
         return aControlValue;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyHandlerHelper::setContextDocumentModified( const Reference<XComponentContext> & _rContext )
     {
         try
@@ -275,7 +275,7 @@ namespace pcr
         return xI;
     }
 
-    //--------------------------------------------------------------------
+
     Window* PropertyHandlerHelper::getDialogParentWindow( const Reference<XComponentContext>& _rContext )
     {
         Window* pInspectorWindow = NULL;
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 397ffe6ce41b..4e7f6a7cfb5f 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -26,7 +26,7 @@ namespace pcr
     //====================================================================
     //= InspectorHelpWindow
     //====================================================================
-    //--------------------------------------------------------------------
+
     InspectorHelpWindow::InspectorHelpWindow( Window* _pParent )
         :Window( _pParent, WB_DIALOGCONTROL )
         ,m_aSeparator( this )
@@ -46,20 +46,20 @@ namespace pcr
         m_aHelpText.Show();
     }
 
-    //--------------------------------------------------------------------
+
     void InspectorHelpWindow::SetText( const OUString& _rStr )
     {
         m_aHelpText.SetText( _rStr );
     }
 
-    //--------------------------------------------------------------------
+
     void InspectorHelpWindow::SetLimits( sal_Int32 _nMinLines, sal_Int32 _nMaxLines )
     {
         m_nMinLines = _nMinLines;
         m_nMaxLines = _nMaxLines;
     }
 
-    //--------------------------------------------------------------------
+
     long InspectorHelpWindow::impl_getHelpTextBorderHeight()
     {
         sal_Int32 nTop(0), nBottom(0), nDummy(0);
@@ -67,7 +67,7 @@ namespace pcr
         return nTop + nBottom;
     }
 
-    //--------------------------------------------------------------------
+
     long InspectorHelpWindow::impl_getSpaceAboveTextWindow()
     {
         Size aSeparatorSize( LogicToPixel( Size( 0, 8 ), MAP_APPFONT ) );
@@ -75,25 +75,25 @@ namespace pcr
         return aSeparatorSize.Height() + a3AppFontSize.Height();
     }
 
-    //--------------------------------------------------------------------
+
     long InspectorHelpWindow::GetMinimalHeightPixel()
     {
         return impl_getMinimalTextWindowHeight() + impl_getSpaceAboveTextWindow();
     }
 
-    //--------------------------------------------------------------------
+
     long InspectorHelpWindow::impl_getMinimalTextWindowHeight()
     {
         return impl_getHelpTextBorderHeight() + m_aHelpText.GetTextHeight() * m_nMinLines;
     }
 
-    //--------------------------------------------------------------------
+
     long InspectorHelpWindow::impl_getMaximalTextWindowHeight()
     {
         return impl_getHelpTextBorderHeight() + m_aHelpText.GetTextHeight() * m_nMaxLines;
     }
 
-    //--------------------------------------------------------------------
+
     long InspectorHelpWindow::GetOptimalHeightPixel()
     {
         // --- calc the height as needed for the mere text window
@@ -111,7 +111,7 @@ namespace pcr
         return nOptTextWindowHeight + impl_getSpaceAboveTextWindow();
     }
 
-    //--------------------------------------------------------------------
+
     void InspectorHelpWindow::Resize()
     {
         Size a3AppFont( LogicToPixel( Size( 3, 3 ), MAP_APPFONT ) );
diff --git a/extensions/source/propctrlr/inspectormodelbase.cxx b/extensions/source/propctrlr/inspectormodelbase.cxx
index 3d5f2b57d309..9bbc8237cfce 100644
--- a/extensions/source/propctrlr/inspectormodelbase.cxx
+++ b/extensions/source/propctrlr/inspectormodelbase.cxx
@@ -90,7 +90,7 @@ namespace pcr
     //====================================================================
     //= InspectorModelProperties
     //====================================================================
-    //--------------------------------------------------------------------
+
     InspectorModelProperties::InspectorModelProperties( ::osl::Mutex& _rMutex )
         :m_rMutex( _rMutex )
         ,m_bHasHelpSection( sal_False )
@@ -124,7 +124,7 @@ namespace pcr
         );
     }
 
-    //--------------------------------------------------------------------
+
     void InspectorModelProperties::constructWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines )
     {
         m_bHasHelpSection = sal_True;
@@ -134,7 +134,7 @@ namespace pcr
         // only be used during construction phase, where we don't expect to have any listeners.
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& InspectorModelProperties::getInfoHelper()
     {
         ::osl::MutexGuard aGuard( m_rMutex );
@@ -148,7 +148,7 @@ namespace pcr
         return *m_pPropertyInfo;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > InspectorModelProperties::getPropertySetInfo()
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
@@ -163,72 +163,72 @@ namespace pcr
     {
     }
 
-    //--------------------------------------------------------------------
+
     ImplInspectorModel::~ImplInspectorModel()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( ImplInspectorModel, ImplInspectorModel_Base, ImplInspectorModel_PBase )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ImplInspectorModel, ImplInspectorModel_Base, ImplInspectorModel_PBase )
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL ImplInspectorModel::getPropertySetInfo(  ) throw (RuntimeException)
     {
         return m_pProperties->getPropertySetInfo();
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL ImplInspectorModel::getInfoHelper()
     {
         return m_pProperties->getInfoHelper();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ImplInspectorModel::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw (IllegalArgumentException)
     {
         return m_pProperties->convertFastPropertyValue( rConvertedValue, rOldValue, nHandle, rValue );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ImplInspectorModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
     {
         m_pProperties->setFastPropertyValue( nHandle, rValue );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ImplInspectorModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
     {
         m_pProperties->getFastPropertyValue( rValue, nHandle );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL ImplInspectorModel::getHasHelpSection() throw (RuntimeException)
     {
         return m_pProperties->hasHelpSection();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL ImplInspectorModel::getMinHelpTextLines() throw (RuntimeException)
     {
         return m_pProperties->getMinHelpTextLines();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL ImplInspectorModel::getMaxHelpTextLines() throw (RuntimeException)
     {
         return m_pProperties->getMaxHelpTextLines();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL ImplInspectorModel::getIsReadOnly() throw (::com::sun::star::uno::RuntimeException)
     {
         return m_pProperties->isReadOnly();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ImplInspectorModel::setIsReadOnly( ::sal_Bool _IsReadOnly ) throw (::com::sun::star::uno::RuntimeException)
     {
         setFastPropertyValue( MODEL_PROPERTY_ID_IS_READ_ONLY, makeAny( _IsReadOnly ) );
@@ -239,7 +239,7 @@ namespace pcr
         return cppu::supportsService(this, ServiceName);
     }
 
-    //--------------------------------------------------------------------
+
     void ImplInspectorModel::enableHelpSectionProperties( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines )
     {
         m_pProperties->constructWithHelpSection( _nMinHelpTextLines, _nMaxHelpTextLines );
diff --git a/extensions/source/propctrlr/listselectiondlg.cxx b/extensions/source/propctrlr/listselectiondlg.cxx
index 9b4ac38deda8..1087354427dd 100644
--- a/extensions/source/propctrlr/listselectiondlg.cxx
+++ b/extensions/source/propctrlr/listselectiondlg.cxx
@@ -36,7 +36,7 @@ namespace pcr
     //====================================================================
     //= ListSelectionDialog
     //====================================================================
-    //--------------------------------------------------------------------
+
     ListSelectionDialog::ListSelectionDialog( Window* _pParent, const Reference< XPropertySet >& _rxListBox,
             const OUString& _rPropertyName, const OUString& _rPropertyUIName )
         :ModalDialog( _pParent, PcrRes( RID_DLG_SELECTION ) )
@@ -58,7 +58,7 @@ namespace pcr
         initialize( );
     }
 
-    //------------------------------------------------------------------------
+
     short ListSelectionDialog::Execute()
     {
         short nResult = ModalDialog::Execute();
@@ -69,7 +69,7 @@ namespace pcr
         return nResult;
     }
 
-    //--------------------------------------------------------------------
+
     void ListSelectionDialog::initialize( )
     {
         if ( !m_xListBox.is() )
@@ -100,7 +100,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ListSelectionDialog::commitSelection()
     {
         if ( !m_xListBox.is() )
@@ -119,7 +119,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ListSelectionDialog::fillEntryList( const Sequence< OUString >& _rListEntries )
     {
         m_aEntries.Clear();
@@ -129,7 +129,7 @@ namespace pcr
             m_aEntries.InsertEntry( *_pListEntries );
     }
 
-    //--------------------------------------------------------------------
+
     void ListSelectionDialog::collectSelection( Sequence< sal_Int16 >& /* [out] */ _rSelection )
     {
         sal_uInt16 nSelectedCount = m_aEntries.GetSelectEntryCount( );
@@ -139,7 +139,7 @@ namespace pcr
             *pSelection = static_cast< sal_Int16 >( m_aEntries.GetSelectEntryPos( selected ) );
     }
 
-    //--------------------------------------------------------------------
+
     void ListSelectionDialog::selectEntries( const Sequence< sal_Int16 >& /* [in ] */ _rSelection )
     {
         m_aEntries.SetNoSelection();
diff --git a/extensions/source/propctrlr/newdatatype.cxx b/extensions/source/propctrlr/newdatatype.cxx
index 096166d4e93f..cd267d5e9f8b 100644
--- a/extensions/source/propctrlr/newdatatype.cxx
+++ b/extensions/source/propctrlr/newdatatype.cxx
@@ -31,7 +31,7 @@ namespace pcr
     //====================================================================
     //= NewDataTypeDialog
     //====================================================================
-    //--------------------------------------------------------------------
+
     NewDataTypeDialog::NewDataTypeDialog( Window* _pParent, const OUString& _rNameBase, const ::std::vector< OUString >& _rProhibitedNames )
         :ModalDialog( _pParent, PcrRes( RID_DLG_NEW_DATA_TYPE ) )
         ,m_aLabel   ( this, PcrRes( FT_LABEL  ) )
@@ -72,7 +72,7 @@ namespace pcr
         OnNameModified( NULL );
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( NewDataTypeDialog, OnNameModified, void*, /*_pNotInterestedIn*/ )
     {
         OUString sCurrentName = GetName();
diff --git a/extensions/source/propctrlr/objectinspectormodel.cxx b/extensions/source/propctrlr/objectinspectormodel.cxx
index 1682f0edb0ee..13ee90101ce1 100644
--- a/extensions/source/propctrlr/objectinspectormodel.cxx
+++ b/extensions/source/propctrlr/objectinspectormodel.cxx
@@ -98,27 +98,27 @@ namespace pcr
     {
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Any > SAL_CALL ObjectInspectorModel::getHandlerFactories() throw (RuntimeException)
     {
         return m_aFactories;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyCategoryDescriptor > SAL_CALL ObjectInspectorModel::describeCategories(  ) throw (RuntimeException)
     {
         // no category info provided by this default implementation
         return Sequence< PropertyCategoryDescriptor >( );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL ObjectInspectorModel::getPropertyOrderIndex( const OUString& /*PropertyName*/ ) throw (RuntimeException)
     {
         // no ordering provided by this default implementation
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ObjectInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -153,52 +153,52 @@ namespace pcr
         impl_verifyArgument_throw( false, 2 );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL ObjectInspectorModel::getImplementationName(  ) throw (RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ObjectInspectorModel::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //--------------------------------------------------------------------
+
     OUString ObjectInspectorModel::getImplementationName_static(  ) throw(RuntimeException)
     {
         return OUString( "org.openoffice.comp.extensions.ObjectInspectorModel" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > ObjectInspectorModel::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         OUString sService( "com.sun.star.inspection.ObjectInspectorModel" );
         return Sequence< OUString >( &sService, 1 );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL ObjectInspectorModel::Create(const Reference< XComponentContext >& /* _rxContext */ )
     {
         return *( new ObjectInspectorModel() );
     }
 
-    //--------------------------------------------------------------------
+
     void ObjectInspectorModel::createDefault()
     {
         m_aFactories.realloc( 1 );
         m_aFactories[0] <<= OUString( "com.sun.star.inspection.GenericPropertyHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     void ObjectInspectorModel::createWithHandlerFactories( const Sequence< Any >& _rFactories )
     {
         impl_verifyArgument_throw( _rFactories.getLength() > 0, 1 );
         m_aFactories = _rFactories;
     }
 
-    //--------------------------------------------------------------------
+
     void ObjectInspectorModel::createWithHandlerFactoriesAndHelpSection( const Sequence< Any >& _rFactories, sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines )
     {
         impl_verifyArgument_throw( _rFactories.getLength() > 0, 1 );
@@ -210,7 +210,7 @@ namespace pcr
         enableHelpSectionProperties( _nMinHelpTextLines, _nMaxHelpTextLines );
     }
 
-    //--------------------------------------------------------------------
+
     void ObjectInspectorModel::impl_verifyArgument_throw( bool _bCondition, sal_Int16 _nArgumentPosition )
     {
         if ( !_bCondition )
@@ -221,7 +221,7 @@ namespace pcr
 } // namespace pcr
 //........................................................................
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ObjectInspectorModel()
 {
     ::pcr::OAutoRegistration< ::pcr::ObjectInspectorModel > aObjectInspectorModelRegistration;
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 1fef1572cc1c..e1c427b257d5 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -35,7 +35,7 @@ namespace pcr
     //========================================================================
     //= HelpIdUrl
     //========================================================================
-    //------------------------------------------------------------------------
+
     OString HelpIdUrl::getHelpId( const OUString& _rHelpURL )
     {
         INetURLObject aHID( _rHelpURL );
@@ -45,7 +45,7 @@ namespace pcr
             return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
     }
 
-    //------------------------------------------------------------------------
+
     OUString HelpIdUrl::getHelpURL( const OString& sHelpId )
     {
         OUStringBuffer aBuffer;
diff --git a/extensions/source/propctrlr/pcrservices.cxx b/extensions/source/propctrlr/pcrservices.cxx
index 49caa26c0e94..17b4749f0fc3 100644
--- a/extensions/source/propctrlr/pcrservices.cxx
+++ b/extensions/source/propctrlr/pcrservices.cxx
@@ -20,14 +20,14 @@
 
 #include "modulepcr.hxx"
 
-//---------------------------------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-//---------------------------------------------------------------------------------------
+
 
 extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController();
 extern "C" void SAL_CALL createRegistryInfo_FormController();
@@ -49,7 +49,7 @@ extern "C" void SAL_CALL createRegistryInfo_StringRepresentation();
 extern "C" void SAL_CALL createRegistryInfo_MasterDetailLinkDialog();
 extern "C" void SAL_CALL createRegistryInfo_FormGeometryHandler();
 
-//---------------------------------------------------------------------------------------
+
 
 extern "C" void SAL_CALL pcr_initializeModule()
 {
@@ -79,7 +79,7 @@ extern "C" void SAL_CALL pcr_initializeModule()
     }
 }
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL pcr_component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 93c4dade759a..d2dcc962b929 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -44,7 +44,7 @@ namespace pcr
     //====================================================================
     //= OTabOrderDialog
     //====================================================================
-    //---------------------------------------------------------------------
+
     OTabOrderDialog::OTabOrderDialog( const Reference< XComponentContext >& _rxContext )
         :OGenericUnoDialog( _rxContext )
     {
@@ -57,7 +57,7 @@ namespace pcr
             &m_xTabbingModel, ::getCppuType( &m_xTabbingModel ) );
     }
 
-    //---------------------------------------------------------------------
+
     OTabOrderDialog::~OTabOrderDialog()
     {
         if ( m_pDialog )
@@ -68,38 +68,38 @@ namespace pcr
         }
     }
 
-    //---------------------------------------------------------------------
+
     Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId(  ) throw(RuntimeException)
     {
         static ::cppu::OImplementationId aId;
         return aId.getImplementationId();
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OTabOrderDialog::Create( const Reference< XComponentContext >& _rxContext )
     {
         return *( new OTabOrderDialog( _rxContext ) );
     }
 
-    //---------------------------------------------------------------------
+
     OUString SAL_CALL OTabOrderDialog::getImplementationName() throw(RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //---------------------------------------------------------------------
+
     OUString OTabOrderDialog::getImplementationName_static() throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.form.ui.OTabOrderDialog");
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence SAL_CALL OTabOrderDialog::getSupportedServiceNames() throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //---------------------------------------------------------------------
+
     ::comphelper::StringSequence OTabOrderDialog::getSupportedServiceNames_static() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(2);
@@ -108,20 +108,20 @@ namespace pcr
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
     Reference<XPropertySetInfo>  SAL_CALL OTabOrderDialog::getPropertySetInfo() throw(RuntimeException)
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //---------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& OTabOrderDialog::getInfoHelper()
     {
         return *const_cast< OTabOrderDialog* >( this )->getArrayHelper();
     }
 
-    //--------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OTabOrderDialog::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -129,7 +129,7 @@ namespace pcr
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
 
-    //--------------------------------------------------------------------------
+
     Dialog* OTabOrderDialog::createDialog( Window* _pParent )
     {
         return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 9d6d93b7859f..fd30ffd41fe9 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -52,7 +52,7 @@
 #include <functional>
 #include <sal/macros.h>
 
-//------------------------------------------------------------------------
+
 // !!! outside the namespace !!!
 extern "C" void SAL_CALL createRegistryInfo_OPropertyBrowserController()
 {
@@ -82,7 +82,7 @@ namespace pcr
     //= OPropertyBrowserController
     //========================================================================
     DBG_NAME(OPropertyBrowserController)
-    //------------------------------------------------------------------------
+
     OPropertyBrowserController::OPropertyBrowserController( const Reference< XComponentContext >& _rxContext )
             :m_xContext(_rxContext)
             ,m_aDisposeListeners( m_aMutex )
@@ -96,7 +96,7 @@ namespace pcr
         DBG_CTOR(OPropertyBrowserController,NULL);
     }
 
-    //------------------------------------------------------------------------
+
     OPropertyBrowserController::~OPropertyBrowserController()
     {
         // stop listening for property changes
@@ -105,10 +105,10 @@ namespace pcr
         DBG_DTOR(OPropertyBrowserController,NULL);
     }
 
-    //------------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_REFCOUNT( OPropertyBrowserController, OPropertyBrowserController_Base )
 
-    //------------------------------------------------------------------------
+
     Any SAL_CALL OPropertyBrowserController::queryInterface( const Type& _rType ) throw (RuntimeException)
     {
         Any aReturn = OPropertyBrowserController_Base::queryInterface( _rType );
@@ -120,7 +120,7 @@ namespace pcr
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::startContainerWindowListening()
     {
         if (m_bContainerFocusListening)
@@ -139,7 +139,7 @@ namespace pcr
         DBG_ASSERT(m_bContainerFocusListening, "OPropertyBrowserController::startContainerWindowListening: unable to start listening (inconsistence)!");
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::stopContainerWindowListening()
     {
         if (!m_bContainerFocusListening)
@@ -158,13 +158,13 @@ namespace pcr
         DBG_ASSERT(!m_bContainerFocusListening, "OPropertyBrowserController::stopContainerWindowListening: unable to stop listening (inconsistence)!");
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XObjectInspectorModel > SAL_CALL OPropertyBrowserController::getInspectorModel() throw (RuntimeException)
     {
         return m_xModel;
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_initializeView_nothrow()
     {
         OSL_PRECOND( haveView(), "OPropertyBrowserController::impl_initializeView_nothrow: not to be called when we have no view!" );
@@ -186,7 +186,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_updateReadOnlyView_nothrow()
     {
         // this is a huge cudgel, admitted.
@@ -198,7 +198,7 @@ namespace pcr
         impl_rebindToInspectee_nothrow( m_aInspectedObjects );
     }
 
-    //--------------------------------------------------------------------
+
     bool OPropertyBrowserController::impl_isReadOnlyModel_throw() const
     {
         if ( !m_xModel.is() )
@@ -207,7 +207,7 @@ namespace pcr
         return m_xModel->getIsReadOnly();
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_startOrStopModelListening_nothrow( bool _bDoListen ) const
     {
         try
@@ -232,7 +232,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_bindToNewModel_nothrow( const Reference< XObjectInspectorModel >& _rxInspectorModel )
     {
         impl_startOrStopModelListening_nothrow( false );
@@ -248,7 +248,7 @@ namespace pcr
             impl_rebindToInspectee_nothrow( m_aInspectedObjects );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::setInspectorModel( const Reference< XObjectInspectorModel >& _inspectorModel ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -259,14 +259,14 @@ namespace pcr
         impl_bindToNewModel_nothrow( _inspectorModel );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XObjectInspectorUI > SAL_CALL OPropertyBrowserController::getInspectorUI() throw (RuntimeException)
     {
         // we're derived from this interface, though we do not expose it in queryInterface and getTypes.
         return this;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (com::sun::star::util::VetoException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -287,14 +287,14 @@ namespace pcr
 
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDispatch > SAL_CALL OPropertyBrowserController::queryDispatch( const URL& /*URL*/, const OUString& /*TargetFrameName*/, ::sal_Int32 /*SearchFlags*/ ) throw (RuntimeException)
     {
         // we don't have any dispatches at all, right now
         return Reference< XDispatch >();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Reference< XDispatch > > SAL_CALL OPropertyBrowserController::queryDispatches( const Sequence< DispatchDescriptor >& Requests ) throw (RuntimeException)
     {
         Sequence< Reference< XDispatch > > aReturn;
@@ -311,7 +311,7 @@ namespace pcr
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         if ( m_bConstructed )
@@ -336,13 +336,13 @@ namespace pcr
         throw IllegalArgumentException( OUString(), *this, 0 );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::createDefault()
     {
         m_bConstructed = true;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::createWithModel( const Reference< XObjectInspectorModel >& _rxModel )
     {
         osl_atomic_increment( &m_refCount );
@@ -354,7 +354,7 @@ namespace pcr
         m_bConstructed = true;
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -396,7 +396,7 @@ namespace pcr
         UpdateUI();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool SAL_CALL OPropertyBrowserController::attachModel( const Reference< XModel >& _rxModel ) throw(RuntimeException)
     {
         Reference< XObjectInspectorModel > xModel( _rxModel, UNO_QUERY );
@@ -407,7 +407,7 @@ namespace pcr
         return getInspectorModel() == _rxModel;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool OPropertyBrowserController::suspendAll_nothrow()
     {
         // if there is a handle inside its "onInteractivePropertySelection" method,
@@ -426,7 +426,7 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool OPropertyBrowserController::suspendPropertyHandlers_nothrow( sal_Bool _bSuspend )
     {
         PropertyHandlerArray aAllHandlers;  // will contain every handler exactly once
@@ -462,7 +462,7 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool SAL_CALL OPropertyBrowserController::suspend( sal_Bool _bSuspend ) throw(RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -489,13 +489,13 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------------
+
     Any SAL_CALL OPropertyBrowserController::getViewData(  ) throw(RuntimeException)
     {
         return makeAny( m_sPageSelection );
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::restoreViewData( const Any& Data ) throw(RuntimeException)
     {
         OUString sPageSelection;
@@ -506,20 +506,20 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XModel > SAL_CALL OPropertyBrowserController::getModel(  ) throw(RuntimeException)
     {
         // have no model
         return Reference< XModel >();
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XFrame > SAL_CALL OPropertyBrowserController::getFrame(  ) throw(RuntimeException)
     {
         return m_xFrame;
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::dispose(  ) throw(RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -545,19 +545,19 @@ namespace pcr
         impl_bindToNewModel_nothrow( NULL );
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::addEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException)
     {
         m_aDisposeListeners.addInterface(_rxListener);
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::removeEventListener( const Reference< XEventListener >& _rxListener ) throw(RuntimeException)
     {
         m_aDisposeListeners.removeInterface(_rxListener);
     }
 
-    //------------------------------------------------------------------------
+
     OUString SAL_CALL OPropertyBrowserController::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_static();
@@ -568,19 +568,19 @@ namespace pcr
         return cppu::supportsService(this, ServiceName);
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OPropertyBrowserController::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //------------------------------------------------------------------------
+
     OUString OPropertyBrowserController::getImplementationName_static(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.extensions.ObjectInspector");
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > OPropertyBrowserController::getSupportedServiceNames_static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -588,13 +588,13 @@ namespace pcr
         return aSupported;
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OPropertyBrowserController::Create(const Reference< XComponentContext >& _rxContext)
     {
         return *(new OPropertyBrowserController( _rxContext ) );
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::focusGained( const FocusEvent& _rSource ) throw (RuntimeException)
     {
         Reference< XWindow > xSourceWindow(_rSource.Source, UNO_QUERY);
@@ -609,13 +609,13 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::focusLost( const FocusEvent& /*_rSource*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::disposing( const EventObject& _rSource ) throw(RuntimeException)
     {
         if ( m_xView.is() && ( m_xView == _rSource.Source ) )
@@ -637,14 +637,14 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OPropertyBrowserController, OnPageActivation)
     {
         updateViewDataFromActivePage();
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::updateViewDataFromActivePage()
     {
         if (!haveView())
@@ -675,7 +675,7 @@ namespace pcr
             m_sLastValidPageSelection = sOldSelection;
     }
 
-    //------------------------------------------------------------------------
+
     sal_uInt16 OPropertyBrowserController::impl_getPageIdForCategory_nothrow( const OUString& _rCategoryName ) const
     {
         sal_uInt16 nPageId = (sal_uInt16)-1;
@@ -685,7 +685,7 @@ namespace pcr
         return nPageId;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::selectPageFromViewData()
     {
         sal_uInt16 nNewPage = impl_getPageIdForCategory_nothrow( m_sPageSelection );
@@ -697,7 +697,7 @@ namespace pcr
         updateViewDataFromActivePage();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool OPropertyBrowserController::Construct(Window* _pParentWin)
     {
         DBG_ASSERT(!haveView(), "OPropertyBrowserController::Construct: already have a view!");
@@ -723,7 +723,7 @@ namespace pcr
         return sal_True;
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
     {
         if ( _rEvent.Source == m_xModel )
@@ -761,7 +761,7 @@ namespace pcr
             impl_broadcastPropertyChange_nothrow( _rEvent.PropertyName, aNewValue, _rEvent.OldValue, false );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::createPropertyControl( ::sal_Int16 ControlType, ::sal_Bool _CreateReadOnly ) throw (IllegalArgumentException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -833,7 +833,7 @@ namespace pcr
         return xControl;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_toggleInspecteeListening_nothrow( bool _bOn )
     {
         for (   InterfaceArray::const_iterator loop = m_aInspectedObjects.begin();
@@ -859,7 +859,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::stopInspection( bool _bCommitModified )
     {
         if ( haveView() )
@@ -929,14 +929,14 @@ namespace pcr
         clearContainer( m_aDependencyHandlers );
     }
 
-    //------------------------------------------------------------------------
+
     bool OPropertyBrowserController::impl_hasPropertyHandlerFor_nothrow( const OUString& _rPropertyName ) const
     {
         PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName );
         return ( handlerPos != m_aPropertyHandlers.end() );
     }
 
-    //------------------------------------------------------------------------
+
     OPropertyBrowserController::PropertyHandlerRef OPropertyBrowserController::impl_getHandlerForProperty_throw( const OUString& _rPropertyName ) const
     {
         PropertyHandlerRepository::const_iterator handlerPos = m_aPropertyHandlers.find( _rPropertyName );
@@ -945,14 +945,14 @@ namespace pcr
         return handlerPos->second;
     }
 
-    //------------------------------------------------------------------------
+
     Any OPropertyBrowserController::impl_getPropertyValue_throw( const OUString& _rPropertyName )
     {
         PropertyHandlerRef handler = impl_getHandlerForProperty_throw( _rPropertyName );
         return handler->getPropertyValue( _rPropertyName );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_rebindToInspectee_nothrow( const InterfaceArray& _rObjects )
     {
         try
@@ -974,7 +974,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::doInspection()
     {
         try
@@ -1103,7 +1103,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::getMinimumSize() throw (::com::sun::star::uno::RuntimeException)
     {
         ::com::sun::star::awt::Size aSize;
@@ -1113,13 +1113,13 @@ namespace pcr
             return aSize;
     }
 
-    //------------------------------------------------------------------------
+
     ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::getPreferredSize() throw (::com::sun::star::uno::RuntimeException)
     {
         return getMinimumSize();
     }
 
-    //------------------------------------------------------------------------
+
     ::com::sun::star::awt::Size SAL_CALL OPropertyBrowserController::calcAdjustedSize( const ::com::sun::star::awt::Size& _rNewSize ) throw (::com::sun::star::uno::RuntimeException)
     {
         awt::Size aMinSize = getMinimumSize( );
@@ -1131,7 +1131,7 @@ namespace pcr
         return aAdjustedSize;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::describePropertyLine( const Property& _rProperty, OLineDescriptor& _rDescriptor ) SAL_THROW((Exception))
     {
         try
@@ -1174,7 +1174,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_buildCategories_throw()
     {
         OSL_PRECOND( m_aPageIds.empty(), "OPropertyBrowserController::impl_buildCategories_throw: duplicate call!" );
@@ -1196,7 +1196,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::UpdateUI()
     {
         try
@@ -1310,7 +1310,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::Clicked( const OUString& _rName, sal_Bool _bPrimary )
     {
         try
@@ -1354,7 +1354,7 @@ namespace pcr
         m_xInteractiveHandler = NULL;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool SAL_CALL OPropertyBrowserController::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
     {
         for (   OrderedPropertyMap::const_iterator search = m_aProperties.begin();
@@ -1366,7 +1366,7 @@ namespace pcr
         return false;
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::Commit( const OUString& rName, const Any& _rValue )
     {
         try
@@ -1425,24 +1425,24 @@ namespace pcr
         m_sCommittingProperty = "";
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBrowserController::focusGained( const Reference< XPropertyControl >& _Control )
     {
         m_aControlObservers.notifyEach( &XPropertyControlObserver::focusGained, _Control );
     }
 
-    //--------------------------------------------------------------------
+
     void OPropertyBrowserController::valueChanged( const Reference< XPropertyControl >& _Control )
     {
         m_aControlObservers.notifyEach( &XPropertyControlObserver::valueChanged, _Control );
     }
 
-    //------------------------------------------------------------------------
+
     namespace
     {
         Reference< XPropertyHandler > lcl_createHandler( const Reference<XComponentContext>& _rContext, const Any& _rFactoryDescriptor )
@@ -1464,7 +1464,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::getPropertyHandlers( const InterfaceArray& _rObjects, PropertyHandlerArray& _rHandlers )
     {
         _rHandlers.resize( 0 );
@@ -1540,7 +1540,7 @@ namespace pcr
         // properties they feel responsible for
     }
 
-    //------------------------------------------------------------------------
+
     bool OPropertyBrowserController::impl_findObjectProperty_nothrow( const OUString& _rName, OrderedPropertyMap::const_iterator* _pProperty )
     {
         OrderedPropertyMap::const_iterator search = m_aProperties.begin();
@@ -1552,7 +1552,7 @@ namespace pcr
         return ( search != m_aProperties.end() );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::rebuildPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1576,7 +1576,7 @@ namespace pcr
         getPropertyBox().ChangeEntry( aDescriptor );
    }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::enablePropertyUI( const OUString& _rPropertyName, sal_Bool _bEnable ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1589,7 +1589,7 @@ namespace pcr
         getPropertyBox().EnablePropertyLine( _rPropertyName, _bEnable );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::enablePropertyUIElements( const OUString& _rPropertyName, sal_Int16 _nElements, sal_Bool _bEnable ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1602,7 +1602,7 @@ namespace pcr
         getPropertyBox().EnablePropertyControls( _rPropertyName, _nElements, _bEnable );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::showPropertyUI( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1652,7 +1652,7 @@ namespace pcr
             aDescriptor, impl_getPageIdForCategory_nothrow( aDescriptor.Category ), nUIPos );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::hidePropertyUI( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1665,7 +1665,7 @@ namespace pcr
         getPropertyBox().RemoveEntry( _rPropertyName );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::showCategory( const OUString& _rCategory, sal_Bool _bShow ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1678,7 +1678,7 @@ namespace pcr
         getPropertyBox().ShowPropertyPage( nPageId, _bShow );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XPropertyControl > SAL_CALL OPropertyBrowserController::getPropertyControl( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1689,19 +1689,19 @@ namespace pcr
         return xControl;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::registerControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
     {
         m_aControlObservers.addInterface( _Observer );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::revokeControlObserver( const Reference< XPropertyControlObserver >& _Observer ) throw (RuntimeException)
     {
         m_aControlObservers.removeInterface( _Observer );
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OPropertyBrowserController::setHelpSectionText( const OUString& _rHelpText ) throw (NoSupportException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1716,7 +1716,7 @@ namespace pcr
         getPropertyBox().SetHelpText( _rHelpText );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyBrowserController::impl_broadcastPropertyChange_nothrow( const OUString& _rPropertyName, const Any& _rNewValue, const Any& _rOldValue, bool _bFirstTimeInit ) const
     {
         // are there one or more handlers which are interested in the actuation?
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index cbc14a316bde..517f3325c058 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -43,7 +43,7 @@ namespace pcr
     //====================================================================
     namespace
     {
-        //----------------------------------------------------------------
+
         struct SetPropertyValue : public ::std::unary_function< Reference< XPropertyHandler >, void >
         {
             OUString sPropertyName;
@@ -55,7 +55,7 @@ namespace pcr
             }
         };
 
-        //----------------------------------------------------------------
+
         template < class BagType >
         void putIntoBag( const Sequence< typename BagType::value_type >& _rArray, BagType& /* [out] */ _rBag )
         {
@@ -63,7 +63,7 @@ namespace pcr
                 ::std::insert_iterator< BagType >( _rBag, _rBag.begin() ) );
         }
 
-        //----------------------------------------------------------------
+
         template < class BagType >
         void copyBagToArray( const BagType& /* [out] */ _rBag, Sequence< typename BagType::value_type >& _rArray )
         {
@@ -81,7 +81,7 @@ namespace pcr
     // which is O( n * k ) at worst (n being the number of handlers, k being the maximum number
     // of supported properties per handler). Shouldn't we cache this? So that it is O( log k )?
 
-    //--------------------------------------------------------------------
+
     PropertyComposer::PropertyComposer( const ::std::vector< Reference< XPropertyHandler > >& _rSlaveHandlers )
         :PropertyComposer_Base          ( m_aMutex          )
         ,m_aSlaveHandlers               ( _rSlaveHandlers   )
@@ -107,7 +107,7 @@ namespace pcr
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::inspect( const Reference< XInterface >& _rxIntrospectee ) throw (RuntimeException, NullPointerException)
     {
         MethodGuard aGuard( *this );
@@ -121,35 +121,35 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL PropertyComposer::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->getPropertyValue( _rPropertyName );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException, PropertyVetoException)
     {
         MethodGuard aGuard( *this );
         ::std::for_each( m_aSlaveHandlers.begin(), m_aSlaveHandlers.end(), SetPropertyValue( _rPropertyName, _rValue ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL PropertyComposer::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->convertToPropertyValue( _rPropertyName, _rControlValue );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL PropertyComposer::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->convertToControlValue( _rPropertyName, _rPropertyValue, _rControlValueType );
     }
 
-    //--------------------------------------------------------------------
+
     PropertyState SAL_CALL PropertyComposer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -188,21 +188,21 @@ namespace pcr
         return eState;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.addListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.removeListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL PropertyComposer::getSupportedProperties() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -258,7 +258,7 @@ namespace pcr
         return aSurvived;
     }
 
-    //--------------------------------------------------------------------
+
     void uniteStringArrays( const PropertyComposer::HandlerArray& _rHandlers, Sequence< OUString > (SAL_CALL XPropertyHandler::*pGetter)( void ),
         Sequence< OUString >& /* [out] */ _rUnion )
     {
@@ -277,7 +277,7 @@ namespace pcr
         copyBagToArray( aUnitedBag, _rUnion );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL PropertyComposer::getSupersededProperties( ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -288,7 +288,7 @@ namespace pcr
         return aSuperseded;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL PropertyComposer::getActuatingProperties( ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -299,7 +299,7 @@ namespace pcr
         return aActuating;
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL PropertyComposer::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
@@ -308,14 +308,14 @@ namespace pcr
         return m_aSlaveHandlers[0]->describePropertyLine( _rPropertyName, _rxControlFactory );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL PropertyComposer::isComposable( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_aSlaveHandlers[0]->isComposable( _rPropertyName );
     }
 
-    //--------------------------------------------------------------------
+
     InteractiveSelectionResult SAL_CALL PropertyComposer::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -366,7 +366,7 @@ namespace pcr
         return eResult;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyComposer::impl_ensureUIRequestComposer( const Reference< XObjectInspectorUI >& _rxInspectorUI )
     {
         OSL_ENSURE( !m_pUIRequestComposer.get() || m_pUIRequestComposer->getDelegatorUI().get() == _rxInspectorUI.get(),
@@ -376,7 +376,7 @@ namespace pcr
             m_pUIRequestComposer.reset( new ComposedPropertyUIUpdate( _rxInspectorUI, this ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -412,10 +412,10 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XCOMPONENT( PropertyComposer, PropertyComposer_Base )
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::disposing()
     {
         MethodGuard aGuard( *this );
@@ -437,7 +437,7 @@ namespace pcr
         m_pUIRequestComposer.reset();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
     {
         if ( !impl_isSupportedProperty_nothrow( evt.PropertyName ) )
@@ -456,14 +456,14 @@ namespace pcr
         m_aPropertyListeners.notify( aTranslatedEvent, &XPropertyChangeListener::propertyChange );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyComposer::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_aPropertyListeners.disposing( Source );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL PropertyComposer::suspend( sal_Bool _bSuspend ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -492,7 +492,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL PropertyComposer::hasPropertyByName( const OUString& _rName ) throw (RuntimeException)
     {
         return impl_isSupportedProperty_nothrow( _rName );
diff --git a/extensions/source/propctrlr/propertycontrolextender.cxx b/extensions/source/propctrlr/propertycontrolextender.cxx
index 56b375693b84..76bf639ee5a8 100644
--- a/extensions/source/propctrlr/propertycontrolextender.cxx
+++ b/extensions/source/propctrlr/propertycontrolextender.cxx
@@ -60,7 +60,7 @@ namespace pcr
     //====================================================================
     //= PropertyControlExtender
     //====================================================================
-    //--------------------------------------------------------------------
+
     PropertyControlExtender::PropertyControlExtender( const Reference< XPropertyControl >& _rxObservedControl )
         :m_pData( new PropertyControlExtender_Data )
     {
@@ -76,12 +76,12 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     PropertyControlExtender::~PropertyControlExtender()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlExtender::keyPressed( const KeyEvent& _event ) throw (RuntimeException)
     {
         OSL_ENSURE( _event.Source == m_pData->xControlWindow, "PropertyControlExtender::keyPressed: where does this come from?" );
@@ -110,13 +110,13 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlExtender::keyReleased( const KeyEvent& /*_event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyControlExtender::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         OSL_ENSURE( Source.Source == m_pData->xControlWindow, "PropertyControlExtender::disposing: where does this come from?" );
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index e6f017d74215..850a5db29398 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -41,7 +41,7 @@ namespace pcr
     // class OPropertyEditor
     //==================================================================
     DBG_NAME(OPropertyEditor)
-    //------------------------------------------------------------------
+
     OPropertyEditor::OPropertyEditor( Window* pParent, WinBits nWinStyle)
             :Control(pParent, nWinStyle)
             ,m_aTabControl( this )
@@ -59,7 +59,7 @@ namespace pcr
         m_aTabControl.SetPaintTransparent(true);
     }
 
-    //------------------------------------------------------------------
+
     OPropertyEditor::~OPropertyEditor()
     {
         Hide();
@@ -67,7 +67,7 @@ namespace pcr
         DBG_DTOR(OPropertyEditor,NULL);
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::ClearAll()
     {
         m_nNextId=1;
@@ -97,7 +97,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OPropertyEditor::getMinimumHeight()
     {
         sal_Int32 nMinHeight( LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM );
@@ -121,7 +121,7 @@ namespace pcr
         return nMinHeight;
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OPropertyEditor::getMinimumWidth()
     {
         sal_uInt16 nCount = m_aTabControl.GetPageCount();
@@ -140,7 +140,7 @@ namespace pcr
         return nPageMinWidth+6;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::CommitModified()
     {
         // commit all of my pages, if necessary
@@ -156,13 +156,13 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::GetFocus()
     {
         m_aTabControl.GrabFocus();
     }
 
-    //------------------------------------------------------------------
+
     OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName )
     {
         OBrowserPage* pPage = NULL;
@@ -172,25 +172,25 @@ namespace pcr
         return pPage;
     }
 
-    //------------------------------------------------------------------
+
     const OBrowserPage* OPropertyEditor::getPage( const OUString& _rPropertyName ) const
     {
         return const_cast< OPropertyEditor* >( this )->getPage( _rPropertyName );
     }
 
-    //------------------------------------------------------------------
+
     OBrowserPage* OPropertyEditor::getPage( sal_uInt16& _rPageId )
     {
         return static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( _rPageId ) );
     }
 
-    //------------------------------------------------------------------
+
     const OBrowserPage* OPropertyEditor::getPage( sal_uInt16& _rPageId ) const
     {
         return const_cast< OPropertyEditor* >( this )->getPage( _rPageId );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::Resize()
     {
         Rectangle aPlayground(
@@ -205,7 +205,7 @@ namespace pcr
         m_aTabControl.SetPosSizePixel( aTabArea.TopLeft(), aTabArea.GetSize() );
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OPropertyEditor::AppendPage( const OUString & _rText, const OString& _rHelpId )
     {
         // obtain a new id
@@ -231,14 +231,14 @@ namespace pcr
         return nId;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetHelpId( const OString& rHelpId )
     {
         Control::SetHelpId("");
         m_aTabControl.SetHelpId(rHelpId);
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::RemovePage(sal_uInt16 nID)
     {
         OBrowserPage* pPage = static_cast<OBrowserPage*>(m_aTabControl.GetTabPage(nID));
@@ -250,13 +250,13 @@ namespace pcr
             delete pPage;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetPage(sal_uInt16 nId)
     {
         m_aTabControl.SetCurPageId(nId);
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OPropertyEditor::GetCurPage()
     {
         if(m_aTabControl.GetPageCount()>0)
@@ -265,7 +265,7 @@ namespace pcr
             return 0;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::Update(const ::std::mem_fun_t<void,OBrowserListBox>& _aUpdateFunction)
     {
         // forward this to all our pages
@@ -278,18 +278,18 @@ namespace pcr
                 _aUpdateFunction(&pPage->getListBox());
         }
     }
-    //------------------------------------------------------------------
+
     void OPropertyEditor::EnableUpdate()
     {
         Update(::std::mem_fun(&OBrowserListBox::EnableUpdate));
     }
-    //------------------------------------------------------------------
+
     void OPropertyEditor::DisableUpdate()
     {
         Update(::std::mem_fun(&OBrowserListBox::DisableUpdate));
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::forEachPage( PageOperation _pOperation, const void* _pArgument )
     {
         sal_uInt16 nCount = m_aTabControl.GetPageCount();
@@ -303,52 +303,52 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::setPageLineListener( OBrowserPage& _rPage, const void* )
     {
         _rPage.getListBox().SetListener( m_pListener );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetLineListener(IPropertyLineListener* _pListener)
     {
         m_pListener = _pListener;
         forEachPage( &OPropertyEditor::setPageLineListener );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::setPageControlObserver( OBrowserPage& _rPage, const void* )
     {
         _rPage.getListBox().SetObserver( m_pObserver );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetControlObserver( IPropertyControlObserver* _pObserver )
     {
         m_pObserver = _pObserver;
         forEachPage( &OPropertyEditor::setPageControlObserver );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::EnableHelpSection( bool _bEnable )
     {
         m_bHasHelpSection = _bEnable;
         forEachPage( &OPropertyEditor::enableHelpSection );
     }
 
-    //------------------------------------------------------------------
+
     bool OPropertyEditor::HasHelpSection() const
     {
         return m_bHasHelpSection;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetHelpText( const OUString& _rHelpText )
     {
         forEachPage( &OPropertyEditor::setHelpSectionText, &_rHelpText );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines )
     {
         m_nMinHelpLines = _nMinLines;
@@ -356,13 +356,13 @@ namespace pcr
         forEachPage( &OPropertyEditor::setHelpLineLimits );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::enableHelpSection( OBrowserPage& _rPage, const void* )
     {
         _rPage.getListBox().EnableHelpSection( m_bHasHelpSection );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString )
     {
         OSL_ENSURE( _pPointerToOUString, "OPropertyEditor::setHelpSectionText: invalid argument!" );
@@ -373,13 +373,13 @@ namespace pcr
         _rPage.getListBox().SetHelpText( rText );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::setHelpLineLimits( OBrowserPage& _rPage, const void* )
     {
         _rPage.getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines );
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OPropertyEditor::InsertEntry( const OLineDescriptor& rData, sal_uInt16 _nPageId, sal_uInt16 nPos )
     {
         // let the current page handle this
@@ -397,7 +397,7 @@ namespace pcr
         return nEntry;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::RemoveEntry( const OUString& _rName )
     {
         OBrowserPage* pPage = getPage( _rName );
@@ -411,7 +411,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::ChangeEntry( const OLineDescriptor& rData )
     {
         OBrowserPage* pPage = getPage( rData.sName );
@@ -419,7 +419,7 @@ namespace pcr
             pPage->getListBox().ChangeEntry( rData, EDITOR_LIST_REPLACE_EXISTING );
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::SetPropertyValue( const OUString& rEntryName, const Any& _rValue, bool _bUnknownValue )
     {
         OBrowserPage* pPage = getPage( rEntryName );
@@ -427,7 +427,7 @@ namespace pcr
             pPage->getListBox().SetPropertyValue( rEntryName, _rValue, _bUnknownValue );
     }
 
-    //------------------------------------------------------------------
+
     sal_uInt16 OPropertyEditor::GetPropertyPos( const OUString& rEntryName ) const
     {
         sal_uInt16 nVal=LISTBOX_ENTRY_NOTFOUND;
@@ -437,7 +437,7 @@ namespace pcr
         return nVal;
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::ShowPropertyPage( sal_uInt16 _nPageId, bool _bShow )
     {
         if ( !_bShow )
@@ -464,7 +464,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::EnablePropertyControls( const OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable )
     {
         for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i )
@@ -475,7 +475,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void OPropertyEditor::EnablePropertyLine( const OUString& _rEntryName, bool _bEnable )
     {
         for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i )
@@ -486,7 +486,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Reference< XPropertyControl > OPropertyEditor::GetPropertyControl(const OUString& rEntryName)
     {
         Reference< XPropertyControl > xControl;
@@ -497,7 +497,7 @@ namespace pcr
         return xControl;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OPropertyEditor, OnPageActivate)
     {
         if (m_aPageActivationHandler.IsSet())
@@ -505,7 +505,7 @@ namespace pcr
         return 0L;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OPropertyEditor, OnPageDeactivate)
     {
         // commit the data on the current (to-be-decativated) tab page
diff --git a/extensions/source/propctrlr/propeventtranslation.cxx b/extensions/source/propctrlr/propeventtranslation.cxx
index 163634fe57d9..2e08ea928ada 100644
--- a/extensions/source/propctrlr/propeventtranslation.cxx
+++ b/extensions/source/propctrlr/propeventtranslation.cxx
@@ -39,7 +39,7 @@ namespace pcr
     //====================================================================
     //= PropertyEventTranslation
     //====================================================================
-    //--------------------------------------------------------------------
+
     PropertyEventTranslation::PropertyEventTranslation( const Reference< XPropertyChangeListener >& _rxDelegator,
         const Reference< XInterface >& _rxTranslatedEventSource )
         :m_xDelegator( _rxDelegator )
@@ -49,7 +49,7 @@ namespace pcr
             throw NullPointerException();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyEventTranslation::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
     {
         if ( !m_xDelegator.is() )
@@ -65,7 +65,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL PropertyEventTranslation::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         if ( !m_xDelegator.is() )
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 8d65391b9cc9..0278b036481c 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -35,7 +35,7 @@ namespace pcr
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::form;
 
-    //------------------------------------------------------------------------
+
     namespace
     {
         static const sal_Int32 s_nFirstVirtualButtonType = 1 + (sal_Int32)FormButtonType_URL;
@@ -79,7 +79,7 @@ namespace pcr
     //========================================================================
     //= PushButtonNavigation
     //========================================================================
-    //------------------------------------------------------------------------
+
     PushButtonNavigation::PushButtonNavigation( const Reference< XPropertySet >& _rxControlModel )
         :m_xControlModel( _rxControlModel )
         ,m_bIsPushButton( sal_False )
@@ -96,7 +96,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int32 PushButtonNavigation::implGetCurrentButtonType() const SAL_THROW((Exception))
     {
         sal_Int32 nButtonType = FormButtonType_PUSH;
@@ -119,7 +119,7 @@ namespace pcr
         return nButtonType;
     }
 
-    //------------------------------------------------------------------------
+
     Any PushButtonNavigation::getCurrentButtonType() const SAL_THROW(())
     {
         OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::getCurrentButtonType: not expected to be called for forms!" );
@@ -136,7 +136,7 @@ namespace pcr
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void PushButtonNavigation::setCurrentButtonType( const Any& _rValue ) const SAL_THROW(())
     {
         OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::setCurrentButtonType: not expected to be called for forms!" );
@@ -167,7 +167,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     PropertyState PushButtonNavigation::getCurrentButtonTypeState( ) const SAL_THROW(())
     {
         OSL_ENSURE( m_bIsPushButton, "PushButtonNavigation::getCurrentButtonTypeState: not expected to be called for forms!" );
@@ -201,7 +201,7 @@ namespace pcr
         return eState;
     }
 
-    //------------------------------------------------------------------------
+
     Any PushButtonNavigation::getCurrentTargetURL() const SAL_THROW(())
     {
         Any aReturn;
@@ -231,7 +231,7 @@ namespace pcr
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void PushButtonNavigation::setCurrentTargetURL( const Any& _rValue ) const SAL_THROW(())
     {
         if ( !m_xControlModel.is() )
@@ -247,7 +247,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------------
+
     PropertyState PushButtonNavigation::getCurrentTargetURLState( ) const SAL_THROW(())
     {
         PropertyState eState = PropertyState_DIRECT_VALUE;
@@ -268,7 +268,7 @@ namespace pcr
         return eState;
     }
 
-    //------------------------------------------------------------------------
+
     bool PushButtonNavigation::currentButtonTypeIsOpenURL() const
     {
         sal_Int32 nButtonType( FormButtonType_PUSH );
@@ -283,7 +283,7 @@ namespace pcr
         return nButtonType == FormButtonType_URL;
     }
 
-    //------------------------------------------------------------------------
+
     bool PushButtonNavigation::hasNonEmptyCurrentTargetURL() const
     {
         OUString sTargetURL;
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index 154c34e998a2..d85e626a99fd 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -47,7 +47,7 @@ namespace pcr
     // OSelectLabelDialog
     //========================================================================
     DBG_NAME(OSelectLabelDialog)
-    //------------------------------------------------------------------------
+
     OSelectLabelDialog::OSelectLabelDialog( Window* pParent, Reference< XPropertySet >  _xControlModel )
         :ModalDialog(pParent, PcrRes(RID_DLG_SELECTLABELCONTROL))
         ,m_aMainDesc(this, PcrRes(1))
@@ -150,7 +150,7 @@ namespace pcr
         FreeResource();
     }
 
-    //------------------------------------------------------------------------
+
     OSelectLabelDialog::~OSelectLabelDialog()
     {
         // delete the entry datas of the listbox entries
@@ -166,7 +166,7 @@ namespace pcr
         DBG_DTOR(OSelectLabelDialog,NULL);
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int32 OSelectLabelDialog::InsertEntries(const Reference< XInterface > & _xContainer, SvTreeListEntry* pContainerEntry)
     {
         Reference< XIndexAccess >  xContainer(_xContainer, UNO_QUERY);
@@ -241,7 +241,7 @@ namespace pcr
         return nChildren;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK(OSelectLabelDialog, OnEntrySelected, SvTreeListBox*, pLB)
     {
         DBG_ASSERT(pLB == &m_aControlTree, "OSelectLabelDialog::OnEntrySelected : where did this come from ?");
@@ -259,7 +259,7 @@ namespace pcr
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, Button*, pButton)
     {
         DBG_ASSERT(pButton == &m_aNoAssignment, "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?");
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 4672ac6ff147..f286d9bf2275 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -89,7 +89,7 @@ namespace pcr
     //====================================================================
     //= ISQLCommandAdapter
     //====================================================================
-    //--------------------------------------------------------------------
+
     ISQLCommandAdapter::~ISQLCommandAdapter()
     {
     }
@@ -97,7 +97,7 @@ namespace pcr
     //====================================================================
     //= SQLCommandDesigner
     //====================================================================
-    //--------------------------------------------------------------------
+
     SQLCommandDesigner::SQLCommandDesigner( const Reference< XComponentContext >& _rxContext,
             const ::rtl::Reference< ISQLCommandAdapter >& _rxPropertyAdapter,
             const ::dbtools::SharedConnection& _rConnection, const Link& _rCloseLink )
@@ -114,12 +114,12 @@ namespace pcr
         impl_doOpenDesignerFrame_nothrow();
     }
 
-    //--------------------------------------------------------------------
+
     SQLCommandDesigner::~SQLCommandDesigner()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL SQLCommandDesigner::propertyChange( const PropertyChangeEvent& Event ) throw (RuntimeException)
     {
         OSL_ENSURE( m_xDesigner.is() && ( Event.Source == m_xDesigner ), "SQLCommandDesigner::propertyChange: where did this come from?" );
@@ -150,7 +150,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL SQLCommandDesigner::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         if ( m_xDesigner.is() && ( Source.Source == m_xDesigner ) )
@@ -160,7 +160,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SQLCommandDesigner::dispose()
     {
         if ( impl_isDisposed() )
@@ -174,28 +174,28 @@ namespace pcr
         m_xORB.clear();
     }
 
-    //--------------------------------------------------------------------
+
     void SQLCommandDesigner::impl_checkDisposed_throw() const
     {
         if ( impl_isDisposed() )
             throw DisposedException();
     }
 
-    //--------------------------------------------------------------------
+
     void SQLCommandDesigner::raise() const
     {
         impl_checkDisposed_throw();
         impl_raise_nothrow();
     }
 
-    //------------------------------------------------------------------------
+
     bool SQLCommandDesigner::suspend() const
     {
         impl_checkDisposed_throw();
         return impl_trySuspendDesigner_nothrow();
     }
 
-    //--------------------------------------------------------------------
+
     void SQLCommandDesigner::impl_raise_nothrow() const
     {
         OSL_PRECOND( isActive(), "SQLCommandDesigner::impl_raise_nothrow: not active!" );
@@ -218,7 +218,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SQLCommandDesigner::impl_doOpenDesignerFrame_nothrow()
     {
         OSL_PRECOND( !isActive(),
@@ -284,7 +284,7 @@ namespace pcr
         osl_atomic_decrement(&m_refCount);
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XFrame > SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow( ) const
     {
         OSL_PRECOND( m_xORB.is(), "SQLCommandDesigner::impl_createEmptyParentlessTask_nothrow: this will crash!" );
@@ -306,14 +306,14 @@ namespace pcr
         return xFrame;
     }
 
-    //------------------------------------------------------------------------
+
     void SQLCommandDesigner::impl_designerClosed_nothrow()
     {
         if ( m_aCloseLink.IsSet() )
             m_aCloseLink.Call( this );
     }
 
-    //------------------------------------------------------------------------
+
     void SQLCommandDesigner::impl_closeDesigner_nothrow()
     {
         OSL_PRECOND( isActive(), "SQLCommandDesigner::impl_closeDesigner_nothrow: invalid calle!" );
@@ -355,7 +355,7 @@ namespace pcr
         m_xDesigner.clear();
     }
 
-    //------------------------------------------------------------------------
+
     bool SQLCommandDesigner::impl_trySuspendDesigner_nothrow() const
     {
         OSL_PRECOND( isActive(), "SQLCommandDesigner::impl_trySuspendDesigner_nothrow: no active designer, this will crash!" );
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index d5e4e5371cd1..54f3ccd7381b 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -67,7 +67,7 @@ namespace pcr
     //==================================================================
     //= OTimeControl
     //==================================================================
-    //------------------------------------------------------------------
+
     OTimeControl::OTimeControl( Window* pParent, WinBits nWinStyle )
         :OTimeControl_Base( PropertyControlType::TimeField, pParent, nWinStyle )
     {
@@ -76,7 +76,7 @@ namespace pcr
         getTypedControlWindow()->EnableEmptyFieldValue( true );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         util::Time aUNOTime;
@@ -92,7 +92,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OTimeControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -103,7 +103,7 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OTimeControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< util::Time* >( NULL ) );
@@ -112,7 +112,7 @@ namespace pcr
     //==================================================================
     //= ODateControl
     //==================================================================
-    //------------------------------------------------------------------
+
     ODateControl::ODateControl( Window* pParent, WinBits nWinStyle )
         :ODateControl_Base( PropertyControlType::DateField, pParent, nWinStyle | WB_DROPDOWN )
     {
@@ -128,7 +128,7 @@ namespace pcr
         pControlWindow->EnableEmptyFieldValue( true );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ODateControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         util::Date aUNODate;
@@ -144,7 +144,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ODateControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -157,7 +157,7 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL ODateControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< util::Date* >( NULL ) );
@@ -166,7 +166,7 @@ namespace pcr
     //==================================================================
     //= OEditControl
     //==================================================================
-    //------------------------------------------------------------------
+
     OEditControl::OEditControl(Window* _pParent, sal_Bool _bPW, WinBits _nWinStyle)
         :OEditControl_Base( _bPW ? PropertyControlType::CharacterField : PropertyControlType::TextField, _pParent, _nWinStyle )
     {
@@ -176,7 +176,7 @@ namespace pcr
            getTypedControlWindow()->SetMaxTextLen( 1 );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         OUString sText;
@@ -195,7 +195,7 @@ namespace pcr
         getTypedControlWindow()->SetText( sText );
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OEditControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -212,13 +212,13 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OEditControl::getValueType() throw (RuntimeException)
     {
         return m_bIsPassword ? ::getCppuType( static_cast< sal_Int16* >( NULL ) ) : ::getCppuType( static_cast< OUString* >( NULL ) );
     }
 
-    //------------------------------------------------------------------
+
     void OEditControl::modified()
     {
         OEditControl_Base::modified();
@@ -228,7 +228,7 @@ namespace pcr
             m_aImplControl.notifyModifiedValue();
     }
 
-    //------------------------------------------------------------------
+
     static long ImplCalcLongValue( double nValue, sal_uInt16 nDigits )
     {
         double n = nValue;
@@ -240,7 +240,7 @@ namespace pcr
         return (long)n;
     }
 
-    //------------------------------------------------------------------
+
     static double ImplCalcDoubleValue( long nValue, sal_uInt16 nDigits )
     {
         double n = nValue;
@@ -252,7 +252,7 @@ namespace pcr
     //==================================================================
     // class ODateTimeControl
     //==================================================================
-    //------------------------------------------------------------------
+
     ODateTimeControl::ODateTimeControl( Window* _pParent, WinBits _nWinStyle)
         :ODateTimeControl_Base( PropertyControlType::DateTimeField, _pParent, _nWinStyle )
     {
@@ -268,7 +268,7 @@ namespace pcr
         getTypedControlWindow()->SetFormatKey( nStandardDateTimeFormat );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ODateTimeControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         if ( !_rValue.hasValue() )
@@ -288,7 +288,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ODateTimeControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -316,7 +316,7 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL ODateTimeControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< util::DateTime* >( NULL ) );
@@ -325,7 +325,7 @@ namespace pcr
     //========================================================================
     //= HyperlinkInput
     //========================================================================
-    //--------------------------------------------------------------------
+
     HyperlinkInput::HyperlinkInput( Window* _pParent, WinBits _nWinStyle )
         :Edit( _pParent, _nWinStyle )
     {
@@ -346,7 +346,7 @@ namespace pcr
         SetSettings( aAllSettings );
     }
 
-    //--------------------------------------------------------------------
+
     void HyperlinkInput::MouseMove( const ::MouseEvent& rMEvt )
     {
         Edit::MouseMove( rMEvt );
@@ -362,7 +362,7 @@ namespace pcr
         SetPointer( Pointer( ePointerStyle ) );
     }
 
-    //--------------------------------------------------------------------
+
     void HyperlinkInput::MouseButtonDown( const ::MouseEvent& rMEvt )
     {
         Edit::MouseButtonDown( rMEvt );
@@ -373,7 +373,7 @@ namespace pcr
             m_aMouseButtonDownPos.X() = m_aMouseButtonDownPos.Y() = -1;
     }
 
-    //--------------------------------------------------------------------
+
     void HyperlinkInput::MouseButtonUp( const ::MouseEvent& rMEvt )
     {
         Edit::MouseButtonUp( rMEvt );
@@ -381,14 +381,14 @@ namespace pcr
         impl_checkEndClick( rMEvt );
     }
 
-    //--------------------------------------------------------------------
+
     bool HyperlinkInput::impl_textHitTest( const ::Point& _rWindowPos )
     {
         sal_Int32 nPos = GetCharPos( _rWindowPos );
         return ( ( nPos != EDIT_NOLIMIT ) && ( nPos < GetText().getLength() ) );
     }
 
-    //--------------------------------------------------------------------
+
     void HyperlinkInput::impl_checkEndClick( const ::MouseEvent rMEvt )
     {
         const MouseSettings& rMouseSettings( GetSettings().GetMouseSettings() );
@@ -398,7 +398,7 @@ namespace pcr
             Application::PostUserEvent( m_aClickHandler );
     }
 
-    //--------------------------------------------------------------------
+
     void HyperlinkInput::Tracking( const TrackingEvent& rTEvt )
     {
         Edit::Tracking( rTEvt );
@@ -410,7 +410,7 @@ namespace pcr
     //========================================================================
     //= OHyperlinkControl
     //========================================================================
-    //--------------------------------------------------------------------
+
     OHyperlinkControl::OHyperlinkControl( Window* _pParent, WinBits _nWinStyle )
         :OHyperlinkControl_Base( PropertyControlType::HyperlinkField, _pParent, _nWinStyle )
         ,m_aActionListeners( m_aMutex )
@@ -418,14 +418,14 @@ namespace pcr
         getTypedControlWindow()->SetClickHdl( LINK( this, OHyperlinkControl, OnHyperlinkClicked ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OHyperlinkControl::getValue() throw (RuntimeException)
     {
         OUString sText = getTypedControlWindow()->GetText();
         return makeAny( sText );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OHyperlinkControl::setValue( const Any& _value ) throw (IllegalTypeException, RuntimeException)
     {
         OUString sText;
@@ -433,26 +433,26 @@ namespace pcr
         getTypedControlWindow()->SetText( sText );
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL OHyperlinkControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< OUString* >( NULL ) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OHyperlinkControl::addActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException)
     {
         if ( listener.is() )
             m_aActionListeners.addInterface( listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OHyperlinkControl::removeActionListener( const Reference< XActionListener >& listener ) throw (RuntimeException)
     {
         m_aActionListeners.removeInterface( listener );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OHyperlinkControl::disposing()
     {
         OHyperlinkControl_Base::disposing();
@@ -461,7 +461,7 @@ namespace pcr
         m_aActionListeners.disposeAndClear( aEvent );
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( OHyperlinkControl, OnHyperlinkClicked, void*, /*_NotInterestedIn*/ )
     {
         ActionEvent aEvent( *this, OUString( "clicked" ) );
@@ -476,7 +476,7 @@ namespace pcr
     //==================================================================
     //= ONumericControl
     //==================================================================
-    //------------------------------------------------------------------
+
     ONumericControl::ONumericControl( Window* _pParent, WinBits _nWinStyle )
         :ONumericControl_Base( PropertyControlType::NumericField, _pParent, _nWinStyle )
         ,m_eValueUnit( FUNIT_NONE )
@@ -491,19 +491,19 @@ namespace pcr
         setMinValue( value );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL ONumericControl::getDecimalDigits() throw (RuntimeException)
     {
         return getTypedControlWindow()->GetDecimalDigits();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits ) throw (RuntimeException)
     {
         getTypedControlWindow()->SetDecimalDigits( _decimaldigits );
     }
 
-    //--------------------------------------------------------------------
+
     Optional< double > SAL_CALL ONumericControl::getMinValue() throw (RuntimeException)
     {
         Optional< double > aReturn( sal_True, 0 );
@@ -517,7 +517,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ONumericControl::setMinValue( const Optional< double >& _minvalue ) throw (RuntimeException)
     {
         if ( !_minvalue.IsPresent )
@@ -526,7 +526,7 @@ namespace pcr
             getTypedControlWindow()->SetMin( impl_apiValueToFieldValue_nothrow( _minvalue.Value ) , m_eValueUnit);
     }
 
-    //--------------------------------------------------------------------
+
     Optional< double > SAL_CALL ONumericControl::getMaxValue() throw (RuntimeException)
     {
         Optional< double > aReturn( sal_True, 0 );
@@ -540,7 +540,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ONumericControl::setMaxValue( const Optional< double >& _maxvalue ) throw (RuntimeException)
     {
         if ( !_maxvalue.IsPresent )
@@ -549,13 +549,13 @@ namespace pcr
             getTypedControlWindow()->SetMax( impl_apiValueToFieldValue_nothrow( _maxvalue.Value ), m_eValueUnit );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL ONumericControl::getDisplayUnit() throw (RuntimeException)
     {
         return VCLUnoHelper::ConvertToMeasurementUnit( getTypedControlWindow()->GetUnit(), 1 );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ONumericControl::setDisplayUnit( ::sal_Int16 _displayunit ) throw (IllegalArgumentException, RuntimeException)
     {
         if ( ( _displayunit < MeasureUnit::MM_100TH ) || ( _displayunit > MeasureUnit::PERCENT ) )
@@ -578,13 +578,13 @@ namespace pcr
         getTypedControlWindow()->MetricFormatter::SetUnit( eFieldUnit );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL ONumericControl::getValueUnit() throw (RuntimeException)
     {
         return VCLUnoHelper::ConvertToMeasurementUnit( m_eValueUnit, m_nFieldToUNOValueFactor );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ONumericControl::setValueUnit( ::sal_Int16 _valueunit ) throw (RuntimeException)
     {
         if ( ( _valueunit < MeasureUnit::MM_100TH ) || ( _valueunit > MeasureUnit::PERCENT ) )
@@ -592,7 +592,7 @@ namespace pcr
         m_eValueUnit = VCLUnoHelper::ConvertToFieldUnit( _valueunit, m_nFieldToUNOValueFactor );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ONumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         if ( !_rValue.hasValue() )
@@ -609,7 +609,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     long ONumericControl::impl_apiValueToFieldValue_nothrow( double _nApiValue ) const
     {
         long nControlValue = ImplCalcLongValue( _nApiValue, getTypedControlWindow()->GetDecimalDigits() );
@@ -617,7 +617,7 @@ namespace pcr
         return nControlValue;
     }
 
-    //------------------------------------------------------------------
+
     double ONumericControl::impl_fieldValueToApiValue_nothrow( sal_Int64 _nFieldValue ) const
     {
         double nApiValue = ImplCalcDoubleValue( (long)_nFieldValue, getTypedControlWindow()->GetDecimalDigits() );
@@ -625,7 +625,7 @@ namespace pcr
         return nApiValue;
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ONumericControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -637,7 +637,7 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL ONumericControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< double* >( NULL ) );
@@ -647,7 +647,7 @@ namespace pcr
     //= OColorControl
     //==================================================================
     #define LB_DEFAULT_COUNT 20
-    //------------------------------------------------------------------
+
     OUString MakeHexStr(sal_uInt32 nVal, sal_Int32 nLength)
     {
         OUStringBuffer aStr;
@@ -663,7 +663,7 @@ namespace pcr
         return aStr.makeStringAndClear();
     }
 
-    //------------------------------------------------------------------
+
     OColorControl::OColorControl(Window* pParent, WinBits nWinStyle)
         :OColorControl_Base( PropertyControlType::ColorListBox, pParent, nWinStyle )
     {
@@ -700,7 +700,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OColorControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         if ( _rValue.hasValue() )
@@ -733,7 +733,7 @@ namespace pcr
             getTypedControlWindow()->SetNoSelection();
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OColorControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -751,32 +751,32 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OColorControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< sal_Int32* >( NULL ) );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OColorControl::clearList() throw (RuntimeException)
     {
         getTypedControlWindow()->Clear();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OColorControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException)
     {
         getTypedControlWindow()->InsertEntry( NewEntry, 0 );
         m_aNonColorEntries.insert( NewEntry );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OColorControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException)
     {
         getTypedControlWindow()->InsertEntry( NewEntry );
         m_aNonColorEntries.insert( NewEntry );
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OColorControl::getListEntries(  ) throw (RuntimeException)
     {
         if ( !m_aNonColorEntries.empty() )
@@ -784,7 +784,7 @@ namespace pcr
         return Sequence< OUString >();
     }
 
-    //------------------------------------------------------------------
+
     void OColorControl::modified()
     {
         OColorControl_Base::modified();
@@ -797,7 +797,7 @@ namespace pcr
     //==================================================================
     //= OListboxControl
     //==================================================================
-    //------------------------------------------------------------------
+
     OListboxControl::OListboxControl( Window* pParent, WinBits nWinStyle)
         :OListboxControl_Base( PropertyControlType::ListBox, pParent, nWinStyle )
     {
@@ -809,7 +809,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OListboxControl::getValue() throw (RuntimeException)
     {
         OUString sControlValue( getTypedControlWindow()->GetSelectEntry() );
@@ -820,13 +820,13 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OListboxControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< OUString* >( NULL ) );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OListboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         if ( !_rValue.hasValue() )
@@ -847,24 +847,24 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OListboxControl::clearList() throw (RuntimeException)
     {
         getTypedControlWindow()->Clear();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OListboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException)
     {
         getTypedControlWindow()->InsertEntry( NewEntry, 0 );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OListboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException)
     {
         getTypedControlWindow()->InsertEntry( NewEntry );
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OListboxControl::getListEntries(  ) throw (RuntimeException)
     {
         const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
@@ -876,7 +876,7 @@ namespace pcr
         return aRet;
     }
 
-    //------------------------------------------------------------------
+
     void OListboxControl::modified()
     {
         OListboxControl_Base::modified();
@@ -889,7 +889,7 @@ namespace pcr
     //==================================================================
     //= OComboboxControl
     //==================================================================
-    //------------------------------------------------------------------
+
     OComboboxControl::OComboboxControl( Window* pParent, WinBits nWinStyle)
         :OComboboxControl_Base( PropertyControlType::ComboBox, pParent, nWinStyle )
     {
@@ -897,7 +897,7 @@ namespace pcr
         getTypedControlWindow()->SetSelectHdl( LINK( this, OComboboxControl, OnEntrySelected ) );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OComboboxControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         OUString sText;
@@ -905,36 +905,36 @@ namespace pcr
         getTypedControlWindow()->SetText( sText );
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OComboboxControl::getValue() throw (RuntimeException)
     {
         return makeAny( OUString( getTypedControlWindow()->GetText() ) );
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OComboboxControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< OUString* >( NULL ) );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OComboboxControl::clearList() throw (RuntimeException)
     {
         getTypedControlWindow()->Clear();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OComboboxControl::prependListEntry( const OUString& NewEntry ) throw (RuntimeException)
     {
         getTypedControlWindow()->InsertEntry( NewEntry, 0 );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OComboboxControl::appendListEntry( const OUString& NewEntry ) throw (RuntimeException)
     {
         getTypedControlWindow()->InsertEntry( NewEntry );
     }
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OComboboxControl::getListEntries(  ) throw (RuntimeException)
     {
         const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
@@ -946,7 +946,7 @@ namespace pcr
         return aRet;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( OComboboxControl, OnEntrySelected, void*, /*_pNothing*/ )
     {
         if ( !getTypedControlWindow()->IsTravelSelect() )
@@ -974,7 +974,7 @@ namespace pcr
         virtual bool    PreNotify(NotifyEvent& _rNEvt);
     };
 
-    //------------------------------------------------------------------
+
     OMultilineFloatingEdit::OMultilineFloatingEdit(Window* _pParent)
         :FloatingWindow(_pParent, WB_BORDER)
         ,m_aImplEdit(this, WB_VSCROLL|WB_IGNORETAB|WB_NOBORDER)
@@ -982,13 +982,13 @@ namespace pcr
         m_aImplEdit.Show();
     }
 
-    //------------------------------------------------------------------
+
     void OMultilineFloatingEdit::Resize()
     {
         m_aImplEdit.SetSizePixel(GetOutputSizePixel());
     }
 
-    //------------------------------------------------------------------
+
     bool OMultilineFloatingEdit::PreNotify(NotifyEvent& _rNEvt)
     {
         bool nResult = true;
@@ -1021,7 +1021,7 @@ namespace pcr
     //==================================================================
     //= DropDownEditControl_Base
     //==================================================================
-    //------------------------------------------------------------------
+
     DropDownEditControl::DropDownEditControl( Window* _pParent, WinBits _nStyle )
         :DropDownEditControl_Base( _pParent, _nStyle )
         ,m_pFloatingEdit( NULL )
@@ -1050,7 +1050,7 @@ namespace pcr
         m_pFloatingEdit->getEdit()->SetReadOnly( ( _nStyle & WB_READONLY ) != 0 );
     }
 
-    //------------------------------------------------------------------
+
     void DropDownEditControl::setControlHelper( ControlHelper& _rControlHelper )
     {
         DropDownEditControl_Base::setControlHelper( _rControlHelper );
@@ -1060,7 +1060,7 @@ namespace pcr
         m_pImplEdit->SetLoseFocusHdl( LINK( &_rControlHelper, ControlHelper, LoseFocusHdl ) );
     }
 
-    //------------------------------------------------------------------
+
     DropDownEditControl::~DropDownEditControl()
     {
         {
@@ -1078,7 +1078,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     void DropDownEditControl::Resize()
     {
         ::Size aOutSz = GetOutputSizePixel();
@@ -1094,7 +1094,7 @@ namespace pcr
             m_pImplEdit->setPosSizePixel( 0, 1, aOutSz.Width(), aOutSz.Height()-2 );
     }
 
-    //------------------------------------------------------------------
+
     bool DropDownEditControl::PreNotify( NotifyEvent& rNEvt )
     {
         bool nResult = true;
@@ -1152,7 +1152,7 @@ namespace pcr
         return nResult;
     }
 
-    //------------------------------------------------------------------
+
     namespace
     {
         //..............................................................
@@ -1199,7 +1199,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     #define STD_HEIGHT  100
     sal_Bool DropDownEditControl::ShowDropDown( sal_Bool bShow )
     {
@@ -1241,7 +1241,7 @@ namespace pcr
 
     }
 
-    //------------------------------------------------------------------
+
     long DropDownEditControl::FindPos(long nSinglePos)
     {
         long nPos=0;
@@ -1298,7 +1298,7 @@ namespace pcr
         return nPos;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( DropDownEditControl, ReturnHdl, OMultilineFloatingEdit*, /*pMEd*/)
     {
 
@@ -1315,27 +1315,27 @@ namespace pcr
         return 0;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( DropDownEditControl, DropDownHdl, PushButton*, /*pPb*/ )
     {
         ShowDropDown(!m_bDropdown);
         return 0;
     }
 
-    //------------------------------------------------------------------
+
     void DropDownEditControl::SetStringListValue( const StlSyntaxSequence< OUString >& _rStrings )
     {
         SetText( lcl_convertListToDisplayText( _rStrings ) );
         m_pFloatingEdit->getEdit()->SetText( lcl_convertListToMultiLine( _rStrings ) );
     }
 
-    //------------------------------------------------------------------
+
     StlSyntaxSequence< OUString > DropDownEditControl::GetStringListValue() const
     {
         return lcl_convertMultiLineToList( m_pFloatingEdit->getEdit()->GetText() );
     }
 
-    //------------------------------------------------------------------
+
     void DropDownEditControl::SetTextValue( const OUString& _rText )
     {
         OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::SetTextValue: illegal call!" );
@@ -1344,7 +1344,7 @@ namespace pcr
         SetText( _rText );
     }
 
-    //------------------------------------------------------------------
+
     OUString DropDownEditControl::GetTextValue() const
     {
         OSL_PRECOND( m_nOperationMode == eMultiLineText, "DropDownEditControl::GetTextValue: illegal call!" );
@@ -1354,7 +1354,7 @@ namespace pcr
     //==================================================================
     //= OMultilineEditControl
     //==================================================================
-    //------------------------------------------------------------------
+
     OMultilineEditControl::OMultilineEditControl( Window* pParent, MultiLineOperationMode _eMode, WinBits nWinStyle )
         :OMultilineEditControl_Base( _eMode == eMultiLineText ? PropertyControlType::MultiLineTextField : PropertyControlType::StringListField
                                    , pParent
@@ -1364,7 +1364,7 @@ namespace pcr
         getTypedControlWindow()->setOperationMode( _eMode );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OMultilineEditControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         impl_checkDisposed_throw();
@@ -1390,7 +1390,7 @@ namespace pcr
         }
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OMultilineEditControl::getValue() throw (RuntimeException)
     {
         impl_checkDisposed_throw();
@@ -1408,7 +1408,7 @@ namespace pcr
         return aValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OMultilineEditControl::getValueType() throw (RuntimeException)
     {
         if ( getTypedControlWindow()->getOperationMode() == eMultiLineText )
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx b/extensions/source/propctrlr/stringrepresentation.cxx
index cfba15f94d37..d2a63c706af7 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -271,7 +271,7 @@ void SAL_CALL StringRepresentation::initialize(const uno::Sequence< uno::Any > &
         }
     }
 }
-//------------------------------------------------------------------------
+
 OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue )
 {
     OUString sReturn;
@@ -307,7 +307,7 @@ OUString StringRepresentation::convertSimpleToString( const uno::Any& _rValue )
     return sReturn;
 }
 
-//--------------------------------------------------------------------
+
 namespace
 {
     struct ConvertIntegerFromAndToString
@@ -365,7 +365,7 @@ namespace
     }
 }
 
-//--------------------------------------------------------------------
+
 bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue, OUString& _rStringRep )
 {
     bool bCanConvert = true;
@@ -473,7 +473,7 @@ bool StringRepresentation::convertGenericValueToString( const uno::Any& _rValue,
 
     return bCanConvert;
 }
-//------------------------------------------------------------------------
+
 uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,const uno::TypeClass& _ePropertyType )
 {
     uno::Any aReturn;
@@ -504,7 +504,7 @@ uno::Any StringRepresentation::convertStringToSimple( const OUString& _rValue,co
     }
     return aReturn;
 }
-//--------------------------------------------------------------------
+
 bool StringRepresentation::convertStringToGenericValue( const OUString& _rStringRep, uno::Any& _rValue, const uno::Type& _rTargetType )
 {
     bool bCanConvert = true;
@@ -612,10 +612,10 @@ bool StringRepresentation::convertStringToGenericValue( const OUString& _rString
 
     return bCanConvert;
 }
-//------------------------------------------------------------------------
-//------------------------------------------------------------------------
+
+
 } // pcr
-//------------------------------------------------------------------------
+
 
 
 // component helper namespace
@@ -643,7 +643,7 @@ uno::Reference< uno::XInterface > SAL_CALL _create(
 
 } // closing component helper namespace
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_StringRepresentation()
 {
     ::pcr::PcrModule::getInstance().registerImplementation(
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index bdb8a10612ac..e7637ab58233 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -30,7 +30,7 @@
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_SubmissionPropertyHandler()
 {
     ::pcr::SubmissionPropertyHandler::registerImplementation();
@@ -55,7 +55,7 @@ namespace pcr
     //====================================================================
     //= SubmissionHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     SubmissionHelper::SubmissionHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxIntrospectee, const Reference< frame::XModel >& _rxContextDocument )
         :EFormsHelper( _rMutex, _rxIntrospectee, _rxContextDocument )
     {
@@ -63,7 +63,7 @@ namespace pcr
             "SubmissionHelper::SubmissionHelper: you should not have instantiated me!" );
     }
 
-    //--------------------------------------------------------------------
+
     bool SubmissionHelper::canTriggerSubmissions( const Reference< XPropertySet >& _rxControlModel,
         const Reference< frame::XModel >& _rxContextDocument ) SAL_THROW(())
     {
@@ -87,7 +87,7 @@ namespace pcr
     //= SubmissionPropertyHandler
     //====================================================================
     DBG_NAME( SubmissionPropertyHandler )
-    //--------------------------------------------------------------------
+
     SubmissionPropertyHandler::SubmissionPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :EditPropertyHandler_Base( _rxContext )
         ,OPropertyChangeListener( m_aMutex )
@@ -96,20 +96,20 @@ namespace pcr
         DBG_CTOR( SubmissionPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     SubmissionPropertyHandler::~SubmissionPropertyHandler( )
     {
         disposeAdapter();
         DBG_DTOR( SubmissionPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL SubmissionPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.SubmissionPropertyHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -117,7 +117,7 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL SubmissionPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -166,7 +166,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL SubmissionPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -209,7 +209,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -221,7 +221,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL SubmissionPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -235,7 +235,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SubmissionPropertyHandler::onNewComponent()
     {
         if ( m_pPropChangeMultiplexer )
@@ -262,7 +262,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > SAL_CALL SubmissionPropertyHandler::doDescribeSupportedProperties() const
     {
         ::std::vector< Property > aProperties;
@@ -276,7 +276,7 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL SubmissionPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
@@ -317,7 +317,7 @@ namespace pcr
         return aDescriptor;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL SubmissionPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -343,7 +343,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL SubmissionPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -382,7 +382,7 @@ namespace pcr
         return aPropertyValue;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL SubmissionPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -423,7 +423,7 @@ namespace pcr
         return aControlValue;
     }
 
-    //--------------------------------------------------------------------
+
     void SubmissionPropertyHandler::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw(RuntimeException)
     {
         if ( _rEvent.PropertyName == PROPERTY_BUTTONTYPE )
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 285aedc75617..73f2be452a89 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -71,7 +71,7 @@ namespace pcr
     //= TabOrderDialog
     //========================================================================
     DBG_NAME(TabOrderDialog)
-    //------------------------------------------------------------------------
+
     TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel,
                     const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB )
         :ModalDialog( _pParent, "TabOrderDialog", "modules/spropctrlr/ui/taborder.ui")
@@ -111,13 +111,13 @@ namespace pcr
 
     }
 
-    //------------------------------------------------------------------------
+
     void TabOrderDialog::SetModified()
     {
         m_pPB_OK->Enable();
     }
 
-    //------------------------------------------------------------------------
+
     TabOrderDialog::~TabOrderDialog()
     {
         m_pLB_Controls->Hide();
@@ -127,7 +127,7 @@ namespace pcr
         DBG_DTOR(TabOrderDialog,NULL);
     }
 
-    //------------------------------------------------------------------------
+
     Image TabOrderDialog::GetImage( const Reference< XPropertySet >& _rxSet ) const
     {
         sal_uInt16 nImageId = RID_SVXIMG_CONTROL;
@@ -165,7 +165,7 @@ namespace pcr
         return pImageList->GetImage( nImageId );
     }
 
-    //------------------------------------------------------------------------
+
     void TabOrderDialog::FillList()
     {
         DBG_ASSERT( m_xTempModel.is() && m_xControlContainer.is(), "TabOrderDialog::FillList: invalid call!" );
@@ -219,21 +219,21 @@ namespace pcr
             m_pLB_Controls->Select( pFirstEntry );
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( TabOrderDialog, MoveUpClickHdl, Button*, /*pButton*/ )
     {
         m_pLB_Controls->MoveSelection( -1 );
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( TabOrderDialog, MoveDownClickHdl, Button*, /*pButton*/ )
     {
         m_pLB_Controls->MoveSelection( 1 );
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( TabOrderDialog, AutoOrderClickHdl, Button*, /*pButton*/ )
     {
         try
@@ -257,7 +257,7 @@ namespace pcr
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ )
     {
         sal_uLong nEntryCount = m_pLB_Controls->GetEntryCount();
@@ -292,7 +292,7 @@ namespace pcr
     //= TabOrderListBox
     //========================================================================
     DBG_NAME(TabOrderListBox);
-    //------------------------------------------------------------------------
+
     TabOrderListBox::TabOrderListBox( Window* pParent, WinBits nBits  )
         :SvTreeListBox( pParent, nBits  )
     {
@@ -313,13 +313,13 @@ namespace pcr
          return new TabOrderListBox(pParent, nWinStyle);
     }
 
-    //------------------------------------------------------------------------
+
     TabOrderListBox::~TabOrderListBox()
     {
         DBG_DTOR(TabOrderListBox,NULL);
     }
 
-    //------------------------------------------------------------------------
+
     void TabOrderListBox::ModelHasMoved( SvTreeListEntry* _pSource )
     {
         SvTreeListBox::ModelHasMoved( _pSource );
@@ -327,7 +327,7 @@ namespace pcr
         ((TabOrderDialog*)GetParentDialog())->SetModified();
     }
 
-    //------------------------------------------------------------------------
+
     void TabOrderListBox::MoveSelection( long nRelPos )
     {
         OUString aSelEntryPrevText, aSelEntryNextText;
diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx
index 833dd60df576..842294c3230f 100644
--- a/extensions/source/propctrlr/usercontrol.cxx
+++ b/extensions/source/propctrlr/usercontrol.cxx
@@ -44,7 +44,7 @@ namespace pcr
     //==================================================================
     // NumberFormatSampleField
     //==================================================================
-    //------------------------------------------------------------------
+
     bool NumberFormatSampleField::PreNotify( NotifyEvent& rNEvt )
     {
         // want to handle two keys myself : Del/Backspace should empty the window (setting my prop to "standard" this way)
@@ -64,7 +64,7 @@ namespace pcr
         return BaseClass::PreNotify( rNEvt );
     }
 
-    //------------------------------------------------------------------
+
     void NumberFormatSampleField::SetFormatSupplier( const SvNumberFormatsSupplierObj* pSupplier )
     {
         if ( pSupplier )
@@ -86,13 +86,13 @@ namespace pcr
     //==================================================================
     // OFormatSampleControl
     //==================================================================
-    //------------------------------------------------------------------
+
     OFormatSampleControl::OFormatSampleControl( Window* pParent, WinBits nWinStyle )
         :OFormatSampleControl_Base( PropertyControlType::Unknown, pParent, nWinStyle )
     {
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormatSampleControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         sal_Int32 nFormatKey = 0;
@@ -114,7 +114,7 @@ namespace pcr
         else
             getTypedControlWindow()->SetText( "" );
     }
-    //------------------------------------------------------------------
+
     double OFormatSampleControl::getPreviewValue( const SvNumberformat& i_rEntry )
     {
         double nValue = 1234.56789;
@@ -140,7 +140,7 @@ namespace pcr
         return nValue;
     }
 
-    //------------------------------------------------------------------
+
     double OFormatSampleControl::getPreviewValue(SvNumberFormatter* _pNF,sal_Int32 _nFormatKey)
     {
         const SvNumberformat* pEntry = _pNF->GetEntry(_nFormatKey);
@@ -150,7 +150,7 @@ namespace pcr
             nValue = getPreviewValue( *pEntry );
         return nValue;
     }
-    //------------------------------------------------------------------
+
     Any SAL_CALL OFormatSampleControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -159,7 +159,7 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OFormatSampleControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< sal_Int32* >( NULL ) );
@@ -169,7 +169,7 @@ namespace pcr
     // class OFormattedNumericControl
     //==================================================================
     DBG_NAME(OFormattedNumericControl);
-    //------------------------------------------------------------------
+
     OFormattedNumericControl::OFormattedNumericControl( Window* pParent, WinBits nWinStyle )
         :OFormattedNumericControl_Base( PropertyControlType::Unknown, pParent, nWinStyle )
     {
@@ -180,13 +180,13 @@ namespace pcr
         m_nLastDecimalDigits = getTypedControlWindow()->GetDecimalDigits();
     }
 
-    //------------------------------------------------------------------
+
     OFormattedNumericControl::~OFormattedNumericControl()
     {
         DBG_DTOR(OFormattedNumericControl,NULL);
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormattedNumericControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         double nValue( 0 );
@@ -196,7 +196,7 @@ namespace pcr
             getTypedControlWindow()->SetText("");
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OFormattedNumericControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -205,13 +205,13 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OFormattedNumericControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< double* >( NULL ) );
     }
 
-    //------------------------------------------------------------------
+
     void OFormattedNumericControl::SetFormatDescription(const FormatDescription& rDesc)
     {
         sal_Bool bFallback = sal_True;
@@ -264,7 +264,7 @@ namespace pcr
     //========================================================================
     //= OFileUrlControl
     //========================================================================
-    //------------------------------------------------------------------
+
     OFileUrlControl::OFileUrlControl( Window* pParent, WinBits nWinStyle )
         :OFileUrlControl_Base( PropertyControlType::Unknown, pParent, nWinStyle | WB_DROPDOWN )
     {
@@ -272,12 +272,12 @@ namespace pcr
         getTypedControlWindow()->SetPlaceHolder( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ).toString() ) ;
     }
 
-    //------------------------------------------------------------------
+
     OFileUrlControl::~OFileUrlControl()
     {
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFileUrlControl::setValue( const Any& _rValue ) throw (IllegalTypeException, RuntimeException)
     {
         OUString sURL;
@@ -292,7 +292,7 @@ namespace pcr
             getTypedControlWindow()->SetText( "" );
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OFileUrlControl::getValue() throw (RuntimeException)
     {
         Any aPropValue;
@@ -301,7 +301,7 @@ namespace pcr
         return aPropValue;
     }
 
-    //------------------------------------------------------------------
+
     Type SAL_CALL OFileUrlControl::getValueType() throw (RuntimeException)
     {
         return ::getCppuType( static_cast< OUString* >( NULL ) );
@@ -310,7 +310,7 @@ namespace pcr
     //========================================================================
     //= OTimeDurationControl
     //========================================================================
-    //------------------------------------------------------------------
+
     OTimeDurationControl::OTimeDurationControl( ::Window* pParent, WinBits nWinStyle )
         :ONumericControl( pParent, nWinStyle )
     {
@@ -319,12 +319,12 @@ namespace pcr
         getTypedControlWindow()->SetCustomConvertHdl( LINK( this, OTimeDurationControl, OnCustomConvert ) );
     }
 
-    //------------------------------------------------------------------
+
     OTimeDurationControl::~OTimeDurationControl()
     {
     }
 
-    //------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL OTimeDurationControl::getControlType() throw (::com::sun::star::uno::RuntimeException)
     {
         // don't use the base class'es method, it would claim we're a standard control, which
@@ -332,7 +332,7 @@ namespace pcr
         return PropertyControlType::Unknown;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK( OTimeDurationControl, OnCustomConvert, MetricField*, /*pField*/ )
     {
         long nMultiplier = 1;
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 76a1796a038b..30073ac652c2 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -37,7 +37,7 @@ namespace pcr
     //====================================================================
     //= helper
     //====================================================================
-    //--------------------------------------------------------------------
+
     template< typename INTERFACE, typename ARGUMENT >
     void setSave( INTERFACE* pObject, void ( SAL_CALL INTERFACE::*pSetter )( ARGUMENT ), ARGUMENT _rArg )
     {
@@ -51,7 +51,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     template< typename INTERFACE, typename ARGUMENT >
     ARGUMENT getSave( INTERFACE* pObject, ARGUMENT ( SAL_CALL INTERFACE::*pGetter )( ) )
     {
@@ -85,7 +85,7 @@ namespace pcr
     //====================================================================
     //= XSDDataType
     //====================================================================
-    //--------------------------------------------------------------------
+
     XSDDataType::XSDDataType( const Reference< XDataType >& _rxDataType )
         :m_xDataType( _rxDataType )
         ,m_refCount( 0 )
@@ -95,13 +95,13 @@ namespace pcr
             m_xFacetInfo = m_xDataType->getPropertySetInfo();
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL XSDDataType::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL XSDDataType::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -112,12 +112,12 @@ namespace pcr
         return m_refCount;
     }
 
-    //--------------------------------------------------------------------
+
     XSDDataType::~XSDDataType()
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 XSDDataType::classify() const SAL_THROW(())
     {
         sal_Int16 nTypeClass = DataTypeClass::STRING;
@@ -133,19 +133,19 @@ namespace pcr
         return nTypeClass;
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDDataType::isBasicType() const SAL_THROW(())
     {
         return getSave( m_xDataType.get(), &XDataType::getIsBasic );
     }
 
-    //--------------------------------------------------------------------
+
     OUString XSDDataType::getName() const SAL_THROW(())
     {
         return getSave( m_xDataType.get(), &XDataType::getName );
     }
 
-     //--------------------------------------------------------------------
+
     void XSDDataType::setFacet( const OUString& _rFacetName, const Any& _rValue ) SAL_THROW(())
     {
         try
@@ -158,7 +158,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDDataType::hasFacet( const OUString& _rFacetName ) const SAL_THROW(())
     {
         bool bReturn = false;
@@ -172,7 +172,7 @@ namespace pcr
         }
         return bReturn;
     }
-    //--------------------------------------------------------------------
+
     Any XSDDataType::getFacet( const OUString& _rFacetName ) SAL_THROW(())
     {
         Any aReturn;
@@ -187,7 +187,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void lcl_copyProperties( const Reference< XPropertySet >& _rxSource, const Reference< XPropertySet >& _rxDest )
@@ -213,7 +213,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void XSDDataType::copyFacetsFrom( const ::rtl::Reference< XSDDataType >& _pSourceType )
     {
         OSL_ENSURE( _pSourceType.is(), "XSDDataType::copyFacetsFrom: invalid source type!" );
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.cxx b/extensions/source/propctrlr/xsdvalidationhelper.cxx
index 4a6f1eada469..ceffc2127fb3 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.cxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.cxx
@@ -48,7 +48,7 @@ namespace pcr
     //====================================================================
     //= XSDValidationHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     XSDValidationHelper::XSDValidationHelper( ::osl::Mutex& _rMutex, const Reference< XPropertySet >& _rxIntrospectee, const Reference< frame::XModel >& _rxContextDocument )
         :EFormsHelper( _rMutex, _rxIntrospectee, _rxContextDocument )
         ,m_bInspectingFormattedField( false )
@@ -73,7 +73,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void XSDValidationHelper::getAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(())
     {
         _rNames.resize( 0 );
@@ -94,7 +94,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository() const SAL_THROW((Exception))
     {
         Reference< XDataTypeRepository > xRepository;
@@ -106,7 +106,7 @@ namespace pcr
         return xRepository;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDataTypeRepository > XSDValidationHelper::getDataTypeRepository( const OUString& _rModelName ) const SAL_THROW((Exception))
     {
         Reference< XDataTypeRepository > xRepository;
@@ -118,7 +118,7 @@ namespace pcr
         return xRepository;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDataType > XSDValidationHelper::getDataType( const OUString& _rName ) const SAL_THROW((Exception))
     {
         Reference< XDataType > xDataType;
@@ -132,7 +132,7 @@ namespace pcr
         return xDataType;
     }
 
-    //--------------------------------------------------------------------
+
     OUString XSDValidationHelper::getValidatingDataTypeName( ) const SAL_THROW(())
     {
         OUString sDataTypeName;
@@ -152,7 +152,7 @@ namespace pcr
         return sDataTypeName;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::Reference< XSDDataType > XSDValidationHelper::getDataTypeByName( const OUString& _rName ) const SAL_THROW(())
     {
         ::rtl::Reference< XSDDataType > pReturn;
@@ -175,13 +175,13 @@ namespace pcr
         return pReturn;
     }
 
-    //--------------------------------------------------------------------
+
     ::rtl::Reference< XSDDataType > XSDValidationHelper::getValidatingDataType( ) const SAL_THROW(())
     {
         return getDataTypeByName( getValidatingDataTypeName() );
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDValidationHelper::cloneDataType( const ::rtl::Reference< XSDDataType >& _pDataType, const OUString& _rNewName ) const SAL_THROW(())
     {
         OSL_ENSURE( _pDataType.is(), "XSDValidationHelper::removeDataTypeFromRepository: invalid data type!" );
@@ -209,7 +209,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDValidationHelper::removeDataTypeFromRepository( const OUString& _rName ) const SAL_THROW(())
     {
         try
@@ -235,7 +235,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void XSDValidationHelper::setValidatingDataTypeByName( const OUString& _rName ) const SAL_THROW(())
     {
         try
@@ -273,7 +273,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void XSDValidationHelper::copyDataType( const OUString& _rFromModel, const OUString& _rToModel,
                 const OUString& _rDataTypeName ) const SAL_THROW(())
     {
@@ -313,7 +313,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     void XSDValidationHelper::findDefaultFormatForIntrospectee() SAL_THROW(())
     {
         try
@@ -365,13 +365,13 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass ) const SAL_THROW(())
     {
         return getBasicTypeNameForClass( _nClass, getDataTypeRepository() );
     }
 
-    //--------------------------------------------------------------------
+
     OUString XSDValidationHelper::getBasicTypeNameForClass( sal_Int16 _nClass, Reference< XDataTypeRepository > _rxRepository ) const SAL_THROW(())
     {
         OUString sReturn;
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index edf7f6ee3e46..5dbbd362ed5f 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -46,7 +46,7 @@
 #include <functional>
 #include <limits>
 
-//------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_XSDValidationPropertyHandler()
 {
     ::pcr::XSDValidationPropertyHandler::registerImplementation();
@@ -72,26 +72,26 @@ namespace pcr
     //= XSDValidationPropertyHandler
     //====================================================================
     DBG_NAME( XSDValidationPropertyHandler )
-    //--------------------------------------------------------------------
+
     XSDValidationPropertyHandler::XSDValidationPropertyHandler( const Reference< XComponentContext >& _rxContext )
         :XSDValidationPropertyHandler_Base( _rxContext )
     {
         DBG_CTOR( XSDValidationPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     XSDValidationPropertyHandler::~XSDValidationPropertyHandler()
     {
         DBG_DTOR( XSDValidationPropertyHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL XSDValidationPropertyHandler::getImplementationName_static(  ) throw (RuntimeException)
     {
         return OUString( "com.sun.star.comp.extensions.XSDValidationPropertyHandler" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported( 1 );
@@ -99,7 +99,7 @@ namespace pcr
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL XSDValidationPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -129,7 +129,7 @@ namespace pcr
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL XSDValidationPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -158,7 +158,7 @@ namespace pcr
         impl_setContextDocumentModified_nothrow();
     }
 
-    //--------------------------------------------------------------------
+
     void XSDValidationPropertyHandler::onNewComponent()
     {
         XSDValidationPropertyHandler_Base::onNewComponent();
@@ -171,7 +171,7 @@ namespace pcr
             m_pHelper.reset();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Property > XSDValidationPropertyHandler::doDescribeSupportedProperties() const
     {
         ::std::vector< Property > aProperties;
@@ -226,7 +226,7 @@ namespace pcr
         return Sequence< Property >( &(*aProperties.begin()), aProperties.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -263,7 +263,7 @@ namespace pcr
         return Sequence< OUString >( &(*aSuperfluous.begin()), aSuperfluous.size() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL XSDValidationPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -278,7 +278,7 @@ namespace pcr
         return Sequence< OUString >( &(*aInterestedInActuations.begin()), aInterestedInActuations.size() );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void showPropertyUI( const Reference< XObjectInspectorUI >& _rxInspectorUI, const OUString& _rPropertyName, bool _bShow )
@@ -290,7 +290,7 @@ namespace pcr
         }
     }
 
-    //--------------------------------------------------------------------
+
     LineDescriptor SAL_CALL XSDValidationPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
         const Reference< XPropertyControlFactory >& _rxControlFactory )
         throw (UnknownPropertyException, NullPointerException, RuntimeException)
@@ -426,7 +426,7 @@ namespace pcr
         return aDescriptor;
     }
 
-    //--------------------------------------------------------------------
+
     InteractiveSelectionResult SAL_CALL XSDValidationPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool _bPrimary, Any& /*_rData*/, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -464,7 +464,7 @@ namespace pcr
         return InteractiveSelectionResult_Cancelled;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL XSDValidationPropertyHandler::addPropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -473,7 +473,7 @@ namespace pcr
             m_pHelper->registerBindingListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL XSDValidationPropertyHandler::removePropertyChangeListener( const Reference< XPropertyChangeListener >& _rxListener ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -482,7 +482,7 @@ namespace pcr
         XSDValidationPropertyHandler_Base::removePropertyChangeListener( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDValidationPropertyHandler::implPrepareCloneDataCurrentType( OUString& _rNewName ) SAL_THROW(())
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: this will crash!" );
@@ -505,7 +505,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDValidationPropertyHandler::implDoCloneCurrentDataType( const OUString& _rNewName ) SAL_THROW(())
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoCloneCurrentDataType: this will crash!" );
@@ -521,7 +521,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType() SAL_THROW(())
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: this will crash!" );
@@ -543,7 +543,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool XSDValidationPropertyHandler::implDoRemoveCurrentDataType() SAL_THROW(())
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implDoRemoveCurrentDataType: this will crash!" );
@@ -563,7 +563,7 @@ namespace pcr
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL XSDValidationPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
     {
         if ( !_rxInspectorUI.is() )
@@ -586,7 +586,7 @@ namespace pcr
             _rxInspectorUI->enablePropertyUIElements( PROPERTY_XSD_DATA_TYPE, PropertyLineElement::PrimaryButton, xDataType.is() );
             _rxInspectorUI->enablePropertyUIElements( PROPERTY_XSD_DATA_TYPE, PropertyLineElement::SecondaryButton, xDataType.is() && !bIsBasicType );
 
-            //------------------------------------------------------------
+
             // show the facets which are available at the data type
             OUString aFacets[] = {
                 OUString(PROPERTY_XSD_WHITESPACES), OUString(PROPERTY_XSD_PATTERN),
@@ -653,7 +653,7 @@ namespace pcr
             m_pHelper->findDefaultFormatForIntrospectee();
     }
 
-    //--------------------------------------------------------------------
+
     void XSDValidationPropertyHandler::implGetAvailableDataTypeNames( ::std::vector< OUString >& /* [out] */ _rNames ) const SAL_THROW(())
     {
         OSL_PRECOND( m_pHelper.get(), "XSDValidationPropertyHandler::implGetAvailableDataTypeNames: this will crash!" );
diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx
index 0de4b76c36bd..37db727047b1 100644
--- a/extensions/source/resource/oooresourceloader.cxx
+++ b/extensions/source/resource/oooresourceloader.cxx
@@ -162,13 +162,13 @@ namespace extensions { namespace resource
     {
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle_Default( const OUString& _baseName ) throw (MissingResourceException, RuntimeException)
     {
         return loadBundle( _baseName, Application::GetSettings().GetUILanguageTag().getLocale() );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XResourceBundle > SAL_CALL OpenOfficeResourceLoader::loadBundle( const OUString& _baseName, const Locale& _locale ) throw (MissingResourceException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index d337c5f6e86e..02f709cf4274 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -38,7 +38,7 @@ ResId SaneResId( sal_uInt32 );
  *
  ***********************************************************************/
 
-// ---------------------------------------------------------------------
+
 
 GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, sal_Bool bCutValues )
 :   ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
@@ -96,7 +96,7 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window*
     FreeResource();
 }
 
-// ---------------------------------------------------------------------
+
 
 GridWindow::~GridWindow()
 {
@@ -104,7 +104,7 @@ GridWindow::~GridWindow()
         delete [] m_pNewYValues;
 }
 
-// ---------------------------------------------------------------------
+
 
 double GridWindow::findMinX()
 {
@@ -117,7 +117,7 @@ double GridWindow::findMinX()
     return fMin;
 }
 
-// ---------------------------------------------------------------------
+
 
 double GridWindow::findMinY()
 {
@@ -130,7 +130,7 @@ double GridWindow::findMinY()
     return fMin;
 }
 
-// ---------------------------------------------------------------------
+
 
 double GridWindow::findMaxX()
 {
@@ -143,7 +143,7 @@ double GridWindow::findMaxX()
     return fMax;
 }
 
-// ---------------------------------------------------------------------
+
 
 double GridWindow::findMaxY()
 {
@@ -156,7 +156,7 @@ double GridWindow::findMaxY()
     return fMax;
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::computeExtremes()
 {
@@ -179,7 +179,7 @@ void GridWindow::computeExtremes()
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 Point GridWindow::transform( double x, double y )
 {
@@ -195,7 +195,7 @@ Point GridWindow::transform( double x, double y )
     return aRet;
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::transform( const Point& rOriginal, double& x, double& y )
 {
@@ -203,14 +203,14 @@ void GridWindow::transform( const Point& rOriginal, double& x, double& y )
     y = ( m_aGridArea.Bottom() - rOriginal.Y() ) * (m_fMaxY - m_fMinY) / (double)m_aGridArea.GetHeight() + m_fMinY;
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::drawLine( double x1, double y1, double x2, double y2 )
 {
     DrawLine( transform( x1, y1 ), transform( x2, y2 ) );
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::computeChunk( double fMin, double fMax, double& fChunkOut, double& fMinChunkOut )
 {
@@ -238,7 +238,7 @@ void GridWindow::computeChunk( double fMin, double fMax, double& fChunkOut, doub
         fMinChunkOut += fChunkOut;
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::computeNew()
 {
@@ -287,7 +287,7 @@ void GridWindow::computeNew()
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 double GridWindow::interpolate(
     double x,
@@ -313,7 +313,7 @@ double GridWindow::interpolate(
     return ret;
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY )
 {
@@ -326,7 +326,7 @@ void GridWindow::setBoundings( double fMinX, double fMinY, double fMaxX, double
     computeChunk( m_fMinY, m_fMaxY, m_fChunkY, m_fMinChunkY );
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::drawGrid()
 {
@@ -366,7 +366,7 @@ void GridWindow::drawGrid()
     drawLine( m_fMaxX, m_fMinY, m_fMaxX, m_fMaxY );
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::drawOriginal()
 {
@@ -381,7 +381,7 @@ void GridWindow::drawOriginal()
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::drawNew()
 {
@@ -398,7 +398,7 @@ void GridWindow::drawNew()
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::drawHandles()
 {
@@ -408,7 +408,7 @@ void GridWindow::drawHandles()
     }
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::Paint( const Rectangle& rRect )
 {
@@ -419,7 +419,7 @@ void GridWindow::Paint( const Rectangle& rRect )
     drawHandles();
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::MouseMove( const MouseEvent& rEvt )
 {
@@ -454,7 +454,7 @@ void GridWindow::MouseMove( const MouseEvent& rEvt )
     ModalDialog::MouseMove( rEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::MouseButtonUp( const MouseEvent& rEvt )
 {
@@ -472,7 +472,7 @@ void GridWindow::MouseButtonUp( const MouseEvent& rEvt )
     ModalDialog::MouseButtonUp( rEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 void GridWindow::MouseButtonDown( const MouseEvent& rEvt )
 {
@@ -524,7 +524,7 @@ void GridWindow::MouseButtonDown( const MouseEvent& rEvt )
     ModalDialog::MouseButtonDown( rEvt );
 }
 
-// ---------------------------------------------------------------------
+
 
 IMPL_LINK( GridWindow, ClickButtonHdl, Button*, pButton )
 {
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index 671968d9c748..cb0d79cbd0f4 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -19,16 +19,16 @@
 
 #include <scanner.hxx>
 
-// ------------------
+
 // - ScannerManager -
-// ------------------
+
 
 Reference< XInterface > SAL_CALL ScannerManager_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >& /*rxFactory*/ ) throw ( Exception )
 {
     return *( new ScannerManager() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ScannerManager::ScannerManager() :
     mpData( NULL )
@@ -36,14 +36,14 @@ ScannerManager::ScannerManager() :
     AcquireData();
 }
 
-// -----------------------------------------------------------------------------
+
 
 ScannerManager::~ScannerManager()
 {
     ReleaseData();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeException )
 {
@@ -54,35 +54,35 @@ Any SAL_CALL ScannerManager::queryInterface( const Type& rType ) throw( RuntimeE
     return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ScannerManager::acquire() throw()
 {
     OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ScannerManager::release() throw()
 {
     OWeakObject::release();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw()
 {
     return Sequence< sal_Int8 >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString ScannerManager::getImplementationName_Static() throw()
 {
     return OUString( "com.sun.star.scanner.ScannerManager" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw ()
 {
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 4d2a48e2d5f4..6c0985d79f7e 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -40,7 +40,7 @@ BitmapTransporter::~BitmapTransporter()
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( RuntimeException )
 {
@@ -49,7 +49,7 @@ Any SAL_CALL BitmapTransporter::queryInterface( const Type& rType ) throw( Runti
     return( aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 css::awt::Size BitmapTransporter::getSize() throw()
 {
@@ -73,7 +73,7 @@ css::awt::Size BitmapTransporter::getSize() throw()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > BitmapTransporter::getDIB() throw()
 {
@@ -92,9 +92,9 @@ Sequence< sal_Int8 > BitmapTransporter::getDIB() throw()
     return aValue;
 }
 
-// --------------
+
 // - SaneHolder -
-// --------------
+
 
 struct SaneHolder
 {
@@ -139,9 +139,9 @@ namespace
     struct theSanes : public rtl::Static<allSanes, theSanes> {};
 }
 
-// -----------------
+
 // - ScannerThread -
-// -----------------
+
 
 class ScannerThread : public osl::Thread
 {
@@ -159,7 +159,7 @@ public:
     virtual ~ScannerThread();
 };
 
-// -----------------------------------------------------------------------------
+
 
 ScannerThread::ScannerThread(
                              boost::shared_ptr<SaneHolder> pHolder,
@@ -207,9 +207,9 @@ void ScannerThread::run()
     m_pHolder->m_bBusy = false;
 }
 
-// ------------------
+
 // - ScannerManager -
-// ------------------
+
 
 void ScannerManager::AcquireData()
 {
@@ -223,7 +223,7 @@ void ScannerManager::ReleaseData()
     theSanes::get().release();
 }
 
-// -----------------------------------------------------------------------------
+
 
 css::awt::Size ScannerManager::getSize() throw()
 {
@@ -232,14 +232,14 @@ css::awt::Size ScannerManager::getSize() throw()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > ScannerManager::getDIB() throw()
 {
     return Sequence< sal_Int8 >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw()
 {
@@ -264,7 +264,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw()
     return Sequence< ScannerContext >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_context,
                                                   const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException )
@@ -306,7 +306,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ScannerManager::startScan( const ScannerContext& scanner_context,
                                 const Reference< com::sun::star::lang::XEventListener >& listener ) throw( ScannerException )
@@ -337,7 +337,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
     pThread->create();
 }
 
-// -----------------------------------------------------------------------------
+
 
 ScanError ScannerManager::getError( const ScannerContext& scanner_context ) throw( ScannerException )
 {
@@ -356,7 +356,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
     return pHolder->m_nError;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext& scanner_context ) throw( ScannerException )
 {
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 94beb83856d9..fa3ea2a4b7f3 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -55,7 +55,7 @@ struct OutData
     OutData(osl::Condition& rCondition) : FileHandle(NULL), Offset(0), StopCondition(rCondition), curl(NULL) {};
 };
 
-//------------------------------------------------------------------------------
+
 
 static void openFile( OutData& out )
 {
@@ -99,7 +99,7 @@ static void openFile( OutData& out )
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 static inline OString
 getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, const OUString& aName)
@@ -110,7 +110,7 @@ getStringValue(const uno::Reference< container::XNameAccess >& xNameAccess, cons
     return OUStringToOString(aValue.get<OUString>(), RTL_TEXTENCODING_UTF8);
 }
 
-//------------------------------------------------------------------------------
+
 
 static inline sal_Int32
 getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess,
@@ -124,7 +124,7 @@ getInt32Value(const uno::Reference< container::XNameAccess >& xNameAccess,
     return n;
 }
 
-//------------------------------------------------------------------------------
+
 
 static size_t
 write_function( void *ptr, size_t size, size_t nmemb, void *stream )
@@ -142,7 +142,7 @@ write_function( void *ptr, size_t size, size_t nmemb, void *stream )
     return (size_t) nBytesWritten;
 }
 
-//------------------------------------------------------------------------------
+
 
 static int
 progress_callback( void *clientp, double dltotal, double dlnow, double ultotal, double ulnow )
@@ -175,7 +175,7 @@ progress_callback( void *clientp, double dltotal, double dlnow, double ultotal,
     return -1;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort) const
@@ -219,7 +219,7 @@ Download::getProxyForURL(const OUString& rURL, OString& rHost, sal_Int32& rPort)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal_Int32 nProxyPort)
 {
@@ -337,7 +337,7 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
     return ret;
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDestinationDir)
@@ -425,7 +425,7 @@ Download::start(const OUString& rURL, const OUString& rFile, const OUString& rDe
     return ret;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 Download::stop()
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 33ffd7e0418c..f49829c4edbb 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -71,7 +71,7 @@ namespace uno = com::sun::star::uno ;
 #define PROPERTY_SHOW_MENUICON  "MenuIconVisible"
 
 extern "C" bool SAL_CALL WNT_hasInternetConnection();
-//------------------------------------------------------------------------------
+
 
 // Returns the URL of the release note for the given position
 OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloadEnabled)
@@ -93,7 +93,7 @@ OUString getReleaseNote(const UpdateInfo& rInfo, sal_uInt8 pos, bool autoDownloa
     return OUString();
 }
 
-//------------------------------------------------------------------------------
+
 
 namespace
 {
@@ -105,7 +105,7 @@ static inline OUString getBuildId()
     return aPathVal;
 }
 
-//------------------------------------------------------------------------------
+
 #if defined LINUX || defined SOLARIS
 static inline OUString getBaseInstallation()
 {
@@ -115,7 +115,7 @@ static inline OUString getBaseInstallation()
 }
 #endif
 
-//------------------------------------------------------------------------------
+
 
 inline bool isObsoleteUpdateInfo(const OUString& rBuildId)
 {
@@ -123,7 +123,7 @@ inline bool isObsoleteUpdateInfo(const OUString& rBuildId)
 }
 
 
-//------------------------------------------------------------------------------
+
 
 OUString getImageFromFileName(const OUString& aFile)
 {
@@ -199,7 +199,7 @@ OUString getImageFromFileName(const OUString& aFile)
 }
 
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference< beans::XPropertySet > createMenuBarUI(
     const uno::Reference< uno::XComponentContext >& xContext,
@@ -224,7 +224,7 @@ static uno::Reference< beans::XPropertySet > createMenuBarUI(
     return xMenuBarUI;
 }
 
-//------------------------------------------------------------------------------
+
 
 
 
@@ -337,7 +337,7 @@ private:
     Download m_aDownload;
 };
 
-//------------------------------------------------------------------------------
+
 class ShutdownThread :  public osl::Thread
 {
 public:
@@ -354,7 +354,7 @@ private:
     const uno::Reference<uno::XComponentContext> m_xContext;
 };
 
-//------------------------------------------------------------------------------
+
 
 UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
                                       const uno::Reference<uno::XComponentContext>& xContext ) :
@@ -367,13 +367,13 @@ UpdateCheckThread::UpdateCheckThread( osl::Condition& rCondition,
     resume();
 }
 
-//------------------------------------------------------------------------------
+
 
 UpdateCheckThread::~UpdateCheckThread()
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 
 void SAL_CALL
@@ -385,7 +385,7 @@ UpdateCheckThread::terminate()
     osl::Thread::terminate();
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateCheckThread::join()
@@ -399,7 +399,7 @@ UpdateCheckThread::join()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateCheckThread::cancel()
@@ -410,7 +410,7 @@ UpdateCheckThread::cancel()
         xProvider->cancel();
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheckThread::runCheck( bool & rbExtensionsChecked )
@@ -449,7 +449,7 @@ UpdateCheckThread::runCheck( bool & rbExtensionsChecked )
     return ret;
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateCheckThread::onTerminated()
@@ -457,7 +457,7 @@ UpdateCheckThread::onTerminated()
     delete this;
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateCheckThread::run()
@@ -561,7 +561,7 @@ UpdateCheckThread::run()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 ManualUpdateCheckThread::run()
@@ -579,14 +579,14 @@ ManualUpdateCheckThread::run()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 MenuBarButtonJob::MenuBarButtonJob(const rtl::Reference< UpdateCheck >& rUpdateCheck) :
     m_aUpdateCheck(rUpdateCheck)
 {
 };
 
-//------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL
 MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& )
@@ -600,7 +600,7 @@ MenuBarButtonJob::execute(const uno::Sequence<beans::NamedValue>& )
     return uno::Any();
 }
 
-//------------------------------------------------------------------------------
+
 
 DownloadThread::DownloadThread(osl::Condition& rCondition,
                                const uno::Reference<uno::XComponentContext>& xContext,
@@ -614,13 +614,13 @@ DownloadThread::DownloadThread(osl::Condition& rCondition,
     createSuspended();
 }
 
-//------------------------------------------------------------------------------
+
 
 DownloadThread::~DownloadThread()
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 DownloadThread::run()
@@ -667,7 +667,7 @@ DownloadThread::run()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL DownloadThread::cancel()
 {
@@ -678,7 +678,7 @@ void SAL_CALL DownloadThread::cancel()
     aController->cancelDownload();
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL DownloadThread::suspend()
 {
@@ -686,26 +686,26 @@ void SAL_CALL DownloadThread::suspend()
     m_aDownload.stop();
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL DownloadThread::onTerminated()
 {
     delete this;
 }
 
-//------------------------------------------------------------------------------
+
 ShutdownThread::ShutdownThread( const uno::Reference<uno::XComponentContext>& xContext) :
     m_xContext( xContext )
 {
     create();
 }
 
-//------------------------------------------------------------------------------
+
 ShutdownThread::~ShutdownThread()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL
 ShutdownThread::run()
 {
@@ -724,18 +724,18 @@ ShutdownThread::run()
     xDesktop->terminate();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ShutdownThread::onTerminated()
 {
     delete this;
 }
 
-//------------------------------------------------------------------------------
+
 
 } // anonymous namespace
 
 
-//------------------------------------------------------------------------------
+
 
 UpdateCheck::UpdateCheck():
     m_eState(NOT_INITIALIZED), m_eUpdateState(UPDATESTATES_COUNT),
@@ -842,7 +842,7 @@ UpdateCheck::initialize(const uno::Sequence< beans::NamedValue >& rValues,
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::cancel()
@@ -860,7 +860,7 @@ UpdateCheck::cancel()
     setUIState(eUIState);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::download()
@@ -889,7 +889,7 @@ UpdateCheck::download()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::install()
@@ -933,7 +933,7 @@ UpdateCheck::install()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::pause()
@@ -950,7 +950,7 @@ UpdateCheck::pause()
     setUIState(UPDATESTATE_DOWNLOAD_PAUSED);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::resume()
@@ -967,7 +967,7 @@ UpdateCheck::resume()
     setUIState(UPDATESTATE_DOWNLOADING);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::closeAfterFailure()
@@ -982,7 +982,7 @@ UpdateCheck::closeAfterFailure()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::shutdownThread(bool join)
@@ -1006,7 +1006,7 @@ UpdateCheck::shutdownThread(bool join)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::enableAutoCheck(bool enable)
@@ -1017,7 +1017,7 @@ UpdateCheck::enableAutoCheck(bool enable)
     m_eState = enable ? CHECK_SCHEDULED : DISABLED;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::enableDownload(bool enable, bool paused)
@@ -1044,7 +1044,7 @@ UpdateCheck::enableDownload(bool enable, bool paused)
 
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheck::downloadTargetExists(const OUString& rFileName)
@@ -1088,7 +1088,7 @@ UpdateCheck::downloadTargetExists(const OUString& rFileName)
     return cont;
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateCheck::checkDownloadDestination( const OUString& rFileName )
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -1105,7 +1105,7 @@ bool UpdateCheck::checkDownloadDestination( const OUString& rFileName )
     return bReload;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::downloadStalled(const OUString& rErrorMessage)
@@ -1118,7 +1118,7 @@ UpdateCheck::downloadStalled(const OUString& rErrorMessage)
     setUIState(UPDATESTATE_ERROR_DOWNLOADING);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::downloadProgressAt(sal_Int8 nPercent)
@@ -1131,7 +1131,7 @@ UpdateCheck::downloadProgressAt(sal_Int8 nPercent)
     setUIState(UPDATESTATE_DOWNLOADING);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize)
@@ -1150,7 +1150,7 @@ UpdateCheck::downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::downloadFinished(const OUString& rLocalFileName)
@@ -1173,7 +1173,7 @@ UpdateCheck::downloadFinished(const OUString& rLocalFileName)
         showReleaseNote(aURL);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::cancelDownload()
@@ -1200,7 +1200,7 @@ UpdateCheck::cancelDownload()
 
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::showDialog(bool forceCheck)
@@ -1262,7 +1262,7 @@ UpdateCheck::showDialog(bool forceCheck)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
@@ -1343,7 +1343,7 @@ UpdateCheck::setUpdateInfo(const UpdateInfo& aInfo)
     setUIState(eUIState, bSuppressBubble);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::setCheckFailedState()
@@ -1351,7 +1351,7 @@ UpdateCheck::setCheckFailedState()
     setUIState(UPDATESTATE_ERROR_CHECKING);
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandler,
                                    UpdateState& eState,
                                    bool suppressBubble )
@@ -1386,7 +1386,7 @@ void UpdateCheck::handleMenuBarUI( rtl::Reference< UpdateHandler > rUpdateHandle
     }
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble)
 {
     osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -1440,7 +1440,7 @@ void UpdateCheck::setUIState(UpdateState eState, bool suppressBubble)
     aUpdateHandler->setState(eState);
 }
 
-//------------------------------------------------------------------------------
+
 
 UpdateState
 UpdateCheck::getUIState(const UpdateInfo& rInfo)
@@ -1458,7 +1458,7 @@ UpdateCheck::getUIState(const UpdateInfo& rInfo)
     return eUIState;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::showReleaseNote(const OUString& rURL) const
@@ -1472,7 +1472,7 @@ UpdateCheck::showReleaseNote(const OUString& rURL) const
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL)
@@ -1518,7 +1518,7 @@ UpdateCheck::storeReleaseNote(sal_Int8 nNum, const OUString &rURL)
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheck::showExtensionDialog()
 {
     OUString sServiceName = "com.sun.star.deployment.ui.PackageManagerDialog";
@@ -1540,7 +1540,7 @@ void UpdateCheck::showExtensionDialog()
         xExecuteable->trigger( sArguments );
 }
 
-//------------------------------------------------------------------------------
+
 
 rtl::Reference<UpdateHandler>
 UpdateCheck::getUpdateHandler()
@@ -1553,7 +1553,7 @@ UpdateCheck::getUpdateHandler()
     return m_aUpdateHandler;
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Reference< task::XInteractionHandler >
 UpdateCheck::getInteractionHandler() const
@@ -1568,7 +1568,7 @@ UpdateCheck::getInteractionHandler() const
     return xHandler;
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheck::isDialogShowing() const
@@ -1577,7 +1577,7 @@ UpdateCheck::isDialogShowing() const
     return m_aUpdateHandler.is() && m_aUpdateHandler->isVisible();
 };
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::autoCheckStatusChanged(bool enabled)
@@ -1596,7 +1596,7 @@ UpdateCheck::autoCheckStatusChanged(bool enabled)
     }
 };
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheck::autoCheckIntervalChanged()
@@ -1605,7 +1605,7 @@ UpdateCheck::autoCheckIntervalChanged()
     m_aCondition.set();
 };
 
-//------------------------------------------------------------------------------
+
 
 oslInterlockedCount SAL_CALL
 UpdateCheck::acquire() SAL_THROW(())
@@ -1613,7 +1613,7 @@ UpdateCheck::acquire() SAL_THROW(())
     return ReferenceObject::acquire();
 }
 
-//------------------------------------------------------------------------------
+
 
 oslInterlockedCount SAL_CALL
 UpdateCheck::release() SAL_THROW(())
diff --git a/extensions/source/update/check/updatecheckconfig.cxx b/extensions/source/update/check/updatecheckconfig.cxx
index f0f7ce1d6070..34c23a05fb2a 100644
--- a/extensions/source/update/check/updatecheckconfig.cxx
+++ b/extensions/source/update/check/updatecheckconfig.cxx
@@ -80,13 +80,13 @@ static const sal_Char * const aUpdateEntryProperties[] = {
 
 static const sal_uInt32 nUpdateEntryProperties = SAL_N_ELEMENTS(aUpdateEntryProperties);
 
-//------------------------------------------------------------------------------
+
 
 NamedValueByNameAccess::~NamedValueByNameAccess()
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Any
 NamedValueByNameAccess::getValue(const sal_Char * pName)
@@ -101,7 +101,7 @@ NamedValueByNameAccess::getValue(const sal_Char * pName)
 }
 
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheckROModel::isAutoCheckEnabled() const
@@ -109,7 +109,7 @@ UpdateCheckROModel::isAutoCheckEnabled() const
     return sal_True == m_aNameAccess.getValue(AUTOCHECK_ENABLED).get< sal_Bool >();
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheckROModel::isDownloadPaused() const
@@ -117,7 +117,7 @@ UpdateCheckROModel::isDownloadPaused() const
     return sal_True == m_aNameAccess.getValue(DOWNLOAD_PAUSED).get< sal_Bool >();
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
@@ -130,14 +130,14 @@ UpdateCheckROModel::getStringValue(const sal_Char * pStr) const
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString UpdateCheckROModel::getLocalFileName() const
 {
     return getStringValue(LOCAL_FILE);
 };
 
-//------------------------------------------------------------------------------
+
 
 sal_Int64 UpdateCheckROModel::getDownloadSize() const
 {
@@ -148,7 +148,7 @@ sal_Int64 UpdateCheckROModel::getDownloadSize() const
     return nRet;
 };
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckROModel::getUpdateEntryVersion() const
@@ -156,7 +156,7 @@ UpdateCheckROModel::getUpdateEntryVersion() const
     return getStringValue(OLD_VERSION);
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
@@ -181,7 +181,7 @@ UpdateCheckROModel::getUpdateEntry(UpdateInfo& rInfo) const
 }
 
 
-//------------------------------------------------------------------------------
+
 
 OUString UpdateCheckConfig::getDesktopDirectory()
 {
@@ -210,7 +210,7 @@ OUString UpdateCheckConfig::getDesktopDirectory()
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString UpdateCheckConfig::getAllUsersDirectory()
 {
@@ -231,7 +231,7 @@ OUString UpdateCheckConfig::getAllUsersDirectory()
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameContainer>& xContainer,
                                       const uno::Reference<container::XNameContainer>& xAvailableUpdates,
                                       const uno::Reference<container::XNameContainer>& xIgnoredUpdates,
@@ -242,11 +242,11 @@ UpdateCheckConfig::UpdateCheckConfig( const uno::Reference<container::XNameConta
     m_rListener( rListener )
 {}
 
-//------------------------------------------------------------------------------
+
 UpdateCheckConfig::~UpdateCheckConfig()
 {}
 
-//------------------------------------------------------------------------------
+
 
 ::rtl::Reference< UpdateCheckConfig >
 UpdateCheckConfig::get(
@@ -279,7 +279,7 @@ UpdateCheckConfig::get(
     return new UpdateCheckConfig( xContainer, xUpdateAvail, xIgnoredExt, rListener );
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheckConfig::isAutoCheckEnabled() const
@@ -289,7 +289,7 @@ UpdateCheckConfig::isAutoCheckEnabled() const
     return nValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 bool
 UpdateCheckConfig::isAutoDownloadEnabled() const
@@ -299,7 +299,7 @@ UpdateCheckConfig::isAutoDownloadEnabled() const
     return nValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckConfig::getUpdateEntryVersion() const
@@ -312,7 +312,7 @@ UpdateCheckConfig::getUpdateEntryVersion() const
     return aValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Int64
 UpdateCheckConfig::getLastChecked() const
@@ -325,7 +325,7 @@ UpdateCheckConfig::getLastChecked() const
     return nValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Int64
 UpdateCheckConfig::getCheckInterval() const
@@ -338,7 +338,7 @@ UpdateCheckConfig::getCheckInterval() const
     return nValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckConfig::getLocalFileName() const
@@ -352,7 +352,7 @@ UpdateCheckConfig::getLocalFileName() const
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckConfig::getDownloadDestination() const
@@ -365,7 +365,7 @@ UpdateCheckConfig::getDownloadDestination() const
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64 nFileSize)
@@ -385,7 +385,7 @@ UpdateCheckConfig::storeLocalFileName(const OUString& rLocalFileName, sal_Int64
     commitChanges();
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckConfig::clearLocalFileName()
@@ -402,7 +402,7 @@ UpdateCheckConfig::clearLocalFileName()
     commitChanges();
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckConfig::storeDownloadPaused(bool paused)
@@ -411,7 +411,7 @@ UpdateCheckConfig::storeDownloadPaused(bool paused)
     commitChanges();
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckConfig::updateLastChecked()
@@ -424,7 +424,7 @@ UpdateCheckConfig::updateLastChecked()
     replaceByName(LAST_CHECK, uno::makeAny(lastCheck));
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aCurrentBuild)
@@ -461,7 +461,7 @@ UpdateCheckConfig::storeUpdateFound( const UpdateInfo& rInfo, const OUString& aC
     commitChanges();
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateCheckConfig::clearUpdateFound()
@@ -490,7 +490,7 @@ UpdateCheckConfig::clearUpdateFound()
     commitChanges();
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString >
 UpdateCheckConfig::getServiceNames()
@@ -500,7 +500,7 @@ UpdateCheckConfig::getServiceNames()
     return aServiceList;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckConfig::getImplName()
@@ -508,7 +508,7 @@ UpdateCheckConfig::getImplName()
     return OUString("vnd.sun.UpdateCheckConfig");
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Type SAL_CALL
 UpdateCheckConfig::getElementType() throw (uno::RuntimeException)
@@ -516,7 +516,7 @@ UpdateCheckConfig::getElementType() throw (uno::RuntimeException)
     return m_xContainer->getElementType();
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL
 UpdateCheckConfig::hasElements() throw (uno::RuntimeException)
@@ -524,7 +524,7 @@ UpdateCheckConfig::hasElements() throw (uno::RuntimeException)
     return m_xContainer->hasElements();
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL
 UpdateCheckConfig::getByName( const OUString& aName )
@@ -545,7 +545,7 @@ UpdateCheckConfig::getByName( const OUString& aName )
     return aValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL
 UpdateCheckConfig::getElementNames(  ) throw (uno::RuntimeException)
@@ -553,7 +553,7 @@ UpdateCheckConfig::getElementNames(  ) throw (uno::RuntimeException)
     return m_xContainer->getElementNames();
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL
 UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeException)
@@ -561,7 +561,7 @@ UpdateCheckConfig::hasByName( const OUString& aName ) throw (uno::RuntimeExcepti
     return m_xContainer->hasByName( aName );
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElement )
@@ -571,7 +571,7 @@ UpdateCheckConfig::replaceByName( const OUString& aName, const uno::Any& aElemen
     return m_xContainer->replaceByName( aName, aElement );
 }
 
-//------------------------------------------------------------------------------
+
 // XChangesBatch
 
 void SAL_CALL
@@ -618,7 +618,7 @@ UpdateCheckConfig::commitChanges()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL
 UpdateCheckConfig::hasPendingChanges(  ) throw (uno::RuntimeException)
@@ -630,7 +630,7 @@ UpdateCheckConfig::hasPendingChanges(  ) throw (uno::RuntimeException)
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< util::ElementChange > SAL_CALL
 UpdateCheckConfig::getPendingChanges(  ) throw (uno::RuntimeException)
@@ -642,7 +642,7 @@ UpdateCheckConfig::getPendingChanges(  ) throw (uno::RuntimeException)
     return uno::Sequence< util::ElementChange >();
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
                                                const OUString& rVersion )
 {
@@ -673,7 +673,7 @@ bool UpdateCheckConfig::storeExtensionVersion( const OUString& rExtensionName,
     return bNotify;
 }
 
-//------------------------------------------------------------------------------
+
 bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName,
                                                const OUString& rVersion )
 {
@@ -706,7 +706,7 @@ bool UpdateCheckConfig::checkExtensionVersion( const OUString& rExtensionName,
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion,
                                                 sal_Int32 *nIndex )
 {
@@ -718,7 +718,7 @@ OUString UpdateCheckConfig::getSubVersion( const OUString& rVersion,
     return rVersion.getToken( 0, '.', *nIndex );
 }
 
-//------------------------------------------------------------------------------
+
 // checks if the second version string is greater than the first one
 
 bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1,
@@ -742,9 +742,9 @@ bool UpdateCheckConfig::isVersionGreater( const OUString& rVersion1,
     return false;
 }
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 
 OUString SAL_CALL
 UpdateCheckConfig::getImplementationName()  throw (uno::RuntimeException)
@@ -759,7 +759,7 @@ UpdateCheckConfig::supportsService(OUString const & serviceName)
     return cppu::supportsService(this, serviceName);
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL
 UpdateCheckConfig::getSupportedServiceNames()  throw (uno::RuntimeException)
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index 0ba47146b27d..f3276f973e36 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -111,9 +111,9 @@ private:
     void handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp );
 };
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 InitUpdateCheckJobThread::InitUpdateCheckJobThread(
             const uno::Reference< uno::XComponentContext > &xContext,
             const uno::Sequence< beans::NamedValue > &xParameters,
@@ -126,7 +126,7 @@ InitUpdateCheckJobThread::InitUpdateCheckJobThread(
     create();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL InitUpdateCheckJobThread::run()
 {
     if (!m_bShowDialog) {
@@ -158,7 +158,7 @@ UpdateCheckJob::~UpdateCheckJob()
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString >
 UpdateCheckJob::getServiceNames()
@@ -168,7 +168,7 @@ UpdateCheckJob::getServiceNames()
     return aServiceList;
 };
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateCheckJob::getImplName()
@@ -177,7 +177,7 @@ UpdateCheckJob::getImplName()
 }
 
 
-//------------------------------------------------------------------------------
+
 
 uno::Any
 UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
@@ -222,7 +222,7 @@ UpdateCheckJob::execute(const uno::Sequence<beans::NamedValue>& namedValues)
     return uno::Any();
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedValue > &rListProp )
 {
     try {
@@ -260,7 +260,7 @@ void UpdateCheckJob::handleExtensionUpdates( const uno::Sequence< beans::NamedVa
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL
 UpdateCheckJob::getImplementationName() throw (uno::RuntimeException)
@@ -268,7 +268,7 @@ UpdateCheckJob::getImplementationName() throw (uno::RuntimeException)
     return getImplName();
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL
 UpdateCheckJob::getSupportedServiceNames() throw (uno::RuntimeException)
@@ -282,7 +282,7 @@ UpdateCheckJob::supportsService( OUString const & serviceName ) throw (uno::Runt
     return cppu::supportsService(this, serviceName);
 }
 
-//------------------------------------------------------------------------------
+
 // XEventListener
 void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
@@ -296,14 +296,14 @@ void SAL_CALL UpdateCheckJob::disposing( lang::EventObject const & rEvt )
     }
 }
 
-//------------------------------------------------------------------------------
+
 // XTerminateListener
 void SAL_CALL UpdateCheckJob::queryTermination( lang::EventObject const & )
     throw ( frame::TerminationVetoException, uno::RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & )
     throw ( uno::RuntimeException )
 {
@@ -316,7 +316,7 @@ void SAL_CALL UpdateCheckJob::notifyTermination( lang::EventObject const & )
 
 } // anonymous namespace
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL
 createJobInstance(const uno::Reference<uno::XComponentContext>& xContext)
@@ -328,7 +328,7 @@ createJobInstance(const uno::Reference<uno::XComponentContext>& xContext)
     return static_cast<cppu::OWeakObject *>(job.get());
 }
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL
 createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext)
@@ -336,7 +336,7 @@ createConfigInstance(const uno::Reference<uno::XComponentContext>& xContext)
     return *UpdateCheckConfig::get(xContext, *UpdateCheck::get());
 }
 
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -359,7 +359,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     { NULL, NULL, NULL, NULL, NULL, 0 }
 } ;
 
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchk_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index 57ff85fbe0ba..73a7da79d0e1 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -82,7 +82,7 @@
 
 using namespace com::sun::star;
 
-//--------------------------------------------------------------------
+
 UpdateHandler::UpdateHandler( const uno::Reference< uno::XComponentContext > & rxContext,
                               const rtl::Reference< IActionListener > & rxActionListener ) :
     mxContext( rxContext ),
@@ -100,7 +100,7 @@ UpdateHandler::UpdateHandler( const uno::Reference< uno::XComponentContext > & r
 {
 }
 
-//--------------------------------------------------------------------
+
 UpdateHandler::~UpdateHandler()
 {
     mxContext = NULL;
@@ -109,7 +109,7 @@ UpdateHandler::~UpdateHandler()
     mxActionListener = NULL;
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::enableControls( short nCtrlState )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -138,7 +138,7 @@ void UpdateHandler::enableControls( short nCtrlState )
     mnLastCtrlState = nCtrlState;
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setDownloadBtnLabel( bool bAppendDots )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -157,7 +157,7 @@ void UpdateHandler::setDownloadBtnLabel( bool bAppendDots )
     }
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setState( UpdateState eState )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -168,7 +168,7 @@ void UpdateHandler::setState( UpdateState eState )
         updateState( meCurState );
 }
 
-//--------------------------------------------------------------------
+
 bool UpdateHandler::isVisible() const
 {
     if ( !mxUpdDlg.is() ) return false;
@@ -181,7 +181,7 @@ bool UpdateHandler::isVisible() const
         return false;
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setVisible( bool bVisible )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -224,7 +224,7 @@ void UpdateHandler::setVisible( bool bVisible )
     }
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setProgress( sal_Int32 nPercent )
 {
     if ( nPercent > 100 )
@@ -242,13 +242,13 @@ void UpdateHandler::setProgress( sal_Int32 nPercent )
     }
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setErrorMessage( const OUString& rErrorMsg )
 {
     setControlProperty( TEXT_DESCRIPTION, "Text", uno::Any( rErrorMsg ) );
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setDownloadFile( const OUString& rFilePath )
 {
     sal_Int32 nLast = rFilePath.lastIndexOf( '/' );
@@ -260,7 +260,7 @@ void UpdateHandler::setDownloadFile( const OUString& rFilePath )
     }
 }
 
-//--------------------------------------------------------------------
+
 OUString UpdateHandler::getBubbleText( UpdateState eState )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -276,7 +276,7 @@ OUString UpdateHandler::getBubbleText( UpdateState eState )
     return sText;
 }
 
-//--------------------------------------------------------------------
+
 OUString UpdateHandler::getBubbleTitle( UpdateState eState )
 {
     osl::MutexGuard aGuard( maMutex );
@@ -292,7 +292,7 @@ OUString UpdateHandler::getBubbleTitle( UpdateState eState )
     return sText;
 }
 
-//--------------------------------------------------------------------
+
 OUString UpdateHandler::getDefaultInstErrMsg()
 {
     osl::MutexGuard aGuard( maMutex );
@@ -303,7 +303,7 @@ OUString UpdateHandler::getDefaultInstErrMsg()
 }
 
 // XActionListener
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt )
     throw( uno::RuntimeException )
 {
@@ -311,7 +311,7 @@ void SAL_CALL UpdateHandler::disposing( const lang::EventObject& rEvt )
         mxUpdDlg.clear();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
     throw( uno::RuntimeException )
 {
@@ -376,13 +376,13 @@ void SAL_CALL UpdateHandler::actionPerformed( awt::ActionEvent const & rEvent )
 }
 
 // XTopWindowListener
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowOpened( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e )
     throw( uno::RuntimeException )
 {
@@ -393,40 +393,40 @@ void SAL_CALL UpdateHandler::windowClosing( const lang::EventObject& e )
     actionPerformed( aActionEvt );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowClosed( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowMinimized( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
     mbMinimized = true;
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowNormalized( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
     mbMinimized = false;
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowActivated( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::windowDeactivated( const lang::EventObject& )
     throw( uno::RuntimeException )
 {
 }
 
 // XInteractionHandler
-//------------------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest > const & rRequest)
     throw (uno::RuntimeException)
 {
@@ -468,9 +468,9 @@ void SAL_CALL UpdateHandler::handle( uno::Reference< task::XInteractionRequest >
         mxInteractionHdl->handle( rRequest );
 }
 
-//------------------------------------------------------------------------------
+
 // XTerminateListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& )
     throw ( frame::TerminationVetoException, uno::RuntimeException )
 {
@@ -488,7 +488,7 @@ void SAL_CALL UpdateHandler::queryTermination( const lang::EventObject& )
         setVisible( false );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& )
     throw ( uno::RuntimeException )
 {
@@ -508,9 +508,9 @@ void SAL_CALL UpdateHandler::notifyTermination( const lang::EventObject& )
     }
 }
 
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
-//--------------------------------------------------------------------
+
+
+
 void UpdateHandler::updateState( UpdateState eState )
 {
     if ( meLastState == eState )
@@ -610,7 +610,7 @@ void UpdateHandler::updateState( UpdateState eState )
     meLastState = eState;
 }
 
-//--------------------------------------------------------------------
+
 OUString UpdateHandler::loadString( const uno::Reference< resource::XResourceBundle > xBundle,
                                          sal_Int32 nResourceId ) const
 {
@@ -639,7 +639,7 @@ OUString UpdateHandler::substVariables( const OUString &rSource ) const
         .replaceAll( "%PERCENT", OUString::number( mnPercent ) );
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::loadStrings()
 {
     if ( mbStringsLoaded )
@@ -726,7 +726,7 @@ void UpdateHandler::loadStrings()
 }
 
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::startThrobber( bool bStart )
 {
     uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY );
@@ -745,7 +745,7 @@ void UpdateHandler::startThrobber( bool bStart )
         xWindow->setVisible( bStart );
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setControlProperty( const OUString &rCtrlName,
                                         const OUString &rPropName,
                                         const uno::Any &rPropValue )
@@ -766,7 +766,7 @@ void UpdateHandler::setControlProperty( const OUString &rCtrlName,
     }
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::showControl( const OUString &rCtrlName, bool bShow )
 {
     uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY );
@@ -782,7 +782,7 @@ void UpdateHandler::showControl( const OUString &rCtrlName, bool bShow )
         xWindow->setVisible( bShow );
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::focusControl( DialogControls eID )
 {
     uno::Reference< awt::XControlContainer > xContainer( mxUpdDlg, uno::UNO_QUERY );
@@ -800,7 +800,7 @@ void UpdateHandler::focusControl( DialogControls eID )
         xWindow->setFocus();
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > const & rxDialogModel,
                                         OUString const & rServiceName,
                                         OUString const & rControlName,
@@ -828,7 +828,7 @@ void UpdateHandler::insertControlModel( uno::Reference< awt::XControlModel > con
     xContainer->insertByName( rControlName, uno::Any (uno::Reference< uno::XInterface >(xModel, uno::UNO_QUERY)));
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::setFullVersion( OUString& rString )
 {
     uno::Reference< lang::XMultiServiceFactory > xConfigurationProvider(
@@ -854,7 +854,7 @@ void UpdateHandler::setFullVersion( OUString& rString )
     rString = rString.replaceFirst( aProductVersion, aProductFullVersion );
 }
 
-//--------------------------------------------------------------------
+
 bool UpdateHandler::showWarning( const OUString &rWarningText ) const
 {
     bool bRet = false;
@@ -901,7 +901,7 @@ bool UpdateHandler::showWarning( const OUString &rWarningText ) const
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 bool UpdateHandler::showWarning( const OUString &rWarningText,
                                  const OUString &rBtnText_1,
                                  const OUString &rBtnText_2 ) const
@@ -972,7 +972,7 @@ bool UpdateHandler::showWarning( const OUString &rWarningText,
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 bool UpdateHandler::showOverwriteWarning( const OUString& rFileName ) const
 {
     return showWarning(
@@ -982,13 +982,13 @@ bool UpdateHandler::showOverwriteWarning( const OUString& rFileName ) const
         msReloadContinue, msReloadReload );
 }
 
-//--------------------------------------------------------------------
+
 bool UpdateHandler::showOverwriteWarning() const
 {
     return showWarning( msOverwriteWarning );
 }
 
-//--------------------------------------------------------------------
+
 #define BUTTON_HEIGHT       14
 #define BUTTON_WIDTH        50
 #define BUTTON_X_OFFSET      7
@@ -1023,7 +1023,7 @@ bool UpdateHandler::showOverwriteWarning() const
 #define PROGRESS_X_POS      ( DIALOG_BORDER + 8 )
 #define PROGRESS_Y_POS      ( DIALOG_BORDER + 2*LABEL_OFFSET )
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::showControls( short nControls )
 {
     // The buttons from CANCEL_BUTTON to RESUME_BUTTON will be shown or
@@ -1055,7 +1055,7 @@ void UpdateHandler::showControls( short nControls )
         setControlProperty( TEXT_STATUS, "Height", uno::Any( sal_Int32(BOX_HEIGHT1 - 4*TEXT_OFFSET - LABEL_HEIGHT ) ) );
 }
 
-//--------------------------------------------------------------------
+
 void UpdateHandler::createDialog()
 {
     if ( !mxContext.is() )
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 7ef271aa1d40..ddf58590675c 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -44,7 +44,7 @@ namespace uno = css::uno ;
 namespace task = css::task ;
 namespace xml = css::xml ;
 
-//------------------------------------------------------------------------------
+
 
 static bool
 getBootstrapData(
@@ -74,7 +74,7 @@ getBootstrapData(
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 
 // Returns 'true' if successfully connected to the update server
 bool
@@ -243,7 +243,7 @@ checkForUpdates(
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > & rxContext,
                                 const uno::Sequence< uno::Sequence< OUString > > &rUpdateInfos )
 {
@@ -261,7 +261,7 @@ bool storeExtensionUpdateInfos( const uno::Reference< uno::XComponentContext > &
     return bNotify;
 }
 
-//------------------------------------------------------------------------------
+
 // Returns 'true' if there are updates for any extension
 
 bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > & rxContext )
@@ -288,7 +288,7 @@ bool checkForExtensionUpdates( const uno::Reference< uno::XComponentContext > &
     return bNotify;
 }
 
-//------------------------------------------------------------------------------
+
 // Returns 'true' if there are any pending updates for any extension (offline check)
 
 bool checkForPendingUpdates( const uno::Reference< uno::XComponentContext > & rxContext )
diff --git a/extensions/source/update/check/updateprotocoltest.cxx b/extensions/source/update/check/updateprotocoltest.cxx
index 60cbe243157a..803c3efe75d7 100644
--- a/extensions/source/update/check/updateprotocoltest.cxx
+++ b/extensions/source/update/check/updateprotocoltest.cxx
@@ -31,7 +31,7 @@
 namespace task = ::com::sun::star::task;
 namespace uno  = ::com::sun::star::uno;
 
-// -----------------------------------------------------------------------
+
 
 SAL_IMPLEMENT_MAIN()
 {
diff --git a/extensions/source/update/feed/test/updatefeedtest.cxx b/extensions/source/update/feed/test/updatefeedtest.cxx
index d45b7f2d2c8d..c205732dc2fe 100644
--- a/extensions/source/update/feed/test/updatefeedtest.cxx
+++ b/extensions/source/update/feed/test/updatefeedtest.cxx
@@ -37,7 +37,7 @@ namespace lang = ::com::sun::star::lang;
 namespace uno = ::com::sun::star::uno;
 namespace xml = ::com::sun::star::xml;
 
-// -----------------------------------------------------------------------
+
 
 SAL_IMPLEMENT_MAIN()
 {
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 4503a64b82b3..1ed4e8605576 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -66,7 +66,7 @@ namespace xml = com::sun::star::xml ;
 namespace sdbc = com::sun::star::sdbc ;
 
 
-//------------------------------------------------------------------------------
+
 
 namespace
 {
@@ -113,7 +113,7 @@ public:
 #define INPUT_STREAM(i) i
 #endif
 
-//------------------------------------------------------------------------------
+
 
 class ActiveDataSink : public ::cppu::WeakImplHelper1< io::XActiveDataSink >
 {
@@ -128,7 +128,7 @@ public:
         throw (uno::RuntimeException) { m_xStream = rStream; };
 };
 
-//------------------------------------------------------------------------------
+
 
 class UpdateInformationProvider :
     public ::cppu::WeakImplHelper3< deployment::XUpdateInformationProvider,
@@ -219,7 +219,7 @@ private:
     sal_Int32 m_nCommandId;
 };
 
-//------------------------------------------------------------------------------
+
 
 class UpdateInformationEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
@@ -286,7 +286,7 @@ private:
     sal_Int32 m_nCount;
 };
 
-//------------------------------------------------------------------------------
+
 
 class SingleUpdateInformationEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
 {
@@ -312,7 +312,7 @@ private:
 };
 
 
-//------------------------------------------------------------------------------
+
 
 UpdateInformationProvider::UpdateInformationProvider(
     const uno::Reference<uno::XComponentContext>& xContext,
@@ -366,7 +366,7 @@ UpdateInformationProvider::UpdateInformationProvider(
     }
 }
 
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface >
 UpdateInformationProvider::createInstance(const uno::Reference<uno::XComponentContext>& xContext)
 {
@@ -383,13 +383,13 @@ UpdateInformationProvider::createInstance(const uno::Reference<uno::XComponentCo
     return *new UpdateInformationProvider(xContext, xUniversalContentBroker, xDocumentBuilder, xXPath);
 }
 
-//------------------------------------------------------------------------------
+
 
 UpdateInformationProvider::~UpdateInformationProvider()
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServiceFactory> const & configurationProvider, OUString const & node, OUString const & item)
@@ -412,7 +412,7 @@ UpdateInformationProvider::getConfigurationItem(uno::Reference<lang::XMultiServi
     return sRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 void
 UpdateInformationProvider::storeCommandInfo(
@@ -425,7 +425,7 @@ UpdateInformationProvider::storeCommandInfo(
     m_xCommandProcessor = rxCommandProcessor;
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Reference< io::XInputStream >
 UpdateInformationProvider::load(const OUString& rURL)
@@ -482,7 +482,7 @@ UpdateInformationProvider::load(const OUString& rURL)
     return INPUT_STREAM(aSink->getInputStream());
 }
 
-//------------------------------------------------------------------------------
+
 
 // TODO: docu content node
 
@@ -529,7 +529,7 @@ UpdateInformationProvider::getDocumentRoot(const uno::Reference< xml::dom::XNode
     return uno::Reference< xml::dom::XElement > ();
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Reference< xml::dom::XNode >
 UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >& rxNode,
@@ -544,7 +544,7 @@ UpdateInformationProvider::getChildNode(const uno::Reference< xml::dom::XNode >&
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Reference< container::XEnumeration > SAL_CALL
 UpdateInformationProvider::getUpdateInformationEnumeration(
@@ -615,7 +615,7 @@ UpdateInformationProvider::getUpdateInformationEnumeration(
     return uno::Reference< container::XEnumeration >();
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< uno::Reference< xml::dom::XElement > > SAL_CALL
 UpdateInformationProvider::getUpdateInformation(
@@ -660,7 +660,7 @@ UpdateInformationProvider::getUpdateInformation(
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateInformationProvider::cancel() throw (uno::RuntimeException)
@@ -672,7 +672,7 @@ UpdateInformationProvider::cancel() throw (uno::RuntimeException)
         m_xCommandProcessor->abort(m_nCommandId);
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 UpdateInformationProvider::setInteractionHandler(
@@ -683,7 +683,7 @@ UpdateInformationProvider::setInteractionHandler(
     m_xInteractionHandler = handler;
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Reference< task::XInteractionHandler > SAL_CALL
 UpdateInformationProvider::getInteractionHandler()
@@ -715,7 +715,7 @@ UpdateInformationProvider::getInteractionHandler()
         return m_xPwContainerInteractionHandler;
     }
 }
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString >
 UpdateInformationProvider::getServiceNames()
@@ -725,7 +725,7 @@ UpdateInformationProvider::getServiceNames()
     return aServiceList;
 };
 
-//------------------------------------------------------------------------------
+
 
 OUString
 UpdateInformationProvider::getImplName()
@@ -733,7 +733,7 @@ UpdateInformationProvider::getImplName()
     return OUString("vnd.sun.UpdateInformationProvider");
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL
 UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException)
@@ -741,7 +741,7 @@ UpdateInformationProvider::getImplementationName() throw (uno::RuntimeException)
     return getImplName();
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL
 UpdateInformationProvider::getSupportedServiceNames() throw (uno::RuntimeException)
@@ -757,7 +757,7 @@ UpdateInformationProvider::supportsService( OUString const & serviceName ) throw
 
 } // anonymous namespace
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL
 createInstance(uno::Reference<uno::XComponentContext> const & xContext)
@@ -765,7 +765,7 @@ createInstance(uno::Reference<uno::XComponentContext> const & xContext)
     return UpdateInformationProvider::createInstance(xContext);
 }
 
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -780,7 +780,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     { NULL, NULL, NULL, NULL, NULL, 0 }
 } ;
 
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updatefeed_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 1361ebaee414..8af861593fe5 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -63,7 +63,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------------
+
 
 static uno::Sequence< OUString > getServiceNames()
 {
@@ -72,19 +72,19 @@ static uno::Sequence< OUString > getServiceNames()
     return aServiceList;
 }
 
-//------------------------------------------------------------------------------
+
 
 static OUString getImplementationName()
 {
     return OUString("vnd.sun.UpdateCheckUI");
 }
 
-//------------------------------------------------------------------------------
+
 
 namespace
 {
 
-//------------------------------------------------------------------------------
+
 class BubbleWindow : public FloatingWindow
 {
     Point           maTipPos;
@@ -116,7 +116,7 @@ public:
                                      const Image& rImage );
 };
 
-//------------------------------------------------------------------------------
+
 class UpdateCheckUI : public ::cppu::WeakImplHelper3
                         < lang::XServiceInfo, document::XEventListener, beans::XPropertySet >
 {
@@ -195,7 +195,7 @@ public:
         throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException );
 };
 
-//------------------------------------------------------------------------------
+
 UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xContext) :
       m_xContext(xContext)
     , mpBubbleWin( NULL )
@@ -225,7 +225,7 @@ UpdateCheckUI::UpdateCheckUI(const uno::Reference<uno::XComponentContext>& xCont
     Application::AddEventListener( maApplicationEventHdl );
 }
 
-//------------------------------------------------------------------------------
+
 UpdateCheckUI::~UpdateCheckUI()
 {
     Application::RemoveEventListener( maApplicationEventHdl );
@@ -234,14 +234,14 @@ UpdateCheckUI::~UpdateCheckUI()
     delete mpSfxResMgr;
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL
 UpdateCheckUI::getImplementationName() throw (uno::RuntimeException)
 {
     return ::getImplementationName();
 }
 
-//------------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL
 UpdateCheckUI::getSupportedServiceNames() throw (uno::RuntimeException)
 {
@@ -254,7 +254,7 @@ UpdateCheckUI::supportsService( OUString const & serviceName ) throw (uno::Runti
     return cppu::supportsService(this, serviceName);
 }
 
-//------------------------------------------------------------------------------
+
 Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
 {
     sal_uInt32 nResID;
@@ -272,7 +272,7 @@ Image UpdateCheckUI::GetMenuBarIcon( MenuBar* pMBar )
     return Image( ResId( nResID, *mpUpdResMgr ) );
 }
 
-//------------------------------------------------------------------------------
+
 Image UpdateCheckUI::GetBubbleImage( OUString &rURL )
 {
     Image aImage;
@@ -310,7 +310,7 @@ Image UpdateCheckUI::GetBubbleImage( OUString &rURL )
     return aImage;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
 {
     if ( ! mbShowMenuIcon )
@@ -364,7 +364,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UpdateCheckUI::notifyEvent(const document::EventObject& rEvent)
     throw (uno::RuntimeException)
 {
@@ -376,20 +376,20 @@ void SAL_CALL UpdateCheckUI::notifyEvent(const document::EventObject& rEvent)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL UpdateCheckUI::disposing(const lang::EventObject&)
     throw (uno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > UpdateCheckUI::getPropertySetInfo(void)
     throw ( uno::RuntimeException )
 {
     return NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
                                      const uno::Any& rValue)
     throw( beans::UnknownPropertyException, beans::PropertyVetoException,
@@ -455,7 +455,7 @@ void UpdateCheckUI::setPropertyValue(const OUString& rPropertyName,
         mpBubbleWin->Show( sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName)
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
 {
@@ -481,7 +481,7 @@ uno::Any UpdateCheckUI::getPropertyValue(const OUString& rPropertyName)
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/,
                                                const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
@@ -489,7 +489,7 @@ void UpdateCheckUI::addPropertyChangeListener( const OUString& /*aPropertyName*/
     //no bound properties
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyName*/,
                                                   const uno::Reference< beans::XPropertyChangeListener > & /*aListener*/)
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
@@ -497,7 +497,7 @@ void UpdateCheckUI::removePropertyChangeListener( const OUString& /*aPropertyNam
     //no bound properties
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/,
                                                const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
@@ -505,7 +505,7 @@ void UpdateCheckUI::addVetoableChangeListener( const OUString& /*aPropertyName*/
     //no vetoable properties
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyName*/,
                                                   const uno::Reference< beans::XVetoableChangeListener > & /*aListener*/)
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
@@ -514,9 +514,9 @@ void UpdateCheckUI::removeVetoableChangeListener( const OUString& /*aPropertyNam
 }
 
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 BubbleWindow * UpdateCheckUI::GetBubbleWindow()
 {
     if ( !mpIconSysWin )
@@ -546,7 +546,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow()
     return pBubbleWin;
 }
 
-//------------------------------------------------------------------------------
+
 void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon )
 {
     SolarMutexGuard aGuard;
@@ -579,7 +579,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon )
     }
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl)
 {
     SolarMutexGuard aGuard;
@@ -602,7 +602,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, ClickHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pData )
 {
     if ( pData->bHighlight )
@@ -613,7 +613,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl)
 {
     SolarMutexGuard aGuard;
@@ -628,7 +628,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, WaitTimeOutHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl)
 {
     RemoveBubbleWindow( false );
@@ -636,7 +636,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, TimeOutHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
 {
     SolarMutexGuard aGuard;
@@ -669,7 +669,7 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent )
 {
     sal_uLong nEventID = pEvent->GetId();
@@ -721,7 +721,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent )
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent)
 {
     switch (pEvent->GetId())
@@ -746,9 +746,9 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent)
     }
     return 0;
 }
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 
 #define TIP_HEIGHT             15
 #define TIP_WIDTH               7
@@ -757,7 +757,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent)
 #define TEXT_MAX_WIDTH        300
 #define TEXT_MAX_HEIGHT       200
 
-//------------------------------------------------------------------------------
+
 BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle,
                             const OUString& rText, const Image& rImage )
     : FloatingWindow( pParent, WB_SYSTEMWINDOW
@@ -773,12 +773,12 @@ BubbleWindow::BubbleWindow( Window* pParent, const OUString& rTitle,
     SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetHelpColor() ) );
 }
 
-//------------------------------------------------------------------------------
+
 BubbleWindow::~BubbleWindow()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void BubbleWindow::Resize()
 {
     SolarMutexGuard aGuard;
@@ -809,7 +809,7 @@ void BubbleWindow::Resize()
     SetWindowRegionPixel( maBounds );
 }
 
-//------------------------------------------------------------------------------
+
 void BubbleWindow::SetTitleAndText( const OUString& rTitle,
                                     const OUString& rText,
                                     const Image& rImage )
@@ -821,7 +821,7 @@ void BubbleWindow::SetTitleAndText( const OUString& rTitle,
     Resize();
 }
 
-//------------------------------------------------------------------------------
+
 void BubbleWindow::Paint( const Rectangle& )
 {
     SolarMutexGuard aGuard;
@@ -861,13 +861,13 @@ void BubbleWindow::Paint( const Rectangle& )
     DrawText( aTextRect, maBubbleText, TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
 }
 
-//------------------------------------------------------------------------------
+
 void BubbleWindow::MouseButtonDown( const MouseEvent& )
 {
     Show( sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
 {
     SolarMutexGuard aGuard;
@@ -916,7 +916,7 @@ void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
     FloatingWindow::Show( bVisible, nFlags );
 }
 
-//------------------------------------------------------------------------------
+
 void BubbleWindow::RecalcTextRects()
 {
     Size aTotalSize;
@@ -957,13 +957,13 @@ void BubbleWindow::RecalcTextRects()
     maTitleRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT );
     maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetHeight() * 3 / 4 );
 }
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
+
 
 } // anonymous namespace
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL
 createInstance(const uno::Reference<uno::XComponentContext>& xContext)
@@ -971,7 +971,7 @@ createInstance(const uno::Reference<uno::XComponentContext>& xContext)
     return  *new UpdateCheckUI(xContext);
 }
 
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -986,7 +986,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     { NULL, NULL, NULL, NULL, NULL, 0 }
 } ;
 
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL updchkui_component_getFactory(const sal_Char *pszImplementationName, void *pServiceManager, void *pRegistryKey)
 {
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index e938b87b79f3..d70440582ec8 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -560,7 +560,7 @@ Sequence< Sequence<Reference<XEventListener > > > SAL_CALL OComponent::methodXEv
     return aSeq;
 }
 
-//---------------------------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OComponent::getAttrByte(void) throw( RuntimeException)
 {
@@ -711,7 +711,7 @@ void SAL_CALL OComponent::setAttrXInterface( const Sequence< Reference< XInterfa
     m_seqxInterface= _attrxinterface;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ::sal_Int8 SAL_CALL OComponent::getAByte() throw (RuntimeException)
 {
@@ -852,7 +852,7 @@ void SAL_CALL OComponent::setAXInvocation( const Reference< XInvocation >& _axin
 {
     m_attr_xinvocation = _axinvocation;
 }
-//-----------------------------------------------------------------------------------
+
 void SAL_CALL OComponent::testout_methodByte(sal_Int8& rOut) throw( RuntimeException )
 {
     rOut= m_int8;
diff --git a/extensions/test/stm/datatest.cxx b/extensions/test/stm/datatest.cxx
index 0ff0a7496bda..cf59aaae4edb 100644
--- a/extensions/test/stm/datatest.cxx
+++ b/extensions/test/stm/datatest.cxx
@@ -618,8 +618,8 @@ UString     OMyPersistObject_getImplementationName( ) THROWS(())
 }
 
 
-// ---------------------------------------------
-// -----------------------------------------------
+
+
 class OObjectStreamTest :
         public ODataStreamTest
 {
diff --git a/extensions/test/stm/marktest.cxx b/extensions/test/stm/marktest.cxx
index 83be75863cd0..c04ec9953000 100644
--- a/extensions/test/stm/marktest.cxx
+++ b/extensions/test/stm/marktest.cxx
@@ -389,7 +389,7 @@ UString     OMarkableOutputStreamTest_getImplementationName() THROWS(())
 
 
 
-//-----------------------------------------------------
+
 // Input stream
 
 class OMarkableInputStreamTest :
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 3e1cb25bd664..b38f318ad1d9 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -18,7 +18,7 @@
  */
 
 
-//------------------------------------------------------
+
 // testcomponent - Loads a service and its testcomponent from dlls performs a test.
 // Expands the dll-names depending on the actual environment.
 // Example : testcomponent com.sun.star.io.Pipe stm
diff --git a/extensions/workben/testframecontrol.cxx b/extensions/workben/testframecontrol.cxx
index 5f5b72037529..247374caaf8e 100644
--- a/extensions/workben/testframecontrol.cxx
+++ b/extensions/workben/testframecontrol.cxx
@@ -84,7 +84,7 @@ public:
     void                removeAllListeners( const XControlRef& xControl );
 };
 
-//--------------------------------------------------------------------------------------------------
+
 void Listener_Impl::addAllListeners( const XControlRef& xControl )
 {
     XWindowRef xWindow( xControl, USR_QUERY );
@@ -99,7 +99,7 @@ void Listener_Impl::addAllListeners( const XControlRef& xControl )
     xControl->addEventListener( (XEventListener*)(XPaintListener*)this );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void Listener_Impl::removeAllListeners( const XControlRef& xControl )
 {
     XWindowRef xWindow( xControl, USR_QUERY );
@@ -114,10 +114,10 @@ void Listener_Impl::removeAllListeners( const XControlRef& xControl )
     xControl->removeEventListener( (XEventListener*)(XPaintListener*)this );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 SMART_UNO_IMPLEMENTATION( Listener_Impl, UsrObject );
 
-//--------------------------------------------------------------------------------------------------
+
 BOOL Listener_Impl::queryInterface( Uik aUik, XInterfaceRef& rOut )
 {
     if (aUik == XMouseListener::getSmartUik())
@@ -140,7 +140,7 @@ BOOL Listener_Impl::queryInterface( Uik aUik, XInterfaceRef& rOut )
     return TRUE;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 // XMouseListener
 void Listener_Impl::mousePressed( const VclMouseEvent& evt )    {}
 void Listener_Impl::mouseReleased( const VclMouseEvent& evt )   {}
@@ -213,7 +213,7 @@ Application* pApp = &g_App;
 #endif
 
 
-//--------------------------------------------------------------------------------------------------
+
 void FrameControlApplication::init()
 {
     XMultiServiceFactoryRef xMgr = createRegistryServiceManager( L"test.rdb" );
@@ -262,7 +262,7 @@ void FrameControlApplication::init()
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void FrameControlApplication::deinit()
 {
     if (_pListener)
@@ -281,7 +281,7 @@ void FrameControlApplication::deinit()
 }
 
 
-//--------------------------------------------------------------------------------------------------
+
 void FrameControlApplication::Main()
 {
 //      void TestErrcodes();
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index 152d380839c5..e31420824349 100644
--- a/extensions/workben/testresource.cxx
+++ b/extensions/workben/testresource.cxx
@@ -37,7 +37,7 @@ public:
 
 MyApp aMyApp;
 
-// -----------------------------------------------------------------------
+
 
 void MyApp::Main()
 {
diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx
index 8f91437fce30..e82634fb25c2 100644
--- a/filter/source/config/cache/cacheitem.cxx
+++ b/filter/source/config/cache/cacheitem.cxx
@@ -131,7 +131,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
     css::uno::TypeClass aTypeClass = aT1.getTypeClass();
     switch(aTypeClass)
     {
-        //---------------------------------------
+
         case css::uno::TypeClass_BOOLEAN :
         case css::uno::TypeClass_BYTE :
         case css::uno::TypeClass_SHORT :
@@ -148,7 +148,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
             return bIs;
         }
 
-        //---------------------------------------
+
         case css::uno::TypeClass_STRING :
         {
             OUString v1;
@@ -166,7 +166,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
         }
         break;
 
-        //---------------------------------------
+
         case css::uno::TypeClass_ANY :
         {
             css::uno::Any v1;
@@ -184,7 +184,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
         }
         break;
 
-        //---------------------------------------
+
         case css::uno::TypeClass_STRUCT :
         {
             css::beans::PropertyValue p1;
@@ -221,7 +221,7 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet,
         }
         break;
 
-        //---------------------------------------
+
         case css::uno::TypeClass_SEQUENCE :
         {
             css::uno::Sequence< OUString > uno_s1;
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index d9715a1ee68c..8e53aef0c9f0 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -88,7 +88,7 @@ void SAL_CALL ConfigFlush::refresh()
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener)
     throw(css::uno::RuntimeException)
 {
@@ -98,7 +98,7 @@ void SAL_CALL ConfigFlush::addRefreshListener(const css::uno::Reference< css::ut
                              xListener);
 }
 
-//-----------------------------------------------
+
 void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener >& xListener)
     throw(css::uno::RuntimeException)
 {
@@ -108,13 +108,13 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css:
                                 xListener);
 }
 
-//-----------------------------------------------
+
 OUString ConfigFlush::impl_getImplementationName()
 {
     return OUString("com.sun.star.comp.filter.config.ConfigFlush");
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames()
 {
     css::uno::Sequence< OUString > lServiceNames(1);
@@ -122,7 +122,7 @@ css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames()
     return lServiceNames;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::uno::XInterface > ConfigFlush::impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
 {
     ConfigFlush* pNew = new ConfigFlush(xSMGR);
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 0d150332c0a0..04cc0ab6b632 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -189,7 +189,7 @@ void FilterCache::load(EFillState eRequired,
 
     // Otherwise load the missing items.
 
-    // ------------------------------------------
+
     // a) load some const values from configration.
     //    These values are needed there for loading
     //    config items ...
@@ -216,7 +216,7 @@ void FilterCache::load(EFillState eRequired,
         /* LateInitListener* pLateInit = */ new LateInitListener(comphelper::getProcessComponentContext());
     }
 
-    // ------------------------------------------
+
     // b) If the required fill state was not reached
     //    but std values was already loaded ...
     //    we must load some further missing items.
@@ -452,7 +452,7 @@ void FilterCache::setItem(      EItemType        eType ,
     impl_addItem2FlushList(eType, sItem);
 }
 
-//-----------------------------------------------
+
 void FilterCache::refreshItem(      EItemType        eType,
                               const OUString& sItem)
     throw(css::uno::Exception)
@@ -1346,7 +1346,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
     // Attention: Detect services are part of the standard set!
     // So there is no need to handle it separately.
 
-    // ------------------------------------------
+
     // a) The standard set of config value is needed.
     if (
         ((eRequiredState & E_CONTAINS_STANDARD) == E_CONTAINS_STANDARD) &&
@@ -1363,7 +1363,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         }
     }
 
-    // ------------------------------------------
+
     // b) We need all type information ...
     if (
         ((eRequiredState & E_CONTAINS_TYPES) == E_CONTAINS_TYPES) &&
@@ -1380,7 +1380,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         }
     }
 
-    // ------------------------------------------
+
     // c) We need all filter information ...
     if (
         ((eRequiredState & E_CONTAINS_FILTERS) == E_CONTAINS_FILTERS) &&
@@ -1397,7 +1397,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         }
     }
 
-    // ------------------------------------------
+
     // c) We need all frame loader information ...
     if (
         ((eRequiredState & E_CONTAINS_FRAMELOADERS) == E_CONTAINS_FRAMELOADERS) &&
@@ -1414,7 +1414,7 @@ void FilterCache::impl_load(EFillState eRequiredState)
         }
     }
 
-    // ------------------------------------------
+
     // d) We need all content handler information ...
     if (
         ((eRequiredState & E_CONTAINS_CONTENTHANDLERS) == E_CONTAINS_CONTENTHANDLERS) &&
@@ -1680,7 +1680,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
     aItem[PROPNAME_NAME] = css::uno::makeAny(sItem);
     switch(eType)
     {
-        //---------------------------------------
+
         case E_TYPE :
         {
             // read standard properties of a type
@@ -1709,7 +1709,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
         }
         break;
 
-        //---------------------------------------
+
         case E_FILTER :
         {
             // read standard properties of a filter
@@ -1749,7 +1749,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::
         }
         break;
 
-        //---------------------------------------
+
         case E_FRAMELOADER :
         case E_CONTENTHANDLER :
         {
@@ -1850,7 +1850,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName
     CacheItem::const_iterator pIt;
     switch(eType)
     {
-        //---------------------------------------
+
         case E_TYPE :
         {
             pIt = aItem.find(PROPNAME_PREFERREDFILTER);
@@ -1881,7 +1881,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName
         }
         break;
 
-        //---------------------------------------
+
         case E_FILTER :
         {
             pIt = aItem.find(PROPNAME_TYPE);
@@ -1930,7 +1930,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName
         }
         break;
 
-        //---------------------------------------
+
         case E_FRAMELOADER :
         case E_CONTENTHANDLER :
         {
diff --git a/filter/source/flash/impswfdialog.cxx b/filter/source/flash/impswfdialog.cxx
index 0bb623916f4d..eea9ab89c829 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -24,9 +24,9 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
 
-// ----------------
+
 // - ImpPDFDialog -
-// ----------------
+
 
 ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) :
     ModalDialog( pParent, "ImpSWFDialog", "filter/ui/impswfdialog.ui" ),
@@ -60,13 +60,13 @@ ImpSWFDialog::ImpSWFDialog( Window* pParent, Sequence< PropertyValue >& rFilterD
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 ImpSWFDialog::~ImpSWFDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > ImpSWFDialog::GetFilterData()
 {
diff --git a/filter/source/flash/swfdialog.cxx b/filter/source/flash/swfdialog.cxx
index b63604fac578..5a44f73d9046 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -38,13 +38,13 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::document;
 
-// -----------------------
+
 // - PDFDialog functions -
-// -----------------------
+
 
 #define SERVICE_NAME "com.sun.star.Impress.FlashExportDialog"
 
-// -----------------------------------------------------------------------------
+
 
 OUString SWFDialog_getImplementationName ()
     throw (RuntimeException)
@@ -52,7 +52,7 @@ OUString SWFDialog_getImplementationName ()
     return OUString ( SERVICE_NAME );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL SWFDialog_getImplementationId()
     throw(RuntimeException)
@@ -61,7 +61,7 @@ Sequence< sal_Int8 > SAL_CALL SWFDialog_getImplementationId()
     return aId.getImplementationId();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
     throw (RuntimeException)
@@ -72,7 +72,7 @@ Sequence< OUString > SAL_CALL SWFDialog_getSupportedServiceNames()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
@@ -80,26 +80,26 @@ Reference< XInterface > SAL_CALL SWFDialog_createInstance( const Reference< XMul
     return (cppu::OWeakObject*) new SWFDialog( comphelper::getComponentContext(rSMgr) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 #undef SERVICE_NAME
 
-// -------------
+
 // - SWFDialog -
-// -------------
+
 
 SWFDialog::SWFDialog( const Reference< XComponentContext> &rxContext ) :
     OGenericUnoDialog( rxContext )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SWFDialog::~SWFDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
     throw (RuntimeException)
@@ -114,7 +114,7 @@ Any SAL_CALL SWFDialog::queryInterface( const Type& rType )
     return aReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SWFDialog::acquire()
     throw ()
@@ -122,7 +122,7 @@ void SAL_CALL SWFDialog::acquire()
     OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SWFDialog::release()
     throw ()
@@ -130,7 +130,7 @@ void SAL_CALL SWFDialog::release()
     OWeakObject::release();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
     throw(RuntimeException)
@@ -138,7 +138,7 @@ Sequence< sal_Int8 > SAL_CALL SWFDialog::getImplementationId()
     return SWFDialog_getImplementationId();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SWFDialog::getImplementationName()
     throw (RuntimeException)
@@ -146,7 +146,7 @@ OUString SAL_CALL SWFDialog::getImplementationName()
     return SWFDialog_getImplementationName();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
     throw (RuntimeException)
@@ -154,7 +154,7 @@ Sequence< OUString > SAL_CALL SWFDialog::getSupportedServiceNames()
     return SWFDialog_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Dialog* SWFDialog::createDialog( Window* pParent )
 {
@@ -189,7 +189,7 @@ Dialog* SWFDialog::createDialog( Window* pParent )
     return pRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
 {
@@ -199,7 +199,7 @@ void SWFDialog::executedDialog( sal_Int16 nExecutionResult )
     destroyDialog();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
     throw(RuntimeException)
@@ -208,13 +208,13 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
     return xInfo;
 }
 
-//-------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SWFDialog::getInfoHelper()
 {
     return *const_cast<SWFDialog*>(this)->getArrayHelper();
 }
 
-//------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* SWFDialog::createArrayHelper() const
 {
     Sequence< Property > aProps;
@@ -222,7 +222,7 @@ Reference< XPropertySetInfo > SAL_CALL SWFDialog::getPropertySetInfo()
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
     throw ( RuntimeException )
@@ -244,7 +244,7 @@ Sequence< PropertyValue > SAL_CALL SWFDialog::getPropertyValues()
     return maMediaDescriptor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
     throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
@@ -261,7 +261,7 @@ void SAL_CALL SWFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SWFDialog::setSourceDocument( const Reference< XComponent >& xDoc )
     throw(IllegalArgumentException, RuntimeException)
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx
index f67269787142..b9e7850a3bff 100644
--- a/filter/source/flash/swfexporter.cxx
+++ b/filter/source/flash/swfexporter.cxx
@@ -58,7 +58,7 @@ using com::sun::star::document::XFilter;
 using com::sun::star::frame::XModel;
 using com::sun::star::lang::XServiceInfo;
 
-// -----------------------------------------------------------------------------
+
 
 PageInfo::PageInfo()
         : meFadeEffect( FadeEffect_NONE )
@@ -73,7 +73,7 @@ PageInfo::PageInfo()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 PageInfo::~PageInfo()
 {
@@ -86,7 +86,7 @@ PageInfo::~PageInfo()
 }
 
 #ifdef THEFUTURE
-// -----------------------------------------------------------------------------
+
 
 void PageInfo::addShape( ShapeInfo* pShapeInfo )
 {
@@ -94,7 +94,7 @@ void PageInfo::addShape( ShapeInfo* pShapeInfo )
 }
 #endif
 
-// -----------------------------------------------------------------------------
+
 
 FlashExporter::FlashExporter(const Reference< XComponentContext > &rxContext, sal_Int32 nJPEGCompressMode, sal_Bool bExportOLEAsJPEG)
     : mxContext(rxContext)
@@ -108,7 +108,7 @@ FlashExporter::FlashExporter(const Reference< XComponentContext > &rxContext, sa
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 FlashExporter::~FlashExporter()
 {
@@ -123,7 +123,7 @@ void FlashExporter::Flush()
     maPagesMap.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 const sal_uInt16 cBackgroundDepth = 2;
 const sal_uInt16 cBackgroundObjectsDepth = 3;
@@ -381,7 +381,7 @@ sal_Bool FlashExporter::exportSound( Reference< XOutputStream > &xOutputStream,
 }
 #endif // defined AUGUSTUS
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 nPlaceDepth;
 // AS: A Slide can have a private background or use its masterpage's background.
@@ -485,7 +485,7 @@ sal_uInt16 FlashExporter::exportMasterPageObjects(sal_uInt16 nPage, Reference< X
     return nPage;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** export's the definition of the shapes inside this drawing page and adds the
     shape infos to the current PageInfo */
@@ -495,7 +495,7 @@ void FlashExporter::exportDrawPageContents( Reference< XDrawPage >& xPage, bool
     exportShapes(xShapes, bStream, bMaster);
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** export's the definition of the shapes inside this XShapes container and adds the
     shape infos to the current PageInfo */
@@ -528,7 +528,7 @@ void FlashExporter::exportShapes( Reference< XShapes >& xShapes, bool bStream, b
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** export this shape definition and adds it's info to the current PageInfo */
 void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster )
@@ -641,7 +641,7 @@ void FlashExporter::exportShape( Reference< XShape >& xShape, bool bMaster )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool FlashExporter::getMetaFile( Reference< XComponent >&xComponent, GDIMetaFile& rMtf, bool bOnlyBackground /* = false */, bool bExportAsJPEG /* = false */)
 {
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index 76f920c84ea9..55270544f393 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -130,7 +130,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput(  ) throw (::com::sun::star::i
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 class FlashExportFilter : public cppu::WeakImplHelper4
 <
@@ -167,7 +167,7 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException);
 };
 
-// -----------------------------------------------------------------------------
+
 
 FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxContext)
 :   mxContext( rxContext )
@@ -175,7 +175,7 @@ FlashExportFilter::FlashExportFilter(const Reference< XComponentContext > &rxCon
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 OUString exportBackground(FlashExporter &aFlashExporter, Reference< XDrawPage > xDrawPage, OUString sPath, sal_uInt32 nPage, const char* suffix)
 {
@@ -425,14 +425,14 @@ sal_Bool FlashExportFilter::ExportAsSingleFile(const Sequence< PropertyValue >&
     return aFlashExporter.exportAll( mxDoc, xOutputStream, mxStatusIndicator );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FlashExportFilter::cancel(  )
     throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 // XExporter
 void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
@@ -441,7 +441,7 @@ void SAL_CALL FlashExportFilter::setSourceDocument( const ::com::sun::star::uno:
     mxDoc = xDoc;
 }
 
-// -----------------------------------------------------------------------------
+
 
 // XInitialization
 void SAL_CALL FlashExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ )
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx
index a6c3fbf511db..a94ee9b396fe 100644
--- a/filter/source/flash/swfwriter.cxx
+++ b/filter/source/flash/swfwriter.cxx
@@ -27,7 +27,7 @@ using namespace ::std;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
-// -----------------------------------------------------------------------------
+
 
 static MapMode aTWIPSMode( MAP_TWIP );
 static MapMode a100thmmMode( MAP_100TH_MM );
@@ -39,7 +39,7 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM )
     return nX;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nJPEGcompressMode )
 :   mpClipPolyPolygon( NULL ),
@@ -98,7 +98,7 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 Writer::~Writer()
 {
@@ -107,7 +107,7 @@ Writer::~Writer()
     delete mpTag;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream > &xOut )
 {
@@ -138,7 +138,7 @@ void ImplCopySvStreamToXOutputStream( SvStream& rIn, Reference< XOutputStream >
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::storeTo( Reference< XOutputStream > &xOutStream )
 {
@@ -183,7 +183,7 @@ void Writer::storeTo( Reference< XOutputStream > &xOutStream )
     ImplCopySvStreamToXOutputStream( *mpMovieStream, xOutStream );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 Writer::startSprite()
 {
@@ -193,7 +193,7 @@ sal_uInt16 Writer::startSprite()
     return nShapeId;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::endSprite()
 {
@@ -215,7 +215,7 @@ void Writer::endSprite()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y, sal_uInt16 nClip, const char* pName )
 {
@@ -252,7 +252,7 @@ void Writer::placeShape( sal_uInt16 nID, sal_uInt16 nDepth, sal_Int32 x, sal_Int
 }
 
 #ifdef THEFUTURE
-// -----------------------------------------------------------------------------
+
 
 void Writer::moveShape( sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y )
 {
@@ -281,7 +281,7 @@ void Writer::moveShape( sal_uInt16 nDepth, sal_Int32 x, sal_Int32 y )
 }
 #endif
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::removeShape( sal_uInt16 nDepth )
 {
@@ -290,7 +290,7 @@ void Writer::removeShape( sal_uInt16 nDepth )
     endTag();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::startTag( sal_uInt8 nTagId )
 {
@@ -299,7 +299,7 @@ void Writer::startTag( sal_uInt8 nTagId )
     mpTag = new Tag( nTagId );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::endTag()
 {
@@ -318,14 +318,14 @@ void Writer::endTag()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 Writer::createID()
 {
     return mnNextId++;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::showFrame()
 {
@@ -336,7 +336,7 @@ void Writer::showFrame()
         mnFrames++;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16 y )
 {
@@ -369,7 +369,7 @@ sal_uInt16 Writer::defineShape( const GDIMetaFile& rMtf, sal_Int16 x, sal_Int16
     return nId;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 Writer::defineShape( const Polygon& rPoly, const FillStyle& rFillStyle )
 {
@@ -377,7 +377,7 @@ sal_uInt16 Writer::defineShape( const Polygon& rPoly, const FillStyle& rFillStyl
     return defineShape( aPolyPoly, rFillStyle );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, const FillStyle& rFillStyle )
 {
@@ -421,7 +421,7 @@ sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, const FillStyle& r
     return nShapeId;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 Writer::defineShape( const PolyPolygon& rPolyPoly, sal_uInt16 nLineWidth, const Color& rLineColor )
 {
@@ -594,7 +594,7 @@ sal_Bool Writer::streamSound( const char * filename )
 #endif // AUGUSTUS
 
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::stop()
 {
@@ -604,7 +604,7 @@ void Writer::stop()
     endTag();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::waitOnClick( sal_uInt16 nDepth )
 {
@@ -614,7 +614,7 @@ void Writer::waitOnClick( sal_uInt16 nDepth )
     removeShape( nDepth );
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** inserts a doaction tag with an ActionGotoFrame */
 void Writer::gotoFrame( sal_uInt16 nFrame )
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 0448fe447974..d27ce022fa1b 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -52,7 +52,7 @@ extern sal_uInt16 getMaxBitsSigned( sal_Int32 nValue );
 static MapMode aTWIPSMode( MAP_TWIP );
 static MapMode a100thmmMode( MAP_100TH_MM );
 
-// -----------------------------------------------------------------------------
+
 
 Point Writer::map( const Point& rPoint ) const
 {
@@ -68,7 +68,7 @@ Point Writer::map( const Point& rPoint ) const
     return retPoint;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Size Writer::map( const Size& rSize ) const
 {
@@ -84,7 +84,7 @@ Size Writer::map( const Size& rSize ) const
     return retSize;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::map( PolyPolygon& rPolyPolygon ) const
 {
@@ -105,7 +105,7 @@ void Writer::map( PolyPolygon& rPolyPolygon ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
 {
@@ -116,7 +116,7 @@ sal_Int32 Writer::mapRelative( sal_Int32 n100thMM ) const
     return nTwips;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /**
 */
@@ -173,7 +173,7 @@ void Writer::Impl_addPolygon( BitStream& rBits, const Polygon& rPoly, sal_Bool b
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** exports a style change record with a move to (x,y) and depending on bFilled a line style 1 or fill style 1
 */
@@ -196,7 +196,7 @@ void Writer::Impl_addShapeRecordChange( BitStream& rBits, sal_Int16 dx, sal_Int1
     rBits.writeUB( 1, 1 );          // set FillStyle1 or LineStyle to 1
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** exports a straight edge record
 */
@@ -230,7 +230,7 @@ void Writer::Impl_addStraightEdgeRecord( BitStream& rBits, sal_Int16 dx, sal_Int
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** exports a curved edge record
 */
@@ -253,7 +253,7 @@ void Writer::Impl_addCurvedEdgeRecord( BitStream& rBits, sal_Int16 control_dx, s
     rBits.writeSB( anchor_dy, nBits );      // DeltaY
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** exports a end shape record
 */
@@ -262,7 +262,7 @@ void Writer::Impl_addEndShapeRecord( BitStream& rBits )
     rBits.writeUB( 0, 6 );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
 {
@@ -270,7 +270,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled )
     Impl_writePolyPolygon( aPolyPoly, bFilled );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
 {
@@ -278,7 +278,7 @@ void Writer::Impl_writePolygon( const Polygon& rPoly, sal_Bool bFilled, const Co
     Impl_writePolyPolygon( aPolyPoly, bFilled, rFillColor, rLineColor );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, sal_uInt8 nTransparence /* = 0 */ )
 {
@@ -291,7 +291,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFill
     Impl_writePolyPolygon(rPolyPoly, bFilled, aFillColor, aLineColor );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFilled, const Color& rFillColor, const Color& rLineColor )
 {
@@ -326,7 +326,7 @@ void Writer::Impl_writePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bool bFill
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** a gradient is a transition from one color to another, rendered inside a given polypolygon */
 void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient& rGradient )
@@ -361,14 +361,14 @@ void Writer::Impl_writeGradientEx( const PolyPolygon& rPolyPoly, const Gradient&
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::setClipping( const PolyPolygon* pClipPolyPolygon )
 {
     mpClipPolyPolygon = pClipPolyPolygon;
 }
 
-// -----------------------------------------------------------------------------
+
 
 // AS: Just comparing fonts straight up is too literal.  There are some
 //  differences in font that actually require different glyphs to be defined,
@@ -384,7 +384,7 @@ bool compare_fonts_for_me(const Font& rFont1, const Font& rFont2)
             rFont1.GetRelief() == rFont2.GetRelief();
 }
 
-// -----------------------------------------------------------------------------
+
 
 FlashFont& Writer::Impl_getFont( const Font& rFont )
 {
@@ -405,7 +405,7 @@ FlashFont& Writer::Impl_getFont( const Font& rFont )
     return *pFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal_Int32* pDXArray, long nWidth )
 {
@@ -724,7 +724,7 @@ void Writer::Impl_writeText( const Point& rPos, const OUString& rText, const sal
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // AS: Because JPEGs require the alpha channel provided separately (JPEG does not
 //  natively support alpha channel, but SWF lets you provide it separately), we
 //  extract the alpha channel into a separate array here.
@@ -792,7 +792,7 @@ void getBitmapData( const BitmapEx& aBmpEx, sal_uInt8*& tgadata, sal_uInt8*& tga
     }
 }
 
-// -----------------------------------------------------------------------------
+
 sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQualityLevel )
 {
     sal_uLong bmpChecksum = bmpSource.GetChecksum();
@@ -885,7 +885,7 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx &bmpSource, sal_Int32 nJPEGQuali
     return nBitmapId;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Size& rSz, const Point& /* rSrcPt */, const Size& /* rSrcSz */, const Rectangle& rClipRect, bool bNeedToMapClipRect )
 {
@@ -982,7 +982,7 @@ void Writer::Impl_writeImage( const BitmapEx& rBmpEx, const Point& rPt, const Si
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 height, sal_uInt8 *pCompressed, sal_uInt32 compressed_size )
 {
@@ -998,7 +998,7 @@ void Writer::Impl_writeBmp( sal_uInt16 nBitmapId, sal_uInt32 width, sal_uInt32 h
     endTag();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal_uInt32 nJpgDataLength, sal_uInt8 *pAlphaCompressed, sal_uInt32 alpha_compressed_size )
 {
@@ -1135,7 +1135,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color* pLineColor )
 {
@@ -1150,7 +1150,7 @@ void Writer::Impl_writeLine( const Point& rPt1, const Point& rPt2, const Color*
     mpVDev->SetLineColor( aOldColor );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY )
 {
@@ -1166,7 +1166,7 @@ void Writer::Impl_writeRect( const Rectangle& rRect, long nRadX, long nRadY )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeEllipse( const Point& rCenter, long nRadX, long nRadY )
 {
@@ -1217,7 +1217,7 @@ bool Writer::Impl_writeStroke( SvtGraphicStroke& rStroke )
     return true;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** writes the filling defined by SvtGraphicFill and returns true or it returns
     false if it can't handle this filling.
@@ -1294,7 +1294,7 @@ bool Writer::Impl_writeFilling( SvtGraphicFill& rFilling )
     return true;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* CL: The idea was to export page fields as text fields that get theire
    string from a variable set with actionscript by each page. This didn't
@@ -1343,7 +1343,7 @@ bool Writer::Impl_writePageField( Rectangle& rTextBounds )
 }
 #endif
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon)
 {
@@ -1383,7 +1383,7 @@ void Writer::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const basegf
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_writeActions( const GDIMetaFile& rMtf )
 {
@@ -1862,7 +1862,7 @@ void Writer::Impl_addStraightLine( BitStream& rBits, Point& rLastPoint,
 
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint,
                                  const double P2x, const double P2y,
@@ -1878,7 +1878,7 @@ void Writer::Impl_addQuadBezier( BitStream& rBits, Point& rLastPoint,
     rLastPoint = aAnchorPoint;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* Approximate given cubic bezier curve by quadratic bezier segments */
 void Writer::Impl_quadBezierApprox( BitStream& rBits,
diff --git a/filter/source/flash/swfwriter2.cxx b/filter/source/flash/swfwriter2.cxx
index 8bbc476e8922..131777dccf13 100644
--- a/filter/source/flash/swfwriter2.cxx
+++ b/filter/source/flash/swfwriter2.cxx
@@ -28,7 +28,7 @@ using namespace ::std;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue )
 {
@@ -43,7 +43,7 @@ sal_uInt16 getMaxBitsUnsigned( sal_uInt32 nValue )
     return nBits;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 getMaxBitsSigned( sal_Int32 nValue )
 {
@@ -53,7 +53,7 @@ sal_uInt16 getMaxBitsSigned( sal_Int32 nValue )
     return getMaxBitsUnsigned( static_cast< sal_uInt32 >(nValue) ) + 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 BitStream::BitStream()
 {
@@ -61,7 +61,7 @@ BitStream::BitStream()
     mnCurrentByte = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void BitStream::writeUB( sal_uInt32 nValue, sal_uInt16 nBits )
 {
@@ -85,21 +85,21 @@ void BitStream::writeUB( sal_uInt32 nValue, sal_uInt16 nBits )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void BitStream::writeSB( sal_Int32 nValue, sal_uInt16 nBits )
 {
     writeUB( static_cast< sal_uInt32 >(nValue), nBits );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void BitStream::writeFB( sal_uInt32 nValue, sal_uInt16 nBits )
 {
     writeUB( nValue, nBits );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void BitStream::pad()
 {
@@ -111,7 +111,7 @@ void BitStream::pad()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void BitStream::writeTo( SvStream& out )
 {
@@ -125,7 +125,7 @@ void BitStream::writeTo( SvStream& out )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt32 BitStream::getOffset() const
 {
@@ -139,7 +139,7 @@ Tag::Tag( sal_uInt8 nTagId )
     mnTagId = nTagId;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::write( SvStream &out )
 {
@@ -173,28 +173,28 @@ void Tag::write( SvStream &out )
     out.Write( GetData(), nSz );
 }
 #if 0
-// -----------------------------------------------------------------------------
+
 
 void Tag::addI32( sal_Int32 nValue )
 {
     addUI32( static_cast<sal_uInt32>( nValue ) );
 }
 #endif
-// -----------------------------------------------------------------------------
+
 
 void Tag::addUI32( sal_uInt32 nValue )
 {
     WriteUInt32( nValue );
 }
 #if 0
-// -----------------------------------------------------------------------------
+
 
 void Tag::addI16( sal_Int16 nValue )
 {
     addUI16( static_cast<sal_uInt16>( nValue ) );
 }
 #endif
-// -----------------------------------------------------------------------------
+
 
 void Tag::addUI16( sal_uInt16 nValue )
 {
@@ -202,21 +202,21 @@ void Tag::addUI16( sal_uInt16 nValue )
     WriteUChar( (sal_uInt8)(nValue >> 8) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addUI8( sal_uInt8 nValue )
 {
     WriteUChar( (sal_uInt8)nValue );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addBits( BitStream& rIn )
 {
     rIn.writeTo( *this );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addRGBA( const Color& rColor )
 {
@@ -226,7 +226,7 @@ void Tag::addRGBA( const Color& rColor )
     addUI8( 0xff - rColor.GetTransparency() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addRGB( const Color& rColor )
 {
@@ -235,14 +235,14 @@ void Tag::addRGB( const Color& rColor )
     addUI8( rColor.GetBlue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addRect( const Rectangle& rRect )
 {
     writeRect( *this, rRect );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::writeRect( SvStream& rOut, const Rectangle& rRect )
 {
@@ -292,14 +292,14 @@ void Tag::writeRect( SvStream& rOut, const Rectangle& rRect )
     aBits.writeTo( rOut );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addMatrix( const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264#
 {
     writeMatrix( *this, rMatrix );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264#
 {
@@ -341,7 +341,7 @@ void Tag::writeMatrix( SvStream& rOut, const ::basegfx::B2DHomMatrix& rMatrix )
     aBits.writeTo( rOut );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addString( const char* pString )
 {
@@ -354,7 +354,7 @@ void Tag::addString( const char* pString )
     addUI8( 0 );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Tag::addStream( SvStream& rIn )
 {
@@ -368,7 +368,7 @@ Sprite::Sprite( sal_uInt16 nId )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sprite::~Sprite()
 {
@@ -376,7 +376,7 @@ Sprite::~Sprite()
         delete *i;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Sprite::write( SvStream& out )
 {
@@ -396,7 +396,7 @@ void Sprite::write( SvStream& out )
     aTag.write( out );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Sprite::addTag( Tag* pNewTag )
 {
@@ -430,13 +430,13 @@ FlashFont::FlashFont( const Font& rFont, sal_uInt16 nId )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 FlashFont::~FlashFont()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** gets the glyph id for the given character. The glyphs are created on demand */
 sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
@@ -496,7 +496,7 @@ sal_uInt16 FlashFont::getGlyph( sal_uInt16 nChar, VirtualDevice* pVDev )
     return mnNextIndex++;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void FlashFont::write( SvStream& out )
 {
@@ -525,7 +525,7 @@ FillStyle::FillStyle( const Color& rSolidColor )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** this c'tor creates a tiled or clipped bitmap fill style */
 FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DHomMatrix& rMatrix ) // #i73264#
@@ -535,7 +535,7 @@ FillStyle::FillStyle( sal_uInt16 nBitmapId, bool bClipped, const ::basegfx::B2DH
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient )
 {
@@ -553,7 +553,7 @@ FillStyle::FillStyleType Impl_getFillStyleType( const Gradient& rGradient )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** this c'tor creates a linear or radial gradient fill style */
 FillStyle::FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient )
@@ -564,7 +564,7 @@ FillStyle::FillStyle( const Rectangle& rBoundRect, const Gradient& rGradient )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void FillStyle::addTo( Tag* pTag ) const
 {
@@ -586,7 +586,7 @@ void FillStyle::addTo( Tag* pTag ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 struct GradRecord
 {
diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx
index 946968e177b4..df402c7b385a 100644
--- a/filter/source/graphicfilter/egif/egif.cxx
+++ b/filter/source/graphicfilter/egif/egif.cxx
@@ -27,9 +27,9 @@
 #include <vcl/FilterConfigItem.hxx>
 #include "giflzwc.hxx"
 
-// -------------
+
 // - GIFWriter -
-// -------------
+
 
 class GIFWriter
 {
@@ -81,7 +81,7 @@ GIFWriter::GIFWriter(SvStream &rStream)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
 {
@@ -170,7 +170,7 @@ sal_Bool GIFWriter::WriteGIF(const Graphic& rGraphic, FilterConfigItem* pFilterC
     return bStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint,
                                sal_Bool bExtended, long nTimer, Disposal eDisposal )
@@ -200,7 +200,7 @@ void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint,
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteAnimation( const Animation& rAnimation )
 {
@@ -225,7 +225,7 @@ void GIFWriter::WriteAnimation( const Animation& rAnimation )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::MayCallback( sal_uLong nPercent )
 {
@@ -240,7 +240,7 @@ void GIFWriter::MayCallback( sal_uLong nPercent )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
 {
@@ -274,7 +274,7 @@ sal_Bool GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
     return bStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::DestroyAccess()
 {
@@ -282,7 +282,7 @@ void GIFWriter::DestroyAccess()
     m_pAcc = NULL;
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteSignature( sal_Bool bGIF89a )
 {
@@ -295,7 +295,7 @@ void GIFWriter::WriteSignature( sal_Bool bGIF89a )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteGlobalHeader( const Size& rSize )
 {
@@ -325,7 +325,7 @@ void GIFWriter::WriteGlobalHeader( const Size& rSize )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
 {
@@ -358,7 +358,7 @@ void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
 {
@@ -377,7 +377,7 @@ void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
 {
@@ -409,7 +409,7 @@ void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteLocalHeader()
 {
@@ -441,7 +441,7 @@ void GIFWriter::WriteLocalHeader()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WritePalette()
 {
@@ -468,7 +468,7 @@ void GIFWriter::WritePalette()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteAccess()
 {
@@ -543,7 +543,7 @@ void GIFWriter::WriteAccess()
     delete[] pBuffer;
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFWriter::WriteTerminator()
 {
@@ -556,7 +556,7 @@ void GIFWriter::WriteTerminator()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
@@ -573,7 +573,7 @@ GraphicExport( SvStream& rStream, Graphic& rGraphic,
     return aWriter.WriteGIF(rGraphic, pConfigItem);
 }
 
-// ------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/egif/giflzwc.cxx b/filter/source/graphicfilter/egif/giflzwc.cxx
index 081c8e1bd710..c686a6dfe91e 100644
--- a/filter/source/graphicfilter/egif/giflzwc.cxx
+++ b/filter/source/graphicfilter/egif/giflzwc.cxx
@@ -21,9 +21,9 @@
 #include <tools/stream.hxx>
 #include "giflzwc.hxx"
 
-// ----------------------------
+
 // - GIFImageDataOutputStream -
-// ----------------------------
+
 
 class GIFImageDataOutputStream
 {
@@ -46,7 +46,7 @@ public:
     inline void WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen );
 };
 
-// ------------------------------------------------------------------------
+
 
 inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
 {
@@ -61,7 +61,7 @@ inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
 {
@@ -72,7 +72,7 @@ inline void GIFImageDataOutputStream::WriteBits( sal_uInt16 nCode, sal_uInt16 nC
     nBitsBufSize = nBitsBufSize + nCodeLen;
 }
 
-// ------------------------------------------------------------------------
+
 
 GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 nLZWDataSize ) :
         rStream(rGIF)
@@ -84,7 +84,7 @@ GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, sal_uInt8 n
     rStream.WriteUChar( nLZWDataSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 
 GIFImageDataOutputStream::~GIFImageDataOutputStream()
@@ -96,7 +96,7 @@ GIFImageDataOutputStream::~GIFImageDataOutputStream()
     delete[] pBlockBuf;
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFImageDataOutputStream::FlushBlockBuf()
 {
@@ -108,9 +108,9 @@ void GIFImageDataOutputStream::FlushBlockBuf()
     }
 }
 
-// -------------------
+
 // - GIFLZWCTreeNode -
-// -------------------
+
 
 struct GIFLZWCTreeNode
 {
@@ -121,9 +121,9 @@ struct GIFLZWCTreeNode
     sal_uInt16              nValue;         // the pixel value
 };
 
-// --------------------
+
 // - GIFLZWCompressor -
-// --------------------
+
 
 GIFLZWCompressor::GIFLZWCompressor()
     : pIDOS(NULL), pTable(NULL), pPrefix(NULL), nDataSize(0), nClearCode(0),
@@ -131,14 +131,14 @@ GIFLZWCompressor::GIFLZWCompressor()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 GIFLZWCompressor::~GIFLZWCompressor()
 {
     if (pIDOS!=NULL) EndCompression();
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize )
 {
@@ -170,7 +170,7 @@ void GIFLZWCompressor::StartCompression( SvStream& rGIF, sal_uInt16 nPixelSize )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFLZWCompressor::Compress( HPBYTE pSrc, sal_uLong nSize )
 {
@@ -230,7 +230,7 @@ void GIFLZWCompressor::Compress( HPBYTE pSrc, sal_uLong nSize )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFLZWCompressor::EndCompression()
 {
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index a7c9ef8d8edb..425416ec82dd 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -822,9 +822,9 @@ void METWriter::WriteDataDescriptor(const GDIMetaFile *)
 
     WriteFieldIntroducer(0,DscGrfObjMagic,0,0);
 
-    //------------------------------------------------------------------------------
+
     // The following is the OS2 original documentation and the associated implementation
-    //------------------------------------------------------------------------------
+
 
     //  Parameters (all required and in this order)
 
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx
index f71ed0cad0d9..f77a0d67384a 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -62,13 +62,13 @@ PBMWriter::PBMWriter(SvStream &rPBM)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 PBMWriter::~PBMWriter()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
 {
@@ -110,7 +110,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic& rGraphic, FilterConfigItem* pFilter
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PBMWriter::ImplWriteHeader()
 {
@@ -132,7 +132,7 @@ sal_Bool PBMWriter::ImplWriteHeader()
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void PBMWriter::ImplWriteBody()
 {
@@ -174,7 +174,7 @@ void PBMWriter::ImplWriteBody()
     }
 }
 
-// ------------------------------------------------------------------------
+
 // A decimal number in ascii format is written in the stream.
 
 void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
@@ -183,11 +183,11 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber)
     m_rOStm.WriteCharPtr( aNum.getStr() );
 }
 
-// ------------------------------------------------------------------------
 
-// ---------------------
+
+
 // - exported function -
-// ---------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
@@ -204,7 +204,7 @@ GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterCon
     return aPBMWriter.WritePBM( rGraphic, pFilterConfigItem );
 }
 
-// ------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx
index 3a61cf0b0dfe..5c151be2ab3b 100644
--- a/filter/source/graphicfilter/epgm/epgm.cxx
+++ b/filter/source/graphicfilter/epgm/epgm.cxx
@@ -62,13 +62,13 @@ PGMWriter::PGMWriter(SvStream &rStream)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 PGMWriter::~PGMWriter()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
 {
@@ -111,7 +111,7 @@ sal_Bool PGMWriter::WritePGM( const Graphic& rGraphic, FilterConfigItem* pFilter
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PGMWriter::ImplWriteHeader()
 {
@@ -137,7 +137,7 @@ sal_Bool PGMWriter::ImplWriteHeader()
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void PGMWriter::ImplWriteBody()
 {
@@ -199,7 +199,7 @@ void PGMWriter::ImplWriteBody()
     }
 }
 
-// ------------------------------------------------------------------------
+
 // write a decimal number in ascii format into the stream
 void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
 {
@@ -207,11 +207,11 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber)
     m_rOStm.WriteCharPtr( aNum.getStr() );
 }
 
-// ------------------------------------------------------------------------
 
-// ---------------------
+
+
 // - exported function -
-// ---------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
@@ -228,7 +228,7 @@ GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterCon
     return aPGMWriter.WritePGM( rGraphic, pFilterConfigItem );
 }
 
-// ------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index 5a6e8df4aece..a2413829e4e3 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -38,8 +38,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
-//============================== PictWriter ===================================
-
+// PictWriter
 struct PictWriterAttrStackMember {
     struct PictWriterAttrStackMember *  pSucc;
     Color                               aLineColor;
@@ -172,9 +171,7 @@ public:
 };
 
 
-//========================== Methods of PictWriter ==========================
-
-
+// Methods of PictWriter
 void PictWriter::MayCallback()
 {
     if ( xStatusIndicator.is() )
@@ -235,8 +232,7 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly)
     for (np=1; np<nCount; np++) {
         aPoly2=rPolyPoly.GetObject(np);
 
-        //-----------------The following code merges aPoly1 and aPoly2 to aPoly1-----------------
-
+        // The following code merges aPoly1 and aPoly2 to aPoly1
         nSize1=aPoly1.GetSize();
         nSize2=aPoly2.GetSize();
 
@@ -277,9 +273,6 @@ Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly)
         for (i2=0;         i2<=nBestIdx2; i2++) aPoly3.SetPoint(aPoly2.GetPoint(i2),i3++);
 
         aPoly1=aPoly3;
-
-        //-----------------------------------------------------------------------------------
-
     }
     return aPoly1;
 }
@@ -1150,13 +1143,12 @@ void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize,
         // allocate memory for a row:
         pPix = new sal_uInt8[ nSrcRowBytes ];
 
-        // Position der Map-Daten in Ziel merken:
+        // remember position of the map-data in the target:
         nDstMapPos=pPict->Tell();
 
         // loop trough rows:
         for ( ny = 0; ny < nHeight; ny++ )
         {
-
             // read line ny of source into the buffer:
             switch ( nBitsPerPixel )
             {
@@ -1600,7 +1592,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_CHORD_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_CHORD_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_CHORD_ACTION!" );
             }
             break;
 
@@ -1775,7 +1767,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_TEXTRECT_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" );
             }
             break;
 
@@ -1858,7 +1850,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             case META_MASKSCALE_ACTION:
             case META_MASKSCALEPART_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_MASK..._ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_MASK..._ACTION!" );
             }
             break;
 
@@ -1888,13 +1880,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_WALLPAPER_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" );
             }
             break;
 
             case META_CLIPREGION_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" );
             }
             break;
 
@@ -1907,13 +1899,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_ISECTREGIONCLIPREGION_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
             }
             break;
 
             case META_MOVECLIPREGION_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" );
             }
             break;
 
@@ -1959,7 +1951,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_TEXTALIGN_ACTION:
             {
-//                OSL_FAIL( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" );
+                // OSL_FAIL( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" );
             }
             break;
 
@@ -2262,7 +2254,7 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea
     return bStatus;
 }
 
-//================== GraphicExport - the exported Function ================
+// GraphicExport - the exported Function
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx
index 0af3cb8dabe4..fcb75e9bfecb 100644
--- a/filter/source/graphicfilter/eppm/eppm.cxx
+++ b/filter/source/graphicfilter/eppm/eppm.cxx
@@ -62,13 +62,13 @@ PPMWriter::PPMWriter(SvStream &rStrm)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 PPMWriter::~PPMWriter()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem )
 {
@@ -111,7 +111,7 @@ sal_Bool PPMWriter::WritePPM( const Graphic& rGraphic, FilterConfigItem* pFilter
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PPMWriter::ImplWriteHeader()
 {
@@ -137,7 +137,7 @@ sal_Bool PPMWriter::ImplWriteHeader()
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void PPMWriter::ImplWriteBody()
 {
@@ -207,7 +207,7 @@ void PPMWriter::ImplWriteBody()
     }
 }
 
-// ------------------------------------------------------------------------
+
 // a decimal number in ASCII format is being written into the stream
 
 void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
@@ -216,11 +216,11 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber)
     m_rOStm.WriteCharPtr( aNum.getStr() );
 }
 
-// ------------------------------------------------------------------------
 
-// ---------------------
+
+
 // - exported function -
-// ---------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
@@ -236,7 +236,7 @@ GraphicExport(SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterCon
     return aPPMWriter.WritePPM( rGraphic, pFilterConfigItem );
 }
 
-// ------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 14731e1c46bc..18e3c9b8d7eb 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -242,7 +242,7 @@ public:
 
 //========================== Methoden von PSWriter ==========================
 
-//---------------------------------------------------------------------------------
+
 
 PSWriter::PSWriter()
     : mbStatus(sal_False)
@@ -305,7 +305,7 @@ PSWriter::~PSWriter()
     delete pAMTF;
 }
 
-//---------------------------------------------------------------------------------
+
 
 sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
 {
@@ -501,7 +501,7 @@ sal_Bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Fi
     return mbStatus;
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteProlog( const Graphic* pPreview )
 {
@@ -638,7 +638,7 @@ void PSWriter::ImplWriteProlog( const Graphic* pPreview )
     ImplWriteLine( "/tm matrix currentmatrix def" );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteEpilog()
 {
@@ -652,9 +652,9 @@ void PSWriter::ImplWriteEpilog()
     ImplWriteLine( "%%EOF" );
 }
 
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
+
+
+
 
 void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
 {
@@ -1463,7 +1463,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
 
 
 
-//---------------------------------------------------------------------------------
+
 
 inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode )
 {
@@ -1471,7 +1471,7 @@ inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode )
     ImplWriteDouble( rPoint.Y(), nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode )
 {
@@ -1480,7 +1480,7 @@ void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode )
 {
@@ -1489,7 +1489,7 @@ void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3, sal_uInt32 nMode )
 {
@@ -1500,7 +1500,7 @@ void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMode )
 {
@@ -1510,7 +1510,7 @@ void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMo
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode )
 {
@@ -1520,7 +1520,7 @@ void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplRect( const Rectangle & rRect )
 {
@@ -1545,7 +1545,7 @@ void PSWriter::ImplRect( const Rectangle & rRect )
     mnCursorPos = 0;
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplRectFill( const Rectangle & rRect )
 {
@@ -1565,7 +1565,7 @@ void PSWriter::ImplRectFill( const Rectangle & rRect )
     ImplExecMode( PS_RET );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplAddPath( const Polygon & rPolygon )
 {
@@ -1590,7 +1590,7 @@ void PSWriter::ImplAddPath( const Polygon & rPolygon )
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly )
 {
@@ -1608,7 +1608,7 @@ void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly )
     ImplWriteLine( "eoclip newpath" );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev )
 {
@@ -1619,7 +1619,7 @@ void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient&
     ImplWriteActions( aTmpMtf, rVDev );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutline )
 {
@@ -1656,7 +1656,7 @@ void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutlin
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplPolyLine( const Polygon & rPoly )
 {
@@ -1694,7 +1694,7 @@ void PSWriter::ImplPolyLine( const Polygon & rPoly )
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplSetClipRegion( Region& rClipRegion )
 {
@@ -1757,7 +1757,7 @@ void PSWriter::ImplSetClipRegion( Region& rClipRegion )
     }
 }
 
-//---------------------------------------------------------------------------------
+
 // possible gfx formats:
 //
 // level 1: grayscale   8 bit
@@ -2088,7 +2088,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteCharacter( sal_Char nChar )
 {
@@ -2102,7 +2102,7 @@ void PSWriter::ImplWriteCharacter( sal_Char nChar )
     ImplWriteByte( (sal_uInt8)nChar, PS_NONE );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, const sal_Int32* pDXArry, sal_Bool bStretch )
 {
@@ -2134,7 +2134,7 @@ void PSWriter::ImplWriteString( const OString& rString, VirtualDevice& rVDev, co
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sal_Int32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev )
 {
@@ -2195,7 +2195,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const sa
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void PSWriter::ImplSetAttrForText( const Point& rPoint )
 {
@@ -2238,7 +2238,7 @@ void PSWriter::ImplSetAttrForText( const Point& rPoint )
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic )
 {
@@ -2262,9 +2262,9 @@ void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic )
     ImplWriteLine( " f" );
 }
 
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
+
+
+
 
 void PSWriter::ImplClosePathDraw( sal_uLong nMode )
 {
@@ -2280,7 +2280,7 @@ void PSWriter::ImplPathDraw()
     ImplExecMode( PS_RET );
 }
 
-//---------------------------------------------------------------------------------
+
 
 inline void PSWriter::ImplWriteLineColor( sal_uLong nMode )
 {
@@ -2315,7 +2315,7 @@ inline void PSWriter::ImplWriteTextFillColor( sal_uLong nMode )
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteColor( sal_uLong nMode )
 {
@@ -2336,7 +2336,7 @@ void PSWriter::ImplWriteColor( sal_uLong nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 double PSWriter::ImplGetScaling( const MapMode& rMapMode )
 {
@@ -2384,7 +2384,7 @@ double PSWriter::ImplGetScaling( const MapMode& rMapMode )
     return nMul;
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplGetMapMode( const MapMode& rMapMode )
 {
@@ -2396,7 +2396,7 @@ void PSWriter::ImplGetMapMode( const MapMode& rMapMode )
     ImplScale( fScaleX, fScaleY );
 }
 
-//---------------------------------------------------------------------------------
+
 
 inline void PSWriter::ImplExecMode( sal_uLong nMode )
 {
@@ -2421,7 +2421,7 @@ inline void PSWriter::ImplExecMode( sal_uLong nMode )
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode )
 {
@@ -2434,7 +2434,7 @@ inline void PSWriter::ImplWriteLine( const char* pString, sal_uLong nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit,
                                     SvtGraphicStroke::CapType eLCap,
@@ -2479,7 +2479,7 @@ void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit,
     }
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
 {
@@ -2529,7 +2529,7 @@ void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
     ImplWriteLineInfo( fLWidth, fMiterLimit, aCapType, aJoinType, l_aDashArray );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode)
 {
@@ -2539,7 +2539,7 @@ void PSWriter::ImplWriteLong(sal_Int32 nNumber, sal_uLong nMode)
     ImplExecMode(nMode);
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode )
 {
@@ -2583,7 +2583,7 @@ void PSWriter::ImplWriteDouble( double fNumber, sal_uLong nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 // writes the number to stream: nNumber / ( 10^nCount )
 
@@ -2625,7 +2625,7 @@ void PSWriter::ImplWriteF( sal_Int32 nNumber, sal_uLong nCount, sal_uLong nMode
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode )
 {
@@ -2634,7 +2634,7 @@ void PSWriter::ImplWriteByte( sal_uInt8 nNumb, sal_uLong nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode )
 {
@@ -2651,7 +2651,7 @@ void PSWriter::ImplWriteHexByte( sal_uInt8 nNumb, sal_uLong nMode )
     ImplExecMode( nMode );
 }
 
-//---------------------------------------------------------------------------------
+
 
 // writes the sal_uInt8 nNumb as a Number from 0.000 up to 1.000
 
@@ -2661,7 +2661,7 @@ void PSWriter::ImplWriteB1( sal_uInt8 nNumb, sal_uLong nMode )
 }
 
 
-// ------------------------------------------------------------------------
+
 
 inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
 {
@@ -2677,7 +2677,7 @@ inline void PSWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
         ImplWriteHexByte( (sal_uInt8)( dwShift >> 24 ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void PSWriter::StartCompression()
 {
@@ -2703,7 +2703,7 @@ void PSWriter::StartCompression()
     WriteBits( nClearCode, nCodeSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 void PSWriter::Compress( sal_uInt8 nCompThis )
 {
@@ -2757,7 +2757,7 @@ void PSWriter::Compress( sal_uInt8 nCompThis )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void PSWriter::EndCompression()
 {
@@ -2768,7 +2768,7 @@ void PSWriter::EndCompression()
     delete[] pTable;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize )
 {
@@ -2787,7 +2787,7 @@ sal_uInt8* PSWriter::ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_
     return NULL;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize )
 {
diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx
index 46cc4fbcecaf..fe18cadbe89d 100644
--- a/filter/source/graphicfilter/eras/eras.cxx
+++ b/filter/source/graphicfilter/eras/eras.cxx
@@ -65,13 +65,13 @@ RASWriter::RASWriter(SvStream &rStream)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 RASWriter::~RASWriter()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void RASWriter::ImplCallback( sal_uLong nYPos )
 {
@@ -132,7 +132,7 @@ sal_Bool RASWriter::WriteRAS( const Graphic& rGraphic, FilterConfigItem* pFilter
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool RASWriter::ImplWriteHeader()
 {
@@ -164,7 +164,7 @@ sal_Bool RASWriter::ImplWriteHeader()
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void RASWriter::ImplWritePalette()
 {
@@ -175,7 +175,7 @@ void RASWriter::ImplWritePalette()
     for ( i = 0; i < mnColors; m_rOStm.WriteUChar( mpAcc->GetPaletteColor( i++ ).GetBlue() ) ) ;
 }
 
-// ------------------------------------------------------------------------
+
 
 void RASWriter::ImplWriteBody()
 {
@@ -230,7 +230,7 @@ void RASWriter::ImplWriteBody()
     ImplPutByte( mnRepVal + 1 );    // end of RLE decoding
 }
 
-// ------------------------------------------------------------------------
+
 
 void RASWriter::ImplPutByte( sal_uInt8 nPutThis )
 {
@@ -263,11 +263,11 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis )
     }
 }
 
-// ------------------------------------------------------------------------
 
-// ---------------------
+
+
 // - exported function -
-// ---------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx
index aff5ce3733f6..e32b5a915a3f 100644
--- a/filter/source/graphicfilter/etiff/etiff.cxx
+++ b/filter/source/graphicfilter/etiff/etiff.cxx
@@ -42,9 +42,9 @@
 #define ResolutionUnit              296
 #define ColorMap                    320
 
-// -------------
+
 // - TIFFWriter -
-// -------------
+
 
 struct TIFFLZWCTreeNode
 {
@@ -113,7 +113,7 @@ public:
     sal_Bool WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem );
 };
 
-// ------------------------------------------------------------------------
+
 
 TIFFWriter::TIFFWriter(SvStream &rStream)
     : m_rOStm(rStream)
@@ -129,13 +129,13 @@ TIFFWriter::TIFFWriter(SvStream &rStream)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 TIFFWriter::~TIFFWriter()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilterConfigItem)
 {
@@ -228,7 +228,7 @@ sal_Bool TIFFWriter::WriteTIFF( const Graphic& rGraphic, FilterConfigItem* pFilt
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::ImplCallback( sal_uInt32 nPercent )
 {
@@ -244,7 +244,7 @@ void TIFFWriter::ImplCallback( sal_uInt32 nPercent )
 }
 
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage )
 {
@@ -319,7 +319,7 @@ sal_Bool TIFFWriter::ImplWriteHeader( sal_Bool bMultiPage )
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::ImplWritePalette()
 {
@@ -346,7 +346,7 @@ void TIFFWriter::ImplWritePalette()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool TIFFWriter::ImplWriteBody()
 {
@@ -454,7 +454,7 @@ sal_Bool TIFFWriter::ImplWriteBody()
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResolutionUnit )
 {
@@ -466,7 +466,7 @@ void TIFFWriter::ImplWriteResolution( sal_uLong nStreamPos, sal_uInt32 nResoluti
     m_rOStm.WriteUInt32( nResolutionUnit );
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt32 nNumberOfItems, sal_uInt32 nValue)
 {
@@ -480,7 +480,7 @@ void TIFFWriter::ImplWriteTag( sal_uInt16 nTagID, sal_uInt16 nDataType, sal_uInt
         m_rOStm.WriteUInt32( nValue );
 }
 
-// ------------------------------------------------------------------------
+
 
 inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
 {
@@ -498,7 +498,7 @@ inline void TIFFWriter::WriteBits( sal_uInt16 nCode, sal_uInt16 nCodeLen )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::StartCompression()
 {
@@ -525,7 +525,7 @@ void TIFFWriter::StartCompression()
     WriteBits( nClearCode, nCodeSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::Compress( sal_uInt8 nCompThis )
 {
@@ -579,7 +579,7 @@ void TIFFWriter::Compress( sal_uInt8 nCompThis )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void TIFFWriter::EndCompression()
 {
@@ -590,7 +590,7 @@ void TIFFWriter::EndCompression()
     delete[] pTable;
 }
 
-// ------------------------------------------------------------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx
index df650d1ef40f..3affd3586aad 100644
--- a/filter/source/graphicfilter/expm/expm.cxx
+++ b/filter/source/graphicfilter/expm/expm.cxx
@@ -63,13 +63,13 @@ XPMWriter::XPMWriter(SvStream& rOStm)
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 XPMWriter::~XPMWriter()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void XPMWriter::ImplCallback( sal_uInt16 nPercent )
 {
@@ -141,7 +141,7 @@ sal_Bool XPMWriter::WriteXPM( const Graphic& rGraphic, FilterConfigItem* pFilter
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool XPMWriter::ImplWriteHeader()
 {
@@ -163,7 +163,7 @@ sal_Bool XPMWriter::ImplWriteHeader()
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 void XPMWriter::ImplWritePalette()
 {
@@ -186,7 +186,7 @@ void XPMWriter::ImplWritePalette()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void XPMWriter::ImplWriteBody()
 {
@@ -202,7 +202,7 @@ void XPMWriter::ImplWriteBody()
     }
 }
 
-// ------------------------------------------------------------------------
+
 // write a decimal number in ascii format into the stream
 
 void XPMWriter::ImplWriteNumber(sal_Int32 nNumber)
@@ -211,7 +211,7 @@ void XPMWriter::ImplWriteNumber(sal_Int32 nNumber)
     m_rOStm.WriteCharPtr( aNum.getStr() );
 }
 
-// ------------------------------------------------------------------------
+
 
 void XPMWriter::ImplWritePixel( sal_uLong nCol ) const
 {
@@ -225,7 +225,7 @@ void XPMWriter::ImplWritePixel( sal_uLong nCol ) const
         m_rOStm.WriteUChar( (sal_uInt8)( nCol + 'A' ) );
 }
 
-// ------------------------------------------------------------------------
+
 // write a color value in hex format into the stream
 void XPMWriter::ImplWriteColor( sal_uInt16 nNumber )
 {
@@ -245,7 +245,7 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 // this needs to be kept in sync with
 // ImpFilterLibCacheEntry::GetImportFunction() from
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index 274a912e4f1d..d4aaf10ec30f 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -47,7 +47,7 @@
 
 using namespace ::com::sun::star;
 
-// ---------------------------------------------------------------
+
 
 CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) :
         CGMOutAct       ( rCGM ),
@@ -76,7 +76,7 @@ CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XMod
     }
 };
 
-// ---------------------------------------------------------------
+
 
 sal_Bool CGMImpressOutAct::ImplInitPage()
 {
@@ -92,7 +92,7 @@ sal_Bool CGMImpressOutAct::ImplInitPage()
     return bStatRet;
 }
 
-// ---------------------------------------------------------------
+
 
 sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType )
 {
@@ -107,7 +107,7 @@ sal_Bool CGMImpressOutAct::ImplCreateShape( const OUString& rType )
     return sal_False;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrientation )
 {
@@ -120,7 +120,7 @@ void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrien
     maXPropSet->setPropertyValue( "RotateAngle", aAny );
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::ImplSetLineBundle()
 {
@@ -178,7 +178,7 @@ void CGMImpressOutAct::ImplSetLineBundle()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::ImplSetFillBundle()
 {
@@ -345,7 +345,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XPropertySet > & rProperty )
 {
@@ -389,7 +389,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty
     rProperty->setPropertyValue( "FontDescriptor", aAny );
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::InsertPage()
 {
@@ -403,7 +403,7 @@ void CGMImpressOutAct::InsertPage()
     mnCurrentPage++;
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::BeginGroup()
 {
@@ -415,7 +415,7 @@ void CGMImpressOutAct::BeginGroup()
     mnGroupActCount = mpCGM->mnActCount;
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::EndGroup()
 {
@@ -448,7 +448,7 @@ void CGMImpressOutAct::EndGroup()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::EndGrouping()
 {
@@ -458,7 +458,7 @@ void CGMImpressOutAct::EndGrouping()
     }
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
 {
@@ -474,7 +474,7 @@ void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation )
 {
@@ -501,7 +501,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation,
             sal_uInt32 nType, double& fStartAngle, double& fEndAngle )
@@ -574,7 +574,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
 {
@@ -615,7 +615,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
 {
@@ -648,7 +648,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
 };
 
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
 {
@@ -680,7 +680,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
 {
@@ -715,7 +715,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
 {
@@ -760,7 +760,7 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, char* pString, sal_uInt32 /*nSize*/, FinalFlag eFlag )
 {
@@ -909,7 +909,7 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFlag /*eFlag*/ )
 {
@@ -947,14 +947,14 @@ void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFla
     }
 }
 
-// ---------------------------------------------------------------
+
 // nCount != 0 -> Append Text
 sal_uInt32 CGMImpressOutAct::DrawText( TextEntry* /*pTextEntry*/, NodeFrameSet& /*rNodeFrameSet*/, sal_uInt32 /*nObjCount*/ )
 {
 return 0;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMImpressOutAct::DrawChart()
 {
diff --git a/filter/source/graphicfilter/icgm/bitmap.cxx b/filter/source/graphicfilter/icgm/bitmap.cxx
index f9242c784877..a5ca20b34d06 100644
--- a/filter/source/graphicfilter/icgm/bitmap.cxx
+++ b/filter/source/graphicfilter/icgm/bitmap.cxx
@@ -20,7 +20,7 @@
 
 #include "main.hxx"
 
-// ---------------------------------------------------------------
+
 
 CGMBitmap::CGMBitmap( CGM& rCGM ) :
     mpCGM                           ( &rCGM ),
@@ -29,14 +29,14 @@ CGMBitmap::CGMBitmap( CGM& rCGM ) :
     ImplGetBitmap( *pCGMBitmapDescriptor );
 };
 
-// ---------------------------------------------------------------
+
 
 CGMBitmap::~CGMBitmap()
 {
     delete pCGMBitmapDescriptor;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
 {
@@ -220,7 +220,7 @@ void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
     }
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc )
 {
@@ -233,7 +233,7 @@ void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc )
     }
 }
 
-// ---------------------------------------------------------------
+
 
 sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
 {
@@ -325,7 +325,7 @@ sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
     return rDesc.mbStatus;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest )
 {
@@ -358,7 +358,7 @@ void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& r
     rDest.mndy += rSource.mndy;
 };
 
-// ---------------------------------------------------------------
+
 
 CGMBitmap* CGMBitmap::GetNext()
 {
@@ -391,7 +391,7 @@ CGMBitmap* CGMBitmap::GetNext()
         return NULL;
 }
 
-// ---------------------------------------------------------------
+
 
 CGMBitmapDescriptor* CGMBitmap::GetBitmap()
 {
diff --git a/filter/source/graphicfilter/icgm/bundles.cxx b/filter/source/graphicfilter/icgm/bundles.cxx
index c4dc6e929607..2b22bc40361c 100644
--- a/filter/source/graphicfilter/icgm/bundles.cxx
+++ b/filter/source/graphicfilter/icgm/bundles.cxx
@@ -29,7 +29,7 @@ Bundle& Bundle::operator=( Bundle& rSource )
     return *this;
 };
 
-// ---------------------------------------------------------------
+
 
 void Bundle::SetColor( sal_uInt32 nColor )
 {
@@ -41,7 +41,7 @@ sal_uInt32 Bundle::GetColor() const
     return mnColor;
 }
 
-// ---------------------------------------------------------------
+
 
 LineBundle& LineBundle::operator=( LineBundle& rSource )
 {
@@ -86,7 +86,7 @@ FillBundle& FillBundle::operator=( FillBundle& rSource )
     return *this;
 };
 
-// ---------------------------------------------------------------
+
 
 FontEntry::FontEntry() :
     pFontName       ( NULL ),
@@ -102,7 +102,7 @@ FontEntry::~FontEntry()
     delete pCharSetValue;
 }
 
-// ---------------------------------------------------------------
+
 
 CGMFList::CGMFList() :
     nFontNameCount      ( 0 ),
@@ -117,7 +117,7 @@ CGMFList::~CGMFList()
     ImplDeleteList();
 }
 
-// ---------------------------------------------------------------
+
 
 CGMFList& CGMFList::operator=( CGMFList& rSource )
 {
@@ -148,7 +148,7 @@ CGMFList& CGMFList::operator=( CGMFList& rSource )
     return *this;
 }
 
-// ---------------------------------------------------------------
+
 
 FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex )
 {
@@ -158,7 +158,7 @@ FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex )
     return ( nInd < aFontEntryList.size() ) ? aFontEntryList[ nInd ] : NULL;
 }
 
-// ---------------------------------------------------------------
+
 
 static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8* pDest, sal_uInt32 nComp, sal_uInt32 nSize )
 {
@@ -238,7 +238,7 @@ void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize )
     delete[] pBuf;
 }
 
-//--------------------------------------------------------------------------
+
 
 void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_uInt32 nSize )
 {
@@ -260,7 +260,7 @@ void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_
     memcpy( pFontEntry->pCharSetValue, pSource , nSize );
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMFList::ImplDeleteList()
 {
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index b2055b35ed42..08e81ad258d7 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -31,8 +31,6 @@
 
 using namespace ::com::sun::star;
 
-// ---------------------------------------------------------------
-
 void CGM::ImplCGMInit()
 {
     mbIsFinished = mbPicture = mbMetaFile = mbPictureBody = sal_False;
@@ -49,8 +47,6 @@ void CGM::ImplCGMInit()
     pElement = new CGMElements( *this );
 }
 
-// ---------------------------------------------------------------
-
 #ifdef CGM_EXPORT_IMPRESS
 
 CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel )  :
@@ -64,8 +60,6 @@ CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel )  :
 }
 #endif
 
-// ---------------------------------------------------------------
-
 CGM::~CGM()
 {
 
@@ -91,15 +85,11 @@ CGM::~CGM()
     delete [] mpBuf;
 };
 
-// ---------------------------------------------------------------
-
 sal_uInt32 CGM::GetBackGroundColor()
 {
     return ( pElement ) ? pElement->aColorTable[ 0 ] : 0;
 }
 
-// ---------------------------------------------------------------
-
 sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ )
 {
     sal_uInt8* pSource = mpSource + mnParaSize;
@@ -107,15 +97,11 @@ sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ )
     return ( pSource[ 0 ] << 8 ) +  pSource[ 1 ];
 };
 
-// ---------------------------------------------------------------
-
 sal_uInt8 CGM::ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision )
 {
     return (sal_uInt8)( nSource >> ( ( nPrecision - 1 ) << 3 ) );
 };
 
-// ---------------------------------------------------------------
-
 long CGM::ImplGetI( sal_uInt32 nPrecision )
 {
     sal_uInt8* pSource = mpSource + mnParaSize;
@@ -146,8 +132,6 @@ long CGM::ImplGetI( sal_uInt32 nPrecision )
     }
 }
 
-// ---------------------------------------------------------------
-
 sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
 {
     sal_uInt8* pSource = mpSource + mnParaSize;
@@ -174,8 +158,6 @@ sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
     }
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest )
 {
     for ( int i = 0; i < 4; i++ )
@@ -184,8 +166,6 @@ void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest )
     }
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest )
 {
     for ( int i = 0; i < 8; i++ )
@@ -194,8 +174,6 @@ void CGM::ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest )
     }
 }
 
-// ---------------------------------------------------------------
-
 double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
 {
     void*   pPtr;
@@ -265,8 +243,6 @@ double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
     return nRetValue;
 }
 
-// ---------------------------------------------------------------
-
 sal_uInt32 CGM::ImplGetPointSize()
 {
     if ( pElement->eVDCType == VDC_INTEGER )
@@ -275,36 +251,26 @@ sal_uInt32 CGM::ImplGetPointSize()
         return pElement->nVDCRealSize << 1;
 }
 
-// ---------------------------------------------------------------
-
 inline double CGM::ImplGetIX()
 {
     return ( ( ImplGetI( pElement->nVDCIntegerPrecision ) + mnVDCXadd ) * mnVDCXmul );
 }
 
-// ---------------------------------------------------------------
-
 inline double CGM::ImplGetFX()
 {
     return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCXadd ) * mnVDCXmul );
 }
 
-// ---------------------------------------------------------------
-
 inline double CGM::ImplGetIY()
 {
     return ( ( ImplGetI( pElement->nVDCIntegerPrecision ) + mnVDCYadd ) * mnVDCYmul );
 }
 
-// ---------------------------------------------------------------
-
 inline double CGM::ImplGetFY()
 {
     return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCYadd ) * mnVDCYmul );
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap )
 {
     if ( pElement->eVDCType == VDC_INTEGER )
@@ -321,8 +287,6 @@ void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap )
         ImplMapPoint( rFloatPoint );
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap )
 {
     if ( pElement->eVDCType == VDC_INTEGER )
@@ -349,8 +313,6 @@ void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap )
     }
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplGetRectangleNS( FloatRect& rFloatRect )
 {
     if ( pElement->eVDCType == VDC_INTEGER )
@@ -369,8 +331,6 @@ void CGM::ImplGetRectangleNS( FloatRect& rFloatRect )
     }
 }
 
-// ---------------------------------------------------------------
-
 sal_uInt32 CGM::ImplGetBitmapColor( sal_Bool bDirect )
 {
     // the background color is always a direct color
@@ -408,8 +368,6 @@ sal_uInt32 CGM::ImplGetBitmapColor( sal_Bool bDirect )
     return nTmp;
 }
 
-// ---------------------------------------------------------------
-
 // call this function each time after the mapmode settings has been changed
 void CGM::ImplSetMapMode()
 {
@@ -453,8 +411,6 @@ void CGM::ImplSetMapMode()
     }
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplMapDouble( double& nNumb )
 {
     if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
@@ -470,7 +426,7 @@ void CGM::ImplMapDouble( double& nNumb )
 
             case DVPM_METRIC :
             {
-//              nNumb *= ( 100 * pElement->nDeviceViewPortScale );
+                // nNumb *= ( 100 * pElement->nDeviceViewPortScale );
                 nNumb *= ( mnXFraction + mnYFraction ) / 2;
                 if ( pElement->nDeviceViewPortScale < 0 )
                     nNumb = -nNumb;
@@ -495,8 +451,6 @@ void CGM::ImplMapDouble( double& nNumb )
     }
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplMapX( double& nNumb )
 {
     if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
@@ -512,7 +466,7 @@ void CGM::ImplMapX( double& nNumb )
 
             case DVPM_METRIC :
             {
-//              nNumb *= ( 100 * pElement->nDeviceViewPortScale );
+                // nNumb *= ( 100 * pElement->nDeviceViewPortScale );
                 nNumb *= mnXFraction;
                 if ( pElement->nDeviceViewPortScale < 0 )
                     nNumb = -nNumb;
@@ -537,9 +491,6 @@ void CGM::ImplMapX( double& nNumb )
     }
 }
 
-
-// ---------------------------------------------------------------
-
 void CGM::ImplMapY( double& nNumb )
 {
     if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
@@ -555,7 +506,7 @@ void CGM::ImplMapY( double& nNumb )
 
             case DVPM_METRIC :
             {
-//              nNumb *= ( 100 * pElement->nDeviceViewPortScale );
+                // nNumb *= ( 100 * pElement->nDeviceViewPortScale );
                 nNumb *= mnYFraction;
                 if ( pElement->nDeviceViewPortScale < 0 )
                     nNumb = -nNumb;
@@ -580,9 +531,6 @@ void CGM::ImplMapY( double& nNumb )
     }
 }
 
-
-// ---------------------------------------------------------------
-
 // convert a point to the current VC mapmode (1/100TH mm)
 void CGM::ImplMapPoint( FloatPoint& rFloatPoint )
 {
@@ -628,8 +576,6 @@ void CGM::ImplMapPoint( FloatPoint& rFloatPoint )
     }
 }
 
-// ---------------------------------------------------------------
-
 void CGM::ImplDoClass()
 {
 #ifdef CGM_USER_BREAKPOINT
@@ -662,8 +608,6 @@ void CGM::ImplDoClass()
     mnActCount++;
 };
 
-// ---------------------------------------------------------------
-
 void CGM::ImplDefaultReplacement()
 {
     if ( !maDefRepList.empty() )
@@ -709,8 +653,6 @@ void CGM::ImplDefaultReplacement()
     }
 }
 
-// ---------------------------------------------------------------
-
 sal_Bool CGM::Write( SvStream& rIStm )
 {
     if ( !mpBuf )
@@ -748,20 +690,13 @@ sal_Bool CGM::Write( SvStream& rIStm )
     return mbStatus;
 };
 
-// ---------------------------------------------------------------
-
 SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ )
 {
 
     return rOStm;
 };
 
-// ---------------------------------------------------------------
-
-
-
-//================== GraphicImport - the exported function ================
-
+// GraphicImport - the exported function
 extern "C" SAL_DLLPUBLIC_EXPORT sal_uInt32 SAL_CALL
 ImportCGM( OUString& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar )
 {
diff --git a/filter/source/graphicfilter/icgm/chart.cxx b/filter/source/graphicfilter/icgm/chart.cxx
index d66ca3441883..6d6f653f0e84 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -21,7 +21,7 @@
 #include <main.hxx>
 #include <chart.hxx>
 
-// ---------------------------------------------------------------
+
 
 CGMChart::CGMChart( CGM& rCGM ) :
     mpCGM       ( &rCGM )
@@ -35,7 +35,7 @@ CGMChart::CGMChart( CGM& rCGM ) :
     }
 };
 
-// ---------------------------------------------------------------
+
 
 CGMChart::~CGMChart()
 {
@@ -47,7 +47,7 @@ CGMChart::~CGMChart()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
 {
@@ -73,22 +73,22 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMChart::InsertTextEntry( TextEntry* pTextEntry )
 {
     maTextEntryList.push_back( pTextEntry );
 };
 
-// ---------------------------------------------------------------
 
-// ---------------------------------------------------------------
+
+
 void CGMChart::ResetAnnotation()
 {
     mDataNode[ 0 ].nZoneEnum = 0;
 }
 
-// ---------------------------------------------------------------
+
 
 sal_Bool CGMChart::IsAnnotation()
 {
diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx
index fa65008815f9..3ef40972609d 100644
--- a/filter/source/graphicfilter/icgm/class0.cxx
+++ b/filter/source/graphicfilter/icgm/class0.cxx
@@ -20,7 +20,7 @@
 #include <main.hxx>
 #include <outact.hxx>
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass0()
 {
diff --git a/filter/source/graphicfilter/icgm/class1.cxx b/filter/source/graphicfilter/icgm/class1.cxx
index de354d52c581..f9082953dd56 100644
--- a/filter/source/graphicfilter/icgm/class1.cxx
+++ b/filter/source/graphicfilter/icgm/class1.cxx
@@ -20,7 +20,7 @@
 
 #include <main.hxx>
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass1()
 {
diff --git a/filter/source/graphicfilter/icgm/class2.cxx b/filter/source/graphicfilter/icgm/class2.cxx
index 2c9e430323a9..3012eeec3571 100644
--- a/filter/source/graphicfilter/icgm/class2.cxx
+++ b/filter/source/graphicfilter/icgm/class2.cxx
@@ -20,7 +20,7 @@
 
 #include <main.hxx>
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass2()
 {
diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx
index 98f1254acd06..56f96d7eff5f 100644
--- a/filter/source/graphicfilter/icgm/class3.cxx
+++ b/filter/source/graphicfilter/icgm/class3.cxx
@@ -21,7 +21,7 @@
 #include <main.hxx>
 #include <outact.hxx>
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass3()
 {
diff --git a/filter/source/graphicfilter/icgm/class4.cxx b/filter/source/graphicfilter/icgm/class4.cxx
index 71ccf320abba..0f99aff1b704 100644
--- a/filter/source/graphicfilter/icgm/class4.cxx
+++ b/filter/source/graphicfilter/icgm/class4.cxx
@@ -39,7 +39,7 @@ double CGM::ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint )
     return fOrientation;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle )
 {
@@ -49,7 +49,7 @@ void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle )
     rEndAngle = nTemp;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplGetVector( double* pVector )
 {
@@ -73,7 +73,7 @@ void CGM::ImplGetVector( double* pVector )
     pVector[ 3 ] *= mnVDCYmul;
 }
 
-// ---------------------------------------------------------------
+
 sal_Bool CGM::ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rAngle )
 {
     FloatPoint  aPoint1, aPoint2;
diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx
index eb537886fbb6..43705f4c7e08 100644
--- a/filter/source/graphicfilter/icgm/class5.cxx
+++ b/filter/source/graphicfilter/icgm/class5.cxx
@@ -23,7 +23,7 @@
 #include <outact.hxx>
 
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass5()
 {
diff --git a/filter/source/graphicfilter/icgm/class7.cxx b/filter/source/graphicfilter/icgm/class7.cxx
index 304ba32952ff..60141c488ef1 100644
--- a/filter/source/graphicfilter/icgm/class7.cxx
+++ b/filter/source/graphicfilter/icgm/class7.cxx
@@ -22,7 +22,7 @@
 #include <chart.hxx>
 #include <outact.hxx>
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass7()
 {
diff --git a/filter/source/graphicfilter/icgm/classx.cxx b/filter/source/graphicfilter/icgm/classx.cxx
index 9fb36078a2bf..8d8c03872d13 100644
--- a/filter/source/graphicfilter/icgm/classx.cxx
+++ b/filter/source/graphicfilter/icgm/classx.cxx
@@ -21,7 +21,7 @@
 #include <main.hxx>
 #include <outact.hxx>
 
-// ---------------------------------------------------------------
+
 
 #define ImplSetUnderlineMode()                                  \
                                                                 \
@@ -36,7 +36,7 @@
     }                                                           \
     pElement->nUnderlineColor = ImplGetBitmapColor();
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass6()
 {
@@ -197,7 +197,7 @@ void CGM::ImplDoClass6()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass8()
 {
@@ -216,7 +216,7 @@ void CGM::ImplDoClass8()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass9()
 {
@@ -236,7 +236,7 @@ void CGM::ImplDoClass9()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 void CGM::ImplDoClass15()
 {
@@ -249,6 +249,6 @@ void CGM::ImplDoClass15()
     }
 };
 
-// ---------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/graphicfilter/icgm/elements.cxx b/filter/source/graphicfilter/icgm/elements.cxx
index dcd5479ecc40..0f4104005e58 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -20,7 +20,7 @@
 
 #include "elements.hxx"
 
-// ---------------------------------------------------------------
+
 
 
 CGMElements::CGMElements( CGM& rCGM ) :
@@ -29,7 +29,7 @@ CGMElements::CGMElements( CGM& rCGM ) :
     Init();
 };
 
-// ---------------------------------------------------------------
+
 
 CGMElements::~CGMElements()
 {
@@ -40,7 +40,7 @@ CGMElements::~CGMElements()
     DeleteAllBundles( aFillList );
 }
 
-// ---------------------------------------------------------------
+
 
 CGMElements& CGMElements::operator=( CGMElements& rSource )
 {
@@ -139,7 +139,7 @@ CGMElements& CGMElements::operator=( CGMElements& rSource )
     return (*this);
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMElements::Init()
 {
@@ -283,7 +283,7 @@ void CGMElements::Init()
     bSegmentCount = sal_False;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, long nAngle )
 {
@@ -293,7 +293,7 @@ void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, l
     rEntry.HatchAngle = nAngle;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMElements::DeleteAllBundles( BundleList& rList )
 {
@@ -304,7 +304,7 @@ void CGMElements::DeleteAllBundles( BundleList& rList )
 };
 
 
-// ---------------------------------------------------------------
+
 
 void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest )
 {
@@ -318,7 +318,7 @@ void CGMElements::CopyAllBundles( BundleList& rSource, BundleList& rDest )
     }
 };
 
-// ---------------------------------------------------------------
+
 
 Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBundle )
 {
@@ -329,7 +329,7 @@ Bundle* CGMElements::GetBundleIndex( long nIndex, BundleList& rList, Bundle& rBu
     return pBundle;
 }
 
-// ---------------------------------------------------------------
+
 
 Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex )
 {
@@ -341,7 +341,7 @@ Bundle* CGMElements::GetBundle( BundleList& rList, long nIndex )
     return NULL;
 }
 
-// ---------------------------------------------------------------
+
 
 Bundle* CGMElements::InsertBundle( BundleList& rList, Bundle& rBundle )
 {
diff --git a/filter/source/graphicfilter/icgm/outact.cxx b/filter/source/graphicfilter/icgm/outact.cxx
index fe1d09ffd46b..798b2f2ce0bd 100644
--- a/filter/source/graphicfilter/icgm/outact.cxx
+++ b/filter/source/graphicfilter/icgm/outact.cxx
@@ -23,7 +23,7 @@
 
 using namespace ::com::sun::star;
 
-// ---------------------------------------------------------------
+
 
 CGMOutAct::CGMOutAct( CGM& rCGM )
 {
@@ -38,7 +38,7 @@ CGMOutAct::CGMOutAct( CGM& rCGM )
     mpGradient = NULL;
 };
 
-// ---------------------------------------------------------------
+
 
 CGMOutAct::~CGMOutAct()
 {
@@ -50,7 +50,7 @@ CGMOutAct::~CGMOutAct()
         delete mpGradient;
 };
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::BeginFigure()
 {
@@ -61,7 +61,7 @@ void CGMOutAct::BeginFigure()
     mnIndex = 0;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::CloseRegion()
 {
@@ -73,7 +73,7 @@ void CGMOutAct::CloseRegion()
     }
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::NewRegion()
 {
@@ -85,7 +85,7 @@ void CGMOutAct::NewRegion()
     mnIndex = 0;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::EndFigure()
 {
@@ -96,7 +96,7 @@ void CGMOutAct::EndFigure()
     mnIndex = 0;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::RegPolyLine( Polygon& rPolygon, sal_Bool bReverse )
 {
@@ -123,7 +123,7 @@ void CGMOutAct::RegPolyLine( Polygon& rPolygon, sal_Bool bReverse )
     }
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 /*nType*/ )
 {
@@ -133,7 +133,7 @@ void CGMOutAct::SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 /*nT
     mpGradient->YOffset = ( (sal_uInt16)nVertOfs & 0x7f );
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::SetGradientAngle( long nAngle )
 {
@@ -142,7 +142,7 @@ void CGMOutAct::SetGradientAngle( long nAngle )
     mpGradient->Angle = sal::static_int_cast< sal_Int16 >(nAngle);
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorTo )
 {
@@ -152,7 +152,7 @@ void CGMOutAct::SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorT
     mpGradient->EndColor = nColorTo;
 }
 
-// ---------------------------------------------------------------
+
 
 void CGMOutAct::SetGradientStyle( sal_uInt32 nStyle, double /*fRatio*/ )
 {
diff --git a/filter/source/graphicfilter/idxf/dxfblkrd.cxx b/filter/source/graphicfilter/idxf/dxfblkrd.cxx
index bb52fe42aebe..eb100bdc6773 100644
--- a/filter/source/graphicfilter/idxf/dxfblkrd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfblkrd.cxx
@@ -22,9 +22,9 @@
 #include <dxfblkrd.hxx>
 
 
-//----------------------------------------------------------------------------
+
 //---------------- DXFBlock --------------------------------------------------
-//----------------------------------------------------------------------------
+
 
 
 DXFBlock::DXFBlock()
@@ -65,9 +65,9 @@ void DXFBlock::Read(DXFGroupReader & rDGR)
 }
 
 
-//----------------------------------------------------------------------------
+
 //---------------- DXFBlocks -------------------------------------------------
-//----------------------------------------------------------------------------
+
 
 
 DXFBlocks::DXFBlocks()
diff --git a/filter/source/graphicfilter/idxf/dxfgrprd.cxx b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
index 43fccca97fa2..506ffa277656 100644
--- a/filter/source/graphicfilter/idxf/dxfgrprd.cxx
+++ b/filter/source/graphicfilter/idxf/dxfgrprd.cxx
@@ -24,7 +24,7 @@
 #include <tools/stream.hxx>
 #include "dxfgrprd.hxx"
 
-// ----------------------------------------------------------------------------
+
 
 // we use an own ReadLine function, because Stream::ReadLine stops if
 // a 0-sign occurs; this functions converts 0-signs to blanks and reads
@@ -87,7 +87,7 @@ OString DXFReadLine(SvStream& rIStm)
     return aBuf.makeStringAndClear();
 }
 
-// ------------------
+
 
 DXFGroupReader::DXFGroupReader(SvStream & rIStream, sal_uInt16 nminpercent, sal_uInt16 nmaxpercent ) :
     rIS(rIStream)
diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index a5f8b1455af2..fee898d34b40 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -67,7 +67,7 @@ static sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLo
     return NULL;
 }
 
-//--------------------------------------------------------------------------
+
 // SecurityCount is the buffersize of the buffer in which we will parse for a number
 static long ImplGetNumber( sal_uInt8 **pBuf, int& nSecurityCount )
 {
@@ -106,7 +106,7 @@ static long ImplGetNumber( sal_uInt8 **pBuf, int& nSecurityCount )
     return nRetValue;
 }
 
-//--------------------------------------------------------------------------
+
 
 static int ImplGetLen( sal_uInt8* pBuf, int nMax )
 {
diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx
index 02b4db2701d6..3f56bfff7cd2 100644
--- a/filter/source/graphicfilter/ipcd/ipcd.cxx
+++ b/filter/source/graphicfilter/ipcd/ipcd.cxx
@@ -162,13 +162,13 @@ sal_Bool PCDReader::ReadPCD( Graphic & rGraphic, FilterConfigItem* pConfigItem )
     return bStatus;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 void PCDReader::MayCallback(sal_uLong /*nPercent*/)
 {
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 void PCDReader::CheckPCDImagePacFile()
 {
@@ -181,7 +181,7 @@ void PCDReader::CheckPCDImagePacFile()
         bStatus = sal_False;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 void PCDReader::ReadOrientation()
 {
@@ -192,7 +192,7 @@ void PCDReader::ReadOrientation()
     nOrientation &= 0x03;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent)
 {
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index 9cb8cf877fed..27cf0bfa7503 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -249,7 +249,7 @@ public:
 
 };
 
-//------------------------------------------------------------------------------------------------
+
 
 #define SETBYTE                                         \
     switch ( nPixelSize )                               \
@@ -290,7 +290,7 @@ public:
             break;                                      \
     }
 
-//------------------------------------------------------------------------------------------------
+
 
 #define BITMAPERROR                                     \
 {                                                       \
diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx
index 33219a75927e..7848463fb00e 100644
--- a/filter/source/graphicfilter/ipsd/ipsd.cxx
+++ b/filter/source/graphicfilter/ipsd/ipsd.cxx
@@ -102,7 +102,7 @@ PSDReader::~PSDReader()
     delete mpFileHeader;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PSDReader::ReadPSD(Graphic & rGraphic )
 {
@@ -166,7 +166,7 @@ sal_Bool PSDReader::ReadPSD(Graphic & rGraphic )
     return mbStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PSDReader::ImplReadHeader()
 {
@@ -331,7 +331,7 @@ sal_Bool PSDReader::ImplReadHeader()
     return sal_True;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool PSDReader::ImplReadBody()
 {
diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx
index dcaaf4ce06f8..101aab41a758 100644
--- a/filter/source/graphicfilter/iras/iras.cxx
+++ b/filter/source/graphicfilter/iras/iras.cxx
@@ -78,7 +78,7 @@ RASReader::~RASReader()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
 {
@@ -169,7 +169,7 @@ sal_Bool RASReader::ReadRAS(Graphic & rGraphic)
     return mbStatus;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool RASReader::ImplReadHeader()
 {
@@ -207,7 +207,7 @@ sal_Bool RASReader::ImplReadHeader()
     return mbStatus;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool RASReader::ImplReadBody()
 {
@@ -302,7 +302,7 @@ sal_Bool RASReader::ImplReadBody()
     return mbStatus;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_uInt8 RASReader::ImplGetByte()
 {
diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx
index f9b338119f59..b03ca79e6277 100644
--- a/filter/source/graphicfilter/itga/itga.cxx
+++ b/filter/source/graphicfilter/itga/itga.cxx
@@ -130,7 +130,7 @@ TGAReader::~TGAReader()
     delete mpFileFooter;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 sal_Bool TGAReader::ReadTGA(Graphic & rGraphic)
 {
@@ -170,7 +170,7 @@ sal_Bool TGAReader::ReadTGA(Graphic & rGraphic)
     return mbStatus;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 sal_Bool TGAReader::ImplReadHeader()
 {
@@ -276,7 +276,7 @@ sal_Bool TGAReader::ImplReadHeader()
     return mbStatus;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 sal_Bool TGAReader::ImplReadBody()
 {
@@ -711,7 +711,7 @@ sal_Bool TGAReader::ImplReadBody()
     return mbStatus;
 }
 
-// -------------------------------------------------------------------------------------------
+
 
 sal_Bool TGAReader::ImplReadPalette()
 {
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx
index 8deea2c16589..cd156a7fca05 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -138,7 +138,7 @@ void TIFFReader::MayCallback( sal_uLong /*nPercent*/ )
 {
 }
 
-// ---------------------------------------------------------------------------------
+
 
 sal_uLong TIFFReader::DataTypeSize()
 {
@@ -172,7 +172,7 @@ sal_uLong TIFFReader::DataTypeSize()
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------
+
 
 sal_uLong TIFFReader::ReadIntData()
 {
@@ -235,7 +235,7 @@ sal_uLong TIFFReader::ReadIntData()
     return nUINT32a;
 }
 
-// ---------------------------------------------------------------------------------
+
 
 double TIFFReader::ReadDoubleData()
 {
@@ -255,7 +255,7 @@ double TIFFReader::ReadDoubleData()
     return nd;
 }
 
-// ---------------------------------------------------------------------------------
+
 
 void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
 {
@@ -481,7 +481,7 @@ void TIFFReader::ReadTagData( sal_uInt16 nTagType, sal_uInt32 nDataLen)
         bStatus = sal_False;
 }
 
-// ---------------------------------------------------------------------------------
+
 
 sal_Bool TIFFReader::ReadMap( sal_uLong nMinPercent, sal_uLong nMaxPercent )
 {
@@ -717,7 +717,7 @@ sal_uLong TIFFReader::GetBits( const sal_uInt8 * pSrc, sal_uLong nBitsPos, sal_u
     return nRes;
 }
 
-// ---------------------------------------------------------------------------------
+
 
 sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
 {
@@ -1024,7 +1024,7 @@ sal_Bool TIFFReader::ConvertScanline( sal_uLong nY )
     return sal_True;
 }
 
-// ---------------------------------------------------------------------------------
+
 
 void TIFFReader::MakePalCol( void )
 {
@@ -1075,7 +1075,7 @@ void TIFFReader::MakePalCol( void )
     }
 }
 
-// ---------------------------------------------------------------------------------
+
 
 void TIFFReader::ReadHeader()
 {
@@ -1105,7 +1105,7 @@ bool TIFFReader::HasAlphaChannel() const
            );
 }
 
-// ---------------------------------------------------------------------------------
+
 
 sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
 {
diff --git a/filter/source/msfilter/countryid.cxx b/filter/source/msfilter/countryid.cxx
index 28b57b332e5b..832d4b2886da 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -22,7 +22,7 @@
 #include <algorithm>
 #include <sal/macros.h>
 
-// ----------------------------------------------------------------------------
+
 
 namespace msfilter {
 
@@ -30,7 +30,7 @@ namespace msfilter {
 
 namespace {
 
-// ----------------------------------------------------------------------------
+
 
 /** Table entry for Windows country ID <-> language type conversion.
 
@@ -57,7 +57,7 @@ struct CountryEntry
     bool                        mbUseSubLang;   /// false = Primary only, true = Primary and sub language.
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Table for Windows country ID <-> language type conversion.
 
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index a6423fce2fdc..b507ed68bef8 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -435,10 +435,10 @@ void EscherPropertyContainer::CreateGradientProperties(
     sal_uInt32  nFillFocus = 0;
     sal_uInt32  nFillLR = 0;
     sal_uInt32  nFillTB = 0;
-    sal_uInt32  nFirstColor = 0;//like the control var nChgColors in import logic
+    sal_uInt32  nFirstColor = 0;// like the control var nChgColors in import logic
     bool        bWriteFillTo = false;
 
-    //Transparency gradient: Means the third setting in transparency page is set
+    // Transparency gradient: Means the third setting in transparency page is set
     if (bTransparentGradient &&  EscherPropertyValueHelper::GetPropertyValue(
         aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) )
     {
@@ -452,7 +452,7 @@ void EscherPropertyContainer::CreateGradientProperties(
             ::com::sun::star::drawing::FillStyle eFS;
             if ( ! ( aAnyTemp >>= eFS ) )
                 eFS = ::com::sun::star::drawing::FillStyle_SOLID;
-            //solid and transparency
+            // solid and transparency
             if ( eFS == ::com::sun::star::drawing::FillStyle_SOLID)
             {
                 if ( EscherPropertyValueHelper::GetPropertyValue(
@@ -462,7 +462,7 @@ void EscherPropertyContainer::CreateGradientProperties(
                     pGradient->EndColor = ImplGetColor( *((sal_uInt32*)aAnyTemp.getValue()), sal_False );
                 }
             }
-            //gradient and transparency.
+            // gradient and transparency.
             else if( eFS == ::com::sun::star::drawing::FillStyle_GRADIENT )
             {
                 if ( EscherPropertyValueHelper::GetPropertyValue(
@@ -472,7 +472,7 @@ void EscherPropertyContainer::CreateGradientProperties(
         }
 
     }
-    //Not transparency gradient
+    // Not transparency gradient
     else if ( EscherPropertyValueHelper::GetPropertyValue(
         aAny, rXPropSet, OUString( "FillGradient" ), sal_False ) )
     {
@@ -490,7 +490,7 @@ void EscherPropertyContainer::CreateGradientProperties(
                 nAngle = pGradient->Angle;
                 while ( nAngle > 0 ) nAngle -= 3600;
                 while ( nAngle <= -3600 ) nAngle += 3600;
-                //Value of the real number = Integral + (Fractional / 65536.0)
+                // Value of the real number = Integral + (Fractional / 65536.0)
                 nAngle = ( nAngle * 0x10000) / 10;
 
                 nFillFocus = (pGradient->Style == ::com::sun::star::awt::GradientStyle_LINEAR) ?
@@ -506,7 +506,7 @@ void EscherPropertyContainer::CreateGradientProperties(
         case ::com::sun::star::awt::GradientStyle_SQUARE :
         case ::com::sun::star::awt::GradientStyle_RECT :
             {
-                //according to the import logic and rect type fill** value
+                // according to the import logic and rect type fill** value
                 nFillLR = (pGradient->XOffset * 0x10000) / 100;
                 nFillTB = (pGradient->YOffset * 0x10000) / 100;
                 if ( ((nFillLR > 0) && (nFillLR < 0x10000)) || ((nFillTB > 0) && (nFillTB < 0x10000)) )
@@ -528,7 +528,7 @@ void EscherPropertyContainer::CreateGradientProperties(
     AddOpt( ESCHER_Prop_fillFocus, nFillFocus );
     if ( bWriteFillTo )
     {
-        //according to rect type fillTo** value
+        // according to rect type fillTo** value
         if(nFillLR)
         {
             AddOpt( ESCHER_Prop_fillToLeft, nFillLR );
@@ -541,7 +541,7 @@ void EscherPropertyContainer::CreateGradientProperties(
         }
     }
 
-    //Transparency gradient
+    // Transparency gradient
     if (bTransparentGradient &&  EscherPropertyValueHelper::GetPropertyValue(
         aAny, rXPropSet, OUString( "FillTransparenceGradient" ), sal_False ) )
     {
@@ -566,7 +566,7 @@ void    EscherPropertyContainer::CreateFillProperties(
         if ( pObj )
         {
             SfxItemSet aAttr( pObj->GetMergedItemSet() );
-            //tranparency with gradient. Means the third setting in transparency page is set
+            // tranparency with gradient. Means the third setting in transparency page is set
             sal_Bool bTransparentGradient =  ( aAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
                 ( (const XFillFloatTransparenceItem&) aAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled();
             CreateFillProperties(  rXPropSet, bEdge, bTransparentGradient );
@@ -880,9 +880,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
                 if ( !aApiName.isEmpty() )
                 {
 
-                    /* todo:
-                    calculate the best option for ArrowLength and ArrowWidth
-                    */
+                    // TODO: calculate the best option for ArrowLength and ArrowWidth
                     if ( aApiName == "Arrow concave" )
                         reLineEnd = ESCHER_LineArrowStealthEnd;
                     else if ( aApiName == "Square 45" )
@@ -1610,7 +1608,7 @@ sal_Bool EscherPropertyContainer::CreateGraphicProperties(
 
                         if ( nErrCode == ERRCODE_NONE )
                         {
-                            // no.
+                            // no
                             aGraphicObject = aGraphic;
                             aUniqueId = aGraphicObject.GetUniqueID();
                         }
@@ -2195,9 +2193,8 @@ sal_Int32 lcl_GetAdjustValueCount( const XPolygon& rPoly )
     }
     return nRet;
 }
-/*
- Adjust value decide the position which connector should turn a corner
-*/
+
+// Adjust value decide the position which connector should turn a corner
 sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex )
 {
     sal_uInt16 k =  rPoly.GetSize();
@@ -2212,7 +2209,7 @@ sal_Int32 lcl_GetConnectorAdjustValue ( const XPolygon& rPoly, sal_uInt16 nIndex
         aEnd.X() = aStart.X() +4;
 
     sal_Bool bVertical = ( rPoly[1].X()-aStart.X() ) == 0 ;
-    //vertical and horizon alternate
+    // vertical and horizon alternate
     if ( nIndex%2 == 1 ) bVertical = !bVertical;
     aPt = rPoly[ nIndex + 1];
 
@@ -2306,7 +2303,7 @@ sal_Bool lcl_GetAngle(Polygon &rPoly,sal_uInt16& rShapeFlags,sal_Int32& nAngle )
         // Set angle properties
         nAngle *= 655;
         nAngle += 0x8000;
-        nAngle &=~0xffff;                                  // nAngle auf volle Gradzahl runden
+        nAngle &=~0xffff;                                  // round nAngle to whole number of degrees
         return sal_True;
     }
     return sal_False;
@@ -2348,7 +2345,7 @@ sal_Bool EscherPropertyContainer::CreateConnectorProperties(
                         rShapeFlags = SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT | SHAPEFLAG_CONNECTOR;
                         rGeoRect = ::com::sun::star::awt::Rectangle( aStartPoint.X, aStartPoint.Y,
                                                             ( aEndPoint.X - aStartPoint.X ) + 1, ( aEndPoint.Y - aStartPoint.Y ) + 1 );
-                        //set standard's FLIP in below code
+                        // set standard's FLIP in below code
                         if ( eCt != ::com::sun::star::drawing::ConnectorType_STANDARD)
                         {
                             if ( rGeoRect.Height < 0 )          // justify
@@ -2646,7 +2643,7 @@ sal_Bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShap
     sal_Bool bIsDefaultObject = sal_False;
     switch(eShapeType)
     {
-        //if the custom shape is not default shape of ppt, return sal_Fasle;
+        // if the custom shape is not default shape of ppt, return sal_Fasle;
         case mso_sptTearDrop:
             return bIsDefaultObject;
 
@@ -3562,7 +3559,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                         nTextPathFlags &=~0x20;
                                 }
                             }
-                            //export gTextAlign attr
+                            // export gTextAlign attr
                             if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, "TextHorizontalAdjust", sal_True ) )
                             {
                                 MSO_GeoTextAlign  gTextAlign = mso_alignTextCenter;
@@ -3598,7 +3595,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
                                 AddOpt(DFF_Prop_gtextAlign,gTextAlign);
                             }
                         }
-                        if((nTextPathFlags & 0x4000) != 0)  //Is Font work
+                        if((nTextPathFlags & 0x4000) != 0)  // Is Font work
                         {
                             OutlinerParaObject* pOutlinerParaObject = pCustoShape->GetOutlinerParaObject();
                             if ( pOutlinerParaObject && pOutlinerParaObject->IsVertical() )
@@ -3917,7 +3914,7 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference< drawi
     return GetCustomShapeType( rXShape, nMirrorFlags, aShapeType );
 }
 
-//Implement for form control export
+// Implement for form control export
 sal_Bool   EscherPropertyContainer::CreateBlipPropertiesforOLEControl(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape)
 {
     SdrObject* pShape = GetSdrObjectFromXShape( rXShape );
@@ -4581,7 +4578,7 @@ sal_uInt32 EscherConnectorListEntry::GetClosestPoint( const Polygon& rPoly, cons
     return nClosest;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 // for rectangles          for ellipses     for polygons
 //
 // nRule =  0 ->Top         0 ->Top         nRule = Index auf ein (Poly)Polygon Punkt
@@ -5022,11 +5019,11 @@ SvStream* EscherExGlobal::ImplQueryPictureStream()
     return 0;
 }
 
-/// Implementation of an empty stream that silently succeeds, but does nothing.
-///
-/// In fact, this is a hack.  The right solution is to abstract EscherEx to be
-/// able to work without SvStream; but at the moment it is better to live with
-/// this I guess.
+// /Implementation of an empty stream that silently succeeds, but does nothing.
+// /
+// /In fact, this is a hack.  The right solution is to abstract EscherEx to be
+// /able to work without SvStream; but at the moment it is better to live with
+// /this I guess.
 class SvNullStream : public SvStream
 {
 protected:
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 8340f844b700..68cfc3a79da2 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2837,9 +2837,9 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& aSet,MSO_FillType eMSO_
     }
 }
 
-//---------------------------------------------------------------------------
+
 //- Record Manager ----------------------------------------------------------
-//---------------------------------------------------------------------------
+
 
 DffRecordList::DffRecordList( DffRecordList* pList ) :
     nCount                  ( 0 ),
@@ -3029,9 +3029,9 @@ DffRecordHeader* DffRecordManager::GetRecordHeader( sal_uInt16 nRecId, DffSeekTo
     return pHd;
 }
 
-//---------------------------------------------------------------------------
+
 //  private methods
-//---------------------------------------------------------------------------
+
 
 bool CompareSvxMSDffShapeInfoById::operator() (
     ::boost::shared_ptr<SvxMSDffShapeInfo> const& lhs,
@@ -5436,9 +5436,9 @@ void SvxMSDffManager::RemoveFromShapeOrder( SdrObject* pObject ) const
 
 
 
-//---------------------------------------------------------------------------
+
 //  exported class: Public Methods
-//---------------------------------------------------------------------------
+
 
 SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
                                  const OUString& rBaseURL,
diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx
index abd50efed0dc..8035c862e6c3 100644
--- a/filter/source/msfilter/util.cxx
+++ b/filter/source/msfilter/util.cxx
@@ -20,8 +20,8 @@ namespace util {
 
 rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Locale &rLocale)
 {
-    //Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks
-    //in last-ditch broken-file-format cases to guess the right 8bit encodings
+    // Obviously not comprehensive, feel free to expand these, they're for ultimate fallbacks
+    // in last-ditch broken-file-format cases to guess the right 8bit encodings
     const OUString &rLanguage = rLocale.Language;
     if (rLanguage == "cs" || rLanguage == "hu" || rLanguage == "pl")
         return RTL_TEXTENCODING_MS_1250;
@@ -358,7 +358,7 @@ sal_Int32 PaperSizeConv::getMSPaperSizeIndex( const com::sun::star::awt::Size& r
     {
         sal_Int32 nCurDeltaHeight = std::abs( pItem->mnHeight - rSize.Height );
         sal_Int32 nCurDeltaWidth = std::abs( pItem->mnWidth - rSize.Width );
-        if ( pItem == spPaperSizeTable ) // initialise delta with first item
+        if ( pItem == spPaperSizeTable ) // initialize delta with first item
         {
             nDeltaWidth = nCurDeltaWidth;
             nDeltaHeight = nCurDeltaHeight;
@@ -412,10 +412,9 @@ WW8ReadFieldParams::WW8ReadFieldParams( const OUString& _rData )
     , nNext( 0 )
     , nSavPtr( 0 )
 {
+
     /*
-        erstmal nach einer oeffnenden Klammer oder einer Leerstelle oder einem
-        Anfuehrungszeichen oder einem Backslash suchen, damit der Feldbefehl
-        (also INCLUDEPICTURE bzw EINFUeGENGRAFIK bzw ...) ueberlesen wird
+        First look for an opening bracket or a space or a quatation mark or a backslash, so that the field (i.e. INCLUDEPICTURE or EINFUEGENGRAFIK or...) gets oread over
     */
     const sal_Int32 nLen = aData.getLength();
 
@@ -461,7 +460,7 @@ bool WW8ReadFieldParams::GoToTokenParam()
     return false;
 }
 
-// ret: -2: NOT a '\' parameter but normal Text
+// ret: -2: NOT a '\' parameter but normal text
 sal_Int32 WW8ReadFieldParams::SkipToNextToken()
 {
     if ( nNext<0 || nNext>=aData.getLength() )
@@ -476,7 +475,7 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken()
     if (nFnd+1<aData.getLength() && aData[nFnd+1]!='\\' && aData[nFnd]=='\\')
     {
         const sal_Int32 nRet = aData[++nFnd];
-        nNext = ++nFnd;             // und dahinter setzen
+        nNext = ++nFnd;             // and set after
         return nRet;
     }
 
@@ -487,22 +486,22 @@ sal_Int32 WW8ReadFieldParams::SkipToNextToken()
     return -2;
 }
 
-// FindNextPara sucht naechsten Backslash-Parameter oder naechste Zeichenkette
-// bis zum Blank oder naechsten "\" oder zum schliessenden Anfuehrungszeichen
-// oder zum String-Ende von pStr.
+// FindNextPara searches the next backslash parameter or the next string
+// until the next blank or "\" or closing quatation mark
+// or the end of the string of pStr.
 //
-// Ausgabe ppNext (falls ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
+// Output ppNext (if ppNext != 0) Suchbeginn fuer naechsten Parameter bzw. 0
 //
-// Returnwert: 0 falls String-Ende erreicht,
+// Return value: 0 if end of string reached,
 //             ansonsten Anfang des Paramters bzw. der Zeichenkette
 //
 sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart)
 {
     const sal_Int32 nLen = aData.getLength();
-    sal_Int32  n = nStart<0  ? nFnd : nStart;  // Anfang
-    sal_Int32 n2;          // Ende
+    sal_Int32  n = nStart<0  ? nFnd : nStart;  // start
+    sal_Int32 n2;          // end
 
-    nNext = -1;        // Default fuer nicht gefunden
+    nNext = -1;        // if not found -> Default
 
     while ( n<nLen && aData[n]==' ' )
         ++n;
@@ -519,36 +518,36 @@ sal_Int32 WW8ReadFieldParams::FindNextStringPiece(const sal_Int32 nStart)
             return -1;
     }
 
-    // Anfuehrungszeichen vor Para?
+    // quotation marks before paragraph?
     if ( aData[n]=='"' || aData[n]==0x201c || aData[n]==132 || aData[n]==0x14 )
     {
-        n++;                        // Anfuehrungszeichen ueberlesen
-        n2 = n;                     // ab hier nach Ende suchen
+        n++;                        // read over quatation marks
+        n2 = n;                     // search for the end from here on
         while(     (nLen > n2)
                 && (aData[n2] != '"')
                 && (aData[n2] != 0x201d)
                 && (aData[n2] != 147)
                 && (aData[n2] != 0x15) )
-            n2++;                   // Ende d. Paras suchen
+            n2++;                   // search for the end of the paragraph
     }
-    else                        // keine Anfuehrungszeichen
+    else                        // no quotation mark
     {
-        n2 = n;                     // ab hier nach Ende suchen
-        while ( n2<nLen && aData[n2]!=' ' ) // Ende d. Paras suchen
+        n2 = n;                     // search for the end from here on
+        while ( n2<nLen && aData[n2]!=' ' ) // search for the end of the paragraph
         {
             if ( aData[n2]=='\\' )
             {
                 if ( n2+1<nLen && aData[n2+1]=='\\' )
-                    n2 += 2;        // Doppel-Backslash -> OK
+                    n2 += 2;        // double backslash -> OK
                 else
                 {
                     if( n2 > n )
                         n2--;
-                    break;          // einfach-Backslash -> Ende
+                    break;          // single backslash -> end
                 }
             }
             else
-                n2++;               // kein Backslash -> OK
+                n2++;               // no backslash -> OK
         }
     }
     if( nLen > n2 )
@@ -622,8 +621,8 @@ EquationResult Read_SubF_Combined(WW8ReadFieldParams& rReadParam)
                                 OUString sPart = rReadParam.GetResult();
                                 sal_Int32 nBegin = sPart.indexOf('(');
 
-                                //Word disallows brackets in this field, which
-                                //aids figuring out the case of an end of )) vs )
+                                // Word disallows brackets in this field, which
+                                // aids figuring out the case of an end of )) vs )
                                 sal_Int32 nEnd = sPart.indexOf(')');
 
                                 if (nBegin != -1 && nEnd != -1)
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index a98e170c9d1d..189f7e226508 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -49,9 +49,9 @@ PDFFilterResId::PDFFilterResId( sal_uInt32 nId ) : ResId( nId, getPDFFilterResMg
 {
 }
 
-// ----------------
+
 // - ImpPDFDialog -
-// ----------------
+
 
 using namespace ::com::sun::star;
 
@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
 // tabbed PDF dialog implementation
 // please note: the default used here are the same as per specification,
 // they should be the same in  PDFFilter::implExport and  in PDFExport::PDFExport
-// -----------------------------------------------------------------------------
+
 ImpPDFTabDialog::ImpPDFTabDialog(Window* pParent, Sequence< PropertyValue >& rFilterData,
     const Reference< XComponent >& rxDoc)
     : SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui",
@@ -314,7 +314,7 @@ IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabDialog::~ImpPDFTabDialog()
 {
 //delete the pages, needed because otherwise the child tab pages
@@ -331,7 +331,7 @@ ImpPDFTabDialog::~ImpPDFTabDialog()
         RemoveTabPage(mnSigningPageId);
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabDialog::PageCreated( sal_uInt16 _nId,
                                    SfxTabPage& _rPage )
 {
@@ -361,7 +361,7 @@ void ImpPDFTabDialog::PageCreated( sal_uInt16 _nId,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 short ImpPDFTabDialog::Ok( )
 {
 //here the whole mechanism of the base class is not used
@@ -369,7 +369,7 @@ short ImpPDFTabDialog::Ok( )
     return RET_OK;
 }
 
-// -----------------------------------------------------------------------------
+
 Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
 {
 // updating the FilterData sequence and storing FilterData to configuration
@@ -511,7 +511,7 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rCoreSet)
     : SfxTabPage(pParent, "PdfGeneralPage","filter/ui/pdfgeneralpage.ui", rCoreSet)
     , mbTaggedPDFUserSelection(false)
@@ -553,12 +553,12 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(Window* pParent, const SfxItemSet& rC
     get(mpEdWatermark, "watermarkentry");
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
 {
     mpaParent = paParent;
@@ -652,7 +652,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
     ToggleAddStreamHdl(NULL);
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
 {
 // updating the FilterData sequence and storing FilterData to configuration
@@ -705,14 +705,14 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
     paParent->mbAllowDuplicateFieldNames = mpCbAllowDuplicateFieldNames->IsChecked();
 }
 
-// -----------------------------------------------------------------------------
+
 SfxTabPage*  ImpPDFTabGeneralPage::Create( Window* pParent,
                                            const SfxItemSet& rAttrSet)
 {
     return ( new  ImpPDFTabGeneralPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl)
 {
     mpEdPages->Enable( mpRbRange->IsChecked() );
@@ -721,21 +721,21 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl)
 {
     mpFormsFrame->Enable(mpCbExportFormFields->IsChecked());
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl)
 {
     mpQualityFrame->Enable(mpRbJPEGCompression->IsChecked());
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl)
 {
     mpCoReduceImageResolution->Enable( mpCbReduceImageResolution->IsChecked() );
@@ -753,7 +753,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl)
 {
     if( mpCbAddStream->IsVisible() )
@@ -776,7 +776,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl)
 {
     //set the security page status (and its controls as well)
@@ -851,19 +851,19 @@ ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& rCor
     mpRbMagnZoom->SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, ToggleRbMagnHdl ) );
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 SfxTabPage*  ImpPDFTabOpnFtrPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet)
 {
     return ( new  ImpPDFTabOpnFtrPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
     paParent->mnInitialView = 0;
@@ -898,7 +898,7 @@ void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
     paParent->mbFirstPageLeft = ( mbUseCTLFont ) ? mpCbPgLyFirstOnLeft->IsChecked() : sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent )
 {
     mbUseCTLFont = paParent->mbUseCTLFont;
@@ -985,7 +985,7 @@ IMPL_LINK( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, void*, )
 
 ////////////////////////////////////////////////////////
 // The Viewer preferences tab page
-// -----------------------------------------------------------------------------
+
 ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent,
                                           const SfxItemSet& rCoreSet ) :
     SfxTabPage( pParent, "PdfUserInterfacePage","filter/ui/pdfuserinterfacepage.ui", rCoreSet )
@@ -1007,25 +1007,25 @@ ImpPDFTabViewerPage::ImpPDFTabViewerPage( Window* pParent,
     m_pRbVisibleBookmarkLevels->SetToggleHdl( LINK( this, ImpPDFTabViewerPage, ToggleRbBookmarksHdl ) );
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabViewerPage::~ImpPDFTabViewerPage()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, void*, )
 {
     m_pNumBookmarkLevels->Enable( m_pRbVisibleBookmarkLevels->IsChecked() );
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 SfxTabPage*  ImpPDFTabViewerPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet)
 {
     return ( new  ImpPDFTabViewerPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
     paParent->mbHideViewerMenubar = m_pCbHideViewerMenubar->IsChecked();
@@ -1040,7 +1040,7 @@ void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
                                      -1 : static_cast<sal_Int32>(m_pNumBookmarkLevels->GetValue());
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabViewerPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent )
 {
     m_pCbHideViewerMenubar->Check( paParent->mbHideViewerMenubar );
@@ -1105,19 +1105,19 @@ ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(Window* i_pParent, const SfxItemSet
     mpPbSetPwd->SetClickHdl( LINK( this, ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl ) );
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 SfxTabPage*  ImpPDFTabSecurityPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet)
 {
     return ( new  ImpPDFTabSecurityPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
 // please note that in PDF/A-1a mode even if this are copied back,
@@ -1152,7 +1152,7 @@ void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 }
 
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabSecurityPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent )
 {
     switch( paParent->mnPrint )
@@ -1293,7 +1293,7 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
 ////////////////////////////////////////////////////////
 // This tab page is under control of the PDF/A-1a checkbox:
 // implement a method to do it.
-// -----------------------------------------------------------------------------
+
 void    ImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity )
 {
     if( bEnableSecurity )
@@ -1309,7 +1309,7 @@ void    ImpPDFTabSecurityPage::ImplPDFASecurityControl( sal_Bool bEnableSecurity
 
 ////////////////////////////////////////////////////////
 // The link preferences tab page (relative and other stuff)
-// -----------------------------------------------------------------------------
+
 ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent,
                                               const SfxItemSet& rCoreSet ) :
     SfxTabPage( pParent, "PdfLinksPage","filter/ui/pdflinkspage.ui",rCoreSet ),
@@ -1326,19 +1326,19 @@ ImpPDFTabLinksPage::ImpPDFTabLinksPage( Window* pParent,
     get(m_pRbOpnLnksBrowser ,"openinternet");
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabLinksPage::~ImpPDFTabLinksPage()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 SfxTabPage*  ImpPDFTabLinksPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet)
 {
     return ( new  ImpPDFTabLinksPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
     paParent->mbExportRelativeFsysLinks = m_pCbExportRelativeFsysLinks->IsChecked();
@@ -1367,7 +1367,7 @@ void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
     paParent->mbExportBmkToPDFDestination = m_pCbExprtBmkrToNmDst->IsChecked();
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabLinksPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent )
 {
     m_pCbOOoToPDFTargets->Check( paParent->mbConvertOOoTargets );
@@ -1402,7 +1402,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent )
         ImplPDFALinkControl(!pGeneralPage->mpCbPDFA1b->IsChecked());
 }
 
-// -----------------------------------------------------------------------------
+
 // called from general tab, with PDFA/1 selection status
 // retrieves/store the status of Launch action selection
 void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch )
@@ -1428,7 +1428,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( sal_Bool bEnableLaunch )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // reset the memory of Launch action present
 // when PDF/A-1 was requested
 IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl)
@@ -1439,7 +1439,7 @@ IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // reset the memory of a launch action present
 // when PDF/A-1 was requested
 IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl)
@@ -1555,7 +1555,7 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl)
 
 ////////////////////////////////////////////////////////
 // The digital signatures tab page
-// -----------------------------------------------------------------------------
+
 ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rCoreSet)
     : SfxTabPage(pParent, "PdfSignPage","filter/ui/pdfsignpage.ui", rCoreSet)
     , maSignCertificate()
@@ -1573,7 +1573,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(Window* pParent, const SfxItemSet& rC
     mpPbSignCertClear->SetClickHdl( LINK( this, ImpPDFTabSigningPage, ClickmaPbSignCertClear ) );
 }
 
-// -----------------------------------------------------------------------------
+
 ImpPDFTabSigningPage::~ImpPDFTabSigningPage()
 {
 }
@@ -1613,14 +1613,14 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear )
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 SfxTabPage*  ImpPDFTabSigningPage::Create( Window* pParent,
                                           const SfxItemSet& rAttrSet)
 {
     return ( new  ImpPDFTabSigningPage( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 {
     paParent->mbSignPDF = maSignCertificate.is();
@@ -1632,7 +1632,7 @@ void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent  )
 
 }
 
-// -----------------------------------------------------------------------------
+
 void ImpPDFTabSigningPage::SetFilterConfigItem( const  ImpPDFTabDialog* paParent )
 {
 
diff --git a/filter/source/pdf/pdfdialog.cxx b/filter/source/pdf/pdfdialog.cxx
index 361748dd52fa..cbead17dc2ce 100644
--- a/filter/source/pdf/pdfdialog.cxx
+++ b/filter/source/pdf/pdfdialog.cxx
@@ -32,13 +32,13 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 
-// -----------------------
+
 // - PDFDialog functions -
-// -----------------------
+
 
 #define SERVICE_NAME "com.sun.star.document.PDFDialog"
 
-// -----------------------------------------------------------------------------
+
 
 OUString PDFDialog_getImplementationName ()
     throw (RuntimeException)
@@ -46,7 +46,7 @@ OUString PDFDialog_getImplementationName ()
     return OUString ( "com.sun.star.comp.PDF.PDFDialog" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId()
     throw(RuntimeException)
@@ -55,7 +55,7 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog_getImplementationId()
     return aId.getImplementationId();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
     throw (RuntimeException)
@@ -66,7 +66,7 @@ Sequence< OUString > SAL_CALL PDFDialog_getSupportedServiceNames()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr)
     throw( Exception )
@@ -74,26 +74,26 @@ Reference< XInterface > SAL_CALL PDFDialog_createInstance( const Reference< XMul
     return (cppu::OWeakObject*) new PDFDialog( comphelper::getComponentContext(rSMgr) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 #undef SERVICE_NAME
 
-// -------------
+
 // - PDFDialog -
-// -------------
+
 
 PDFDialog::PDFDialog( const Reference< XComponentContext > &rxContext )
 : PDFDialog_Base( rxContext )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 PDFDialog::~PDFDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId()
     throw(RuntimeException)
@@ -101,7 +101,7 @@ Sequence< sal_Int8 > SAL_CALL PDFDialog::getImplementationId()
     return PDFDialog_getImplementationId();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL PDFDialog::getImplementationName()
     throw (RuntimeException)
@@ -109,7 +109,7 @@ OUString SAL_CALL PDFDialog::getImplementationName()
     return PDFDialog_getImplementationName();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames()
     throw (RuntimeException)
@@ -117,7 +117,7 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames()
     return PDFDialog_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Dialog* PDFDialog::createDialog( Window* pParent )
 {
@@ -132,7 +132,7 @@ Dialog* PDFDialog::createDialog( Window* pParent )
     return pRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void PDFDialog::executedDialog( sal_Int16 nExecutionResult )
 {
@@ -141,7 +141,7 @@ void PDFDialog::executedDialog( sal_Int16 nExecutionResult )
     destroyDialog();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
     throw(RuntimeException)
@@ -150,13 +150,13 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
     return xInfo;
 }
 
-//-------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& PDFDialog::getInfoHelper()
 {
     return *const_cast<PDFDialog*>(this)->getArrayHelper();
 }
 
-//------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* PDFDialog::createArrayHelper() const
 {
     Sequence< Property > aProps;
@@ -164,7 +164,7 @@ Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
     throw ( RuntimeException )
@@ -186,7 +186,7 @@ Sequence< PropertyValue > SAL_CALL PDFDialog::getPropertyValues()
     return maMediaDescriptor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
     throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
@@ -203,7 +203,7 @@ void SAL_CALL PDFDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL PDFDialog::setSourceDocument( const Reference< XComponent >& xDoc )
     throw(IllegalArgumentException, RuntimeException)
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 1105b17b9dd5..5b1994bb9af8 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -84,9 +84,9 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::graphic;
 
-// -------------
+
 // - PDFExport -
-// -------------
+
 
 PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
                       const Reference< task::XStatusIndicator >& rxStatusIndicator,
@@ -148,13 +148,13 @@ PDFExport::PDFExport( const Reference< XComponent >& rxSrcDoc,
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 PDFExport::~PDFExport()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter,
     Reference< com::sun::star::view::XRenderable >& rRenderable,
@@ -999,7 +999,7 @@ void PDFExport::showErrors( const std::set< PDFWriter::ErrorCode >& rErrors )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFExtOutDevData, const GDIMetaFile& rMtf )
 {
@@ -1041,7 +1041,7 @@ sal_Bool PDFExport::ImplExportPage( PDFWriter& rWriter, PDFExtOutDevData& rPDFEx
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void PDFExport::ImplWriteWatermark( PDFWriter& rWriter, const Size& rPageSize )
 {
diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx
index b8406900d242..5814b42a5bd3 100644
--- a/filter/source/pdf/pdffilter.cxx
+++ b/filter/source/pdf/pdffilter.cxx
@@ -129,7 +129,7 @@ sal_Bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 class FocusWindowWaitCursor
 {
     Window*         m_pFocusWindow;
@@ -172,13 +172,13 @@ sal_Bool SAL_CALL PDFFilter::filter( const Sequence< PropertyValue >& rDescripto
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL PDFFilter::cancel( ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc )
     throw (IllegalArgumentException, RuntimeException)
@@ -186,7 +186,7 @@ void SAL_CALL PDFFilter::setSourceDocument( const Reference< XComponent >& xDoc
     mxSrcDoc = xDoc;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL PDFFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& )
     throw (Exception, RuntimeException)
@@ -212,7 +212,7 @@ Reference< XInterface > SAL_CALL PDFFilter_createInstance( const Reference< XMul
     return (cppu::OWeakObject*) new PDFFilter( comphelper::getComponentContext(rSMgr) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL PDFFilter::getImplementationName()
     throw (RuntimeException)
@@ -220,7 +220,7 @@ OUString SAL_CALL PDFFilter::getImplementationName()
     return PDFFilter_getImplementationName();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName )
     throw (RuntimeException)
@@ -228,7 +228,7 @@ sal_Bool SAL_CALL PDFFilter::supportsService( const OUString& rServiceName )
     return cppu::supportsService( this, rServiceName );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL PDFFilter::getSupportedServiceNames(  ) throw (RuntimeException)
 {
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index fdb2e5655cb6..a0bbaaa85dfa 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -54,20 +54,20 @@ using com::sun::star::beans::XPropertySet;
 using com::sun::star::presentation::XPresentationPage;
 using com::sun::star::task::XStatusIndicator;
 
-// -----------------------------------------------------------------------------
+
 
 PlaceWareExporter::PlaceWareExporter(const Reference< XComponentContext > & rxContext)
 :   mxContext( rxContext )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 PlaceWareExporter::~PlaceWareExporter()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 class PageEntry
 {
 private:
@@ -399,7 +399,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference <
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 PageEntry* PlaceWareExporter::exportPage( Reference< XDrawPage >&xDrawPage )
 {
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 61309708f3dc..2a82b1fdee89 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -37,7 +37,7 @@ using ::com::sun::star::task::XStatusIndicator;
 
 namespace pwp {
 
-// -----------------------------------------------------------------------------
+
 
 class PlaceWareExportFilter : public cppu::WeakImplHelper4
 <
@@ -69,14 +69,14 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw(RuntimeException);
 };
 
-// -----------------------------------------------------------------------------
+
 
 PlaceWareExportFilter::PlaceWareExportFilter(const Reference< XComponentContext > &rxContext)
 :   mxContext( rxContext )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor )
     throw (RuntimeException)
@@ -116,14 +116,14 @@ sal_Bool SAL_CALL PlaceWareExportFilter::filter( const ::com::sun::star::uno::Se
     return aExporter.doExport( mxDoc, xOutputStream, sURL, xInteractionHandler, xStatusIndicator );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL PlaceWareExportFilter::cancel(  )
     throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 // XExporter
 void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
@@ -132,7 +132,7 @@ void SAL_CALL PlaceWareExportFilter::setSourceDocument( const ::com::sun::star::
     mxDoc = xDoc;
 }
 
-// -----------------------------------------------------------------------------
+
 
 // XInitialization
 void SAL_CALL PlaceWareExportFilter::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& /* aArguments */ )
@@ -180,7 +180,7 @@ sal_Bool SAL_CALL PlaceWareExportFilter::supportsService( const OUString& rServi
     return PlaceWareExportFilter_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------------
+
 
 }
 
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index c438cf5d6f00..1da05e4020a9 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -31,9 +31,9 @@ inline sal_Int32 implMap( Window& /*rWnd*/, sal_Int32 nVal )
     return( nVal << 1 );
 }
 
-// ----------------
+
 // - ImpSVGDialog -
-// ----------------
+
 
 ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterData ) :
     ModalDialog( pParent ),
@@ -91,13 +91,13 @@ ImpSVGDialog::ImpSVGDialog( Window* pParent, Sequence< PropertyValue >& rFilterD
     maBTHelp.Show();
 }
 
-// -----------------------------------------------------------------------------
+
 
 ImpSVGDialog::~ImpSVGDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
 {
@@ -108,7 +108,7 @@ Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
     return( maConfigItem.GetFilterData() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( ImpSVGDialog, OnToggleCheckbox, CheckBox*, pBox )
 {
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 7a5afb9f17d3..9ae45d865d20 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -42,9 +42,9 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::view;
 using namespace ::com::sun::star::document;
 
-// -----------------------
+
 // - SVGDialog functions -
-// -----------------------
+
 
 OUString SVGDialog_getImplementationName ()
     throw (RuntimeException)
@@ -52,7 +52,7 @@ OUString SVGDialog_getImplementationName ()
     return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL SVGDialog_getImplementationId()
     throw(RuntimeException)
@@ -62,7 +62,7 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog_getImplementationId()
     return( aId.getImplementationId() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
     throw (RuntimeException)
@@ -74,7 +74,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMultiServiceFactory > & rSMgr )
     throw( Exception )
@@ -82,22 +82,22 @@ Reference< XInterface > SAL_CALL SVGDialog_createInstance( const Reference< XMul
     return( static_cast< cppu::OWeakObject* >( new SVGDialog( comphelper::getComponentContext(rSMgr) ) ) );
 }
 
-// -------------
+
 // - SVGDialog -
-// -------------
+
 
 SVGDialog::SVGDialog( const Reference< XComponentContext > &rxContext ) :
     OGenericUnoDialog( rxContext )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SVGDialog::~SVGDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL SVGDialog::queryInterface( const Type& rType )
     throw (RuntimeException)
@@ -113,7 +113,7 @@ Any SAL_CALL SVGDialog::queryInterface( const Type& rType )
     return( aReturn );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGDialog::acquire()
     throw ()
@@ -121,7 +121,7 @@ void SAL_CALL SVGDialog::acquire()
     OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGDialog::release()
     throw ()
@@ -129,7 +129,7 @@ void SAL_CALL SVGDialog::release()
     OWeakObject::release();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
     throw(RuntimeException)
@@ -137,7 +137,7 @@ Sequence< sal_Int8 > SAL_CALL SVGDialog::getImplementationId()
     return SVGDialog_getImplementationId();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SVGDialog::getImplementationName()
     throw (RuntimeException)
@@ -145,7 +145,7 @@ OUString SAL_CALL SVGDialog::getImplementationName()
     return SVGDialog_getImplementationName();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
     throw (RuntimeException)
@@ -153,7 +153,7 @@ Sequence< OUString > SAL_CALL SVGDialog::getSupportedServiceNames()
     return SVGDialog_getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Dialog* SVGDialog::createDialog( Window* pParent )
 {
@@ -162,7 +162,7 @@ Dialog* SVGDialog::createDialog( Window* pParent )
             NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
 {
@@ -172,7 +172,7 @@ void SVGDialog::executedDialog( sal_Int16 nExecutionResult )
     destroyDialog();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
     throw(RuntimeException)
@@ -180,13 +180,13 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
     return( Reference< XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ) );
 }
 
-//-------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SVGDialog::getInfoHelper()
 {
     return( *const_cast< SVGDialog *>(this)->getArrayHelper() );
 }
 
-//------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* SVGDialog::createArrayHelper() const
 {
     Sequence< Property > aProps;
@@ -196,7 +196,7 @@ Reference< XPropertySetInfo > SAL_CALL SVGDialog::getPropertySetInfo()
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
     throw ( RuntimeException )
@@ -220,7 +220,7 @@ Sequence< PropertyValue > SAL_CALL SVGDialog::getPropertyValues()
     return( maMediaDescriptor );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rProps )
     throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
@@ -237,7 +237,7 @@ void SAL_CALL SVGDialog::setPropertyValues( const Sequence< PropertyValue >& rPr
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGDialog::setSourceDocument( const Reference< XComponent >& xDoc )
     throw(IllegalArgumentException, RuntimeException)
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 121e3aa1041c..bbb413d61f6f 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -48,9 +48,9 @@
 
 using namespace ::com::sun::star;
 
-// -------------------------------
+
 // - ooo elements and attributes -
-// -------------------------------
+
 
 #define NSPREFIX "ooo:"
 
@@ -311,9 +311,9 @@ sal_Bool operator==( const TextField & aLhsTextField, const TextField & aRhsText
 
 
 
-// -------------
+
 // - SVGExport -
-// -------------
+
 
 SVGExport::SVGExport(
     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext,
@@ -360,7 +360,7 @@ SVGExport::SVGExport(
 
 }
 
-// -----------------------------------------------------------------------------
+
 
 SVGExport::~SVGExport()
 {
@@ -368,16 +368,16 @@ SVGExport::~SVGExport()
 }
 
 
-// ------------------------
+
 // - ObjectRepresentation -
-// ------------------------
+
 
 ObjectRepresentation::ObjectRepresentation() :
     mpMtf( NULL )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObject,
                                             const GDIMetaFile& rMtf ) :
@@ -386,7 +386,7 @@ ObjectRepresentation::ObjectRepresentation( const Reference< XInterface >& rxObj
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ObjectRepresentation::ObjectRepresentation( const ObjectRepresentation& rPresentation ) :
     mxObject( rPresentation.mxObject ),
@@ -394,14 +394,14 @@ ObjectRepresentation::ObjectRepresentation( const ObjectRepresentation& rPresent
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ObjectRepresentation::~ObjectRepresentation()
 {
     delete mpMtf;
 }
 
-// -----------------------------------------------------------------------------
+
 
 ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentation& rPresentation )
 {
@@ -414,7 +414,7 @@ ObjectRepresentation& ObjectRepresentation::operator=( const ObjectRepresentatio
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresentation ) const
 {
@@ -422,7 +422,7 @@ sal_Bool ObjectRepresentation::operator==( const ObjectRepresentation& rPresenta
             ( *mpMtf == *rPresentation.mpMtf ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uLong GetBitmapChecksum( const MetaAction* pAction )
 {
@@ -452,7 +452,7 @@ sal_uLong GetBitmapChecksum( const MetaAction* pAction )
     }
     return nChecksum;
 }
-// -----------------------------------------------------------------------------
+
 
 void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
 {
@@ -481,7 +481,7 @@ void MetaBitmapActionGetPoint( const MetaAction* pAction, Point& rPt )
 
 }
 
-// -----------------------------------------------------------------------------
+
 
 size_t HashBitmap::operator()( const ObjectRepresentation& rObjRep ) const
 {
@@ -497,7 +497,7 @@ size_t HashBitmap::operator()( const ObjectRepresentation& rObjRep ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
                                      const ObjectRepresentation& rObjRep2 ) const
@@ -518,9 +518,9 @@ bool EqualityBitmap::operator()( const ObjectRepresentation& rObjRep1,
 }
 
 
-// -------------
+
 // - SVGFilter -
-// -------------
+
 
 sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException)
@@ -631,7 +631,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference< XOutputStream >& rxOStm )
 {
@@ -646,7 +646,7 @@ Reference< XWriter > SVGFilter::implCreateExportDocumentHandler( const Reference
     return xSaxWriter;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implLookForFirstVisiblePage()
 {
@@ -677,7 +677,7 @@ sal_Bool SVGFilter::implLookForFirstVisiblePage()
     return ( mnVisiblePage != -1 );
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SVGFilter::implExportDocument()
 {
     OUString         aAttr;
@@ -820,7 +820,7 @@ sal_Bool SVGFilter::implExportDocument()
 }
 
 
-//------------------------------------------------------------------------------
+
 // Append aField to aFieldSet if it is not already present in the set
 // and create the field id sFieldId
 //
@@ -853,7 +853,7 @@ OUString implGenerateFieldId( std::vector< TextField* > & aFieldSet,
     return sFieldId;
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implGenerateMetaData()
 {
@@ -1072,7 +1072,7 @@ sal_Bool SVGFilter::implGenerateMetaData()
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implExportAnimations()
 {
@@ -1138,7 +1138,7 @@ sal_Bool SVGFilter::implExportAnimations()
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFilter::implExportTextShapeIndex()
 {
@@ -1164,7 +1164,7 @@ void SVGFilter::implExportTextShapeIndex()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFilter::implEmbedBulletGlyphs()
 {
@@ -1191,7 +1191,7 @@ void SVGFilter::implEmbedBulletGlyphs()
     implEmbedBulletGlyph( 8211, sPathData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPathData )
 {
@@ -1210,7 +1210,7 @@ void SVGFilter::implEmbedBulletGlyph( sal_Unicode cBullet, const OUString & sPat
 
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** SVGFilter::implExportTextEmbeddedBitmaps
  *  We export bitmaps embedded into text shapes, such as those used by list
@@ -1281,7 +1281,7 @@ sal_Bool SVGFilter::implExportTextEmbeddedBitmaps()
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 #define SVGFILTER_EXPORT_SVGSCRIPT( z, n, aFragment ) \
         xExtDocHandler->unknown( OUString::createFromAscii( aFragment ## n ) );
@@ -1303,7 +1303,7 @@ sal_Bool SVGFilter::implGenerateScript()
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
                                             const Reference< XPropertySet > & rxPropSet,
@@ -1317,7 +1317,7 @@ Any SVGFilter::implSafeGetPagePropSet( const OUString & sPropertyName,
     return result;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /*  SVGFilter::implGetPagePropSet
  *
@@ -1382,7 +1382,7 @@ sal_Bool SVGFilter::implGetPagePropSet( const Reference< XDrawPage > & rxPage )
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence & rxPages,
                                            sal_Int32 nFirstPage, sal_Int32 nLastPage )
@@ -1415,7 +1415,7 @@ sal_Bool SVGFilter::implExportMasterPages( const SVGFilter::XDrawPageSequence &
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rxPages,
                                            sal_Int32 nFirstPage, sal_Int32 nLastPage )
@@ -1467,7 +1467,7 @@ sal_Bool SVGFilter::implExportDrawPages( const SVGFilter::XDrawPageSequence & rx
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SVGFilter::implExportPage( const OUString & sPageId,
                                     const Reference< XDrawPage > & rxPage,
                                     const Reference< XShapes > & xShapes,
@@ -1570,7 +1570,7 @@ sal_Bool SVGFilter::implExportPage( const OUString & sPageId,
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
                                       sal_Bool bMaster )
@@ -1589,7 +1589,7 @@ sal_Bool SVGFilter::implExportShapes( const Reference< XShapes >& rxShapes,
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
                                      sal_Bool bMaster )
@@ -1763,7 +1763,7 @@ sal_Bool SVGFilter::implExportShape( const Reference< XShape >& rxShape,
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implCreateObjects()
 {
@@ -1819,7 +1819,7 @@ sal_Bool SVGFilter::implCreateObjects()
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > & rxPage, const Reference< XShapes >& rxShapes )
 {
@@ -1837,7 +1837,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShapes( const Reference< XDrawPage > &
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & rxPage, const Reference< XShape >& rxShape )
 {
@@ -1955,7 +1955,7 @@ sal_Bool SVGFilter::implCreateObjectsFromShape( const Reference< XDrawPage > & r
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage >& rxDrawPage )
 {
@@ -1983,7 +1983,7 @@ sal_Bool SVGFilter::implCreateObjectsFromBackground( const Reference< XDrawPage
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape )
 {
@@ -2014,7 +2014,7 @@ OUString SVGFilter::implGetClassFromShape( const Reference< XShape >& rxShape )
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf )
 {
@@ -2022,14 +2022,14 @@ void SVGFilter::implRegisterInterface( const Reference< XInterface >& rxIf )
         (mpSVGExport->getInterfaceToIdentifierMapper()).registerReference( rxIf );
 }
 
-// -----------------------------------------------------------------------------
+
 
 const OUString & SVGFilter::implGetValidIDFromInterface( const Reference< XInterface >& rxIf )
 {
    return (mpSVGExport->getInterfaceToIdentifierMapper()).getIdentifier( rxIf );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
 {
@@ -2042,7 +2042,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
 {
@@ -2282,7 +2282,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
     return ( bFieldProcessed ? 0 : maOldFieldHdl.Call( pInfo ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGExport::writeMtf( const GDIMetaFile& rMtf )
 {
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 6b030a2c8df6..e8e7df608e8a 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -47,9 +47,9 @@
 
 using namespace ::com::sun::star;
 
-// -------------
+
 // - SVGFilter -
-// -------------
+
 
 SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) :
     mxContext( rxCtx ),
@@ -66,7 +66,7 @@ SVGFilter::SVGFilter( const Reference< XComponentContext >& rxCtx ) :
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SVGFilter::~SVGFilter()
 {
@@ -77,7 +77,7 @@ SVGFilter::~SVGFilter()
     DBG_ASSERT( mpObjects == NULL, "mpObjects not destroyed" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException)
@@ -242,13 +242,13 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc )
     throw (IllegalArgumentException, RuntimeException)
@@ -256,7 +256,7 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc
     mxSrcDoc = xDoc;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
     throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
@@ -264,7 +264,7 @@ void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc
     mxDstDoc = xDoc;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor ) throw (RuntimeException)
 {
@@ -305,7 +305,7 @@ OUString SAL_CALL SVGFilter::detect( Sequence< PropertyValue >& io_rDescriptor )
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 #define SVG_FILTER_IMPL_NAME "com.sun.star.comp.Draw.SVGFilter"
 #define SVG_WRITER_IMPL_NAME "com.sun.star.comp.Draw.SVGWriter"
diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx
index 6dd28be6fcca..86f401ffd4d2 100644
--- a/filter/source/svg/svgfontexport.cxx
+++ b/filter/source/svg/svgfontexport.cxx
@@ -30,9 +30,9 @@
 
 static const sal_Int32 nFontEM = 2048;
 
-// -----------------
+
 // - SVGFontExport -
-// -----------------
+
 
 SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRepresentation >& rObjects ) :
     mrExport( rExport ),
@@ -41,13 +41,13 @@ SVGFontExport::SVGFontExport( SVGExport& rExport, const ::std::vector< ObjectRep
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SVGFontExport::~SVGFontExport()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont )
 {
@@ -74,7 +74,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const Font& rFont )
     return( maGlyphTree[ aFontName.getToken( 0, ';', nNextTokenPos ) ][ eWeight ][ eItalic ] );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFontExport::implCollectGlyphs()
 {
@@ -172,7 +172,7 @@ void SVGFontExport::implCollectGlyphs()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFontExport::implEmbedFont( const Font& rFont )
 {
@@ -254,7 +254,7 @@ void SVGFontExport::implEmbedFont( const Font& rFont )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr )
 {
@@ -289,7 +289,7 @@ void SVGFontExport::implEmbedGlyph( OutputDevice& rOut, const OUString& rCellStr
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SVGFontExport::EmbedFonts()
 {
@@ -327,7 +327,7 @@ void SVGFontExport::EmbedFonts()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SVGFontExport::GetMappedFontName( const OUString& rFontName ) const
 {
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index a252d1267caa..6b3f04da56e5 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -3611,9 +3611,9 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
     mpVDev->Pop();
 }
 
-// -------------
+
 // - SVGWriter -
-// -------------
+
 
 SVGWriter::SVGWriter( const Sequence<Any>& args, const Reference< XComponentContext >& rxCtx )
     : mxContext(rxCtx)
@@ -3622,13 +3622,13 @@ SVGWriter::SVGWriter( const Sequence<Any>& args, const Reference< XComponentCont
         args[0]>>=maFilterData;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SVGWriter::~SVGWriter()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SVGWriter::write( const Reference<XDocumentHandler>& rxDocHandler,
                                 const Sequence<sal_Int8>& rMtfSeq ) throw( RuntimeException )
diff --git a/filter/source/svg/test/parsertest.cxx b/filter/source/svg/test/parsertest.cxx
index 9ac5829c2511..447939864823 100644
--- a/filter/source/svg/test/parsertest.cxx
+++ b/filter/source/svg/test/parsertest.cxx
@@ -194,7 +194,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(TestParser, "test svg parser fragments");
 
diff --git a/filter/source/xmlfilteradaptor/streamwrap.cxx b/filter/source/xmlfilteradaptor/streamwrap.cxx
index d3115ca5cd2f..3f42cbda43f0 100644
--- a/filter/source/xmlfilteradaptor/streamwrap.cxx
+++ b/filter/source/xmlfilteradaptor/streamwrap.cxx
@@ -32,7 +32,7 @@ using namespace ::osl;
 //==================================================================
 //= OOutputStreamWrapper
 //==================================================================
-//------------------------------------------------------------------------------
+
 void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     sal_uInt64 nWritten = 0;
@@ -43,12 +43,12 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
 }
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 9884cf7706e5..31c1816894fa 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -111,7 +111,7 @@ private:
     XMLFilterSettingsDialog* mpDialog;
 };
 
-//-------------------------------------------------------------------------
+
 
 namespace
 {
@@ -133,13 +133,13 @@ XMLFilterDialogComponent::XMLFilterDialogComponent( const com::sun::star::uno::R
     xDesktop->addTerminateListener( xListener );
 }
 
-//-------------------------------------------------------------------------
+
 
 XMLFilterDialogComponent::~XMLFilterDialogComponent()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 // XInterface
 Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw (RuntimeException)
@@ -147,7 +147,7 @@ Any SAL_CALL XMLFilterDialogComponent::queryInterface( const Type& aType ) throw
     return OComponentHelper::queryInterface( aType );
 }
 
-//-------------------------------------------------------------------------
+
 
 Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) throw (RuntimeException)
 {
@@ -174,21 +174,21 @@ Any SAL_CALL XMLFilterDialogComponent::queryAggregation( Type const & rType ) th
     return OComponentHelper::queryAggregation( rType );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SAL_CALL XMLFilterDialogComponent::acquire() throw ()
 {
     OComponentHelper::acquire();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SAL_CALL XMLFilterDialogComponent::release() throw ()
 {
     OComponentHelper::release();
 }
 
-//-------------------------------------------------------------------------
+
 
 OUString XMLFilterDialogComponent_getImplementationName() throw ( RuntimeException )
 {
@@ -220,7 +220,7 @@ Sequence< sal_Int8 > SAL_CALL XMLFilterDialogComponent::getImplementationId( voi
     return rID.getImplementationId();
 }
 
-//-------------------------------------------------------------------------
+
 
 namespace
 {
@@ -281,7 +281,7 @@ void SAL_CALL XMLFilterDialogComponent::disposing()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 // XTerminateListener
 void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /* Event */ ) throw (TerminationVetoException, RuntimeException)
@@ -303,7 +303,7 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( const EventObject& /*
         mpDialog->Close();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& /* Event */ ) throw (RuntimeException)
 {
@@ -315,12 +315,12 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const EventObject& /* Source
 {
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle */ ) throw(RuntimeException)
 {
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException)
 {
     ::SolarMutexGuard aGuard;
@@ -349,7 +349,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException)
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
 {
     const Any* pArguments = aArguments.getConstArray();
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 869f98104938..3f1d2d198682 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -102,7 +102,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog(Window* pParent,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton )
 {
@@ -141,7 +141,7 @@ IMPL_LINK(XMLFilterSettingsDialog, ClickHdl_Impl, PushButton *, pButton )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl)
 {
@@ -149,7 +149,7 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, SelectionChangedHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(XMLFilterSettingsDialog, DoubleClickHdl_Impl)
 {
@@ -162,7 +162,7 @@ bool XMLFilterSettingsDialog::isClosable()
     return m_bIsClosable;
 }
 
-// -----------------------------------------------------------------------
+
 
 short XMLFilterSettingsDialog::Execute()
 {
@@ -175,7 +175,7 @@ short XMLFilterSettingsDialog::Execute()
     return ModelessDialog::Execute();
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::updateStates()
 {
@@ -209,7 +209,7 @@ void XMLFilterSettingsDialog::updateStates()
     m_pPBSave->Enable( bHasSelection );
 }
 
-// -----------------------------------------------------------------------
+
 
 /** is called when the user clicks on the "New" button */
 void XMLFilterSettingsDialog::onNew()
@@ -238,7 +238,7 @@ void XMLFilterSettingsDialog::onNew()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 /** is called when the user clicks on the "Edit" Button */
 void XMLFilterSettingsDialog::onEdit()
@@ -265,7 +265,7 @@ void XMLFilterSettingsDialog::onEdit()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 /** helper to create a sequence of strings from an extensions strings
     "ext1;ext2;ext3" will become { "ext1", "ext2", "ext3" } */
@@ -318,7 +318,7 @@ static Sequence< OUString > createExtensionsSequence( const OUString& rExtension
     return aExtensions;
 }
 
-// -----------------------------------------------------------------------
+
 
 /** checks if the given name is unique inside the filter factory. If not,
     numbers are added until the returned name is unique */
@@ -339,7 +339,7 @@ OUString XMLFilterSettingsDialog::createUniqueFilterName( const OUString& rFilte
     return aFilterName;
 }
 
-// -----------------------------------------------------------------------
+
 
 /** checks if the given name is unique inside the type detection. If not,
     numbers are added until the returned name is unique */
@@ -420,7 +420,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn
     return aInterfaceName;
 }
 
-// -----------------------------------------------------------------------
+
 
 /** inserts a new filter into the ui and configuration if pOldInfo is NULL.
     If pOldInfo is not null, the old filter will be replaced with the new settings */
@@ -765,7 +765,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
     return bOk;
 }
 
-// -----------------------------------------------------------------------
+
 
 /** is called when the user clicks the "Test" button */
 void XMLFilterSettingsDialog::onTest()
@@ -781,7 +781,7 @@ void XMLFilterSettingsDialog::onTest()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::onDelete()
 {
@@ -873,7 +873,7 @@ void XMLFilterSettingsDialog::onDelete()
     updateStates();
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::onSave()
 {
@@ -929,7 +929,7 @@ void XMLFilterSettingsDialog::onSave()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::onOpen()
 {
@@ -995,7 +995,7 @@ void XMLFilterSettingsDialog::onOpen()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::onClose()
 {
@@ -1026,7 +1026,7 @@ bool XMLFilterSettingsDialog::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::disposeFilterList()
 {
@@ -1040,7 +1040,7 @@ void XMLFilterSettingsDialog::disposeFilterList()
     m_pFilterListBox->Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterSettingsDialog::initFilterList()
 {
@@ -1222,9 +1222,9 @@ void XMLFilterSettingsDialog::initFilterList()
         m_pFilterListBox->Select( pEntry );
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 application_info_impl::application_info_impl( const sal_Char * pDocumentService, ResId& rUINameRes, const sal_Char * mpXMLImporter, const sal_Char * mpXMLExporter )
 :   maDocumentService( pDocumentService, strlen( pDocumentService ), RTL_TEXTENCODING_ASCII_US ),
@@ -1234,7 +1234,7 @@ application_info_impl::application_info_impl( const sal_Char * pDocumentService,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 std::vector< application_info_impl* >& getApplicationInfos()
 {
@@ -1303,7 +1303,7 @@ std::vector< application_info_impl* >& getApplicationInfos()
     return aInfos;
 }
 
-// -----------------------------------------------------------------------
+
 
 const application_info_impl* getApplicationInfo( const OUString& rServiceName )
 {
@@ -1320,7 +1320,7 @@ const application_info_impl* getApplicationInfo( const OUString& rServiceName )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString getApplicationUIName( const OUString& rServiceName )
 {
@@ -1424,7 +1424,7 @@ XMLFilterListBox::XMLFilterListBox(SvxPathControl* pParent)
     m_pHeaderBar->Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterListBox::Paint( const Rectangle& rRect )
 {
@@ -1443,7 +1443,7 @@ IMPL_LINK( XMLFilterListBox, TabBoxScrollHdl_Impl, SvTabListBox*, /* pList */ )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
 {
@@ -1474,7 +1474,7 @@ IMPL_LINK( XMLFilterListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 /** adds a new filter info entry to the ui filter list */
 void XMLFilterListBox::addFilterEntry( const filter_info_impl* pInfo )
@@ -1483,7 +1483,7 @@ void XMLFilterListBox::addFilterEntry( const filter_info_impl* pInfo )
     InsertEntryToColumn( aEntryStr, LIST_APPEND, 0xffff, (void*)pInfo );
 }
 
-// -----------------------------------------------------------------------
+
 
 void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo )
 {
@@ -1501,7 +1501,7 @@ void XMLFilterListBox::changeEntry( const filter_info_impl* pInfo )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const
 {
@@ -1535,9 +1535,9 @@ OUString XMLFilterListBox::getEntryString( const filter_info_impl* pInfo ) const
     return aEntryStr;
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 filter_info_impl::filter_info_impl()
 :   maFlags(0x00080040),
@@ -1548,7 +1548,7 @@ filter_info_impl::filter_info_impl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 filter_info_impl::filter_info_impl( const filter_info_impl& rInfo ) :
     maFilterName( rInfo.maFilterName ),
@@ -1572,7 +1572,7 @@ filter_info_impl::filter_info_impl( const filter_info_impl& rInfo ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool filter_info_impl::operator==( const filter_info_impl& r ) const
 {
@@ -1594,7 +1594,7 @@ bool filter_info_impl::operator==( const filter_info_impl& r ) const
         mbNeedsXSLT2 == r.mbNeedsXSLT2;
 }
 
-// -----------------------------------------------------------------------
+
 
 Sequence< OUString > filter_info_impl::getFilterUserData() const
 {
@@ -1612,7 +1612,7 @@ Sequence< OUString > filter_info_impl::getFilterUserData() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 OUString string_encode( const OUString & rText )
 {
@@ -1632,21 +1632,21 @@ OUString string_encode( const OUString & rText )
     return Uri::encode( rText, aCharClass, rtl_UriEncodeCheckEscapes, RTL_TEXTENCODING_UTF8 );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString string_decode( const OUString & rText )
 {
     return Uri::decode( rText, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool isFileURL( const OUString & rURL )
 {
     return rURL.startsWith("file:");
 }
 
-// -----------------------------------------------------------------------
+
 
 bool copyStreams( Reference< XInputStream > xIS, Reference< XOutputStream > xOS )
 {
@@ -1685,7 +1685,7 @@ bool copyStreams( Reference< XInputStream > xIS, Reference< XOutputStream > xOS
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool createDirectory( OUString& rURL )
 {
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index f8690520d24f..78da78bde5ad 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -71,7 +71,7 @@ XMLFilterTabDialog::XMLFilterTabDialog(Window *pParent, ResMgr& rResMgr,
     ActivatePageHdl(m_pTabCtrl);
 }
 
-// -----------------------------------------------------------------------
+
 
 XMLFilterTabDialog::~XMLFilterTabDialog()
 {
@@ -80,7 +80,7 @@ XMLFilterTabDialog::~XMLFilterTabDialog()
     delete mpNewInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool XMLFilterTabDialog::onOk()
 {
@@ -271,14 +271,14 @@ bool XMLFilterTabDialog::onOk()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 filter_info_impl* XMLFilterTabDialog::getNewFilterInfo() const
 {
     return mpNewInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl)
 {
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(XMLFilterTabDialog, OkHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 {
@@ -299,7 +299,7 @@ IMPL_LINK( XMLFilterTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( XMLFilterTabDialog, DeactivatePageHdl, TabControl *, /* pTabCtrl */ )
 {
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 1edc2d682654..0577d505643f 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -273,7 +273,7 @@ void XMLFilterTestDialog::initDialog()
     m_pExport->Enable(bExport);
     m_pFTExportXSLTFile->SetText( getFileNameFromURL( m_pFilterInfo->maExportXSLT ) );
 
-    // ---
+
 
     m_pImport->Enable(bImport);
     m_pFTImportTemplate->Enable(bImport && !m_pFilterInfo->maImportTemplate.isEmpty());
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index ff9aca316e62..355b9f0fe7b5 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -545,9 +545,9 @@ namespace XSLT
     }
 
 
-    // --------------------------------------
+
     // Component management
-    // --------------------------------------
+
 #define FILTER_SERVICE_NAME "com.sun.star.documentconversion.XSLTFilter"
 #define FILTER_IMPL_NAME "com.sun.star.comp.documentconversion.XSLTFilter"
 #define TRANSFORMER_SERVICE_NAME "com.sun.star.xml.xslt.XSLTTransformer"
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 6d2732b20c31..3a6b9534535d 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -52,13 +52,13 @@ using ::com::sun::star::frame::XDispatchProviderInterceptor;
 //==================================================================
 //= OButtonModel
 //==================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OButtonModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
+
 OButtonModel::OButtonModel(const Reference<XComponentContext>& _rxFactory)
     :OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_COMMANDBUTTON, FRM_SUN_CONTROL_COMMANDBUTTON )
                                     // use the old control name for compatibility reasons
@@ -68,7 +68,7 @@ OButtonModel::OButtonModel(const Reference<XComponentContext>& _rxFactory)
     m_nClassId = FormComponentType::COMMANDBUTTON;
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) throw(RuntimeException)
 {
     Any aReturn = OClickableImageBaseModel::queryAggregation( _type );
@@ -77,7 +77,7 @@ Any SAL_CALL OButtonModel::queryAggregation( const Type& _type ) throw(RuntimeEx
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 Sequence< Type > OButtonModel::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -86,7 +86,7 @@ Sequence< Type > OButtonModel::_getTypes()
     );
 }
 
-//------------------------------------------------------------------
+
 OButtonModel::OButtonModel( const OButtonModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OClickableImageBaseModel( _pOriginal, _rxFactory )
     ,m_aResetHelper( *this, m_aMutex )
@@ -97,12 +97,12 @@ OButtonModel::OButtonModel( const OButtonModel* _pOriginal, const Reference<XCom
     implInitializeImageURL();
 }
 
-//------------------------------------------------------------------------------
+
 OButtonModel::~OButtonModel()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 6, OClickableImageBaseModel )
@@ -115,11 +115,11 @@ void OButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) cons
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OButtonModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence  OButtonModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames();
@@ -131,13 +131,13 @@ StringSequence  OButtonModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 OUString OButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_COMMANDBUTTON); // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OClickableImageBaseModel::write(_rxOutStream);
@@ -158,7 +158,7 @@ void OButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) thr
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OClickableImageBaseModel::read(_rxInStream);
@@ -218,14 +218,14 @@ void OButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw
     }
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonModel::disposing()
 {
     m_aResetHelper.disposing();
     OClickableImageBaseModel::disposing();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonModel::reset() throw (RuntimeException)
 {
     if ( !m_aResetHelper.approveReset() )
@@ -236,19 +236,19 @@ void SAL_CALL OButtonModel::reset() throw (RuntimeException)
     m_aResetHelper.notifyResetted();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonModel::addResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException)
 {
     m_aResetHelper.addResetListener( _listener );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonModel::removeResetListener( const Reference< XResetListener >& _listener ) throw (RuntimeException)
 {
     m_aResetHelper.removeResetListener( _listener );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
 {
     switch ( _nHandle )
@@ -263,7 +263,7 @@ void SAL_CALL OButtonModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand
     }
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)
 {
     switch ( _nHandle )
@@ -283,7 +283,7 @@ void SAL_CALL OButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle
     }
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
 {
     sal_Bool bModified = sal_False;
@@ -300,7 +300,7 @@ sal_Bool SAL_CALL OButtonModel::convertFastPropertyValue( Any& _rConvertedValue,
     return bModified;
 }
 
-//--------------------------------------------------------------------
+
 Any OButtonModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
 {
     Any aDefault;
@@ -317,7 +317,7 @@ Any OButtonModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     return aDefault;
 }
 
-//--------------------------------------------------------------------
+
 void OButtonModel::impl_resetNoBroadcast_nothrow()
 {
     try
@@ -333,13 +333,13 @@ void OButtonModel::impl_resetNoBroadcast_nothrow()
 //==================================================================
 // OButtonControl
 //==================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OButtonControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OButtonControl::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -349,7 +349,7 @@ Sequence<Type> OButtonControl::_getTypes()
     );
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence  OButtonControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames();
@@ -360,7 +360,7 @@ StringSequence  OButtonControl::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 OButtonControl::OButtonControl(const Reference<XComponentContext>& _rxFactory)
                  :OClickableImageBaseControl(_rxFactory, VCL_CONTROL_COMMANDBUTTON)
                  ,OFormNavigationHelper( _rxFactory )
@@ -380,7 +380,7 @@ OButtonControl::OButtonControl(const Reference<XComponentContext>& _rxFactory)
     decrement(m_refCount);
 }
 
-//------------------------------------------------------------------------------
+
 OButtonControl::~OButtonControl()
 {
     if (m_nClickEvent)
@@ -388,7 +388,7 @@ OButtonControl::~OButtonControl()
 }
 
 // UNO binding
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     // if asked for the XTypeProvider, don't let OButtonControl_BASE do this
@@ -405,7 +405,7 @@ Any SAL_CALL OButtonControl::queryAggregation(const Type& _rType) throw (Runtime
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::disposing()
 {
     startOrStopModelPropertyListening( false );
@@ -414,7 +414,7 @@ void SAL_CALL OButtonControl::disposing()
     OFormNavigationHelper::dispose();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( RuntimeException )
 {
     OControl::disposing( _rSource );
@@ -422,7 +422,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru
 }
 
 // ActionListener
-//------------------------------------------------------------------------------
+
 void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException)
 {
     // Asynchronous for starutil::URL-Button
@@ -433,7 +433,7 @@ void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::co
     }
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(OButtonControl, OnClick)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -488,7 +488,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::com::sun::star::awt::MouseEvent& _rEvt )
 {
     {
@@ -513,7 +513,7 @@ void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::co
 }
 
 // XButton
-//------------------------------------------------------------------------------
+
 void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException )
 {
     Reference<XButton>  xButton;
@@ -522,7 +522,7 @@ void OButtonControl::setLabel(const OUString& Label) throw( RuntimeException )
         xButton->setLabel(Label);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw( RuntimeException )
 {
     {
@@ -536,19 +536,19 @@ void SAL_CALL OButtonControl::setActionCommand(const OUString& _rCommand) throw(
         xButton->setActionCommand(_rCommand);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::addActionListener(const Reference<XActionListener>& _rxListener) throw( RuntimeException )
 {
     m_aActionListeners.addInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::removeActionListener(const Reference<XActionListener>& _rxListener) throw( RuntimeException )
 {
     m_aActionListeners.removeInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
+
 class DoPropertyListening
 {
 private:
@@ -590,7 +590,7 @@ void DoPropertyListening::handleListening( const OUString& _rPropertyName )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonControl::startOrStopModelPropertyListening( bool _bStart )
 {
     DoPropertyListening aListeningHandler( getModel(), this, _bStart );
@@ -599,7 +599,7 @@ void OButtonControl::startOrStopModelPropertyListening( bool _bStart )
     aListeningHandler.handleListening( PROPERTY_ENABLED );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _rxModel ) throw ( RuntimeException )
 {
     startOrStopModelPropertyListening( false );
@@ -616,7 +616,7 @@ sal_Bool SAL_CALL OButtonControl::setModel( const Reference< XControlModel >& _r
     return bResult;
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonControl::modelFeatureUrlPotentiallyChanged( )
 {
     sal_Int16 nOldUrlFeatureId = m_nTargetUrlFeatureId;
@@ -631,7 +631,7 @@ void OButtonControl::modelFeatureUrlPotentiallyChanged( )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent ) throw ( RuntimeException )
 {
     if  (   _rEvent.PropertyName.equals( PROPERTY_TARGET_URL )
@@ -646,7 +646,7 @@ void SAL_CALL OButtonControl::propertyChange( const PropertyChangeEvent& _rEvent
     }
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     bool isFormControllerURL( const OUString& _rURL )
@@ -656,7 +656,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 OButtonControl::getModelUrlFeatureId( ) const
 {
     sal_Int16 nFeatureId = -1;
@@ -686,7 +686,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const
     return nFeatureId;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException )
 {
     OClickableImageBaseControl::setDesignMode( _bOn  );
@@ -698,14 +698,14 @@ void SAL_CALL OButtonControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeExcep
         // this will connect if not already connected and just update else
 }
 
-//------------------------------------------------------------------------------
+
 void OButtonControl::getSupportedFeatures( ::std::vector< sal_Int16 >& /* [out] */ _rFeatureIds )
 {
     if ( -1 != m_nTargetUrlFeatureId )
         _rFeatureIds.push_back( m_nTargetUrlFeatureId );
 }
 
-//------------------------------------------------------------------
+
 void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled )
 {
     if ( _nFeatureId == m_nTargetUrlFeatureId )
@@ -724,7 +724,7 @@ void OButtonControl::featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnab
     OFormNavigationHelper::featureStateChanged( _nFeatureId, _bEnabled );
 }
 
-//------------------------------------------------------------------
+
 void OButtonControl::allFeatureStatesChanged( )
 {
     if ( -1 != m_nTargetUrlFeatureId )
@@ -735,7 +735,7 @@ void OButtonControl::allFeatureStatesChanged( )
     OFormNavigationHelper::allFeatureStatesChanged( );
 }
 
-//------------------------------------------------------------------
+
 bool OButtonControl::isEnabled( sal_Int16 _nFeatureId ) const
 {
     if ( const_cast< OButtonControl* >( this )->isDesignMode() )
@@ -745,14 +745,14 @@ bool OButtonControl::isEnabled( sal_Int16 _nFeatureId ) const
     return OFormNavigationHelper::isEnabled( _nFeatureId );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
 {
     OClickableImageBaseControl::registerDispatchProviderInterceptor( _rxInterceptor );
     OFormNavigationHelper::registerDispatchProviderInterceptor( _rxInterceptor );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OButtonControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
 {
     OClickableImageBaseControl::releaseDispatchProviderInterceptor( _rxInterceptor );
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index a6316d963c06..1a01ab8515d9 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -45,19 +45,19 @@ using namespace ::com::sun::star::form::binding;
 //= OCheckBoxControl
 //==================================================================
 
-//------------------------------------------------------------------
+
 OCheckBoxControl::OCheckBoxControl(const Reference<XComponentContext>& _rxFactory)
     :OBoundControl(_rxFactory, VCL_CONTROL_CHECKBOX)
 {
 }
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new OCheckBoxControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OCheckBoxControl::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -78,8 +78,8 @@ InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const Reference<XMultiServic
     return *(new OCheckBoxModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OCheckBoxModel::OCheckBoxModel(const Reference<XComponentContext>& _rxFactory)
     :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_CHECKBOX, FRM_SUN_CONTROL_CHECKBOX, sal_True )
                     // use the old control name for compytibility reasons
@@ -89,22 +89,22 @@ OCheckBoxModel::OCheckBoxModel(const Reference<XComponentContext>& _rxFactory)
     initValueProperty( PROPERTY_STATE, PROPERTY_ID_STATE );
 }
 
-//------------------------------------------------------------------
+
 OCheckBoxModel::OCheckBoxModel( const OCheckBoxModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OReferenceValueComponent( _pOriginal, _rxFactory )
 {
 }
 
-//------------------------------------------------------------------------------
+
 OCheckBoxModel::~OCheckBoxModel()
 {
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OCheckBoxModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames();
@@ -127,7 +127,7 @@ StringSequence SAL_CALL OCheckBoxModel::getSupportedServiceNames() throw(::com::
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
@@ -135,13 +135,13 @@ void OCheckBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OCheckBoxModel::getServiceName() throw(RuntimeException)
 {
     return OUString(FRM_COMPONENT_CHECKBOX);  // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OCheckBoxModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream)
     throw(stario::IOException, RuntimeException)
 {
@@ -157,7 +157,7 @@ void SAL_CALL OCheckBoxModel::write(const Reference<stario::XObjectOutputStream>
     writeCommonProperties(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OCheckBoxModel::read(const Reference<stario::XObjectInputStream>& _rxInStream) throw(stario::IOException, RuntimeException)
 {
     OReferenceValueComponent::read(_rxInStream);
@@ -206,7 +206,7 @@ bool OCheckBoxModel::DbUseBool()
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 Any OCheckBoxModel::translateDbColumnToControlValue()
 {
     Any aValue;
@@ -247,7 +247,7 @@ Any OCheckBoxModel::translateDbColumnToControlValue()
     return aValue;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool OCheckBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     OSL_PRECOND( m_xColumnUpdate.is(), "OCheckBoxModel::commitControlValueToDbColumn: not bound!" );
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index c4cceb958332..5f5994520cab 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -63,7 +63,7 @@ const sal_uInt16 ALIGN              = 0x0002;
 const sal_uInt16 OLD_HIDDEN         = 0x0004;
 const sal_uInt16 COMPATIBLE_HIDDEN  = 0x0008;
 
-//------------------------------------------------------------------------------
+
 const StringSequence& getColumnTypes()
 {
     static StringSequence aColumnTypes(10);
@@ -84,7 +84,7 @@ const StringSequence& getColumnTypes()
     return aColumnTypes;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
 {
     const OUString aModelPrefix ("com.sun.star.form.component.");
@@ -124,7 +124,7 @@ const Sequence<sal_Int8>& OGridColumn::getUnoTunnelImplementationId()
     return theOGridColumnImplementationId::get().getSeq();
 }
 
-//------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdentifier) throw(RuntimeException)
 {
     sal_Int64 nReturn(0);
@@ -144,13 +144,13 @@ sal_Int64 SAL_CALL OGridColumn::getSomething( const Sequence<sal_Int8>& _rIdenti
     return nReturn;
 }
 
-//------------------------------------------------------------------
+
 Sequence<sal_Int8> SAL_CALL OGridColumn::getImplementationId() throw(RuntimeException)
 {
     return OImplementationIds::getImplementationId(getTypes());
 }
 
-//------------------------------------------------------------------
+
 Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException)
 {
     TypeBag aTypes( OGridColumn_BASE::getTypes() );
@@ -174,7 +174,7 @@ Sequence<Type> SAL_CALL OGridColumn::getTypes() throw(RuntimeException)
     return aTypes.getTypes();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeException)
 {
     Any aReturn;
@@ -198,7 +198,7 @@ Any SAL_CALL OGridColumn::queryAggregation( const Type& _rType ) throw (RuntimeE
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const OUString& _sModelName )
     :OGridColumn_BASE(m_aMutex)
     ,OPropertySetAggregationHelper(OGridColumn_BASE::rBHelper)
@@ -226,7 +226,7 @@ OGridColumn::OGridColumn( const Reference<XComponentContext>& _rContext, const O
     }
 }
 
-//------------------------------------------------------------------------------
+
 OGridColumn::OGridColumn( const OGridColumn* _pOriginal )
     :OGridColumn_BASE( m_aMutex )
     ,OPropertySetAggregationHelper( OGridColumn_BASE::rBHelper )
@@ -253,7 +253,7 @@ OGridColumn::OGridColumn( const OGridColumn* _pOriginal )
     decrement( m_refCount );
 }
 
-//------------------------------------------------------------------------------
+
 OGridColumn::~OGridColumn()
 {
     if (!OGridColumn_BASE::rBHelper.bDisposed)
@@ -272,7 +272,7 @@ OGridColumn::~OGridColumn()
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) throw(RuntimeException)
 {
     OPropertySetAggregationHelper::disposing(_rSource);
@@ -283,7 +283,7 @@ void SAL_CALL OGridColumn::disposing(const EventObject& _rSource) throw(RuntimeE
 }
 
 // OGridColumn_BASE
-//-----------------------------------------------------------------------------
+
 void OGridColumn::disposing()
 {
     OGridColumn_BASE::disposing();
@@ -294,7 +294,7 @@ void OGridColumn::disposing()
         xComp->dispose();
 }
 
-//------------------------------------------------------------------------------
+
 void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_Bool bAllowDropDown )
 {
     // some properties are not to be exposed to the outer world
@@ -354,7 +354,7 @@ void OGridColumn::clearAggregateProperties( Sequence< Property >& _rProps, sal_B
     _rProps = aNewProps;
 }
 
-//------------------------------------------------------------------------------
+
 void OGridColumn::setOwnProperties(Sequence<Property>& aDescriptor)
 {
     aDescriptor.realloc(5);
@@ -367,7 +367,7 @@ void OGridColumn::setOwnProperties(Sequence<Property>& aDescriptor)
 }
 
 // Reference<XPropertySet>
-//------------------------------------------------------------------------------
+
 void OGridColumn::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const
 {
     switch (nHandle)
@@ -392,7 +392,7 @@ void OGridColumn::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                             sal_Int32 nHandle, const Any& rValue )throw( IllegalArgumentException )
 {
@@ -423,7 +423,7 @@ sal_Bool OGridColumn::convertFastPropertyValue( Any& rConvertedValue, Any& rOldV
     return bModified;
 }
 
-//------------------------------------------------------------------------------
+
 void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (::com::sun::star::uno::Exception)
 {
     switch (nHandle)
@@ -446,7 +446,7 @@ void OGridColumn::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any
 
 
 // XPropertyState
-//------------------------------------------------------------------------------
+
 Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 {
     switch (nHandle)
@@ -462,7 +462,7 @@ Any OGridColumn::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 Reference< XCloneable > SAL_CALL OGridColumn::createClone(  ) throw (RuntimeException)
 {
     OGridColumn* pNewColumn = createCloneColumn();
@@ -470,7 +470,7 @@ Reference< XCloneable > SAL_CALL OGridColumn::createClone(  ) throw (RuntimeExce
 }
 
 // XPersistObject
-//------------------------------------------------------------------------------
+
 void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     // 1. Write the UnoControl
@@ -518,7 +518,7 @@ void SAL_CALL OGridColumn::write(const Reference<XObjectOutputStream>& _rxOutStr
         _rxOutStream->writeBoolean(getBOOL(m_aHidden));
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream)
 {
     // 1. Read the UnoControl
@@ -567,7 +567,7 @@ void SAL_CALL OGridColumn::read(const Reference<XObjectInputStream>& _rxInStream
     }
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_COLUMN(TextFieldColumn,        FRM_SUN_COMPONENT_TEXTFIELD,        sal_False);
 IMPL_COLUMN(PatternFieldColumn,     FRM_SUN_COMPONENT_PATTERNFIELD,     sal_False);
 IMPL_COLUMN(DateFieldColumn,        FRM_SUN_COMPONENT_DATEFIELD,        sal_True);
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index 285aa146b521..4c35487289ea 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -72,13 +72,13 @@ using namespace ::com::sun::star::form::binding;
 //========================================================================
 // class OComboBoxModel
 //========================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OComboBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return (*new OComboBoxModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OComboBoxModel::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -89,7 +89,7 @@ Sequence<Type> OComboBoxModel::_getTypes()
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -112,7 +112,7 @@ StringSequence SAL_CALL OComboBoxModel::getSupportedServiceNames() throw(Runtime
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OBoundControlModel::queryAggregation( _rType );
@@ -123,8 +123,8 @@ Any SAL_CALL OComboBoxModel::queryAggregation(const Type& _rType) throw (Runtime
     return aReturn;
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OComboBoxModel::OComboBoxModel(const Reference<XComponentContext>& _rxFactory)
     :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_COMBOBOX, FRM_SUN_CONTROL_COMBOBOX, sal_True, sal_True, sal_True )
                     // use the old control name for compytibility reasons
@@ -138,7 +138,7 @@ OComboBoxModel::OComboBoxModel(const Reference<XComponentContext>& _rxFactory)
     initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
 }
 
-//------------------------------------------------------------------
+
 OComboBoxModel::OComboBoxModel( const OComboBoxModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OBoundControlModel( _pOriginal, _rxFactory )
     ,OEntryListHelper( *_pOriginal, (OControlModel&)*this )
@@ -151,7 +151,7 @@ OComboBoxModel::OComboBoxModel( const OComboBoxModel* _pOriginal, const Referenc
 {
 }
 
-//------------------------------------------------------------------
+
 OComboBoxModel::~OComboBoxModel()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -163,10 +163,10 @@ OComboBoxModel::~OComboBoxModel()
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OComboBoxModel )
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::disposing()
 {
     OBoundControlModel::disposing();
@@ -175,7 +175,7 @@ void OComboBoxModel::disposing()
     m_xFormatter = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 {
     switch (_nHandle)
@@ -205,7 +205,7 @@ void OComboBoxModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) cons
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
                         throw (Exception)
 {
@@ -260,7 +260,7 @@ void OComboBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OComboBoxModel::convertFastPropertyValue(
                         Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
                         throw (IllegalArgumentException)
@@ -295,7 +295,7 @@ sal_Bool OComboBoxModel::convertFastPropertyValue(
     return bModified;
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 6, OBoundControlModel )
@@ -308,7 +308,7 @@ void OComboBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) co
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
 {
     OBoundControlModel::describeAggregateProperties( _rAggregateProps );
@@ -317,13 +317,13 @@ void OComboBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
     RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST );
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OComboBoxModel::getServiceName() throw(RuntimeException)
 {
     return OUString(FRM_COMPONENT_COMBOBOX);  // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream)
         throw(stario::IOException, RuntimeException)
 {
@@ -361,7 +361,7 @@ void SAL_CALL OComboBoxModel::write(const Reference<stario::XObjectOutputStream>
     writeCommonProperties(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>& _rxInStream) throw(stario::IOException, RuntimeException)
 {
     OBoundControlModel::read(_rxInStream);
@@ -460,7 +460,7 @@ void SAL_CALL OComboBoxModel::read(const Reference<stario::XObjectInputStream>&
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::loadData( bool _bForce )
 {
     DBG_ASSERT(m_eListSourceType != ListSourceType_VALUELIST, "OComboBoxModel::loadData : do not call for a value list !");
@@ -675,7 +675,7 @@ void OComboBoxModel::loadData( bool _bForce )
     setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( aStringSeq ) );
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     Reference<XPropertySet> xField = getField();
@@ -688,7 +688,7 @@ void OComboBoxModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm
         loadData( false );
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::onDisconnectedDbColumn()
 {
     m_pValueFormatter.reset();
@@ -700,7 +700,7 @@ void OComboBoxModel::onDisconnectedDbColumn()
     m_aListRowSet.dispose();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(RuntimeException)
 {
     OBoundControlModel::reloaded(aEvent);
@@ -710,14 +710,14 @@ void SAL_CALL OComboBoxModel::reloaded( const EventObject& aEvent ) throw(Runtim
         loadData( false );
 }
 
-//------------------------------------------------------------------------------
+
 void OComboBoxModel::resetNoBroadcast()
 {
     OBoundControlModel::resetNoBroadcast();
     m_aLastKnownValue.clear();
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
 {
     Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -791,7 +791,7 @@ sal_Bool OComboBoxModel::commitControlValueToDbColumn( bool _bPostReset )
 }
 
 // XPropertiesChangeListener
-//------------------------------------------------------------------------------
+
 Any OComboBoxModel::translateDbColumnToControlValue()
 {
     OSL_PRECOND( m_pValueFormatter.get(), "OComboBoxModel::translateDbColumnToControlValue: no value formatter!" );
@@ -818,32 +818,32 @@ Any OComboBoxModel::translateDbColumnToControlValue()
         // (m_aLastKnownValue is alllowed to be VOID, the control value isn't)
 }
 
-//------------------------------------------------------------------------------
+
 Any OComboBoxModel::getDefaultForReset() const
 {
     return makeAny( m_aDefaultText );
 }
 
-//--------------------------------------------------------------------
+
 void OComboBoxModel::stringItemListChanged( ControlModelLock& /*_rInstanceLock*/ )
 {
     if ( m_xAggregateSet.is() )
         m_xAggregateSet->setPropertyValue( PROPERTY_STRINGITEMLIST, makeAny( getStringItemList() ) );
 }
 
-//--------------------------------------------------------------------
+
 void OComboBoxModel::connectedExternalListSource( )
 {
     // TODO?
 }
 
-//--------------------------------------------------------------------
+
 void OComboBoxModel::disconnectedExternalListSource( )
 {
     // TODO?
 }
 
-//--------------------------------------------------------------------
+
 void OComboBoxModel::refreshInternalEntryList()
 {
     DBG_ASSERT( !hasExternalListSource(), "OComboBoxModel::refreshInternalEntryList: invalid call!" );
@@ -857,7 +857,7 @@ void OComboBoxModel::refreshInternalEntryList()
     }
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException )
 {
     if ( !OEntryListHelper::handleDisposing( _rSource ) )
@@ -868,19 +868,19 @@ void SAL_CALL OComboBoxModel::disposing( const EventObject& _rSource ) throw ( R
 //= OComboBoxControl
 //========================================================================
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OComboBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new OComboBoxControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 OComboBoxControl::OComboBoxControl(const Reference<XComponentContext>& _rxContext)
     :OBoundControl(_rxContext, VCL_CONTROL_COMBOBOX)
 {
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OComboBoxControl::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index e9d0e54ca62e..4a88cfb24b89 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -43,25 +43,25 @@ using namespace ::com::sun::star::util;
 //==================================================================
 // OCurrencyControl
 //==================================================================
-//------------------------------------------------------------------
+
 OCurrencyControl::OCurrencyControl(const Reference<XComponentContext>& _rxFactory)
     :OBoundControl(_rxFactory, VCL_CONTROL_CURRENCYFIELD)
 {
 }
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OCurrencyControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OCurrencyControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OCurrencyControl::_getTypes()
 {
     return OBoundControl::_getTypes();
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -75,19 +75,19 @@ StringSequence SAL_CALL OCurrencyControl::getSupportedServiceNames() throw()
 //==================================================================
 // OCurrencyModel
 //==================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OCurrencyModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OCurrencyModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OCurrencyModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
 }
 
-//------------------------------------------------------------------
+
 void OCurrencyModel::implConstruct()
 {
     if (m_xAggregateSet.is())
@@ -132,8 +132,8 @@ void OCurrencyModel::implConstruct()
     }
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OCurrencyModel::OCurrencyModel(const Reference<XComponentContext>& _rxFactory)
     :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_CURRENCYFIELD, FRM_SUN_CONTROL_CURRENCYFIELD, sal_False, sal_True )
                                     // use the old control name for compytibility reasons
@@ -145,24 +145,24 @@ OCurrencyModel::OCurrencyModel(const Reference<XComponentContext>& _rxFactory)
     implConstruct();
 }
 
-//------------------------------------------------------------------
+
 OCurrencyModel::OCurrencyModel( const OCurrencyModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OEditBaseModel( _pOriginal, _rxFactory )
 {
     implConstruct();
 }
 
-//------------------------------------------------------------------
+
 OCurrencyModel::~OCurrencyModel()
 {
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OCurrencyModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -180,7 +180,7 @@ StringSequence SAL_CALL OCurrencyModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
@@ -192,13 +192,13 @@ void OCurrencyModel::describeFixedProperties( Sequence< Property >& _rProps ) co
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OCurrencyModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_CURRENCYFIELD); // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OCurrencyModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aControlValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -222,7 +222,7 @@ sal_Bool OCurrencyModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 Any OCurrencyModel::translateDbColumnToControlValue()
 {
     m_aSaveValue <<= m_xColumn->getDouble();
@@ -232,7 +232,7 @@ Any OCurrencyModel::translateDbColumnToControlValue()
 }
 
 // XReset
-//------------------------------------------------------------------------------
+
 Any OCurrencyModel::getDefaultForReset() const
 {
     Any aValue;
@@ -242,7 +242,7 @@ Any OCurrencyModel::getDefaultForReset() const
     return aValue;
 }
 
-//------------------------------------------------------------------------------
+
 void OCurrencyModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index a8f812cc9b39..223adc8bc321 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -118,7 +118,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::data;
 using namespace ::com::sun::star::util;
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ODatabaseForm()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::ODatabaseForm > aAutoRegistration;
@@ -169,7 +169,7 @@ private:
 //= submitting and resetting html-forms asynchronously
 //==================================================================
 
-//------------------------------------------------------------------
+
 class OFormSubmitResetThread: public OComponentEventThread
 {
 protected:
@@ -189,14 +189,14 @@ public:
     OFormSubmitResetThread(ODatabaseForm* pControl) : OComponentEventThread(pControl) { }
 };
 
-//------------------------------------------------------------------
+
 EventObject* OFormSubmitResetThread::cloneEvent(
         const EventObject *pEvt ) const
 {
     return new ::com::sun::star::awt::MouseEvent( *(::com::sun::star::awt::MouseEvent *)pEvt );
 }
 
-//------------------------------------------------------------------
+
 void OFormSubmitResetThread::processEvent(
         ::cppu::OComponentHelper* pCompImpl,
         const EventObject *_pEvt,
@@ -213,19 +213,19 @@ void OFormSubmitResetThread::processEvent(
 //= ODatabaseForm
 //==================================================================
 
-//------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL ODatabaseForm::Create( const Reference< XMultiServiceFactory >& _rxFactory )
 {
     return *( new ODatabaseForm( comphelper::getComponentContext(_rxFactory) ) );
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<sal_Int8> SAL_CALL ODatabaseForm::getImplementationId() throw(RuntimeException)
 {
     return OImplementationIds::getImplementationId(getTypes());
 }
 
-//------------------------------------------------------------------
+
 Sequence<Type> SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException)
 {
     // ask the aggregate
@@ -241,7 +241,7 @@ Sequence<Type> SAL_CALL ODatabaseForm::getTypes() throw(RuntimeException)
     return concatSequences( aRet, OPropertySetAggregationHelper::getTypes() );
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeException)
 {
     Any aReturn = ODatabaseForm_BASE1::queryInterface(_rType);
@@ -276,7 +276,7 @@ Any SAL_CALL ODatabaseForm::queryAggregation(const Type& _rType) throw(RuntimeEx
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 ODatabaseForm::ODatabaseForm(const Reference<XComponentContext>& _rxContext)
     :OFormComponents(_rxContext)
     ,OPropertySetAggregationHelper(OComponentHelper::rBHelper)
@@ -311,7 +311,7 @@ ODatabaseForm::ODatabaseForm(const Reference<XComponentContext>& _rxContext)
     impl_construct();
 }
 
-//------------------------------------------------------------------
+
 ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
     :OFormComponents( _cloneSource )
     ,OPropertySetAggregationHelper( OComponentHelper::rBHelper )
@@ -409,7 +409,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm& _cloneSource )
     osl_atomic_decrement( &m_refCount );
 }
 
-//------------------------------------------------------------------
+
 void ODatabaseForm::impl_construct()
 {
     // aggregate a row set
@@ -451,7 +451,7 @@ void ODatabaseForm::impl_construct()
     m_pGroupManager->acquire();
 }
 
-//------------------------------------------------------------------
+
 ODatabaseForm::~ODatabaseForm()
 {
 
@@ -473,12 +473,12 @@ ODatabaseForm::~ODatabaseForm()
 
 //==============================================================================
 // html tools
-//------------------------------------------------------------------------
+
 OUString ODatabaseForm::GetDataURLEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
 {
     return GetDataEncoded(true,SubmitButton,MouseEvt);
 }
-// -----------------------------------------------------------------------------
+
 OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
 {
     // Fill List of successful Controls
@@ -531,13 +531,13 @@ OUString ODatabaseForm::GetDataEncoded(bool _bURLEncoded,const Reference<XContro
 
 //==============================================================================
 // html tools
-//------------------------------------------------------------------------
+
 OUString ODatabaseForm::GetDataTextEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
 {
     return GetDataEncoded(false,SubmitButton,MouseEvt);
 }
 
-//------------------------------------------------------------------------
+
 Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XControl>& SubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt, OUString& rContentType)
 {
 
@@ -589,7 +589,7 @@ Sequence<sal_Int8> ODatabaseForm::GetDataMultiPartEncoded(const Reference<XContr
     return Sequence<sal_Int8>((sal_Int8*)pData, nLen);
 }
 
-//------------------------------------------------------------------------
+
 namespace
 {
     static void appendDigits( sal_Int32 _nNumber, sal_Int8 nDigits, OUStringBuffer& _rOut )
@@ -601,7 +601,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Reference<XPropertySet>& xComponentSet, const OUString& rNamePrefix,
                      const Reference<XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt)
 {
@@ -930,7 +930,7 @@ void ODatabaseForm::AppendComponent(HtmlSuccessfulObjList& rList, const Referenc
     }
 }
 
-//------------------------------------------------------------------------
+
 void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList,
     const Reference<XControl>& rxSubmitButton, const ::com::sun::star::awt::MouseEvent& MouseEvt )
 {
@@ -950,7 +950,7 @@ void ODatabaseForm::FillSuccessfulList( HtmlSuccessfulObjList& rList,
     }
 }
 
-//------------------------------------------------------------------------
+
 void ODatabaseForm::Encode( OUString& rString ) const
 {
     OUStringBuffer aResult;
@@ -1005,7 +1005,7 @@ void ODatabaseForm::Encode( OUString& rString ) const
     rString = aResult.makeStringAndClear().replace(' ', '+');
 }
 
-//------------------------------------------------------------------------
+
 void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rName,
     const OUString& rData )
 {
@@ -1036,7 +1036,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage& rParent, const OUString& rN
     rParent.AttachChild( *pChild );
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString& rName,
     const OUString& rFileName )
 {
@@ -1098,13 +1098,13 @@ sal_Bool ODatabaseForm::InsertFilePart( INetMIMEMessage& rParent, const OUString
 
 //==============================================================================
 // internals
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::onError( const SQLErrorEvent& _rEvent )
 {
     m_aErrorListeners.notifyEach( &XSQLErrorListener::errorOccured, _rEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::onError( const SQLException& _rException, const OUString& _rContextDescription )
 {
     if ( !m_aErrorListeners.getLength() )
@@ -1114,13 +1114,13 @@ void ODatabaseForm::onError( const SQLException& _rException, const OUString& _r
     onError( aEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::updateParameterInfo()
 {
     m_aParameterManager.updateParameterInfo( m_aFilterManager );
 }
 
-//------------------------------------------------------------------------------
+
 bool ODatabaseForm::hasValidParent() const
 {
     // do we have to fill the parameters again?
@@ -1154,7 +1154,7 @@ bool ODatabaseForm::hasValidParent() const
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool ODatabaseForm::fillParameters( ::osl::ResettableMutexGuard& _rClearForNotifies, const Reference< XInteractionHandler >& _rxCompletionHandler )
 {
     // do we have to fill the parameters again?
@@ -1175,14 +1175,14 @@ bool ODatabaseForm::fillParameters( ::osl::ResettableMutexGuard& _rClearForNotif
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::saveInsertOnlyState( )
 {
     OSL_ENSURE( !m_aIgnoreResult.hasValue(), "ODatabaseForm::saveInsertOnlyState: overriding old value!" );
     m_aIgnoreResult = m_xAggregateSet->getPropertyValue( PROPERTY_INSERTONLY );
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::restoreInsertOnlyState( )
 {
     if ( m_aIgnoreResult.hasValue() )
@@ -1192,7 +1192,7 @@ void ODatabaseForm::restoreInsertOnlyState( )
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNotifies, sal_Bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler)
 {
     if (!m_xAggregateAsRowSet.is())
@@ -1293,7 +1293,7 @@ sal_Bool ODatabaseForm::executeRowSet(::osl::ResettableMutexGuard& _rClearForNot
     return bSuccess;
 }
 
-//------------------------------------------------------------------
+
 void ODatabaseForm::disposing()
 {
     if (m_pAggregatePropertyMultiplexer)
@@ -1338,7 +1338,7 @@ void ODatabaseForm::disposing()
     m_aPropertyBagHelper.dispose();
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XConnection > ODatabaseForm::getConnection()
 {
     Reference< XConnection > xConn;
@@ -1346,7 +1346,7 @@ Reference< XConnection > ODatabaseForm::getConnection()
     return xConn;
 }
 
-//------------------------------------------------------------------------------
+
 ::osl::Mutex& ODatabaseForm::getMutex()
 {
     return m_aMutex;
@@ -1354,7 +1354,7 @@ Reference< XConnection > ODatabaseForm::getConnection()
 
 //==============================================================================
 // property handling
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::describeFixedAndAggregateProperties(
         Sequence< Property >& _rProps,
         Sequence< Property >& _rAggregateProps ) const
@@ -1404,61 +1404,61 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XMultiPropertySet > ODatabaseForm::getPropertiesInterface()
 {
     return Reference< XMultiPropertySet >( *this, UNO_QUERY );
 }
 
-//------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& ODatabaseForm::getInfoHelper()
 {
     return m_aPropertyBagHelper.getInfoHelper();
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XPropertySetInfo > ODatabaseForm::getPropertySetInfo() throw( RuntimeException )
 {
     return createPropertySetInfo( getInfoHelper() );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
 {
     m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
 {
     m_aPropertyBagHelper.removeProperty( _rName );
 }
 
-//--------------------------------------------------------------------
+
 Sequence< PropertyValue > SAL_CALL ODatabaseForm::getPropertyValues() throw (RuntimeException)
 {
     return m_aPropertyBagHelper.getPropertyValues();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     m_aPropertyBagHelper.setPropertyValues( _rProps );
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseForm::getWarnings(  ) throw (SQLException, RuntimeException)
 {
     return m_aWarnings.getWarnings();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::clearWarnings(  ) throw (SQLException, RuntimeException)
 {
     m_aWarnings.clearWarnings();
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XCloneable > SAL_CALL ODatabaseForm::createClone(  ) throw (RuntimeException)
 {
     ODatabaseForm* pClone = new ODatabaseForm( *this );
@@ -1468,7 +1468,7 @@ Reference< XCloneable > SAL_CALL ODatabaseForm::createClone(  ) throw (RuntimeEx
     return pClone;
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any* pOldValues, sal_Int32 nCount, sal_Bool bVetoable )
 {
     // same as in getFastPropertyValue(sal_Int32) : if we're resetting currently don't fire any changes of the
@@ -1506,7 +1506,7 @@ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any
     OPropertySetAggregationHelper::fire(pnHandles, pNewValues, pOldValues, nCount, bVetoable);
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle )
        throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1517,7 +1517,7 @@ Any SAL_CALL ODatabaseForm::getFastPropertyValue( sal_Int32 nHandle )
         return OPropertySetAggregationHelper::getFastPropertyValue(nHandle);
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
     switch (nHandle)
@@ -1598,7 +1598,7 @@ void ODatabaseForm::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                                 sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException )
 {
@@ -1682,7 +1682,7 @@ sal_Bool ODatabaseForm::convertFastPropertyValue( Any& rConvertedValue, Any& rOl
     return bModified;
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception )
 {
     switch (nHandle)
@@ -1800,7 +1800,7 @@ void ODatabaseForm::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const A
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle )
 {
     OSL_ENSURE( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION, "ODatabaseForm::forwardingPropertyValue: unexpected property!" );
@@ -1812,7 +1812,7 @@ void SAL_CALL ODatabaseForm::forwardingPropertyValue( sal_Int32 _nHandle )
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle, bool /*_bSuccess*/ )
 {
     OSL_ENSURE( _nHandle == PROPERTY_ID_ACTIVE_CONNECTION, "ODatabaseForm::forwardedPropertyValue: unexpected property!" );
@@ -1824,7 +1824,7 @@ void SAL_CALL ODatabaseForm::forwardedPropertyValue( sal_Int32 _nHandle, bool /*
 
 //==============================================================================
 // com::sun::star::beans::XPropertyState
-//------------------------------------------------------------------
+
 PropertyState ODatabaseForm::getPropertyStateByHandle(sal_Int32 nHandle)
 {
     PropertyState eState;
@@ -1874,7 +1874,7 @@ PropertyState ODatabaseForm::getPropertyStateByHandle(sal_Int32 nHandle)
     return eState;
 }
 
-//------------------------------------------------------------------
+
 void ODatabaseForm::setPropertyToDefaultByHandle(sal_Int32 nHandle)
 {
     switch (nHandle)
@@ -1896,7 +1896,7 @@ void ODatabaseForm::setPropertyToDefaultByHandle(sal_Int32 nHandle)
     }
 }
 
-//------------------------------------------------------------------
+
 Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 {
     Any aReturn;
@@ -1937,7 +1937,7 @@ Any ODatabaseForm::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 
 //==============================================================================
 // com::sun::star::form::XReset
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::reset() throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -1976,7 +1976,7 @@ void SAL_CALL ODatabaseForm::reset() throw( RuntimeException )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void ODatabaseForm::reset_impl(bool _bAproveByListeners)
 {
     if ( _bAproveByListeners )
@@ -2097,13 +2097,13 @@ void ODatabaseForm::reset_impl(bool _bAproveByListeners)
     --m_nResetsPending;
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addResetListener(const Reference<XResetListener>& _rListener) throw( RuntimeException )
 {
     m_aResetListeners.addTypedListener( _rListener );
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>& _rListener) throw( RuntimeException )
 {
     m_aResetListeners.removeTypedListener( _rListener );
@@ -2111,7 +2111,7 @@ void SAL_CALL ODatabaseForm::removeResetListener(const Reference<XResetListener>
 
 //==============================================================================
 // com::sun::star::form::XSubmit
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control,
                               const ::com::sun::star::awt::MouseEvent& MouseEvt ) throw( RuntimeException )
 {
@@ -2142,7 +2142,7 @@ void SAL_CALL ODatabaseForm::submit( const Reference<XControl>& Control,
         submit_impl( Control, MouseEvt, true );
     }
 }
-// -----------------------------------------------------------------------------
+
 void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransformer>& xTransformer,const OUString& aURLStr,const OUString& aReferer,const OUString& aTargetName
                   ,const OUString& aData,rtl_TextEncoding _eEncoding)
 {
@@ -2172,7 +2172,7 @@ void lcl_dispatch(const Reference< XFrame >& xFrame,const Reference<XURLTransfor
         xDisp->dispatch(aURL, aArgs);
     } // if (xDisp.is())
 }
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com::sun::star::awt::MouseEvent& MouseEvt, bool _bAproveByListeners)
 {
 
@@ -2315,13 +2315,13 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com:
 }
 
 // XSubmit
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addSubmitListener(const Reference<XSubmitListener>& _rListener) throw( RuntimeException )
 {
     m_aSubmitListeners.addInterface(_rListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListener>& _rListener) throw( RuntimeException )
 {
     m_aSubmitListeners.removeInterface(_rListener);
@@ -2329,19 +2329,19 @@ void SAL_CALL ODatabaseForm::removeSubmitListener(const Reference<XSubmitListene
 
 //==============================================================================
 // com::sun::star::sdbc::XSQLErrorBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException )
 {
     m_aErrorListeners.addInterface(_rListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeSQLErrorListener(const Reference<XSQLErrorListener>& _rListener) throw( RuntimeException )
 {
     m_aErrorListeners.removeInterface(_rListener);
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::invlidateParameters()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2350,7 +2350,7 @@ void ODatabaseForm::invlidateParameters()
 
 //==============================================================================
 // OChangeListener
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( RuntimeException )
 {
     if (evt.PropertyName == PROPERTY_ACTIVE_CONNECTION && !m_bForwardingConnection)
@@ -2369,7 +2369,7 @@ void ODatabaseForm::_propertyChanged(const PropertyChangeEvent& evt) throw( Runt
 
 //==============================================================================
 // smartXChild
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException)
 {
     // SYNCHRONIZED ----->
@@ -2430,7 +2430,7 @@ void SAL_CALL ODatabaseForm::setParent(const InterfaceRef& Parent) throw ( ::com
 
 //==============================================================================
 // smartXTabControllerModel
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::RuntimeException)
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -2449,7 +2449,7 @@ sal_Bool SAL_CALL ODatabaseForm::getGroupControl() throw(com::sun::star::uno::Ru
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlModel> >& rControls) throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -2486,14 +2486,14 @@ void SAL_CALL ODatabaseForm::setControlModels(const Sequence<Reference<XControlM
     }
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Reference<XControlModel> > SAL_CALL ODatabaseForm::getControlModels() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pGroupManager->getControlModels();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >& _rGroup, const OUString& Name ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2522,14 +2522,14 @@ void SAL_CALL ODatabaseForm::setGroup( const Sequence<Reference<XControlModel> >
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseForm::getGroupCount() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_pGroupManager->getGroupCount();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XControlModel> >& _rGroup, OUString& _rName ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2541,7 +2541,7 @@ void SAL_CALL ODatabaseForm::getGroup( sal_Int32 nGroup, Sequence<Reference<XCon
     m_pGroupManager->getGroup( nGroup, _rGroup, _rName  );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Reference<XControlModel>  >& _rGroup) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2551,7 +2551,7 @@ void SAL_CALL ODatabaseForm::getGroupByName(const OUString& Name, Sequence< Refe
 
 //==============================================================================
 // com::sun::star::lang::XEventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( RuntimeException )
 {
     // does the call come from the connection which we are sharing with our parent?
@@ -2581,7 +2581,7 @@ void SAL_CALL ODatabaseForm::disposing(const EventObject& Source) throw( Runtime
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::impl_createLoadTimer()
 {
     OSL_PRECOND( m_pLoadTimer == NULL, "ODatabaseForm::impl_createLoadTimer: timer already exists!" );
@@ -2592,7 +2592,7 @@ void ODatabaseForm::impl_createLoadTimer()
 
 //==============================================================================
 // com::sun::star::form::XLoadListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     {
@@ -2606,7 +2606,7 @@ void SAL_CALL ODatabaseForm::loaded(const EventObject& /*aEvent*/) throw( Runtim
     load_impl( sal_True );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     {
@@ -2624,13 +2624,13 @@ void SAL_CALL ODatabaseForm::unloading(const EventObject& /*aEvent*/) throw( Run
     unload();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     // nothing to do
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     // now stop the rowset listening if we are a subform
@@ -2643,7 +2643,7 @@ void SAL_CALL ODatabaseForm::reloading(const EventObject& /*aEvent*/) throw( Run
         m_pLoadTimer->Stop();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     reload_impl(sal_True);
@@ -2655,7 +2655,7 @@ void SAL_CALL ODatabaseForm::reloaded(const EventObject& /*aEvent*/) throw( Runt
     }
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ODatabaseForm, OnTimeout)
 {
     reload_impl(sal_True);
@@ -2664,13 +2664,13 @@ IMPL_LINK_NOARG(ODatabaseForm, OnTimeout)
 
 //==============================================================================
 // com::sun::star::form::XLoadable
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::load() throw( RuntimeException )
 {
     load_impl(sal_False);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rxParentProps )
 {
     // our own data source
@@ -2725,7 +2725,7 @@ sal_Bool ODatabaseForm::canShareConnection( const Reference< XPropertySet >& _rx
     return bCanShareConnection;
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::doShareConnection( const Reference< XPropertySet >& _rxParentProps )
 {
     // get the conneciton of the parent
@@ -2751,7 +2751,7 @@ void ODatabaseForm::doShareConnection( const Reference< XPropertySet >& _rxParen
         m_bSharingConnection = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::disposingSharedConnection( const Reference< XConnection >& /*_rxConn*/ )
 {
     stopSharingConnection();
@@ -2760,7 +2760,7 @@ void ODatabaseForm::disposingSharedConnection( const Reference< XConnection >& /
     unload( );
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::stopSharingConnection( )
 {
     OSL_ENSURE( m_bSharingConnection, "ODatabaseForm::stopSharingConnection: invalid call!" );
@@ -2791,7 +2791,7 @@ void ODatabaseForm::stopSharingConnection( )
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool ODatabaseForm::implEnsureConnection()
 {
     try
@@ -2852,7 +2852,7 @@ sal_Bool ODatabaseForm::implEnsureConnection()
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -2901,7 +2901,7 @@ void ODatabaseForm::load_impl(sal_Bool bCausedByParentForm, sal_Bool bMoveToFirs
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::unload() throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -2948,13 +2948,13 @@ void SAL_CALL ODatabaseForm::unload() throw( RuntimeException )
     m_aLoadListeners.notifyEach( &XLoadListener::unloaded, aEvt );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::reload() throw( RuntimeException )
 {
     reload_impl(sal_True);
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInteractionHandler >& _rxCompletionHandler ) throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -3009,19 +3009,19 @@ void ODatabaseForm::reload_impl(sal_Bool bMoveToFirst, const Reference< XInterac
         m_bLoaded = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::isLoaded() throw( RuntimeException )
 {
     return m_bLoaded;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addLoadListener(const Reference<XLoadListener>& aListener) throw( RuntimeException )
 {
     m_aLoadListeners.addInterface(aListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeLoadListener(const Reference<XLoadListener>& aListener) throw( RuntimeException )
 {
     m_aLoadListeners.removeInterface(aListener);
@@ -3038,7 +3038,7 @@ void SAL_CALL ODatabaseForm::close() throw( SQLException, RuntimeException )
 
 //==============================================================================
 // com::sun::star::sdbc::XRowSetListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( RuntimeException )
 {
     // reload the subform with the new parameters of the parent
@@ -3056,13 +3056,13 @@ void SAL_CALL ODatabaseForm::cursorMoved(const EventObject& /*event*/) throw( Ru
     m_pLoadTimer->Start();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::rowChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
     // ignore it
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
     // not interested in :
@@ -3072,7 +3072,7 @@ void SAL_CALL ODatabaseForm::rowSetChanged(const EventObject& /*event*/) throw(
     // "load" respectivly "reload" ... can't do anything ....
 }
 
-//------------------------------------------------------------------------------
+
 bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, const bool _bAllowSQLException,
     ::osl::ClearableMutexGuard& _rGuard )
 {
@@ -3112,7 +3112,7 @@ bool ODatabaseForm::impl_approveRowChange_throw( const EventObject& _rEvent, con
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) throw( RuntimeException )
 {
     // is our aggregate calling?
@@ -3161,7 +3161,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveCursorMove(const EventObject& event) thr
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) throw( RuntimeException )
 {
     // is our aggregate calling?
@@ -3201,7 +3201,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowChange(const RowChangeEvent& event) t
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) throw( RuntimeException )
 {
     if (event.Source == InterfaceRef(static_cast<XWeak*>(this)))    // ignore our aggregate as we handle this approve ourself
@@ -3230,7 +3230,7 @@ sal_Bool SAL_CALL ODatabaseForm::approveRowSetChange(const EventObject& event) t
 
 //==============================================================================
 // com::sun::star::sdb::XRowSetApproveBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -3248,7 +3248,7 @@ void SAL_CALL ODatabaseForm::addRowSetApproveListener(const Reference<XRowSetApp
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSetApproveListener>& _rListener) throw( RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -3267,24 +3267,24 @@ void SAL_CALL ODatabaseForm::removeRowSetApproveListener(const Reference<XRowSet
 
 //==============================================================================
 // com::sun:star::form::XDatabaseParameterBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException )
 {
     m_aParameterManager.addParameterListener( _rListener );
 }
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeDatabaseParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException )
 {
     m_aParameterManager.removeParameterListener( _rListener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException )
 {
     ODatabaseForm::addDatabaseParameterListener( _rListener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabaseParameterListener>& _rListener) throw( RuntimeException )
 {
     ODatabaseForm::removeDatabaseParameterListener( _rListener );
@@ -3292,7 +3292,7 @@ void SAL_CALL ODatabaseForm::removeParameterListener(const Reference<XDatabasePa
 
 //==============================================================================
 // com::sun::star::sdb::XCompletedExecution
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard(m_aMutex);
@@ -3316,7 +3316,7 @@ void SAL_CALL ODatabaseForm::executeWithCompletion( const Reference< XInteractio
 
 //==============================================================================
 // com::sun::star::sdbc::XRowSet
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException )
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -3340,14 +3340,14 @@ void SAL_CALL ODatabaseForm::execute() throw( SQLException, RuntimeException )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::addRowSetListener(const Reference<XRowSetListener>& _rListener) throw( RuntimeException )
 {
     if (m_xAggregateAsRowSet.is())
         m_xAggregateAsRowSet->addRowSetListener(_rListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListener>& _rListener) throw( RuntimeException )
 {
     if (m_xAggregateAsRowSet.is())
@@ -3356,109 +3356,109 @@ void SAL_CALL ODatabaseForm::removeRowSetListener(const Reference<XRowSetListene
 
 //==============================================================================
 // com::sun::star::sdbc::XResultSet
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::next() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->next();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::isBeforeFirst() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->isBeforeFirst();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::isAfterLast() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->isAfterLast();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::isFirst() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->isFirst();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::isLast() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->isLast();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::beforeFirst() throw( SQLException, RuntimeException )
 {
     m_xAggregateAsRowSet->beforeFirst();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::afterLast() throw( SQLException, RuntimeException )
 {
     m_xAggregateAsRowSet->afterLast();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::first() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->first();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::last() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->last();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseForm::getRow() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->getRow();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::absolute(sal_Int32 row) throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->absolute(row);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::relative(sal_Int32 rows) throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->relative(rows);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::previous() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->previous();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::refreshRow() throw( SQLException, RuntimeException )
 {
     m_xAggregateAsRowSet->refreshRow();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::rowUpdated() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->rowUpdated();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::rowInserted() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->rowInserted();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseForm::rowDeleted() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->rowDeleted();
 }
 
-//------------------------------------------------------------------------------
+
 InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException, RuntimeException )
 {
     return m_xAggregateAsRowSet->getStatement();
@@ -3466,7 +3466,7 @@ InterfaceRef SAL_CALL ODatabaseForm::getStatement() throw( SQLException, Runtime
 
 // com::sun::star::sdbc::XResultSetUpdate
 // exceptions during insert update and delete will be forwarded to the errorlistener
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException )
 {
     try
@@ -3486,7 +3486,7 @@ void SAL_CALL ODatabaseForm::insertRow() throw( SQLException, RuntimeException )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException )
 {
     try
@@ -3506,7 +3506,7 @@ void SAL_CALL ODatabaseForm::updateRow() throw( SQLException, RuntimeException )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException )
 {
     try
@@ -3526,7 +3526,7 @@ void SAL_CALL ODatabaseForm::deleteRow() throw( SQLException, RuntimeException )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeException )
 {
     try
@@ -3546,7 +3546,7 @@ void SAL_CALL ODatabaseForm::cancelRowUpdates() throw( SQLException, RuntimeExce
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeException )
 {
     Reference<XResultSetUpdate>  xUpdate;
@@ -3581,7 +3581,7 @@ void SAL_CALL ODatabaseForm::moveToInsertRow() throw( SQLException, RuntimeExcep
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeException )
 {
     Reference<XResultSetUpdate>  xUpdate;
@@ -3590,7 +3590,7 @@ void SAL_CALL ODatabaseForm::moveToCurrentRow() throw( SQLException, RuntimeExce
 }
 
 // com::sun::star::sdbcx::XDeleteRows
-//------------------------------------------------------------------------------
+
 Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows) throw( SQLException, RuntimeException )
 {
     try
@@ -3613,145 +3613,145 @@ Sequence<sal_Int32> SAL_CALL ODatabaseForm::deleteRows(const Sequence<Any>& rows
 }
 
 // com::sun::star::sdbc::XParameters
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setNull(sal_Int32 parameterIndex, sal_Int32 sqlType) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setNull(parameterIndex, sqlType);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setBoolean(sal_Int32 parameterIndex, sal_Bool x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setBoolean(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setByte(sal_Int32 parameterIndex, sal_Int8 x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setByte(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setShort(sal_Int32 parameterIndex, sal_Int16 x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setShort(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setInt(sal_Int32 parameterIndex, sal_Int32 x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setInt(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setLong(sal_Int32 parameterIndex, sal_Int64 x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setLong(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setFloat(sal_Int32 parameterIndex, float x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setFloat(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setDouble(sal_Int32 parameterIndex, double x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setDouble(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setString(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setBytes(sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setBytes(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setDate(sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setDate(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setTime(sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setTime(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setTimestamp(sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setTimestamp(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setBinaryStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setBinaryStream(parameterIndex, x, length);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setCharacterStream(sal_Int32 parameterIndex, const Reference<XInputStream>& x, sal_Int32 length) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setCharacterStream(parameterIndex, x, length);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setObjectWithInfo(sal_Int32 parameterIndex, const Any& x, sal_Int32 targetSqlType, sal_Int32 scale) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setObjectWithInfo(parameterIndex, x, targetSqlType, scale);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setObject(sal_Int32 parameterIndex, const Any& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setObject(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setRef(sal_Int32 parameterIndex, const Reference<XRef>& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setRef(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setBlob(sal_Int32 parameterIndex, const Reference<XBlob>& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setBlob(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setClob(sal_Int32 parameterIndex, const Reference<XClob>& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setClob(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setArray(sal_Int32 parameterIndex, const Reference<XArray>& x) throw( SQLException, RuntimeException )
 {
     m_aParameterManager.setArray(parameterIndex, x);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::clearParameters() throw( SQLException, RuntimeException )
 {
     m_aParameterManager.clearParameters();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException)
 {
     if ( evt.Source == m_xParent )
@@ -3769,13 +3769,13 @@ void SAL_CALL ODatabaseForm::propertyChange( const PropertyChangeEvent& evt ) th
 }
 
 // com::sun::star::lang::XServiceInfo
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseForm::getImplementationName_Static()
 {
     return OUString( "com.sun.star.comp.forms.ODatabaseForm" );
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static()
 {
     Sequence< OUString > aServices( 1 );
@@ -3786,7 +3786,7 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getCompatibleServiceNames_Static()
     return aServices;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static()
 {
     Sequence< OUString > aServices( 5 );
@@ -3801,7 +3801,7 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getCurrentServiceNames_Static()
     return aServices;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static()
 {
     return ::comphelper::concatSequences(
@@ -3810,13 +3810,13 @@ Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames_Static()
     );
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseForm::getImplementationName() throw( RuntimeException )
 {
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL ODatabaseForm::getSupportedServiceNames() throw( RuntimeException )
 {
     // the services of our aggregate
@@ -3964,7 +3964,7 @@ void SAL_CALL ODatabaseForm::write(const Reference<XObjectOutputStream>& _rxOutS
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStream) throw( IOException, RuntimeException )
 {
     DBG_ASSERT(m_xAggregateSet.is(), "ODatabaseForm::read : only to be called if the aggregate exists !");
@@ -4061,7 +4061,7 @@ void SAL_CALL ODatabaseForm::read(const Reference<XObjectInputStream>& _rxInStre
         m_xAggregateSet->setPropertyValue(PROPERTY_APPLYFILTER, makeAny((sal_Bool)((nAnyMask & DONTAPPLYFILTER) == 0)));
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::implInserted( const ElementDescription* _pElement )
 {
     OFormComponents::implInserted( _pElement );
@@ -4075,7 +4075,7 @@ void ODatabaseForm::implInserted( const ElementDescription* _pElement )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject)
 {
     OFormComponents::implRemoved( _rxObject );
@@ -4088,7 +4088,7 @@ void ODatabaseForm::implRemoved(const InterfaceRef& _rxObject)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( RuntimeException )
 {
     // give it to my own error listener
@@ -4098,7 +4098,7 @@ void SAL_CALL ODatabaseForm::errorOccured(const SQLErrorEvent& _rEvent) throw( R
 }
 
 // com::sun::star::container::XNamed
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException )
 {
     OUString sReturn;
@@ -4106,7 +4106,7 @@ OUString SAL_CALL ODatabaseForm::getName() throw( RuntimeException )
     return sReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODatabaseForm::setName(const OUString& aName) throw( RuntimeException )
 {
     setFastPropertyValue(PROPERTY_ID_NAME, makeAny(aName));
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 8ff8a537dc68..3e4ccd0d3a90 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -44,25 +44,25 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 
-//------------------------------------------------------------------
+
 ODateControl::ODateControl(const Reference<XComponentContext>& _rxFactory)
                :OBoundControl(_rxFactory, VCL_CONTROL_DATEFIELD)
 {
 }
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL ODateControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new ODateControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> ODateControl::_getTypes()
 {
     return OBoundControl::_getTypes();
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -74,19 +74,19 @@ StringSequence SAL_CALL ODateControl::getSupportedServiceNames() throw()
 }
 
 /*************************************************************************/
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL ODateModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new ODateModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> ODateModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
 }
 
-//------------------------------------------------------------------
+
 ODateModel::ODateModel(const Reference<XComponentContext>& _rxFactory)
     : OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_DATEFIELD,
         FRM_SUN_CONTROL_DATEFIELD, sal_True, sal_True)
@@ -112,7 +112,7 @@ ODateModel::ODateModel(const Reference<XComponentContext>& _rxFactory)
     osl_atomic_decrement( &m_refCount );
 }
 
-//------------------------------------------------------------------------------
+
 ODateModel::ODateModel( const ODateModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     : OEditBaseModel(_pOriginal, _rxFactory)
     , OLimitedFormats(_rxFactory, FormComponentType::DATEFIELD)
@@ -121,18 +121,18 @@ ODateModel::ODateModel( const ODateModel* _pOriginal, const Reference<XComponent
     setAggregateSet( m_xAggregateFastSet, getOriginalHandle( PROPERTY_ID_DATEFORMAT ) );
 }
 
-//------------------------------------------------------------------------------
+
 ODateModel::~ODateModel( )
 {
     setAggregateSet(Reference< XFastPropertySet >(), -1);
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( ODateModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -155,14 +155,14 @@ StringSequence SAL_CALL ODateModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL ODateModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_DATEFIELD); // old (non-sun) name for compatibility !
 }
 
 // XPropertySet
-//------------------------------------------------------------------------------
+
 void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
@@ -173,7 +173,7 @@ void ODateModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODateModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle ) const
 {
     switch (_nHandle)
@@ -190,7 +190,7 @@ void SAL_CALL ODateModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue,
         sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
 {
@@ -200,7 +200,7 @@ sal_Bool SAL_CALL ODateModel::convertFastPropertyValue(Any& _rConvertedValue, An
         return OEditBaseModel::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( ::com::sun::star::uno::Exception)
 {
     if (PROPERTY_ID_FORMATKEY == _nHandle)
@@ -210,7 +210,7 @@ void SAL_CALL ODateModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, c
 }
 
 // XLoadListener
-//------------------------------------------------------------------------------
+
 void ODateModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     OBoundControlModel::onConnectedDbColumn( _rxForm );
@@ -230,7 +230,7 @@ void ODateModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool ODateModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aControlValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -271,25 +271,25 @@ sal_Bool ODateModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 Any ODateModel::translateControlValueToExternalValue( ) const
 {
     return getControlValue();
 }
 
-//------------------------------------------------------------------------------
+
 Any ODateModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
 {
     return _rExternalValue;
 }
 
-//------------------------------------------------------------------------------
+
 Any ODateModel::translateControlValueToValidatableValue( ) const
 {
     return getControlValue();
 }
 
-//------------------------------------------------------------------------------
+
 Any ODateModel::translateDbColumnToControlValue()
 {
     util::Date aDate = m_xColumn->getDate();
@@ -301,20 +301,20 @@ Any ODateModel::translateDbColumnToControlValue()
     return m_aSaveValue;
 }
 
-//------------------------------------------------------------------------------
+
 Any ODateModel::getDefaultForReset() const
 {
     return m_aDefault;
 }
 
-//------------------------------------------------------------------------------
+
 void ODateModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
     m_aSaveValue.clear();
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Type > ODateModel::getSupportedBindingTypes()
 {
     return Sequence< Type >( &::getCppuType( static_cast< util::Date* >( NULL ) ), 1 );
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index bdaf676f8851..4f577eb53876 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -61,13 +61,13 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OEditControl_CreateInstance(const Reference< XMultiServiceFactory > & _rxFactory)
 {
     return *(new OEditControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OEditControl::_getTypes()
 {
     static Sequence<Type> aTypes;
@@ -79,7 +79,7 @@ Sequence<Type> OEditControl::_getTypes()
     return aTypes;
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OBoundControl::queryAggregation(_rType);
@@ -89,7 +89,7 @@ Any SAL_CALL OEditControl::queryAggregation(const Type& _rType) throw (RuntimeEx
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 OEditControl::OEditControl(const Reference<XComponentContext>& _rxFactory)
                :OBoundControl( _rxFactory, FRM_SUN_CONTROL_RICHTEXTCONTROL )
                ,m_aChangeListeners(m_aMutex)
@@ -108,7 +108,7 @@ OEditControl::OEditControl(const Reference<XComponentContext>& _rxFactory)
     decrement(m_refCount);
 }
 
-//------------------------------------------------------------------------------
+
 OEditControl::~OEditControl()
 {
     if( m_nKeyEvent )
@@ -123,20 +123,20 @@ OEditControl::~OEditControl()
 }
 
 // XChangeBroadcaster
-//------------------------------------------------------------------------------
+
 void OEditControl::addChangeListener(const Reference<XChangeListener>& l) throw ( ::com::sun::star::uno::RuntimeException)
 {
     m_aChangeListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void OEditControl::removeChangeListener(const Reference<XChangeListener>& l) throw ( ::com::sun::star::uno::RuntimeException)
 {
     m_aChangeListeners.removeInterface( l );
 }
 
 // OComponentHelper
-//------------------------------------------------------------------------------
+
 void OEditControl::disposing()
 {
     OBoundControl::disposing();
@@ -146,7 +146,7 @@ void OEditControl::disposing()
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence  OEditControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -158,14 +158,14 @@ StringSequence  OEditControl::getSupportedServiceNames() throw()
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
+
 void OEditControl::disposing(const EventObject& Source) throw( RuntimeException )
 {
     OBoundControl::disposing(Source);
 }
 
 // XFocusListener
-//------------------------------------------------------------------------------
+
 void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySet>  xSet(getModel(), UNO_QUERY);
@@ -173,7 +173,7 @@ void OEditControl::focusGained( const FocusEvent& /*e*/ ) throw ( ::com::sun::st
         xSet->getPropertyValue( PROPERTY_TEXT ) >>= m_aHtmlChangeValue;
 }
 
-//------------------------------------------------------------------------------
+
 void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySet>  xSet(getModel(), UNO_QUERY);
@@ -190,7 +190,7 @@ void OEditControl::focusLost( const FocusEvent& /*e*/ ) throw ( ::com::sun::star
 }
 
 // XKeyListener
-//------------------------------------------------------------------------------
+
 void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 )
@@ -247,12 +247,12 @@ void OEditControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw (
     m_nKeyEvent = Application::PostUserEvent( LINK(this, OEditControl,OnKeyPressed) );
 }
 
-//------------------------------------------------------------------------------
+
 void OEditControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(OEditControl, OnKeyPressed, void*, /*EMPTYARG*/)
 {
     m_nKeyEvent = 0;
@@ -265,27 +265,27 @@ IMPL_LINK(OEditControl, OnKeyPressed, void*, /*EMPTYARG*/)
     return 0L;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OEditControl::createPeer( const Reference< XToolkit>& _rxToolkit, const Reference< XWindowPeer>& _rxParent ) throw ( RuntimeException )
 {
     OBoundControl::createPeer(_rxToolkit, _rxParent);
 }
 
 /*************************************************************************/
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OEditModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OEditModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OEditModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
 }
 
 
-//------------------------------------------------------------------
+
 OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory)
     :OEditBaseModel( _rxFactory, FRM_SUN_COMPONENT_RICHTEXTCONTROL, FRM_SUN_CONTROL_TEXTFIELD, sal_True, sal_True )
     ,m_bMaxTextLenModified(sal_False)
@@ -296,7 +296,7 @@ OEditModel::OEditModel(const Reference<XComponentContext>& _rxFactory)
     initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
 }
 
-//------------------------------------------------------------------
+
 OEditModel::OEditModel( const OEditModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OEditBaseModel( _pOriginal, _rxFactory )
     ,m_bMaxTextLenModified(sal_False)
@@ -310,7 +310,7 @@ OEditModel::OEditModel( const OEditModel* _pOriginal, const Reference<XComponent
     // they will be set to new values, anyway ....
 }
 
-//------------------------------------------------------------------
+
 OEditModel::~OEditModel()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -321,10 +321,10 @@ OEditModel::~OEditModel()
 
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OEditModel )
 
-//------------------------------------------------------------------------------
+
 void OEditModel::disposing()
 {
     OEditBaseModel::disposing();
@@ -332,14 +332,14 @@ void OEditModel::disposing()
 }
 
 // XPersistObject
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OEditModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_EDIT);  // old (non-sun) name for compatibility !
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OEditModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -378,7 +378,7 @@ void SAL_CALL OEditModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 5, OEditBaseModel )
@@ -390,7 +390,7 @@ void OEditModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
 {
     OEditBaseModel::describeAggregateProperties( _rAggregateProps );
@@ -405,7 +405,7 @@ void OEditModel::describeAggregateProperties( Sequence< Property >& _rAggregateP
 
 }
 
-//------------------------------------------------------------------------------
+
 bool OEditModel::implActsAsRichText( ) const
 {
     sal_Bool bActAsRichText = sal_False;
@@ -416,7 +416,7 @@ bool OEditModel::implActsAsRichText( ) const
     return bActAsRichText;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OEditModel::reset(  ) throw(RuntimeException)
 {
     // no reset if we currently act as rich text control
@@ -426,7 +426,7 @@ void SAL_CALL OEditModel::reset(  ) throw(RuntimeException)
     OEditBaseModel::reset();
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     void lcl_transferProperties( const Reference< XPropertySet >& _rxSource, const Reference< XPropertySet >& _rxDest )
@@ -496,7 +496,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutStream ) const
 {
     // we need to fake the writing of our aggregate. Since #i24387#, we have another aggregate,
@@ -518,7 +518,7 @@ void OEditModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutS
         xFakedPersist->write( _rxOutStream );
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStream )
 {
     // we need to fake the reading of our aggregate. Since #i24387#, we have another aggregate,
@@ -537,7 +537,7 @@ void OEditModel::readAggregate( const Reference< XObjectInputStream >& _rxInStre
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     Any aCurrentText;
@@ -567,7 +567,7 @@ void OEditModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OEditBaseModel::read(_rxInStream);
@@ -589,7 +589,7 @@ void OEditModel::read(const Reference<XObjectInputStream>& _rxInStream) throw (
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_uInt16 OEditModel::getPersistenceFlags() const
 {
     sal_uInt16 nFlags = OEditBaseModel::getPersistenceFlags();
@@ -600,7 +600,7 @@ sal_uInt16 OEditModel::getPersistenceFlags() const
     return nFlags;
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     Reference< XPropertySet > xField = getField();
@@ -631,7 +631,7 @@ void OEditModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::onDisconnectedDbColumn()
 {
     OEditBaseModel::onDisconnectedDbColumn();
@@ -647,7 +647,7 @@ void OEditModel::onDisconnectedDbColumn()
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType )
 {
     // if we act as rich text currently, we do not allow binding to a database column
@@ -657,13 +657,13 @@ sal_Bool OEditModel::approveDbColumnType( sal_Int32 _nColumnType )
     return OEditBaseModel::approveDbColumnType( _nColumnType );
 }
 
-//------------------------------------------------------------------------------
+
 void OEditModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -701,7 +701,7 @@ sal_Bool OEditModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 Any OEditModel::translateDbColumnToControlValue()
 {
     OSL_PRECOND( m_pValueFormatter.get(), "OEditModel::translateDbColumnToControlValue: no value formatter!" );
@@ -732,7 +732,7 @@ Any OEditModel::translateDbColumnToControlValue()
     return aRet.hasValue() ? aRet : makeAny( OUString() );
 }
 
-//------------------------------------------------------------------------------
+
 Any OEditModel::getDefaultForReset() const
 {
     return makeAny( m_aDefaultText );
diff --git a/forms/source/component/EditBase.cxx b/forms/source/component/EditBase.cxx
index 100d355e1d0d..6c482984c9d3 100644
--- a/forms/source/component/EditBase.cxx
+++ b/forms/source/component/EditBase.cxx
@@ -56,7 +56,7 @@ namespace
     const sal_uInt16 DEFAULT_DATE    =  0x0010;
 }
 
-//------------------------------------------------------------------
+
 OEditBaseModel::OEditBaseModel( const Reference< XComponentContext >& _rxFactory, const OUString& rUnoControlModelName,
         const OUString& rDefault, const sal_Bool _bSupportExternalBinding, const sal_Bool _bSupportsValidation )
     :OBoundControlModel( _rxFactory, rUnoControlModelName, rDefault, sal_True, _bSupportExternalBinding, _bSupportsValidation )
@@ -66,7 +66,7 @@ OEditBaseModel::OEditBaseModel( const Reference< XComponentContext >& _rxFactory
 {
 }
 
-//------------------------------------------------------------------
+
 OEditBaseModel::OEditBaseModel( const OEditBaseModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
      :OBoundControlModel( _pOriginal, _rxFactory )
      ,m_nLastReadVersion(0)
@@ -78,13 +78,13 @@ OEditBaseModel::OEditBaseModel( const OEditBaseModel* _pOriginal, const Referenc
     m_aDefaultText = _pOriginal->m_aDefaultText;
 }
 
-//------------------------------------------------------------------
+
 OEditBaseModel::~OEditBaseModel( )
 {
 }
 
 // XPersist
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OBoundControlModel::write(_rxOutStream);
@@ -152,13 +152,13 @@ void OEditBaseModel::write(const Reference<XObjectOutputStream>& _rxOutStream) t
     // !!! properties common to all OEditBaseModel derived classes should be written in writeCommonEditProperties !!!
 }
 
-//------------------------------------------------------------------------------
+
 sal_uInt16 OEditBaseModel::getPersistenceFlags() const
 {
     return PF_HANDLE_COMMON_PROPS;
 }
 
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OBoundControlModel::read(_rxInStream);
@@ -216,14 +216,14 @@ void OEditBaseModel::read(const Reference<XObjectInputStream>& _rxInStream) thro
         resetNoBroadcast();
 };
 
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::defaultCommonEditProperties()
 {
     OBoundControlModel::defaultCommonProperties();
     // no own common properties at the moment
 }
 
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::readCommonEditProperties(const Reference<XObjectInputStream>& _rxInStream)
 {
     sal_Int32 nLen = _rxInStream->readLong();
@@ -243,7 +243,7 @@ void OEditBaseModel::readCommonEditProperties(const Reference<XObjectInputStream
     xMark->deleteMark(nMark);
 }
 
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::writeCommonEditProperties(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     Reference<XMarkableStream>  xMark(_rxOutStream, UNO_QUERY);
@@ -267,7 +267,7 @@ void OEditBaseModel::writeCommonEditProperties(const Reference<XObjectOutputStre
     xMark->deleteMark(nMark);
 }
 
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
     switch (nHandle)
@@ -291,7 +291,7 @@ void OEditBaseModel::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                             sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException )
 {
@@ -326,7 +326,7 @@ sal_Bool OEditBaseModel::convertFastPropertyValue( Any& rConvertedValue, Any& rO
     return bModified;
 }
 
-//------------------------------------------------------------------------------
+
 void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception)
 {
     switch (nHandle)
@@ -357,7 +357,7 @@ void OEditBaseModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
 }
 
 // XPropertyState
-//------------------------------------------------------------------------------
+
 Any OEditBaseModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 {
     switch (nHandle)
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index d8444ee35b0d..866067d649e7 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -45,13 +45,13 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OFileControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OFileControlModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OFileControlModel::_getTypes()
 {
     static Sequence<Type> aTypes;
@@ -71,7 +71,7 @@ Sequence<Type> OFileControlModel::_getTypes()
 
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence  OFileControlModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
@@ -82,8 +82,8 @@ StringSequence  OFileControlModel::getSupportedServiceNames() throw(RuntimeExcep
     return aSupported;
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OFileControlModel::OFileControlModel(const Reference<XComponentContext>& _rxFactory)
                     :OControlModel(_rxFactory, VCL_CONTROLMODEL_FILECONTROL)
                     ,m_aResetListeners(m_aMutex)
@@ -91,7 +91,7 @@ OFileControlModel::OFileControlModel(const Reference<XComponentContext>& _rxFact
     m_nClassId = FormComponentType::FILECONTROL;
 }
 
-//------------------------------------------------------------------
+
 OFileControlModel::OFileControlModel( const OFileControlModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory )
     ,m_aResetListeners( m_aMutex )
@@ -100,7 +100,7 @@ OFileControlModel::OFileControlModel( const OFileControlModel* _pOriginal, const
     m_sDefaultValue = _pOriginal->m_sDefaultValue;
 }
 
-//------------------------------------------------------------------
+
 OFileControlModel::~OFileControlModel()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -110,10 +110,10 @@ OFileControlModel::~OFileControlModel()
     }
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OFileControlModel )
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OControlModel::queryAggregation(_rType);
@@ -126,7 +126,7 @@ Any SAL_CALL OFileControlModel::queryAggregation(const Type& _rType) throw (Runt
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void OFileControlModel::disposing()
 {
     OControlModel::disposing();
@@ -135,7 +135,7 @@ void OFileControlModel::disposing()
     m_aResetListeners.disposeAndClear(aEvt);
 }
 
-//------------------------------------------------------------------------------
+
 Any OFileControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
 {
     switch ( _nHandle )
@@ -146,7 +146,7 @@ Any OFileControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     return OControlModel::getPropertyDefaultByHandle( _nHandle );
 }
 
-//------------------------------------------------------------------------------
+
 void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
 {
     switch (nHandle)
@@ -157,7 +157,7 @@ void OFileControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) con
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception)
 {
     switch (nHandle)
@@ -171,7 +171,7 @@ void OFileControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, cons
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
                             throw( IllegalArgumentException )
 {
@@ -184,7 +184,7 @@ sal_Bool OFileControlModel::convertFastPropertyValue(Any& rConvertedValue, Any&
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 2, OControlModel )
@@ -193,13 +193,13 @@ void OFileControlModel::describeFixedProperties( Sequence< Property >& _rProps )
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OFileControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_FILECONTROL);   // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void OFileControlModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OControlModel::write(_rxOutStream);
@@ -213,7 +213,7 @@ void OFileControlModel::write(const Reference<stario::XObjectOutputStream>& _rxO
     writeHelpTextCompatibly(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OControlModel::read(_rxInStream);
@@ -239,7 +239,7 @@ void OFileControlModel::read(const Reference<stario::XObjectInputStream>& _rxInS
 //  _reset();
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OInterfaceIteratorHelper aIter(m_aResetListeners);
@@ -259,19 +259,19 @@ void SAL_CALL OFileControlModel::reset() throw ( ::com::sun::star::uno::RuntimeE
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void OFileControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException)
 {
     m_aResetListeners.addInterface(_rxListener);
 }
 
-//-----------------------------------------------------------------------------
+
 void OFileControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException)
 {
     m_aResetListeners.removeInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
+
 void OFileControlModel::_reset()
 {
     {   // release our mutex once (it's acquired in the calling method !), as setting aggregate properties
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 8524b1822ed9..b54fbb2c3f6a 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -64,7 +64,7 @@
 #include <vcl/svapp.hxx>
 #include <tools/wintypes.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_OFilterControl()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::OFilterControl > aAutoRegistration;
@@ -92,7 +92,7 @@ namespace frm
     //=====================================================================
     // OFilterControl
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OFilterControl::OFilterControl( const Reference< XComponentContext >& _rxORB )
         :UnoControl()
         ,m_aTextListeners( *this )
@@ -105,7 +105,7 @@ namespace frm
     {
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OFilterControl::ensureInitialized( )
     {
         if ( !m_xField.is() )
@@ -142,7 +142,7 @@ namespace frm
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     Any SAL_CALL OFilterControl::queryAggregation( const Type & rType ) throw(RuntimeException)
     {
         Any aRet = UnoControl::queryAggregation( rType);
@@ -152,7 +152,7 @@ namespace frm
         return aRet;
     }
 
-    //------------------------------------------------------------------
+
     OUString OFilterControl::GetComponentServiceName()
     {
         OUString aServiceName;
@@ -180,7 +180,7 @@ namespace frm
     }
 
     // XComponent
-    //---------------------------------------------------------------------
+
     void OFilterControl::dispose() throw( RuntimeException  )
     {
         EventObject aEvt(*this);
@@ -188,7 +188,7 @@ namespace frm
         UnoControl::dispose();
     }
 
-    //---------------------------------------------------------------------
+
     void OFilterControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException)
     {
         UnoControl::createPeer( rxToolkit, rParentPeer );
@@ -261,14 +261,14 @@ namespace frm
             m_bFilterListFilled = sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     void OFilterControl::PrepareWindowDescriptor( WindowDescriptor& rDescr )
     {
         if (m_bFilterList)
             rDescr.WindowAttributes |= VclWindowPeerAttribute::DROPDOWN;
     }
 
-    //---------------------------------------------------------------------
+
     void OFilterControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal )
     {
         // these properties are ignored
@@ -280,14 +280,14 @@ namespace frm
     }
 
     // XEventListener
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::disposing(const EventObject& Source) throw( RuntimeException )
     {
         UnoControl::disposing(Source);
     }
 
     // XItemListener
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::itemStateChanged( const ItemEvent& rEvent ) throw(RuntimeException)
     {
         OUStringBuffer aText;
@@ -378,7 +378,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OFilterControl::implInitFilterList()
     {
         if ( !ensureInitialized( ) )
@@ -489,7 +489,7 @@ namespace frm
     }
 
     // XFocusListener
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::focusGained(const FocusEvent& /*e*/)  throw( RuntimeException  )
     {
         // should we fill the combobox?
@@ -497,12 +497,12 @@ namespace frm
             implInitFilterList();
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::focusLost(const FocusEvent& /*e*/) throw( RuntimeException )
     {
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool SAL_CALL OFilterControl::commit() throw(RuntimeException)
     {
         if ( !ensureInitialized( ) )
@@ -553,19 +553,19 @@ namespace frm
     }
 
     // XTextComponent
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::addTextListener(const Reference< XTextListener > & l) throw(RuntimeException)
     {
         m_aTextListeners.addInterface( l );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::removeTextListener(const Reference< XTextListener > & l) throw(RuntimeException)
     {
         m_aTextListeners.removeInterface( l );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::setText( const OUString& aText ) throw(RuntimeException)
     {
         if ( !ensureInitialized( ) )
@@ -664,7 +664,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::insertText( const ::com::sun::star::awt::Selection& rSel, const OUString& aText ) throw(::com::sun::star::uno::RuntimeException)
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
@@ -675,13 +675,13 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     OUString SAL_CALL OFilterControl::getText() throw(RuntimeException)
     {
         return m_aText;
     }
 
-    //---------------------------------------------------------------------
+
     OUString SAL_CALL OFilterControl::getSelectedText( void ) throw(RuntimeException)
     {
         OUString aSelected;
@@ -692,7 +692,7 @@ namespace frm
         return aSelected;
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw(::com::sun::star::uno::RuntimeException)
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
@@ -700,7 +700,7 @@ namespace frm
             xText->setSelection( aSelection );
     }
 
-    //---------------------------------------------------------------------
+
     ::com::sun::star::awt::Selection SAL_CALL OFilterControl::getSelection( void ) throw(::com::sun::star::uno::RuntimeException)
     {
         ::com::sun::star::awt::Selection aSel;
@@ -710,14 +710,14 @@ namespace frm
         return aSel;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool SAL_CALL OFilterControl::isEditable( void ) throw(RuntimeException)
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         return xText.is() && xText->isEditable();
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::setEditable( sal_Bool bEditable ) throw(RuntimeException)
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
@@ -725,14 +725,14 @@ namespace frm
             xText->setEditable(bEditable);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int16 SAL_CALL OFilterControl::getMaxTextLen() throw(RuntimeException)
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
         return xText.is() ? xText->getMaxTextLen() : 0;
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::setMaxTextLen( sal_Int16 nLength ) throw(RuntimeException)
     {
         Reference< XTextComponent >  xText( getPeer(), UNO_QUERY );
@@ -740,7 +740,7 @@ namespace frm
             xText->setMaxTextLen(nLength);
     }
 
-    //---------------------------------------------------------------------
+
     void OFilterControl::displayException( const ::com::sun::star::sdb::SQLContext& _rExcept )
     {
         try
@@ -754,7 +754,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OFilterControl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
     {
         const Any* pArguments = aArguments.getConstArray();
@@ -902,7 +902,7 @@ namespace frm
         return aNames;
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OFilterControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return static_cast< XServiceInfo* >( new OFilterControl( comphelper::getComponentContext(_rxFactory) ) );
diff --git a/forms/source/component/FixedText.cxx b/forms/source/component/FixedText.cxx
index 896c7a59a8e1..11601ef78a31 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -39,14 +39,14 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-//------------------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OFixedTextModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new OFixedTextModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OFixedTextModel::OFixedTextModel( const Reference<XComponentContext>& _rxFactory )
         :OControlModel(_rxFactory, VCL_CONTROLMODEL_FIXEDTEXT)
 
@@ -54,22 +54,22 @@ OFixedTextModel::OFixedTextModel( const Reference<XComponentContext>& _rxFactory
     m_nClassId = FormComponentType::FIXEDTEXT;
 }
 
-//------------------------------------------------------------------
+
 OFixedTextModel::OFixedTextModel( const OFixedTextModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory )
 
 {
 }
 
-//------------------------------------------------------------------
+
 OFixedTextModel::~OFixedTextModel( )
 {
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OFixedTextModel )
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
@@ -80,20 +80,20 @@ StringSequence SAL_CALL OFixedTextModel::getSupportedServiceNames() throw(::com:
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void OFixedTextModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
 {
     OControlModel::describeAggregateProperties( _rAggregateProps );
     RemoveProperty( _rAggregateProps, PROPERTY_TABSTOP );
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OFixedTextModel::getServiceName() throw(RuntimeException)
 {
     return OUString(FRM_COMPONENT_FIXEDTEXT); // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
     throw(IOException, RuntimeException)
 {
@@ -104,7 +104,7 @@ void SAL_CALL OFixedTextModel::write(const Reference<XObjectOutputStream>& _rxOu
     writeHelpTextCompatibly(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OFixedTextModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException)
 {
     OControlModel::read(_rxInStream);
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index e77b677c7e79..14abb983cdfb 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -16,8 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
 #include "componenttools.hxx"
 #include "FormComponent.hxx"
 #include "frm_resource.hrc"
@@ -52,90 +50,75 @@
 #include <functional>
 #include <algorithm>
 
-
-//... namespace frm .......................................................
 namespace frm
 {
-//.........................................................................
-
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::sdb;
-    using namespace ::com::sun::star::sdbc;
-    using namespace ::com::sun::star::sdbcx;
-    using namespace ::com::sun::star::beans;
-    using namespace ::com::sun::star::container;
-    using namespace ::com::sun::star::form;
-    using namespace ::com::sun::star::awt;
-    using namespace ::com::sun::star::io;
-    using namespace ::com::sun::star::lang;
-    using namespace ::com::sun::star::util;
-    using namespace ::com::sun::star::form::binding;
-    using namespace ::com::sun::star::form::validation;
-    using namespace ::dbtools;
-    using namespace ::comphelper;
-
-    //=========================================================================
-    //= FieldChangeNotifier
-    //=========================================================================
-    //-------------------------------------------------------------------------
-    void ControlModelLock::impl_notifyAll_nothrow()
-    {
-        m_rModel.firePropertyChanges( m_aHandles, m_aOldValues, m_aNewValues, OControlModel::LockAccess() );
-    }
-
-    //-------------------------------------------------------------------------
-    void ControlModelLock::addPropertyNotification( const sal_Int32 _nHandle, const Any& _rOldValue, const Any& _rNewValue )
-    {
-        sal_Int32 nOldLength = m_aHandles.getLength();
-        if  (   ( nOldLength != m_aOldValues.getLength() )
-            ||  ( nOldLength != m_aNewValues.getLength() )
-            )
-            throw RuntimeException( OUString(), m_rModel );
-
-        m_aHandles.realloc( nOldLength + 1 );
-        m_aHandles[ nOldLength ] = _nHandle;
-        m_aOldValues.realloc( nOldLength + 1 );
-        m_aOldValues[ nOldLength ] = _rOldValue;
-        m_aNewValues.realloc( nOldLength + 1 );
-        m_aNewValues[ nOldLength ] = _rNewValue;
-    }
-
-    //=========================================================================
-    //= FieldChangeNotifier
-    //=========================================================================
-    //-------------------------------------------------------------------------
-    class FieldChangeNotifier
-    {
-    public:
-        FieldChangeNotifier( ControlModelLock& _rLock )
-            :m_rLock( _rLock )
-            ,m_rModel( dynamic_cast< OBoundControlModel& >( _rLock.getModel() ) )
-        {
-            m_xOldField = m_rModel.getField();
-        }
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::sdb;
+using namespace ::com::sun::star::sdbc;
+using namespace ::com::sun::star::sdbcx;
+using namespace ::com::sun::star::beans;
+using namespace ::com::sun::star::container;
+using namespace ::com::sun::star::form;
+using namespace ::com::sun::star::awt;
+using namespace ::com::sun::star::io;
+using namespace ::com::sun::star::lang;
+using namespace ::com::sun::star::util;
+using namespace ::com::sun::star::form::binding;
+using namespace ::com::sun::star::form::validation;
+using namespace ::dbtools;
+using namespace ::comphelper;
+
+// FieldChangeNotifier
+void ControlModelLock::impl_notifyAll_nothrow()
+{
+    m_rModel.firePropertyChanges( m_aHandles, m_aOldValues, m_aNewValues, OControlModel::LockAccess() );
+}
+
+void ControlModelLock::addPropertyNotification( const sal_Int32 _nHandle, const Any& _rOldValue, const Any& _rNewValue )
+{
+    sal_Int32 nOldLength = m_aHandles.getLength();
+    if  (   ( nOldLength != m_aOldValues.getLength() )
+        ||  ( nOldLength != m_aNewValues.getLength() )
+        )
+        throw RuntimeException( OUString(), m_rModel );
 
-        ~FieldChangeNotifier()
-        {
-            Reference< XPropertySet > xNewField( m_rModel.getField() );
-            if ( m_xOldField != xNewField )
-                m_rLock.addPropertyNotification( PROPERTY_ID_BOUNDFIELD, makeAny( m_xOldField ), makeAny( xNewField ) );
-        }
+    m_aHandles.realloc( nOldLength + 1 );
+    m_aHandles[ nOldLength ] = _nHandle;
+    m_aOldValues.realloc( nOldLength + 1 );
+    m_aOldValues[ nOldLength ] = _rOldValue;
+    m_aNewValues.realloc( nOldLength + 1 );
+    m_aNewValues[ nOldLength ] = _rNewValue;
+}
 
-    private:
-        ControlModelLock&           m_rLock;
-        OBoundControlModel&         m_rModel;
-        Reference< XPropertySet >   m_xOldField;
-    };
+class FieldChangeNotifier
+{
+public:
+    FieldChangeNotifier( ControlModelLock& _rLock )
+        :m_rLock( _rLock )
+        ,m_rModel( dynamic_cast< OBoundControlModel& >( _rLock.getModel() ) )
+    {
+        m_xOldField = m_rModel.getField();
+    }
+
+    ~FieldChangeNotifier()
+    {
+        Reference< XPropertySet > xNewField( m_rModel.getField() );
+        if ( m_xOldField != xNewField )
+            m_rLock.addPropertyNotification( PROPERTY_ID_BOUNDFIELD, makeAny( m_xOldField ), makeAny( xNewField ) );
+    }
 
-//=============================================================================
-//= base class for form layer controls
-//=============================================================================
-//------------------------------------------------------------------------------
+private:
+    ControlModelLock&           m_rLock;
+    OBoundControlModel&         m_rModel;
+    Reference< XPropertySet >   m_xOldField;
+};
+
+// base class for form layer controls
 OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUString& _rAggregateService, const sal_Bool _bSetDelegator )
             :OComponentHelper(m_aMutex)
             ,m_xContext( _rxContext )
 {
-    // VCL-Control aggregieren
+    // aggregate VCL-Control
     // bei Aggregation den Refcount um eins erhoehen da im setDelegator
     // das Aggregat selbst den Refcount erhoeht
     increment( m_refCount );
@@ -149,20 +132,17 @@ OControl::OControl( const Reference< XComponentContext >& _rxContext, const OUSt
         doSetDelegator();
 }
 
-//------------------------------------------------------------------------------
 OControl::~OControl()
 {
     doResetDelegator();
 }
 
-//------------------------------------------------------------------------------
 void OControl::doResetDelegator()
 {
     if ( m_xAggregate.is() )
         m_xAggregate->setDelegator( NULL );
 }
 
-//------------------------------------------------------------------------------
 void OControl::doSetDelegator()
 {
     increment( m_refCount );
@@ -176,7 +156,6 @@ void OControl::doSetDelegator()
 }
 
 // UNO Anbindung
-//------------------------------------------------------------------------------
 Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeException)
 {
     // ask the base class
@@ -193,13 +172,11 @@ Any SAL_CALL OControl::queryAggregation( const Type& _rType ) throw(RuntimeExcep
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
 Sequence<sal_Int8> SAL_CALL OControl::getImplementationId() throw(RuntimeException)
 {
     return OImplementationIds::getImplementationId(getTypes());
 }
 
-//------------------------------------------------------------------------------
 Sequence<Type> SAL_CALL OControl::getTypes() throw(RuntimeException)
 {
     TypeBag aTypes( _getTypes() );
@@ -211,13 +188,11 @@ Sequence<Type> SAL_CALL OControl::getTypes() throw(RuntimeException)
     return aTypes.getTypes();
 }
 
-//------------------------------------------------------------------------------
 Sequence<Type> OControl::_getTypes()
 {
     return TypeBag( OComponentHelper::getTypes(), OControl_BASE::getTypes() ).getTypes();
 }
 
-//------------------------------------------------------------------------------
 void OControl::initFormControlPeer( const Reference< XWindowPeer >& /*_rxPeer*/ )
 {
     // nothing to do here
@@ -247,6 +222,7 @@ Sequence< OUString > OControl::getAggregateServiceNames()
     Reference< XServiceInfo > xInfo;
     if ( query_aggregation( m_xAggregate, xInfo ) )
         aAggServices = xInfo->getSupportedServiceNames();
+
     return aAggServices;
 }
 
@@ -258,7 +234,6 @@ Sequence<OUString> SAL_CALL OControl::getSupportedServiceNames() throw(RuntimeEx
    );
 }
 
-//------------------------------------------------------------------------------
 Sequence< OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw( RuntimeException )
 {
     // no own supported service names
@@ -266,13 +241,12 @@ Sequence< OUString > SAL_CALL OControl::getSupportedServiceNames_Static() throw(
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
 void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException)
 {
     Reference< XInterface > xAggAsIface;
     query_aggregation(m_xAggregate, xAggAsIface);
 
-    // does the disposing come from the aggregate ?
+    // does the disposing come from the aggregate?
     if (xAggAsIface != Reference< XInterface >(_rEvent.Source, UNO_QUERY))
     {   // no -> forward it
                 Reference<com::sun::star::lang::XEventListener> xListener;
@@ -282,20 +256,17 @@ void SAL_CALL OControl::disposing(const com::sun::star::lang::EventObject& _rEve
 }
 
 // XControl
-//------------------------------------------------------------------------------
 void SAL_CALL OControl::setContext(const Reference< XInterface >& Context) throw (RuntimeException)
 {
     if (m_xControl.is())
         m_xControl->setContext(Context);
 }
 
-//------------------------------------------------------------------------------
 Reference< XInterface > SAL_CALL OControl::getContext() throw (RuntimeException)
 {
     return m_xControl.is() ? m_xControl->getContext() : Reference< XInterface >();
 }
 
-//------------------------------------------------------------------------------
 void OControl::impl_resetStateGuard_nothrow()
 {
     Reference< XWindow2 > xWindow;
@@ -312,26 +283,21 @@ void OControl::impl_resetStateGuard_nothrow()
     m_aWindowStateGuard.attach( xWindow, xModel );
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OControl::createPeer(const Reference<XToolkit>& _rxToolkit, const Reference<XWindowPeer>& _rxParent) throw (RuntimeException)
 {
     if ( m_xControl.is() )
     {
         m_xControl->createPeer( _rxToolkit, _rxParent );
-
         initFormControlPeer( getPeer() );
-
         impl_resetStateGuard_nothrow();
     }
 }
 
-//------------------------------------------------------------------------------
 Reference<XWindowPeer> SAL_CALL OControl::getPeer() throw ( RuntimeException)
 {
     return m_xControl.is() ? m_xControl->getPeer() : Reference<XWindowPeer>();
 }
 
-//------------------------------------------------------------------------------
 sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) throw ( RuntimeException)
 {
     if ( !m_xControl.is() )
@@ -342,41 +308,33 @@ sal_Bool SAL_CALL OControl::setModel(const Reference<XControlModel>& Model) thro
     return bSuccess;
 }
 
-//------------------------------------------------------------------------------
 Reference<XControlModel> SAL_CALL OControl::getModel() throw ( RuntimeException)
 {
     return m_xControl.is() ? m_xControl->getModel() : Reference<XControlModel>();
 }
 
-//------------------------------------------------------------------------------
 Reference<XView> SAL_CALL OControl::getView() throw ( RuntimeException)
 {
     return m_xControl.is() ? m_xControl->getView() : Reference<XView>();
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OControl::setDesignMode(sal_Bool bOn) throw ( RuntimeException)
 {
     if (m_xControl.is())
         m_xControl->setDesignMode(bOn);
 }
 
-//------------------------------------------------------------------------------
 sal_Bool SAL_CALL OControl::isDesignMode() throw ( RuntimeException)
 {
     return m_xControl.is() ? m_xControl->isDesignMode() : sal_True;
 }
 
-//------------------------------------------------------------------------------
 sal_Bool SAL_CALL OControl::isTransparent() throw ( RuntimeException)
 {
     return m_xControl.is() ? m_xControl->isTransparent() : sal_True;
 }
 
-//==================================================================
-//= OBoundControl
-//==================================================================
-//------------------------------------------------------------------
+// OBoundControl
 OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext,
             const OUString& _rAggregateService, const sal_Bool _bSetDelegator )
     :OControl( _rxContext, _rAggregateService, _bSetDelegator )
@@ -386,16 +344,15 @@ OBoundControl::OBoundControl( const Reference< XComponentContext >& _rxContext,
 {
 }
 
-//------------------------------------------------------------------
 OBoundControl::~OBoundControl()
 {
 }
-// -----------------------------------------------------------------------------
+
 Sequence< Type> OBoundControl::_getTypes()
 {
     return TypeBag( OControl::_getTypes(), OBoundControl_BASE::getTypes() ).getTypes();
 }
-//------------------------------------------------------------------
+
 Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeException)
 {
     Any aReturn;
@@ -416,13 +373,11 @@ Any SAL_CALL OBoundControl::queryAggregation(const Type& _rType) throw(RuntimeEx
     return aReturn;
 }
 
-//------------------------------------------------------------------
 sal_Bool SAL_CALL OBoundControl::getLock() throw(RuntimeException)
 {
     return m_bLocked;
 }
 
-//------------------------------------------------------------------
 void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException)
 {
     if (m_bLocked == _bLock)
@@ -433,7 +388,6 @@ void SAL_CALL OBoundControl::setLock(sal_Bool _bLock) throw(RuntimeException)
     m_bLocked = _bLock;
 }
 
-//------------------------------------------------------------------
 void OBoundControl::_setLock(sal_Bool _bLock)
 {
     // try to set the text component to readonly
@@ -451,47 +405,40 @@ void OBoundControl::_setLock(sal_Bool _bLock)
     }
 }
 
-//--------------------------------------------------------------------
 sal_Bool SAL_CALL OBoundControl::setModel( const Reference< XControlModel >& _rxModel ) throw (RuntimeException)
 {
     return OControl::setModel( _rxModel );
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControl::disposing(const EventObject& Source) throw (RuntimeException)
 {
     // just disambiguate
     OControl::disposing(Source);
 }
 
-//--------------------------------------------------------------------
 void OBoundControl::disposing()
 {
     OControl::disposing();
 }
 
-//==================================================================
-//= OControlModel
-//==================================================================
-//------------------------------------------------------------------
+// OControlModel
 Sequence<sal_Int8> SAL_CALL OControlModel::getImplementationId() throw(RuntimeException)
 {
     return OImplementationIds::getImplementationId(getTypes());
 }
 
-//------------------------------------------------------------------
 Sequence<Type> SAL_CALL OControlModel::getTypes() throw(RuntimeException)
 {
     TypeBag aTypes( _getTypes() );
 
     Reference< XTypeProvider > xProv;
+
     if ( query_aggregation( m_xAggregate, xProv ) )
         aTypes.addTypes( xProv->getTypes() );
 
     return aTypes.getTypes();
 }
 
-//------------------------------------------------------------------------------
 Sequence<Type> OControlModel::_getTypes()
 {
     return TypeBag( OComponentHelper::getTypes(),
@@ -500,7 +447,6 @@ Sequence<Type> OControlModel::_getTypes()
     ).getTypes();
 }
 
-//------------------------------------------------------------------
 Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     // base class 1
@@ -523,7 +469,6 @@ Any SAL_CALL OControlModel::queryAggregation(const Type& _rType) throw (RuntimeE
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XObjectInputStream >& _rxInStream)
 {
     OUString sHelpText;
@@ -540,7 +485,6 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb
     }
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XObjectOutputStream >& _rxOutStream)
 {
     OUString sHelpText;
@@ -557,7 +501,6 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO
     ::comphelper::operator<<( _rxOutStream, sHelpText);
 }
 
-//------------------------------------------------------------------
 OControlModel::OControlModel(
             const Reference<XComponentContext>& _rxContext,
             const OUString& _rUnoControlModelTypeName,
@@ -573,14 +516,13 @@ OControlModel::OControlModel(
     ,m_bGenerateVbEvents( sal_False )
     ,m_nControlTypeinMSO(0) // 0 : default value is create from AOO
     ,m_nObjIDinMSO(INVALID_OBJ_ID_IN_MSO)
-        // form controls are usually embedded into documents, not dialogs, and in documents
-        // the native look is ugly ....
-        // #i37342#
+    // form controls are usually embedded into documents, not dialogs, and in documents
+    // the native look is ugly...
+    // #i37342#
 {
     if (!_rUnoControlModelTypeName.isEmpty())  // the is a model we have to aggregate
     {
         increment(m_refCount);
-
         {
             m_xAggregate = Reference<XAggregation>(m_xContext->getServiceManager()->createInstanceWithContext(_rUnoControlModelTypeName, m_xContext), UNO_QUERY);
             setAggregation(m_xAggregate);
@@ -599,17 +541,14 @@ OControlModel::OControlModel(
                 }
             }
         }
-
         if (_bSetDelegator)
             doSetDelegator();
 
-        // Refcount wieder bei NULL
+        // Refcount is at NULL again
         decrement(m_refCount);
     }
-
 }
 
-//------------------------------------------------------------------
 OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference< XComponentContext>& _rxFactory, const sal_Bool _bCloneAggregate, const sal_Bool _bSetDelegator )
     :OComponentHelper( m_aMutex )
     ,OPropertySetAggregationHelper( OComponentHelper::rBHelper )
@@ -635,7 +574,6 @@ OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference<
     {
         // temporarily increment refcount because of temporary references to ourself in the following
         increment( m_refCount );
-
         {
             // transfer the (only, at the very moment!) ref count
             m_xAggregate = createAggregateClone( _pOriginal );
@@ -651,31 +589,25 @@ OControlModel::OControlModel( const OControlModel* _pOriginal, const Reference<
         // decrement ref count
         decrement( m_refCount );
     }
-
 }
 
-//------------------------------------------------------------------
 OControlModel::~OControlModel()
 {
     // release the aggregate
     doResetDelegator( );
-
 }
 
-//------------------------------------------------------------------
 void OControlModel::clonedFrom( const OControlModel* /*_pOriginal*/ )
 {
     // nothing to do in this base class
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::doResetDelegator()
 {
     if (m_xAggregate.is())
         m_xAggregate->setDelegator(NULL);
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::doSetDelegator()
 {
     increment(m_refCount);
@@ -687,13 +619,11 @@ void OControlModel::doSetDelegator()
 }
 
 // XChild
-//------------------------------------------------------------------------------
 Reference< XInterface > SAL_CALL OControlModel::getParent() throw(RuntimeException)
 {
     return m_xParent;
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OControlModel::setParent(const Reference< XInterface >& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException)
 {
     osl::MutexGuard aGuard(m_aMutex);
@@ -754,7 +684,6 @@ Sequence< OUString > SAL_CALL OControlModel::getSupportedServiceNames_Static() t
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
 void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject& _rSource) throw (RuntimeException)
 {
     // release the parent
@@ -775,7 +704,6 @@ void SAL_CALL OControlModel::disposing(const com::sun::star::lang::EventObject&
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
 void OControlModel::disposing()
 {
     OPropertySetAggregationHelper::disposing();
@@ -789,7 +717,6 @@ void OControlModel::disposing()
     m_aPropertyBagHelper.dispose();
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::writeAggregate( const Reference< XObjectOutputStream >& _rxOutStream ) const
 {
     Reference< XPersistObject > xPersist;
@@ -797,7 +724,6 @@ void OControlModel::writeAggregate( const Reference< XObjectOutputStream >& _rxO
         xPersist->write( _rxOutStream );
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInStream )
 {
     Reference< XPersistObject > xPersist;
@@ -805,13 +731,12 @@ void OControlModel::readAggregate( const Reference< XObjectInputStream >& _rxInS
         xPersist->read( _rxInStream );
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>& _rxOutStream)
                         throw(stario::IOException, RuntimeException)
 {
     osl::MutexGuard aGuard(m_aMutex);
 
-    // 1. Schreiben des UnoControls
+    // 1. writing the UnoControls
     Reference<stario::XMarkableStream> xMark(_rxOutStream, UNO_QUERY);
     if ( !xMark.is() )
     {
@@ -828,14 +753,14 @@ void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>&
 
     writeAggregate( _rxOutStream );
 
-    // feststellen der Laenge
+    // determining the length
     nLen = xMark->offsetToMark(nMark) - 4;
     xMark->jumpToMark(nMark);
     _rxOutStream->writeLong(nLen);
     xMark->jumpToFurthest();
     xMark->deleteMark(nMark);
 
-    // 2. Schreiben einer VersionsNummer
+    // 2. wrting a version number
     _rxOutStream->writeShort(0x0003);
 
     // 3. Schreiben der allgemeinen Properties
@@ -843,15 +768,14 @@ void SAL_CALL OControlModel::write(const Reference<stario::XObjectOutputStream>&
     _rxOutStream->writeShort(m_nTabIndex);
     ::comphelper::operator<<( _rxOutStream, m_aTag); // 3. version
 
-    // !!! IMPORTANT NOTE !!!
+    // IMPORTANT NOTE!
     // don't write any new members here : this wouldn't be compatible with older versions, as OControlModel
     // is a base class which is called in derived classes "read" method. So if you increment the version
     // and write new stuff, older office versions will read this in the _derived_ classes, which may result
     // in anything from data loss to crash.
-    // !!! EOIN !!!
+    // EOIN!
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream) throw (::com::sun::star::io::IOException, RuntimeException)
 {
     osl::MutexGuard aGuard(m_aMutex);
@@ -865,7 +789,7 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream)
         );
     }
 
-    // 1. Lesen des UnoControls
+    // 1. reading the UnoControls
     sal_Int32 nLen = InStream->readLong();
     if (nLen)
     {
@@ -875,6 +799,7 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream)
         {
             readAggregate( InStream );
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
@@ -885,10 +810,10 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream)
         xMark->deleteMark(nMark);
     }
 
-    // 2. Lesen des Versionsnummer
+    // 2. reading the version number
     sal_uInt16 nVersion = InStream->readShort();
 
-    // 3. Lesen der allgemeinen Properties
+    // 3. reading the general properties
     ::comphelper::operator>>( InStream, m_aName);
     m_nTabIndex  = InStream->readShort();
 
@@ -904,7 +829,6 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream)
     // later versions shouldn't exist (see write for a detailed comment)
 }
 
-//------------------------------------------------------------------------------
 PropertyState OControlModel::getPropertyStateByHandle( sal_Int32 _nHandle )
 {
     // simply compare the current and the default value
@@ -920,7 +844,6 @@ PropertyState OControlModel::getPropertyStateByHandle( sal_Int32 _nHandle )
     return bEqual ? PropertyState_DEFAULT_VALUE : PropertyState_DIRECT_VALUE;
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::setPropertyToDefaultByHandle( sal_Int32 _nHandle)
 {
     Any aDefault = getPropertyDefaultByHandle( _nHandle );
@@ -933,7 +856,6 @@ void OControlModel::setPropertyToDefaultByHandle( sal_Int32 _nHandle)
     }
 }
 
-//------------------------------------------------------------------------------
 Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
 {
     Any aReturn;
@@ -943,23 +865,19 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
         case PROPERTY_ID_TAG:
             aReturn <<= OUString();
             break;
-
         case PROPERTY_ID_CLASSID:
             aReturn <<= (sal_Int16)FormComponentType::CONTROL;
             break;
-
         case PROPERTY_ID_TABINDEX:
             aReturn <<= (sal_Int16)FRM_DEFAULT_TABINDEX;
             break;
-
         case PROPERTY_ID_NATIVE_LOOK:
             aReturn <<= (sal_Bool)sal_True;
             break;
-
         case PROPERTY_ID_GENERATEVBAEVENTS:
             aReturn <<= (sal_Bool)sal_False;
             break;
-        //added for exporting OCX control
+        // added for exporting OCX control
         case PROPERTY_ID_CONTROL_TYPE_IN_MSO:
             aReturn <<= (sal_Int16)0;
             break;
@@ -975,7 +893,6 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
 {
     switch ( _nHandle )
@@ -997,7 +914,7 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con
             break;
         case PROPERTY_ID_GENERATEVBAEVENTS:
             _rValue <<= (sal_Bool)m_bGenerateVbEvents;
-        //added for exporting OCX control
+        // added for exporting OCX control
         case PROPERTY_ID_CONTROL_TYPE_IN_MSO:
             _rValue <<= (sal_Int16)m_nControlTypeinMSO;
             break;
@@ -1013,7 +930,6 @@ void OControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) con
     }
 }
 
-//------------------------------------------------------------------------------
 sal_Bool OControlModel::convertFastPropertyValue(
                         Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
                         throw (com::sun::star::lang::IllegalArgumentException)
@@ -1036,7 +952,7 @@ sal_Bool OControlModel::convertFastPropertyValue(
         case PROPERTY_ID_GENERATEVBAEVENTS:
             bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_bGenerateVbEvents);
             break;
-        //added for exporting OCX control
+        // added for exporting OCX control
         case PROPERTY_ID_CONTROL_TYPE_IN_MSO:
             bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_nControlTypeinMSO);
             break;
@@ -1053,7 +969,6 @@ sal_Bool OControlModel::convertFastPropertyValue(
     return bModified;
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
                         throw (Exception)
 {
@@ -1080,7 +995,7 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
         case PROPERTY_ID_GENERATEVBAEVENTS:
             OSL_VERIFY( _rValue >>= m_bGenerateVbEvents );
             break;
-        //added for exporting OCX control
+        // added for exporting OCX control
         case PROPERTY_ID_CONTROL_TYPE_IN_MSO:
             OSL_VERIFY( _rValue >>= m_nControlTypeinMSO );
             break;
@@ -1096,7 +1011,6 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
     }
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_BASE_PROPERTIES( 7 )
@@ -1110,7 +1024,6 @@ void OControlModel::describeFixedProperties( Sequence< Property >& _rProps ) con
     END_DESCRIBE_PROPERTIES()
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::describeAggregateProperties( Sequence< Property >& /* [out] */ _rAggregateProps ) const
 {
     if ( m_xAggregateSet.is() )
@@ -1121,69 +1034,58 @@ void OControlModel::describeAggregateProperties( Sequence< Property >& /* [out]
     }
 }
 
-//------------------------------------------------------------------------------
 ::osl::Mutex& OControlModel::getMutex()
 {
     return m_aMutex;
 }
 
-//------------------------------------------------------------------------------
 void OControlModel::describeFixedAndAggregateProperties( Sequence< Property >& _out_rFixedProperties, Sequence< Property >& _out_rAggregateProperties ) const
 {
     describeFixedProperties( _out_rFixedProperties );
     describeAggregateProperties( _out_rAggregateProperties );
 }
 
-//------------------------------------------------------------------------------
 Reference< XMultiPropertySet > OControlModel::getPropertiesInterface()
 {
     return Reference< XMultiPropertySet >( *this, UNO_QUERY );
 }
 
-//------------------------------------------------------------------------------
 Reference< XPropertySetInfo> SAL_CALL OControlModel::getPropertySetInfo() throw( RuntimeException)
 {
     return createPropertySetInfo( getInfoHelper() );
 }
 
-//------------------------------------------------------------------------------
 ::cppu::IPropertyArrayHelper& OControlModel::getInfoHelper()
 {
     return m_aPropertyBagHelper.getInfoHelper();
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OControlModel::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
 {
     m_aPropertyBagHelper.addProperty( _rName, _nAttributes, _rInitialValue );
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OControlModel::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
 {
     m_aPropertyBagHelper.removeProperty( _rName );
 }
 
-//--------------------------------------------------------------------
 Sequence< PropertyValue > SAL_CALL OControlModel::getPropertyValues() throw (RuntimeException)
 {
     return m_aPropertyBagHelper.getPropertyValues();
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OControlModel::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     m_aPropertyBagHelper.setPropertyValues( _rProps );
 }
 
-//--------------------------------------------------------------------
 void OControlModel::lockInstance( LockAccess )
 {
     m_aMutex.acquire();
     osl_atomic_increment( &m_lockCount );
 }
 
-//--------------------------------------------------------------------
 oslInterlockedCount OControlModel::unlockInstance( LockAccess )
 {
     OSL_ENSURE( m_lockCount > 0, "OControlModel::unlockInstance: not locked!" );
@@ -1192,7 +1094,6 @@ oslInterlockedCount OControlModel::unlockInstance( LockAccess )
     return lockCount;
 }
 
-//--------------------------------------------------------------------
 void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles, const Sequence< Any >& _rOldValues,
                                         const Sequence< Any >& _rNewValues, LockAccess )
 {
@@ -1205,10 +1106,7 @@ void OControlModel::firePropertyChanges( const Sequence< sal_Int32 >& _rHandles,
     );
 }
 
-//==================================================================
-//= OBoundControlModel
-//==================================================================
-//------------------------------------------------------------------
+// OBoundControlModel
 Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException)
 {
     Any aReturn( OControlModel::queryAggregation(_rType) );
@@ -1225,11 +1123,9 @@ Any SAL_CALL OBoundControlModel::queryAggregation( const Type& _rType ) throw (R
         if ( !aReturn.hasValue() && m_bSupportsValidation )
             aReturn = OBoundControlModel_VALIDATION::queryInterface( _rType );
     }
-
     return aReturn;
 }
 
-//------------------------------------------------------------------
 OBoundControlModel::OBoundControlModel(
         const Reference< XComponentContext>& _rxFactory,
         const OUString& _rUnoControlModelTypeName, const OUString& _rDefault,
@@ -1260,12 +1156,10 @@ OBoundControlModel::OBoundControlModel(
     ,m_eControlValueChangeInstigator( eOther )
     ,m_aLabelServiceName(FRM_SUN_COMPONENT_FIXEDTEXT)
 {
-
     // start property listening at the aggregate
     implInitAggMultiplexer( );
 }
 
-//------------------------------------------------------------------
 OBoundControlModel::OBoundControlModel(
         const OBoundControlModel* _pOriginal, const Reference< XComponentContext>& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory, sal_True, sal_False )
@@ -1294,10 +1188,8 @@ OBoundControlModel::OBoundControlModel(
     ,m_bBindingControlsEnable( sal_False )
     ,m_eControlValueChangeInstigator( eOther )
 {
-
     // start property listening at the aggregate
     implInitAggMultiplexer( );
-
     m_aLabelServiceName = _pOriginal->m_aLabelServiceName;
     m_sValuePropertyName = _pOriginal->m_sValuePropertyName;
     m_nValuePropertyAggregateHandle = _pOriginal->m_nValuePropertyAggregateHandle;
@@ -1309,12 +1201,10 @@ OBoundControlModel::OBoundControlModel(
     // (the former should be clear - a clone of the object we're only referencing does not make sense)
     // (the second would violate the restriction for label controls that they're part of the
     // same form component hierarchy - we ourself are no part, yet, so we can't have a label control)
-
     // start listening for changes at the value property
     implInitValuePropertyListening( );
 }
 
-//------------------------------------------------------------------
 OBoundControlModel::~OBoundControlModel()
 {
     if ( !OComponentHelper::rBHelper.bDisposed )
@@ -1324,7 +1214,6 @@ OBoundControlModel::~OBoundControlModel()
     }
 
     doResetDelegator( );
-
     OSL_ENSURE( m_pAggPropMultiplexer, "OBoundControlModel::~OBoundControlModel: what about my property multiplexer?" );
     if ( m_pAggPropMultiplexer )
     {
@@ -1332,10 +1221,8 @@ OBoundControlModel::~OBoundControlModel()
         m_pAggPropMultiplexer->release();
         m_pAggPropMultiplexer = NULL;
     }
-
 }
 
-//------------------------------------------------------------------
 void OBoundControlModel::clonedFrom( const OControlModel* _pOriginal )
 {
     const OBoundControlModel* pBoundOriginal = static_cast< const OBoundControlModel* >( _pOriginal );
@@ -1347,14 +1234,15 @@ void OBoundControlModel::clonedFrom( const OControlModel* _pOriginal )
         {
             setValueBinding( pBoundOriginal->m_xExternalBinding );
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
         }
+
     }
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::implInitAggMultiplexer( )
 {
     increment( m_refCount );
@@ -1363,12 +1251,11 @@ void OBoundControlModel::implInitAggMultiplexer( )
         m_pAggPropMultiplexer = new OPropertyChangeMultiplexer( this, m_xAggregateSet, false );
         m_pAggPropMultiplexer->acquire();
     }
-    decrement( m_refCount );
 
-       doSetDelegator();
+    decrement( m_refCount );
+    doSetDelegator();
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::implInitValuePropertyListening( ) const
 {
     // start listening for changes at the value property
@@ -1387,7 +1274,6 @@ void OBoundControlModel::implInitValuePropertyListening( ) const
     }
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::initOwnValueProperty( const OUString& i_rValuePropertyName )
 {
     OSL_PRECOND( m_sValuePropertyName.isEmpty() && -1 == m_nValuePropertyAggregateHandle,
@@ -1396,7 +1282,6 @@ void OBoundControlModel::initOwnValueProperty( const OUString& i_rValuePropertyN
     m_sValuePropertyName = i_rValuePropertyName;
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::initValueProperty( const OUString& _rValuePropertyName, sal_Int32 _nValuePropertyExternalHandle )
 {
     OSL_PRECOND( m_sValuePropertyName.isEmpty() && -1 == m_nValuePropertyAggregateHandle,
@@ -1420,28 +1305,24 @@ void OBoundControlModel::initValueProperty( const OUString& _rValuePropertyName,
     implInitValuePropertyListening( );
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::suspendValueListening( )
 {
     OSL_PRECOND( !m_sValuePropertyName.isEmpty(), "OBoundControlModel::suspendValueListening: don't have a value property!" );
     OSL_PRECOND( m_pAggPropMultiplexer, "OBoundControlModel::suspendValueListening: I *am* not listening!" );
 
-    if ( m_pAggPropMultiplexer )
+if ( m_pAggPropMultiplexer )
         m_pAggPropMultiplexer->lock();
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::resumeValueListening( )
 {
     OSL_PRECOND( !m_sValuePropertyName.isEmpty(), "OBoundControlModel::resumeValueListening: don't have a value property!" );
     OSL_PRECOND( m_pAggPropMultiplexer, "OBoundControlModel::resumeValueListening: I *am* not listening at all!" );
     OSL_PRECOND( !m_pAggPropMultiplexer || m_pAggPropMultiplexer->locked(), "OBoundControlModel::resumeValueListening: listening not suspended currently!" );
-
     if ( m_pAggPropMultiplexer )
         m_pAggPropMultiplexer->unlock();
 }
 
-//-----------------------------------------------------------------------------
 Sequence< Type > OBoundControlModel::_getTypes()
 {
     TypeBag aTypes(
@@ -1457,12 +1338,10 @@ Sequence< Type > OBoundControlModel::_getTypes()
 
     if ( m_bSupportsValidation )
         aTypes.addTypes( OBoundControlModel_VALIDATION::getTypes() );
-
     return aTypes.getTypes();
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
 void OBoundControlModel::disposing()
 {
     OControlModel::disposing();
@@ -1486,32 +1365,32 @@ void OBoundControlModel::disposing()
         getField()->removePropertyChangeListener( PROPERTY_VALUE, this );
         resetField();
     }
-    m_xCursor = NULL;
 
+    m_xCursor = NULL;
     Reference< XComponent > xComp( m_xLabelControl, UNO_QUERY );
     if ( xComp.is() )
         xComp->removeEventListener(static_cast< XEventListener* >( static_cast< XPropertyChangeListener* >( this ) ) );
-
     // disconnect from our external value binding
     if ( hasExternalValueBinding() )
         disconnectExternalValueBinding();
-
     // dito for the validator
     if ( hasValidator() )
         disconnectValidator( );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onValuePropertyChange( ControlModelLock& i_rControLock )
 {
     if ( hasExternalValueBinding() )
-    {   // the control value changed, while we have an external value binding
+    {
+        // the control value changed, while we have an external value binding
         // -> forward the value to it
         if ( m_eControlValueChangeInstigator != eExternalBinding )
             transferControlValueToExternal( i_rControLock );
     }
+
     else if ( !m_bCommitable && m_xColumnUpdate.is() )
-    {   // the control value changed, while we are  bound to a database column,
+    {
+        // the control value changed, while we are  bound to a database column,
         // but not committable (which means changes in the control have to be reflected to
         // the underlying database column immediately)
         // -> forward the value to the database column
@@ -1524,45 +1403,36 @@ void OBoundControlModel::onValuePropertyChange( ControlModelLock& i_rControLock
         recheckValidity( true );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::_propertyChanged( const PropertyChangeEvent& _rEvt ) throw ( RuntimeException )
 {
     ControlModelLock aLock( *this );
-
     OSL_ENSURE( _rEvt.PropertyName == m_sValuePropertyName,
         "OBoundControlModel::_propertyChanged: where did this come from (1)?" );
     OSL_ENSURE( m_pAggPropMultiplexer && !m_pAggPropMultiplexer->locked(),
         "OBoundControlModel::_propertyChanged: where did this come from (2)?" );
-
     if ( _rEvt.PropertyName == m_sValuePropertyName )
     {
         onValuePropertyChange( aLock );
     }
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::startAggregatePropertyListening( const OUString& _rPropertyName )
 {
     OSL_PRECOND( m_pAggPropMultiplexer, "OBoundControlModel::startAggregatePropertyListening: no multiplexer!" );
     OSL_ENSURE( !_rPropertyName.isEmpty(), "OBoundControlModel::startAggregatePropertyListening: invalid property name!" );
-
     if ( m_pAggPropMultiplexer && !_rPropertyName.isEmpty() )
     {
         m_pAggPropMultiplexer->addProperty( _rPropertyName );
     }
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::doFormListening( const bool _bStart )
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::doFormListening: external value binding should overrule the database binding!" );
-
     if ( isFormListening() == _bStart )
         return;
-
     if ( m_xAmbientForm.is() )
         _bStart ? m_xAmbientForm->addLoadListener( this ) : m_xAmbientForm->removeLoadListener( this );
-
     Reference< XLoadable > xParentLoadable( getParent(), UNO_QUERY );
     if ( getParent().is() && !xParentLoadable.is() )
     {
@@ -1578,34 +1448,26 @@ void OBoundControlModel::doFormListening( const bool _bStart )
 }
 
 // XChild
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxParent) throw(com::sun::star::lang::NoSupportException, RuntimeException)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
-
     if ( getParent() == _rxParent )
         return;
-
     // disconnect from database column (which is controlled by parent, directly or indirectly)
     if ( hasField() )
         impl_disconnectDatabaseColumn_noNotify();
-
     // log off old listeners
     if ( isFormListening() )
         doFormListening( false );
-
     // actually set the new parent
     OControlModel::setParent( _rxParent );
-
     // a new parent means a new ambient form
     impl_determineAmbientForm_nothrow();
-
     if ( !hasExternalValueBinding() )
     {
         // log on new listeners
         doFormListening( true );
-
         // re-connect to database column of the new parent
         if ( m_xAmbientForm.is() && m_xAmbientForm->isLoaded() )
             impl_connectDatabaseColumn_noNotify( false );
@@ -1613,38 +1475,38 @@ void SAL_CALL OBoundControlModel::setParent(const Reference<XInterface>& _rxPare
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::disposing(const com::sun::star::lang::EventObject& _rEvent) throw (RuntimeException)
 {
     ControlModelLock aLock( *this );
-
     if ( _rEvent.Source == getField() )
     {
         resetField();
     }
+
     else if ( _rEvent.Source == m_xLabelControl )
     {
         Reference<XPropertySet> xOldValue = m_xLabelControl;
         m_xLabelControl = NULL;
-
         // fire a propertyChanged (when we leave aLock's scope)
         aLock.addPropertyNotification( PROPERTY_ID_CONTROLLABEL, makeAny( xOldValue ), makeAny( m_xLabelControl ) );
     }
+
     else if ( _rEvent.Source == m_xExternalBinding )
     {   // *first* check for the external binding
         disconnectExternalValueBinding( );
     }
+
     else if ( _rEvent.Source == m_xValidator )
     {   // *then* check for the validator. Reason is that bindings may also act as validator at the same
         // time, in this case, the validator is automatically revoked when the binding is revoked
         disconnectValidator( );
     }
+
     else
         OControlModel::disposing(_rEvent);
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
 StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -1653,12 +1515,10 @@ StringSequence SAL_CALL OBoundControlModel::getSupportedServiceNames() throw(Run
     );
 }
 
-//------------------------------------------------------------------------------
 Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Static() throw( RuntimeException )
 {
     Sequence< OUString > aOwnServiceNames( 1 );
     aOwnServiceNames[ 0 ] = "com.sun.star.form.DataAwareControlModel";
-
     return ::comphelper::concatSequences(
         OControlModel::getSupportedServiceNames_Static(),
         aOwnServiceNames
@@ -1666,19 +1526,14 @@ Sequence< OUString > SAL_CALL OBoundControlModel::getSupportedServiceNames_Stati
 }
 
 // XPersist
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::write( const Reference<stario::XObjectOutputStream>& _rxOutStream ) throw(stario::IOException, RuntimeException)
 {
     OControlModel::write(_rxOutStream);
-
     osl::MutexGuard aGuard(m_aMutex);
-
     // Version
     _rxOutStream->writeShort(0x0002);
-
     // Controlsource
     ::comphelper::operator<<( _rxOutStream, m_aControlSource);
-
     // !!! IMPORTANT NOTE !!!
     // don't write any new members here : this wouldn't be compatible with older versions, as OBoundControlModel
     // is a base class which is called in derived classes "read" method. So if you increment the version
@@ -1688,7 +1543,6 @@ void SAL_CALL OBoundControlModel::write( const Reference<stario::XObjectOutputSt
     // !!! EOIN !!!
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::defaultCommonProperties()
 {
     Reference<com::sun::star::lang::XComponent> xComp(m_xLabelControl, UNO_QUERY);
@@ -1697,15 +1551,12 @@ void OBoundControlModel::defaultCommonProperties()
     m_xLabelControl = NULL;
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::readCommonProperties(const Reference<stario::XObjectInputStream>& _rxInStream)
 {
     sal_Int32 nLen = _rxInStream->readLong();
-
     Reference<stario::XMarkableStream> xMark(_rxInStream, UNO_QUERY);
     DBG_ASSERT(xMark.is(), "OBoundControlModel::readCommonProperties : can only work with markable streams !");
     sal_Int32 nMark = xMark->createMark();
-
     // read the reference to the label control
     Reference<stario::XPersistObject> xPersist;
     sal_Int32 nUsedFlag;
@@ -1716,26 +1567,21 @@ void OBoundControlModel::readCommonProperties(const Reference<stario::XObjectInp
     Reference< XComponent > xComp( m_xLabelControl, UNO_QUERY );
     if (xComp.is())
         xComp->addEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this)));
-
     // read any other new common properties here
-
     // skip the remaining bytes
     xMark->jumpToMark(nMark);
     _rxInStream->skipBytes(nLen);
     xMark->deleteMark(nMark);
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::writeCommonProperties(const Reference<stario::XObjectOutputStream>& _rxOutStream)
 {
     Reference<stario::XMarkableStream> xMark(_rxOutStream, UNO_QUERY);
     DBG_ASSERT(xMark.is(), "OBoundControlModel::writeCommonProperties : can only work with markable streams !");
     sal_Int32 nMark = xMark->createMark();
-
     // a placeholder where we will write the overall length (later in this method)
     sal_Int32 nLen = 0;
     _rxOutStream->writeLong(nLen);
-
     // write the reference to the label control
     Reference<stario::XPersistObject> xPersist(m_xLabelControl, UNO_QUERY);
     sal_Int32 nUsedFlag = 0;
@@ -1744,9 +1590,7 @@ void OBoundControlModel::writeCommonProperties(const Reference<stario::XObjectOu
     _rxOutStream->writeLong(nUsedFlag);
     if (xPersist.is())
         _rxOutStream->writeObject(xPersist);
-
     // write any other new common properties here
-
     // write the correct length at the beginning of the block
     nLen = xMark->offsetToMark(nMark) - sizeof(nLen);
     xMark->jumpToMark(nMark);
@@ -1755,17 +1599,14 @@ void OBoundControlModel::writeCommonProperties(const Reference<stario::XObjectOu
     xMark->deleteMark(nMark);
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStream >& _rxInStream ) throw(stario::IOException, RuntimeException)
 {
     OControlModel::read(_rxInStream);
-
     osl::MutexGuard aGuard(m_aMutex);
     sal_uInt16 nVersion = _rxInStream->readShort(); (void)nVersion;
     ::comphelper::operator>>( _rxInStream, m_aControlSource);
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
 {
     switch (nHandle)
@@ -1793,7 +1634,6 @@ void OBoundControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) co
     }
 }
 
-//------------------------------------------------------------------------------
 sal_Bool OBoundControlModel::convertFastPropertyValue(
                                 Any& _rConvertedValue, Any& _rOldValue,
                 sal_Int32 _nHandle,
@@ -1819,6 +1659,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
                 getFastPropertyValue(_rOldValue, _nHandle);
                 bModified = m_xLabelControl.is();
             }
+
             else
             {
                 bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_xLabelControl);
@@ -1826,6 +1667,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
                     // an empty interface is interpreted as VOID
                     _rOldValue.clear();
             }
+
             break;
         default:
             bModified = OControlModel::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue);
@@ -1833,7 +1675,6 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
     return bModified;
 }
 
-//------------------------------------------------------------------------------
 Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
 {
     Any aDefault;
@@ -1842,11 +1683,9 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
         case PROPERTY_ID_INPUT_REQUIRED:
             aDefault <<= sal_Bool( sal_True );
             break;
-
         case PROPERTY_ID_CONTROLSOURCE:
             aDefault <<= OUString();
             break;
-
         case PROPERTY_ID_CONTROLLABEL:
             aDefault <<= Reference< XPropertySet >();
             break;
@@ -1854,7 +1693,6 @@ Any OBoundControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     return aDefault;
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
 {
     switch (nHandle)
@@ -1872,7 +1710,6 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
         {
             if ( rValue.hasValue() && ( rValue.getValueTypeClass() != TypeClass_INTERFACE ) )
                 throw com::sun::star::lang::IllegalArgumentException();
-
             Reference< XInterface > xNewValue( rValue, UNO_QUERY );
             if ( !xNewValue.is() )
             {   // set property to "void"
@@ -1902,20 +1739,20 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
                 if (!xAsForm.is())
                     // found my root
                     break;
-
                 Reference<XChild> xLoopAsChild(xMyTopLevel, UNO_QUERY);
                 xMyTopLevel = xLoopAsChild.is() ? xLoopAsChild->getParent() : Reference< XInterface >();
             }
+
             Reference< XInterface > xNewTopLevel = xAsChild->getParent();
             while (xNewTopLevel.is())
             {
                 Reference<XForm> xAsForm(xNewTopLevel, UNO_QUERY);
                 if (!xAsForm.is())
                     break;
-
                 Reference<XChild> xLoopAsChild(xNewTopLevel, UNO_QUERY);
                 xNewTopLevel = xLoopAsChild.is() ? xLoopAsChild->getParent() : Reference< XInterface >();
             }
+
             if (xNewTopLevel != xMyTopLevel)
             {
                 // the both objects don't belong to the same forms collection -> not acceptable
@@ -1927,6 +1764,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
             if (xComp.is())
                 xComp->addEventListener(static_cast<com::sun::star::lang::XEventListener*>(static_cast<XPropertyChangeListener*>(this)));
         }
+
         break;
         default:
             OControlModel::setFastPropertyValue_NoBroadcast(nHandle, rValue );
@@ -1934,7 +1772,6 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
 {
     // if the DBColumn value changed, transfer it to the control
@@ -1945,10 +1782,10 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
         if ( m_bForwardValueChanges && m_xColumn.is() )
             transferDbValueToControl();
     }
+
     else
     {
         OSL_ENSURE( evt.Source == m_xExternalBinding, "OBoundControlModel::propertyChange: where did this come from?" );
-
         // our binding has properties which can control properties of ourself
         OUString sBindingControlledProperty;
         bool bForwardToLabelControl = false;
@@ -1956,71 +1793,64 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
         {
             sBindingControlledProperty = PROPERTY_READONLY;
         }
+
         else if ( evt.PropertyName.equals( PROPERTY_RELEVANT ) )
         {
             sBindingControlledProperty = PROPERTY_ENABLED;
             bForwardToLabelControl = true;
         }
+
         else
             return;
-
         try
         {
             setPropertyValue( sBindingControlledProperty, evt.NewValue );
             if ( bForwardToLabelControl && m_xLabelControl.is() )
                 m_xLabelControl->setPropertyValue( sBindingControlledProperty, evt.NewValue );
         }
+
         catch( const Exception& )
         {
             SAL_WARN("forms.component",  "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!");
             DBG_UNHANDLED_EXCEPTION();
         }
+
     }
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::onRowSetChanged( const EventObject& /*i_Event*/ ) throw (RuntimeException)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
-
     // disconnect from database column (which is controlled by parent, directly or indirectly)
     if ( hasField() )
         impl_disconnectDatabaseColumn_noNotify();
-
     // log off old listeners
     if ( isFormListening() )
         doFormListening( false );
-
     // determine the new ambient form
     impl_determineAmbientForm_nothrow();
-
     // log on new listeners
     doFormListening( true );
-
     // re-connect to database column if needed and possible
     if ( m_xAmbientForm.is() && m_xAmbientForm->isLoaded() )
         impl_connectDatabaseColumn_noNotify( false );
 }
 
 // XBoundComponent
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::addUpdateListener(const Reference<XUpdateListener>& _rxListener) throw(RuntimeException)
 {
     m_aUpdateListeners.addInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::removeUpdateListener(const Reference< XUpdateListener>& _rxListener) throw(RuntimeException)
 {
     m_aUpdateListeners.removeInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
 sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException)
 {
     ControlModelLock aLock( *this );
-
     OSL_PRECOND( m_bCommitable, "OBoundControlModel::commit: invalid call (I'm not commitable !) " );
     if ( hasExternalValueBinding() )
     {
@@ -2036,22 +1866,18 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException)
 
     OSL_ENSURE( !hasExternalValueBinding(), "OBoundControlModel::commit: control flow broken!" );
         // we reach this only if we're not working with an external binding
-
     if ( !hasField() )
         return sal_True;
-
     ::cppu::OInterfaceIteratorHelper aIter( m_aUpdateListeners );
     EventObject aEvent;
     aEvent.Source = static_cast< XWeak* >( this );
     sal_Bool bSuccess = sal_True;
-
     aLock.release();
-    // >>>>>>>> ----- UNSAFE ----- >>>>>>>>
+    // UNSAFE >
     while (aIter.hasMoreElements() && bSuccess)
         bSuccess = static_cast< XUpdateListener* >( aIter.next() )->approveUpdate( aEvent );
-    // <<<<<<<< ----- UNSAFE ----- <<<<<<<<
+    // < UNSAFE
     aLock.acquire();
-
     if ( bSuccess )
     {
         try
@@ -2059,10 +1885,12 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException)
             if ( m_xColumnUpdate.is() )
                 bSuccess = commitControlValueToDbColumn( false );
         }
+
         catch(const Exception&)
         {
             bSuccess = sal_False;
         }
+
     }
 
     if ( bSuccess )
@@ -2070,11 +1898,9 @@ sal_Bool SAL_CALL OBoundControlModel::commit() throw(RuntimeException)
         aLock.release();
         m_aUpdateListeners.notifyEach( &XUpdateListener::updated, aEvent );
     }
-
     return bSuccess;
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::resetField()
 {
     m_xColumnUpdate.clear();
@@ -2083,18 +1909,15 @@ void OBoundControlModel::resetField()
     m_nFieldType = DataType::OTHER;
 }
 
-//------------------------------------------------------------------------------
 sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::connectToField: invalid call (have an external binding)!" );
-
-    // wenn eine Verbindung zur Datenbank existiert
+    // if there's a connection to the database
     if (rForm.is() && getConnection(rForm).is())
     {
-        // Feld bestimmen und PropertyChangeListener
+        // determine field and PropertyChangeListener
         m_xCursor = rForm;
         Reference<XPropertySet> xFieldCandidate;
-
         if (m_xCursor.is())
         {
             Reference<XColumnsSupplier> xColumnsSupplier(m_xCursor, UNO_QUERY);
@@ -2106,7 +1929,9 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
                 {
                     OSL_VERIFY( xColumns->getByName(m_aControlSource) >>= xFieldCandidate );
                 }
+
             }
+
         }
 
         try
@@ -2118,42 +1943,44 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
                 if ( approveDbColumnType( nFieldType ) )
                     impl_setField_noNotify( xFieldCandidate );
             }
+
             else
                 impl_setField_noNotify( NULL );
-
             if ( m_xField.is() )
             {
-                if( m_xField->getPropertySetInfo()->hasPropertyByName( PROPERTY_VALUE ) )
+                if ( m_xField->getPropertySetInfo()->hasPropertyByName( PROPERTY_VALUE ) )
                 {
                     m_nFieldType = nFieldType;
-
-                    // an wertaenderungen horchen
+                    // listen to changing values
                     m_xField->addPropertyChangeListener( PROPERTY_VALUE, this );
                     m_xColumnUpdate = Reference< XColumnUpdate >( m_xField, UNO_QUERY );
                     m_xColumn = Reference< XColumn >( m_xField, UNO_QUERY );
-
                     sal_Int32 nNullableFlag = ColumnValue::NO_NULLS;
                     m_xField->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullableFlag;
                     m_bRequired = (ColumnValue::NO_NULLS == nNullableFlag);
-                        // we're optimistic : in case of ColumnValue_NULLABLE_UNKNOWN we assume nullability ....
+                        // we're optimistic: in case of ColumnValue_NULLABLE_UNKNOWN we assume nullability...
                 }
+
                 else
                 {
                     SAL_WARN("forms.component", "OBoundControlModel::connectToField: property " << PROPERTY_VALUE << " not supported!");
                     impl_setField_noNotify( NULL );
                 }
+
             }
+
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
             resetField();
         }
+
     }
     return hasField();
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::initFromField( const Reference< XRowSet >& _rxRowSet )
 {
     // but only if the rowset if posisitioned on a valid record
@@ -2168,11 +1995,9 @@ void OBoundControlModel::initFromField( const Reference< XRowSet >& _rxRowSet )
     }
 }
 
-//------------------------------------------------------------------------------
 sal_Bool OBoundControlModel::approveDbColumnType(sal_Int32 _nColumnType)
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::approveDbColumnType: invalid call (have an external binding)!" );
-
     if ((_nColumnType == DataType::BINARY) || (_nColumnType == DataType::VARBINARY)
         || (_nColumnType == DataType::LONGVARBINARY) || (_nColumnType == DataType::OTHER)
         || (_nColumnType == DataType::OBJECT) || (_nColumnType == DataType::DISTINCT)
@@ -2180,15 +2005,12 @@ sal_Bool OBoundControlModel::approveDbColumnType(sal_Int32 _nColumnType)
         || (_nColumnType == DataType::BLOB) /*|| (_nColumnType == DataType::CLOB)*/
         || (_nColumnType == DataType::REF) || (_nColumnType == DataType::SQLNULL))
         return sal_False;
-
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::impl_determineAmbientForm_nothrow()
 {
     Reference< XInterface > xParent( const_cast< OBoundControlModel* >( this )->getParent() );
-
     m_xAmbientForm.set( xParent, UNO_QUERY );
     if ( !m_xAmbientForm.is() )
     {
@@ -2198,21 +2020,17 @@ void OBoundControlModel::impl_determineAmbientForm_nothrow()
     }
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::impl_connectDatabaseColumn_noNotify( bool _bFromReload )
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::impl_connectDatabaseColumn_noNotify: not to be called with an external value binding!" );
-
     // consistency checks
     DBG_ASSERT( !( hasField() && !_bFromReload ),
         "OBoundControlModel::impl_connectDatabaseColumn_noNotify: the form is just *loaded*, but we already have a field!" );
     (void)_bFromReload;
-
     Reference< XRowSet > xRowSet( m_xAmbientForm, UNO_QUERY );
     OSL_ENSURE( xRowSet.is(), "OBoundControlModel::impl_connectDatabaseColumn_noNotify: no row set!" );
     if ( !xRowSet.is() )
         return;
-
     if ( !hasField() )
     {
         // connect to the column
@@ -2222,24 +2040,19 @@ void OBoundControlModel::impl_connectDatabaseColumn_noNotify( bool _bFromReload
     // now that we're connected (more or less, even if we did not find a column),
     // we definitely want to forward any potentially occuring value changes
     m_bForwardValueChanges = sal_True;
-
     // let derived classes react on this new connection
     m_bLoaded = sal_True;
     onConnectedDbColumn( xRowSet );
-
     // initially transfer the db column value to the control, if we successfully connected to a database column
     if ( hasField() )
         initFromField( xRowSet );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::impl_disconnectDatabaseColumn_noNotify()
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::impl_disconnectDatabaseColumn_noNotify: not to be called with an external value binding!" );
-
     // let derived classes react on this
     onDisconnectedDbColumn();
-
     if ( hasField() )
     {
         getField()->removePropertyChangeListener( PROPERTY_VALUE, this );
@@ -2250,72 +2063,55 @@ void OBoundControlModel::impl_disconnectDatabaseColumn_noNotify()
     m_bLoaded = sal_False;
 }
 
-//==============================================================================
 // XLoadListener
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::loaded( const EventObject& _rEvent ) throw(RuntimeException)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
-
     OSL_ENSURE( _rEvent.Source == m_xAmbientForm, "OBoundControlModel::loaded: where does this come from?" );
     (void)_rEvent;
-
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::loaded: we should never reach this with an external value binding!" );
     if ( hasExternalValueBinding() )
         return;
-
     impl_connectDatabaseColumn_noNotify( false );
 }
 
-
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::unloaded( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException)
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::unloaded: we should never reach this with an external value binding!" );
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::reloading( const com::sun::star::lang::EventObject& /*aEvent*/ ) throw(RuntimeException)
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::reloading: we should never reach this with an external value binding!" );
     if ( hasExternalValueBinding() )
         return;
-
     osl::MutexGuard aGuard(m_aMutex);
     m_bForwardValueChanges = sal_False;
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::unloading(const com::sun::star::lang::EventObject& /*aEvent*/) throw(RuntimeException)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
-
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::unloading: we should never reach this with an external value binding!" );
     if ( hasExternalValueBinding() )
         return;
-
     impl_disconnectDatabaseColumn_noNotify();
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::reloaded( const EventObject& _rEvent ) throw(RuntimeException)
 {
     ControlModelLock aLock( *this );
     FieldChangeNotifier aBoundFieldNotifier( aLock );
-
     OSL_ENSURE( _rEvent.Source == m_xAmbientForm, "OBoundControlModel::reloaded: where does this come from?" );
     (void)_rEvent;
-
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::reloaded: we should never reach this with an external value binding!" );
     if ( hasExternalValueBinding() )
         return;
-
     impl_connectDatabaseColumn_noNotify( true );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::setControlValue( const Any& _rValue, ValueChangeInstigator _eInstigator )
 {
     m_eControlValueChangeInstigator = _eInstigator;
@@ -2323,14 +2119,12 @@ void OBoundControlModel::setControlValue( const Any& _rValue, ValueChangeInstiga
     m_eControlValueChangeInstigator = eOther;
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::doSetControlValue( const Any& _rValue )
 {
     OSL_PRECOND( m_xAggregateFastSet.is() && m_xAggregateSet.is(),
         "OBoundControlModel::doSetControlValue: invalid aggregate !" );
     OSL_PRECOND( !m_sValuePropertyName.isEmpty() || ( m_nValuePropertyAggregateHandle != -1 ),
         "OBoundControlModel::doSetControlValue: please override if you have own value property handling!" );
-
     try
     {
         // release our mutex once (it's acquired in one of the calling methods), as setting aggregate properties
@@ -2341,11 +2135,14 @@ void OBoundControlModel::doSetControlValue( const Any& _rValue )
         {
             m_xAggregateFastSet->setFastPropertyValue( m_nValuePropertyAggregateHandle, _rValue );
         }
+
         else if ( !m_sValuePropertyName.isEmpty() && m_xAggregateSet.is() )
         {
             m_xAggregateSet->setPropertyValue( m_sValuePropertyName, _rValue );
         }
+
     }
+
     catch( const Exception& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::doSetControlValue: caught an exception!");
@@ -2353,7 +2150,6 @@ void OBoundControlModel::doSetControlValue( const Any& _rValue )
     }
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onConnectedValidator( )
 {
     try
@@ -2367,15 +2163,16 @@ void OBoundControlModel::onConnectedValidator( )
         if ( xAggregatePropertyInfo.is() && xAggregatePropertyInfo->hasPropertyByName( PROPERTY_ENFORCE_FORMAT ) )
             m_xAggregateSet->setPropertyValue( PROPERTY_ENFORCE_FORMAT, makeAny( (sal_Bool)sal_False ) );
     }
+
     catch( const Exception& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::onConnectedValidator: caught an exception!");
         DBG_UNHANDLED_EXCEPTION();
     }
+
     recheckValidity( false );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onDisconnectedValidator( )
 {
     try
@@ -2386,70 +2183,61 @@ void OBoundControlModel::onDisconnectedValidator( )
         if ( xAggregatePropertyInfo.is() && xAggregatePropertyInfo->hasPropertyByName( PROPERTY_ENFORCE_FORMAT ) )
             m_xAggregateSet->setPropertyValue( PROPERTY_ENFORCE_FORMAT, makeAny( (sal_Bool)sal_True ) );
     }
+
     catch( const Exception& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::onDisconnectedValidator: caught an exception!");
         DBG_UNHANDLED_EXCEPTION();
     }
+
     recheckValidity( false );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onConnectedExternalValue( )
 {
     calculateExternalValueType();
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onDisconnectedExternalValue( )
 {
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onConnectedDbColumn( const Reference< XInterface >& /*_rxForm*/ )
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::onConnectedDbColumn: how this? There's an external value binding!" );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::onDisconnectedDbColumn()
 {
     OSL_PRECOND( !hasExternalValueBinding(), "OBoundControlModel::onDisconnectedDbColumn: how this? There's an external value binding!" );
 }
 
 // XReset
-//-----------------------------------------------------------------------------
 Any OBoundControlModel::getDefaultForReset() const
 {
     return Any();
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::resetNoBroadcast()
 {
     setControlValue( getDefaultForReset(), eOther );
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::addResetListener(const Reference<XResetListener>& l) throw (RuntimeException)
 {
     m_aResetHelper.addResetListener( l );
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::removeResetListener(const Reference<XResetListener>& l) throw (RuntimeException)
 {
     m_aResetHelper.removeResetListener( l );
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::reset() throw (RuntimeException)
 {
     if ( !m_aResetHelper.approveReset() )
        return;
-
     ControlModelLock aLock( *this );
-
     // on a new record?
     sal_Bool bIsNewRecord = sal_False;
     Reference<XPropertySet> xSet( m_xCursor, UNO_QUERY );
@@ -2459,10 +2247,12 @@ void OBoundControlModel::reset() throw (RuntimeException)
         {
             xSet->getPropertyValue( PROPERTY_ISNEW ) >>= bIsNewRecord;
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
         }
+
     }
 
     // cursor on an invalid row?
@@ -2475,13 +2265,14 @@ void OBoundControlModel::reset() throw (RuntimeException)
                                     )
                                 &&  !bIsNewRecord;
     }
+
     catch( const SQLException& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::reset: caught an SQL exception!" );
         DBG_UNHANDLED_EXCEPTION();
     }
-    // #i24495# - don't count the insert row as "invalid"
 
+    // #i24495# - don't count the insert row as "invalid"
     sal_Bool bSimpleReset =
                         (   !m_xColumn.is()                     // no connection to a database column
                         ||  (   m_xCursor.is()                  // OR   we have an improperly positioned cursor
@@ -2489,7 +2280,6 @@ void OBoundControlModel::reset() throw (RuntimeException)
                             )
                         ||  hasExternalValueBinding()           // OR we have an external value binding
                         );
-
     if ( !bSimpleReset )
     {
         // The default values will be set if and only if the current value of the field which we're bound
@@ -2497,7 +2287,6 @@ void OBoundControlModel::reset() throw (RuntimeException)
         // Else, the current field value should be refreshed
         // This behaviour is not completely ... "matured": What should happen if the field as well as the
         // control have a default value?
-
         sal_Bool bIsNull = sal_True;
         // we have to access the field content at least once to get a reliable result by XColumn::wasNull
         try
@@ -2519,9 +2308,9 @@ void OBoundControlModel::reset() throw (RuntimeException)
                 m_xColumn->getBlob();
             else
                 m_xColumn->getString();
-
             bIsNull = m_xColumn->wasNull();
         }
+
         catch(const Exception&)
         {
             SAL_WARN("forms.component", "OBoundControlModel::reset: this should have succeeded in all cases!");
@@ -2529,7 +2318,6 @@ void OBoundControlModel::reset() throw (RuntimeException)
         }
 
         sal_Bool bNeedValueTransfer = sal_True;
-
         if ( bIsNull )
         {
             if ( bIsNewRecord )
@@ -2538,18 +2326,18 @@ void OBoundControlModel::reset() throw (RuntimeException)
                 resetNoBroadcast();
                 // and immediately commit the changes to the DB column, to keep consistency
                 commitControlValueToDbColumn( true );
-
                 bNeedValueTransfer = sal_False;
             }
+
         }
 
         if ( bNeedValueTransfer )
             transferDbValueToControl();
     }
+
     else
     {
         resetNoBroadcast();
-
         // transfer to the external binding, if necessary
         if ( hasExternalValueBinding() )
             transferControlValueToExternal( aLock );
@@ -2558,31 +2346,26 @@ void OBoundControlModel::reset() throw (RuntimeException)
     // revalidate, if necessary
     if ( hasValidator() )
         recheckValidity( true );
-
     aLock.release();
-
     m_aResetHelper.notifyResetted();
 }
 
-// -----------------------------------------------------------------------------
 void OBoundControlModel::impl_setField_noNotify( const Reference< XPropertySet>& _rxField )
 {
     DBG_ASSERT( !hasExternalValueBinding(), "OBoundControlModel::impl_setField_noNotify: We have an external value binding!" );
     m_xField = _rxField;
 }
 
-//--------------------------------------------------------------------
 sal_Bool OBoundControlModel::impl_approveValueBinding_nolock( const Reference< XValueBinding >& _rxBinding )
 {
     if ( !_rxBinding.is() )
         return sal_False;
-
     Sequence< Type > aTypeCandidates;
     {
-        // SYNCHRONIZED -->
+        // SYNCHRONIZED >
         ::osl::MutexGuard aGuard( m_aMutex );
         aTypeCandidates = getSupportedBindingTypes();
-        // <-- SYNCHRONIZED
+        // < SYNCHRONIZED
     }
 
     for (   const Type* pType = aTypeCandidates.getConstArray();
@@ -2593,39 +2376,31 @@ sal_Bool OBoundControlModel::impl_approveValueBinding_nolock( const Reference< X
         if ( _rxBinding->supportsType( *pType ) )
             return sal_True;
     }
-
     return sal_False;
 }
 
-//--------------------------------------------------------------------
 void OBoundControlModel::connectExternalValueBinding(
         const Reference< XValueBinding >& _rxBinding, ControlModelLock& _rInstanceLock )
 {
     OSL_PRECOND( _rxBinding.is(), "OBoundControlModel::connectExternalValueBinding: invalid binding instance!" );
     OSL_PRECOND( !hasExternalValueBinding( ), "OBoundControlModel::connectExternalValueBinding: precond not met (currently have a binding)!" );
-
     // if we're connected to a database column, suspend this
     if ( hasField() )
         impl_disconnectDatabaseColumn_noNotify();
-
     // suspend listening for load-related events at out ambient form.
     // This is because an external value binding overrules a possible database binding.
     if ( isFormListening() )
         doFormListening( false );
-
     // remember this new binding
     m_xExternalBinding = _rxBinding;
-
     // tell the derivee
     onConnectedExternalValue();
-
     try
     {
         // add as value listener so we get notified when the value changes
         Reference< XModifyBroadcaster > xModifiable( m_xExternalBinding, UNO_QUERY );
         if ( xModifiable.is() )
             xModifiable->addModifyListener( this );
-
         // add as property change listener for some (possibly present) properties we're
         // interested in
         Reference< XPropertySet > xBindingProps( m_xExternalBinding, UNO_QUERY );
@@ -2637,13 +2412,17 @@ void OBoundControlModel::connectExternalValueBinding(
                 xBindingProps->addPropertyChangeListener( PROPERTY_READONLY, this );
                 m_bBindingControlsRO = sal_True;
             }
+
             if ( xBindingPropsInfo->hasPropertyByName( PROPERTY_RELEVANT ) )
             {
                 xBindingProps->addPropertyChangeListener( PROPERTY_RELEVANT, this );
                 m_bBindingControlsEnable = sal_True;
             }
+
         }
+
     }
+
     catch( const Exception& )
     {
         DBG_UNHANDLED_EXCEPTION();
@@ -2651,7 +2430,6 @@ void OBoundControlModel::connectExternalValueBinding(
 
     // propagate our new value
     transferExternalValueToControl( _rInstanceLock );
-
     // if the binding is also a validator, use it, too. This is a constraint of the
     // com.sun.star.form.binding.ValidatableBindableFormComponent service
     if ( m_bSupportsValidation )
@@ -2662,14 +2440,15 @@ void OBoundControlModel::connectExternalValueBinding(
             if ( xAsValidator.is() )
                 setValidator( xAsValidator );
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
         }
+
     }
 }
 
-//--------------------------------------------------------------------
 void OBoundControlModel::disconnectExternalValueBinding( )
 {
     try
@@ -2678,7 +2457,6 @@ void OBoundControlModel::disconnectExternalValueBinding( )
         Reference< XModifyBroadcaster > xModifiable( m_xExternalBinding, UNO_QUERY );
         if ( xModifiable.is() )
             xModifiable->removeModifyListener( this );
-
         // remove as property change listener
         Reference< XPropertySet > xBindingProps( m_xExternalBinding, UNO_QUERY );
         if ( m_bBindingControlsRO )
@@ -2686,6 +2464,7 @@ void OBoundControlModel::disconnectExternalValueBinding( )
         if ( m_bBindingControlsEnable )
             xBindingProps->removePropertyChangeListener( PROPERTY_RELEVANT, this );
     }
+
     catch( const Exception& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::disconnectExternalValueBinding: caught an exception!");
@@ -2695,23 +2474,18 @@ void OBoundControlModel::disconnectExternalValueBinding( )
     // if the binding also acts as our validator, disconnect the validator, too
     if ( ( m_xExternalBinding == m_xValidator ) && m_xValidator.is() )
         disconnectValidator( );
-
     // no binding anymore
     m_xExternalBinding.clear();
-
     // be a load listener at our form, again. This was suspended while we had
     // an external value binding in place.
     doFormListening( true );
-
     // re-connect to database column of the new parent
     if ( m_xAmbientForm.is() && m_xAmbientForm->isLoaded() )
         impl_connectDatabaseColumn_noNotify( false );
-
     // tell the derivee
     onDisconnectedExternalValue();
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBinding >& _rxBinding ) throw (IncompatibleTypesException, RuntimeException)
 {
     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::setValueBinding: How did you reach this method?" );
@@ -2727,36 +2501,29 @@ void SAL_CALL OBoundControlModel::setValueBinding( const Reference< XValueBindin
     }
 
     ControlModelLock aLock( *this );
-
     // since a ValueBinding overrules any potentially active database binding, the change in a ValueBinding
     // might trigger a change in our BoundField.
     FieldChangeNotifier aBoundFieldNotifier( aLock );
-
     // disconnect from the old binding
     if ( hasExternalValueBinding() )
         disconnectExternalValueBinding( );
-
     // connect to the new binding
     if ( _rxBinding.is() )
         connectExternalValueBinding( _rxBinding, aLock );
 }
 
-//--------------------------------------------------------------------
 Reference< XValueBinding > SAL_CALL OBoundControlModel::getValueBinding(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     OSL_PRECOND( m_bSupportsExternalBinding, "OBoundControlModel::getValueBinding: How did you reach this method?" );
         // the interface for this method should not have been exposed if we do not
         // support binding to external data
-
     return m_xExternalBinding;
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) throw ( RuntimeException )
 {
     ControlModelLock aLock( *this );
-
     OSL_PRECOND( hasExternalValueBinding(), "OBoundControlModel::modified: Where did this come from?" );
     if ( !m_bTransferingValue && ( m_xExternalBinding == _rEvent.Source ) && m_xExternalBinding.is() )
     {
@@ -2764,83 +2531,76 @@ void SAL_CALL OBoundControlModel::modified( const EventObject& _rEvent ) throw (
     }
 }
 
-//--------------------------------------------------------------------
 void OBoundControlModel::transferDbValueToControl( )
 {
     try
     {
         setControlValue( translateDbColumnToControlValue(), eDbColumnBinding );
     }
+
     catch( const Exception& )
     {
         DBG_UNHANDLED_EXCEPTION();
     }
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::transferExternalValueToControl( ControlModelLock& _rInstanceLock )
 {
         Reference< XValueBinding > xExternalBinding( m_xExternalBinding );
         Type aValueExchangeType( getExternalValueType() );
-
         _rInstanceLock.release();
-        // >>>>>>>> ----- UNSAFE ----- >>>>>>>>
+        // UNSAFE >
         Any aExternalValue;
         try
         {
             aExternalValue = xExternalBinding->getValue( aValueExchangeType );
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        // <<<<<<<< ----- UNSAFE ----- <<<<<<<<
+        // < UNSAFE
         _rInstanceLock.acquire();
-
         setControlValue( translateExternalValueToControlValue( aExternalValue ), eExternalBinding );
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::transferControlValueToExternal( ControlModelLock& _rInstanceLock )
 {
     OSL_PRECOND( m_bSupportsExternalBinding && hasExternalValueBinding(),
         "OBoundControlModel::transferControlValueToExternal: precondition not met!" );
-
     if ( m_xExternalBinding.is() )
     {
         Any aExternalValue( translateControlValueToExternalValue() );
         m_bTransferingValue = sal_True;
-
         _rInstanceLock.release();
-         // >>>>>>>> ----- UNSAFE ----- >>>>>>>>
+         // UNSAFE >
         try
         {
             m_xExternalBinding->setValue( aExternalValue );
         }
+
         catch( const Exception& )
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        // <<<<<<<< ----- UNSAFE ----- <<<<<<<<
-        _rInstanceLock.acquire();
 
+        // < UNSAFE
+        _rInstanceLock.acquire();
         m_bTransferingValue = sal_False;
     }
 }
 
-// -----------------------------------------------------------------------------
 Sequence< Type > OBoundControlModel::getSupportedBindingTypes()
 {
     return Sequence< Type >( &m_aValuePropertyType, 1 );
 }
 
-//-----------------------------------------------------------------------------
 void OBoundControlModel::calculateExternalValueType()
 {
     m_aExternalValueType = Type();
     if ( !m_xExternalBinding.is() )
         return;
-
     Sequence< Type > aTypeCandidates( getSupportedBindingTypes() );
     for (   const Type* pTypeCandidate = aTypeCandidates.getConstArray();
             pTypeCandidate != aTypeCandidates.getConstArray() + aTypeCandidates.getLength();
@@ -2855,30 +2615,24 @@ void OBoundControlModel::calculateExternalValueType()
     }
 }
 
-//-----------------------------------------------------------------------------
 Any OBoundControlModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
 {
     OSL_PRECOND( m_bSupportsExternalBinding && hasExternalValueBinding(),
         "OBoundControlModel::translateExternalValueToControlValue: precondition not met!" );
-
     Any aControlValue( _rExternalValue );
-
     // if the external value is VOID, and our value property is not allowed to be VOID,
     // then default-construct a value
     if ( !aControlValue.hasValue() && !m_bValuePropertyMayBeVoid )
         aControlValue.setValue( NULL, m_aValuePropertyType );
-
-    // outta here
+    // out of here
     return aControlValue;
 }
 
-//------------------------------------------------------------------------------
 Any OBoundControlModel::translateControlValueToExternalValue( ) const
 {
     return getControlValue( );
 }
 
-//------------------------------------------------------------------------------
 Any OBoundControlModel::translateControlValueToValidatableValue( ) const
 {
     OSL_PRECOND( m_xValidator.is(), "OBoundControlModel::translateControlValueToValidatableValue: no validator, so why should I?" );
@@ -2887,34 +2641,30 @@ Any OBoundControlModel::translateControlValueToValidatableValue( ) const
     return getControlValue();
 }
 
-//------------------------------------------------------------------------------
 Any OBoundControlModel::getControlValue( ) const
 {
     OSL_PRECOND( m_xAggregateFastSet.is() && m_xAggregateSet.is(),
         "OBoundControlModel::getControlValue: invalid aggregate !" );
     OSL_PRECOND( !m_sValuePropertyName.isEmpty() || ( m_nValuePropertyAggregateHandle != -1 ),
         "OBoundControlModel::getControlValue: please override if you have own value property handling!" );
-
     // determine the current control value
     Any aControlValue;
     if ( ( m_nValuePropertyAggregateHandle != -1 ) && m_xAggregateFastSet.is() )
     {
         aControlValue = m_xAggregateFastSet->getFastPropertyValue( m_nValuePropertyAggregateHandle );
     }
+
     else if ( !m_sValuePropertyName.isEmpty() && m_xAggregateSet.is() )
     {
         aControlValue = m_xAggregateSet->getPropertyValue( m_sValuePropertyName );
     }
-
     return aControlValue;
 }
 
-//--------------------------------------------------------------------
 void OBoundControlModel::connectValidator( const Reference< XValidator >& _rxValidator )
 {
     OSL_PRECOND( _rxValidator.is(), "OBoundControlModel::connectValidator: invalid validator instance!" );
     OSL_PRECOND( !hasValidator( ), "OBoundControlModel::connectValidator: precond not met (have a validator currently)!" );
-
     m_xValidator = _rxValidator;
 
     // add as value listener so we get notified when the value changes
@@ -2924,15 +2674,14 @@ void OBoundControlModel::connectValidator( const Reference< XValidator >& _rxVal
         {
             m_xValidator->addValidityConstraintListener( this );
         }
+
         catch( const RuntimeException& )
         {
         }
     }
-
     onConnectedValidator( );
 }
 
-//--------------------------------------------------------------------
 void OBoundControlModel::disconnectValidator( )
 {
     OSL_PRECOND( hasValidator( ), "OBoundControlModel::connectValidator: precond not met (don't have a validator currently)!" );
@@ -2944,6 +2693,7 @@ void OBoundControlModel::disconnectValidator( )
         {
             m_xValidator->removeValidityConstraintListener( this );
         }
+
         catch( const RuntimeException& )
         {
         }
@@ -2954,16 +2704,15 @@ void OBoundControlModel::disconnectValidator( )
     onDisconnectedValidator( );
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _rxValidator ) throw (VetoException,RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     OSL_PRECOND( m_bSupportsValidation, "OBoundControlModel::setValidator: How did you reach this method?" );
-        // the interface for this method should not have been exposed if we do not
-        // support validation
+    // the interface for this method should not have been exposed if we do not
+    // support validation
 
     // early out if the validator does not change
-    if( _rxValidator == m_xValidator )
+    if ( _rxValidator == m_xValidator )
         return;
 
     if ( m_xValidator.is() && ( m_xValidator == m_xExternalBinding ) )
@@ -2981,7 +2730,6 @@ void SAL_CALL OBoundControlModel::setValidator( const Reference< XValidator >& _
         connectValidator( _rxValidator );
 }
 
-//--------------------------------------------------------------------
 Reference< XValidator > SAL_CALL OBoundControlModel::getValidator(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2992,7 +2740,6 @@ Reference< XValidator > SAL_CALL OBoundControlModel::getValidator(  ) throw (Run
     return m_xValidator;
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject& /*Source*/ ) throw (RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -3003,13 +2750,11 @@ void SAL_CALL OBoundControlModel::validityConstraintChanged( const EventObject&
     recheckValidity( false );
 }
 
-//--------------------------------------------------------------------
 sal_Bool SAL_CALL OBoundControlModel::isValid(  ) throw (RuntimeException)
 {
     return m_bIsCurrentValueValid;
 }
 
-//--------------------------------------------------------------------
 ::com::sun::star::uno::Any OBoundControlModel::getCurrentFormComponentValue() const
 {
     if ( hasValidator() )
@@ -3017,28 +2762,24 @@ sal_Bool SAL_CALL OBoundControlModel::isValid(  ) throw (RuntimeException)
     return getControlValue();
 }
 
-//--------------------------------------------------------------------
 Any SAL_CALL OBoundControlModel::getCurrentValue(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return getCurrentFormComponentValue();
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::addFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException)
 {
     if ( Listener.is() )
         m_aFormComponentListeners.addInterface( Listener );
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OBoundControlModel::removeFormComponentValidityListener( const Reference< validation::XFormComponentValidityListener >& Listener ) throw (NullPointerException, RuntimeException)
 {
     if ( Listener.is() )
         m_aFormComponentListeners.removeInterface( Listener );
 }
 
-//--------------------------------------------------------------------
 void OBoundControlModel::recheckValidity( bool _bForceNotification )
 {
     try
@@ -3055,7 +2796,9 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
             MutexRelease aRelease( m_aMutex );
             m_aFormComponentListeners.notifyEach( &validation::XFormComponentValidityListener::componentValidityChanged, EventObject( *this ) );
         }
+
     }
+
     catch( const Exception& )
     {
         SAL_WARN("forms.component",  "OBoundControlModel::recheckValidity: caught an exception!");
@@ -3063,7 +2806,6 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
     }
 }
 
-//------------------------------------------------------------------------------
 void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 5, OControlModel )
@@ -3074,11 +2816,6 @@ void OBoundControlModel::describeFixedProperties( Sequence< Property >& _rProps
         DECL_BOOL_PROP1 ( INPUT_REQUIRED,                               BOUND );
     END_DESCRIBE_PROPERTIES()
 }
-
-// -----------------------------------------------------------------------------
-
-//.........................................................................
 }
-//... namespace frm .......................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index afb857dd7a44..eb850260b2d0 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -16,8 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
 #include "FormattedField.hxx"
 #include "services.hxx"
 #include "property.hrc"
@@ -51,14 +49,12 @@
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <osl/mutex.hxx>
-    // needed as long as we use the SolarMutex
+// needed as long as we use the SolarMutex
 #include <comphelper/streamsection.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <unotools/desktopterminationobserver.hxx>
-
 #include <list>
 #include <algorithm>
-
 using namespace dbtools;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
@@ -72,64 +68,44 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
-
 namespace
 {
     typedef com::sun::star::util::Date UNODate;
     typedef com::sun::star::util::Time UNOTime;
     typedef com::sun::star::util::DateTime UNODateTime;
 }
-
-//.........................................................................
 namespace frm
 {
-
-/*************************************************************************/
-
 class StandardFormatsSupplier : protected SvNumberFormatsSupplierObj, public ::utl::ITerminationListener
 {
 protected:
             SvNumberFormatter*                       m_pMyPrivateFormatter;
     static  WeakReference< XNumberFormatsSupplier >  s_xDefaultFormatsSupplier;
-
 public:
     static Reference< XNumberFormatsSupplier > get( const Reference< XComponentContext >& _rxORB );
-
     using SvNumberFormatsSupplierObj::operator new;
     using SvNumberFormatsSupplierObj::operator delete;
-
 protected:
     StandardFormatsSupplier(const Reference< XComponentContext >& _rxFactory,LanguageType _eSysLanguage);
     ~StandardFormatsSupplier();
-
 protected:
     virtual bool    queryTermination() const;
     virtual void    notifyTermination();
 };
-
-//------------------------------------------------------------------
 WeakReference< XNumberFormatsSupplier > StandardFormatsSupplier::s_xDefaultFormatsSupplier;
-
-//------------------------------------------------------------------
 StandardFormatsSupplier::StandardFormatsSupplier(const Reference< XComponentContext > & _rxContext,LanguageType _eSysLanguage)
     :SvNumberFormatsSupplierObj()
     ,m_pMyPrivateFormatter(new SvNumberFormatter(_rxContext, _eSysLanguage))
 {
     SetNumberFormatter(m_pMyPrivateFormatter);
-
     // #i29147#
     ::utl::DesktopTerminationObserver::registerTerminationListener( this );
 }
-
-//------------------------------------------------------------------
 StandardFormatsSupplier::~StandardFormatsSupplier()
 {
     ::utl::DesktopTerminationObserver::revokeTerminationListener( this );
-
     DELETEZ( m_pMyPrivateFormatter );
 }
-
-//------------------------------------------------------------------
 Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Reference< XComponentContext >& _rxORB )
 {
     LanguageType eSysLanguage = LANGUAGE_SYSTEM;
@@ -138,14 +114,11 @@ Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Referenc
         Reference< XNumberFormatsSupplier > xSupplier = s_xDefaultFormatsSupplier;
         if ( xSupplier.is() )
             return xSupplier;
-
         // get the Office's locale
         eSysLanguage = SvtSysLocale().GetLanguageTag().getLanguageType( false);
     }
-
     StandardFormatsSupplier* pSupplier = new StandardFormatsSupplier( _rxORB, eSysLanguage );
     Reference< XNumberFormatsSupplier > xNewlyCreatedSupplier( pSupplier );
-
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
         Reference< XNumberFormatsSupplier > xSupplier = s_xDefaultFormatsSupplier;
@@ -153,20 +126,14 @@ Reference< XNumberFormatsSupplier > StandardFormatsSupplier::get( const Referenc
             // somebody used the small time frame where the mutex was not locked to create and set
             // the supplier
             return xSupplier;
-
         s_xDefaultFormatsSupplier = xNewlyCreatedSupplier;
     }
-
     return xNewlyCreatedSupplier;
 }
-
-//------------------------------------------------------------------
 bool StandardFormatsSupplier::queryTermination() const
 {
     return true;
 }
-
-//------------------------------------------------------------------
 void StandardFormatsSupplier::notifyTermination()
 {
     Reference< XNumberFormatsSupplier > xKeepAlive = this;
@@ -174,19 +141,13 @@ void StandardFormatsSupplier::notifyTermination()
     // earlier than upon unloading the library
     // #i29147#
     s_xDefaultFormatsSupplier = WeakReference< XNumberFormatsSupplier >( );
-
     SetNumberFormatter( NULL );
     DELETEZ( m_pMyPrivateFormatter );
 }
-
-/*************************************************************************/
-//------------------------------------------------------------------
 InterfaceRef SAL_CALL OFormattedControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OFormattedControl( comphelper::getComponentContext(_rxFactory) ));
 }
-
-//------------------------------------------------------------------
 Sequence<Type> OFormattedControl::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -194,8 +155,6 @@ Sequence<Type> OFormattedControl::_getTypes()
         OBoundControl::_getTypes()
     );
 }
-
-//------------------------------------------------------------------
 Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OBoundControl::queryAggregation(_rType);
@@ -203,14 +162,10 @@ Any SAL_CALL OFormattedControl::queryAggregation(const Type& _rType) throw (Runt
         aReturn = OFormattedControl_BASE::queryInterface(_rType);
     return aReturn;
 }
-
-
-//------------------------------------------------------------------------------
 OFormattedControl::OFormattedControl(const Reference<XComponentContext>& _rxFactory)
                :OBoundControl(_rxFactory, VCL_CONTROL_FORMATTEDFIELD)
                ,m_nKeyEvent(0)
 {
-
     increment(m_refCount);
     {
         Reference<XWindow>  xComp;
@@ -221,64 +176,50 @@ OFormattedControl::OFormattedControl(const Reference<XComponentContext>& _rxFact
     }
     decrement(m_refCount);
 }
-
-//------------------------------------------------------------------------------
 OFormattedControl::~OFormattedControl()
 {
     if( m_nKeyEvent )
         Application::RemoveUserEvent( m_nKeyEvent );
-
     if (!OComponentHelper::rBHelper.bDisposed)
     {
         acquire();
         dispose();
     }
-
 }
 
 // XKeyListener
-//------------------------------------------------------------------------------
 void OFormattedControl::disposing(const EventObject& _rSource) throw(RuntimeException)
 {
     OBoundControl::disposing(_rSource);
 }
-
-//------------------------------------------------------------------------------
 void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
 {
     if( e.KeyCode != KEY_RETURN || e.Modifiers != 0 )
         return;
-
     // Steht das Control in einem Formular mit einer Submit-URL?
     Reference<com::sun::star::beans::XPropertySet>  xSet(getModel(), UNO_QUERY);
     if( !xSet.is() )
         return;
-
     Reference<XFormComponent>  xFComp(xSet, UNO_QUERY);
     InterfaceRef  xParent = xFComp->getParent();
     if( !xParent.is() )
         return;
-
     Reference<com::sun::star::beans::XPropertySet>  xFormSet(xParent, UNO_QUERY);
     if( !xFormSet.is() )
         return;
-
     Any aTmp(xFormSet->getPropertyValue( PROPERTY_TARGET_URL ));
     if (!isA(aTmp, static_cast< OUString* >(NULL)) ||
         getString(aTmp).isEmpty() )
         return;
-
     Reference<XIndexAccess>  xElements(xParent, UNO_QUERY);
     sal_Int32 nCount = xElements->getCount();
     if( nCount > 1 )
     {
-
         Reference<com::sun::star::beans::XPropertySet>  xFCSet;
         for( sal_Int32 nIndex=0; nIndex < nCount; nIndex++ )
         {
             //  Any aElement(xElements->getByIndex(nIndex));
             xElements->getByIndex(nIndex) >>= xFCSet;
-
             if (hasProperty(PROPERTY_CLASSID, xFCSet) &&
                 getINT16(xFCSet->getPropertyValue(PROPERTY_CLASSID)) == FormComponentType::TEXTFIELD)
             {
@@ -288,7 +229,6 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
             }
         }
     }
-
     // Da wir noch im Haender stehen, submit asynchron ausloesen
     if( m_nKeyEvent )
         Application::RemoveUserEvent( m_nKeyEvent );
@@ -296,16 +236,13 @@ void OFormattedControl::keyPressed(const ::com::sun::star::awt::KeyEvent& e) thr
                                             OnKeyPressed) );
 }
 
-//------------------------------------------------------------------------------
 void OFormattedControl::keyReleased(const ::com::sun::star::awt::KeyEvent& /*e*/) throw ( ::com::sun::star::uno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
 IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/)
 {
     m_nKeyEvent = 0;
-
     Reference<XFormComponent>  xFComp(getModel(), UNO_QUERY);
     InterfaceRef  xParent = xFComp->getParent();
     Reference<XSubmit>  xSubmit(xParent, UNO_QUERY);
@@ -314,25 +251,20 @@ IMPL_LINK(OFormattedControl, OnKeyPressed, void*, /*EMPTYARG*/)
     return 0L;
 }
 
-//------------------------------------------------------------------------------
 StringSequence  OFormattedControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 1);
-
     OUString*pArray = aSupported.getArray();
     pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_FORMATTEDFIELD;
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
 void OFormattedControl::setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException)
 {
     OBoundControl::setDesignMode(bOn);
 }
 
-/*************************************************************************/
-//------------------------------------------------------------------
 void OFormattedModel::implConstruct()
 {
     // members
@@ -342,48 +274,36 @@ void OFormattedModel::implConstruct()
     m_nKeyType = NumberFormat::UNDEFINED;
     m_aNullDate = DBTypeConversion::getStandardDate();
     m_nFieldType =  DataType::OTHER;
-
     // default our formats supplier
     increment(m_refCount);
     setPropertyToDefaultByHandle(PROPERTY_ID_FORMATSSUPPLIER);
     decrement(m_refCount);
-
     startAggregatePropertyListening( PROPERTY_FORMATKEY );
     startAggregatePropertyListening( PROPERTY_FORMATSSUPPLIER );
 }
-
-//------------------------------------------------------------------
 OFormattedModel::OFormattedModel(const Reference<XComponentContext>& _rxFactory)
     :OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_FORMATTEDFIELD, FRM_SUN_CONTROL_FORMATTEDFIELD, sal_True, sal_True )
                             // use the old control name for compytibility reasons
     ,OErrorBroadcaster( OComponentHelper::rBHelper )
 {
-
     implConstruct();
-
     m_nClassId = FormComponentType::TEXTFIELD;
     initValueProperty( PROPERTY_EFFECTIVE_VALUE, PROPERTY_ID_EFFECTIVE_VALUE );
 }
-
-//------------------------------------------------------------------
 OFormattedModel::OFormattedModel( const OFormattedModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
     :OEditBaseModel( _pOriginal, _rxFactory )
     ,OErrorBroadcaster( OComponentHelper::rBHelper )
 {
-
     implConstruct();
 }
 
-//------------------------------------------------------------------------------
 OFormattedModel::~OFormattedModel()
 {
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
 IMPLEMENT_DEFAULT_CLONING( OFormattedModel )
 
-//------------------------------------------------------------------------------
 void SAL_CALL OFormattedModel::disposing()
 {
     OErrorBroadcaster::disposing();
@@ -391,31 +311,24 @@ void SAL_CALL OFormattedModel::disposing()
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
 StringSequence OFormattedModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OEditBaseModel::getSupportedServiceNames();
-
     sal_Int32 nOldLen = aSupported.getLength();
     aSupported.realloc( nOldLen + 8 );
     OUString* pStoreTo = aSupported.getArray() + nOldLen;
-
     *pStoreTo++ = BINDABLE_CONTROL_MODEL;
     *pStoreTo++ = DATA_AWARE_CONTROL_MODEL;
     *pStoreTo++ = VALIDATABLE_CONTROL_MODEL;
-
     *pStoreTo++ = BINDABLE_DATA_AWARE_CONTROL_MODEL;
     *pStoreTo++ = VALIDATABLE_BINDABLE_CONTROL_MODEL;
-
     *pStoreTo++ = FRM_SUN_COMPONENT_FORMATTEDFIELD;
     *pStoreTo++ = FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
     *pStoreTo++ = BINDABLE_DATABASE_FORMATTED_FIELD;
-
     return aSupported;
 }
 
 // XAggregation
-//------------------------------------------------------------------------------
 Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) throw(RuntimeException)
 {
     Any aReturn = OEditBaseModel::queryAggregation( _rType );
@@ -423,7 +336,6 @@ Any SAL_CALL OFormattedModel::queryAggregation(const Type& _rType) throw(Runtime
 }
 
 // XTypeProvider
-//------------------------------------------------------------------------------
 Sequence< Type > OFormattedModel::_getTypes()
 {
     return ::comphelper::concatSequences(
@@ -433,14 +345,12 @@ Sequence< Type > OFormattedModel::_getTypes()
 }
 
 // XPersistObject
-//------------------------------------------------------------------------------
 OUString SAL_CALL OFormattedModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_EDIT);
 }
 
 // XPropertySet
-//------------------------------------------------------------------------------
 void OFormattedModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 3, OEditBaseModel )
@@ -450,11 +360,9 @@ void OFormattedModel::describeFixedProperties( Sequence< Property >& _rProps ) c
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
 {
     OEditBaseModel::describeAggregateProperties( _rAggregateProps );
-
     // TreatAsNumeric nicht transient : wir wollen es an der UI anbinden (ist noetig, um dem EffectiveDefault
     // - der kann Text oder Zahl sein - einen Sinn zu geben)
     ModifyPropertyAttributes(_rAggregateProps, PROPERTY_TREATASNUMERIC, 0, PropertyAttribute::TRANSIENT);
@@ -462,33 +370,28 @@ void OFormattedModel::describeAggregateProperties( Sequence< Property >& _rAggre
     // (though the paragraph above for the TreatAsNumeric does not hold anymore - we do not have an UI for this.
     // But we have for the format key ...)
     ModifyPropertyAttributes(_rAggregateProps, PROPERTY_FORMATKEY, 0, PropertyAttribute::TRANSIENT);
-
     RemoveProperty(_rAggregateProps, PROPERTY_STRICTFORMAT);
         // no strict format property for formatted fields: it does not make sense, 'cause
         // there is no general way to decide which characters/sub strings are allowed during the input of an
         // arbitraryly formatted control
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
 {
     OEditBaseModel::getFastPropertyValue(rValue, nHandle);
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception)
 {
     OEditBaseModel::setFastPropertyValue_NoBroadcast(nHandle, rValue);
 }
 
-//------------------------------------------------------------------------------
 sal_Bool OFormattedModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
                                                         throw( IllegalArgumentException )
 {
     return OEditBaseModel::convertFastPropertyValue(rConvertedValue, rOldValue, nHandle, rValue);
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle)
 {
     if (nHandle == PROPERTY_ID_FORMATSSUPPLIER)
@@ -502,19 +405,16 @@ void OFormattedModel::setPropertyToDefaultByHandle(sal_Int32 nHandle)
         OEditBaseModel::setPropertyToDefaultByHandle(nHandle);
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::setPropertyToDefault(const OUString& aPropertyName) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException )
 {
     OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper();
     sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
-
     if (nHandle == PROPERTY_ID_FORMATSSUPPLIER)
         setPropertyToDefaultByHandle(PROPERTY_ID_FORMATSSUPPLIER);
     else
         OEditBaseModel::setPropertyToDefault(aPropertyName);
 }
 
-//------------------------------------------------------------------------------
 Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 {
     if (nHandle == PROPERTY_ID_FORMATSSUPPLIER)
@@ -526,23 +426,19 @@ Any OFormattedModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
         return OEditBaseModel::getPropertyDefaultByHandle(nHandle);
 }
 
-//------------------------------------------------------------------------------
 Any SAL_CALL OFormattedModel::getPropertyDefault( const OUString& aPropertyName ) throw( com::sun::star::beans::UnknownPropertyException, RuntimeException )
 {
     OPropertyArrayAggregationHelper& rPH = m_aPropertyBagHelper.getInfoHelper();
     sal_Int32 nHandle = rPH.getHandleByName( aPropertyName );
-
     if (nHandle == PROPERTY_ID_FORMATSSUPPLIER)
         return getPropertyDefaultByHandle(PROPERTY_ID_FORMATSSUPPLIER);
     else
         return OEditBaseModel::getPropertyDefault(aPropertyName);
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyChangeEvent& evt ) throw(RuntimeException)
 {
     // TODO: check how this works with external bindings
-
     OSL_ENSURE( evt.Source == m_xAggregateSet, "OFormattedModel::_propertyChanged: where did this come from?" );
     if ( evt.Source == m_xAggregateSet )
     {
@@ -554,17 +450,14 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
                 try
                 {
                     ::osl::MutexGuard aGuard( m_aMutex );
-
                     Reference<XNumberFormatsSupplier> xSupplier( calcFormatsSupplier() );
                     m_nKeyType  = getNumberFormatType(xSupplier->getNumberFormats(), getINT32( evt.NewValue ) );
-
                     // as m_aSaveValue (which is used by commitControlValueToDbColumn) is format dependent we have
                     // to recalc it, which is done by translateDbColumnToControlValue
                     if ( m_xColumn.is() && m_xAggregateFastSet.is()  && !m_xCursor->isBeforeFirst() && !m_xCursor->isAfterLast())
                     {
                         setControlValue( translateDbColumnToControlValue(), eOther );
                     }
-
                     // if we're connected to an external value binding, then re-calculate the type
                     // used to exchange the value - it depends on the format, too
                     if ( hasExternalValueBinding() )
@@ -578,18 +471,15 @@ void OFormattedModel::_propertyChanged( const com::sun::star::beans::PropertyCha
             }
             return;
         }
-
         if ( evt.PropertyName.equals( PROPERTY_FORMATSSUPPLIER ) )
         {
             updateFormatterNullDate();
             return;
         }
-
         OBoundControlModel::_propertyChanged( evt );
     }
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::updateFormatterNullDate()
 {
     // calc the current NULL date
@@ -598,29 +488,23 @@ void OFormattedModel::updateFormatterNullDate()
         xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate") >>= m_aNullDate;
 }
 
-//------------------------------------------------------------------------------
 Reference< XNumberFormatsSupplier > OFormattedModel::calcFormatsSupplier() const
 {
     Reference<XNumberFormatsSupplier>  xSupplier;
-
     DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::calcFormatsSupplier : have no aggregate !");
     // hat mein aggregiertes Model einen FormatSupplier ?
     if( m_xAggregateSet.is() )
         m_xAggregateSet->getPropertyValue(PROPERTY_FORMATSSUPPLIER) >>= xSupplier;
-
     if (!xSupplier.is())
         // check if my parent form has a supplier
         xSupplier = calcFormFormatsSupplier();
-
     if (!xSupplier.is())
         xSupplier = calcDefaultFormatsSupplier();
-
     DBG_ASSERT(xSupplier.is(), "OFormattedModel::calcFormatsSupplier : no supplier !");
         // jetzt sollte aber einer da sein
     return xSupplier;
 }
 
-//------------------------------------------------------------------------------
 Reference<XNumberFormatsSupplier>  OFormattedModel::calcFormFormatsSupplier() const
 {
     Reference<XChild>  xMe;
@@ -628,7 +512,6 @@ Reference<XNumberFormatsSupplier>  OFormattedModel::calcFormFormatsSupplier() co
     // damit stellen wir sicher, dass wir auch fuer den Fall der Aggregation das richtige
     // Objekt bekommen
     DBG_ASSERT(xMe.is(), "OFormattedModel::calcFormFormatsSupplier : I should have a content interface !");
-
     // jetzt durchhangeln nach oben, bis wir auf eine starform treffen (angefangen mit meinem eigenen Parent)
     Reference<XChild>  xParent(xMe->getParent(), UNO_QUERY);
     Reference<XForm>  xNextParentForm(xParent, UNO_QUERY);
@@ -637,13 +520,11 @@ Reference<XNumberFormatsSupplier>  OFormattedModel::calcFormFormatsSupplier() co
         xParent         = xParent.query( xParent->getParent() );
         xNextParentForm = xNextParentForm.query( xParent );
     }
-
     if (!xNextParentForm.is())
     {
         OSL_FAIL("OFormattedModel::calcFormFormatsSupplier : have no ancestor which is a form !");
         return NULL;
     }
-
     // den FormatSupplier von meinem Vorfahren (falls der einen hat)
     Reference< XRowSet > xRowSet( xNextParentForm, UNO_QUERY );
     Reference< XNumberFormatsSupplier > xSupplier;
@@ -652,14 +533,12 @@ Reference<XNumberFormatsSupplier>  OFormattedModel::calcFormFormatsSupplier() co
     return xSupplier;
 }
 
-//------------------------------------------------------------------------------
 Reference< XNumberFormatsSupplier > OFormattedModel::calcDefaultFormatsSupplier() const
 {
     return StandardFormatsSupplier::get( getContext() );
 }
 
 // XBoundComponent
-//------------------------------------------------------------------------------
 void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException)
 {
     // HACK : our onConnectedDbColumn accesses our NumberFormatter which locks the solar mutex (as it doesn't have
@@ -670,31 +549,25 @@ void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star
     // property requests and one for our own code. This would need a lot of code rewriting
     // alternative b): The NumberFormatter has to be really threadsafe (with an own mutex), which is
     // the only "clean" solution for me.
-
     SolarMutexGuard aGuard;
     OEditBaseModel::loaded(rEvent);
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     m_xOriginalFormatter = NULL;
-
     // get some properties of the field
     m_nFieldType = DataType::OTHER;
     Reference<XPropertySet> xField = getField();
     if ( xField.is() )
         xField->getPropertyValue( PROPERTY_FIELDTYPE ) >>= m_nFieldType;
-
     sal_Int32 nFormatKey = 0;
-
     DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::onConnectedDbColumn : have no aggregate !");
     if (m_xAggregateSet.is())
     {   // all the following doesn't make any sense if we have no aggregate ...
         Any aSupplier = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATSSUPPLIER);
         DBG_ASSERT( aSupplier.hasValue(), "OFormattedModel::onConnectedDbColumn : invalid property value !" );
         // das sollte im Constructor oder im read auf was richtiges gesetzt worden sein
-
         Any aFmtKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY);
         if ( !(aFmtKey >>= nFormatKey ) )
         {   // nobody gave us a format to use. So we examine the field we're bound to for a
@@ -705,13 +578,11 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
                 aFmtKey = xField->getPropertyValue(PROPERTY_FORMATKEY);
                 xField->getPropertyValue(PROPERTY_FIELDTYPE) >>= nType ;
             }
-
             Reference<XNumberFormatsSupplier>  xSupplier = calcFormFormatsSupplier();
             DBG_ASSERT(xSupplier.is(), "OFormattedModel::onConnectedDbColumn : bound to a field but no parent with a formatter ? how this ?");
             if (xSupplier.is())
             {
                 m_bOriginalNumeric = getBOOL(getPropertyValue(PROPERTY_TREATASNUMERIC));
-
                 if (!aFmtKey.hasValue())
                 {   // we aren't bound to a field (or this field's format is invalid)
                     // -> determine the standard text (or numeric) format of the supplier
@@ -719,18 +590,15 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
                     if (xTypes.is())
                     {
                         Locale aApplicationLocale = Application::GetSettings().GetUILanguageTag().getLocale();
-
                         if (m_bOriginalNumeric)
                             aFmtKey <<= (sal_Int32)xTypes->getStandardFormat(NumberFormat::NUMBER, aApplicationLocale);
                         else
                             aFmtKey <<= (sal_Int32)xTypes->getStandardFormat(NumberFormat::TEXT, aApplicationLocale);
                     }
                 }
-
                 aSupplier >>= m_xOriginalFormatter;
                 m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(xSupplier));
                 m_xAggregateSet->setPropertyValue(PROPERTY_FORMATKEY, aFmtKey);
-
                 // das Numeric-Flag an mein gebundenes Feld anpassen
                 if (xField.is())
                 {
@@ -757,23 +625,18 @@ void OFormattedModel::onConnectedDbColumn( const Reference< XInterface >& _rxFor
                 }
                 else
                     m_bNumeric = m_bOriginalNumeric;
-
                 setPropertyValue(PROPERTY_TREATASNUMERIC, makeAny((sal_Bool)m_bNumeric));
-
                 OSL_VERIFY( aFmtKey >>= nFormatKey );
             }
         }
     }
-
     Reference<XNumberFormatsSupplier>  xSupplier = calcFormatsSupplier();
     m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) );
     m_nKeyType  = getNumberFormatType( xSupplier->getNumberFormats(), nFormatKey );
     xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate") >>= m_aNullDate;
-
     OEditBaseModel::onConnectedDbColumn( _rxForm );
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::onDisconnectedDbColumn()
 {
     OEditBaseModel::onDisconnectedDbColumn();
@@ -784,23 +647,18 @@ void OFormattedModel::onDisconnectedDbColumn()
         setPropertyValue(PROPERTY_TREATASNUMERIC, makeAny((sal_Bool)m_bOriginalNumeric));
         m_xOriginalFormatter = NULL;
     }
-
     m_nFieldType = DataType::OTHER;
     m_nKeyType   = NumberFormat::UNDEFINED;
     m_aNullDate  = DBTypeConversion::getStandardDate();
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OEditBaseModel::write(_rxOutStream);
     _rxOutStream->writeShort(0x0003);
-
     DBG_ASSERT(m_xAggregateSet.is(), "OFormattedModel::write : have no aggregate !");
-
     // mein Format (evtl. void) in ein persistentes Format bringen (der Supplier zusammen mit dem Key ist es zwar auch,
     // aber deswegen muessen wir ja nicht gleich den ganzen Supplier speichern, das waere ein klein wenig Overhead ;)
-
         Reference<XNumberFormatsSupplier>  xSupplier;
         Any aFmtKey;
     sal_Bool bVoidKey = sal_True;
@@ -811,25 +669,19 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
         {
             OSL_VERIFY( aSupplier >>= xSupplier );
         }
-
         aFmtKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY);
         bVoidKey = (!xSupplier.is() || !aFmtKey.hasValue()) || (isLoaded() && m_xOriginalFormatter.is());
             // (kein Fomatter und/oder Key) oder (loaded und faked Formatter)
     }
-
     _rxOutStream->writeBoolean(!bVoidKey);
     if (!bVoidKey)
     {
         // aus dem FormatKey und dem Formatter persistente Angaben basteln
-
         Any aKey = m_xAggregateSet->getPropertyValue(PROPERTY_FORMATKEY);
         sal_Int32 nKey = aKey.hasValue() ? getINT32(aKey) : 0;
-
         Reference<XNumberFormats>  xFormats = xSupplier->getNumberFormats();
-
         OUString         sFormatDescription;
         LanguageType    eFormatLanguage = LANGUAGE_DONTKNOW;
-
         static const OUString s_aLocaleProp ("Locale");
         Reference<com::sun::star::beans::XPropertySet>  xFormat = xFormats->getByKey(nKey);
         if (hasProperty(s_aLocaleProp, xFormat))
@@ -842,37 +694,29 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
                 eFormatLanguage = LanguageTag::convertToLanguageType( *pLocale, false);
             }
         }
-
         static const OUString s_aFormatStringProp ("FormatString");
         if (hasProperty(s_aFormatStringProp, xFormat))
             xFormat->getPropertyValue(s_aFormatStringProp) >>= sFormatDescription;
-
         _rxOutStream->writeUTF(sFormatDescription);
         _rxOutStream->writeLong((sal_Int32)eFormatLanguage);
     }
-
     // version 2 : write the properties common to all OEditBaseModels
     writeCommonEditProperties(_rxOutStream);
-
     // version 3 : write the effective value property of the aggregate
     // Due to a bug within the UnoControlFormattedFieldModel implementation (our default aggregate) this props value isn't correctly read
     // and this can't be corrected without being incompatible.
     // so we have our own handling.
-
     // and to be a little bit more compatible we make the following section skippable
     {
         OStreamSection aDownCompat(_rxOutStream);
-
         // a sub version within the skippable block
         _rxOutStream->writeShort(0x0000);
-
         // version 0: the effective value of the aggregate
                 Any aEffectiveValue;
         if (m_xAggregateSet.is())
         {
             try { aEffectiveValue = m_xAggregateSet->getPropertyValue(PROPERTY_EFFECTIVE_VALUE); } catch(const Exception&) { }
         }
-
         {
             OStreamSection aDownCompat2(_rxOutStream);
             switch (aEffectiveValue.getValueType().getTypeClass())
@@ -894,12 +738,10 @@ void OFormattedModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
     }
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OEditBaseModel::read(_rxInStream);
     sal_uInt16 nVersion = _rxInStream->readShort();
-
     Reference<XNumberFormatsSupplier>  xSupplier;
     sal_Int32 nKey = -1;
     switch (nVersion)
@@ -911,36 +753,30 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
             sal_Bool bNonVoidKey = _rxInStream->readBoolean();
             if (bNonVoidKey)
             {
-                // den String und die Language lesen ....
+                // read string and language...
                 OUString sFormatDescription = _rxInStream->readUTF();
                 LanguageType eDescriptionLanguage = (LanguageType)_rxInStream->readLong();
-
-                // und daraus von einem Formatter zu einem Key zusammenwuerfeln lassen ...
+                // and let a formatter roll dice based on that to create a key...
                 xSupplier = calcFormatsSupplier();
-                    // calcFormatsSupplier nimmt erst den vom Model, dann einen von der starform, dann einen ganz neuen ....
+                    // calcFormatsSupplier first takes the one from the model, then one from the starform, then a new one...
                 Reference<XNumberFormats>  xFormats = xSupplier->getNumberFormats();
-
                 if (xFormats.is())
                 {
                     Locale aDescriptionLanguage( LanguageTag::convertToLocale(eDescriptionLanguage));
-
                     nKey = xFormats->queryKey(sFormatDescription, aDescriptionLanguage, sal_False);
                     if (nKey == (sal_Int32)-1)
-                    {   // noch nicht vorhanden in meinem Formatter ...
+                    {   // does not yet exist in my formatter...
                         nKey = xFormats->addNew(sFormatDescription, aDescriptionLanguage);
                     }
                 }
             }
             if ((nVersion == 0x0002) || (nVersion == 0x0003))
                 readCommonEditProperties(_rxInStream);
-
             if (nVersion == 0x0003)
             {   // since version 3 there is a "skippable" block at this position
                 OStreamSection aDownCompat(_rxInStream);
-
                 sal_Int16 nSubVersion = _rxInStream->readShort();
                 (void)nSubVersion;
-
                 // version 0 and higher : the "effective value" property
                 Any aEffectiveValue;
                 {
@@ -959,7 +795,6 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
                             OSL_FAIL("FmXFormattedModel::read : unknown effective value type !");
                     }
                 }
-
                 // this property is only to be set if we have no control source : in all other cases the base class did a
                 // reset after it's read and this set the effective value to a default value
                 if ( m_xAggregateSet.is() && getControlSource().isEmpty() )
@@ -977,11 +812,10 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
         break;
         default :
             OSL_FAIL("OFormattedModel::read : unknown version !");
-            // dann bleibt das Format des aggregierten Sets, wie es bei der Erzeugung ist : void
+            // then the format of the aggregated set stay like it was during creation: void
             defaultCommonEditProperties();
             break;
     }
-
     if ((nKey != -1) && m_xAggregateSet.is())
     {
                 m_xAggregateSet->setPropertyValue(PROPERTY_FORMATSSUPPLIER, makeAny(xSupplier));
@@ -994,20 +828,18 @@ void OFormattedModel::read(const Reference<XObjectInputStream>& _rxInStream) thr
     }
 }
 
-//------------------------------------------------------------------------------
 sal_uInt16 OFormattedModel::getPersistenceFlags() const
 {
     return (OEditBaseModel::getPersistenceFlags() & ~PF_HANDLE_COMMON_PROPS);
     // a) we do our own call to writeCommonEditProperties
 }
 
-//------------------------------------------------------------------------------
 sal_Bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aControlValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
     if ( aControlValue != m_aSaveValue )
     {
-        // Leerstring + EmptyIsNull = void
+        // empty string + EmptyIsNull = void
         if  (   !aControlValue.hasValue()
             ||  (   ( aControlValue.getValueType().getTypeClass() == TypeClass_STRING )
                 &&  getString( aControlValue ).isEmpty()
@@ -1040,14 +872,12 @@ sal_Bool OFormattedModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::onConnectedExternalValue( )
 {
     OEditBaseModel::onConnectedExternalValue();
     updateFormatterNullDate();
 }
 
-//------------------------------------------------------------------------------
 Any OFormattedModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
 {
     Any aControlValue;
@@ -1055,11 +885,9 @@ Any OFormattedModel::translateExternalValueToControlValue( const Any& _rExternal
     {
     case TypeClass_VOID:
         break;
-
     case TypeClass_STRING:
         aControlValue = _rExternalValue;
         break;
-
     case TypeClass_BOOLEAN:
     {
         sal_Bool bExternalValue = sal_False;
@@ -1067,7 +895,6 @@ Any OFormattedModel::translateExternalValueToControlValue( const Any& _rExternal
         aControlValue <<= (double)( bExternalValue ? 1 : 0 );
     }
     break;
-
     default:
     {
         if ( _rExternalValue.getValueType().equals( ::getCppuType( static_cast< UNODate* >( NULL ) ) ) )
@@ -1098,22 +925,17 @@ Any OFormattedModel::translateExternalValueToControlValue( const Any& _rExternal
         }
     }
     }
-
     return aControlValue;
 }
 
-//------------------------------------------------------------------------------
 Any OFormattedModel::translateControlValueToExternalValue( ) const
 {
     OSL_PRECOND( hasExternalValueBinding(),
         "OFormattedModel::translateControlValueToExternalValue: precondition not met!" );
-
     Any aControlValue( getControlValue() );
     if ( !aControlValue.hasValue() )
         return aControlValue;
-
     Any aExternalValue;
-
     // translate into the external value type
     Type aExternalValueType( getExternalValueType() );
     switch ( aExternalValueType.getTypeClass() )
@@ -1128,7 +950,6 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
         }
     }
     // NO break here!
-
     case TypeClass_BOOLEAN:
     {
         double fValue = 0;
@@ -1139,7 +960,6 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
         aExternalValue <<= (sal_Bool)( fValue ? sal_True : sal_False );
     }
     break;
-
     default:
     {
         double fValue = 0;
@@ -1147,7 +967,6 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
             // if this asserts ... well, the somebody set the TreatAsNumeric property to false,
             // and the control value is a string. This implies some weird misconfiguration
             // of the FormattedModel, so we won't care for it for the moment.
-
         if ( aExternalValueType.equals( ::getCppuType( static_cast< UNODate* >( NULL ) ) ) )
         {
             aExternalValue <<= DBTypeConversion::toDate( fValue, m_aNullDate );
@@ -1172,26 +991,21 @@ Any OFormattedModel::translateControlValueToExternalValue( ) const
     return aExternalValue;
 }
 
-//------------------------------------------------------------------------------
 Any OFormattedModel::translateDbColumnToControlValue()
 {
     if ( m_bNumeric )
         m_aSaveValue <<= DBTypeConversion::getValue( m_xColumn, m_aNullDate ); // #100056# OJ
     else
         m_aSaveValue <<= m_xColumn->getString();
-
     if ( m_xColumn->wasNull() )
         m_aSaveValue.clear();
-
     return m_aSaveValue;
 }
 
-// -----------------------------------------------------------------------------
 Sequence< Type > OFormattedModel::getSupportedBindingTypes()
 {
     ::std::list< Type > aTypes;
     aTypes.push_back( ::getCppuType( static_cast< double* >( NULL ) ) );
-
     switch ( m_nKeyType & ~NumberFormat::DEFINED )
     {
     case NumberFormat::DATE:
@@ -1210,27 +1024,21 @@ Sequence< Type > OFormattedModel::getSupportedBindingTypes()
         aTypes.push_front(::getCppuType( static_cast< sal_Bool* >( NULL ) ) );
         break;
     }
-
     Sequence< Type > aTypesRet( aTypes.size() );
     ::std::copy( aTypes.begin(), aTypes.end(), aTypesRet.getArray() );
     return aTypesRet;
 }
 
-//------------------------------------------------------------------------------
 Any OFormattedModel::getDefaultForReset() const
 {
     return m_xAggregateSet->getPropertyValue( PROPERTY_EFFECTIVE_DEFAULT );
 }
 
-//------------------------------------------------------------------------------
 void OFormattedModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
     m_aSaveValue.clear();
 }
-
-//.........................................................................
 }
-//.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormattedField.hxx b/forms/source/component/FormattedField.hxx
index 1ea82f6989bb..eb274242cf46 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -26,20 +26,16 @@
 #include <cppuhelper/implbase1.hxx>
 #include "errorbroadcaster.hxx"
 
-//.........................................................................
 namespace frm
 {
-
-    //==================================================================
-    //= OFormattedModel
-    //==================================================================
-
-    class OFormattedModel
+class OFormattedModel
                     :public OEditBaseModel
                     ,public OErrorBroadcaster
     {
-        // das Original, falls ich die Format-Properties meines aggregierten Models gefaket, d.h. von dem Feld, an das
-        // ich gebunden bin, weitergereicht habe (nur gueltig wenn loaded)
+        // the original, in case I faked the format properties of my aggregated model,
+        // i.e. I just passed on the attributes of the field to which I am bound
+        // (only valid if loaded)
+
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier>   m_xOriginalFormatter;
         ::com::sun::star::util::Date        m_aNullDate;
         ::com::sun::star::uno::Any          m_aSaveValue;
@@ -47,7 +43,7 @@ namespace frm
         sal_Int32                           m_nFieldType;
         sal_Int16                           m_nKeyType;
         sal_Bool                            m_bOriginalNumeric      : 1,
-                                            m_bNumeric              : 1;    // analog fuer TreatAsNumeric-Property
+                                            m_bNumeric              : 1;    // analogous for the TreatAsNumeric-property
 
     protected:
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier>  calcDefaultFormatsSupplier() const;
@@ -59,38 +55,38 @@ namespace frm
         friend class OFormattedFieldWrapper;
 
     protected:
-    // XInterface
+        // XInterface
         DECLARE_UNO3_AGG_DEFAULTS( OFormattedModel, OEditBaseModel );
 
-    // XTypeProvider
+        // XTypeProvider
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
 
-    // XAggregation
+        // XAggregation
         virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw(::com::sun::star::uno::RuntimeException);
 
-    // OComponentHelper
+        // OComponentHelper
         virtual void SAL_CALL disposing();
 
-    // XServiceInfo
+        // XServiceInfo
         IMPLEMENTATION_NAME(OFormattedModel);
         virtual StringSequence SAL_CALL getSupportedServiceNames() throw();
 
-    // XPersistObject
+        // XPersistObject
         virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
         virtual OUString SAL_CALL getServiceName() throw ( ::com::sun::star::uno::RuntimeException);
 
-    // XPropertySet
+        // XPropertySet
         virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
         virtual sal_Bool SAL_CALL convertFastPropertyValue(::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue,
                                               sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
                                             throw(::com::sun::star::lang::IllegalArgumentException);
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw ( ::com::sun::star::uno::Exception);
 
-    // XLoadListener
+        // XLoadListener
         virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw ( ::com::sun::star::uno::RuntimeException);
 
-    // XPropertyState
+        // XPropertyState
         void setPropertyToDefaultByHandle(sal_Int32 nHandle);
         ::com::sun::star::uno::Any getPropertyDefaultByHandle(sal_Int32 nHandle) const;
 
@@ -105,16 +101,16 @@ namespace frm
             ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
         ) const;
 
-    // XPropertyChangeListener
+        // XPropertyChangeListener
         virtual void _propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
 
-    // prevent method hiding
+        // prevent method hiding
         using OEditBaseModel::disposing;
         using OEditBaseModel::getFastPropertyValue;
 
     protected:
         virtual sal_uInt16 getPersistenceFlags() const;
-            // as we have an own version handling for persistence
+        // as we have an own version handling for persistence
 
         // OBoundControlModel overridables
         virtual ::com::sun::star::uno::Any
@@ -144,9 +140,7 @@ namespace frm
         void    updateFormatterNullDate();
     };
 
-    //==================================================================
-    //= OFormattedControl
-    //==================================================================
+    // OFormattedControl
     typedef ::cppu::ImplHelper1< ::com::sun::star::awt::XKeyListener> OFormattedControl_BASE;
     class OFormattedControl :    public OBoundControl
                                 ,public OFormattedControl_BASE
@@ -162,31 +156,27 @@ namespace frm
 
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
 
-    // ::com::sun::star::lang::XServiceInfo
+        // ::com::sun::star::lang::XServiceInfo
         IMPLEMENTATION_NAME(OFormattedControl);
         virtual StringSequence SAL_CALL getSupportedServiceNames() throw();
 
-    // ::com::sun::star::lang::XEventListener
+        // ::com::sun::star::lang::XEventListener
         virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& _rSource) throw(::com::sun::star::uno::RuntimeException);
 
-    // ::com::sun::star::awt::XKeyListener
+        // ::com::sun::star::awt::XKeyListener
         virtual void SAL_CALL keyPressed(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL keyReleased(const ::com::sun::star::awt::KeyEvent& e) throw ( ::com::sun::star::uno::RuntimeException);
 
-    // ::com::sun::star::awt::XControl
+        // ::com::sun::star::awt::XControl
         virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw ( ::com::sun::star::uno::RuntimeException);
 
-    // disambiguation
+        // disambiguation
         using OBoundControl::disposing;
 
     private:
         DECL_LINK( OnKeyPressed, void* );
     };
-
-//.........................................................................
 }
-//.........................................................................
-
 #endif // INCLUDED_FORMS_SOURCE_COMPONENT_FORMATTEDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/FormsCollection.cxx b/forms/source/component/FormsCollection.cxx
index 624d3629b40d..d0c0ec648c6b 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -36,32 +36,32 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 InterfaceRef SAL_CALL OFormsCollection_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OFormsCollection( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OFormsCollection::getServiceName() throw(RuntimeException)
 {
     return OUString("com.sun.star.form.Forms");
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId(  ) throw(RuntimeException)
 {
     return OImplementationIds::getImplementationId(getTypes());
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> SAL_CALL OFormsCollection::getTypes() throw(RuntimeException)
 {
     return concatSequences(OInterfaceContainer::getTypes(), FormsCollectionComponentBase::getTypes(), OFormsCollection_BASE::getTypes());
 }
 
-//------------------------------------------------------------------
+
 OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactory)
     :FormsCollectionComponentBase( m_aMutex )
     ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XForm>::get() )
@@ -69,7 +69,7 @@ OFormsCollection::OFormsCollection(const Reference<XComponentContext>& _rxFactor
 {
 }
 
-//------------------------------------------------------------------------------
+
 OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
     :FormsCollectionComponentBase( m_aMutex )
     ,OInterfaceContainer( m_aMutex, _cloneSource )
@@ -77,7 +77,7 @@ OFormsCollection::OFormsCollection( const OFormsCollection& _cloneSource )
 {
 }
 
-//------------------------------------------------------------------------------
+
 OFormsCollection::~OFormsCollection()
 {
     if (!FormsCollectionComponentBase::rBHelper.bDisposed)
@@ -87,7 +87,7 @@ OFormsCollection::~OFormsCollection()
     }
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OFormsCollection::queryAggregation(const Type& _rType) throw(RuntimeException)
 {
     Any aReturn = OFormsCollection_BASE::queryInterface(_rType);
@@ -133,7 +133,7 @@ Reference< XCloneable > SAL_CALL OFormsCollection::createClone(  ) throw (Runtim
 }
 
 // OComponentHelper
-//------------------------------------------------------------------------------
+
 void OFormsCollection::disposing()
 {
     {
@@ -145,14 +145,14 @@ void OFormsCollection::disposing()
 }
 
 //XChild
-//------------------------------------------------------------------------------
+
 void OFormsCollection::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_xParent = Parent;
 }
 
-//------------------------------------------------------------------------------
+
 InterfaceRef  OFormsCollection::getParent() throw( RuntimeException )
 {
     return m_xParent;
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index c524b0118aab..746583ba30f6 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -16,20 +16,16 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-
-
 #include "Columns.hxx"
 #include "findpos.hxx"
 #include "Grid.hxx"
 #include "property.hrc"
 #include "property.hxx"
 #include "services.hxx"
-
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
-
 #include <comphelper/basicio.hxx>
 #include <comphelper/container.hxx>
 #include <comphelper/extract.hxx>
@@ -37,13 +33,9 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
-
 using namespace ::com::sun::star::uno;
-
-//.........................................................................
 namespace frm
 {
-//.........................................................................
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
@@ -57,9 +49,7 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::view;
-
 namespace WritingMode2 = ::com::sun::star::text::WritingMode2;
-
 const sal_uInt16 ROWHEIGHT          =   0x0001;
 const sal_uInt16 FONTTYPE           =   0x0002;
 const sal_uInt16 FONTSIZE           =   0x0004;
@@ -69,14 +59,10 @@ const sal_uInt16 TEXTCOLOR          =   0x0020;
 const sal_uInt16 FONTDESCRIPTOR     =   0x0040;
 const sal_uInt16 RECORDMARKER       =   0x0080;
 const sal_uInt16 BACKGROUNDCOLOR    =   0x0100;
-
-//------------------------------------------------------------------
 InterfaceRef SAL_CALL OGridControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OGridControlModel( comphelper::getComponentContext(_rxFactory) ));
 }
-
-//------------------------------------------------------------------
 OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, OUString())
     ,OInterfaceContainer(_rxFactory, m_aMutex, ::getCppuType(static_cast<Reference<XPropertySet>*>(NULL)))
@@ -97,11 +83,9 @@ OGridControlModel::OGridControlModel(const Reference<XComponentContext>& _rxFact
     ,m_bAlwaysShowCursor(sal_False)
     ,m_bDisplaySynchron(sal_True)
 {
-
     m_nClassId = FormComponentType::GRIDCONTROL;
 }
 
-//------------------------------------------------------------------
 OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory )
     ,OInterfaceContainer( _rxFactory, m_aMutex, ::getCppuType( static_cast<Reference<XPropertySet>*>( NULL ) ) )
@@ -111,7 +95,6 @@ OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const
     ,m_aResetListeners( m_aMutex )
     ,m_aRowSetChangeListeners( m_aMutex )
 {
-
     m_aDefaultControl = _pOriginal->m_aDefaultControl;
     m_bEnable = _pOriginal->m_bEnable;
     m_bEnableVisible = _pOriginal->m_bEnableVisible;
@@ -123,14 +106,11 @@ OGridControlModel::OGridControlModel( const OGridControlModel* _pOriginal, const
     m_bPrintable = _pOriginal->m_bPrintable;
     m_bAlwaysShowCursor = _pOriginal->m_bAlwaysShowCursor;
     m_bDisplaySynchron = _pOriginal->m_bDisplaySynchron;
-
     // clone the columns
     cloneColumns( _pOriginal );
-
     // TODO: clone the events?
 }
 
-//------------------------------------------------------------------
 OGridControlModel::~OGridControlModel()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -138,11 +118,9 @@ OGridControlModel::~OGridControlModel()
         acquire();
         dispose();
     }
-
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
 Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (RuntimeException)
 {
     OGridControlModel* pClone = new OGridControlModel( this, getContext() );
@@ -155,13 +133,11 @@ Reference< XCloneable > SAL_CALL OGridControlModel::createClone( ) throw (Runtim
     return static_cast< XCloneable* >( static_cast< OControlModel* >( pClone ) );
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContainer )
 {
     try
     {
         Reference< XCloneable > xColCloneable;
-
         const OInterfaceArray::const_iterator pColumnStart = _pOriginalContainer->m_aItems.begin();
         const OInterfaceArray::const_iterator pColumnEnd = _pOriginalContainer->m_aItems.end();
         for ( OInterfaceArray::const_iterator pColumn = pColumnStart; pColumn != pColumnEnd; ++pColumn )
@@ -169,19 +145,16 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
             // ask the col for a factory for the clone
             xColCloneable = xColCloneable.query( *pColumn );
             DBG_ASSERT( xColCloneable.is(), "OGridControlModel::cloneColumns: column is not cloneable!" );
-
             if ( xColCloneable.is() )
             {
                 // create a clone of the column
                 Reference< XCloneable > xColClone( xColCloneable->createClone() );
                 DBG_ASSERT( xColClone.is(), "OGridControlModel::cloneColumns: invalid column clone!" );
-
                 if ( xColClone.is() )
                 {
                     // insert this clone into our own container
                     insertByIndex( pColumn - pColumnStart, xColClone->queryInterface( m_aElementType ) );
                 }
-
             }
         }
     }
@@ -192,22 +165,17 @@ void OGridControlModel::cloneColumns( const OGridControlModel* _pOriginalContain
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
 StringSequence OGridControlModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
     aSupported.realloc(aSupported.getLength() + 2);
-
     aSupported[aSupported.getLength()-2] = "com.sun.star.awt.UnoControlModel";
     aSupported[aSupported.getLength()-1] = FRM_SUN_COMPONENT_GRIDCONTROL;
     return aSupported;
 }
-
-//------------------------------------------------------------------------------
 Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (RuntimeException)
 {
     Any aReturn = OGridControlModel_BASE::queryInterface(_rType);
-
     if ( !aReturn.hasValue() )
     {
         aReturn = OControlModel::queryAggregation( _rType );
@@ -222,7 +190,6 @@ Any SAL_CALL OGridControlModel::queryAggregation( const Type& _rType ) throw (Ru
 }
 
 // XSQLErrorListener
-//------------------------------------------------------------------------------
 void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) throw (RuntimeException)
 {
     // forward the errors which happened to my columns to my own listeners
@@ -230,47 +197,38 @@ void SAL_CALL OGridControlModel::errorOccured( const SQLErrorEvent& _rEvent ) th
 }
 
 // XRowSetSupplier
-//------------------------------------------------------------------------------
 Reference< XRowSet > SAL_CALL OGridControlModel::getRowSet(  ) throw (RuntimeException)
 {
     return Reference< XRowSet >( getParent(), UNO_QUERY );
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OGridControlModel::setRowSet( const Reference< XRowSet >& /*_rxDataSource*/ ) throw (RuntimeException)
 {
     OSL_FAIL( "OGridControlModel::setRowSet: not supported!" );
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OGridControlModel::addRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException)
 {
     if ( i_Listener.is() )
         m_aRowSetChangeListeners.addInterface( i_Listener );
 }
 
-//--------------------------------------------------------------------
 void SAL_CALL OGridControlModel::removeRowSetChangeListener( const Reference< XRowSetChangeListener >& i_Listener ) throw (RuntimeException)
 {
     m_aRowSetChangeListeners.removeInterface( i_Listener );
 }
 
 // XChild
-//------------------------------------------------------------------------------
 void SAL_CALL OGridControlModel::setParent( const InterfaceRef& i_Parent ) throw(NoSupportException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
     if ( i_Parent == getParent() )
         return;
-
     OControlModel::setParent( i_Parent );
-
     EventObject aEvent( *this );
     aGuard.clear();
     m_aRowSetChangeListeners.notifyEach( &XRowSetChangeListener::onRowSetChanged, aEvent );
 }
-
-//------------------------------------------------------------------------------
 Sequence< Type > SAL_CALL OGridControlModel::getTypes(  ) throw(RuntimeException)
 {
     return concatSequences(
@@ -284,15 +242,12 @@ Sequence< Type > SAL_CALL OGridControlModel::getTypes(  ) throw(RuntimeException
 }
 
 // OComponentHelper
-//------------------------------------------------------------------------------
 void OGridControlModel::disposing()
 {
     OControlModel::disposing();
     OErrorBroadcaster::disposing();
     OInterfaceContainer::disposing();
-
     setParent(NULL);
-
     EventObject aEvt(static_cast<XWeak*>(this));
     m_aSelectListeners.disposeAndClear(aEvt);
     m_aResetListeners.disposeAndClear(aEvt);
@@ -300,7 +255,6 @@ void OGridControlModel::disposing()
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
 void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeException )
 {
     OControlModel::disposing( _rEvent );
@@ -308,18 +262,15 @@ void OGridControlModel::disposing(const EventObject& _rEvent) throw( RuntimeExce
 }
 
 // XSelectionSupplier
-//-----------------------------------------------------------------------------
 sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalArgumentException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
-
     Reference<XPropertySet> xSel;
     if (rElement.hasValue() && !::cppu::extractInterface(xSel, rElement))
     {
         throw IllegalArgumentException();
     }
     InterfaceRef xMe = static_cast<XWeak*>(this);
-
     if (xSel.is())
     {
         Reference<XChild> xAsChild(xSel, UNO_QUERY);
@@ -328,7 +279,6 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr
             throw IllegalArgumentException();
         }
     }
-
     if ( xSel != m_xSelection )
     {
         m_xSelection = xSel;
@@ -338,35 +288,28 @@ sal_Bool SAL_CALL OGridControlModel::select(const Any& rElement) throw(IllegalAr
     }
     return sal_False;
 }
-
-//-----------------------------------------------------------------------------
 Any SAL_CALL OGridControlModel::getSelection() throw(RuntimeException)
 {
     return makeAny(m_xSelection);
 }
 
-//-----------------------------------------------------------------------------
 void OGridControlModel::addSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException )
 {
     m_aSelectListeners.addInterface(_rxListener);
 }
 
-//-----------------------------------------------------------------------------
 void OGridControlModel::removeSelectionChangeListener(const Reference< XSelectionChangeListener >& _rxListener) throw( RuntimeException )
 {
     m_aSelectListeners.removeInterface(_rxListener);
 }
 
 // XGridColumnFactory
-//------------------------------------------------------------------------------
 Reference<XPropertySet> SAL_CALL OGridControlModel::createColumn(const OUString& ColumnType) throw ( :: com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard g;
     const Sequence< OUString >& rColumnTypes = frm::getColumnTypes();
     return createColumn( ::detail::findPos( ColumnType, rColumnTypes ) );
 }
-
-//------------------------------------------------------------------------------
 Reference<XPropertySet>  OGridControlModel::createColumn(sal_Int32 nTypeId) const
 {
     Reference<XPropertySet>  xReturn;
@@ -388,15 +331,12 @@ Reference<XPropertySet>  OGridControlModel::createColumn(sal_Int32 nTypeId) cons
     }
     return xReturn;
 }
-
-//------------------------------------------------------------------------------
 StringSequence SAL_CALL OGridControlModel::getColumnTypes() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return frm::getColumnTypes();
 }
 
 // XReset
-//-----------------------------------------------------------------------------
 void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeException)
 {
     ::cppu::OInterfaceIteratorHelper aIter(m_aResetListeners);
@@ -404,27 +344,20 @@ void SAL_CALL OGridControlModel::reset() throw ( ::com::sun::star::uno::RuntimeE
     sal_Bool bContinue = sal_True;
     while (aIter.hasMoreElements() && bContinue)
         bContinue =((XResetListener*)aIter.next())->approveReset(aEvt);
-
     if (bContinue)
     {
         _reset();
         m_aResetListeners.notifyEach( &XResetListener::resetted, aEvt );
     }
 }
-
-//-----------------------------------------------------------------------------
 void SAL_CALL OGridControlModel::addResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException)
 {
     m_aResetListeners.addInterface(_rxListener);
 }
-
-//-----------------------------------------------------------------------------
 void SAL_CALL OGridControlModel::removeResetListener(const Reference<XResetListener>& _rxListener) throw ( ::com::sun::star::uno::RuntimeException)
 {
     m_aResetListeners.removeInterface(_rxListener);
 }
-
-//-----------------------------------------------------------------------------
 void OGridControlModel::_reset()
 {
     Reference<XReset> xReset;
@@ -438,7 +371,6 @@ void OGridControlModel::_reset()
 }
 
 // XPropertySet
-//------------------------------------------------------------------------------
 void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_BASE_PROPERTIES( 37 )
@@ -481,8 +413,6 @@ void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps )
         DECL_PROP3(CONTEXT_WRITING_MODE,sal_Int16,          BOUND, MAYBEDEFAULT, TRANSIENT);
     END_DESCRIBE_PROPERTIES();
 }
-
-//------------------------------------------------------------------------------
 void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) const
 {
     switch (nHandle)
@@ -541,7 +471,6 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co
         case PROPERTY_ID_ROWHEIGHT:
             rValue = m_aRowHeight;
             break;
-
         default:
             if ( isFontRelatedProperty( nHandle ) )
                 FontControlModel::getFastPropertyValue( rValue, nHandle );
@@ -549,8 +478,6 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co
                 OControlModel::getFastPropertyValue( rValue, nHandle );
     }
 }
-
-//------------------------------------------------------------------------------
 sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue,
                                                     sal_Int32 nHandle, const Any& rValue )throw( IllegalArgumentException )
 {
@@ -622,7 +549,6 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any&
         case PROPERTY_ID_ROWHEIGHT:
             {
                 bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_aRowHeight, ::getCppuType((const sal_Int32*)NULL));
-
                 sal_Int32 nNewVal( 0 );
                 if ( ( rConvertedValue >>= nNewVal ) && ( nNewVal <= 0 ) )
                 {
@@ -639,8 +565,6 @@ sal_Bool OGridControlModel::convertFastPropertyValue( Any& rConvertedValue, Any&
     }
     return bModified;
 }
-
-//------------------------------------------------------------------------------
 void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw ( ::com::sun::star::uno::Exception)
 {
     switch (nHandle)
@@ -699,7 +623,6 @@ void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
         case PROPERTY_ID_ROWHEIGHT:
             m_aRowHeight = rValue;
             break;
-
         default:
             if ( isFontRelatedProperty( nHandle ) )
             {
@@ -710,12 +633,9 @@ void OGridControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
             else
                 OControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
     }
-
 }
 
 //XPropertyState
-
-//------------------------------------------------------------------------------
 Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
 {
     Any aReturn;
@@ -725,11 +645,9 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
         case PROPERTY_ID_WRITING_MODE:
             aReturn <<= WritingMode2::CONTEXT;
             break;
-
         case PROPERTY_ID_DEFAULTCONTROL:
             aReturn <<= OUString( STARDIV_ONE_FORM_CONTROL_GRID  );
             break;
-
         case PROPERTY_ID_PRINTABLE:
         case PROPERTY_ID_HASNAVIGATION:
         case PROPERTY_ID_RECORDMARKER:
@@ -738,20 +656,16 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
         case PROPERTY_ID_ENABLEVISIBLE:
             aReturn = makeBoolAny(true);
             break;
-
         case PROPERTY_ID_ALWAYSSHOWCURSOR:
             aReturn = makeBoolAny(false);
             break;
-
         case PROPERTY_ID_HELPURL:
         case PROPERTY_ID_HELPTEXT:
             aReturn <<= OUString();
             break;
-
         case PROPERTY_ID_BORDER:
             aReturn <<= (sal_Int16)1;
             break;
-
         case PROPERTY_ID_BORDERCOLOR:
         case PROPERTY_ID_TABSTOP:
         case PROPERTY_ID_BACKGROUNDCOLOR:
@@ -759,7 +673,6 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
         case PROPERTY_ID_CURSORCOLOR:
             // void
             break;
-
         default:
             if ( isFontRelatedProperty( nHandle ) )
                 aReturn = FontControlModel::getPropertyDefaultByHandle( nHandle );
@@ -769,18 +682,15 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
 OGridColumn* OGridControlModel::getColumnImplementation(const InterfaceRef& _rxIFace) const
 {
     OGridColumn* pImplementation = NULL;
     Reference< XUnoTunnel > xUnoTunnel( _rxIFace, UNO_QUERY );
     if ( xUnoTunnel.is() )
         pImplementation = reinterpret_cast<OGridColumn*>(xUnoTunnel->getSomething(OGridColumn::getUnoTunnelImplementationId()));
-
     return pImplementation;
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::gotColumn( const Reference< XInterface >& _rxColumn )
 {
     Reference< XSQLErrorBroadcaster > xBroadcaster( _rxColumn, UNO_QUERY );
@@ -788,7 +698,6 @@ void OGridControlModel::gotColumn( const Reference< XInterface >& _rxColumn )
         xBroadcaster->addSQLErrorListener( this );
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::lostColumn(const Reference< XInterface >& _rxColumn)
 {
     if ( m_xSelection == _rxColumn )
@@ -797,119 +706,95 @@ void OGridControlModel::lostColumn(const Reference< XInterface >& _rxColumn)
         EventObject aEvt( static_cast< XWeak* >( this ) );
         m_aSelectListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvt );
     }
-
     Reference< XSQLErrorBroadcaster > xBroadcaster( _rxColumn, UNO_QUERY );
     if ( xBroadcaster.is() )
         xBroadcaster->removeSQLErrorListener( this );
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::implRemoved(const InterfaceRef& _rxObject)
 {
     OInterfaceContainer::implRemoved(_rxObject);
     lostColumn(_rxObject);
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::implInserted( const ElementDescription* _pElement )
 {
     OInterfaceContainer::implInserted( _pElement );
     gotColumn( _pElement->xInterface );
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::impl_replacedElement( const ContainerEvent& _rEvent, ::osl::ClearableMutexGuard& _rInstanceLock )
 {
     Reference< XInterface > xOldColumn( _rEvent.ReplacedElement, UNO_QUERY );
     Reference< XInterface > xNewColumn( _rEvent.Element, UNO_QUERY );
-
     bool bNewSelection = ( xOldColumn == m_xSelection );
-
     lostColumn( xOldColumn );
     gotColumn( xNewColumn );
-
     if ( bNewSelection )
         m_xSelection.set( xNewColumn, UNO_QUERY );
-
     OInterfaceContainer::impl_replacedElement( _rEvent, _rInstanceLock );
-    // <<---- SYNCHRONIZED
-
+    // < SYNCHRONIZED
     if ( bNewSelection )
     {
         m_aSelectListeners.notifyEach( &XSelectionChangeListener::selectionChanged, EventObject( *this ) );
     }
 }
 
-//------------------------------------------------------------------------------
 ElementDescription* OGridControlModel::createElementMetaData( )
 {
     return new ColumnDescription;
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::approveNewElement( const Reference< XPropertySet >& _rxObject, ElementDescription* _pElement )
 {
     OGridColumn* pCol = getColumnImplementation( _rxObject );
     if ( !pCol )
         throw IllegalArgumentException();
-
     OInterfaceContainer::approveNewElement( _rxObject, _pElement );
-
     // if we're here, the object passed all tests
     if ( _pElement )
         static_cast< ColumnDescription* >( _pElement )->pColumn = pCol;
 }
 
 // XPersistObject
-//------------------------------------------------------------------------------
 OUString SAL_CALL OGridControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
-    return OUString(FRM_COMPONENT_GRID);  // old (non-sun) name for compatibility !
+    return OUString(FRM_COMPONENT_GRID);  // old (non-sun) name for compatibility!
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OControlModel::write(_rxOutStream);
-
     Reference<XMarkableStream>  xMark(_rxOutStream, UNO_QUERY);
-
     // 1. Version
     _rxOutStream->writeShort(0x0008);
-
     // 2. Columns
     sal_Int32 nLen = getCount();
     _rxOutStream->writeLong(nLen);
     OGridColumn* pCol;
     for (sal_Int32 i = 0; i < nLen; i++)
     {
-        // zuerst den Servicenamen fuer das darunterliegende Model
+        // first the service name for the unerlying model
         pCol = getColumnImplementation(m_aItems[i]);
         DBG_ASSERT(pCol != NULL, "OGridControlModel::write : such items should never reach it into my container !");
-
         _rxOutStream << pCol->getModelName();
-
-        // dann das Object selbst
+        // then the object itself
         sal_Int32 nMark = xMark->createMark();
         sal_Int32 nObjLen = 0;
         _rxOutStream->writeLong(nObjLen);
-
-        // schreiben der Col
+        // writing the column
         pCol->write(_rxOutStream);
-
-        // feststellen der Laenge
+        // determining the length
         nObjLen = xMark->offsetToMark(nMark) - 4;
         xMark->jumpToMark(nMark);
         _rxOutStream->writeLong(nObjLen);
         xMark->jumpToFurthest();
         xMark->deleteMark(nMark);
     }
-
     // 3. Events
     writeEvents(_rxOutStream);
-
-    // 4. Attribute
-    // Maskierung fuer alle any Typen
+    // 4. Attributes
+    // Masking for all 'any' types
     sal_uInt16 nAnyMask = 0;
     if (m_aRowHeight.getValueType().getTypeClass() == TypeClass_LONG)
         nAnyMask |= ROWHEIGHT;
@@ -923,12 +808,9 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
         nAnyMask |= BACKGROUNDCOLOR;
     if (!m_bRecordMarker)
         nAnyMask |= RECORDMARKER;
-
     _rxOutStream->writeShort(nAnyMask);
-
     if (nAnyMask & ROWHEIGHT)
         _rxOutStream->writeLong(getINT32(m_aRowHeight));
-
     // old structures
     const FontDescriptor& aFont = getFont();
     if ( nAnyMask & FONTDESCRIPTOR )
@@ -941,12 +823,10 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
         _rxOutStream->writeShort( sal_Int16(aFont.Orientation * 10) );
         _rxOutStream->writeBoolean( aFont.Kerning );
         _rxOutStream->writeBoolean( aFont.WordLineMode );
-
         // Size
         _rxOutStream->writeLong( aFont.Width );
         _rxOutStream->writeLong( aFont.Height );
         _rxOutStream->writeShort( sal::static_int_cast< sal_Int16 >( VCLUnoHelper::ConvertFontWidth( aFont.CharacterWidth ) ) );
-
         // Type
         _rxOutStream->writeUTF( aFont.Name );
         _rxOutStream->writeUTF( aFont.StyleName );
@@ -954,59 +834,43 @@ void OGridControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream
         _rxOutStream->writeShort( aFont.CharSet );
         _rxOutStream->writeShort( aFont.Pitch );
     }
-
     _rxOutStream << m_aDefaultControl;
-
     _rxOutStream->writeShort(m_nBorder);
     _rxOutStream->writeBoolean(m_bEnable);
-
     if (nAnyMask & TABSTOP)
         _rxOutStream->writeBoolean(getBOOL(m_aTabStop));
-
     _rxOutStream->writeBoolean(m_bNavigation);
-
     if (nAnyMask & TEXTCOLOR)
         _rxOutStream->writeLong( getTextColor() );
-
-    // neu ab Version 6
+    // new since version 6
     _rxOutStream << m_sHelpText;
-
     if (nAnyMask & FONTDESCRIPTOR)
         _rxOutStream << getFont();
-
     if (nAnyMask & RECORDMARKER)
         _rxOutStream->writeBoolean(m_bRecordMarker);
-
-    // neu ab Version 7
+    // new since version 7
     _rxOutStream->writeBoolean(m_bPrintable);
-
-    // new since 8
+    // new since version 8
     if (nAnyMask & BACKGROUNDCOLOR)
         _rxOutStream->writeLong(getINT32(m_aBackgroundColor));
 }
 
-//------------------------------------------------------------------------------
 void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard g;
     OControlModel::read(_rxInStream);
-
     Reference<XMarkableStream>  xMark(_rxInStream, UNO_QUERY);
-
-    // 1. Version
+    // 1. version
     sal_Int16 nVersion = _rxInStream->readShort();
-
-    // 2. Einlesen der Spalten
+    // 2. reading the columns
     sal_Int32 nLen = _rxInStream->readLong();
     if (nLen)
     {
         for (sal_Int32 i = 0; i < nLen; i++)
         {
-            // Lesen des Modelnamen
-
+            // reading the model names
             OUString sModelName;
             _rxInStream >> sModelName;
-
             Reference<XPropertySet>  xCol(createColumn(getColumnTypeByModelName(sModelName)));
             DBG_ASSERT(xCol.is(), "OGridControlModel::read : unknown column type !");
             sal_Int32 nObjLen = _rxInStream->readLong();
@@ -1022,15 +886,13 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
                 _rxInStream->skipBytes(nObjLen);
                 xMark->deleteMark(nMark);
             }
-
             if ( xCol.is() )
                 implInsert( i, xCol, sal_False, NULL, sal_False );
         }
     }
-
-    // In der Basisimplementierung werden die Events nur gelesen, Elemente im Container existieren
-    // da aber vor TF_ONE fuer das GridControl immer Events geschrieben wurden, muessen sie auch immer
-    // mit gelesen werden
+    // In the base implementation events are only read, elements in the container exist
+    // but since before TF_ONE for the GridControl events were always written, so they
+    // need to be read, too
     sal_Int32 nObjLen = _rxInStream->readLong();
     if (nObjLen)
     {
@@ -1042,8 +904,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
         _rxInStream->skipBytes(nObjLen);
         xMark->deleteMark(nMark);
     }
-
-    // Attachement lesen
+    // reading the attachement
     for (sal_Int32 i = 0; i < nLen; i++)
     {
         InterfaceRef  xIfc(m_aItems[i], UNO_QUERY);
@@ -1052,25 +913,20 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
         aHelper <<= xSet;
         m_xEventAttacher->attach( i, xIfc, aHelper );
     }
-
-    // 4. Einlesen der Attribute
+    // 4. reading the attributes
     if (nVersion == 1)
         return;
-
-    // Maskierung fuer any
+    // Masking for any
     sal_uInt16 nAnyMask = _rxInStream->readShort();
-
     if (nAnyMask & ROWHEIGHT)
     {
         sal_Int32 nValue = _rxInStream->readLong();
         m_aRowHeight <<= (sal_Int32)nValue;
     }
-
     FontDescriptor aFont( getFont() );
     if ( nAnyMask & FONTATTRIBS )
     {
         aFont.Weight = (float)VCLUnoHelper::ConvertFontWeight( _rxInStream->readShort() );
-
         aFont.Slant = (FontSlant)_rxInStream->readShort();
         aFont.Underline = _rxInStream->readShort();
         aFont.Strikeout = _rxInStream->readShort();
@@ -1092,56 +948,42 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
         aFont.CharSet = _rxInStream->readShort();
         aFont.Pitch = _rxInStream->readShort();
     }
-
     if ( nAnyMask & ( FONTATTRIBS | FONTSIZE | FONTTYPE ) )
         setFont( aFont );
-
     // Name
     _rxInStream >> m_aDefaultControl;
     m_nBorder = _rxInStream->readShort();
     m_bEnable = _rxInStream->readBoolean();
-
     if (nAnyMask & TABSTOP)
     {
         m_aTabStop = makeBoolAny(_rxInStream->readBoolean());
     }
-
     if (nVersion > 3)
         m_bNavigation = _rxInStream->readBoolean();
-
     if (nAnyMask & TEXTCOLOR)
     {
         sal_Int32 nValue = _rxInStream->readLong();
         setTextColor( (sal_Int32)nValue );
     }
-
-    // neu ab Version 6
+    // new since version 6
     if (nVersion > 5)
         _rxInStream >> m_sHelpText;
-
     if (nAnyMask & FONTDESCRIPTOR)
     {
         FontDescriptor aUNOFont;
         _rxInStream >> aUNOFont;
         setFont( aFont );
     }
-
     if (nAnyMask & RECORDMARKER)
         m_bRecordMarker = _rxInStream->readBoolean();
-
-    // neu ab Version 7
+    // new since version 7
     if (nVersion > 6)
         m_bPrintable = _rxInStream->readBoolean();
-
     if (nAnyMask & BACKGROUNDCOLOR)
     {
         sal_Int32 nValue = _rxInStream->readLong();
         m_aBackgroundColor <<= (sal_Int32)nValue;
     }
 }
-
-//.........................................................................
-}   // namespace frm
-//.........................................................................
-
+}
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/GroupBox.cxx b/forms/source/component/GroupBox.cxx
index 1386de86fea7..e5afd4154c48 100644
--- a/forms/source/component/GroupBox.cxx
+++ b/forms/source/component/GroupBox.cxx
@@ -43,28 +43,28 @@ using namespace ::com::sun::star::util;
 // OGroupBoxModel
 //==================================================================
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OGroupBoxModel_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new OGroupBoxModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OGroupBoxModel::OGroupBoxModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, VCL_CONTROLMODEL_GROUPBOX, VCL_CONTROL_GROUPBOX)
 {
     m_nClassId = FormComponentType::GROUPBOX;
 }
 
-//------------------------------------------------------------------
+
 OGroupBoxModel::OGroupBoxModel( const OGroupBoxModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory )
 {
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControlModel::getSupportedServiceNames();
@@ -75,15 +75,15 @@ StringSequence SAL_CALL OGroupBoxModel::getSupportedServiceNames() throw(Runtime
     return aSupported;
 }
 
-//------------------------------------------------------------------
+
 OGroupBoxModel::~OGroupBoxModel()
 {
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OGroupBoxModel )
 
-//------------------------------------------------------------------------------
+
 void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
 {
     OControlModel::describeAggregateProperties( _rAggregateProps );
@@ -91,13 +91,13 @@ void OGroupBoxModel::describeAggregateProperties( Sequence< Property >& _rAggreg
     RemoveProperty(_rAggregateProps, PROPERTY_TABSTOP);
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OGroupBoxModel::getServiceName() throw(RuntimeException)
 {
     return OUString(FRM_COMPONENT_GROUPBOX);  // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOutStream)
     throw(IOException, RuntimeException)
 {
@@ -108,7 +108,7 @@ void SAL_CALL OGroupBoxModel::write(const Reference< XObjectOutputStream>& _rxOu
     writeHelpTextCompatibly(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException)
 {
     OControlModel::read( _rxInStream );
@@ -131,19 +131,19 @@ void SAL_CALL OGroupBoxModel::read(const Reference< XObjectInputStream>& _rxInSt
 // OGroupBoxControl
 //==================================================================
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OGroupBoxControl_CreateInstance(const Reference<starlang::XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new OGroupBoxControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 OGroupBoxControl::OGroupBoxControl(const Reference<XComponentContext>& _rxFactory)
                    :OControl(_rxFactory, VCL_CONTROL_GROUPBOX)
 {
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OGroupBoxControl::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OControl::getSupportedServiceNames();
diff --git a/forms/source/component/GroupManager.cxx b/forms/source/component/GroupManager.cxx
index af6b3c836dfa..7a90ed5804b8 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -29,11 +29,8 @@
 
 #include <algorithm>
 
-//.........................................................................
 namespace frm
 {
-//.........................................................................
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::beans;
@@ -58,23 +55,18 @@ namespace
     }
 }
 
-//========================================================================
 // class OGroupCompAcc
-//========================================================================
-//------------------------------------------------------------------
 OGroupCompAcc::OGroupCompAcc(const Reference<XPropertySet>& rxElement, const OGroupComp& _rGroupComp )
                :m_xComponent( rxElement )
                ,m_aGroupComp( _rGroupComp )
 {
 }
 
-//------------------------------------------------------------------
 sal_Bool OGroupCompAcc::operator==( const OGroupCompAcc& rCompAcc ) const
 {
     return (m_xComponent == rCompAcc.GetComponent());
 }
 
-//------------------------------------------------------------------
 class OGroupCompAccLess : public ::std::binary_function<OGroupCompAcc, OGroupCompAcc, sal_Bool>
 {
 public:
@@ -86,18 +78,13 @@ public:
     }
 };
 
-//========================================================================
 // class OGroupComp
-//========================================================================
-
-//------------------------------------------------------------------
 OGroupComp::OGroupComp()
     :m_nPos( -1 )
     ,m_nTabIndex( 0 )
 {
 }
 
-//------------------------------------------------------------------
 OGroupComp::OGroupComp(const OGroupComp& _rSource)
     :m_aName( _rSource.m_aName )
     ,m_xComponent( _rSource.m_xComponent )
@@ -107,7 +94,6 @@ OGroupComp::OGroupComp(const OGroupComp& _rSource)
 {
 }
 
-//------------------------------------------------------------------
 OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPos )
     : m_aName( OGroupManager::GetGroupName( rxSet ) )
     , m_xComponent( rxSet )
@@ -118,18 +104,16 @@ OGroupComp::OGroupComp(const Reference<XPropertySet>& rxSet, sal_Int32 nInsertPo
     if (m_xComponent.is())
     {
         if (hasProperty( PROPERTY_TABINDEX, m_xComponent ) )
-            // Indices kleiner 0 werden wie 0 behandelt
+            // Indices smaller than 0 are treated like 0
             m_nTabIndex = std::max(getINT16(m_xComponent->getPropertyValue( PROPERTY_TABINDEX )) , sal_Int16(0));
     }
 }
 
-//------------------------------------------------------------------
 sal_Bool OGroupComp::operator==( const OGroupComp& rComp ) const
 {
     return m_nTabIndex == rComp.GetTabIndex() && m_nPos == rComp.GetPos();
 }
 
-//------------------------------------------------------------------
 class OGroupCompLess : public ::std::binary_function<OGroupComp, OGroupComp, sal_Bool>
 {
 public:
@@ -147,23 +131,17 @@ public:
     }
 };
 
-//========================================================================
 // class OGroup
-//========================================================================
-
-//------------------------------------------------------------------
 OGroup::OGroup( const OUString& rGroupName )
         :m_aGroupName( rGroupName )
         ,m_nInsertPos(0)
 {
 }
 
-//------------------------------------------------------------------
 OGroup::~OGroup()
 {
 }
 
-//------------------------------------------------------------------
 void OGroup::InsertComponent( const Reference<XPropertySet>& xSet )
 {
     OGroupComp aNewGroupComp( xSet, m_nInsertPos );
@@ -174,7 +152,6 @@ void OGroup::InsertComponent( const Reference<XPropertySet>& xSet )
     m_nInsertPos++;
 }
 
-//------------------------------------------------------------------
 void OGroup::RemoveComponent( const Reference<XPropertySet>& rxElement )
 {
     sal_Int32 nGroupCompAccPos;
@@ -190,12 +167,12 @@ void OGroup::RemoveComponent( const Reference<XPropertySet>& rxElement )
             m_aCompAccArray.erase( m_aCompAccArray.begin() + nGroupCompAccPos );
             m_aCompArray.erase( m_aCompArray.begin() + nGroupCompPos );
 
-            /*============================================================
+            /*
             Durch das Entfernen der GroupComp ist die Einfuegeposition
             ungueltig geworden. Sie braucht hier aber nicht angepasst werden,
             da sie fortlaufend vergeben wird und damit immer
             aufsteigend eindeutig ist.
-            ============================================================*/
+            */
         }
         else
         {
@@ -208,13 +185,11 @@ void OGroup::RemoveComponent( const Reference<XPropertySet>& rxElement )
     }
 }
 
-//------------------------------------------------------------------
 sal_Bool OGroup::operator==( const OGroup& rGroup ) const
 {
     return m_aGroupName.equals(rGroup.GetGroupName());
 }
 
-//------------------------------------------------------------------
 class OGroupLess : public ::std::binary_function<OGroup, OGroup, sal_Bool>
 {
 public:
@@ -224,7 +199,6 @@ public:
     }
 };
 
-//------------------------------------------------------------------
 Sequence< Reference<XControlModel>  > OGroup::GetControlModels() const
 {
     sal_Int32 nLen = m_aCompArray.size();
@@ -240,7 +214,7 @@ Sequence< Reference<XControlModel>  > OGroup::GetControlModels() const
 }
 
 DBG_NAME(OGroupManager);
-//------------------------------------------------------------------
+
 OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
     :m_pCompGroup( new OGroup( OUString("AllComponentGroup") ) )
     ,m_xContainer(_rxContainer)
@@ -254,16 +228,14 @@ OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
     decrement(m_refCount);
 }
 
-//------------------------------------------------------------------
 OGroupManager::~OGroupManager()
 {
     DBG_DTOR(OGroupManager,NULL);
-    // Alle Components und CompGroup loeschen
+    // delete all Components and CompGroup
     delete m_pCompGroup;
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------
 void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException )
 {
     Reference<XContainer>  xContainer(evt.Source, UNO_QUERY);
@@ -271,23 +243,22 @@ void OGroupManager::disposing(const EventObject& evt) throw( RuntimeException )
     {
         DELETEZ(m_pCompGroup);
 
-        ////////////////////////////////////////////////////////////////
-        // Gruppen loeschen
+        // delete group
         m_aGroupArr.clear();
         m_xContainer.clear();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Reference<XPropertySet>& _xSet)
 {
-    // Component aus CompGroup entfernen
+    // remove Component from CompGroup
     m_pCompGroup->RemoveComponent( _xSet );
 
     OGroupArr::iterator aFind = m_aGroupArr.find(_sGroupName);
 
     if ( aFind != m_aGroupArr.end() )
     {
-        // Gruppe vorhanden
+        // group exists
         aFind->second.RemoveComponent( _xSet );
 
         // Wenn Anzahl der Gruppenelemente == 1 ist, Gruppe deaktivieren
@@ -317,12 +288,12 @@ void OGroupManager::removeFromGroupMap(const OUString& _sGroupName,const Referen
     if (hasProperty(PROPERTY_TABINDEX, _xSet))
         _xSet->removePropertyChangeListener( PROPERTY_TABINDEX, this );
 }
-//------------------------------------------------------------------
+
 void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) throw ( ::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySet>  xSet(evt.Source, UNO_QUERY);
 
-    // Component aus Gruppe entfernen
+    // remove Component from group
     OUString     sGroupName;
     if (hasProperty( PROPERTY_GROUP_NAME, xSet ))
         xSet->getPropertyValue( PROPERTY_GROUP_NAME ) >>= sGroupName;
@@ -349,7 +320,6 @@ void SAL_CALL OGroupManager::propertyChange(const PropertyChangeEvent& evt) thro
 }
 
 // XContainerListener
-//------------------------------------------------------------------
 void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException)
 {
     Reference< XPropertySet > xProps;
@@ -358,7 +328,6 @@ void SAL_CALL OGroupManager::elementInserted(const ContainerEvent& Event) throw
         InsertElement( xProps );
 }
 
-//------------------------------------------------------------------
 void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySet> xProps;
@@ -367,7 +336,6 @@ void SAL_CALL OGroupManager::elementRemoved(const ContainerEvent& Event) throw (
         RemoveElement( xProps );
 }
 
-//------------------------------------------------------------------
 void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw ( ::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySet> xProps;
@@ -382,19 +350,16 @@ void SAL_CALL OGroupManager::elementReplaced(const ContainerEvent& Event) throw
 }
 
 // Other functions
-//------------------------------------------------------------------
 Sequence<Reference<XControlModel> > OGroupManager::getControlModels()
 {
     return m_pCompGroup->GetControlModels();
 }
 
-//------------------------------------------------------------------
 sal_Int32 OGroupManager::getGroupCount()
 {
     return m_aActiveGroupMap.size();
 }
 
-//------------------------------------------------------------------
 void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel> >& _rGroup, OUString& _rName)
 {
     OSL_ENSURE(nGroup >= 0 && (size_t)nGroup < m_aActiveGroupMap.size(),"OGroupManager::getGroup: Invalid group index!");
@@ -403,7 +368,6 @@ void OGroupManager::getGroup(sal_Int32 nGroup, Sequence< Reference<XControlModel
     _rGroup                         = aGroupPos->second.GetControlModels();
 }
 
-//------------------------------------------------------------------
 void OGroupManager::getGroupByName(const OUString& _rName, Sequence< Reference<XControlModel>  >& _rGroup)
 {
     OGroupArr::iterator aFind = m_aGroupArr.find(_rName);
@@ -411,7 +375,6 @@ void OGroupManager::getGroupByName(const OUString& _rName, Sequence< Reference<X
         _rGroup = aFind->second.GetControlModels();
 }
 
-//------------------------------------------------------------------
 void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
 {
     // Nur ControlModels
@@ -458,7 +421,6 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
             m_aActiveGroupMap.push_back(  aFind );
     }
 
-
     // Bei Component als PropertyChangeListener anmelden
     xSet->addPropertyChangeListener( PROPERTY_NAME, this );
     if (hasProperty(PROPERTY_GROUP_NAME, xSet))
@@ -467,10 +429,8 @@ void OGroupManager::InsertElement( const Reference<XPropertySet>& xSet )
     // Tabindex muss nicht jeder unterstuetzen
     if (hasProperty(PROPERTY_TABINDEX, xSet))
         xSet->addPropertyChangeListener( PROPERTY_TABINDEX, this );
-
 }
 
-//------------------------------------------------------------------
 void OGroupManager::RemoveElement( const Reference<XPropertySet>& xSet )
 {
     // Nur ControlModels
@@ -498,9 +458,6 @@ OUString OGroupManager::GetGroupName( ::com::sun::star::uno::Reference< ::com::s
         xComponent->getPropertyValue( PROPERTY_NAME ) >>= sGroupName;
     return sGroupName;
 }
-
-//.........................................................................
 }   // namespace frm
-//.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index b084030c6608..31d506ee057c 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -40,36 +40,36 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OHiddenModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new OHiddenModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OHiddenModel::OHiddenModel(const Reference<XComponentContext>& _rxFactory)
     :OControlModel(_rxFactory, OUString())
 {
     m_nClassId = FormComponentType::HIDDENCONTROL;
 }
 
-//------------------------------------------------------------------
+
 OHiddenModel::OHiddenModel( const OHiddenModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OControlModel( _pOriginal, _rxFactory )
 {
     m_sHiddenValue = _pOriginal->m_sHiddenValue;
 }
 
-//------------------------------------------------------------------------------
+
 OHiddenModel::~OHiddenModel( )
 {
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OHiddenModel )
 
-//------------------------------------------------------------------------------
+
 void OHiddenModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 {
     switch (_nHandle)
@@ -80,7 +80,7 @@ void OHiddenModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception)
 {
     switch (_nHandle)
@@ -94,7 +94,7 @@ void OHiddenModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const An
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OHiddenModel::convertFastPropertyValue(
             Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
             throw (IllegalArgumentException)
@@ -112,7 +112,7 @@ sal_Bool OHiddenModel::convertFastPropertyValue(
     return bModified;
 }
 
-//------------------------------------------------------------------------------
+
 void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_BASE_PROPERTIES(4)
@@ -124,7 +124,7 @@ void OHiddenModel::describeFixedProperties( Sequence< Property >& _rProps ) cons
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)
 {
     StringSequence aSupported( 2 );
@@ -133,13 +133,13 @@ StringSequence SAL_CALL OHiddenModel::getSupportedServiceNames() throw(::com::su
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OHiddenModel::getServiceName() throw(RuntimeException)
 {
     return OUString(FRM_COMPONENT_HIDDEN);    // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
     throw(IOException, RuntimeException)
 {
@@ -152,7 +152,7 @@ void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutSt
     OControlModel::write(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException)
 {
     // Version
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 944df88ce4ce..3c60460c7e71 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -26,10 +26,8 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/MouseButton.hpp>
 
-//.........................................................................
 namespace frm
 {
-//.........................................................................
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdb;
@@ -42,16 +40,12 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::util;
 
-//==================================================================
-//= OImageButtonModel
-//==================================================================
-//------------------------------------------------------------------
+// OImageButtonModel
 InterfaceRef SAL_CALL OImageButtonModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
      return *(new OImageButtonModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
 OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFactory)
                     :OClickableImageBaseModel( _rxFactory, VCL_CONTROLMODEL_IMAGEBUTTON, FRM_SUN_CONTROL_IMAGEBUTTON )
                                     // use the old control name for compytibility reasons
@@ -59,23 +53,19 @@ OImageButtonModel::OImageButtonModel(const Reference<XComponentContext>& _rxFact
     m_nClassId = FormComponentType::IMAGEBUTTON;
 }
 
-//------------------------------------------------------------------
 OImageButtonModel::OImageButtonModel( const OImageButtonModel* _pOriginal, const Reference<XComponentContext>& _rxFactory)
     :OClickableImageBaseModel( _pOriginal, _rxFactory )
 {
     implInitializeImageURL();
 }
 
-//------------------------------------------------------------------------------
 IMPLEMENT_DEFAULT_CLONING( OImageButtonModel )
 
-//------------------------------------------------------------------------------
 OImageButtonModel::~OImageButtonModel()
 {
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
 StringSequence  OImageButtonModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseModel::getSupportedServiceNames();
@@ -86,7 +76,6 @@ StringSequence  OImageButtonModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
 void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 5, OClickableImageBaseModel )
@@ -98,13 +87,11 @@ void OImageButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
 OUString OImageButtonModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_IMAGEBUTTON);   // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
 void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OControlModel::write(_rxOutStream);
@@ -119,7 +106,6 @@ void OImageButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream
     writeHelpTextCompatibly(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
 void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OControlModel::read(_rxInStream);
@@ -159,16 +145,12 @@ void OImageButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) t
     }
 }
 
-//==================================================================
 // OImageButtonControl
-//==================================================================
-//------------------------------------------------------------------
 InterfaceRef SAL_CALL OImageButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OImageButtonControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
 Sequence<Type> OImageButtonControl::_getTypes()
 {
     static Sequence<Type> aTypes;
@@ -177,7 +159,6 @@ Sequence<Type> OImageButtonControl::_getTypes()
     return aTypes;
 }
 
-//------------------------------------------------------------------------------
 StringSequence  OImageButtonControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OClickableImageBaseControl::getSupportedServiceNames();
@@ -188,7 +169,6 @@ StringSequence  OImageButtonControl::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
 OImageButtonControl::OImageButtonControl(const Reference<XComponentContext>& _rxFactory)
             :OClickableImageBaseControl(_rxFactory, VCL_CONTROL_IMAGEBUTTON)
 {
@@ -204,7 +184,6 @@ OImageButtonControl::OImageButtonControl(const Reference<XComponentContext>& _rx
 }
 
 // UNO Anbindung
-//------------------------------------------------------------------------------
 Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OClickableImageBaseControl::queryAggregation(_rType);
@@ -214,7 +193,6 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
 void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -238,24 +216,18 @@ void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::
     }
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OImageButtonControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OImageButtonControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
 void SAL_CALL OImageButtonControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException)
 {
 }
 
-
-//.........................................................................
 }   // namespace frm
-//.........................................................................
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index c959ab9c7dd6..c7519a8881c6 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -122,13 +122,13 @@ namespace
 // OImageControlModel
 //==============================================================================
 
-//------------------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OImageControlModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OImageControlModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OImageControlModel::_getTypes()
 {
     return concatSequences(
@@ -137,7 +137,7 @@ Sequence<Type> OImageControlModel::_getTypes()
     );
 }
 
-//------------------------------------------------------------------
+
 OImageControlModel::OImageControlModel(const Reference<XComponentContext>& _rxFactory)
     :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_IMAGECONTROL, FRM_SUN_CONTROL_IMAGECONTROL, sal_False, sal_False, sal_False )
                     // use the old control name for compytibility reasons
@@ -153,7 +153,7 @@ OImageControlModel::OImageControlModel(const Reference<XComponentContext>& _rxFa
     implConstruct();
 }
 
-//------------------------------------------------------------------
+
 OImageControlModel::OImageControlModel( const OImageControlModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
     :OBoundControlModel( _pOriginal, _rxFactory )
                 // use the old control name for compytibility reasons
@@ -174,7 +174,7 @@ OImageControlModel::OImageControlModel( const OImageControlModel* _pOriginal, co
     osl_atomic_decrement( &m_refCount );
 }
 
-//------------------------------------------------------------------
+
 void OImageControlModel::implConstruct()
 {
     m_pImageProducer = new ImageProducer;
@@ -182,7 +182,7 @@ void OImageControlModel::implConstruct()
     m_pImageProducer->SetDoneHdl( LINK( this, OImageControlModel, OnImageImportDone ) );
 }
 
-//------------------------------------------------------------------
+
 OImageControlModel::~OImageControlModel()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -194,11 +194,11 @@ OImageControlModel::~OImageControlModel()
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OImageControlModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence  OImageControlModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -209,7 +209,7 @@ StringSequence  OImageControlModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     // Order matters: we want to "override" the XImageProducer interface of the aggregate without
@@ -226,13 +226,13 @@ Any SAL_CALL OImageControlModel::queryAggregation(const Type& _rType) throw (Run
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OImageControlModel::approveDbColumnType( sal_Int32 _nColumnType )
 {
     return ImageStoreInvalid != lcl_getImageStoreType( _nColumnType );
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
 {
     switch (nHandle)
@@ -251,7 +251,7 @@ void OImageControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) co
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( ::com::sun::star::uno::Exception)
 {
     switch (nHandle)
@@ -309,7 +309,7 @@ void OImageControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, con
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
                                 throw( IllegalArgumentException )
 {
@@ -332,7 +332,7 @@ sal_Bool OImageControlModel::convertFastPropertyValue(Any& rConvertedValue, Any&
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 4, OBoundControlModel )
@@ -343,7 +343,7 @@ void OImageControlModel::describeFixedProperties( Sequence< Property >& _rProps
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [out] */ o_rAggregateProperties ) const
 {
     OBoundControlModel::describeAggregateProperties( o_rAggregateProperties );
@@ -353,13 +353,13 @@ void OImageControlModel::describeAggregateProperties( Sequence< Property >& /* [
     RemoveProperty( o_rAggregateProperties, PROPERTY_GRAPHIC );
 }
 
-//------------------------------------------------------------------------------
+
 OUString OImageControlModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_IMAGECONTROL);  // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     // Base class
@@ -373,7 +373,7 @@ void OImageControlModel::write(const Reference<XObjectOutputStream>& _rxOutStrea
     writeCommonProperties(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     OBoundControlModel::read(_rxInStream);
@@ -408,7 +408,7 @@ void OImageControlModel::read(const Reference<XObjectInputStream>& _rxInStream)
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL, ValueChangeInstigator _eInstigator )
 {
     // create a stream for the image specified by the URL
@@ -450,7 +450,7 @@ sal_Bool OImageControlModel::impl_updateStreamForURL_lck( const OUString& _rURL,
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _eInstigator )
 {
     switch ( lcl_getImageStoreType( getFieldType() ) )
@@ -489,7 +489,7 @@ sal_Bool OImageControlModel::impl_handleNewImageURL_lck( ValueChangeInstigator _
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OImageControlModel::commitControlValueToDbColumn( bool _bPostReset )
 {
     if ( _bPostReset )
@@ -508,7 +508,7 @@ sal_Bool OImageControlModel::commitControlValueToDbColumn( bool _bPostReset )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     bool lcl_isValidDocumentURL( const OUString& _rDocURL )
@@ -517,7 +517,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     OBoundControlModel::onConnectedDbColumn( _rxForm );
@@ -547,7 +547,7 @@ void OImageControlModel::onConnectedDbColumn( const Reference< XInterface >& _rx
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::onDisconnectedDbColumn()
 {
     OBoundControlModel::onDisconnectedDbColumn();
@@ -555,7 +555,7 @@ void OImageControlModel::onDisconnectedDbColumn()
     m_sDocumentURL = OUString();
 }
 
-//------------------------------------------------------------------------------
+
 Any OImageControlModel::translateDbColumnToControlValue()
 {
     switch ( lcl_getImageStoreType( getFieldType() ) )
@@ -581,13 +581,13 @@ Any OImageControlModel::translateDbColumnToControlValue()
     return Any();
 }
 
-//------------------------------------------------------------------------------
+
 Any OImageControlModel::getControlValue( ) const
 {
     return makeAny( m_sImageURL );
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::doSetControlValue( const Any& _rValue )
 {
     DBG_ASSERT( GetImageProducer() && m_xImageProducer.is(), "OImageControlModel::doSetControlValue: no image producer!" );
@@ -637,44 +637,44 @@ void OImageControlModel::doSetControlValue( const Any& _rValue )
 }
 
 // OComponentHelper
-//------------------------------------------------------------------
+
 void SAL_CALL OImageControlModel::disposing()
 {
     OBoundControlModel::disposing();
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlModel::resetNoBroadcast()
 {
     if ( hasField() )          // only reset when we are connected to a column
         OBoundControlModel::resetNoBroadcast( );
 }
 
-//--------------------------------------------------------------------
+
 Reference< XImageProducer > SAL_CALL OImageControlModel::getImageProducer() throw ( RuntimeException)
 {
     return this;
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OImageControlModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException)
 {
     GetImageProducer()->addConsumer( _rxConsumer );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OImageControlModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException)
 {
     GetImageProducer()->removeConsumer( _rxConsumer );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL OImageControlModel::startProduction(  ) throw (RuntimeException)
 {
     GetImageProducer()->startProduction();
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic )
 {
     const Reference< XGraphic > xGraphic( i_pGraphic != NULL ? Image( i_pGraphic->GetBitmapEx() ).GetXGraphic() : NULL );
@@ -695,13 +695,13 @@ IMPL_LINK( OImageControlModel, OnImageImportDone, ::Graphic*, i_pGraphic )
 // OImageControlControl
 //==================================================================
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OImageControlControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OImageControlControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OImageControlControl::_getTypes()
 {
     return concatSequences(
@@ -710,7 +710,7 @@ Sequence<Type> OImageControlControl::_getTypes()
     );
 }
 
-//------------------------------------------------------------------------------
+
 OImageControlControl::OImageControlControl(const Reference<XComponentContext>& _rxFactory)
     :OBoundControl(_rxFactory, VCL_CONTROL_IMAGECONTROL)
     ,m_aModifyListeners( m_aMutex )
@@ -726,7 +726,7 @@ OImageControlControl::OImageControlControl(const Reference<XComponentContext>& _
     decrement(m_refCount);
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OBoundControl::queryAggregation( _rType );
@@ -740,7 +740,7 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence  OImageControlControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -751,19 +751,19 @@ StringSequence  OImageControlControl::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::addModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException)
 {
     m_aModifyListeners.addInterface( _Listener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::removeModifyListener( const Reference< XModifyListener >& _Listener ) throw (RuntimeException)
 {
     m_aModifyListeners.removeInterface( _Listener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::disposing()
 {
     EventObject aEvent( *this );
@@ -772,13 +772,13 @@ void SAL_CALL OImageControlControl::disposing()
     OBoundControl::disposing();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::disposing( const EventObject& _Event ) throw(RuntimeException)
 {
     OBoundControl::disposing( _Event );
 }
 
-//------------------------------------------------------------------------------
+
 void OImageControlControl::implClearGraphics( sal_Bool _bForce )
 {
     Reference< XPropertySet > xSet( getModel(), UNO_QUERY );
@@ -801,7 +801,7 @@ void OImageControlControl::implClearGraphics( sal_Bool _bForce )
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool OImageControlControl::implInsertGraphics()
 {
     Reference< XPropertySet > xSet( getModel(), UNO_QUERY );
@@ -867,7 +867,7 @@ bool OImageControlControl::implInsertGraphics()
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 bool OImageControlControl::impl_isEmptyGraphics_nothrow() const
 {
     bool bIsEmpty = true;
@@ -888,7 +888,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const
 }
 
 // MouseListener
-//------------------------------------------------------------------------------
+
 void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -985,17 +985,17 @@ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent&
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::mouseReleased(const awt::MouseEvent& /*e*/) throw ( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::mouseEntered(const awt::MouseEvent& /*e*/) throw ( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OImageControlControl::mouseExited(const awt::MouseEvent& /*e*/) throw ( RuntimeException )
 {
 }
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 01b253e3230d..aa3423300dcc 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -83,7 +83,7 @@ namespace frm
     //==============================================================================
     namespace
     {
-        //--------------------------------------------------------------------------
+
         struct RowSetValueToString : public ::std::unary_function< ORowSetValue, OUString >
         {
             OUString operator()( const ORowSetValue& _value ) const
@@ -92,7 +92,7 @@ namespace frm
             }
         };
 
-        //--------------------------------------------------------------------------
+
         struct AppendRowSetValueString : public ::std::unary_function< OUString, void >
         {
             AppendRowSetValueString( OUString& _string )
@@ -109,7 +109,7 @@ namespace frm
             OUString&    m_string;
         };
 
-        //--------------------------------------------------------------------------
+
         Sequence< OUString > lcl_convertToStringSequence( const ValueList& _values )
         {
             Sequence< OUString > aStrings( _values.size() );
@@ -131,13 +131,13 @@ namespace frm
     //==============================================================================
     //= OListBoxModel
     //==============================================================================
-    //------------------------------------------------------------------
+
     InterfaceRef SAL_CALL OListBoxModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
     {
         return *(new OListBoxModel( comphelper::getComponentContext(_rxFactory) ));
     }
 
-    //------------------------------------------------------------------------------
+
     Sequence< Type> OListBoxModel::_getTypes()
     {
         return TypeBag(
@@ -153,7 +153,7 @@ namespace frm
         startAggregatePropertyListening( PROPERTY_STRINGITEMLIST );
     }
 
-    //------------------------------------------------------------------
+
     OListBoxModel::OListBoxModel(const Reference<XComponentContext>& _rxFactory)
         :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_LISTBOX, FRM_SUN_CONTROL_LISTBOX, sal_True, sal_True, sal_True )
         // use the old control name for compatibility reasons
@@ -173,7 +173,7 @@ namespace frm
         init();
     }
 
-    //------------------------------------------------------------------
+
     OListBoxModel::OListBoxModel( const OListBoxModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
         :OBoundControlModel( _pOriginal, _rxFactory )
         ,OEntryListHelper( *_pOriginal, (OControlModel&)*this )
@@ -192,7 +192,7 @@ namespace frm
         init();
     }
 
-    //------------------------------------------------------------------
+
     OListBoxModel::~OListBoxModel()
     {
         if (!OComponentHelper::rBHelper.bDisposed)
@@ -204,11 +204,11 @@ namespace frm
     }
 
     // XCloneable
-    //------------------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_CLONING( OListBoxModel )
 
     // XServiceInfo
-    //------------------------------------------------------------------------------
+
     StringSequence SAL_CALL OListBoxModel::getSupportedServiceNames() throw(RuntimeException)
     {
         StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -231,7 +231,7 @@ namespace frm
         return aSupported;
     }
 
-    //------------------------------------------------------------------------------
+
     Any SAL_CALL OListBoxModel::queryAggregation(const Type& _rType) throw (RuntimeException)
     {
         Any aReturn = OBoundControlModel::queryAggregation( _rType );
@@ -243,7 +243,7 @@ namespace frm
     }
 
     // OComponentHelper
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::disposing()
     {
         OBoundControlModel::disposing();
@@ -251,7 +251,7 @@ namespace frm
         OErrorBroadcaster::disposing();
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
     {
         switch (_nHandle)
@@ -293,7 +293,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (com::sun::star::uno::Exception)
     {
         switch (_nHandle)
@@ -388,7 +388,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OListBoxModel::convertFastPropertyValue(
         Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue)
         throw (IllegalArgumentException)
@@ -434,7 +434,7 @@ namespace frm
         return bModified;
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
     {
         // if both SelectedItems and StringItemList are set, care for this
@@ -470,7 +470,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 9, OBoundControlModel )
@@ -486,7 +486,7 @@ namespace frm
         END_DESCRIBE_PROPERTIES();
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::_propertyChanged( const PropertyChangeEvent& i_rEvent ) throw ( RuntimeException )
     {
         if ( i_rEvent.PropertyName == PROPERTY_STRINGITEMLIST )
@@ -502,7 +502,7 @@ namespace frm
         OBoundControlModel::_propertyChanged( i_rEvent );
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
     {
         OBoundControlModel::describeAggregateProperties( _rAggregateProps );
@@ -511,13 +511,13 @@ namespace frm
         RemoveProperty( _rAggregateProps, PROPERTY_STRINGITEMLIST );
     }
 
-    //------------------------------------------------------------------------------
+
     OUString SAL_CALL OListBoxModel::getServiceName() throw(RuntimeException)
     {
         return OUString(FRM_COMPONENT_LISTBOX);   // old (non-sun) name for compatibility !
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
         throw(IOException, RuntimeException)
     {
@@ -554,7 +554,7 @@ namespace frm
         writeCommonProperties(_rxOutStream);
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException)
     {
         // We need to respect dependencies for certain variables.
@@ -675,7 +675,7 @@ namespace frm
             resetNoBroadcast();
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::loadData( bool _bForce )
     {
         SAL_INFO( "forms.component", "OListBoxModel::loadData" );
@@ -987,7 +987,7 @@ namespace frm
         setFastPropertyValue( PROPERTY_ID_STRINGITEMLIST, makeAny( lcl_convertToStringSequence( aDisplayList ) ) );
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::onConnectedDbColumn( const Reference< XInterface >& /*_rxForm*/ )
     {
         // list boxes which are bound to a db column don't have multi selection
@@ -1001,7 +1001,7 @@ namespace frm
             impl_refreshDbEntryList( false );
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::onDisconnectedDbColumn()
     {
         if ( m_eListSourceType != ListSourceType_VALUELIST )
@@ -1017,21 +1017,21 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::setBoundValues(const ValueList &l)
     {
         m_aConvertedBoundValues.clear();
         m_aBoundValues = l;
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::clearBoundValues()
     {
         ValueList().swap(m_aConvertedBoundValues);
         ValueList().swap(m_aBoundValues);
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxModel::convertBoundValues(const sal_Int32 nFieldType) const
     {
         m_aConvertedBoundValues.resize(m_aBoundValues.size());
@@ -1047,12 +1047,12 @@ namespace frm
         OSL_ENSURE(dst == m_aConvertedBoundValues.end(), "OListBoxModel::convertBoundValues expected to have overwritten all of m_aConvertedBoundValues, but did not.");
         assert(dst == m_aConvertedBoundValues.end());
     }
-    //------------------------------------------------------------------------------
+
     sal_Int32 OListBoxModel::getValueType() const
     {
         return impl_hasBoundComponent() ? m_nBoundColumnType : getFieldType();
     }
-    //------------------------------------------------------------------------------
+
     ValueList OListBoxModel::impl_getValues() const
     {
         const sal_Int32 nFieldType = getValueType();
@@ -1081,7 +1081,7 @@ namespace frm
         assert(dst == aValues.end());
         return aValues;
     }
-    //------------------------------------------------------------------------------
+
     ORowSetValue OListBoxModel::getFirstSelectedValue() const
     {
         static const ORowSetValue s_aEmptyVaue;
@@ -1112,7 +1112,7 @@ namespace frm
         return aValues[ selectedValue ];
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OListBoxModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     {
         // current selection list
@@ -1137,7 +1137,7 @@ namespace frm
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     Sequence< sal_Int16 > OListBoxModel::translateDbValueToControlValue(const ORowSetValue &i_aValue) const
     {
         Sequence< sal_Int16 > aSelectionIndicies;
@@ -1167,7 +1167,7 @@ namespace frm
 
         return aSelectionIndicies;
     }
-    //------------------------------------------------------------------------------
+
     Sequence< sal_Int16 > OListBoxModel::translateBindingValuesToControlValue(const Sequence< const Any > &i_aValues) const
     {
         const ValueList aValues( impl_getValues() );
@@ -1207,7 +1207,7 @@ namespace frm
         aSelectionIndicies.realloc(nCount);
         return aSelectionIndicies;
     }
-    //------------------------------------------------------------------------------
+
     Any OListBoxModel::translateDbColumnToControlValue()
     {
         Reference< XPropertySet > xBoundField( getField() );
@@ -1226,7 +1226,7 @@ namespace frm
     }
 
     // XReset
-    //------------------------------------------------------------------------------
+
     Any OListBoxModel::getDefaultForReset() const
     {
         Any aValue;
@@ -1247,21 +1247,21 @@ namespace frm
         return aValue;
     }
 
-    //--------------------------------------------------------------------
+
     void OListBoxModel::resetNoBroadcast()
     {
         OBoundControlModel::resetNoBroadcast();
         m_aSaveValue.setNull();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxModel::disposing( const EventObject& _rSource ) throw ( RuntimeException )
     {
         if ( !OEntryListHelper::handleDisposing( _rSource ) )
             OBoundControlModel::disposing( _rSource );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         // The type of how we should transfer our selection to external value bindings
@@ -1275,7 +1275,7 @@ namespace frm
             eValue          /// as string representation of the selected value
         };
 
-        //--------------------------------------------------------------------
+
         ExchangeType lcl_getCurrentExchangeType( const Type& _rExchangeType )
         {
             switch ( _rExchangeType.getTypeClass() )
@@ -1309,7 +1309,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any OListBoxModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
     {
         Sequence< sal_Int16 > aSelectIndexes;
@@ -1407,7 +1407,7 @@ namespace frm
         return makeAny( aSelectIndexes );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -1509,7 +1509,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any OListBoxModel::translateControlValueToExternalValue( ) const
     {
         OSL_PRECOND( hasExternalValueBinding(), "OListBoxModel::translateControlValueToExternalValue: no binding!" );
@@ -1566,14 +1566,14 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     Any OListBoxModel::translateControlValueToValidatableValue( ) const
     {
         OSL_PRECOND( hasValidator(), "OListBoxModel::translateControlValueToValidatableValue: no validator, so why should I?" );
         return getCurrentFormComponentValue();
     }
 
-    //--------------------------------------------------------------------
+
     Any OListBoxModel::getCurrentSingleValue() const
     {
         Any aCurrentValue;
@@ -1591,7 +1591,7 @@ namespace frm
 
         return aCurrentValue;
     }
-    //--------------------------------------------------------------------
+
     Any OListBoxModel::getCurrentMultiValue() const
     {
         Any aCurrentValue;
@@ -1609,7 +1609,7 @@ namespace frm
 
         return aCurrentValue;
     }
-    //--------------------------------------------------------------------
+
     Any OListBoxModel::getCurrentFormComponentValue() const
     {
         {
@@ -1639,7 +1639,7 @@ namespace frm
         return aCurrentValue;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Type > OListBoxModel::getSupportedBindingTypes()
     {
         Sequence< Type > aTypes(6);
@@ -1652,7 +1652,7 @@ namespace frm
         return aTypes;
     }
 
-    //--------------------------------------------------------------------
+
     void OListBoxModel::stringItemListChanged( ControlModelLock& _rInstanceLock )
     {
         if ( !m_xAggregateSet.is() )
@@ -1686,13 +1686,13 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OListBoxModel::connectedExternalListSource( )
     {
         // TODO?
     }
 
-    //--------------------------------------------------------------------
+
     void OListBoxModel::disconnectedExternalListSource( )
     {
         // TODO: in case we're part of an already loaded form, we should probably simulate
@@ -1700,7 +1700,7 @@ namespace frm
         // by our SQL-binding related properties
     }
 
-    //--------------------------------------------------------------------
+
     void OListBoxModel::impl_refreshDbEntryList( bool _bForce )
     {
         DBG_ASSERT( !hasExternalListSource(), "OListBoxModel::impl_refreshDbEntryList: invalid call!" );
@@ -1714,7 +1714,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OListBoxModel::refreshInternalEntryList()
     {
         impl_refreshDbEntryList( true );
@@ -1726,13 +1726,13 @@ namespace frm
     // OListBoxControl
     //==================================================================
 
-    //------------------------------------------------------------------
+
     InterfaceRef SAL_CALL OListBoxControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
     {
         return *(new OListBoxControl( comphelper::getComponentContext(_rxFactory) ));
     }
 
-    //------------------------------------------------------------------------------
+
     Sequence< Type> OListBoxControl::_getTypes()
     {
         return TypeBag(
@@ -1741,7 +1741,7 @@ namespace frm
         ).getTypes();
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL OListBoxControl::queryAggregation(const Type& _rType) throw (RuntimeException)
     {
         Any aReturn = OListBoxControl_BASE::queryInterface( _rType );
@@ -1754,7 +1754,7 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     OListBoxControl::OListBoxControl(const Reference<XComponentContext>& _rxFactory)
         :OBoundControl( _rxFactory, VCL_CONTROL_LISTBOX, sal_False )
         ,m_aChangeListeners( m_aMutex )
@@ -1781,7 +1781,7 @@ namespace frm
         m_aChangeTimer.SetTimeoutHdl(LINK(this,OListBoxControl,OnTimeout));
     }
 
-    //------------------------------------------------------------------------------
+
     OListBoxControl::~OListBoxControl()
     {
         if (!OComponentHelper::rBHelper.bDisposed)
@@ -1795,7 +1795,7 @@ namespace frm
 
     }
 
-    //------------------------------------------------------------------------------
+
     StringSequence SAL_CALL OListBoxControl::getSupportedServiceNames() throw(RuntimeException)
     {
         StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -1808,7 +1808,7 @@ namespace frm
 
 
     // XFocusListener
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::focusGained(const FocusEvent& /*_rEvent*/) throw(RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -1823,14 +1823,14 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::focusLost(const FocusEvent& /*_rEvent*/) throw(RuntimeException)
     {
         m_aCurrentSelection.clear();
     }
 
     // XItemListener
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::itemStateChanged(const ItemEvent& _rEvent) throw(RuntimeException)
     {
         // forward this to our listeners
@@ -1900,27 +1900,27 @@ namespace frm
     }
 
     // XEventListener
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::disposing(const EventObject& _rSource) throw (RuntimeException)
     {
         OBoundControl::disposing(_rSource);
     }
 
     // XChangeBroadcaster
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::addChangeListener(const Reference<XChangeListener>& _rxListener) throw(RuntimeException)
     {
         m_aChangeListeners.addInterface( _rxListener );
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::removeChangeListener(const Reference<XChangeListener>& _rxListener) throw(RuntimeException)
     {
         m_aChangeListeners.removeInterface( _rxListener );
     }
 
     // OComponentHelper
-    //------------------------------------------------------------------------------
+
     void OListBoxControl::disposing()
     {
         if (m_aChangeTimer.IsActive())
@@ -1948,7 +1948,7 @@ namespace frm
         OBoundControl::disposing();
     }
 
-    //------------------------------------------------------------------------------
+
     void OListBoxControl::processEvent( const AnyEvent& _rEvent )
     {
         Reference< XListBox > xKeepAlive( this );
@@ -1961,61 +1961,61 @@ namespace frm
         m_aItemListeners.notifyEach( &XItemListener::itemStateChanged, rItemEvent.getEventObject() );
     }
 
-    //------------------------------------------------------------------------------
+
     IMPL_LINK(OListBoxControl, OnTimeout, void*, /*EMPTYTAG*/)
     {
         m_aChangeListeners.notifyEach( &XChangeListener::changed, EventObject( *this ) );
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::addItemListener( const Reference< XItemListener >& l ) throw (RuntimeException)
     {
         m_aItemListeners.addInterface( l );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::removeItemListener( const Reference< XItemListener >& l ) throw (RuntimeException)
     {
         m_aItemListeners.removeInterface( l );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::addActionListener( const Reference< XActionListener >& l ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->addActionListener( l );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::removeActionListener( const Reference< XActionListener >& l ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->removeActionListener( l );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::addItem( const OUString& aItem, ::sal_Int16 nPos ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->addItem( aItem, nPos );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::addItems( const Sequence< OUString >& aItems, ::sal_Int16 nPos ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->addItems( aItems, nPos );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::removeItems( ::sal_Int16 nPos, ::sal_Int16 nCount ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->removeItems( nPos, nCount );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL OListBoxControl::getItemCount(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2023,7 +2023,7 @@ namespace frm
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OListBoxControl::getItem( ::sal_Int16 nPos ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2031,7 +2031,7 @@ namespace frm
         return OUString( );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OListBoxControl::getItems(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2039,7 +2039,7 @@ namespace frm
         return Sequence< OUString >( );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL OListBoxControl::getSelectedItemPos(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2047,7 +2047,7 @@ namespace frm
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< ::sal_Int16 > SAL_CALL OListBoxControl::getSelectedItemsPos(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2055,7 +2055,7 @@ namespace frm
         return Sequence< ::sal_Int16 >( );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OListBoxControl::getSelectedItem(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2063,7 +2063,7 @@ namespace frm
         return OUString( );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OListBoxControl::getSelectedItems(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2071,28 +2071,28 @@ namespace frm
         return Sequence< OUString >( );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::selectItemPos( ::sal_Int16 nPos, ::sal_Bool bSelect ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->selectItemPos( nPos, bSelect );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::selectItemsPos( const Sequence< ::sal_Int16 >& aPositions, ::sal_Bool bSelect ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->selectItemsPos( aPositions, bSelect );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::selectItem( const OUString& aItem, ::sal_Bool bSelect ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->selectItem( aItem, bSelect );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL OListBoxControl::isMutipleMode(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2100,14 +2100,14 @@ namespace frm
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::setMultipleMode( ::sal_Bool bMulti ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->setMultipleMode( bMulti );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL OListBoxControl::getDropDownLineCount(  ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
@@ -2115,14 +2115,14 @@ namespace frm
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::setDropDownLineCount( ::sal_Int16 nLines ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
             m_xAggregateListBox->setDropDownLineCount( nLines );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OListBoxControl::makeVisible( ::sal_Int16 nEntry ) throw (RuntimeException)
     {
         if ( m_xAggregateListBox.is() )
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index fc977322f0f4..22c58f223efe 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -42,13 +42,13 @@ using namespace ::com::sun::star::form::binding;
 // ONumericControl
 //==================================================================
 
-//------------------------------------------------------------------
+
 ONumericControl::ONumericControl(const Reference<XComponentContext>& _rxFactory)
     :OBoundControl(_rxFactory, VCL_CONTROL_NUMERICFIELD)
 {
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence ONumericControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -60,13 +60,13 @@ StringSequence ONumericControl::getSupportedServiceNames() throw()
 }
 
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL ONumericControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new ONumericControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> ONumericControl::_getTypes()
 {
     return OBoundControl::_getTypes();
@@ -75,20 +75,20 @@ Sequence<Type> ONumericControl::_getTypes()
 //==================================================================
 // ONumericModel
 //==================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL ONumericModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new ONumericModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> ONumericModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory)
                 :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_NUMERICFIELD, FRM_SUN_CONTROL_NUMERICFIELD, sal_True, sal_True )
                                     // use the old control name for compytibility reasons
@@ -98,23 +98,23 @@ ONumericModel::ONumericModel(const Reference<XComponentContext>& _rxFactory)
     initValueProperty( PROPERTY_VALUE, PROPERTY_ID_VALUE );
 }
 
-//------------------------------------------------------------------
+
 ONumericModel::ONumericModel( const ONumericModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OEditBaseModel( _pOriginal, _rxFactory )
 {
 }
 
-//------------------------------------------------------------------
+
 ONumericModel::~ONumericModel()
 {
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( ONumericModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence ONumericModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -137,7 +137,7 @@ StringSequence ONumericModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 2, OEditBaseModel )
@@ -146,13 +146,13 @@ void ONumericModel::describeFixedProperties( Sequence< Property >& _rProps ) con
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL ONumericModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_NUMERICFIELD);  // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool ONumericModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aControlValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -176,7 +176,7 @@ sal_Bool ONumericModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 Any ONumericModel::translateDbColumnToControlValue()
 {
     m_aSaveValue <<= (double)m_xColumn->getDouble();
@@ -186,7 +186,7 @@ Any ONumericModel::translateDbColumnToControlValue()
     return m_aSaveValue;
 }
 
-//------------------------------------------------------------------------------
+
 Any ONumericModel::getDefaultForReset() const
 {
     Any aValue;
@@ -196,7 +196,7 @@ Any ONumericModel::getDefaultForReset() const
     return aValue;
 }
 
-//------------------------------------------------------------------------------
+
 void ONumericModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index e09e069f566b..fe6de45bdd40 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -43,25 +43,25 @@ namespace frm
 //==================================================================
 // OPatternControl
 //==================================================================
-//------------------------------------------------------------------
+
 OPatternControl::OPatternControl(const Reference<XComponentContext>& _rxFactory)
     :OBoundControl(_rxFactory, VCL_CONTROL_PATTERNFIELD)
 {
 }
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OPatternControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OPatternControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OPatternControl::_getTypes()
 {
     return OBoundControl::_getTypes();
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence OPatternControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -75,20 +75,20 @@ StringSequence OPatternControl::getSupportedServiceNames() throw()
 //==================================================================
 // OPatternModel
 //==================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OPatternModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OPatternModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OPatternModel::_getTypes()
 {
     return OEditBaseModel::_getTypes();
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory)
     :OEditBaseModel( _rxFactory, VCL_CONTROLMODEL_PATTERNFIELD, FRM_SUN_CONTROL_PATTERNFIELD, sal_False, sal_False )
                                     // use the old control name for compytibility reasons
@@ -98,23 +98,23 @@ OPatternModel::OPatternModel(const Reference<XComponentContext>& _rxFactory)
     initValueProperty( PROPERTY_TEXT, PROPERTY_ID_TEXT );
 }
 
-//------------------------------------------------------------------
+
 OPatternModel::OPatternModel( const OPatternModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OEditBaseModel( _pOriginal, _rxFactory )
 {
 }
 
-//------------------------------------------------------------------
+
 OPatternModel::~OPatternModel()
 {
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OPatternModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -127,7 +127,7 @@ StringSequence SAL_CALL OPatternModel::getSupportedServiceNames() throw()
 }
 
 
-//------------------------------------------------------------------------------
+
 void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
@@ -138,13 +138,13 @@ void OPatternModel::describeFixedProperties( Sequence< Property >& _rProps ) con
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OPatternModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_PATTERNFIELD);  // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OPatternModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aNewValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -178,7 +178,7 @@ sal_Bool OPatternModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void OPatternModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     OEditBaseModel::onConnectedDbColumn( _rxForm );
@@ -190,7 +190,7 @@ void OPatternModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm
     m_pFormattedValue.reset( new ::dbtools::FormattedColumnValue( getContext(), Reference< XRowSet >( _rxForm, UNO_QUERY ), xField ) );
 }
 
-//------------------------------------------------------------------------------
+
 void OPatternModel::onDisconnectedDbColumn()
 {
     OEditBaseModel::onDisconnectedDbColumn();
@@ -198,7 +198,7 @@ void OPatternModel::onDisconnectedDbColumn()
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------------------
+
 Any OPatternModel::translateDbColumnToControlValue()
 {
     OSL_PRECOND( m_pFormattedValue.get(), "OPatternModel::translateDbColumnToControlValue: no value helper!" );
@@ -226,13 +226,13 @@ Any OPatternModel::translateDbColumnToControlValue()
 }
 
 // XReset
-//------------------------------------------------------------------------------
+
 Any OPatternModel::getDefaultForReset() const
 {
     return makeAny( m_aDefaultText );
 }
 
-//------------------------------------------------------------------------------
+
 void OPatternModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index 1430c1b7492d..3e121a714e66 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -46,13 +46,13 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::form::binding;
 
 //==================================================================
-//------------------------------------------------------------------------------
+
 InterfaceRef SAL_CALL ORadioButtonControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory) throw (RuntimeException)
 {
     return *(new ORadioButtonControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -64,13 +64,13 @@ StringSequence SAL_CALL ORadioButtonControl::getSupportedServiceNames() throw(Ru
 }
 
 
-//------------------------------------------------------------------
+
 ORadioButtonControl::ORadioButtonControl(const Reference<XComponentContext>& _rxFactory)
                       :OBoundControl(_rxFactory, VCL_CONTROL_RADIOBUTTON)
 {
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL ORadioButtonControl::createPeer(const Reference<starawt::XToolkit>& _rxToolkit, const Reference<starawt::XWindowPeer>& _rxParent) throw (RuntimeException)
 {
     OBoundControl::createPeer(_rxToolkit, _rxParent);
@@ -97,8 +97,8 @@ InterfaceRef SAL_CALL ORadioButtonModel_CreateInstance(const Reference<XMultiSer
     return *(new ORadioButtonModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFactory)
     :OReferenceValueComponent( _rxFactory, VCL_CONTROLMODEL_RADIOBUTTON, FRM_SUN_CONTROL_RADIOBUTTON,sal_True )
                     // use the old control name for compytibility reasons
@@ -110,23 +110,23 @@ ORadioButtonModel::ORadioButtonModel(const Reference<XComponentContext>& _rxFact
     startAggregatePropertyListening( PROPERTY_GROUP_NAME );
 }
 
-//------------------------------------------------------------------
+
 ORadioButtonModel::ORadioButtonModel( const ORadioButtonModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
     :OReferenceValueComponent( _pOriginal, _rxFactory )
 {
 }
 
-//------------------------------------------------------------------------------
+
 ORadioButtonModel::~ORadioButtonModel()
 {
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( ORadioButtonModel )
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(RuntimeException)
 {
     StringSequence aSupported = OReferenceValueComponent::getSupportedServiceNames();
@@ -149,7 +149,7 @@ StringSequence SAL_CALL ORadioButtonModel::getSupportedServiceNames() throw(Runt
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any& rValue)
 {
     // my name
@@ -191,7 +191,7 @@ void ORadioButtonModel::SetSiblingPropsTo(const OUString& rPropName, const Any&
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ORadioButtonModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw (Exception)
 {
     OReferenceValueComponent::setFastPropertyValue_NoBroadcast( nHandle, rValue );
@@ -275,7 +275,7 @@ void ORadioButtonModel::setControlSource()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 1, OReferenceValueComponent )
@@ -283,13 +283,13 @@ void ORadioButtonModel::describeFixedProperties( Sequence< Property >& _rProps )
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL ORadioButtonModel::getServiceName() throw(RuntimeException)
 {
     return OUString(FRM_COMPONENT_RADIOBUTTON);   // old (non-sun) name for compatibility !
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rxOutStream)
     throw(IOException, RuntimeException)
 {
@@ -307,7 +307,7 @@ void SAL_CALL ORadioButtonModel::write(const Reference<XObjectOutputStream>& _rx
     writeCommonProperties(_rxOutStream);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException)
 {
     OReferenceValueComponent::read(_rxInStream);
@@ -350,7 +350,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn
         resetNoBroadcast();
 }
 
-//------------------------------------------------------------------------------
+
 void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException)
 {
     if ( _rEvent.PropertyName.equals( PROPERTY_STATE ) )
@@ -374,7 +374,7 @@ void ORadioButtonModel::_propertyChanged(const PropertyChangeEvent& _rEvent) thr
     OReferenceValueComponent::_propertyChanged( _rEvent );
 }
 
-//------------------------------------------------------------------------------
+
 Any ORadioButtonModel::translateDbColumnToControlValue()
 {
     return makeAny( (sal_Int16)
@@ -382,7 +382,7 @@ Any ORadioButtonModel::translateDbColumnToControlValue()
     );
 }
 
-//------------------------------------------------------------------------------
+
 Any ORadioButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
 {
     Any aControlValue = OReferenceValueComponent::translateExternalValueToControlValue( _rExternalValue );
@@ -393,7 +393,7 @@ Any ORadioButtonModel::translateExternalValueToControlValue( const Any& _rExtern
     return aControlValue;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool ORadioButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Reference< XPropertySet > xField( getField() );
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index f98477328dfb..ab9b9bbef4fc 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -51,25 +51,25 @@ using namespace ::com::sun::star::lang;
 //==================================================================
 //= OTimeControl
 //==================================================================
-//------------------------------------------------------------------
+
 OTimeControl::OTimeControl(const Reference<XComponentContext>& _rxFactory)
                :OBoundControl(_rxFactory, VCL_CONTROL_TIMEFIELD)
 {
 }
 
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OTimeControl_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OTimeControl( comphelper::getComponentContext(_rxFactory) ));
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OTimeControl::_getTypes()
 {
     return OBoundControl::_getTypes();
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
@@ -83,14 +83,14 @@ StringSequence SAL_CALL OTimeControl::getSupportedServiceNames() throw()
 //==================================================================
 //= OTimeModel
 //==================================================================
-//------------------------------------------------------------------
+
 InterfaceRef SAL_CALL OTimeModel_CreateInstance(const Reference<XMultiServiceFactory>& _rxFactory)
 {
     return *(new OTimeModel( comphelper::getComponentContext(_rxFactory) ));
 }
 
 // XServiceInfo
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw()
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
@@ -113,14 +113,14 @@ StringSequence SAL_CALL OTimeModel::getSupportedServiceNames() throw()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<Type> OTimeModel::_getTypes()
 {
     return OBoundControlModel::_getTypes();
 }
 
-//------------------------------------------------------------------
-//------------------------------------------------------------------
+
+
 OTimeModel::OTimeModel(const Reference<XComponentContext>& _rxFactory)
     : OEditBaseModel(_rxFactory, VCL_CONTROLMODEL_TIMEFIELD,
         FRM_SUN_CONTROL_TIMEFIELD, sal_True, sal_True)
@@ -134,7 +134,7 @@ OTimeModel::OTimeModel(const Reference<XComponentContext>& _rxFactory)
     setAggregateSet(m_xAggregateFastSet, getOriginalHandle(PROPERTY_ID_TIMEFORMAT));
 }
 
-//------------------------------------------------------------------------------
+
 OTimeModel::OTimeModel(const OTimeModel* _pOriginal, const Reference<XComponentContext>& _rxFactory)
     : OEditBaseModel(_pOriginal, _rxFactory)
     , OLimitedFormats(_rxFactory, FormComponentType::TIMEFIELD)
@@ -143,24 +143,24 @@ OTimeModel::OTimeModel(const OTimeModel* _pOriginal, const Reference<XComponentC
     setAggregateSet( m_xAggregateFastSet, getOriginalHandle( PROPERTY_ID_TIMEFORMAT ) );
 }
 
-//------------------------------------------------------------------------------
+
 OTimeModel::~OTimeModel( )
 {
     setAggregateSet(Reference< XFastPropertySet >(), -1);
 }
 
 // XCloneable
-//------------------------------------------------------------------------------
+
 IMPLEMENT_DEFAULT_CLONING( OTimeModel )
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL OTimeModel::getServiceName() throw ( ::com::sun::star::uno::RuntimeException)
 {
     return OUString(FRM_COMPONENT_TIMEFIELD); // old (non-sun) name for compatibility !
 }
 
 // XPropertySet
-//------------------------------------------------------------------------------
+
 void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const
 {
     BEGIN_DESCRIBE_PROPERTIES( 4, OEditBaseModel )
@@ -171,7 +171,7 @@ void OTimeModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     END_DESCRIBE_PROPERTIES();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OTimeModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle ) const
 {
     switch (_nHandle)
@@ -188,7 +188,7 @@ void SAL_CALL OTimeModel::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue,
         sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
 {
@@ -198,7 +198,7 @@ sal_Bool SAL_CALL OTimeModel::convertFastPropertyValue(Any& _rConvertedValue, An
         return OEditBaseModel::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw ( ::com::sun::star::uno::Exception)
 {
     if (PROPERTY_ID_FORMATKEY == _nHandle)
@@ -208,7 +208,7 @@ void SAL_CALL OTimeModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, c
 }
 
 // XLoadListener
-//------------------------------------------------------------------------------
+
 void OTimeModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
 {
     OBoundControlModel::onConnectedDbColumn( _rxForm );
@@ -228,7 +228,7 @@ void OTimeModel::onConnectedDbColumn( const Reference< XInterface >& _rxForm )
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OTimeModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
 {
     Any aControlValue( m_xAggregateFastSet->getFastPropertyValue( getValuePropertyAggHandle() ) );
@@ -270,25 +270,25 @@ sal_Bool OTimeModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 Any OTimeModel::translateControlValueToExternalValue( ) const
 {
     return getControlValue();
 }
 
-//------------------------------------------------------------------------------
+
 Any OTimeModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
 {
     return _rExternalValue;
 }
 
-//------------------------------------------------------------------------------
+
 Any OTimeModel::translateControlValueToValidatableValue( ) const
 {
     return getControlValue();
 }
 
-//------------------------------------------------------------------------------
+
 Any OTimeModel::translateDbColumnToControlValue()
 {
     util::Time aTime = m_xColumn->getTime();
@@ -300,20 +300,20 @@ Any OTimeModel::translateDbColumnToControlValue()
     return m_aSaveValue;
 }
 
-//------------------------------------------------------------------------------
+
 Any OTimeModel::getDefaultForReset() const
 {
     return m_aDefault;
 }
 
-//------------------------------------------------------------------------------
+
 void OTimeModel::resetNoBroadcast()
 {
     OEditBaseModel::resetNoBroadcast();
     m_aSaveValue.clear();
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Type > OTimeModel::getSupportedBindingTypes()
 {
     return Sequence< Type >( &::getCppuType( static_cast< util::Time* >( NULL ) ), 1 );
diff --git a/forms/source/component/cachedrowset.cxx b/forms/source/component/cachedrowset.cxx
index 8847e377a054..37bf3f9d33a9 100644
--- a/forms/source/component/cachedrowset.cxx
+++ b/forms/source/component/cachedrowset.cxx
@@ -77,19 +77,19 @@ namespace frm
     //====================================================================
     //= CachedRowSet
     //====================================================================
-    //--------------------------------------------------------------------
+
     CachedRowSet::CachedRowSet()
         :m_pData( new CachedRowSet_Data )
     {
     }
 
-    //--------------------------------------------------------------------
+
     CachedRowSet::~CachedRowSet()
     {
         dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void CachedRowSet::setCommand( const OUString& _rCommand )
     {
         if ( m_pData->sCommand == _rCommand )
@@ -99,7 +99,7 @@ namespace frm
         m_pData->bStatementDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     void CachedRowSet::setCommandFromQuery( const OUString& _rQueryName )
     {
         Reference< XQueriesSupplier > xSupplyQueries( m_pData->xConnection, UNO_QUERY_THROW );
@@ -115,7 +115,7 @@ namespace frm
         setCommand( sCommand );
     }
 
-    //--------------------------------------------------------------------
+
     void CachedRowSet::setEscapeProcessing ( const sal_Bool _bEscapeProcessing )
     {
         if ( m_pData->bEscapeProcessing == _bEscapeProcessing )
@@ -125,7 +125,7 @@ namespace frm
         m_pData->bStatementDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     void CachedRowSet::setConnection( const Reference< XConnection >& _rxConnection )
     {
         if ( m_pData->xConnection == _rxConnection )
@@ -135,7 +135,7 @@ namespace frm
         m_pData->bStatementDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XResultSet > CachedRowSet::execute()
     {
         Reference< XResultSet > xResult;
@@ -164,13 +164,13 @@ namespace frm
         return xResult;
     }
 
-    //--------------------------------------------------------------------
+
     bool CachedRowSet::isDirty() const
     {
         return m_pData->bStatementDirty;
     }
 
-    //--------------------------------------------------------------------
+
     void CachedRowSet::dispose()
     {
         try
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 3f9a661f4dab..f4c79b0d1e35 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -68,7 +68,7 @@ namespace frm
     //==================================================================
     // OClickableImageBaseControl
     //==================================================================
-    //------------------------------------------------------------------------------
+
     Sequence<Type> OClickableImageBaseControl::_getTypes()
     {
         static Sequence<Type> aTypes;
@@ -77,7 +77,7 @@ namespace frm
         return aTypes;
     }
 
-    //------------------------------------------------------------------------------
+
     OClickableImageBaseControl::OClickableImageBaseControl(const Reference<XComponentContext>& _rxFactory, const OUString& _aService)
         :OControl(_rxFactory, _aService)
         ,m_pThread(NULL)
@@ -88,7 +88,7 @@ namespace frm
         m_pFeatureInterception.reset( new ControlFeatureInterception( _rxFactory ) );
     }
 
-    //------------------------------------------------------------------------------
+
     OClickableImageBaseControl::~OClickableImageBaseControl()
     {
         if (!OComponentHelper::rBHelper.bDisposed)
@@ -99,7 +99,7 @@ namespace frm
     }
 
     // UNO Anbindung
-    //------------------------------------------------------------------------------
+
     Any SAL_CALL OClickableImageBaseControl::queryAggregation(const Type& _rType) throw (RuntimeException)
     {
         Any aReturn = OControl::queryAggregation(_rType);
@@ -109,34 +109,34 @@ namespace frm
     }
 
     // XApproveActionBroadcaster
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseControl::addApproveActionListener(
             const Reference<XApproveActionListener>& l) throw( RuntimeException )
     {
         m_aApproveActionListeners.addInterface(l);
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseControl::removeApproveActionListener(
             const Reference<XApproveActionListener>& l) throw( RuntimeException )
     {
         m_aApproveActionListeners.removeInterface(l);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
         m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor  );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
         m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor  );
     }
 
     // OComponentHelper
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseControl::disposing()
     {
         EventObject aEvent( static_cast< XWeak* >( this ) );
@@ -157,7 +157,7 @@ namespace frm
         OControl::disposing();
     }
 
-    //------------------------------------------------------------------------------
+
     OImageProducerThread_Impl* OClickableImageBaseControl::getImageProducerThread()
     {
         if ( !m_pThread )
@@ -169,7 +169,7 @@ namespace frm
         return m_pThread;
     }
 
-    //------------------------------------------------------------------------------
+
     bool OClickableImageBaseControl::approveAction( )
     {
         sal_Bool bCancelled = sal_False;
@@ -186,7 +186,7 @@ namespace frm
         return !bCancelled;
     }
 
-    //------------------------------------------------------------------------------
+
     // Diese Methode wird auch aus einem Thread gerufen und muss deshalb
     // thread-safe sein.
     void OClickableImageBaseControl::actionPerformed_Impl(sal_Bool bNotifyListener, const MouseEvent& rEvt)
@@ -344,31 +344,31 @@ namespace frm
     }
 
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseControl::addSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException)
     {
         m_aSubmissionVetoListeners.addInterface( listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseControl::removeSubmissionVetoListener( const Reference< submission::XSubmissionVetoListener >& listener ) throw (NoSupportException, RuntimeException)
     {
         m_aSubmissionVetoListeners.removeInterface( listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseControl::submitWithInteraction( const Reference< XInteractionHandler >& _rxHandler ) throw (VetoException, WrappedTargetException, RuntimeException)
     {
         implSubmit( MouseEvent(), _rxHandler );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseControl::submit(  ) throw (VetoException, WrappedTargetException, RuntimeException)
     {
         implSubmit( MouseEvent(), NULL );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OClickableImageBaseControl::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported = OControl::getSupportedServiceNames();
@@ -380,7 +380,7 @@ namespace frm
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     void OClickableImageBaseControl::implSubmit( const MouseEvent& _rEvent, const Reference< XInteractionHandler >& _rxHandler ) SAL_THROW((VetoException, WrappedTargetException, RuntimeException))
     {
         try
@@ -437,7 +437,7 @@ namespace frm
     //==================================================================
     // OClickableImageBaseModel
     //==================================================================
-    //------------------------------------------------------------------------------
+
     Sequence<Type> OClickableImageBaseModel::_getTypes()
     {
         return concatSequences(
@@ -446,8 +446,8 @@ namespace frm
         );
     }
 
-    //------------------------------------------------------------------
-    //------------------------------------------------------------------
+
+
     OClickableImageBaseModel::OClickableImageBaseModel( const Reference< XComponentContext >& _rxFactory, const OUString& _rUnoControlModelTypeName,
             const OUString& rDefault )
         :OControlModel( _rxFactory, _rUnoControlModelTypeName, rDefault )
@@ -462,7 +462,7 @@ namespace frm
         m_eButtonType = FormButtonType_PUSH;
     }
 
-    //------------------------------------------------------------------
+
     OClickableImageBaseModel::OClickableImageBaseModel( const OClickableImageBaseModel* _pOriginal, const Reference<XComponentContext>& _rxFactory )
         :OControlModel( _pOriginal, _rxFactory )
         ,OPropertyChangeListener( m_aMutex )
@@ -481,7 +481,7 @@ namespace frm
         m_bDispatchUrlInternal  = _pOriginal->m_bDispatchUrlInternal;
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::implInitializeImageURL( )
     {
         osl_atomic_increment( &m_refCount );
@@ -494,7 +494,7 @@ namespace frm
         osl_atomic_decrement( &m_refCount );
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::implConstruct()
     {
         m_pProducer = new ImageProducer;
@@ -511,7 +511,7 @@ namespace frm
         decrement(m_refCount);
     }
 
-    //------------------------------------------------------------------------------
+
     OClickableImageBaseModel::~OClickableImageBaseModel()
     {
         if (!OComponentHelper::rBHelper.bDisposed)
@@ -525,40 +525,40 @@ namespace frm
     }
 
     // XImageProducer
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseModel::addConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException)
     {
         ImageModelMethodGuard aGuard( *this );
         GetImageProducer()->addConsumer( _rxConsumer );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseModel::removeConsumer( const Reference< XImageConsumer >& _rxConsumer ) throw (RuntimeException)
     {
         ImageModelMethodGuard aGuard( *this );
         GetImageProducer()->removeConsumer( _rxConsumer );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseModel::startProduction(  ) throw (RuntimeException)
     {
         ImageModelMethodGuard aGuard( *this );
         GetImageProducer()->startProduction();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< submission::XSubmission > SAL_CALL OClickableImageBaseModel::getSubmission() throw (RuntimeException)
     {
         return m_xSubmissionDelegate;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClickableImageBaseModel::setSubmission( const Reference< submission::XSubmission >& _submission ) throw (RuntimeException)
     {
         m_xSubmissionDelegate = _submission;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OClickableImageBaseModel::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames();
@@ -571,7 +571,7 @@ namespace frm
     }
 
     // OComponentHelper
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::disposing()
     {
         OControlModel::disposing();
@@ -585,7 +585,7 @@ namespace frm
         m_pProducer = NULL;
     }
 
-    //------------------------------------------------------------------------------
+
     Any SAL_CALL OClickableImageBaseModel::queryAggregation(const Type& _rType) throw (RuntimeException)
     {
         // order matters:
@@ -603,7 +603,7 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle) const
     {
         switch (nHandle)
@@ -617,7 +617,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& rValue) throw ( Exception)
     {
         switch (nHandle)
@@ -647,7 +647,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OClickableImageBaseModel::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue)
                                 throw( IllegalArgumentException )
     {
@@ -670,7 +670,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::StartProduction()
     {
         ImageProducer *pImgProd = GetImageProducer();
@@ -704,7 +704,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::SetURL( const OUString& rURL )
     {
         if (m_pMedium || rURL.isEmpty())
@@ -809,7 +809,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::DataAvailable()
     {
         if (!m_bProdStarted)
@@ -818,14 +818,14 @@ namespace frm
         GetImageProducer()->NewDataAvailable();
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::DownloadDone()
     {
         DataAvailable();
         m_bDownloading = sal_False;
     }
 
-    //------------------------------------------------------------------------------
+
     IMPL_STATIC_LINK( OClickableImageBaseModel, DownloadDoneLink, void*, EMPTYARG )
     {
         ::osl::MutexGuard aGuard( pThis->m_aMutex );
@@ -833,7 +833,7 @@ namespace frm
         return 0;
     }
 
-    //------------------------------------------------------------------------------
+
     void OClickableImageBaseModel::_propertyChanged( const PropertyChangeEvent& rEvt )
         throw( RuntimeException )
     {
@@ -843,7 +843,7 @@ namespace frm
         SetURL( getString(rEvt.NewValue) );
     }
 
-    // -----------------------------------------------------------------------------
+
     Any OClickableImageBaseModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
     {
         switch (nHandle)
@@ -860,13 +860,13 @@ namespace frm
     //==================================================================
     // OImageProducerThread_Impl
     //==================================================================
-    //------------------------------------------------------------------
+
     EventObject* OImageProducerThread_Impl::cloneEvent( const EventObject* _pEvt ) const
     {
         return new EventObject( *_pEvt );
     }
 
-    //------------------------------------------------------------------
+
     void OImageProducerThread_Impl::processEvent( ::cppu::OComponentHelper *pCompImpl,
                                                 const EventObject* pEvt,
                                                 const Reference<XControl>&,
diff --git a/forms/source/component/cloneable.cxx b/forms/source/component/cloneable.cxx
index a54e11b19070..8bbe17854bb3 100644
--- a/forms/source/component/cloneable.cxx
+++ b/forms/source/component/cloneable.cxx
@@ -34,7 +34,7 @@ namespace frm
     //====================================================================
     //= OCloneableAggregation
     //====================================================================
-    //------------------------------------------------------------------
+
     Reference< XAggregation > OCloneableAggregation::createAggregateClone( const OCloneableAggregation* _pOriginal )
     {
         Reference< XCloneable > xAggregateCloneable;    // will be the aggregate's XCloneable
diff --git a/forms/source/component/entrylisthelper.cxx b/forms/source/component/entrylisthelper.cxx
index 07df31f2e87a..aa2a61d717a8 100644
--- a/forms/source/component/entrylisthelper.cxx
+++ b/forms/source/component/entrylisthelper.cxx
@@ -38,14 +38,14 @@ namespace frm
     //=====================================================================
     //= OEntryListHelper
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OEntryListHelper::OEntryListHelper( OControlModel& _rControlModel )
         :m_rControlModel( _rControlModel )
         ,m_aRefreshListeners( _rControlModel.getInstanceMutex() )
     {
     }
 
-    //---------------------------------------------------------------------
+
     OEntryListHelper::OEntryListHelper( const OEntryListHelper& _rSource, OControlModel& _rControlModel )
         :m_rControlModel( _rControlModel )
         ,m_xListSource ( _rSource.m_xListSource  )
@@ -54,12 +54,12 @@ namespace frm
     {
     }
 
-    //---------------------------------------------------------------------
+
     OEntryListHelper::~OEntryListHelper( )
     {
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::setListEntrySource( const Reference< XListEntrySource >& _rxSource ) throw (RuntimeException)
     {
         ControlModelLock aLock( m_rControlModel );
@@ -72,14 +72,14 @@ namespace frm
             connectExternalListSource( _rxSource, aLock );
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XListEntrySource > SAL_CALL OEntryListHelper::getListEntrySource(  ) throw (RuntimeException)
     {
         return m_xListSource;
     }
 
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::entryChanged( const ListEntryEvent& _rEvent ) throw (RuntimeException)
     {
         ControlModelLock aLock( m_rControlModel );
@@ -101,7 +101,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::entryRangeInserted( const ListEntryEvent& _rEvent ) throw (RuntimeException)
     {
         ControlModelLock aLock( m_rControlModel );
@@ -138,7 +138,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::entryRangeRemoved( const ListEntryEvent& _rEvent ) throw (RuntimeException)
     {
         ControlModelLock aLock( m_rControlModel );
@@ -166,7 +166,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::allEntriesChanged( const EventObject& _rEvent ) throw (RuntimeException)
     {
         ControlModelLock aLock( m_rControlModel );
@@ -182,21 +182,21 @@ namespace frm
     }
 
     // XRefreshable
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::addRefreshListener(const Reference<XRefreshListener>& _rxListener) throw(RuntimeException)
     {
         if ( _rxListener.is() )
             m_aRefreshListeners.addInterface( _rxListener );
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::removeRefreshListener(const Reference<XRefreshListener>& _rxListener) throw(RuntimeException)
     {
         if ( _rxListener.is() )
             m_aRefreshListeners.removeInterface( _rxListener );
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OEntryListHelper::refresh() throw(RuntimeException)
     {
         {
@@ -208,7 +208,7 @@ namespace frm
         m_aRefreshListeners.notifyEach( &XRefreshListener::refreshed, aEvt );
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::impl_lock_refreshList( ControlModelLock& _rInstanceLock )
     {
         if ( hasExternalListSource() )
@@ -220,7 +220,7 @@ namespace frm
             refreshInternalEntryList();
     }
 
-    //---------------------------------------------------------------------
+
     bool OEntryListHelper::handleDisposing( const EventObject& _rEvent )
     {
         if ( m_xListSource .is() && ( _rEvent.Source == m_xListSource ) )
@@ -231,7 +231,7 @@ namespace frm
         return false;
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::disposing( )
     {
         EventObject aEvt( static_cast< XRefreshable* >( this ) );
@@ -241,7 +241,7 @@ namespace frm
             disconnectExternalListSource( );
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::disconnectExternalListSource( )
     {
         if ( m_xListSource.is() )
@@ -252,19 +252,19 @@ namespace frm
         disconnectedExternalListSource();
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::connectedExternalListSource( )
     {
         // nothing to do here
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::disconnectedExternalListSource( )
     {
         // nothing to do here
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::connectExternalListSource( const Reference< XListEntrySource >& _rxSource, ControlModelLock& _rInstanceLock )
     {
         OSL_ENSURE( !hasExternalListSource(), "OEntryListHelper::connectExternalListSource: only to be called if no external source is active!" );
@@ -287,7 +287,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OEntryListHelper::convertNewListSourceProperty( Any& _rConvertedValue,
         Any& _rOldValue, const Any& _rValue ) SAL_THROW( ( IllegalArgumentException ) )
     {
@@ -298,7 +298,7 @@ namespace frm
         return ::comphelper::tryPropertyValue( _rConvertedValue, _rOldValue, _rValue, m_aStringItems );
     }
 
-    //---------------------------------------------------------------------
+
     void OEntryListHelper::setNewStringItemList( const ::com::sun::star::uno::Any& _rValue, ControlModelLock& _rInstanceLock )
     {
         OSL_PRECOND( !hasExternalListSource(), "OEntryListHelper::setNewStringItemList: this should never have survived convertNewListSourceProperty!" );
diff --git a/forms/source/component/errorbroadcaster.cxx b/forms/source/component/errorbroadcaster.cxx
index f9a010ba112f..d90646f5f806 100644
--- a/forms/source/component/errorbroadcaster.cxx
+++ b/forms/source/component/errorbroadcaster.cxx
@@ -35,14 +35,14 @@ namespace frm
     //=====================================================================
     //= OErrorBroadcaster
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OErrorBroadcaster::OErrorBroadcaster( ::cppu::OBroadcastHelper& _rBHelper )
         :m_rBHelper( _rBHelper )
         ,m_aErrorListeners( _rBHelper.rMutex )
     {
     }
 
-    //---------------------------------------------------------------------
+
     OErrorBroadcaster::~OErrorBroadcaster( )
     {
         SAL_WARN_IF( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose, "forms.component",
@@ -54,14 +54,14 @@ namespace frm
         // either we're not disposed, or the derived class did not call our dispose from within their dispose
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OErrorBroadcaster::disposing()
     {
         EventObject aDisposeEvent( static_cast< XSQLErrorBroadcaster* >( this ) );
         m_aErrorListeners.disposeAndClear( aDisposeEvent );
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OErrorBroadcaster::onError( const SQLException& _rException, const OUString& _rContextDescription )
     {
         Any aError;
@@ -73,7 +73,7 @@ namespace frm
         onError( SQLErrorEvent( static_cast< XSQLErrorBroadcaster* >( this ), aError ) );
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OErrorBroadcaster::onError( const ::com::sun::star::sdb::SQLErrorEvent& _rError )
     {
         if ( m_aErrorListeners.getLength() )
@@ -85,13 +85,13 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OErrorBroadcaster::addSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException )
     {
         m_aErrorListeners.addInterface( _rxListener );
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OErrorBroadcaster::removeSQLErrorListener( const Reference< XSQLErrorListener >& _rxListener ) throw( RuntimeException )
     {
         m_aErrorListeners.removeInterface( _rxListener );
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 1a4690fdd6d4..8f7162803e97 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -39,7 +39,7 @@ namespace frm
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
 
-    //------------------------------------------------------------------------------
+
     namespace
     {
         Any lcl_extractFontDescriptorAggregate( sal_Int32 _nHandle, const FontDescriptor& _rFont )
@@ -122,7 +122,7 @@ namespace frm
     //=====================================================================
     //= FontControlModel
     //=====================================================================
-    //---------------------------------------------------------------------
+
     FontControlModel::FontControlModel( bool _bToolkitCompatibleDefaults )
         :m_nFontRelief( FontRelief::NONE )
         ,m_nFontEmphasis( FontEmphasisMark::NONE )
@@ -130,7 +130,7 @@ namespace frm
     {
     }
 
-    //---------------------------------------------------------------------
+
     FontControlModel::FontControlModel( const FontControlModel* _pOriginal )
     {
         m_aFont = _pOriginal->m_aFont;
@@ -141,7 +141,7 @@ namespace frm
         m_bToolkitCompatibleDefaults = _pOriginal->m_bToolkitCompatibleDefaults;
     }
 
-    //---------------------------------------------------------------------
+
     bool FontControlModel::isFontRelatedProperty( sal_Int32 _nPropertyHandle ) const
     {
         return isFontAggregateProperty( _nPropertyHandle )
@@ -152,7 +152,7 @@ namespace frm
             || ( _nPropertyHandle == PROPERTY_ID_TEXTCOLOR );
     }
 
-    //---------------------------------------------------------------------
+
     bool FontControlModel::isFontAggregateProperty( sal_Int32 _nPropertyHandle ) const
     {
         return ( _nPropertyHandle == PROPERTY_ID_FONT_CHARWIDTH )
@@ -173,7 +173,7 @@ namespace frm
             || ( _nPropertyHandle == PROPERTY_ID_FONT_TYPE );
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int32 FontControlModel::getTextColor( ) const
     {
         sal_Int32 nColor = COL_TRANSPARENT;
@@ -181,7 +181,7 @@ namespace frm
         return nColor;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int32 FontControlModel::getTextLineColor( ) const
     {
         sal_Int32 nColor = COL_TRANSPARENT;
@@ -189,7 +189,7 @@ namespace frm
         return nColor;
     }
 
-    //------------------------------------------------------------------------------
+
     void FontControlModel::describeFontRelatedProperties( Sequence< Property >& /* [out] */ _rProps ) const
     {
         sal_Int32 nPos = _rProps.getLength();
@@ -220,7 +220,7 @@ namespace frm
         DECL_BOOL_PROP1 ( FONT_WORDLINEMODE,                    MAYBEDEFAULT );
     }
 
-    //---------------------------------------------------------------------
+
     void FontControlModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         switch( _nHandle )
@@ -251,7 +251,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool FontControlModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue,
                 sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException )
     {
@@ -351,7 +351,7 @@ namespace frm
         return bModified;
     }
 
-    //------------------------------------------------------------------------------
+
     static void setFastPropertyValue_NoBroadcast_implimpl(
             FontDescriptor & rFont,
             sal_Int32 nHandle, const Any& rValue) throw (Exception)
@@ -488,7 +488,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     Any FontControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     {
         Any aReturn;
diff --git a/forms/source/component/imgprod.cxx b/forms/source/component/imgprod.cxx
index e9c6a695a2e9..d374b6707acb 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -30,9 +30,9 @@
 #include "svtools/imageresourceaccess.hxx"
 #include <comphelper/processfactory.hxx>
 
-// --------------------
+
 // - ImgProdLockBytes -
-// --------------------
+
 
 class ImgProdLockBytes : public SvLockBytes
 {
@@ -54,14 +54,14 @@ public:
     virtual ErrCode     Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
 };
 
-// ------------------------------------------------------------------------
+
 
 ImgProdLockBytes::ImgProdLockBytes( SvStream* pStm, sal_Bool bOwner ) :
         SvLockBytes( pStm, bOwner )
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStmRef ) :
         xStmRef( rStmRef )
@@ -88,13 +88,13 @@ ImgProdLockBytes::ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 ImgProdLockBytes::~ImgProdLockBytes()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 ErrCode ImgProdLockBytes::ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const
 {
@@ -125,7 +125,7 @@ ErrCode ImgProdLockBytes::ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount,
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 ErrCode ImgProdLockBytes::WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten )
 {
@@ -138,14 +138,14 @@ ErrCode ImgProdLockBytes::WriteAt( sal_Size nPos, const void* pBuffer, sal_Size
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 ErrCode ImgProdLockBytes::Flush() const
 {
     return ERRCODE_NONE;
 }
 
-// ------------------------------------------------------------------------
+
 
 ErrCode ImgProdLockBytes::SetSize( sal_Size nSize )
 {
@@ -158,7 +158,7 @@ ErrCode ImgProdLockBytes::SetSize( sal_Size nSize )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFlag ) const
 {
@@ -172,9 +172,9 @@ ErrCode ImgProdLockBytes::Stat( SvLockBytesStat* pStat, SvLockBytesStatFlag eFla
     }
 }
 
-// -----------------
+
 // - ImageProducer -
-// -----------------
+
 
 ImageProducer::ImageProducer() :
     mpStm       ( NULL ),
@@ -183,7 +183,7 @@ ImageProducer::ImageProducer() :
     mpGraphic = new Graphic;
 }
 
-// ------------------------------------------------------------
+
 
 ImageProducer::~ImageProducer()
 {
@@ -194,7 +194,7 @@ ImageProducer::~ImageProducer()
     mpStm = NULL;
 }
 
-// ------------------------------------------------------------
+
 
 // ::com::sun::star::uno::XInterface
 ::com::sun::star::uno::Any ImageProducer::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
@@ -205,7 +205,7 @@ ImageProducer::~ImageProducer()
     return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::addConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer )
     throw(::com::sun::star::uno::RuntimeException,
@@ -216,7 +216,7 @@ void ImageProducer::addConsumer( const ::com::sun::star::uno::Reference< ::com::
         maConsList.push_back( new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer > ( rxConsumer ));
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XImageConsumer >& rxConsumer ) throw(::com::sun::star::uno::RuntimeException)
 {
@@ -226,7 +226,7 @@ void ImageProducer::removeConsumer( const ::com::sun::star::uno::Reference< ::co
         maConsList.erase(riter.base()-1);
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::SetImage( const OUString& rPath )
 {
@@ -248,7 +248,7 @@ void ImageProducer::SetImage( const OUString& rPath )
         mpStm = NULL;
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::SetImage( SvStream& rStm )
 {
@@ -260,7 +260,7 @@ void ImageProducer::SetImage( SvStream& rStm )
     mpStm = new SvStream( new ImgProdLockBytes( &rStm, sal_False ) );
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rInputStmRef )
 {
@@ -275,7 +275,7 @@ void ImageProducer::setImage( ::com::sun::star::uno::Reference< ::com::sun::star
         mpStm = NULL;
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::NewDataAvailable()
 {
@@ -283,7 +283,7 @@ void ImageProducer::NewDataAvailable()
         startProduction();
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeException)
 {
@@ -329,7 +329,7 @@ void ImageProducer::startProduction() throw(::com::sun::star::uno::RuntimeExcept
     }
 }
 
-// ------------------------------------------------------------
+
 
 sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic )
 {
@@ -349,7 +349,7 @@ sal_Bool ImageProducer::ImplImportGraphic( Graphic& rGraphic )
     return bRet;
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::ImplUpdateData( const Graphic& rGraphic )
 {
@@ -369,7 +369,7 @@ void ImageProducer::ImplUpdateData( const Graphic& rGraphic )
     }
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
 {
@@ -440,7 +440,7 @@ void ImageProducer::ImplInitConsumer( const Graphic& rGraphic )
     }
 }
 
-// ------------------------------------------------------------
+
 
 void ImageProducer::ImplUpdateConsumer( const Graphic& rGraphic )
 {
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index ffbe14b13c4f..f70aec47debb 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -26,7 +26,7 @@
 #include <comphelper/basicio.hxx>
 #include <comphelper/processfactory.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ONavigationBarModel()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::ONavigationBarModel > aAutoRegistration;
@@ -56,7 +56,7 @@ namespace frm
     //==================================================================
     // ONavigationBarModel
     //==================================================================
-    //------------------------------------------------------------------
+
     ONavigationBarModel::ONavigationBarModel( const Reference< XComponentContext >& _rxFactory )
         :OControlModel( _rxFactory, OUString() )
         ,FontControlModel( true )
@@ -79,7 +79,7 @@ namespace frm
         getPropertyDefaultByHandle( PROPERTY_ID_CONTEXT_WRITING_MODE    ) >>= m_nContextWritingMode;
     }
 
-    //------------------------------------------------------------------
+
     ONavigationBarModel::ONavigationBarModel( const ONavigationBarModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
         :OControlModel( _pOriginal, _rxFactory )
         ,FontControlModel( _pOriginal )
@@ -105,7 +105,7 @@ namespace frm
         m_nContextWritingMode   = _pOriginal->m_nContextWritingMode;
     }
 
-    //------------------------------------------------------------------
+
     void ONavigationBarModel::implInitPropertyContainer()
     {
         REGISTER_PROP_2( DEFAULTCONTROL,      m_sDefaultControl,        BOUND, MAYBEDEFAULT );
@@ -127,7 +127,7 @@ namespace frm
         REGISTER_VOID_PROP( BACKGROUNDCOLOR, m_aBackgroundColor, sal_Int32 );
     }
 
-    //------------------------------------------------------------------
+
     ONavigationBarModel::~ONavigationBarModel()
     {
         if ( !OComponentHelper::rBHelper.bDisposed )
@@ -138,7 +138,7 @@ namespace frm
 
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ONavigationBarModel::queryAggregation( const Type& _rType ) throw ( RuntimeException )
     {
         Any aReturn = ONavigationBarModel_BASE::queryInterface( _rType );
@@ -149,31 +149,31 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarModel, OControlModel, ONavigationBarModel_BASE )
 
-    //------------------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_CLONING( ONavigationBarModel )
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ONavigationBarModel::getImplementationName()  throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
 
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames()  throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ONavigationBarModel::getImplementationName_Static()
     {
         return OUString( "com.sun.star.comp.form.ONavigationBarModel" );
     }
 
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ONavigationBarModel::getSupportedServiceNames_Static()
     {
         Sequence< OUString > aSupported = OControlModel::getSupportedServiceNames_Static();
@@ -185,25 +185,25 @@ namespace frm
         return aSupported;
     }
 
-    //------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL ONavigationBarModel::Create( const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return *( new ONavigationBarModel( comphelper::getComponentContext(_rxFactory) ) );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarModel::disposing()
     {
         OControlModel::disposing( );
     }
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ONavigationBarModel::getServiceName() throw ( RuntimeException )
     {
         return OUString(FRM_SUN_COMPONENT_NAVTOOLBAR);
     }
 
-    //------------------------------------------------------------------
+
     #define PERSIST_TABSTOP         0x0001
     #define PERSIST_BACKGROUND      0x0002
     #define PERSIST_TEXTCOLOR       0x0004
@@ -217,7 +217,7 @@ namespace frm
     #define PERSIST_SHOW_ACTIONS    0x0020
     #define PERSIST_SHOW_FILTERSORT 0x0040
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw ( IOException, RuntimeException )
     {
         // open a section for compatibility - if we later on write additional members,
@@ -290,7 +290,7 @@ namespace frm
         _rxOutStream->writeLong ( m_nDelay  );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarModel::read( const Reference< XObjectInputStream >& _rxInStream ) throw ( IOException, RuntimeException )
     {
         OStreamSection aEnsureBlockCompat( _rxInStream );
@@ -351,7 +351,7 @@ namespace frm
         m_nDelay  = _rxInStream->readLong();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         if ( isRegisteredProperty( _nHandle ) )
@@ -368,7 +368,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool SAL_CALL ONavigationBarModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue,
         sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException )
     {
@@ -390,7 +390,7 @@ namespace frm
         return bModified;
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
     {
         if ( isRegisteredProperty( _nHandle ) )
@@ -409,7 +409,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     Any ONavigationBarModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     {
         Any aDefault;
@@ -464,7 +464,7 @@ namespace frm
         return aDefault;
     }
 
-    //------------------------------------------------------------------
+
     void ONavigationBarModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel )
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index 01dadf9d7808..833ad7bfac95 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -62,7 +62,7 @@ namespace frm
     //====================================================================
     namespace
     {
-        //----------------------------------------------------------------
+
         static ::comphelper::IPropertyInfoService& lcl_getPropertyInfos()
         {
             static ConcreteInfoService s_aPropInfos;
@@ -73,7 +73,7 @@ namespace frm
     //====================================================================
     //= PropertyBagHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     PropertyBagHelper::PropertyBagHelper( IPropertyBagHelperContext& _rContext )
         :m_rContext( _rContext )
         ,m_pPropertyArrayHelper( NULL )
@@ -81,32 +81,32 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     PropertyBagHelper::~PropertyBagHelper()
     {
         delete m_pPropertyArrayHelper, m_pPropertyArrayHelper = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBagHelper::dispose()
     {
         m_bDisposed = true;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBagHelper::impl_nts_checkDisposed_throw() const
     {
         if ( m_bDisposed )
             throw DisposedException();
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBagHelper::impl_nts_invalidatePropertySetInfo()
     {
         delete m_pPropertyArrayHelper, m_pPropertyArrayHelper = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 PropertyBagHelper::impl_findFreeHandle( const OUString& _rPropertyName )
     {
         ::comphelper::OPropertyArrayAggregationHelper& rPropInfo( impl_ts_getArrayHelper() );
@@ -145,7 +145,7 @@ namespace frm
         return nHandle;
     }
 
-    //--------------------------------------------------------------------
+
     ::comphelper::OPropertyArrayAggregationHelper& PropertyBagHelper::impl_ts_getArrayHelper() const
     {
         OPropertyArrayAggregationHelper* p = m_pPropertyArrayHelper;
@@ -179,34 +179,34 @@ namespace frm
         return *p;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBagHelper::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue )
     {
         ::osl::MutexGuard aGuard( m_rContext.getMutex() );
         impl_nts_checkDisposed_throw();
 
-        //----------------------------------------------
+
         // check name sanity
         ::comphelper::OPropertyArrayAggregationHelper& aPropInfo( impl_ts_getArrayHelper() );
         if ( aPropInfo.hasPropertyByName( _rName ) )
             throw PropertyExistException( _rName, m_rContext.getPropertiesInterface() );
 
-        //----------------------------------------------
+
         // normalize the REMOVABLE attribute - the FormComponent service
         // requires that all dynamic properties are REMOVABLE
         _nAttributes |= PropertyAttribute::REMOVABLE;
 
-        //----------------------------------------------
+
         // find a free handle
         sal_Int32 nHandle = impl_findFreeHandle( _rName );
 
-        //----------------------------------------------
+
         // register the property, and invalidate our property meta data
         m_aDynamicProperties.addProperty( _rName, nHandle, _nAttributes, _rInitialValue );
         impl_nts_invalidatePropertySetInfo();
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBagHelper::removeProperty( const OUString& _rName )
     {
         ::osl::MutexGuard aGuard( m_rContext.getMutex() );
@@ -223,28 +223,28 @@ namespace frm
         impl_nts_invalidatePropertySetInfo();
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
-        //----------------------------------------------------------------
+
         struct SelectNameOfProperty : public ::std::unary_function< Property, OUString >
         {
             const OUString& operator()( const Property& _rProp ) const { return _rProp.Name; }
         };
 
-        //----------------------------------------------------------------
+
         struct SelectNameOfPropertyValue : public ::std::unary_function< PropertyValue, OUString >
         {
             const OUString& operator()( const PropertyValue& _rProp ) const { return _rProp.Name; }
         };
 
-        //----------------------------------------------------------------
+
         struct SelectValueOfPropertyValue : public ::std::unary_function< PropertyValue, Any >
         {
             const Any& operator()( const PropertyValue& _rProp ) const { return _rProp.Value; }
         };
 
-        //----------------------------------------------------------------
+
         struct PropertyValueLessByName : public ::std::binary_function< PropertyValue, PropertyValue, bool >
         {
             bool operator()( const PropertyValue& _lhs, const PropertyValue _rhs ) const
@@ -254,7 +254,7 @@ namespace frm
         };
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyValue > PropertyBagHelper::getPropertyValues()
     {
         ::osl::MutexGuard aGuard( m_rContext.getMutex() );
@@ -296,7 +296,7 @@ namespace frm
         return aPropertyValues;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyBagHelper::setPropertyValues( const Sequence< PropertyValue >& _rProps )
     {
         ::osl::ClearableMutexGuard aGuard( m_rContext.getMutex() );
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index dddb795d7682..2d051e6d7418 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -36,7 +36,7 @@ namespace frm
     //====================================================================
     //=
     //====================================================================
-    //--------------------------------------------------------------------
+
     OReferenceValueComponent::OReferenceValueComponent( const Reference< XComponentContext >& _rxFactory, const OUString& _rUnoControlModelTypeName, const OUString& _rDefault, sal_Bool _bSupportNoCheckRefValue )
         :OBoundControlModel( _rxFactory, _rUnoControlModelTypeName, _rDefault, sal_False, sal_True, sal_True )
         ,m_eDefaultChecked( STATE_NOCHECK )
@@ -44,7 +44,7 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     OReferenceValueComponent::OReferenceValueComponent( const OReferenceValueComponent* _pOriginal, const Reference< XComponentContext>& _rxFactory )
         :OBoundControlModel( _pOriginal, _rxFactory )
     {
@@ -56,19 +56,19 @@ namespace frm
         calculateExternalValueType();
     }
 
-    //--------------------------------------------------------------------
+
     OReferenceValueComponent::~OReferenceValueComponent()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OReferenceValueComponent::setReferenceValue( const OUString& _rRefValue )
     {
         m_sReferenceValue = _rRefValue;
         calculateExternalValueType();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OReferenceValueComponent::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         switch ( _nHandle )
@@ -86,7 +86,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OReferenceValueComponent::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)
     {
         switch ( _nHandle )
@@ -115,7 +115,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OReferenceValueComponent::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException)
     {
         sal_Bool bModified = sal_False;
@@ -141,13 +141,13 @@ namespace frm
         return bModified;
     }
 
-    //------------------------------------------------------------------------------
+
     Any OReferenceValueComponent::getDefaultForReset() const
     {
         return makeAny( (sal_Int16)m_eDefaultChecked );
     }
 
-    //--------------------------------------------------------------------
+
     void OReferenceValueComponent::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( m_bSupportSecondRefValue ? 3 : 2, OBoundControlModel )
@@ -160,7 +160,7 @@ namespace frm
         END_DESCRIBE_PROPERTIES();
     }
 
-    //-----------------------------------------------------------------------------
+
     Sequence< Type > OReferenceValueComponent::getSupportedBindingTypes()
     {
         ::std::list< Type > aTypes;
@@ -175,7 +175,7 @@ namespace frm
         return aTypesRet;
     }
 
-    //-----------------------------------------------------------------------------
+
     Any OReferenceValueComponent::translateExternalValueToControlValue( const Any& _rExternalValue ) const
     {
         sal_Int16 nState = STATE_DONTKNOW;
@@ -210,7 +210,7 @@ namespace frm
         return makeAny( nState );
     }
 
-    //-----------------------------------------------------------------------------
+
     Any OReferenceValueComponent::translateControlValueToExternalValue( ) const
     {
         Any aExternalValue;
@@ -259,7 +259,7 @@ namespace frm
         return aExternalValue;
     }
 
-    //-----------------------------------------------------------------------------
+
     Any OReferenceValueComponent::translateControlValueToValidatableValue( ) const
     {
         if ( !m_xAggregateSet.is() )
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index a6c30aebf538..ca2b75e8f56e 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -22,7 +22,7 @@
 #include <comphelper/basicio.hxx>
 #include <rtl/math.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_OScrollBarModel()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::OScrollBarModel >   aRegisterModel;
@@ -45,7 +45,7 @@ namespace frm
     //====================================================================
     //= helper
     //====================================================================
-    //--------------------------------------------------------------------
+
     Any translateExternalDoubleToControlIntValue(
         const Any& _rExternalValue, const Reference< XPropertySet >& _rxProperties,
         const OUString& _rMinValueName, const OUString& _rMaxValueName )
@@ -78,7 +78,7 @@ namespace frm
         return makeAny( nControlValue );
     }
 
-    //--------------------------------------------------------------------
+
     Any translateControlIntToExternalDoubleValue( const Any& _rControlIntValue )
     {
         Any aExternalDoubleValue;
@@ -97,8 +97,8 @@ namespace frm
     //====================================================================
     //= OScrollBarModel
     //====================================================================
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
+
+
     OScrollBarModel::OScrollBarModel( const Reference<XComponentContext>& _rxFactory )
         :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_SCROLLBAR, VCL_CONTROL_SCROLLBAR, sal_True, sal_True, sal_False )
         ,m_nDefaultScrollValue( 0 )
@@ -108,35 +108,35 @@ namespace frm
         initValueProperty( PROPERTY_SCROLL_VALUE, PROPERTY_ID_SCROLL_VALUE );
     }
 
-    //--------------------------------------------------------------------
+
     OScrollBarModel::OScrollBarModel( const OScrollBarModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
         :OBoundControlModel( _pOriginal, _rxFactory )
     {
         m_nDefaultScrollValue = _pOriginal->m_nDefaultScrollValue;
     }
 
-    //--------------------------------------------------------------------
+
     OScrollBarModel::~OScrollBarModel( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_SERVICE_REGISTRATION_2( OScrollBarModel, OControlModel, FRM_SUN_COMPONENT_SCROLLBAR, BINDABLE_INTEGER_VALUE_RANGE )
         // note that we're passing OControlModel as "base class". This is because
         // OBoundControlModel, our real base class, claims to support the DataAwareControlModel
         // service, which isn't really true for us. We only derive from this class
         // to benefit from the functionality for binding to spreadsheet cells
 
-    //------------------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_CLONING( OScrollBarModel )
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OScrollBarModel::disposing()
     {
         OBoundControlModel::disposing();
     }
 
-    //--------------------------------------------------------------------
+
     void OScrollBarModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel )
@@ -146,7 +146,7 @@ namespace frm
         END_DESCRIBE_PROPERTIES();
     }
 
-    //------------------------------------------------------------------------------
+
     void OScrollBarModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         switch ( _nHandle )
@@ -160,7 +160,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OScrollBarModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
     {
         switch ( _nHandle )
@@ -175,7 +175,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OScrollBarModel::convertFastPropertyValue(
                 Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
                 throw ( IllegalArgumentException )
@@ -194,7 +194,7 @@ namespace frm
         return bModified;
     }
 
-    //--------------------------------------------------------------------
+
     Any OScrollBarModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     {
         Any aReturn;
@@ -213,33 +213,33 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     Any OScrollBarModel::translateDbColumnToControlValue( )
     {
         OSL_FAIL( "OScrollBarModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return Any();
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OScrollBarModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     {
         OSL_FAIL( "OScrollBarModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     Any OScrollBarModel::getDefaultForReset() const
     {
         return makeAny( (sal_Int32)m_nDefaultScrollValue );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OScrollBarModel::getServiceName() throw( RuntimeException )
     {
         return OUString(FRM_SUN_COMPONENT_SCROLLBAR);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OScrollBarModel::write( const Reference< XObjectOutputStream >& _rxOutStream )
         throw( IOException, RuntimeException )
     {
@@ -256,7 +256,7 @@ namespace frm
         writeHelpTextCompatibly( _rxOutStream );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OScrollBarModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException )
     {
         OBoundControlModel::read( _rxInStream );
@@ -279,7 +279,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any OScrollBarModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
     {
         return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
@@ -287,14 +287,14 @@ namespace frm
             OUString( "ScrollValueMax" ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any OScrollBarModel::translateControlValueToExternalValue( ) const
     {
         // by definition, the base class simply obtains the property value
         return translateControlIntToExternalDoubleValue( OBoundControlModel::translateControlValueToExternalValue() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Type > OScrollBarModel::getSupportedBindingTypes()
     {
         return Sequence< Type >( &::getCppuType( static_cast< double* >( NULL ) ), 1 );
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index f7103af924e2..82429b0cd410 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -21,7 +21,7 @@
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_OSpinButtonModel()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::OSpinButtonModel >   aRegisterModel;
@@ -53,8 +53,8 @@ namespace frm
     //====================================================================
     //= OSpinButtonModel
     //====================================================================
-    //--------------------------------------------------------------------
-    //--------------------------------------------------------------------
+
+
     OSpinButtonModel::OSpinButtonModel( const Reference<XComponentContext>& _rxFactory )
         :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_SPINBUTTON, VCL_CONTROL_SPINBUTTON, sal_True, sal_True, sal_False )
         ,m_nDefaultSpinValue( 0 )
@@ -64,35 +64,35 @@ namespace frm
         initValueProperty( PROPERTY_SPIN_VALUE, PROPERTY_ID_SPIN_VALUE );
     }
 
-    //--------------------------------------------------------------------
+
     OSpinButtonModel::OSpinButtonModel( const OSpinButtonModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
         :OBoundControlModel( _pOriginal, _rxFactory )
     {
         m_nDefaultSpinValue = _pOriginal->m_nDefaultSpinValue;
     }
 
-    //--------------------------------------------------------------------
+
     OSpinButtonModel::~OSpinButtonModel( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_SERVICE_REGISTRATION_2( OSpinButtonModel, OControlModel, FRM_SUN_COMPONENT_SPINBUTTON, BINDABLE_INTEGER_VALUE_RANGE )
         // note that we're passing OControlModel as "base class". This is because
         // OBoundControlModel, our real base class, claims to support the DataAwareControlModel
         // service, which isn't really true for us. We only derive from this class
         // to benefit from the functionality for binding to spreadsheet cells
 
-    //------------------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_CLONING( OSpinButtonModel )
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OSpinButtonModel::disposing()
     {
         OBoundControlModel::disposing();
     }
 
-    //--------------------------------------------------------------------
+
     void OSpinButtonModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 3, OControlModel )
@@ -102,7 +102,7 @@ namespace frm
         END_DESCRIBE_PROPERTIES();
     }
 
-    //------------------------------------------------------------------------------
+
     void OSpinButtonModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         switch ( _nHandle )
@@ -116,7 +116,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void OSpinButtonModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
     {
         switch ( _nHandle )
@@ -131,7 +131,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OSpinButtonModel::convertFastPropertyValue(
                 Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue )
                 throw ( IllegalArgumentException )
@@ -150,7 +150,7 @@ namespace frm
         return bModified;
     }
 
-    //--------------------------------------------------------------------
+
     Any OSpinButtonModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     {
         Any aReturn;
@@ -169,33 +169,33 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     Any OSpinButtonModel::translateDbColumnToControlValue( )
     {
         OSL_FAIL( "OSpinButtonModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return Any();
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool OSpinButtonModel::commitControlValueToDbColumn( bool /*_bPostReset*/ )
     {
         OSL_FAIL( "OSpinButtonModel::commitControlValueToDbColumn: never to be called (we're not bound)!" );
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     Any OSpinButtonModel::getDefaultForReset() const
     {
         return makeAny( (sal_Int32)m_nDefaultSpinValue );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OSpinButtonModel::getServiceName() throw( RuntimeException )
     {
         return OUString(FRM_SUN_COMPONENT_SPINBUTTON);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OSpinButtonModel::write( const Reference< XObjectOutputStream >& _rxOutStream )
         throw( IOException, RuntimeException )
     {
@@ -212,7 +212,7 @@ namespace frm
         writeHelpTextCompatibly( _rxOutStream );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OSpinButtonModel::read( const Reference< XObjectInputStream>& _rxInStream ) throw( IOException, RuntimeException )
     {
         OBoundControlModel::read( _rxInStream );
@@ -235,7 +235,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any OSpinButtonModel::translateExternalValueToControlValue( const Any& _rExternalValue ) const
     {
         return translateExternalDoubleToControlIntValue( _rExternalValue, m_xAggregateSet,
@@ -243,14 +243,14 @@ namespace frm
             OUString( "SpinValueMax" ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any OSpinButtonModel::translateControlValueToExternalValue( ) const
     {
         // by definition, the base class simply obtains the property value
         return translateControlIntToExternalDoubleValue( OBoundControlModel::translateControlValueToExternalValue() );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Type > OSpinButtonModel::getSupportedBindingTypes()
     {
         return Sequence< Type >( &::getCppuType( static_cast< double* >( NULL ) ), 1 );
diff --git a/forms/source/helper/commanddescriptionprovider.cxx b/forms/source/helper/commanddescriptionprovider.cxx
index 045fe585a371..fec8c7230234 100644
--- a/forms/source/helper/commanddescriptionprovider.cxx
+++ b/forms/source/helper/commanddescriptionprovider.cxx
@@ -78,7 +78,7 @@ namespace frm
     };
 
 
-    //--------------------------------------------------------------------
+
     void DefaultCommandDescriptionProvider::impl_init_nothrow( const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument )
     {
         OSL_ENSURE( _rxDocument.is(), "DefaultCommandDescriptionProvider::impl_init_nothrow: no document => no command descriptions!" );
@@ -99,7 +99,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString DefaultCommandDescriptionProvider::getCommandDescription( const OUString& _rCommandURL ) const
     {
         if ( !m_xCommandAccess.is() )
@@ -118,7 +118,7 @@ namespace frm
         return OUString();
     }
 
-    //--------------------------------------------------------------------
+
     PCommandDescriptionProvider createDocumentCommandDescriptionProvider(
         const Reference<XComponentContext>& _rxContext, const Reference< XModel >& _rxDocument )
     {
diff --git a/forms/source/helper/commandimageprovider.cxx b/forms/source/helper/commandimageprovider.cxx
index bdacb8930955..72adc999f1f1 100644
--- a/forms/source/helper/commandimageprovider.cxx
+++ b/forms/source/helper/commandimageprovider.cxx
@@ -82,7 +82,7 @@ namespace frm
         Reference< XImageManager >    m_xModuleImageManager;
     };
 
-    //--------------------------------------------------------------------
+
     void DocumentCommandImageProvider::impl_init_nothrow( const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
     {
         OSL_ENSURE( _rxDocument.is(), "DocumentCommandImageProvider::impl_init_nothrow: no document => no images!" );
@@ -119,7 +119,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     CommandImages DocumentCommandImageProvider::getCommandImages( const CommandURLs& _rCommandURLs, const bool _bLarge ) const
     {
         const size_t nCommandCount = _rCommandURLs.getLength();
@@ -158,7 +158,7 @@ namespace frm
         return aImages;
     }
 
-    //--------------------------------------------------------------------
+
     PCommandImageProvider createDocumentCommandImageProvider(
         const Reference<XComponentContext>& _rContext, const Reference< XModel >& _rxDocument )
     {
diff --git a/forms/source/helper/controlfeatureinterception.cxx b/forms/source/helper/controlfeatureinterception.cxx
index 7435cc0d367e..d0f3f120143d 100644
--- a/forms/source/helper/controlfeatureinterception.cxx
+++ b/forms/source/helper/controlfeatureinterception.cxx
@@ -33,13 +33,13 @@ namespace frm
     //====================================================================
     //= ControlFeatureInterception
     //====================================================================
-    //--------------------------------------------------------------------
+
     ControlFeatureInterception::ControlFeatureInterception( const Reference< XComponentContext >& _rxORB )
         :m_pUrlTransformer( new UrlTransformer( _rxORB ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ControlFeatureInterception::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException )
     {
         if ( !_rxInterceptor.is() )
@@ -62,7 +62,7 @@ namespace frm
             // it's the first of the interceptor chain
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ControlFeatureInterception::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException )
     {
         if ( !_rxInterceptor.is() )
@@ -109,7 +109,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ControlFeatureInterception::dispose()
     {
         // release all interceptors
@@ -129,7 +129,7 @@ namespace frm
             xInterceptor = xInterceptor.query( xSlave );
         }
     }
-    //--------------------------------------------------------------------
+
     Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL, const OUString& _rTargetFrameName, ::sal_Int32 _nSearchFlags ) SAL_THROW((RuntimeException))
     {
         Reference< XDispatch > xDispatcher;
@@ -138,13 +138,13 @@ namespace frm
         return xDispatcher;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDispatch > ControlFeatureInterception::queryDispatch( const URL& _rURL ) SAL_THROW((RuntimeException))
     {
         return queryDispatch( _rURL, OUString(), 0 );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDispatch > ControlFeatureInterception::queryDispatch( const sal_Char* _pAsciiURL ) SAL_THROW((RuntimeException))
     {
         return queryDispatch( m_pUrlTransformer->getStrictURLFromAscii( _pAsciiURL ) );
diff --git a/forms/source/helper/formnavigation.cxx b/forms/source/helper/formnavigation.cxx
index 8acc422a0636..07ad13e279ef 100644
--- a/forms/source/helper/formnavigation.cxx
+++ b/forms/source/helper/formnavigation.cxx
@@ -42,7 +42,7 @@ namespace frm
     //==================================================================
     //= OFormNavigationHelper
     //==================================================================
-    //------------------------------------------------------------------
+
     OFormNavigationHelper::OFormNavigationHelper( const Reference< XComponentContext >& _rxORB )
         :m_xORB( _rxORB )
         ,m_nConnectedFeatures( 0 )
@@ -50,51 +50,51 @@ namespace frm
         m_pFeatureInterception.reset( new ControlFeatureInterception( m_xORB ) );
     }
 
-    //------------------------------------------------------------------
+
     OFormNavigationHelper::~OFormNavigationHelper()
     {
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormNavigationHelper::dispose( ) throw( RuntimeException )
     {
         m_pFeatureInterception->dispose();
         disconnectDispatchers();
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::interceptorsChanged( )
     {
         updateDispatches();
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::featureStateChanged( sal_Int16 /*_nFeatureId*/, sal_Bool /*_bEnabled*/ )
     {
         // not interested in
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::allFeatureStatesChanged( )
     {
         // not interested in
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormNavigationHelper::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
         m_pFeatureInterception->registerDispatchProviderInterceptor( _rxInterceptor );
         interceptorsChanged();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormNavigationHelper::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
         m_pFeatureInterception->releaseDispatchProviderInterceptor( _rxInterceptor );
         interceptorsChanged();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormNavigationHelper::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException)
     {
         for (   FeatureMap::iterator aFeature = m_aSupportedFeatures.begin();
@@ -122,7 +122,7 @@ namespace frm
         OSL_FAIL( "OFormNavigationHelper::statusChanged: huh? An invalid/unknown URL?" );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL OFormNavigationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         // was it one of our external dispatchers?
@@ -148,7 +148,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::updateDispatches()
     {
         if ( !m_nConnectedFeatures )
@@ -193,7 +193,7 @@ namespace frm
         allFeatureStatesChanged( );
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::connectDispatchers()
     {
         if ( m_nConnectedFeatures )
@@ -225,7 +225,7 @@ namespace frm
         allFeatureStatesChanged( );
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::disconnectDispatchers()
     {
         if ( m_nConnectedFeatures )
@@ -250,7 +250,7 @@ namespace frm
         allFeatureStatesChanged( );
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::initializeSupportedFeatures( )
     {
         if ( m_aSupportedFeatures.empty() )
@@ -279,13 +279,13 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     Reference< XDispatch > OFormNavigationHelper::queryDispatch( const URL& _rURL )
     {
         return m_pFeatureInterception->queryDispatch( _rURL );
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamAsciiName,
         const Any& _rParamValue ) const
     {
@@ -303,7 +303,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::dispatch( sal_Int16 _nFeatureId ) const
     {
         FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId );
@@ -317,7 +317,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     bool OFormNavigationHelper::isEnabled( sal_Int16 _nFeatureId ) const
     {
         FeatureMap::const_iterator aInfo = m_aSupportedFeatures.find( _nFeatureId );
@@ -327,7 +327,7 @@ namespace frm
         return false;
     }
 
-    //------------------------------------------------------------------
+
     bool OFormNavigationHelper::getBooleanState( sal_Int16 _nFeatureId ) const
     {
         sal_Bool bState = sal_False;
@@ -339,7 +339,7 @@ namespace frm
         return (bool)bState;
     }
 
-    //------------------------------------------------------------------
+
     OUString OFormNavigationHelper::getStringState( sal_Int16 _nFeatureId ) const
     {
         OUString sState;
@@ -351,7 +351,7 @@ namespace frm
         return sState;
     }
 
-    //------------------------------------------------------------------
+
     sal_Int32 OFormNavigationHelper::getIntegerState( sal_Int16 _nFeatureId ) const
     {
         sal_Int32 nState = 0;
@@ -363,7 +363,7 @@ namespace frm
         return nState;
     }
 
-    //------------------------------------------------------------------
+
     void OFormNavigationHelper::invalidateSupportedFeaturesSet()
     {
         disconnectDispatchers( );
@@ -375,18 +375,18 @@ namespace frm
     //==================================================================
     //= OFormNavigationMapper
     //==================================================================
-    //------------------------------------------------------------------
+
     OFormNavigationMapper::OFormNavigationMapper( const Reference< XComponentContext >& _rxORB )
     {
         m_pUrlTransformer.reset( new UrlTransformer( _rxORB ) );
     }
 
-    //------------------------------------------------------------------
+
     OFormNavigationMapper::~OFormNavigationMapper( )
     {
     }
 
-    //------------------------------------------------------------------
+
     bool OFormNavigationMapper::getFeatureURL( sal_Int16 _nFeatureId, URL& /* [out] */ _rURL )
     {
         // get the ascii version of the URL
@@ -397,7 +397,7 @@ namespace frm
         return ( pAsciiURL != NULL );
     }
 
-    //------------------------------------------------------------------
+
     namespace
     {
         struct FeatureURL
@@ -440,7 +440,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     const char* OFormNavigationMapper::getFeatureURLAscii( sal_Int16 _nFeatureId )
     {
         const FeatureURL* pFeatures = lcl_getFeatureTable();
@@ -453,7 +453,7 @@ namespace frm
         return NULL;
     }
 
-    //------------------------------------------------------------------
+
     sal_Int16 OFormNavigationMapper::getFeatureId( const OUString& _rCompleteURL )
     {
         const FeatureURL* pFeatures = lcl_getFeatureTable();
diff --git a/forms/source/helper/resettable.cxx b/forms/source/helper/resettable.cxx
index 9430f6d05687..1a87e5087fa5 100644
--- a/forms/source/helper/resettable.cxx
+++ b/forms/source/helper/resettable.cxx
@@ -43,19 +43,19 @@ namespace frm
     //====================================================================
     //= ResetHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     void ResetHelper::addResetListener( const Reference< XResetListener >& _listener )
     {
         m_aResetListeners.addInterface( _listener );
     }
 
-    //--------------------------------------------------------------------
+
     void ResetHelper::removeResetListener( const Reference< XResetListener >& _listener )
     {
         m_aResetListeners.removeInterface( _listener );
     }
 
-    //--------------------------------------------------------------------
+
     bool ResetHelper::approveReset()
     {
         ::cppu::OInterfaceIteratorHelper aIter( m_aResetListeners );
@@ -68,14 +68,14 @@ namespace frm
         return bContinue;
     }
 
-    //--------------------------------------------------------------------
+
     void ResetHelper::notifyResetted()
     {
         EventObject aResetEvent( m_rParent );
         m_aResetListeners.notifyEach( &XResetListener::resetted, aResetEvent );
     }
 
-    //--------------------------------------------------------------------
+
     void ResetHelper::disposing()
     {
         EventObject aEvent( m_rParent );
diff --git a/forms/source/helper/urltransformer.cxx b/forms/source/helper/urltransformer.cxx
index 3b3604952414..c80744fa6155 100644
--- a/forms/source/helper/urltransformer.cxx
+++ b/forms/source/helper/urltransformer.cxx
@@ -35,7 +35,7 @@ namespace frm
     //====================================================================
     //= UrlTransformer
     //====================================================================
-    //--------------------------------------------------------------------
+
     UrlTransformer::UrlTransformer( const Reference< XComponentContext >& _rxORB )
         :m_xORB( _rxORB )
         ,m_bTriedToCreateTransformer( false )
@@ -43,7 +43,7 @@ namespace frm
         DBG_ASSERT( _rxORB.is(), "UrlTransformer::UrlTransformer: invalid service factory!" );
     }
 
-    //--------------------------------------------------------------------
+
     bool UrlTransformer::implEnsureTransformer() const
     {
         // create the transformer, if not already attempted to do so
@@ -59,7 +59,7 @@ namespace frm
         return m_xTransformer.is();
     }
 
-    //--------------------------------------------------------------------
+
     URL UrlTransformer::getStrictURL( const OUString& _rURL ) const
     {
         URL aReturn;
@@ -69,13 +69,13 @@ namespace frm
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     URL UrlTransformer::getStrictURLFromAscii( const sal_Char* _pAsciiURL ) const
     {
         return getStrictURL( OUString::createFromAscii( _pAsciiURL ) );
     }
 
-    //--------------------------------------------------------------------
+
     void UrlTransformer::parseSmartWithAsciiProtocol( ::com::sun::star::util::URL& _rURL, const sal_Char* _pAsciiURL ) const
     {
         if ( implEnsureTransformer() )
diff --git a/forms/source/helper/windowstateguard.cxx b/forms/source/helper/windowstateguard.cxx
index b1057b382487..009fbd4f55c1 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -86,7 +86,7 @@ namespace frm
         void    impl_ensureEnabledState_nothrow_nolck();
     };
 
-    //--------------------------------------------------------------------
+
     WindowStateGuard_Impl::WindowStateGuard_Impl( const Reference< XWindow2 >& _rxWindow, const Reference< XPropertySet >& _rxMdelProps )
         :m_xWindow( _rxWindow )
         ,m_xModelProps( _rxMdelProps )
@@ -101,7 +101,7 @@ namespace frm
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     void WindowStateGuard_Impl::dispose()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -113,7 +113,7 @@ namespace frm
         m_xWindow.clear();
     }
 
-    //--------------------------------------------------------------------
+
     void WindowStateGuard_Impl::impl_ensureEnabledState_nothrow_nolck()
     {
         try
@@ -142,43 +142,43 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::windowEnabled( const EventObject& /*e*/ ) throw (RuntimeException)
     {
         impl_ensureEnabledState_nothrow_nolck();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::windowDisabled( const EventObject& /*e*/ ) throw (RuntimeException)
     {
         impl_ensureEnabledState_nothrow_nolck();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::windowResized( const WindowEvent& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::windowMoved( const WindowEvent& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::windowShown( const EventObject& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::windowHidden( const EventObject& /*e*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL WindowStateGuard_Impl::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         OSL_ENSURE( Source.Source == m_xWindow, "WindowStateGuard_Impl::disposing: where does this come from?" );
@@ -189,17 +189,17 @@ namespace frm
     //====================================================================
     //= WindowStateGuard
     //====================================================================
-    //--------------------------------------------------------------------
+
     WindowStateGuard::WindowStateGuard()
     {
     }
 
-    //--------------------------------------------------------------------
+
     WindowStateGuard::~WindowStateGuard()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void WindowStateGuard::attach( const Reference< XWindow2 >& _rxWindow, const Reference< XControlModel >& _rxModel )
     {
         if ( m_pImpl.is() )
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 7954470c3193..dd6829d6beab 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::util;
 
 namespace
 {
-    //---------------------------------------------------------------------
+
     static void lcl_throwIllegalArgumentException()
     {
         throw IllegalArgumentException();
@@ -168,12 +168,12 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(  const sal_Int32 i_nIn
 //==================================================================
 //= ElementDescription
 //==================================================================
-//------------------------------------------------------------------
+
 ElementDescription::ElementDescription( )
 {
 }
 
-//------------------------------------------------------------------
+
 ElementDescription::~ElementDescription()
 {
 }
@@ -181,7 +181,7 @@ ElementDescription::~ElementDescription()
 //==================================================================
 //= OInterfaceContainer
 //==================================================================
-//------------------------------------------------------------------
+
 OInterfaceContainer::OInterfaceContainer(
                 const Reference<XComponentContext>& _rxContext,
                 ::osl::Mutex& _rMutex,
@@ -195,7 +195,7 @@ OInterfaceContainer::OInterfaceContainer(
     impl_createEventAttacher_nothrow();
 }
 
-//------------------------------------------------------------------------------
+
 OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfaceContainer& _cloneSource )
     :OInterfaceContainer_BASE()
     ,m_rMutex( _rMutex )
@@ -206,7 +206,7 @@ OInterfaceContainer::OInterfaceContainer( ::osl::Mutex& _rMutex, const OInterfac
     impl_createEventAttacher_nothrow();
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
 {
     try
@@ -230,7 +230,7 @@ void OInterfaceContainer::clonedFrom( const OInterfaceContainer& _cloneSource )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::impl_createEventAttacher_nothrow()
 {
     try
@@ -243,12 +243,12 @@ void OInterfaceContainer::impl_createEventAttacher_nothrow()
     }
 }
 
-//------------------------------------------------------------------------------
+
 OInterfaceContainer::~OInterfaceContainer()
 {
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::disposing()
 {
     // dispose all elements
@@ -277,7 +277,7 @@ void OInterfaceContainer::disposing()
 }
 
 // XPersistObject
-//------------------------------------------------------------------------------
+
 namespace
 {
     //..........................................................................
@@ -314,7 +314,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStream>& _rxOutStream)
 {
     // We're writing a document in SO 5.2 format (or even from earlier versions)
@@ -358,7 +358,7 @@ void SAL_CALL OInterfaceContainer::writeEvents(const Reference<XObjectOutputStre
         lcl_restoreEvents( aSave, m_xEventAttacher );
 }
 
-//------------------------------------------------------------------------------
+
 struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescriptor, void >
 {
     void operator()( ScriptEventDescriptor& _rDescriptor )
@@ -381,7 +381,7 @@ struct TransformEventTo52Format : public ::std::unary_function< ScriptEventDescr
     }
 };
 
-//------------------------------------------------------------------------------
+
 struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescriptor, void >
 {
     void operator()( ScriptEventDescriptor& _rDescriptor )
@@ -397,7 +397,7 @@ struct TransformEventTo60Format : public ::std::unary_function< ScriptEventDescr
     }
 };
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
 {
     OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::transformEvents: no event attacher manager!" );
@@ -440,7 +440,7 @@ void OInterfaceContainer::transformEvents( const EventFormat _eTargetFormat )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream>& _rxInStream)
 {
     ::osl::MutexGuard aGuard( m_rMutex );
@@ -473,7 +473,7 @@ void SAL_CALL OInterfaceContainer::readEvents(const Reference<XObjectInputStream
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >& _rxOutStream ) throw(IOException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_rMutex );
@@ -504,7 +504,7 @@ void SAL_CALL OInterfaceContainer::write( const Reference< XObjectOutputStream >
     }
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     Reference< XPersistObject > lcl_createPlaceHolder( const Reference< XComponentContext >& _rxORB )
@@ -531,7 +531,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& _rxInStream ) throw(IOException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_rMutex );
@@ -620,20 +620,20 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
 }
 
 // XContainer
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::addContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException )
 {
     m_aContainerListeners.addInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::removeContainerListener(const Reference<XContainerListener>& _rxListener) throw( RuntimeException )
 {
     m_aContainerListeners.removeInterface(_rxListener);
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_rMutex );
@@ -678,7 +678,7 @@ void SAL_CALL OInterfaceContainer::disposing(const EventObject& _rSource) throw(
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::propertyChange(const PropertyChangeEvent& evt)
 throw (::com::sun::star::uno::RuntimeException) {
     if (evt.PropertyName == PROPERTY_NAME)
@@ -696,20 +696,20 @@ throw (::com::sun::star::uno::RuntimeException) {
 }
 
 // XElementAccess
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OInterfaceContainer::hasElements() throw( RuntimeException )
 {
     return !m_aMap.empty();
 }
 
-//------------------------------------------------------------------------------
+
 Type SAL_CALL OInterfaceContainer::getElementType() throw(RuntimeException)
 {
     return m_aElementType;
 }
 
 // XEnumerationAccess
-//------------------------------------------------------------------------------
+
 Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_rMutex );
@@ -717,7 +717,7 @@ Reference<XEnumeration> SAL_CALL OInterfaceContainer::createEnumeration() throw(
 }
 
 // XNameAccess
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
     ::std::pair <OInterfaceMap::iterator,
@@ -729,7 +729,7 @@ Any SAL_CALL OInterfaceContainer::getByName( const OUString& _rName ) throw(NoSu
     return (*aPair.first).second->queryInterface( m_aElementType );
 }
 
-//------------------------------------------------------------------------------
+
 StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeException)
 {
     StringSequence aNameList(m_aItems.size());
@@ -742,7 +742,7 @@ StringSequence SAL_CALL OInterfaceContainer::getElementNames() throw(RuntimeExce
     return aNameList;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw(RuntimeException)
 {
     ::std::pair <OInterfaceMap::iterator,
@@ -751,13 +751,13 @@ sal_Bool SAL_CALL OInterfaceContainer::hasByName( const OUString& _rName ) throw
 }
 
 // XIndexAccess
-//------------------------------------------------------------------------------
+
 sal_Int32 OInterfaceContainer::getCount() throw( RuntimeException )
 {
     return m_aItems.size();
 }
 
-//------------------------------------------------------------------------------
+
 Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     if (_nIndex < 0 || (_nIndex >= (sal_Int32)m_aItems.size()))
@@ -766,7 +766,7 @@ Any OInterfaceContainer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsEx
     return m_aItems[_nIndex]->queryInterface( m_aElementType );
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _rxObject, ElementDescription* _pElement )
 {
     // it has to be non-NULL
@@ -800,7 +800,7 @@ void OInterfaceContainer::approveNewElement( const Reference< XPropertySet >& _r
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XPropertySet >& _rxElement,
     sal_Bool _bEvents, ElementDescription* _pApprovalResult, sal_Bool _bFire ) throw( IllegalArgumentException )
 {
@@ -902,7 +902,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex)
 {
     OInterfaceArray::iterator i = m_aItems.begin() + nIndex;
@@ -923,19 +923,19 @@ void OInterfaceContainer::removeElementsNoEvents(sal_Int32 nIndex)
         xChild->setParent(InterfaceRef ());
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::implInserted( const ElementDescription* /*_pElement*/ )
 {
     // not inrerested in
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::implRemoved( const InterfaceRef& /*_rxObject*/ )
 {
     // not inrerested in
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::impl_replacedElement( const ContainerEvent& _rEvent, ::osl::ClearableMutexGuard& _rInstanceLock )
 {
     _rInstanceLock.clear();
@@ -943,7 +943,7 @@ void OInterfaceContainer::impl_replacedElement( const ContainerEvent& _rEvent, :
 }
 
 // XIndexContainer
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any& _rElement ) throw(IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
     Reference< XPropertySet > xElement;
@@ -951,7 +951,7 @@ void SAL_CALL OInterfaceContainer::insertByIndex( sal_Int32 _nIndex, const Any&
     implInsert( _nIndex, xElement, sal_True /* event handling */ , NULL /* not yet approved */ , sal_True /* notification */ );
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any& _rNewElement, ::osl::ClearableMutexGuard& _rClearBeforeNotify )
 {
     OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implReplaceByIndex: precondition not met (index)!" );
@@ -1024,14 +1024,14 @@ void OInterfaceContainer::implReplaceByIndex( const sal_Int32 _nIndex, const Any
     impl_replacedElement( aReplaceEvent, _rClearBeforeNotify );
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) )
 {
     if (_nIndex < 0 || _nIndex >= (sal_Int32)m_aItems.size())
         throw IndexOutOfBoundsException();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any& Element) throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -1041,7 +1041,7 @@ void SAL_CALL OInterfaceContainer::replaceByIndex(sal_Int32 _nIndex, const Any&
     implReplaceByIndex( _nIndex, Element, aGuard );
 }
 
-//------------------------------------------------------------------------------
+
 void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::ClearableMutexGuard& _rClearBeforeNotify )
 {
     OSL_PRECOND( ( _nIndex >= 0 ) && ( _nIndex < (sal_Int32)m_aItems.size() ), "OInterfaceContainer::implRemoveByIndex: precondition not met (index)!" );
@@ -1084,7 +1084,7 @@ void OInterfaceContainer::implRemoveByIndex( const sal_Int32 _nIndex, ::osl::Cle
     m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvt );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -1094,13 +1094,13 @@ void SAL_CALL OInterfaceContainer::removeByIndex(sal_Int32 _nIndex) throw( Index
     implRemoveByIndex( _nIndex, aGuard );
 }
 
-//------------------------------------------------------------------------
+
 ElementDescription* OInterfaceContainer::createElementMetaData( )
 {
     return new ElementDescription;
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const Any& _rElement) throw( IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException )
 {
     Reference< XPropertySet > xElementProps;
@@ -1131,7 +1131,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An
     implInsert( m_aItems.size(), xElementProps, sal_True, aElementMetaData.get(), sal_True );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any& Element) throw( IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException )
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -1159,7 +1159,7 @@ void SAL_CALL OInterfaceContainer::replaceByName(const OUString& Name, const Any
     implReplaceByIndex( nPos, Element, aGuard );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_rMutex );
@@ -1174,7 +1174,7 @@ void SAL_CALL OInterfaceContainer::removeByName(const OUString& Name) throw( NoS
 
 
 // XEventAttacherManager
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -1186,7 +1186,7 @@ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const
     }
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -1198,35 +1198,35 @@ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const
     }
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::revokeScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->revokeScriptEvents( nIndex );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::insertEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->insertEntry( nIndex );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->removeEntry( nIndex );
 }
 
-//------------------------------------------------------------------------
+
 Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException)
 {
     Sequence< ScriptEventDescriptor > aReturn;
@@ -1241,28 +1241,28 @@ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents(
     return aReturn;
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::attach( sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any& aHelper ) throw(IllegalArgumentException, ServiceNotRegisteredException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->attach( nIndex, xObject, aHelper );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::detach( sal_Int32 nIndex, const Reference< XInterface >& xObject ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->detach( nIndex, xObject );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::addScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
         m_xEventAttacher->addScriptListener( xListener );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScriptListener >& xListener ) throw(IllegalArgumentException, RuntimeException)
 {
     if ( m_xEventAttacher.is() )
@@ -1272,7 +1272,7 @@ void SAL_CALL OInterfaceContainer::removeScriptListener( const Reference< XScrip
 //==================================================================
 //= OFormComponents
 //==================================================================
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(RuntimeException)
 {
     Any aReturn = OFormComponents_BASE::queryInterface(_rType);
@@ -1287,13 +1287,13 @@ Any SAL_CALL OFormComponents::queryAggregation(const Type& _rType) throw(Runtime
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 Sequence<Type> SAL_CALL OFormComponents::getTypes() throw(RuntimeException)
 {
     return ::comphelper::concatSequences(OInterfaceContainer::getTypes(), FormComponentsBase::getTypes(), OFormComponents_BASE::getTypes());
 }
 
-//------------------------------------------------------------------------------
+
 OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory)
     :FormComponentsBase( m_aMutex )
     ,OInterfaceContainer( _rxFactory, m_aMutex, cppu::UnoType<XFormComponent>::get() )
@@ -1301,7 +1301,7 @@ OFormComponents::OFormComponents(const Reference<XComponentContext>& _rxFactory)
 {
 }
 
-//------------------------------------------------------------------------------
+
 OFormComponents::OFormComponents( const OFormComponents& _cloneSource )
     :FormComponentsBase( m_aMutex )
     ,OInterfaceContainer( m_aMutex, _cloneSource )
@@ -1309,7 +1309,7 @@ OFormComponents::OFormComponents( const OFormComponents& _cloneSource )
 {
 }
 
-//------------------------------------------------------------------------------
+
 OFormComponents::~OFormComponents()
 {
     if (!FormComponentsBase::rBHelper.bDisposed)
@@ -1320,7 +1320,7 @@ OFormComponents::~OFormComponents()
 }
 
 // OComponentHelper
-//------------------------------------------------------------------------------
+
 void OFormComponents::disposing()
 {
     OInterfaceContainer::disposing();
@@ -1329,14 +1329,14 @@ void OFormComponents::disposing()
 }
 
 //XChild
-//------------------------------------------------------------------------------
+
 void OFormComponents::setParent(const InterfaceRef& Parent) throw( NoSupportException, RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     m_xParent = Parent;
 }
 
-//------------------------------------------------------------------------------
+
 InterfaceRef OFormComponents::getParent() throw( RuntimeException )
 {
     return m_xParent;
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index 03b1f0eff145..a4a828529e73 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -38,20 +38,20 @@ namespace frm
     //====================================================================
     //= TypeBag
     //====================================================================
-    //--------------------------------------------------------------------
+
     TypeBag::TypeBag( const TypeSequence& _rTypes1 )
     {
         addTypes( _rTypes1 );
     }
 
-    //--------------------------------------------------------------------
+
     TypeBag::TypeBag( const TypeSequence& _rTypes1, const TypeSequence& _rTypes2 )
     {
         addTypes( _rTypes1 );
         addTypes( _rTypes2 );
     }
 
-    //--------------------------------------------------------------------
+
     TypeBag::TypeBag( const TypeSequence& _rTypes1, const TypeSequence& _rTypes2, const TypeSequence& _rTypes3 )
     {
         addTypes( _rTypes1 );
@@ -59,7 +59,7 @@ namespace frm
         addTypes( _rTypes3 );
     }
 
-    //--------------------------------------------------------------------
+
     void TypeBag::addTypes( const TypeSequence& _rTypes )
     {
         ::std::copy(
@@ -69,19 +69,19 @@ namespace frm
         );
     }
 
-    //--------------------------------------------------------------------
+
     void TypeBag::addType( const Type& i_rType )
     {
         m_aTypes.insert( i_rType );
     }
 
-    //--------------------------------------------------------------------
+
     void TypeBag::removeType( const TypeBag::Type& i_rType )
     {
         m_aTypes.erase( i_rType );
     }
 
-    //--------------------------------------------------------------------
+
     TypeBag::TypeSequence TypeBag::getTypes() const
     {
         TypeSequence aTypes( m_aTypes.size() );
diff --git a/forms/source/misc/limitedformats.cxx b/forms/source/misc/limitedformats.cxx
index 5f0d71ea166c..ffa75cfa1d1e 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -43,7 +43,7 @@ namespace frm
     //=====================================================================
     //=
     //=====================================================================
-    //---------------------------------------------------------------------
+
     enum LocaleType
     {
         ltEnglishUS,
@@ -51,7 +51,7 @@ namespace frm
         ltSystem
     };
 
-    //---------------------------------------------------------------------
+
     static const Locale& getLocale(LocaleType _eType)
     {
         static const Locale s_aEnglishUS( OUString("en"), OUString("us"), OUString() );
@@ -75,7 +75,7 @@ namespace frm
         return s_aSystem;
     }
 
-    //---------------------------------------------------------------------
+
     struct FormatEntry
     {
         const sal_Char* pDescription;
@@ -83,7 +83,7 @@ namespace frm
         LocaleType      eLocale;
     };
 
-    //---------------------------------------------------------------------
+
     static FormatEntry* lcl_getFormatTable(sal_Int16 nTableId)
     {
         switch (nTableId)
@@ -130,7 +130,7 @@ namespace frm
     //=====================================================================
     //= OLimitedFormats
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OLimitedFormats::OLimitedFormats(const Reference< XComponentContext >& _rxContext, const sal_Int16 _nClassId)
         :m_nFormatEnumPropertyHandle(-1)
         ,m_nTableId(_nClassId)
@@ -140,13 +140,13 @@ namespace frm
         ensureTableInitialized(m_nTableId);
     }
 
-    //---------------------------------------------------------------------
+
     OLimitedFormats::~OLimitedFormats()
     {
         releaseSupplier();
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::ensureTableInitialized(const sal_Int16 _nTableId)
     {
         FormatEntry* pFormatTable = lcl_getFormatTable(_nTableId);
@@ -200,7 +200,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::clearTable(const sal_Int16 _nTableId)
     {
         ::osl::MutexGuard aGuard(s_aMutex);
@@ -213,7 +213,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::setAggregateSet(const Reference< XFastPropertySet >& _rxAggregate, sal_Int32 _nOriginalPropertyHandle)
     {
         // changes (NULL -> not NULL) and (not NULL -> NULL) are allowed
@@ -237,7 +237,7 @@ namespace frm
 #endif
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::getFormatKeyPropertyValue( Any& _rValue ) const
     {
         _rValue.clear();
@@ -268,7 +268,7 @@ namespace frm
         // TODO: should use a standard format for the control type we're working for
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OLimitedFormats::convertFormatKeyPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rNewValue)
     {
         OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::convertFormatKeyPropertyValue: not initialized!");
@@ -340,7 +340,7 @@ namespace frm
         return sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::setFormatKeyPropertyValue( const Any& _rNewValue )
     {
         OSL_ENSURE(m_xAggregate.is() && (-1 != m_nFormatEnumPropertyHandle), "OLimitedFormats::setFormatKeyPropertyValue: not initialized!");
@@ -353,7 +353,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::acquireSupplier(const Reference< XComponentContext >& _rxContext)
     {
         ::osl::MutexGuard aGuard(s_aMutex);
@@ -363,7 +363,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OLimitedFormats::releaseSupplier()
     {
         ::osl::MutexGuard aGuard(s_aMutex);
diff --git a/forms/source/misc/listenercontainers.cxx b/forms/source/misc/listenercontainers.cxx
index 5c528737d33a..c6ff7fd32e45 100644
--- a/forms/source/misc/listenercontainers.cxx
+++ b/forms/source/misc/listenercontainers.cxx
@@ -31,7 +31,7 @@ namespace frm
     //====================================================================
     //= ResetListeners
     //====================================================================
-    //---------------------------------------------------------------------
+
     bool ResetListeners::implTypedNotify( const Reference< XResetListener >& _rxListener,
         const EventObject& _rEvent )   SAL_THROW( ( Exception ) )
     {
diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index cd5be3dc23e4..d042d2968858 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -35,7 +35,7 @@ namespace frm
 //= PropertyInfoService
 //==================================================================
 PropertyInfoService::PropertyMap PropertyInfoService::s_AllKnownProperties;
-//------------------------------------------------------------------
+
 sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
 {
     initialize();
@@ -57,13 +57,13 @@ sal_Int32 PropertyInfoService::getPropertyId(const OUString& _rName)
     return nHandle;
 }
 
-//------------------------------------------------------------------
+
 sal_Int32 ConcreteInfoService::getPreferredPropertyId(const OUString& _rName)
 {
     return PropertyInfoService::getPropertyId(_rName);
 }
 
-//------------------------------------------------------------------
+
 #define ADD_PROP_ASSIGNMENT(varname) \
     s_AllKnownProperties.push_back(PropertyAssignment(PROPERTY_##varname, PROPERTY_ID_##varname))
 //..................................................................
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index e071c634b833..fd29532e4b3b 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -27,14 +27,14 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 
-//---------------------------------------------------------------------------------------
+
 //.......................................................................................
 #define DECLARE_SERVICE_INFO(classImplName) \
     namespace frm { \
         extern ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> SAL_CALL classImplName##_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory) throw (::com::sun::star::uno::RuntimeException); \
     }
 
-//---------------------------------------------------------------------------------------
+
 DECLARE_SERVICE_INFO(OFixedTextModel)
 DECLARE_SERVICE_INFO(ORadioButtonModel)
 DECLARE_SERVICE_INFO(ORadioButtonControl)
@@ -89,7 +89,7 @@ namespace frm { \
 DECLARE_SERVICE_INFO(OFormsCollection)
 DECLARE_SERVICE_INFO(ImageProducer)
 
-//---------------------------------------------------------------------------------------
+
 
 static Sequence< OUString >                      s_aClassImplementationNames;
 static Sequence<Sequence< OUString > >   s_aClassServiceNames;
@@ -97,7 +97,7 @@ static Sequence<sal_Int64>                              s_aFactories;
     // need to use sal_Int64 instead of ComponentInstantiation, as ComponentInstantiation has no cppuType, so
     // it can't be used with sequences
 
-//---------------------------------------------------------------------------------------
+
 void registerClassInfo(
         OUString _rClassImplName,                                // the ImplName of the class
         const Sequence< OUString >& _rServiceNames,      // the services supported by this class
@@ -118,7 +118,7 @@ void registerClassInfo(
     s_aFactories.getArray()[nCurrentLength] = reinterpret_cast<sal_Int64>(_pCreateFunction);
 }
 
-//---------------------------------------------------------------------------------------
+
 //.......................................................................................
 #define REGISTER_CLASS_CORE(classImplName) \
     registerClassInfo( \
@@ -156,7 +156,7 @@ void registerClassInfo(
     aServices.getArray()[3] = service4; \
     REGISTER_CLASS_CORE(classImplName)
 
-//---------------------------------------------------------------------------------------
+
 void ensureClassInfos()
 {
     if (s_aClassImplementationNames.getLength())
@@ -166,7 +166,7 @@ void ensureClassInfos()
 
     // ========================================================================
     // = ControlModels
-    // ------------------------------------------------------------------------
+
     // - FixedText
     REGISTER_CLASS2(OFixedTextModel, FRM_COMPONENT_FIXEDTEXT, FRM_SUN_COMPONENT_FIXEDTEXT);
     // - Hidden
@@ -279,7 +279,7 @@ void ensureClassInfos()
 extern "C"
 {
 
-//---------------------------------------------------------------------------------------
+
 void SAL_CALL createRegistryInfo_ODatabaseForm();
 void SAL_CALL createRegistryInfo_OFilterControl();
 void SAL_CALL createRegistryInfo_OScrollBarModel();
@@ -291,7 +291,7 @@ void SAL_CALL createRegistryInfo_ORichTextControl();
 void SAL_CALL createRegistryInfo_CLibxml2XFormsExtension();
 void SAL_CALL createRegistryInfo_FormOperations();
 
-//---------------------------------------------------------------------------------------
+
 void SAL_CALL createRegistryInfo_FORMS()
 {
     static sal_Bool bInit = sal_False;
@@ -311,7 +311,7 @@ void SAL_CALL createRegistryInfo_FORMS()
     }
 }
 
-//---------------------------------------------------------------------------------------
+
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL frm_component_getFactory(const sal_Char* _pImplName, XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/)
 {
     if (!_pServiceManager || !_pImplName)
diff --git a/forms/source/resource/frm_resource.cxx b/forms/source/resource/frm_resource.cxx
index a2a92e173170..2942d905b7cd 100644
--- a/forms/source/resource/frm_resource.cxx
+++ b/forms/source/resource/frm_resource.cxx
@@ -24,7 +24,7 @@
 // ---- needed as long as we have no contexts for components ---
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-//---------------------------------------------------
+
 
 #include <svl/solar.hrc>
 
@@ -37,13 +37,13 @@ namespace frm
     //==================================================================
     SimpleResMgr* ResourceManager::m_pImpl = NULL;
 
-    //------------------------------------------------------------------
+
     ResourceManager::EnsureDelete::~EnsureDelete()
     {
         delete ResourceManager::m_pImpl;
     }
 
-    //------------------------------------------------------------------
+
     void ResourceManager::ensureImplExists()
     {
         if (m_pImpl)
@@ -58,7 +58,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     OUString ResourceManager::loadString(sal_uInt16 _nResId)
     {
         OUString sReturn;
diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx
index 5a2acfe146c0..b6aaa4665758 100644
--- a/forms/source/richtext/attributedispatcher.cxx
+++ b/forms/source/richtext/attributedispatcher.cxx
@@ -35,7 +35,7 @@ namespace frm
     //====================================================================
     //= OAttributeDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OAttributeDispatcher::OAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL,
             IMultiAttributeDispatcher* _pMasterDispatcher )
         :ORichTextFeatureDispatcher( _rView, _rURL )
@@ -45,21 +45,21 @@ namespace frm
         OSL_ENSURE( m_pMasterDispatcher, "OAttributeDispatcher::OAttributeDispatcher: invalid master dispatcher!" );
     }
 
-    //--------------------------------------------------------------------
+
     OAttributeDispatcher::~OAttributeDispatcher( )
     {
         acquire();
         dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void OAttributeDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify )
     {
         m_pMasterDispatcher = NULL;
         ORichTextFeatureDispatcher::disposing( _rClearBeforeNotify );
     }
 
-    //--------------------------------------------------------------------
+
     void OAttributeDispatcher::fillFeatureEventFromAttributeState( FeatureStateEvent& _rEvent, const AttributeState& _rState ) const
     {
         if ( _rState.eSimpleState == eChecked )
@@ -68,7 +68,7 @@ namespace frm
             _rEvent.State <<= (sal_Bool)sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     FeatureStateEvent OAttributeDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() );
@@ -83,7 +83,7 @@ namespace frm
         return aEvent;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -109,7 +109,7 @@ namespace frm
             m_pMasterDispatcher->executeAttribute( m_nAttributeId, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void OAttributeDispatcher::onAttributeStateChanged( AttributeId _nAttributeId, const AttributeState& /*_rState*/ )
     {
         OSL_ENSURE( _nAttributeId == m_nAttributeId, "OAttributeDispatcher::onAttributeStateChanged: wrong attribute!" );
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx
index 61881550647f..5f3d0fe6dd8a 100644
--- a/forms/source/richtext/clipboarddispatcher.cxx
+++ b/forms/source/richtext/clipboarddispatcher.cxx
@@ -60,7 +60,7 @@ namespace frm
     //====================================================================
     //= OClipboardDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OClipboardDispatcher::OClipboardDispatcher( EditView& _rView, ClipboardFunc _eFunc )
         :ORichTextFeatureDispatcher( _rView, createClipboardURL( _eFunc ) )
         ,m_eFunc( _eFunc )
@@ -68,7 +68,7 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OClipboardDispatcher::implIsEnabled( ) const
     {
         sal_Bool bEnabled = sal_False;
@@ -89,7 +89,7 @@ namespace frm
         return bEnabled;
     }
 
-    //--------------------------------------------------------------------
+
     FeatureStateEvent OClipboardDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() );
@@ -97,7 +97,7 @@ namespace frm
         return aEvent;
     }
 
-    //--------------------------------------------------------------------
+
     void OClipboardDispatcher::invalidateFeatureState_Broadcast()
     {
         sal_Bool bEnabled = implIsEnabled();
@@ -109,7 +109,7 @@ namespace frm
         ORichTextFeatureDispatcher::invalidateFeatureState_Broadcast();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OClipboardDispatcher::dispatch( const URL& /*_rURL*/, const Sequence< PropertyValue >& /*Arguments*/ ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -135,7 +135,7 @@ namespace frm
     //====================================================================
     //= OPasteClipboardDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OPasteClipboardDispatcher::OPasteClipboardDispatcher( EditView& _rView )
         :OClipboardDispatcher( _rView, ePaste )
         ,m_pClipListener( NULL )
@@ -150,7 +150,7 @@ namespace frm
         m_bPastePossible = ( aDataHelper.HasFormat( SOT_FORMAT_STRING ) || aDataHelper.HasFormat( SOT_FORMAT_RTF ) );
     }
 
-    //--------------------------------------------------------------------
+
     OPasteClipboardDispatcher::~OPasteClipboardDispatcher()
     {
         if ( !isDisposed() )
@@ -160,7 +160,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( OPasteClipboardDispatcher, OnClipboardChanged, TransferableDataHelper*, _pDataHelper )
     {
         OSL_ENSURE( _pDataHelper, "OPasteClipboardDispatcher::OnClipboardChanged: ooops!" );
@@ -172,7 +172,7 @@ namespace frm
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     void OPasteClipboardDispatcher::disposing( ::osl::ClearableMutexGuard& _rClearBeforeNotify )
     {
         OSL_ENSURE( getEditView() && getEditView()->GetWindow(), "OPasteClipboardDispatcher::disposing: EditView should not (yet) be disfunctional here!" );
@@ -184,7 +184,7 @@ namespace frm
         OClipboardDispatcher::disposing( _rClearBeforeNotify );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OPasteClipboardDispatcher::implIsEnabled( ) const
     {
         return m_bPastePossible && OClipboardDispatcher::implIsEnabled();
diff --git a/forms/source/richtext/featuredispatcher.cxx b/forms/source/richtext/featuredispatcher.cxx
index bc7d66af02a8..47fc1375d2f2 100644
--- a/forms/source/richtext/featuredispatcher.cxx
+++ b/forms/source/richtext/featuredispatcher.cxx
@@ -32,7 +32,7 @@ namespace frm
     //====================================================================
     //= ORichTextFeatureDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     ORichTextFeatureDispatcher::ORichTextFeatureDispatcher( EditView& _rView, const URL&  _rURL )
         :m_aFeatureURL( _rURL )
         ,m_aStatusListeners( m_aMutex )
@@ -41,7 +41,7 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     ORichTextFeatureDispatcher::~ORichTextFeatureDispatcher( )
     {
         if ( !m_bDisposed )
@@ -51,7 +51,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextFeatureDispatcher::dispose()
     {
         EventObject aEvent( *this );
@@ -62,13 +62,13 @@ namespace frm
         disposing( aGuard );
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextFeatureDispatcher::disposing( ::osl::ClearableMutexGuard& /*_rClearBeforeNotify*/ )
     {
         m_pEditView = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException)
     {
         OSL_ENSURE( !m_bDisposed, "ORichTextFeatureDispatcher::addStatusListener: already disposed!" );
@@ -84,19 +84,19 @@ namespace frm
             }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& /*_rURL*/ ) throw (RuntimeException)
     {
         m_aStatusListeners.removeInterface( _rxControl );
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextFeatureDispatcher::invalidate()
     {
         invalidateFeatureState_Broadcast();
     }
 
-    //--------------------------------------------------------------------
+
     FeatureStateEvent ORichTextFeatureDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent;
@@ -107,7 +107,7 @@ namespace frm
         return aEvent;
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextFeatureDispatcher::invalidateFeatureState_Broadcast()
     {
         FeatureStateEvent aEvent( buildStatusEvent() );
@@ -116,13 +116,13 @@ namespace frm
             doNotify( static_cast< XStatusListener* >( aIter.next() ), aEvent );
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextFeatureDispatcher::newStatusListener( const Reference< XStatusListener >& _rxListener )
     {
         doNotify( _rxListener, buildStatusEvent() );
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextFeatureDispatcher::doNotify( const Reference< XStatusListener >& _rxListener, const FeatureStateEvent& _rEvent ) const SAL_THROW(())
     {
         OSL_PRECOND( _rxListener.is(), "ORichTextFeatureDispatcher::doNotify: invalid listener!" );
diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx
index fd729b47201e..fb90c2a0330b 100644
--- a/forms/source/richtext/parametrizedattributedispatcher.cxx
+++ b/forms/source/richtext/parametrizedattributedispatcher.cxx
@@ -41,20 +41,20 @@ namespace frm
     //====================================================================
     //= OParametrizedAttributeDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OParametrizedAttributeDispatcher::OParametrizedAttributeDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher )
         :OAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher )
     {
     }
 
-    //--------------------------------------------------------------------
+
     OParametrizedAttributeDispatcher::~OParametrizedAttributeDispatcher()
     {
         acquire();
         dispose();
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         static SfxSlotId lcl_normalizeLatinScriptSlotId( SfxSlotId _nSlotId )
@@ -71,7 +71,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OParametrizedAttributeDispatcher::fillFeatureEventFromAttributeState( FeatureStateEvent& _rEvent, const AttributeState& _rState ) const
     {
         OSL_ENSURE( getEditView(), "OParametrizedAttributeDispatcher::notifyState: already disposed!" );
@@ -91,7 +91,7 @@ namespace frm
             OAttributeDispatcher::fillFeatureEventFromAttributeState( _rEvent, _rState );
     }
 
-    //--------------------------------------------------------------------
+
     const SfxPoolItem* OParametrizedAttributeDispatcher::convertDispatchArgsToItem( const Sequence< PropertyValue >& _rArguments )
     {
         // get the real slot id. This may differ from our attribute id: for instance, both
@@ -113,7 +113,7 @@ namespace frm
         return pArgument;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OParametrizedAttributeDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 80cae8b7f1ad..9a942ea66ed0 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -40,7 +40,7 @@
 #include <svl/itempool.hxx>
 #include <sfx2/msgpool.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ORichTextControl()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextControl > aAutoRegistration;
@@ -78,21 +78,21 @@ namespace frm
     //==================================================================
     // ORichTextControl
     //==================================================================
-    //------------------------------------------------------------------
+
     ORichTextControl::ORichTextControl()
         :UnoEditControl()
     {
     }
 
-    //------------------------------------------------------------------
+
     ORichTextControl::~ORichTextControl()
     {
     }
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextControl, UnoEditControl, ORichTextControl_Base )
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ORichTextControl::queryAggregation( const Type& _rType ) throw ( RuntimeException )
     {
         Any aReturn = UnoEditControl::queryAggregation( _rType );
@@ -103,7 +103,7 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------
+
     namespace
     {
         //..............................................................
@@ -173,7 +173,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ORichTextControl::createPeer( const Reference< XToolkit >& _rToolkit, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException )
     {
         sal_Bool bReallyActAsRichText = sal_False;
@@ -248,25 +248,25 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ORichTextControl::getImplementationName()  throw( RuntimeException )
     {
         return getImplementationName_Static();
     }
 
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames()  throw( RuntimeException )
     {
         return getSupportedServiceNames_Static();
     }
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ORichTextControl::getImplementationName_Static()
     {
         return OUString( "com.sun.star.comp.form.ORichTextControl" );
     }
 
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames_Static()
     {
         Sequence< OUString > aServices( 3 );
@@ -276,25 +276,25 @@ namespace frm
         return aServices;
     }
 
-    //------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL ORichTextControl::Create( const Reference< XMultiServiceFactory >& )
     {
         return *( new ORichTextControl() );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException)
     {
         FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException)
     {
         FORWARD_TO_PEER_1_RET( Sequence< Reference< XDispatch > >, XDispatchProvider, queryDispatches, _rRequests );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const
     {
         return UnoControl::requiresNewPeer( _rPropertyName ) || _rPropertyName.equals( PROPERTY_RICH_TEXT );
@@ -303,7 +303,7 @@ namespace frm
     //==================================================================
     // ORichTextPeer
     //==================================================================
-    //------------------------------------------------------------------
+
     ORichTextPeer* ORichTextPeer::Create( const Reference< XControlModel >& _rxModel, Window* _pParentWindow, WinBits _nStyle )
     {
         DBG_TESTSOLARMUTEX();
@@ -328,17 +328,17 @@ namespace frm
         return pPeer;
     }
 
-    //------------------------------------------------------------------
+
     ORichTextPeer::ORichTextPeer()
     {
     }
 
-    //------------------------------------------------------------------
+
     ORichTextPeer::~ORichTextPeer()
     {
     }
 
-    //------------------------------------------------------------------
+
     void ORichTextPeer::dispose( ) throw(RuntimeException)
     {
         {
@@ -364,7 +364,7 @@ namespace frm
         VCLXWindow::dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -391,7 +391,7 @@ namespace frm
         pControl->Draw( pTargetDevice, aPos, aSize, WINDOW_DRAW_NOCONTROLS );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue )
         throw (RuntimeException,
                std::exception)
@@ -455,13 +455,13 @@ namespace frm
             VCLXWindow::setProperty( _rPropertyName, _rValue );
     }
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( ORichTextPeer, VCLXWindow, ORichTextPeer_Base )
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextPeer, VCLXWindow, ORichTextPeer_Base )
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         static SfxSlotId lcl_translateConflictingSlot( SfxSlotId _nIDFromPool )
@@ -495,7 +495,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     ORichTextPeer::SingleAttributeDispatcher ORichTextPeer::implCreateDispatcher( SfxSlotId _nSlotId, const ::com::sun::star::util::URL& _rURL )
     {
         RichTextControl* pRichTextControl = static_cast< RichTextControl* >( GetWindow() );
@@ -638,7 +638,7 @@ namespace frm
         return xDispatcher;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         SfxSlotId lcl_getSlotFromUnoName( SfxSlotPool& _rSlotPool, const OUString& _rUnoSlotName )
@@ -664,7 +664,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDispatch > SAL_CALL ORichTextPeer::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& /*_rTargetFrameName*/, sal_Int32 /*_nSearchFlags*/ ) throw (RuntimeException)
     {
         Reference< XDispatch > xReturn;
@@ -701,7 +701,7 @@ namespace frm
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Reference< XDispatch > > SAL_CALL ORichTextPeer::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException)
     {
         Sequence< Reference< XDispatch > >  aReturn( _rRequests.getLength() );
@@ -716,7 +716,7 @@ namespace frm
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextPeer::onSelectionChanged( const ESelection& /*_rSelection*/ )
     {
         AttributeDispatchers::iterator aDispatcherPos = m_aDispatchers.find( SID_COPY );
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 98221cc4a61e..488df7c5c7ba 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -44,7 +44,7 @@ namespace frm
     //====================================================================
     //= RichTextEngine
     //====================================================================
-    //--------------------------------------------------------------------
+
     RichTextEngine* RichTextEngine::Create()
     {
         SolarMutexGuard g;
@@ -79,7 +79,7 @@ namespace frm
         return pReturn;
     }
 
-    //--------------------------------------------------------------------
+
     RichTextEngine* RichTextEngine::Clone()
     {
         RichTextEngine* pClone( NULL );
@@ -98,19 +98,19 @@ namespace frm
         return pClone;
     }
 
-    //--------------------------------------------------------------------
+
     RichTextEngine::RichTextEngine( SfxItemPool* _pPool )
         :EditEngine( _pPool )
         ,m_pEnginePool( _pPool )
     {
     }
 
-    //--------------------------------------------------------------------
+
     RichTextEngine::~RichTextEngine( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextEngine::registerEngineStatusListener( IEngineStatusListener* _pListener )
     {
         OSL_ENSURE( _pListener, "RichTextEngine::registerEngineStatusListener: invalid listener!" );
@@ -118,7 +118,7 @@ namespace frm
             m_aStatusListeners.push_back( _pListener );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextEngine::revokeEngineStatusListener( IEngineStatusListener* _pListener )
     {
         ::std::vector< IEngineStatusListener* >::iterator aPos = ::std::find_if(
@@ -131,7 +131,7 @@ namespace frm
             m_aStatusListeners.erase( aPos );
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( RichTextEngine, EditEngineStatusChanged, EditStatus*, _pStatus )
     {
         for ( ::std::vector< IEngineStatusListener* >::const_iterator aLoop = m_aStatusListeners.begin();
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index 8ae8f53c65bd..b81929e4e5b5 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -44,7 +44,7 @@ namespace frm
     //====================================================================
     //= RichTextControlImpl
     //====================================================================
-    //--------------------------------------------------------------------
+
     RichTextControlImpl::RichTextControlImpl( Control* _pAntiImpl, RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttrListener, ITextSelectionListener* _pSelectionListener )
         :m_pAntiImpl            ( _pAntiImpl          )
         ,m_pViewport            ( NULL                )
@@ -89,7 +89,7 @@ namespace frm
         m_pAntiImpl->SetBackground( Wallpaper( m_pAntiImpl->GetSettings().GetStyleSettings().GetFieldColor() ) );
     }
 
-    //--------------------------------------------------------------------
+
     RichTextControlImpl::~RichTextControlImpl( )
     {
         m_pEngine->RemoveView( m_pView );
@@ -101,7 +101,7 @@ namespace frm
         delete m_pScrollCorner;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::implUpdateAttribute( AttributeHandlerPool::const_iterator _pHandler )
     {
         if  (  ( _pHandler->first == SID_ATTR_CHAR_WEIGHT )
@@ -127,7 +127,7 @@ namespace frm
             implCheckUpdateCache( _pHandler->first, _pHandler->second->getState( m_pView->GetAttribs() ) );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::updateAttribute( AttributeId _nAttribute )
     {
         AttributeHandlerPool::const_iterator pHandler = m_aAttributeHandlers.find( _nAttribute );
@@ -135,7 +135,7 @@ namespace frm
             implUpdateAttribute( pHandler );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::updateAllAttributes( )
     {
         for (   AttributeHandlerPool::const_iterator pHandler = m_aAttributeHandlers.begin();
@@ -158,7 +158,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     AttributeState RichTextControlImpl::getAttributeState( AttributeId _nAttributeId ) const
     {
         StateCache::const_iterator aCachedStatePos = m_aLastKnownStates.find( _nAttributeId );
@@ -170,7 +170,7 @@ namespace frm
         return aCachedStatePos->second;
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControlImpl::executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rAttribs, AttributeId _nAttribute, const SfxPoolItem* _pArgument, ScriptType _nForScriptType )
     {
         // let's see whether we have a handler for this attribute
@@ -183,7 +183,7 @@ namespace frm
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener )
     {
         AttributeHandlerPool::const_iterator aHandlerPos = m_aAttributeHandlers.find( _nAttributeId  );
@@ -206,7 +206,7 @@ namespace frm
         updateAttribute( _nAttributeId );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::disableAttributeNotification( AttributeId _nAttributeId )
     {
         // forget the handler for this attribute
@@ -220,7 +220,7 @@ namespace frm
             m_aAttributeListeners.erase( aListenerPos );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::normalizeScriptDependentAttribute( SvxScriptSetItem& _rScriptSetItem )
     {
         _rScriptSetItem.GetItemSet().Put( m_pView->GetAttribs(), false );
@@ -238,7 +238,7 @@ namespace frm
             _rScriptSetItem.GetItemSet().InvalidateItem( nNormalizedWhichId );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::implCheckUpdateCache( AttributeId _nAttribute, const AttributeState& _rState )
     {
         StateCache::iterator aCachePos = m_aLastKnownStates.find( _nAttribute );
@@ -266,7 +266,7 @@ namespace frm
             m_pTextAttrListener->onAttributeStateChanged( _nAttribute, _rState );
     }
 
-    //--------------------------------------------------------------------
+
     ScriptType RichTextControlImpl::getSelectedScriptType() const
     {
         ScriptType nScript = m_pView->GetSelectedScriptType();
@@ -275,7 +275,7 @@ namespace frm
         return nScript;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::EditEngineStatusChanged( const EditStatus& _rStatus )
     {
         sal_uLong nStatusWord( _rStatus.GetStatusWord() );
@@ -314,28 +314,28 @@ namespace frm
             m_pVScroll->SetThumbPos( m_pView->GetVisArea().Top() );
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( RichTextControlImpl, OnInvalidateAllAttributes, void*, /*_pNotInterestedIn*/ )
     {
         updateAllAttributes();
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( RichTextControlImpl, OnHScroll, ScrollBar*, _pScrollbar )
     {
         m_pView->Scroll( -_pScrollbar->GetDelta(), 0, RGCHK_PAPERSZ1 );
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( RichTextControlImpl, OnVScroll, ScrollBar*, _pScrollbar )
     {
         m_pView->Scroll( 0, -_pScrollbar->GetDelta(), RGCHK_PAPERSZ1 );
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::ensureScrollbars()
     {
         bool bNeedVScroll = 0 != ( m_pAntiImpl->GetStyle() & WB_VSCROLL );
@@ -385,7 +385,7 @@ namespace frm
         layoutWindow();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::ensureLineBreakSetting()
     {
         if ( !windowHasAutomaticLineBreak() )
@@ -394,7 +394,7 @@ namespace frm
         layoutWindow();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::layoutWindow()
     {
         if ( !m_bHasEverBeenShown )
@@ -480,7 +480,7 @@ namespace frm
         updateScrollbars();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::updateScrollbars()
     {
         if ( m_pVScroll )
@@ -499,7 +499,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::notifyInitShow()
     {
         if ( !m_bHasEverBeenShown )
@@ -509,14 +509,14 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::notifyStyleChanged()
     {
         ensureScrollbars();
         ensureLineBreakSetting();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::notifyZoomChanged()
     {
         const Fraction& rZoom = m_pAntiImpl->GetZoom();
@@ -532,25 +532,25 @@ namespace frm
         layoutWindow();
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControlImpl::windowHasAutomaticLineBreak()
     {
         return ( m_pAntiImpl->GetStyle() & WB_WORDBREAK ) != 0;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::SetReadOnly( bool _bReadOnly )
     {
         m_pView->SetReadOnly( _bReadOnly );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControlImpl::IsReadOnly() const
     {
         return m_pView->IsReadOnly( );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         static void lcl_inflate( Rectangle& _rRect, long _nInflateX, long _nInflateY )
@@ -561,7 +561,7 @@ namespace frm
             _rRect.Bottom() += _nInflateY;
         }
     }
-    //--------------------------------------------------------------------
+
     long RichTextControlImpl::HandleCommand( const CommandEvent& _rEvent )
     {
         if (  ( _rEvent.GetCommand() == COMMAND_WHEEL )
@@ -575,7 +575,7 @@ namespace frm
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong /*_nFlags*/ )
     {
         // need to normalize the map mode of the device - every paint operation on any device needs
@@ -635,13 +635,13 @@ namespace frm
         _pDev->Pop();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::SetBackgroundColor( )
     {
         SetBackgroundColor( Application::GetSettings().GetStyleSettings().GetFieldColor() );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::SetBackgroundColor( const Color& _rColor )
     {
         Wallpaper aWallpaper( _rColor );
@@ -649,13 +649,13 @@ namespace frm
         m_pViewport->SetBackground( aWallpaper );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControlImpl::SetHideInactiveSelection( bool _bHide )
     {
         m_pViewport->SetHideInactiveSelection( _bHide );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControlImpl::GetHideInactiveSelection() const
     {
         return m_pViewport->GetHideInactiveSelection( );
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 25134d69ab74..50ccfa8ef0db 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -33,7 +33,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ORichTextModel()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::ORichTextModel >   aRegisterModel;
@@ -58,7 +58,7 @@ namespace frm
     //====================================================================
     //= ORichTextModel
     //====================================================================
-    //--------------------------------------------------------------------
+
     ORichTextModel::ORichTextModel( const Reference< XComponentContext >& _rxFactory )
         :OControlModel       ( _rxFactory, OUString() )
         ,FontControlModel    ( true                          )
@@ -90,7 +90,7 @@ namespace frm
         implInit();
     }
 
-    //------------------------------------------------------------------
+
     ORichTextModel::ORichTextModel( const ORichTextModel* _pOriginal, const Reference< XComponentContext >& _rxFactory )
         :OControlModel       ( _pOriginal, _rxFactory, sal_False )
         ,FontControlModel    ( _pOriginal                        )
@@ -131,7 +131,7 @@ namespace frm
         implInit();
     }
 
-    //------------------------------------------------------------------
+
     void ORichTextModel::implInit()
     {
         OSL_ENSURE( m_pEngine.get(), "ORichTextModel::implInit: where's the engine?" );
@@ -152,7 +152,7 @@ namespace frm
         implRegisterProperties();
     }
 
-    //------------------------------------------------------------------
+
     void ORichTextModel::implDoAggregation()
     {
         increment( m_refCount );
@@ -166,7 +166,7 @@ namespace frm
         decrement( m_refCount );
     }
 
-    //------------------------------------------------------------------
+
     void ORichTextModel::implRegisterProperties()
     {
         REGISTER_PROP_2( DEFAULTCONTROL,        m_sDefaultControl,          BOUND, MAYBEDEFAULT );
@@ -202,7 +202,7 @@ namespace frm
         REGISTER_VOID_PROP_2( ALIGN,        m_aAlign,           sal_Int16, BOUND, MAYBEDEFAULT );
     }
 
-    //--------------------------------------------------------------------
+
     ORichTextModel::~ORichTextModel( )
     {
         if ( !OComponentHelper::rBHelper.bDisposed )
@@ -221,7 +221,7 @@ namespace frm
 
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ORichTextModel::queryAggregation( const Type& _rType ) throw ( RuntimeException )
     {
         Any aReturn = ORichTextModel_BASE::queryInterface( _rType );
@@ -232,10 +232,10 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORichTextModel, OControlModel, ORichTextModel_BASE )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_SERVICE_REGISTRATION_8( ORichTextModel, OControlModel,
         FRM_SUN_COMPONENT_RICHTEXTCONTROL,
         OUString( "com.sun.star.text.TextRange" ),
@@ -247,17 +247,17 @@ namespace frm
         OUString( "com.sun.star.style.ParagraphPropertiesComplex" )
     )
 
-    //------------------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_CLONING( ORichTextModel )
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::disposing()
     {
         m_aModifyListeners.disposeAndClear( EventObject( *this ) );
         OControlModel::disposing();
     }
 
-    //------------------------------------------------------------------------------
+
     namespace
     {
         void lcl_removeProperty( Sequence< Property >& _rSeq, const OUString& _rPropertyName )
@@ -276,7 +276,7 @@ namespace frm
             }
         }
     }
-    //------------------------------------------------------------------------------
+
     void ORichTextModel::describeFixedProperties( Sequence< Property >& _rProps ) const
     {
         BEGIN_DESCRIBE_PROPERTIES( 1, OControlModel )
@@ -294,7 +294,7 @@ namespace frm
         _rProps = concatSequences( aContainedProperties, aFontProperties, _rProps );
     }
 
-    //------------------------------------------------------------------------------
+
     void ORichTextModel::describeAggregateProperties( Sequence< Property >& _rAggregateProps ) const
     {
         OControlModel::describeAggregateProperties( _rAggregateProps );
@@ -309,7 +309,7 @@ namespace frm
         lcl_removeProperty( _rAggregateProps, PROPERTY_WRITING_MODE );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         if ( isRegisteredProperty( _nHandle ) )
@@ -326,7 +326,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ORichTextModel::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw( IllegalArgumentException )
     {
         sal_Bool bModified = sal_False;
@@ -347,7 +347,7 @@ namespace frm
         return bModified;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception)
     {
         if ( isRegisteredProperty( _nHandle ) )
@@ -411,7 +411,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any ORichTextModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
     {
         Any aDefault;
@@ -480,7 +480,7 @@ namespace frm
         return aDefault;
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextModel::impl_smlock_setEngineText( const OUString& _rText )
     {
         if ( m_pEngine.get() )
@@ -492,27 +492,27 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL ORichTextModel::getServiceName() throw ( RuntimeException)
     {
         return OUString(FRM_SUN_COMPONENT_RICHTEXTCONTROL);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::write(const Reference< XObjectOutputStream >& _rxOutStream) throw ( IOException, RuntimeException)
     {
         OControlModel::write( _rxOutStream );
         // TODO: place your code here
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::read(const Reference< XObjectInputStream >& _rxInStream) throw ( IOException, RuntimeException)
     {
         OControlModel::read( _rxInStream );
         // TODO: place your code here
     }
 
-    //--------------------------------------------------------------------
+
     RichTextEngine* ORichTextModel::getEditEngine( const Reference< XControlModel >& _rxModel )
     {
         RichTextEngine* pEngine = NULL;
@@ -533,7 +533,7 @@ namespace frm
         return pEngine;
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< sal_Int8 > ORichTextModel::getEditEngineTunnelId()
     {
         static ::cppu::OImplementationId * pId = 0;
@@ -549,7 +549,7 @@ namespace frm
         return pId->getImplementationId();
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( ORichTextModel, OnEngineContentModified, void*, /*_pNotInterestedIn*/ )
     {
         if ( !m_bSettingEngineText )
@@ -566,7 +566,7 @@ namespace frm
         return 0L;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int64 SAL_CALL ORichTextModel::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException)
     {
         Sequence< sal_Int8 > aEditEngineAccessId( getEditEngineTunnelId() );
@@ -582,19 +582,19 @@ namespace frm
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException)
     {
         m_aModifyListeners.addInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ORichTextModel::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException)
     {
         m_aModifyListeners.removeInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ORichTextModel::potentialTextChange( )
     {
         OUString sCurrentEngineText;
diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx
index 4415f15f4dcc..c091d28fd2eb 100644
--- a/forms/source/richtext/richtextunowrapper.cxx
+++ b/forms/source/richtext/richtextunowrapper.cxx
@@ -61,14 +61,14 @@ namespace frm
     //====================================================================
     //= ORichTextUnoWrapper
     //====================================================================
-    //--------------------------------------------------------------------
+
     ORichTextUnoWrapper::ORichTextUnoWrapper( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener )
         :SvxUnoText( getTextEnginePropertySet() )
     {
         SetEditSource( new RichTextEditSource( _rEngine, _pTextChangeListener ) );
     }
 
-    //--------------------------------------------------------------------
+
     ORichTextUnoWrapper::~ORichTextUnoWrapper() throw()
     {
     }
@@ -76,7 +76,7 @@ namespace frm
     //====================================================================
     //= RichTextEditSource
     //====================================================================
-    //--------------------------------------------------------------------
+
     RichTextEditSource::RichTextEditSource( EditEngine& _rEngine, IEngineTextChangeListener* _pTextChangeListener )
         :m_rEngine              ( _rEngine                               )
         ,m_pTextForwarder       ( new SvxEditEngineForwarder( _rEngine ) )
@@ -84,25 +84,25 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     RichTextEditSource::~RichTextEditSource()
     {
         delete m_pTextForwarder;
     }
 
-    //--------------------------------------------------------------------
+
     SvxEditSource* RichTextEditSource::Clone() const
     {
         return new RichTextEditSource( m_rEngine, m_pTextChangeListener );
     }
 
-    //--------------------------------------------------------------------
+
     SvxTextForwarder* RichTextEditSource::GetTextForwarder()
     {
         return m_pTextForwarder;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextEditSource::UpdateData()
     {
         // this means that the content of the EditEngine changed via the UNO API
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index 2367e51bdb85..fdd967bd618c 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -48,7 +48,7 @@ namespace frm
     //====================================================================
     //= RichTextControl
     //====================================================================
-    //--------------------------------------------------------------------
+
     RichTextControl::RichTextControl( RichTextEngine* _pEngine, Window* _pParent, WinBits _nStyle,
         ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener )
         :Control( _pParent, implInitStyle( _nStyle ) )
@@ -57,26 +57,26 @@ namespace frm
         implInit( _pEngine, _pTextAttribListener, _pSelectionListener );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::implInit( RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener )
     {
         m_pImpl = new RichTextControlImpl( this, _pEngine, _pTextAttribListener, _pSelectionListener );
         SetCompoundControl( true );
     }
 
-    //--------------------------------------------------------------------
+
     RichTextControl::~RichTextControl( )
     {
         delete m_pImpl;
     }
 
-    //--------------------------------------------------------------------
+
     AttributeState RichTextControl::getState( AttributeId _nAttributeId ) const
     {
         return m_pImpl->getAttributeState( _nAttributeId );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::executeAttribute( AttributeId _nAttributeId, const SfxPoolItem* _pArgument )
     {
         SfxItemSet aToApplyAttributes( getView().GetEmptyItemSet() );
@@ -89,7 +89,7 @@ namespace frm
         applyAttributes( aToApplyAttributes );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::applyAttributes( const SfxItemSet& _rAttributesToApply )
     {
         // apply
@@ -112,19 +112,19 @@ namespace frm
             // (the handler for the just executed attribute should know)
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::enableAttributeNotification( AttributeId _nAttributeId, ITextAttributeListener* _pListener )
     {
         m_pImpl->enableAttributeNotification( _nAttributeId, _pListener );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::disableAttributeNotification( AttributeId _nAttributeId )
     {
         m_pImpl->disableAttributeNotification( _nAttributeId );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControl::isMappableSlot( SfxSlotId _nSlotId )
     {
         switch ( _nSlotId )
@@ -152,20 +152,20 @@ namespace frm
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::Resize()
     {
         m_pImpl->layoutWindow();
         Invalidate();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::GetFocus()
     {
         getViewport().GrabFocus();
     }
 
-    //--------------------------------------------------------------------
+
     WinBits RichTextControl::implInitStyle( WinBits nStyle )
     {
         if ( !( nStyle & WB_NOTABSTOP ) )
@@ -173,7 +173,7 @@ namespace frm
         return nStyle;
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::StateChanged( StateChangedType _nStateChange )
     {
         if ( _nStateChange == STATE_CHANGE_STYLE )
@@ -192,7 +192,7 @@ namespace frm
         Control::StateChanged( _nStateChange );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControl::PreNotify( NotifyEvent& _rNEvt )
     {
         if ( IsWindowOrChild( _rNEvt.GetWindow() ) )
@@ -285,7 +285,7 @@ namespace frm
         return Control::PreNotify( _rNEvt );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControl::Notify( NotifyEvent& _rNEvt )
     {
         bool nDone = false;
@@ -297,67 +297,67 @@ namespace frm
         return nDone || Control::Notify( _rNEvt );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags )
     {
         m_pImpl->Draw( _pDev, _rPos, _rSize, _nFlags );
     }
 
-    //--------------------------------------------------------------------
+
     EditView& RichTextControl::getView()
     {
         return *m_pImpl->getView( RichTextControlImpl::GrantAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     const EditView& RichTextControl::getView() const
     {
         return *m_pImpl->getView( RichTextControlImpl::GrantAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     EditEngine& RichTextControl::getEngine() const
     {
         return *m_pImpl->getEngine( RichTextControlImpl::GrantAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     Window& RichTextControl::getViewport() const
     {
         return *m_pImpl->getViewport( RichTextControlImpl::GrantAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::SetReadOnly( bool _bReadOnly )
     {
         m_pImpl->SetReadOnly( _bReadOnly );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControl::IsReadOnly() const
     {
         return m_pImpl->IsReadOnly();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::SetBackgroundColor( )
     {
         m_pImpl->SetBackgroundColor( );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::SetBackgroundColor( const Color& _rColor )
     {
         m_pImpl->SetBackgroundColor( _rColor );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextControl::SetHideInactiveSelection( bool _bHide )
     {
         m_pImpl->SetHideInactiveSelection( _bHide );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextControl::GetHideInactiveSelection() const
     {
         return m_pImpl->GetHideInactiveSelection( );
diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx
index a3f69c430d86..26077b52d48a 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -28,7 +28,7 @@ namespace frm
     //====================================================================
     //= RichTextViewPort
     //====================================================================
-    //--------------------------------------------------------------------
+
     RichTextViewPort::RichTextViewPort( Window* _pParent )
         :Control ( _pParent )
         ,m_pView(NULL)
@@ -36,20 +36,20 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::setView( EditView& _rView )
     {
         m_pView = &_rView;
         SetPointer( _rView.GetPointer() );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::Paint( const Rectangle& _rRect )
     {
         m_pView->Paint( _rRect );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::GetFocus()
     {
         Control::GetFocus();
@@ -57,7 +57,7 @@ namespace frm
         m_pView->ShowCursor( true );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::LoseFocus()
     {
         m_pView->HideCursor();
@@ -65,7 +65,7 @@ namespace frm
         Control::LoseFocus();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::KeyInput( const KeyEvent& _rKEvt )
     {
         if ( !m_pView->PostKeyEvent( _rKEvt ) )
@@ -74,14 +74,14 @@ namespace frm
             implInvalidateAttributes();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::MouseMove( const MouseEvent& _rMEvt )
     {
         Control::MouseMove( _rMEvt );
         m_pView->MouseMove( _rMEvt );
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::MouseButtonDown( const MouseEvent& _rMEvt )
     {
         Control::MouseButtonDown( _rMEvt );
@@ -89,7 +89,7 @@ namespace frm
         GrabFocus();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::MouseButtonUp( const MouseEvent& _rMEvt )
     {
         Control::MouseButtonUp( _rMEvt );
@@ -97,7 +97,7 @@ namespace frm
         implInvalidateAttributes();
     }
 
-    //--------------------------------------------------------------------
+
     void RichTextViewPort::SetHideInactiveSelection( bool _bHide )
     {
         if ( m_bHideInactiveSelection == _bHide )
@@ -107,7 +107,7 @@ namespace frm
             m_pView->SetSelectionMode( m_bHideInactiveSelection ? EE_SELMODE_HIDDEN : EE_SELMODE_STD );
     }
 
-    //--------------------------------------------------------------------
+
     bool RichTextViewPort::GetHideInactiveSelection() const
     {
         return m_bHideInactiveSelection;
diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx
index a1b918d65b3f..d46891693eb3 100644
--- a/forms/source/richtext/rtattributehandler.cxx
+++ b/forms/source/richtext/rtattributehandler.cxx
@@ -42,19 +42,19 @@ namespace frm
     //====================================================================
     //= ReferenceBase
     //====================================================================
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ReferenceBase::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL ReferenceBase::release()
     {
         return osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     ReferenceBase::~ReferenceBase()
     {
     }
@@ -62,44 +62,44 @@ namespace frm
     //====================================================================
     //= AttributeHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     AttributeHandler::AttributeHandler( AttributeId _nAttributeId, WhichId _nWhichId )
         :m_nAttribute( _nAttributeId )
         ,m_nWhich    ( _nWhichId     )
     {
     }
 
-    //--------------------------------------------------------------------
+
     AttributeHandler::~AttributeHandler()
     {
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AttributeHandler::acquire()
     {
         return ReferenceBase::acquire();
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AttributeHandler::release()
     {
         return ReferenceBase::release();
     }
 
-    //--------------------------------------------------------------------
+
     AttributeId AttributeHandler::getAttributeId( ) const
     {
         return getAttribute();
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState AttributeHandler::implGetCheckState( const SfxPoolItem& /*_rItem*/ ) const
     {
         OSL_FAIL( "AttributeHandler::implGetCheckState: not to be called!" );
         return eIndetermined;
     }
 
-    //--------------------------------------------------------------------
+
     void AttributeHandler::putItemForScript( SfxItemSet& _rAttribs, const SfxPoolItem& _rItem, ScriptType _nForScriptType ) const
     {
         SvxScriptSetItem aSetItem( (WhichId)getAttributeId(), *_rAttribs.GetPool() );
@@ -107,7 +107,7 @@ namespace frm
         _rAttribs.Put( aSetItem.GetItemSet(), false );
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState AttributeHandler::getCheckState( const SfxItemSet& _rAttribs ) const
     {
         AttributeCheckState eSimpleState( eIndetermined );
@@ -117,7 +117,7 @@ namespace frm
         return eSimpleState;
     }
 
-    //--------------------------------------------------------------------
+
     AttributeState AttributeHandler::getState( const SfxItemSet& _rAttribs ) const
     {
         AttributeState aState( eIndetermined );
@@ -128,7 +128,7 @@ namespace frm
     //====================================================================
     //= AttributeHandlerFactory
     //====================================================================
-    //--------------------------------------------------------------------
+
     namespace
     {
         static WhichId lcl_implGetWhich( const SfxItemPool& _rPool, AttributeId _nAttributeId )
@@ -148,7 +148,7 @@ namespace frm
             return nWhich;
         }
     }
-    //--------------------------------------------------------------------
+
     ::rtl::Reference< IAttributeHandler > AttributeHandlerFactory::getHandlerFor( AttributeId _nAttributeId, const SfxItemPool& _rEditEnginePool )
     {
         ::rtl::Reference< IAttributeHandler > pReturn;
@@ -202,7 +202,7 @@ namespace frm
     //====================================================================
     //= ParaAlignmentHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     ParaAlignmentHandler::ParaAlignmentHandler( AttributeId _nAttributeId )
         :AttributeHandler( _nAttributeId, EE_PARA_JUST )
         ,m_eAdjust( SVX_ADJUST_CENTER )
@@ -219,7 +219,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState ParaAlignmentHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
     {
         OSL_ENSURE( _rItem.ISA( SvxAdjustItem ), "ParaAlignmentHandler::implGetCheckState: invalid pool item!" );
@@ -227,7 +227,7 @@ namespace frm
         return ( eAdjust == m_eAdjust ) ? eChecked : eUnchecked;
     }
 
-    //--------------------------------------------------------------------
+
     void ParaAlignmentHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const
     {
         OSL_ENSURE( !_pAdditionalArg, "ParaAlignmentHandler::executeAttribute: this is a simple toggle attribute - no args possible!" );
@@ -238,7 +238,7 @@ namespace frm
     //====================================================================
     //= LineSpacingHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     LineSpacingHandler::LineSpacingHandler( AttributeId _nAttributeId )
         :AttributeHandler( _nAttributeId, EE_PARA_SBL )
         ,m_nLineSpace( 100 )
@@ -254,7 +254,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState LineSpacingHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
     {
         OSL_ENSURE( _rItem.ISA( SvxLineSpacingItem ), "LineSpacingHandler::implGetCheckState: invalid pool item!" );
@@ -262,7 +262,7 @@ namespace frm
         return ( nLineSpace == m_nLineSpace ) ? eChecked : eUnchecked;
     }
 
-    //--------------------------------------------------------------------
+
     void LineSpacingHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const
     {
         OSL_ENSURE( !_pAdditionalArg, "LineSpacingHandler::executeAttribute: this is a simple toggle attribute - no args possible!" );
@@ -281,7 +281,7 @@ namespace frm
     //====================================================================
     //= EscapementHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     EscapementHandler::EscapementHandler( AttributeId _nAttributeId )
         :AttributeHandler( _nAttributeId, EE_CHAR_ESCAPEMENT )
         ,m_eEscapement( SVX_ESCAPEMENT_OFF )
@@ -296,7 +296,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState EscapementHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
     {
         OSL_ENSURE( _rItem.ISA( SvxEscapementItem ), "EscapementHandler::getState: invalid pool item!" );
@@ -304,7 +304,7 @@ namespace frm
         return ( eEscapement == m_eEscapement ) ? eChecked : eUnchecked;
     }
 
-    //--------------------------------------------------------------------
+
     void EscapementHandler::executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const
     {
         OSL_ENSURE( !_pAdditionalArg, "EscapementHandler::executeAttribute: this is a simple toggle attribute - no args possible!" );
@@ -318,7 +318,7 @@ namespace frm
     //====================================================================
     //= SlotHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     SlotHandler::SlotHandler( AttributeId _nAttributeId, WhichId _nWhichId )
         :AttributeHandler( _nAttributeId, _nWhichId )
         ,m_bScriptDependent( false )
@@ -328,7 +328,7 @@ namespace frm
                          ||  ( SID_ATTR_CHAR_FONT == _nAttributeId );
     }
 
-    //--------------------------------------------------------------------
+
     AttributeState SlotHandler::getState( const SfxItemSet& _rAttribs ) const
     {
         AttributeState aState( eIndetermined );
@@ -340,7 +340,7 @@ namespace frm
         return aState;
     }
 
-    //--------------------------------------------------------------------
+
     void SlotHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const
     {
         if ( _pAdditionalArg )
@@ -361,7 +361,7 @@ namespace frm
     //====================================================================
     //= FontSizeHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     FontSizeHandler::FontSizeHandler( AttributeId _nAttributeId, WhichId _nWhichId )
         :AttributeHandler( _nAttributeId, _nWhichId )
     {
@@ -370,7 +370,7 @@ namespace frm
             "FontSizeHandler::FontSizeHandler: invalid attribute id!" );
     }
 
-    //--------------------------------------------------------------------
+
     AttributeState FontSizeHandler::getState( const SfxItemSet& _rAttribs ) const
     {
         AttributeState aState( eIndetermined );
@@ -399,7 +399,7 @@ namespace frm
         return aState;
     }
 
-    //--------------------------------------------------------------------
+
     void FontSizeHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType _nForScriptType ) const
     {
         const SvxFontHeightItem* pFontHeightItem = PTR_CAST( SvxFontHeightItem, _pAdditionalArg );
@@ -432,7 +432,7 @@ namespace frm
     //====================================================================
     //= ParagraphDirectionHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     ParagraphDirectionHandler::ParagraphDirectionHandler( AttributeId _nAttributeId )
         :AttributeHandler( _nAttributeId, EE_PARA_WRITINGDIR )
         ,m_eParagraphDirection( FRMDIR_HORI_LEFT_TOP )
@@ -453,7 +453,7 @@ namespace frm
             m_eOppositeDefaultAdjustment = SVX_ADJUST_RIGHT;
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState ParagraphDirectionHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
     {
         OSL_ENSURE( _rItem.ISA( SvxFrameDirectionItem ), "ParagraphDirectionHandler::implGetCheckState: invalid pool item!" );
@@ -461,7 +461,7 @@ namespace frm
         return ( eDirection == m_eParagraphDirection ) ? eChecked : eUnchecked;
     }
 
-    //--------------------------------------------------------------------
+
     void ParagraphDirectionHandler::executeAttribute( const SfxItemSet& _rCurrentAttribs, SfxItemSet& _rNewAttribs, const SfxPoolItem* /*_pAdditionalArg*/, ScriptType /*_nForScriptType*/ ) const
     {
         _rNewAttribs.Put( SvxFrameDirectionItem( m_eParagraphDirection, getWhich() ) );
@@ -480,13 +480,13 @@ namespace frm
     //====================================================================
     //= BooleanHandler
     //====================================================================
-    //--------------------------------------------------------------------
+
     BooleanHandler::BooleanHandler( AttributeId _nAttributeId, WhichId _nWhichId )
         :AttributeHandler( _nAttributeId, _nWhichId )
     {
     }
 
-    //--------------------------------------------------------------------
+
     AttributeCheckState BooleanHandler::implGetCheckState( const SfxPoolItem& _rItem ) const
     {
         OSL_ENSURE( _rItem.ISA( SfxBoolItem ), "BooleanHandler::implGetCheckState: invalid item!" );
@@ -496,7 +496,7 @@ namespace frm
         return eIndetermined;
     }
 
-    //--------------------------------------------------------------------
+
     void BooleanHandler::executeAttribute( const SfxItemSet& /*_rCurrentAttribs*/, SfxItemSet& _rNewAttribs, const SfxPoolItem* _pAdditionalArg, ScriptType /*_nForScriptType*/ ) const
     {
         OSL_ENSURE( _pAdditionalArg && _pAdditionalArg->ISA( SfxBoolItem ), "BooleanHandler::executeAttribute: invalid argument!" );
diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx
index 0fa4212e3e3e..f9eaa1a64952 100644
--- a/forms/source/richtext/specialdispatchers.cxx
+++ b/forms/source/richtext/specialdispatchers.cxx
@@ -37,13 +37,13 @@ namespace frm
     //====================================================================
     //= OSelectAllDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OSelectAllDispatcher::OSelectAllDispatcher( EditView& _rView, const URL&  _rURL )
         :ORichTextFeatureDispatcher( _rView, _rURL )
     {
     }
 
-    //--------------------------------------------------------------------
+
     OSelectAllDispatcher::~OSelectAllDispatcher( )
     {
         if ( !isDisposed() )
@@ -53,7 +53,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OSelectAllDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ )
         throw (RuntimeException,
                std::exception)
@@ -78,7 +78,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     FeatureStateEvent OSelectAllDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() );
@@ -89,14 +89,14 @@ namespace frm
     //====================================================================
     //= OParagraphDirectionDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OParagraphDirectionDispatcher::OParagraphDirectionDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL,
             IMultiAttributeDispatcher* _pMasterDispatcher )
         :OAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher )
     {
     }
 
-    //--------------------------------------------------------------------
+
     FeatureStateEvent OParagraphDirectionDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent( OAttributeDispatcher::buildStatusEvent() );
@@ -112,13 +112,13 @@ namespace frm
     //====================================================================
     //= OTextDirectionDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OTextDirectionDispatcher::OTextDirectionDispatcher( EditView& _rView, const URL& _rURL )
         :ORichTextFeatureDispatcher( _rView, _rURL )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OTextDirectionDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& /*_rArguments*/ ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -135,7 +135,7 @@ namespace frm
         pEngine->SetVertical( !pEngine->IsVertical() );
     }
 
-    //--------------------------------------------------------------------
+
     FeatureStateEvent OTextDirectionDispatcher::buildStatusEvent() const
     {
         FeatureStateEvent aEvent( ORichTextFeatureDispatcher::buildStatusEvent() );
@@ -152,13 +152,13 @@ namespace frm
     //====================================================================
     //= OAsianFontLayoutDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OAsianFontLayoutDispatcher::OAsianFontLayoutDispatcher( EditView& _rView, AttributeId _nAttributeId, const URL& _rURL, IMultiAttributeDispatcher* _pMasterDispatcher )
         :OParametrizedAttributeDispatcher( _rView, _nAttributeId, _rURL, _pMasterDispatcher )
     {
     }
 
-    //--------------------------------------------------------------------
+
     const SfxPoolItem* OAsianFontLayoutDispatcher::convertDispatchArgsToItem( const Sequence< PropertyValue >& _rArguments )
     {
         // look for the "Enable" parameter
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 5cdeddf46202..c9d03bf52d3a 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -61,7 +61,7 @@
 #include <osl/mutex.hxx>
 #include <sal/macros.h>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_FormOperations()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::FormOperations > aAutoRegistration;
@@ -124,7 +124,7 @@ namespace frm
     //====================================================================
     //= FormOperations
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormOperations::FormOperations( const Reference< XComponentContext >& _rxContext )
         :FormOperations_Base( m_aMutex )
         ,m_xContext( _rxContext )
@@ -137,18 +137,18 @@ namespace frm
     {
     }
 
-    //--------------------------------------------------------------------
+
     FormOperations::~FormOperations()
     {
     }
 
-    //--------------------------------------------------------------------
+
     OUString FormOperations::getImplementationName_Static(  ) throw(RuntimeException)
     {
         return OUString( "com.sun.star.comp.forms.FormOperations" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > FormOperations::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aNames(1);
@@ -156,13 +156,13 @@ namespace frm
         return aNames;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL FormOperations::Create(const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return *new FormOperations( comphelper::getComponentContext(_rxFactory) );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         if ( m_bConstructed )
@@ -211,28 +211,28 @@ namespace frm
         return m_xUpdateCursor;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XFormController > SAL_CALL FormOperations::getController() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_xController;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XFeatureInvalidation > SAL_CALL FormOperations::getFeatureInvalidation() throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         return m_xFeatureInvalidation;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::setFeatureInvalidation( const Reference< XFeatureInvalidation > & _rxFeatureInvalidation ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
         m_xFeatureInvalidation = _rxFeatureInvalidation;
     }
 
-    //--------------------------------------------------------------------
+
     FeatureState SAL_CALL FormOperations::getState( ::sal_Int16 _nFeature ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -415,7 +415,7 @@ namespace frm
         return aState;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL FormOperations::isEnabled( ::sal_Int16 _nFeature ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -424,7 +424,7 @@ namespace frm
         return aState.Enabled;
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         static bool lcl_needConfirmCommit( sal_Int32 _nFeature )
@@ -569,7 +569,7 @@ namespace frm
             return true;
         }
     }
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException)
     {
         SolarMutexGuard aSolarGuard;
@@ -828,7 +828,7 @@ namespace frm
         impl_invalidateAllSupportedFeatures_nothrow( aGuard );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::executeWithArguments( ::sal_Int16 _nFeature, const Sequence< NamedValue >& _rArguments ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException)
     {
         if ( !lcl_requiresArguments( _nFeature ) )
@@ -885,7 +885,7 @@ namespace frm
         }   // switch
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL FormOperations::commitCurrentRecord( ::sal_Bool& _out_rRecordInserted ) throw (RuntimeException, SQLException)
     {
         MethodGuard aGuard( *this );
@@ -894,7 +894,7 @@ namespace frm
         return impl_commitCurrentRecord_throw( &_out_rRecordInserted );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_commitCurrentRecord_throw( ::sal_Bool* _pRecordInserted ) const
     {
         DBG_ASSERT( m_nMethodNestingLevel, "FormOperations::impl_commitCurrentRecord_throw: to be called within a MethodGuard'ed section only!" );
@@ -920,14 +920,14 @@ namespace frm
         return bResult;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL FormOperations::commitCurrentControl() throw (RuntimeException, SQLException)
     {
         MethodGuard aGuard( *this );
         return impl_commitCurrentControl_throw();
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_commitCurrentControl_throw() const
     {
         DBG_ASSERT( m_nMethodNestingLevel, "FormOperations::impl_commitCurrentControl_throw: to be called within a MethodGuard'ed section only!" );
@@ -969,7 +969,7 @@ namespace frm
         return bSuccess;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL FormOperations::isInsertionRow() throw (RuntimeException, WrappedTargetException)
     {
         sal_Bool bIs = sal_False;
@@ -985,7 +985,7 @@ namespace frm
         return bIs;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL FormOperations::isModifiedRow() throw (RuntimeException, WrappedTargetException)
     {
         sal_Bool bIs = sal_False;
@@ -1001,7 +1001,7 @@ namespace frm
         return bIs;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::cursorMoved( const EventObject& /*_Event*/ ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -1010,19 +1010,19 @@ namespace frm
         impl_invalidateAllSupportedFeatures_nothrow( aGuard );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::rowChanged( const EventObject& /*_Event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::rowSetChanged( const EventObject& /*_Event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::modified( const EventObject& /*_Source*/ ) throw( RuntimeException )
     {
         MethodGuard aGuard( *this );
@@ -1035,7 +1035,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
@@ -1083,13 +1083,13 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException)
     {
         // TODO: should we react on this? Or is this the responsibility of our owner to dispose us?
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormOperations::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1127,14 +1127,14 @@ namespace frm
         m_bActiveControlModified = true;
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_checkDisposed_throw() const
     {
         if ( impl_isDisposed_nothrow() )
             throw DisposedException( OUString(), *const_cast< FormOperations* >( this ) );
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_initFromController_throw()
     {
         OSL_PRECOND( m_xController.is(), "FormOperations::impl_initFromController_throw: invalid controller!" );
@@ -1149,7 +1149,7 @@ namespace frm
             xBroadcaster->addModifyListener( this );
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_initFromForm_throw()
     {
         OSL_PRECOND( m_xCursor.is(), "FormOperations::impl_initFromForm_throw: invalid form!" );
@@ -1165,7 +1165,7 @@ namespace frm
         m_xCursorProperties->addPropertyChangeListener( PROPERTY_ISNEW, this );
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::createWithFormController( const Reference< XFormController >& _rxController )
     {
         m_xController = _rxController;
@@ -1177,7 +1177,7 @@ namespace frm
         m_bConstructed = true;
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::createWithForm( const Reference< XForm >& _rxForm )
     {
         m_xCursor = m_xCursor.query( _rxForm );
@@ -1189,7 +1189,7 @@ namespace frm
         m_bConstructed = true;
     }
 
-    //------------------------------------------------------------------------------
+
     void FormOperations::impl_invalidateAllSupportedFeatures_nothrow( MethodGuard& _rClearForCallback ) const
     {
         if ( !m_xFeatureInvalidation.is() )
@@ -1201,7 +1201,7 @@ namespace frm
         xInvalidation->invalidateAllFeatures();
     }
 
-    //------------------------------------------------------------------------------
+
     void FormOperations::impl_invalidateModifyDependentFeatures_nothrow( MethodGuard& _rClearForCallback ) const
     {
         if ( !m_xFeatureInvalidation.is() )
@@ -1228,7 +1228,7 @@ namespace frm
         xInvalidation->invalidateFeatures( s_aModifyDependentFeatures );
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_ensureInitializedParser_nothrow()
     {
         OSL_PRECOND( m_xCursorProperties.is(), "FormOperations::impl_ensureInitializedParser_nothrow: we're disposed!" );
@@ -1281,7 +1281,7 @@ namespace frm
         m_bInitializedParser = true;
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_disposeParser_nothrow()
     {
         try
@@ -1308,7 +1308,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_canMoveLeft_throw( ) const
     {
         if ( !impl_hasCursor_nothrow() )
@@ -1317,7 +1317,7 @@ namespace frm
         return impl_getRowCount_throw() && ( !m_xCursor->isFirst() || impl_isInsertionRow_throw() );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_canMoveRight_throw( ) const
     {
         if ( !impl_hasCursor_nothrow() )
@@ -1338,49 +1338,49 @@ namespace frm
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_isInsertionRow_throw() const
     {
         return lcl_safeGetPropertyValue_throw( m_xCursorProperties, PROPERTY_ISNEW, false );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 FormOperations::impl_getRowCount_throw() const
     {
         return lcl_safeGetPropertyValue_throw( m_xCursorProperties, PROPERTY_ROWCOUNT, (sal_Int32)0 );
     }
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_isRowCountFinal_throw() const
     {
         return lcl_safeGetPropertyValue_throw( m_xCursorProperties, PROPERTY_ROWCOUNTFINAL, false );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_isModifiedRow_throw() const
     {
         return lcl_safeGetPropertyValue_throw( m_xCursorProperties, PROPERTY_ISMODIFIED, false );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_isParseable_throw() const
     {
         const_cast< FormOperations* >( this )->impl_ensureInitializedParser_nothrow();
         return m_xParser.is() && !m_xParser->getQuery().isEmpty();
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_hasFilterOrOrder_throw() const
     {
         return impl_isParseable_throw() && ( !m_xParser->getFilter().isEmpty() || !m_xParser->getOrder().isEmpty() );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_isInsertOnlyForm_throw() const
     {
         return lcl_safeGetPropertyValue_throw( m_xCursorProperties, PROPERTY_INSERTONLY, true );
     }
 
-    //------------------------------------------------------------------------------
+
     Reference< XControlModel > FormOperations::impl_getCurrentControlModel_throw() const
     {
         Reference< XControl > xControl( m_xController->getCurrentControl() );
@@ -1405,7 +1405,7 @@ namespace frm
         return xControlModel;
     }
 
-    //------------------------------------------------------------------------------
+
     Reference< XPropertySet > FormOperations::impl_getCurrentBoundField_nothrow( ) const
     {
         OSL_PRECOND( m_xController.is(), "FormOperations::impl_getCurrentBoundField_nothrow: no controller -> no control!" );
@@ -1429,7 +1429,7 @@ namespace frm
         return xField;
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Int16 FormOperations::impl_gridView2ModelPos_nothrow( const Reference< XIndexAccess >& _rxColumns, sal_Int16 _nViewPos ) const
     {
         OSL_PRECOND( _rxColumns.is(), "FormOperations::impl_gridView2ModelPos_nothrow: invalid columns container!" );
@@ -1463,7 +1463,7 @@ namespace frm
         return (sal_Int16)-1;
     }
 
-    //------------------------------------------------------------------------------
+
     bool FormOperations::impl_moveLeft_throw( ) const
     {
         OSL_PRECOND( impl_hasCursor_nothrow(), "FormOperations::impl_moveLeft_throw: no cursor!" );
@@ -1499,7 +1499,7 @@ namespace frm
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool FormOperations::impl_moveRight_throw( ) const
     {
         OSL_PRECOND( impl_hasCursor_nothrow(), "FormOperations::impl_moveRight_throw: no cursor!" );
@@ -1528,7 +1528,7 @@ namespace frm
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_resetAllControls_nothrow() const
     {
         Reference< XIndexAccess > xContainer( m_xCursor, UNO_QUERY );
@@ -1556,7 +1556,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void FormOperations::impl_executeAutoSort_throw( bool _bUp ) const
     {
         OSL_PRECOND( m_xController.is(), "FormOperations::impl_executeAutoSort_throw: need a controller for this!" );
@@ -1619,7 +1619,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void FormOperations::impl_executeAutoFilter_throw( ) const
     {
         OSL_PRECOND( m_xController.is(), "FormOperations::impl_executeAutoFilter_throw: need a controller for this!" );
@@ -1688,7 +1688,7 @@ namespace frm
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FormOperations::impl_executeFilterOrSort_throw( bool _bFilter ) const
     {
         OSL_PRECOND( m_xController.is(), "FormOperations::impl_executeFilterOrSort_throw: need a controller for this!" );
@@ -1732,7 +1732,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------------------
+
     template < typename FunctObj >
     void FormOperations::impl_doActionInSQLContext_throw( FunctObj f, sal_uInt16 _nErrorResourceId ) const
     {
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index d727aeff764f..93e7ddbec2ba 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -39,7 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-//--------------------------------------------------------------------------
+
 extern "C" void SAL_CALL createRegistryInfo_ONavigationBarControl()
 {
     static ::frm::OMultiInstanceAutoRegistration< ::frm::ONavigationBarControl > aAutoRegistration;
@@ -68,21 +68,21 @@ namespace frm
     //==================================================================
     // ONavigationBarControl
     //==================================================================
-    //------------------------------------------------------------------
+
     ONavigationBarControl::ONavigationBarControl( const Reference< XComponentContext >& _rxORB)
         :UnoControl(), m_xContext(_rxORB)
     {
     }
 
-    //------------------------------------------------------------------
+
     ONavigationBarControl::~ONavigationBarControl()
     {
     }
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarControl, UnoControl, ONavigationBarControl_Base )
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ONavigationBarControl::queryAggregation( const Type& _rType ) throw ( RuntimeException )
     {
         Any aReturn = UnoControl::queryAggregation( _rType );
@@ -93,7 +93,7 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------
+
     namespace
     {
         //..............................................................
@@ -123,7 +123,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException )
     {
         SolarMutexGuard aGuard;
@@ -177,25 +177,25 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ONavigationBarControl::getImplementationName()  throw( RuntimeException )
     {
         return getImplementationName_Static();
     }
 
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames()  throw( RuntimeException )
     {
         return getSupportedServiceNames_Static();
     }
 
-    //------------------------------------------------------------------
+
     OUString SAL_CALL ONavigationBarControl::getImplementationName_Static()
     {
         return OUString( "com.sun.star.comp.form.ONavigationBarControl" );
     }
 
-    //------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ONavigationBarControl::getSupportedServiceNames_Static()
     {
         Sequence< OUString > aServices( 2 );
@@ -204,25 +204,25 @@ namespace frm
         return aServices;
     }
 
-    //------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL ONavigationBarControl::Create( const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return *( new ONavigationBarControl( comphelper::getComponentContext(_rxFactory) ) );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarControl::registerDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
         FORWARD_TO_PEER_1( XDispatchProviderInterception, registerDispatchProviderInterceptor, _rxInterceptor );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarControl::releaseDispatchProviderInterceptor( const Reference< XDispatchProviderInterceptor >& _rxInterceptor ) throw (RuntimeException)
     {
         FORWARD_TO_PEER_1( XDispatchProviderInterception, releaseDispatchProviderInterceptor, _rxInterceptor );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarControl::setDesignMode( sal_Bool _bOn ) throw( RuntimeException )
     {
         UnoControl::setDesignMode( _bOn );
@@ -232,7 +232,7 @@ namespace frm
     //==================================================================
     // ONavigationBarPeer
     //==================================================================
-    //------------------------------------------------------------------
+
     ONavigationBarPeer* ONavigationBarPeer::Create( const Reference< XComponentContext >& _rxORB,
         Window* _pParentWindow, const Reference< XControlModel >& _rxModel )
     {
@@ -267,31 +267,31 @@ namespace frm
         return pPeer;
     }
 
-    //------------------------------------------------------------------
+
     ONavigationBarPeer::ONavigationBarPeer( const Reference< XComponentContext >& _rxORB )
         :OFormNavigationHelper( _rxORB )
     {
     }
 
-    //------------------------------------------------------------------
+
     ONavigationBarPeer::~ONavigationBarPeer()
     {
     }
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( ONavigationBarPeer, VCLXWindow, OFormNavigationHelper )
 
-    //------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( ONavigationBarPeer, VCLXWindow, OFormNavigationHelper )
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarPeer::dispose(  ) throw( RuntimeException )
     {
         VCLXWindow::dispose();
         OFormNavigationHelper::dispose();
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException )
     {
         SolarMutexGuard aGuard;
@@ -371,7 +371,7 @@ namespace frm
         }
     }
 
-    //------------------------------------------------------------------
+
     Any SAL_CALL ONavigationBarPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException )
     {
         SolarMutexGuard aGuard;
@@ -415,7 +415,7 @@ namespace frm
         return aReturn;
     }
 
-    //------------------------------------------------------------------
+
     void ONavigationBarPeer::interceptorsChanged( )
     {
         if ( isDesignMode() )
@@ -425,7 +425,7 @@ namespace frm
         OFormNavigationHelper::interceptorsChanged();
     }
 
-    //------------------------------------------------------------------
+
     void ONavigationBarPeer::featureStateChanged( sal_Int16 _nFeatureId, sal_Bool _bEnabled )
     {
         // enable this button on the toolbox
@@ -453,7 +453,7 @@ namespace frm
         OFormNavigationHelper::featureStateChanged( _nFeatureId, _bEnabled );
     }
 
-    //------------------------------------------------------------------
+
     void ONavigationBarPeer::allFeatureStatesChanged( )
     {
         // force the control to update it's states
@@ -465,7 +465,7 @@ namespace frm
         OFormNavigationHelper::allFeatureStatesChanged( );
     }
 
-    //------------------------------------------------------------------
+
     bool ONavigationBarPeer::isEnabled( sal_Int16 _nFeatureId ) const
     {
         if ( const_cast< ONavigationBarPeer* >( this )->isDesignMode() )
@@ -474,7 +474,7 @@ namespace frm
         return OFormNavigationHelper::isEnabled( _nFeatureId );
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarPeer::setDesignMode( sal_Bool _bOn ) throw( RuntimeException )
     {
         VCLXWindow::setDesignMode( _bOn  );
@@ -486,14 +486,14 @@ namespace frm
             // this will connect if not already connected and just update else
     }
 
-    //------------------------------------------------------------------
+
     void SAL_CALL ONavigationBarPeer::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         VCLXWindow::disposing( _rSource );
         OFormNavigationHelper::disposing( _rSource );
     }
 
-    //------------------------------------------------------------------
+
     void ONavigationBarPeer::getSupportedFeatures( ::std::vector< sal_Int16 >& _rFeatureIds )
     {
         _rFeatureIds.push_back( FormFeature::MoveAbsolute );
diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx
index a8127bde1f08..3fd7e856203d 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -121,7 +121,7 @@ namespace frm
 
     };
 
-    //---------------------------------------------------------------------
+
     void ImplNavToolBar::Select()
     {
         if ( m_pDispatcher )
@@ -138,7 +138,7 @@ namespace frm
     //=====================================================================
     //= NavigationToolBar
     //=====================================================================
-    //---------------------------------------------------------------------
+
     NavigationToolBar::NavigationToolBar( Window* _pParent, WinBits _nStyle, const PCommandImageProvider& _pImageProvider,
             const PCommandDescriptionProvider& _pDescriptionProvider )
         :Window( _pParent, _nStyle )
@@ -151,7 +151,7 @@ namespace frm
         implInit( );
     }
 
-    //---------------------------------------------------------------------
+
     NavigationToolBar::~NavigationToolBar( )
     {
         for (   ::std::vector< Window* >::iterator loopChildWins = m_aChildWins.begin();
@@ -164,7 +164,7 @@ namespace frm
         delete m_pToolbar;
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setDispatcher( const IFeatureDispatcher* _pDispatcher )
     {
         m_pDispatcher = _pDispatcher;
@@ -179,7 +179,7 @@ namespace frm
         updateFeatureStates( );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::updateFeatureStates( )
     {
         for ( sal_uInt16 nPos = 0; nPos < m_pToolbar->GetItemCount(); ++nPos )
@@ -195,7 +195,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::implEnableItem( sal_uInt16 _nItemId, bool _bEnabled )
     {
         m_pToolbar->EnableItem( _nItemId, _bEnabled );
@@ -207,7 +207,7 @@ namespace frm
             m_pToolbar->EnableItem( LID_RECORD_FILLER, _bEnabled );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::enableFeature( sal_Int16 _nFeatureId, bool _bEnabled )
     {
         DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
@@ -216,7 +216,7 @@ namespace frm
         implEnableItem( (sal_uInt16)_nFeatureId, _bEnabled );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::checkFeature( sal_Int16 _nFeatureId, bool _bEnabled )
     {
         DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
@@ -225,7 +225,7 @@ namespace frm
         m_pToolbar->CheckItem( (sal_uInt16)_nFeatureId, _bEnabled );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const OUString& _rText )
     {
         DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND,
@@ -238,7 +238,7 @@ namespace frm
             m_pToolbar->SetItemText( (sal_uInt16)_nFeatureId, _rText );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::implInit( )
     {
         m_pToolbar = new ImplNavToolBar( this );
@@ -347,7 +347,7 @@ namespace frm
         implUpdateImages();
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::implUpdateImages()
     {
         OSL_ENSURE( m_pImageProvider, "NavigationToolBar::implUpdateImages: no image provider => no images!" );
@@ -395,7 +395,7 @@ namespace frm
         Resize();
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::implSetImageSize( ImageSize _eSize )
     {
         if ( _eSize != m_eImageSize )
@@ -405,13 +405,13 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::SetImageSize( ImageSize _eSize )
     {
         implSetImageSize( _eSize );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::ShowFunctionGroup( FunctionGroup _eGroup, bool _bShow )
     {
         const sal_uInt16* pGroupIds = NULL;
@@ -459,7 +459,7 @@ namespace frm
                 m_pToolbar->ShowItem( *pGroupIds++, _bShow );
     }
 
-    //---------------------------------------------------------------------
+
     bool NavigationToolBar::IsFunctionGroupVisible( FunctionGroup _eGroup )
     {
         sal_uInt16 nIndicatorItem = 0;
@@ -476,7 +476,7 @@ namespace frm
         return m_pToolbar->IsItemVisible( nIndicatorItem );
     }
 
-    //------------------------------------------------------------------------------
+
     void NavigationToolBar::StateChanged( StateChangedType nType )
     {
         Window::StateChanged( nType );
@@ -510,7 +510,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::Resize()
     {
         // resize/position the toolbox as a whole
@@ -523,7 +523,7 @@ namespace frm
         Window::Resize();
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::SetControlBackground()
     {
         Window::SetControlBackground();
@@ -533,7 +533,7 @@ namespace frm
         implUpdateImages();
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::SetControlBackground( const Color& _rColor )
     {
         Window::SetControlBackground( _rColor );
@@ -543,7 +543,7 @@ namespace frm
         implUpdateImages();
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::SetTextLineColor( )
     {
         Window::SetTextLineColor( );
@@ -551,7 +551,7 @@ namespace frm
         forEachItemWindow( &NavigationToolBar::setTextLineColor, NULL );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::SetTextLineColor( const Color& _rColor )
     {
         Window::SetTextLineColor( _rColor );
@@ -559,7 +559,7 @@ namespace frm
         forEachItemWindow( &NavigationToolBar::setTextLineColor, &_rColor );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::forEachItemWindow( ItemWindowHandler _handler, const void* _pParam )
     {
         for ( sal_uInt16 item = 0; item < m_pToolbar->GetItemCount(); ++item )
@@ -571,7 +571,7 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
     {
         if ( _pColor )
@@ -580,7 +580,7 @@ namespace frm
             _pItemWindow->SetControlBackground();
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const
     {
         if ( _pColor )
@@ -589,14 +589,14 @@ namespace frm
             _pItemWindow->SetTextLineColor();
     }
 #if 0
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         _pItemWindow->SetZoom( GetZoom() );
         _pItemWindow->SetZoomedPointFont( IsControlFont() ? GetControlFont() : GetPointFont() );
     }
 #endif
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         if ( IsControlFont() )
@@ -605,7 +605,7 @@ namespace frm
             _pItemWindow->SetControlFont( );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         if ( IsControlForeground() )
@@ -615,7 +615,7 @@ namespace frm
         _pItemWindow->SetTextColor( GetTextColor() );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const
     {
         OUString sItemText;
@@ -645,7 +645,7 @@ namespace frm
         m_pToolbar->SetItemWindow( _nItemId, _pItemWindow );
     }
 
-    //---------------------------------------------------------------------
+
     void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const
     {
         _pItemWindow->EnableRTL( *static_cast< const sal_Bool* >( _pIsRTLEnabled ) );
@@ -654,7 +654,7 @@ namespace frm
     //=====================================================================
     //= RecordPositionInput
     //=====================================================================
-    //---------------------------------------------------------------------
+
     RecordPositionInput::RecordPositionInput( Window* _pParent )
         :NumericField( _pParent, WB_BORDER | WB_VCENTER )
         ,m_pDispatcher( NULL )
@@ -667,18 +667,18 @@ namespace frm
         SetBorderStyle( WINDOW_BORDER_MONO );
     }
 
-    //---------------------------------------------------------------------
+
     RecordPositionInput::~RecordPositionInput()
     {
     }
 
-    //---------------------------------------------------------------------
+
     void RecordPositionInput::setDispatcher( const IFeatureDispatcher* _pDispatcher )
     {
         m_pDispatcher = _pDispatcher;
     }
 
-    //---------------------------------------------------------------------
+
     void RecordPositionInput::FirePosition( sal_Bool _bForce )
     {
         if ( _bForce || (GetText() != GetSavedValue()) )
@@ -694,13 +694,13 @@ namespace frm
         }
     }
 
-    //---------------------------------------------------------------------
+
     void RecordPositionInput::LoseFocus()
     {
         FirePosition( sal_False );
     }
 
-    //---------------------------------------------------------------------
+
     void RecordPositionInput::KeyInput( const KeyEvent& rKeyEvent )
     {
         if( rKeyEvent.GetKeyCode() == KEY_RETURN && !GetText().isEmpty() )
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 103b802485d2..a0c769053b6c 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -55,26 +55,26 @@ Convert::Convert()
 
 namespace
 {
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_OUString( const Any& rAny )
     { OUString sStr; rAny >>= sStr; return sStr; }
 
-    // ------------------------------------------------------------------------
+
     Any lcl_toAny_OUString( const OUString& rStr )
     { Any aAny; aAny <<= rStr; return aAny; }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_bool( const Any& rAny )
     { bool b = false; rAny >>= b; return b ? OUString("true") : OUString("false"); }
 
-    // ------------------------------------------------------------------------
+
     Any lcl_toAny_bool( const OUString& rStr )
     {
         bool b = ( rStr == "true"  ||  rStr == "1" );
         return makeAny( b );
     }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_double( const Any& rAny )
     {
         double f = 0.0;
@@ -87,7 +87,7 @@ namespace
             : OUString();
     }
 
-    // ------------------------------------------------------------------------
+
     Any lcl_toAny_double( const OUString& rString )
     {
         rtl_math_ConversionStatus eStatus;
@@ -96,7 +96,7 @@ namespace
         return ( eStatus == rtl_math_ConversionStatus_Ok ) ? makeAny( f ) : Any();
     }
 
-    // ------------------------------------------------------------------------
+
     void lcl_appendInt32ToBuffer( const sal_Int32 _nValue, OUStringBuffer& _rBuffer, sal_Int16 _nMinDigits )
     {
         if ( ( _nMinDigits >= 4 ) && ( _nValue < 1000 ) )
@@ -108,7 +108,7 @@ namespace
         _rBuffer.append( _nValue );
     }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_UNODate_typed( const UNODate& rDate )
     {
 
@@ -122,7 +122,7 @@ namespace
         return sInfo.makeStringAndClear();
     }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_UNODate( const Any& rAny )
     {
         UNODate aDate;
@@ -130,7 +130,7 @@ namespace
         return lcl_toXSD_UNODate_typed( aDate );
     }
 
-    // ------------------------------------------------------------------------
+
     UNODate lcl_toUNODate( const OUString& rString )
     {
         UNODate aDate( 1, 1, 1900 );
@@ -154,13 +154,13 @@ namespace
         return aDate;
     }
 
-    // ------------------------------------------------------------------------
+
     Any lcl_toAny_UNODate( const OUString& rString )
     {
         return makeAny( lcl_toUNODate( rString ) );
     }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_UNOTime_typed( const UNOTime& rTime )
     {
 
@@ -184,7 +184,7 @@ namespace
         return sInfo.makeStringAndClear();
     }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_UNOTime( const Any& rAny )
     {
         UNOTime aTime;
@@ -192,7 +192,7 @@ namespace
         return lcl_toXSD_UNOTime_typed( aTime );
     }
 
-    // ------------------------------------------------------------------------
+
     UNOTime lcl_toUNOTime( const OUString& rString )
     {
         UNOTime aTime;
@@ -224,13 +224,13 @@ namespace
         return aTime;
     }
 
-    // ------------------------------------------------------------------------
+
     Any lcl_toAny_UNOTime( const OUString& rString )
     {
         return makeAny( lcl_toUNOTime( rString ) );
     }
 
-    // ------------------------------------------------------------------------
+
     OUString lcl_toXSD_UNODateTime( const Any& rAny )
     {
         UNODateTime aDateTime;
@@ -247,7 +247,7 @@ namespace
         return sRet;
     }
 
-    // ------------------------------------------------------------------------
+
     Any lcl_toAny_UNODateTime( const OUString& rString )
     {
         // separate the date from the time part
@@ -323,7 +323,7 @@ Convert::Any_t Convert::toAny( const OUString& rValue,
     return aIter != maMap.end() ? aIter->second.second( rValue ) : Any_t();
 }
 
-//------------------------------------------------------------------------
+
 OUString Convert::collapseWhitespace( const OUString& _rString )
 {
     sal_Int32 nLength = _rString.getLength();
diff --git a/forms/source/xforms/datatyperepository.cxx b/forms/source/xforms/datatyperepository.cxx
index a2a24868a89e..94fa43cefaba 100644
--- a/forms/source/xforms/datatyperepository.cxx
+++ b/forms/source/xforms/datatyperepository.cxx
@@ -54,7 +54,7 @@ namespace xforms
     //====================================================================
     //= ODataTypeRepository
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODataTypeRepository::ODataTypeRepository( )
     {
 
@@ -96,12 +96,12 @@ namespace xforms
         m_aRepository[ sName ] = new OShortIntegerType( sName, ::com::sun::star::xsd::DataTypeClass::gDay );
     }
 
-    //--------------------------------------------------------------------
+
     ODataTypeRepository::~ODataTypeRepository( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ODataTypeRepository::Repository::iterator ODataTypeRepository::implLocate( const OUString& _rName, bool _bAllowMiss ) SAL_THROW( ( NoSuchElementException ) )
     {
         Repository::iterator aTypePos = m_aRepository.find( _rName );
@@ -111,7 +111,7 @@ namespace xforms
         return aTypePos;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDataType > SAL_CALL ODataTypeRepository::getBasicDataType( sal_Int16 dataTypeClass ) throw (NoSuchElementException, RuntimeException)
     {
         Reference< XDataType > xReturn;
@@ -131,7 +131,7 @@ namespace xforms
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDataType > SAL_CALL ODataTypeRepository::cloneDataType( const OUString& sourceName, const OUString& newName ) throw (NoSuchElementException, ElementExistException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -147,7 +147,7 @@ namespace xforms
         return pClone;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ODataTypeRepository::revokeDataType( const OUString& typeName ) throw (NoSuchElementException, VetoException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -160,7 +160,7 @@ namespace xforms
         m_aRepository.erase( aTypePos );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XDataType > SAL_CALL ODataTypeRepository::getDataType( const OUString& typeName ) throw (NoSuchElementException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -168,19 +168,19 @@ namespace xforms
     }
 
 
-    //--------------------------------------------------------------------
+
     Reference< XEnumeration > SAL_CALL ODataTypeRepository::createEnumeration(  ) throw (RuntimeException)
     {
         return new ::comphelper::OEnumerationByName( this );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL ODataTypeRepository::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
     {
         return makeAny( getDataType( aName ) );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ODataTypeRepository::getElementNames(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -195,26 +195,26 @@ namespace xforms
         return aNames;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ODataTypeRepository::hasByName( const OUString& aName ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_aRepository.find( aName ) != m_aRepository.end();
     }
 
-    //--------------------------------------------------------------------
+
     Type SAL_CALL ODataTypeRepository::getElementType(  ) throw (RuntimeException)
     {
         return ::getCppuType( static_cast< Reference< XDataType >* >( NULL ) );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL ODataTypeRepository::hasElements(  ) throw (RuntimeException)
     {
         return !m_aRepository.empty();
     }
 
-    //--------------------------------------------------------------------
+
     // type specific implementation of registerProperties, using explicit
     // template instantiations
 
diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx
index 5b4811865a49..e44c3b88ce44 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -59,7 +59,7 @@ namespace xforms
     //====================================================================
     //= OXSDDataType
     //====================================================================
-    //--------------------------------------------------------------------
+
     OXSDDataType::OXSDDataType( const OUString& _rName, sal_Int16 _nTypeClass )
         :OXSDDataType_PBase( m_aBHelper )
         ,m_bIsBasic( sal_True )
@@ -70,12 +70,12 @@ namespace xforms
     {
     }
 
-    //--------------------------------------------------------------------
+
     OXSDDataType::~OXSDDataType()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OXSDDataType::registerProperties()
     {
         registerProperty( PROPERTY_NAME,            PROPERTY_ID_NAME,           BOUND, &m_sName,    ::getCppuType( &m_sName ) );
@@ -86,7 +86,7 @@ namespace xforms
         registerProperty( PROPERTY_XSD_TYPE_CLASS,  PROPERTY_ID_XSD_TYPE_CLASS, READONLY, &m_nTypeClass,    ::getCppuType( &m_nTypeClass ) );
     }
 
-    //--------------------------------------------------------------------
+
     void OXSDDataType::initializeClone( const OXSDDataType& _rCloneSource )
     {
         m_bIsBasic   = sal_False;
@@ -95,7 +95,7 @@ namespace xforms
         m_nWST       = _rCloneSource.m_nWST;
     }
 
-    //--------------------------------------------------------------------
+
     OXSDDataType* OXSDDataType::clone( const OUString& _rNewName ) const
     {
         OXSDDataType* pClone = createClone( _rNewName );
@@ -103,73 +103,73 @@ namespace xforms
         return pClone;
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OXSDDataType, OXSDDataType_Base, ::comphelper::OPropertyContainer )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OXSDDataType, OXSDDataType_Base, ::comphelper::OPropertyContainer )
 
 #define SET_PROPERTY( propertyid, value, member ) \
     setFastPropertyValue( PROPERTY_ID_##propertyid, makeAny( value ) ); \
     OSL_POSTCOND( member == value, "OXSDDataType::setFoo: inconsistency!" );
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OXSDDataType::getName(  ) throw (RuntimeException)
     {
         return m_sName;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::setName( const OUString& aName ) throw (RuntimeException, VetoException)
     {
         // TODO: check the name for conflicts in the repository
         SET_PROPERTY( NAME, aName, m_sName );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OXSDDataType::getPattern() throw (RuntimeException)
     {
         return m_sPattern;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::setPattern( const OUString& _pattern ) throw (RuntimeException)
     {
         SET_PROPERTY( XSD_PATTERN, _pattern, m_sPattern );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 SAL_CALL OXSDDataType::getWhiteSpaceTreatment() throw (RuntimeException)
     {
         return m_nWST;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::setWhiteSpaceTreatment( sal_Int16 _whitespacetreatment ) throw (RuntimeException, IllegalArgumentException)
     {
         SET_PROPERTY( XSD_WHITESPACE, _whitespacetreatment, m_nWST );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OXSDDataType::getIsBasic() throw (RuntimeException)
     {
         return m_bIsBasic;
     }
 
 
-    //--------------------------------------------------------------------
+
     sal_Int16 SAL_CALL OXSDDataType::getTypeClass() throw (RuntimeException)
     {
         return m_nTypeClass;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OXSDDataType::validate( const OUString& sValue ) throw( RuntimeException )
     {
         return ( _validate( sValue ) == 0 );
     }
 
-    //--------------------------------------------------------------------
+
   OUString OXSDDataType::explainInvalid( const OUString& sValue ) throw( RuntimeException )
     {
         // get reason
@@ -182,7 +182,7 @@ namespace xforms
                                    _explainInvalid( nReason ) );
     }
 
-    //--------------------------------------------------------------------
+
     OUString OXSDDataType::_explainInvalid( sal_uInt16 nReason )
     {
         if ( RID_STR_XFORMS_PATTERN_DOESNT_MATCH == nReason )
@@ -193,7 +193,7 @@ namespace xforms
         return OUString();
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -224,7 +224,7 @@ namespace xforms
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 OXSDDataType::_validate( const OUString& _rValue )
     {
         // care for the regular expression
@@ -245,7 +245,7 @@ namespace xforms
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OXSDDataType::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException)
     {
         // let the base class do the conversion
@@ -265,7 +265,7 @@ namespace xforms
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)
     {
         OXSDDataType_PBase::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
@@ -273,7 +273,7 @@ namespace xforms
             m_bPatternMatcherDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     bool OXSDDataType::checkPropertySanity( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rNewValue, OUString& _rErrorMessage )
     {
         if ( _nHandle == PROPERTY_ID_XSD_PATTERN )
@@ -293,37 +293,37 @@ namespace xforms
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
     {
         OXSDDataType_PBase::setPropertyValue( aPropertyName, aValue );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OXSDDataType::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         return OXSDDataType_PBase::getPropertyValue( PropertyName );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         OXSDDataType_PBase::addPropertyChangeListener( aPropertyName, xListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         OXSDDataType_PBase::removePropertyChangeListener( aPropertyName, aListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         OXSDDataType_PBase::addVetoableChangeListener( PropertyName, aListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OXSDDataType::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& aListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         OXSDDataType_PBase::removeVetoableChangeListener( PropertyName, aListener );
@@ -341,14 +341,14 @@ namespace xforms
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OValueLimitedType_Base::initializeClone( const OXSDDataType& _rCloneSource )
     {
         OXSDDataType::initializeClone( _rCloneSource );
         initializeTypedClone( static_cast< const OValueLimitedType_Base& >( _rCloneSource ) );
     }
 
-    //--------------------------------------------------------------------
+
     void OValueLimitedType_Base::initializeTypedClone( const OValueLimitedType_Base& _rCloneSource )
     {
         m_aMaxInclusive   = _rCloneSource.m_aMaxInclusive;
@@ -361,7 +361,7 @@ namespace xforms
         m_fCachedMinExclusive   = _rCloneSource.m_fCachedMinExclusive;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OValueLimitedType_Base::setFastPropertyValue_NoBroadcast(
         sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception)
     {
@@ -414,7 +414,7 @@ namespace xforms
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool OValueLimitedType_Base::_getValue( const OUString& rValue, double& fValue )
     {
         // convert to double
@@ -434,7 +434,7 @@ namespace xforms
         return bReturn;
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 OValueLimitedType_Base::_validate( const OUString& rValue )
     {
         sal_uInt16 nReason = OXSDDataType::_validate( rValue );
@@ -459,7 +459,7 @@ namespace xforms
         return nReason;
     }
 
-    //--------------------------------------------------------------------
+
     OUString OValueLimitedType_Base::_explainInvalid( sal_uInt16 nReason )
     {
         OUStringBuffer sInfo;
@@ -500,13 +500,13 @@ namespace xforms
     //====================================================================
     //= OStringType
     //====================================================================
-     //--------------------------------------------------------------------
+
     OStringType::OStringType( const OUString& _rName, sal_Int16 _nTypeClass )
         :OStringType_Base( _rName, _nTypeClass )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OStringType::registerProperties()
     {
         OStringType_Base::registerProperties();
@@ -516,10 +516,10 @@ namespace xforms
         REGISTER_VOID_PROP( XSD_MAX_LENGTH, m_aMaxLength, sal_Int32 );
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_TYPED_CLONING( OStringType, OStringType_Base )
 
-    //--------------------------------------------------------------------
+
     void OStringType::initializeTypedClone( const OStringType& _rCloneSource )
     {
         m_aLength       = _rCloneSource.m_aLength;
@@ -527,7 +527,7 @@ namespace xforms
         m_aMaxLength    = _rCloneSource.m_aMaxLength;
     }
 
-    //--------------------------------------------------------------------
+
     bool OStringType::checkPropertySanity( sal_Int32 _nHandle, const Any& _rNewValue, OUString& _rErrorMessage )
     {
         // let the base class do the conversion
@@ -553,7 +553,7 @@ namespace xforms
         return _rErrorMessage.isEmpty();
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 OStringType::_validate( const OUString& rValue )
     {
         // check regexp, whitespace etc. in parent class
@@ -580,7 +580,7 @@ namespace xforms
         return nReason;
     }
 
-    //--------------------------------------------------------------------
+
     OUString OStringType::_explainInvalid( sal_uInt16 nReason )
     {
         sal_Int32 nValue = 0;
@@ -616,21 +616,21 @@ namespace xforms
     //====================================================================
     //= OBooleanType
     //====================================================================
-    //--------------------------------------------------------------------
+
     OBooleanType::OBooleanType( const OUString& _rName )
         :OBooleanType_Base( _rName, DataTypeClass::BOOLEAN )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_CLONING( OBooleanType, OBooleanType_Base )
 
-    //--------------------------------------------------------------------
+
     void OBooleanType::initializeTypedClone( const OBooleanType& /*_rCloneSource*/ )
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 OBooleanType::_validate( const OUString& sValue )
     {
         sal_uInt16 nInvalidityReason = OBooleanType_Base::_validate( sValue );
@@ -641,7 +641,7 @@ namespace xforms
         return bValid ? 0 : RID_STR_XFORMS_INVALID_VALUE;
     }
 
-    //--------------------------------------------------------------------
+
     OUString OBooleanType::_explainInvalid( sal_uInt16 nReason )
     {
         return ( nReason == 0 ) ? OUString() : getName();
@@ -650,23 +650,23 @@ namespace xforms
     //====================================================================
     //= ODecimalType
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODecimalType::ODecimalType( const OUString& _rName, sal_Int16 _nTypeClass )
         :ODecimalType_Base( _rName, _nTypeClass )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_TYPED_CLONING( ODecimalType, ODecimalType_Base )
 
-    //--------------------------------------------------------------------
+
     void ODecimalType::initializeTypedClone( const ODecimalType& _rCloneSource )
     {
         m_aTotalDigits    = _rCloneSource.m_aTotalDigits;
         m_aFractionDigits = _rCloneSource.m_aFractionDigits;
     }
 
-    //--------------------------------------------------------------------
+
     void ODecimalType::registerProperties()
     {
         ODecimalType_Base::registerProperties();
@@ -675,7 +675,7 @@ namespace xforms
         REGISTER_VOID_PROP( XSD_FRACTION_DIGITS, m_aFractionDigits, sal_Int32 );
     }
 
-    //--------------------------------------------------------------------
+
 
     // validate decimals and return code for which facets failed
     // to be used by: ODecimalType::validate and ODecimalType::explainInvalid
@@ -712,7 +712,7 @@ namespace xforms
         return nReason;
     }
 
-    //--------------------------------------------------------------------
+
     OUString ODecimalType::_explainInvalid( sal_uInt16 nReason )
     {
         sal_Int32 nValue = 0;
@@ -736,7 +736,7 @@ namespace xforms
         return sInfo.makeStringAndClear();
     }
 
-    //--------------------------------------------------------------------
+
     OUString ODecimalType::typedValueAsHumanReadableString( const Any& _rValue ) const
     {
         double fValue( 0 );
@@ -744,7 +744,7 @@ namespace xforms
         return OUString::number( fValue );
     }
 
-    //--------------------------------------------------------------------
+
     void ODecimalType::normalizeValue( const Any& _rValue, double& _rDoubleValue ) const
     {
         OSL_VERIFY( _rValue >>= _rDoubleValue );
@@ -769,16 +769,16 @@ namespace xforms
     //====================================================================
     //= ODateType
     //====================================================================
-    //--------------------------------------------------------------------
+
     DEFAULT_IMPLEMNENT_SUBTYPE( ODateType, DATE )
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 ODateType::_validate( const OUString& _rValue )
     {
         return ODateType_Base::_validate( _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     bool ODateType::_getValue( const OUString& value, double& fValue )
     {
         Any aTypeValue = Convert::get().toAny( value, getCppuType() );
@@ -792,14 +792,14 @@ namespace xforms
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     OUString ODateType::typedValueAsHumanReadableString( const Any& _rValue ) const
     {
         OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "ODateType::typedValueAsHumanReadableString: unexpected type" );
         return Convert::get().toXSD( _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     void ODateType::normalizeValue( const Any& _rValue, double& _rDoubleValue ) const
     {
         Date aValue;
@@ -811,16 +811,16 @@ namespace xforms
     //====================================================================
     //= OTimeType
     //====================================================================
-    //--------------------------------------------------------------------
+
     DEFAULT_IMPLEMNENT_SUBTYPE( OTimeType, TIME )
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 OTimeType::_validate( const OUString& _rValue )
     {
         return OTimeType_Base::_validate( _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     bool OTimeType::_getValue( const OUString& value, double& fValue )
     {
         Any aTypedValue = Convert::get().toAny( value, getCppuType() );
@@ -841,14 +841,14 @@ namespace xforms
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     OUString OTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const
     {
         OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "OTimeType::typedValueAsHumanReadableString: unexpected type" );
         return Convert::get().toXSD( _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     void OTimeType::normalizeValue( const Any& _rValue, double& _rDoubleValue ) const
     {
         Time aValue;
@@ -860,16 +860,16 @@ namespace xforms
     //====================================================================
     //= ODateTimeType
     //====================================================================
-    //--------------------------------------------------------------------
+
     DEFAULT_IMPLEMNENT_SUBTYPE( ODateTimeType, DATETIME )
 
-    //--------------------------------------------------------------------
+
     sal_uInt16 ODateTimeType::_validate( const OUString& _rValue )
     {
         return ODateTimeType_Base::_validate( _rValue );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         double lcl_normalizeDateTime( const DateTime& _rValue )
@@ -888,7 +888,7 @@ namespace xforms
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ODateTimeType::_getValue( const OUString& value, double& fValue )
     {
         Any aTypedValue = Convert::get().toAny( value, getCppuType() );
@@ -901,7 +901,7 @@ namespace xforms
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     OUString ODateTimeType::typedValueAsHumanReadableString( const Any& _rValue ) const
     {
         OSL_PRECOND( _rValue.getValueType().equals( getCppuType() ), "OTimeType::typedValueAsHumanReadableString: unexpected type" );
@@ -913,7 +913,7 @@ namespace xforms
         return sString.replace( 'T', ' ' );
     }
 
-    //--------------------------------------------------------------------
+
     void ODateTimeType::normalizeValue( const Any& _rValue, double& _rDoubleValue ) const
     {
         DateTime aValue;
@@ -924,21 +924,21 @@ namespace xforms
     //====================================================================
     //= OShortIntegerType
     //====================================================================
-    //--------------------------------------------------------------------
+
     OShortIntegerType::OShortIntegerType( const OUString& _rName, sal_Int16 _nTypeClass )
         :OShortIntegerType_Base( _rName, _nTypeClass )
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_DEFAULT_TYPED_CLONING( OShortIntegerType, OShortIntegerType_Base )
 
-    //--------------------------------------------------------------------
+
     void OShortIntegerType::initializeTypedClone( const OShortIntegerType& /*_rCloneSource*/ )
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool OShortIntegerType::_getValue( const OUString& value, double& fValue )
     {
         fValue = (double)(sal_Int16)value.toInt32();
@@ -954,7 +954,7 @@ namespace xforms
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     OUString OShortIntegerType::typedValueAsHumanReadableString( const Any& _rValue ) const
     {
         sal_Int16 nValue( 0 );
@@ -962,7 +962,7 @@ namespace xforms
         return OUString::number( nValue );
     }
 
-    //--------------------------------------------------------------------
+
     void OShortIntegerType::normalizeValue( const Any& _rValue, double& _rDoubleValue ) const
     {
         sal_Int16 nValue( 0 );
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 39f522bd872c..f7972622956a 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -80,17 +80,17 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
         throw lang::IllegalArgumentException();
     return xMap->createSequenceOfAvailableMappings( *m_pCompiler,nGroups);
 }
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName_Static()
 {
     return OUString( "simple.formula.FormulaOpCodeMapperObj" );
 }
-// --------------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL FormulaOpCodeMapperObj::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
@@ -110,7 +110,7 @@ uno::Reference< uno::XInterface > SAL_CALL FormulaOpCodeMapperObj::create(
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
-// -----------------------------------------------------------------------------
+
 
 // =============================================================================
 } // formula
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index c66153f6460e..9d40ef9a35b1 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -255,7 +255,7 @@ bool FormulaToken::TextEqual( const FormulaToken& rToken ) const
 }
 // ==========================================================================
 // real implementations of virtual functions
-// --------------------------------------------------------------------------
+
 
 
 sal_uInt8 FormulaByteToken::GetByte() const                       { return nByte; }
@@ -1337,10 +1337,10 @@ bool FormulaTokenIterator::IsEndOfPath() const
     return GetNonEndOfPathToken( pCur->nPC + 1) == NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 // ==========================================================================
 // real implementations of virtual functions
-// --------------------------------------------------------------------------
+
 
 double      FormulaDoubleToken::GetDouble() const            { return fDouble; }
 double &    FormulaDoubleToken::GetDoubleAsReference()       { return fDouble; }
@@ -1451,8 +1451,8 @@ bool FormulaUnknownToken::operator==( const FormulaToken& r ) const
     return FormulaToken::operator==( r );
 }
 
-// -----------------------------------------------------------------------------
+
 } // formula
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx
index 97debb2901f5..36435b18fde6 100644
--- a/formula/source/core/resource/core_resource.cxx
+++ b/formula/source/core/resource/core_resource.cxx
@@ -42,7 +42,7 @@ namespace formula
     sal_Int32       ResourceManager::s_nClients = 0;
     ResMgr*         ResourceManager::m_pImpl = NULL;
 
-    //------------------------------------------------------------------
+
     void ResourceManager::ensureImplExists()
     {
         if (m_pImpl)
@@ -51,14 +51,14 @@ namespace formula
         m_pImpl = ResMgr::CreateResMgr("for", Application::GetSettings().GetUILanguageTag());
     }
 
-    //-------------------------------------------------------------------------
+
     void ResourceManager::registerClient()
     {
         ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
         ++s_nClients;
     }
 
-    //-------------------------------------------------------------------------
+
     void ResourceManager::revokeClient()
     {
         ::osl::MutexGuard aGuard(theResourceManagerMutex::get());
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 19b0abf96226..6db3c75039a8 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -120,7 +120,7 @@ bool FormulaHelper::GetNextFunc( const OUString&  rFormula,
     return bFound;
 }
 
-//------------------------------------------------------------------------
+
 
 void FormulaHelper::FillArgStrings( const OUString&   rFormula,
                                     sal_Int32         nFuncPos,
@@ -160,7 +160,7 @@ void FormulaHelper::FillArgStrings( const OUString&   rFormula,
             _rArgs.push_back(OUString());
 }
 
-//------------------------------------------------------------------------
+
 
 void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
                                    const OUString& rFormula,
@@ -173,7 +173,7 @@ void FormulaHelper::GetArgStrings( ::std::vector< OUString >& _rArgs,
     }
 }
 
-//------------------------------------------------------------------------
+
 
 inline sal_Bool IsFormulaText( const CharClass* _pCharClass,const OUString& rStr, sal_Int32 nPos )
 {
@@ -280,7 +280,7 @@ sal_Int32 FormulaHelper::GetFunctionStart( const OUString&   rFormula,
     return nFStart;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Int32  FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart ) const
 {
@@ -338,7 +338,7 @@ sal_Int32  FormulaHelper::GetFunctionEnd( const OUString& rStr, sal_Int32 nStart
     return nStart;
 }
 
-//------------------------------------------------------------------
+
 
 sal_Int32 FormulaHelper::GetArgStart( const OUString& rStr, sal_Int32 nStart, sal_uInt16 nArg ) const
 {
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 1fb3bb14918b..085242f42b6e 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -383,7 +383,7 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
 {
     sal_uInt16 nSwitch=rNEvt.GetType();
@@ -460,7 +460,7 @@ namespace
         }
     };
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
 {
     if ( !m_aTokenList.hasElements() )
@@ -570,7 +570,7 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
 
     return nFuncPos;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool FormulaDlg_Impl::CalcValue( const OUString& rStrExp, OUString& rStrResult )
 {
     sal_Bool bResult = sal_True;
@@ -646,7 +646,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const OUString& rStrExp)
     return bResult;
 }
 
-// -----------------------------------------------------------------------------
+
 void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvTreeListEntry* pParent,FormulaToken* _pToken,long Count)
 {
     if( _pToken != NULL && Count > 0 )
@@ -780,7 +780,7 @@ void FormulaDlg_Impl::FillDialog(sal_Bool nFlag)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void FormulaDlg_Impl::FillListboxes()
 {
     //  Switch between the "Pages"
@@ -811,7 +811,7 @@ void FormulaDlg_Impl::FillListboxes()
     m_pParent->SetHelpId( aOldHelp );
     m_pParent->SetUniqueId( aOldUnique );
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
 {
     //  Switch between the "Pages"
@@ -910,7 +910,7 @@ void FormulaDlg_Impl::FillControls(sal_Bool &rbNext, sal_Bool &rbPrev)
     pData->SetFStart(nTempStart);
     rbPrev = m_aFormulaHelper.GetNextFunc( aFormula, true, nTempStart );
 }
-// -----------------------------------------------------------------------------
+
 
 void FormulaDlg_Impl::ClearAllParas()
 {
@@ -978,7 +978,7 @@ void FormulaDlg_Impl::DoEnter(bool bOk)
     //  Close dialog
     m_pHelper->doClose(bOk);
 }
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
 {
@@ -1014,14 +1014,14 @@ IMPL_LINK( FormulaDlg_Impl, BtnHdl, PushButton*, pBtn )
 
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 
 //  --------------------------------------------------------------------------
 //                          Functions for 1. Page
 //  --------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------------
+
 
 // Handler for Listboxes
 
@@ -1056,7 +1056,7 @@ IMPL_LINK_NOARG(FormulaDlg_Impl, DblClkHdl)
 
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 //  --------------------------------------------------------------------------
 //                          Functions for right Page
@@ -1086,7 +1086,7 @@ void FormulaDlg_Impl::SetData(sal_Int32 nFStart, sal_Int32 nNextFStart, sal_Int3
 
     FillDialog();
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg_Impl::EditThisFunc(sal_Int32 nFStart)
 {
     FormEditData* pData = m_pHelper->getFormEditData();
@@ -1581,9 +1581,9 @@ void FormulaDlg_Impl::UpdateParaWin(const Selection& _rSelection, const OUString
     theSel.Max() = theSel.Min() + _sRefStr.getLength();
     aEdRef.SetSelection( theSel );
 
-    //-------------------------------------
+
     // Manual Update of the results' fields:
-    //-------------------------------------
+
     sal_uInt16 nPrivActiv = pParaWin->GetActiveLine();
     pParaWin->SetArgument(nPrivActiv,aEdRef.GetText());
     pParaWin->UpdateParas();
@@ -1630,7 +1630,7 @@ void FormulaDlg_Impl::SetEdSelection()
         pEd->SetSelection(theSel);
     } // if( pEd )
 }
-// -----------------------------------------------------------------------------
+
 const FormulaHelper& FormulaDlg_Impl::GetFormulaHelper()  const
 {
     return m_aFormulaHelper;
@@ -1654,24 +1654,24 @@ FormulaModalDialog::FormulaModalDialog( Window* pParent
 FormulaModalDialog::~FormulaModalDialog()
 {
 }
-// -----------------------------------------------------------------------------
+
 void FormulaModalDialog::Update(const OUString& _sExp)
 {
     m_pImpl->Update(_sExp);
 }
 
-// -----------------------------------------------------------------------------
+
 void FormulaModalDialog::SetMeText(const OUString& _sText)
 {
     m_pImpl->SetMeText(_sText);
 }
 
-// -----------------------------------------------------------------------------
+
 bool FormulaModalDialog::CheckMatrix(OUString& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
 }
-// -----------------------------------------------------------------------------
+
 void FormulaModalDialog::Update()
 {
     m_pImpl->Update();
@@ -1743,39 +1743,39 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW,
 FormulaDlg::~FormulaDlg()
 {
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg::Update(const OUString& _sExp)
 {
     m_pImpl->Update(_sExp);
 }
 
-// -----------------------------------------------------------------------------
+
 void FormulaDlg::SetMeText(const OUString& _sText)
 {
     m_pImpl->SetMeText(_sText);
 }
 
-// -----------------------------------------------------------------------------
+
 FormulaDlgMode FormulaDlg::SetMeText(const OUString& _sText, sal_Int32 PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate)
 {
     return m_pImpl->SetMeText(_sText,PrivStart, PrivEnd,bMatrix,_bSelect,_bUpdate);
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg::CheckMatrix()
 {
     m_pImpl->aBtnMatrix.Check();
 }
-// -----------------------------------------------------------------------------
+
 bool FormulaDlg::CheckMatrix(OUString& aFormula)
 {
     return m_pImpl->CheckMatrix(aFormula);
 }
-// -----------------------------------------------------------------------------
+
 OUString FormulaDlg::GetMeText() const
 {
     return m_pImpl->pMEdit->GetText();
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg::Update()
 {
     m_pImpl->Update();
@@ -1836,13 +1836,13 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
     m_pImpl->StoreFormEditData(pData);
 }
 
-// -----------------------------------------------------------------------------
+
 const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
 {
     OSL_VERIFY(!m_pImpl->pFuncDesc || m_pImpl->pFuncDesc->getSuppressedArgumentCount() == m_pImpl->nArgs);
     return m_pImpl->pFuncDesc;
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg::UpdateParaWin(const Selection& _rSelection,const OUString& _sRefStr)
 {
     m_pImpl->UpdateParaWin(_rSelection,_sRefStr);
@@ -1851,17 +1851,17 @@ bool FormulaDlg::UpdateParaWin(Selection& _rSelection)
 {
     return m_pImpl->UpdateParaWin(_rSelection);
 }
-// -----------------------------------------------------------------------------
+
 RefEdit*    FormulaDlg::GetActiveEdit()
 {
     return m_pImpl->pParaWin->GetActiveEdit();
 }
-// -----------------------------------------------------------------------------
+
 const FormulaHelper& FormulaDlg::GetFormulaHelper() const
 {
     return m_pImpl->GetFormulaHelper();
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDlg::SetEdSelection()
 {
     m_pImpl->SetEdSelection();
@@ -1879,7 +1879,7 @@ IMPL_LINK_NOARG(FormulaDlg, UpdateFocusHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 void FormEditData::SaveValues()
 {
     FormEditData* pTemp = new FormEditData(*this);
@@ -1887,7 +1887,7 @@ void FormEditData::SaveValues()
     Reset();
     pParent = pTemp;
 }
-// -----------------------------------------------------------------------------
+
 void FormEditData::Reset()
 {
     pParent = NULL;
@@ -1903,7 +1903,7 @@ void FormEditData::Reset()
     aSelection.Max()=0;
     aUndoStr = "";
 }
-// -----------------------------------------------------------------------------
+
 const FormEditData& FormEditData::operator=( const FormEditData& r )
 {
     pParent         = r.pParent;
@@ -1919,7 +1919,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r )
     aSelection      = r.aSelection;
     return *this;
 }
-// -----------------------------------------------------------------------------
+
 FormEditData::FormEditData()
 {
     Reset();
@@ -1935,8 +1935,8 @@ FormEditData::FormEditData( const FormEditData& r )
     *this = r;
 }
 
-// -----------------------------------------------------------------------------
+
 } // formula
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index 6b4c49d97066..b73556ecf408 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -99,7 +99,7 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager):
     aLbFunction.SetSelectHdl( LINK( this, FuncPage, SelHdl ) );
     aLbFunction.SetDoubleClickHdl( LINK( this, FuncPage, DblClkHdl ) );
 }
-// -----------------------------------------------------------------------------
+
 void FuncPage::impl_addFunctions(const IFunctionCategory* _pCategory)
 {
     const sal_uInt32 nCount = _pCategory->getCount();
@@ -122,7 +122,7 @@ void FuncPage::UpdateFunctionList()
 
     aLbFunction.Clear();
     aLbFunction.SetUpdateMode( false );
-    //------------------------------------------------------
+
 
     if ( nSelPos > 0 )
     {
@@ -155,7 +155,7 @@ void FuncPage::UpdateFunctionList()
         }
     }
 
-    //------------------------------------------------------
+
     aLbFunction.SetUpdateMode( true );
     aLbFunction.SelectEntryPos(0);
 
diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx
index 81bb9f50244a..5928a4dc249c 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -29,7 +29,7 @@
 #include "formula/IFunctionDescription.hxx"
 #include "ForResId.hrc"
 
-//----------------------------------------------------------------------------
+
 namespace formula
 {
 StructListBox::StructListBox(Window* pParent, const ResId& rResId ):
diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx
index ec6f68b20622..6b360d0fa77a 100644
--- a/formula/source/ui/resource/ModuleHelper.cxx
+++ b/formula/source/ui/resource/ModuleHelper.cxx
@@ -55,7 +55,7 @@ public:
 };
 
 DBG_NAME( rpt_OModuleImpl )
-//-------------------------------------------------------------------------
+
 OModuleImpl::OModuleImpl()
     :m_pResources(NULL)
 {
@@ -63,7 +63,7 @@ OModuleImpl::OModuleImpl()
 
 }
 
-//-------------------------------------------------------------------------
+
 OModuleImpl::~OModuleImpl()
 {
     if (m_pResources)
@@ -72,7 +72,7 @@ OModuleImpl::~OModuleImpl()
     DBG_DTOR( rpt_OModuleImpl,NULL);
 }
 
-//-------------------------------------------------------------------------
+
 ResMgr* OModuleImpl::getResManager()
 {
     // note that this method is not threadsafe, which counts for the whole class !
@@ -95,21 +95,21 @@ namespace
 }
 sal_Int32       OModule::s_nClients = 0;
 OModuleImpl*    OModule::s_pImpl = NULL;
-//-------------------------------------------------------------------------
+
 ResMgr* OModule::getResManager()
 {
     ENTER_MOD_METHOD();
     return s_pImpl->getResManager();
 }
 
-//-------------------------------------------------------------------------
+
 void OModule::registerClient()
 {
     ::osl::MutexGuard aGuard(theOModuleMutex::get());
     ++s_nClients;
 }
 
-//-------------------------------------------------------------------------
+
 void OModule::revokeClient()
 {
     ::osl::MutexGuard aGuard(theOModuleMutex::get());
@@ -120,7 +120,7 @@ void OModule::revokeClient()
     }
 }
 
-//-------------------------------------------------------------------------
+
 void OModule::ensureImpl()
 {
     if (s_pImpl)
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx
index 3a5cb879bb67..d7518de9a46b 100644
--- a/fpicker/source/office/OfficeControlAccess.cxx
+++ b/fpicker/source/office/OfficeControlAccess.cxx
@@ -45,10 +45,10 @@ namespace svt
     using namespace CommonFilePickerElementIds;
     using namespace InternalFilePickerElementIds;
 
-    // --------------------------------------------------------------------
+
     namespace
     {
-        // ----------------------------------------------------------------
+
         #define PROPERTY_FLAG_TEXT                  0x00000001
         #define PROPERTY_FLAG_ENDBALED              0x00000002
         #define PROPERTY_FLAG_VISIBLE               0x00000004
@@ -58,7 +58,7 @@ namespace svt
         #define PROPERTY_FLAG_SELECTEDITEMINDEX     0x00000040
         #define PROPERTY_FLAG_CHECKED               0x00000080
 
-        // ----------------------------------------------------------------
+
         // ................................................................
         struct ControlDescription
         {
@@ -121,7 +121,7 @@ namespace svt
             }
         };
 
-        // ----------------------------------------------------------------
+
         // ................................................................
         struct ControlProperty
         {
@@ -161,7 +161,7 @@ namespace svt
             }
         };
 
-        //-----------------------------------------------------------------
+
         void lcl_throwIllegalArgumentException( ) SAL_THROW( (IllegalArgumentException) )
         {
             throw IllegalArgumentException();
@@ -169,7 +169,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     OControlAccess::OControlAccess( IFilePickerController* _pController, SvtFileView* _pFileView )
         :m_pFilePickerController( _pController )
         ,m_pFileView( _pFileView )
@@ -177,7 +177,7 @@ namespace svt
         DBG_ASSERT( m_pFilePickerController, "OControlAccess::OControlAccess: invalid control locator!" );
     }
 
-    //---------------------------------------------------------------------
+
     void OControlAccess::setHelpURL( Window* _pControl, const OUString& sHelpURL, sal_Bool _bFileView )
     {
         OUString sHelpID( sHelpURL );
@@ -194,7 +194,7 @@ namespace svt
             _pControl->SetHelpId( sID );
     }
 
-    //---------------------------------------------------------------------
+
     OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView )
     {
         OString aHelpId = _pControl->GetHelpId();
@@ -211,7 +211,7 @@ namespace svt
         return sHelpURL;
     }
 
-    // --------------------------------------------------------------------------
+
     Any OControlAccess::getControlProperty( const OUString& _rControlName, const OUString& _rControlProperty )
     {
         // look up the control
@@ -233,7 +233,7 @@ namespace svt
         return implGetControlProperty( pControl, aPropDesc->nPropertyId );
     }
 
-    //---------------------------------------------------------------------
+
     Control* OControlAccess::implGetControl( const OUString& _rControlName, sal_Int16* _pId, sal_Int32* _pPropertyMask ) const SAL_THROW( (IllegalArgumentException) )
     {
         Control* pControl = NULL;
@@ -261,7 +261,7 @@ namespace svt
         return pControl;
     }
 
-    //---------------------------------------------------------------------
+
     void OControlAccess::setControlProperty( const OUString& _rControlName, const OUString& _rControlProperty, const ::com::sun::star::uno::Any& _rValue )
     {
         // look up the control
@@ -278,7 +278,7 @@ namespace svt
         implSetControlProperty( nControlId, pControl, aPropDesc->nPropertyId, _rValue, sal_False );
     }
 
-    // --------------------------------------------------------------------------
+
     Sequence< OUString > OControlAccess::getSupportedControls(  )
     {
         Sequence< OUString > aControls( s_nControlCount );
@@ -295,7 +295,7 @@ namespace svt
         return aControls;
     }
 
-    // --------------------------------------------------------------------------
+
     Sequence< OUString > OControlAccess::getSupportedControlProperties( const OUString& _rControlName )
     {
         sal_Int16 nControlId = -1;
@@ -315,7 +315,7 @@ namespace svt
         return aProps;
     }
 
-    // --------------------------------------------------------------------------
+
     sal_Bool OControlAccess::isControlSupported( const OUString& _rControlName )
     {
         ControlDescription tmpDesc;
@@ -323,7 +323,7 @@ namespace svt
         return ::std::binary_search( s_pControls, s_pControlsEnd, tmpDesc, ControlDescriptionLookup() );
     }
 
-    // --------------------------------------------------------------------------
+
     sal_Bool OControlAccess::isControlPropertySupported( const OUString& _rControlName, const OUString& _rControlProperty )
     {
         // look up the control
@@ -341,7 +341,7 @@ namespace svt
         return 0 != ( aPropDesc->nPropertyId & nPropertyMask );
     }
 
-    //-----------------------------------------------------------------------------
+
     void OControlAccess::setValue( sal_Int16 _nControlId, sal_Int16 _nControlAction, const Any& _rValue )
     {
         Control* pControl = m_pFilePickerController->getControl( _nControlId );
@@ -392,7 +392,7 @@ namespace svt
         }
     }
 
-    //-----------------------------------------------------------------------------
+
     Any OControlAccess::getValue( sal_Int16 _nControlId, sal_Int16 _nControlAction ) const
     {
         Any aRet;
@@ -460,7 +460,7 @@ namespace svt
         return aRet;
     }
 
-    //-----------------------------------------------------------------------------
+
     void OControlAccess::setLabel( sal_Int16 nId, const OUString &rLabel )
     {
         Control* pControl = m_pFilePickerController->getControl( nId, sal_True );
@@ -469,7 +469,7 @@ namespace svt
             pControl->SetText( rLabel );
     }
 
-    //-----------------------------------------------------------------------------
+
     OUString OControlAccess::getLabel( sal_Int16 nId ) const
     {
         OUString sLabel;
@@ -482,13 +482,13 @@ namespace svt
         return sLabel;
     }
 
-    //-----------------------------------------------------------------------------
+
     void OControlAccess::enableControl( sal_Int16 _nId, sal_Bool _bEnable )
     {
         m_pFilePickerController->enableControl( _nId, _bEnable );
     }
 
-    // -----------------------------------------------------------------------
+
     void OControlAccess::implDoListboxAction( ListBox* _pListbox, sal_Int16 _nControlAction, const Any& _rValue )
     {
         switch ( _nControlAction )
@@ -532,7 +532,7 @@ namespace svt
         }
     }
 
-    //-----------------------------------------------------------------------------
+
     void OControlAccess::implSetControlProperty( sal_Int16 _nControlId, Control* _pControl, sal_Int16 _nProperty, const Any& _rValue, sal_Bool _bIgnoreIllegalArgument )
     {
         if ( !_pControl )
@@ -688,7 +688,7 @@ namespace svt
         }
     }
 
-    //-----------------------------------------------------------------------------
+
     Any OControlAccess::implGetControlProperty( Control* _pControl, sal_Int16 _nProperty ) const
     {
         DBG_ASSERT( _pControl, "OControlAccess::implGetControlProperty: invalid argument, this will crash!" );
diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx
index 524330925954..5c6bbfabfc31 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -93,20 +93,20 @@ public:
 
 //=====================================================================
 
-//---------------------------------------------------------------------
+
 FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
     :m_sTitle( _rTitle )
     ,m_aSubFilters( _rSubFilters )
 {
 }
 
-//---------------------------------------------------------------------
+
 sal_Bool FilterEntry::hasSubFilters( ) const
 {
     return ( 0 < m_aSubFilters.getLength() );
 }
 
-//---------------------------------------------------------------------
+
 sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
 {
     _rSubFilterList = m_aSubFilters;
@@ -144,7 +144,7 @@ ElementEntry_Impl::ElementEntry_Impl( sal_Int16 nId )
     , m_bHasEnabled( sal_False )
 {}
 
-//------------------------------------------------------------------------------------
+
 void SvtFilePicker::prepareExecute()
 {
     // set the default directory
@@ -222,7 +222,7 @@ void SvtFilePicker::prepareExecute()
 
 }
 
-//-----------------------------------------------------------------------------
+
 IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog*, pDlg )
 {
     if ( m_xDlgClosedListener.is() )
@@ -235,11 +235,11 @@ IMPL_LINK( SvtFilePicker, DialogClosedHdl, Dialog*, pDlg )
     return 0;
 }
 
-//------------------------------------------------------------------------------------
+
 // SvtFilePicker
-//------------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------------
+
+
 WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits )
 {
     // set the winbits for creating the filedialog
@@ -307,7 +307,7 @@ WinBits SvtFilePicker::getWinBits( WinBits& rExtraBits )
     return nBits;
 }
 
-//------------------------------------------------------------------------------------
+
 void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId )
 {
     if ( !m_xListener.is() )
@@ -338,7 +338,7 @@ void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId )
     }
 }
 
-//------------------------------------------------------------------------------------
+
 namespace {
     //................................................................................
     struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool >
@@ -374,7 +374,7 @@ namespace {
     };
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Bool SvtFilePicker::FilterNameExists( const OUString& rTitle )
 {
     sal_Bool bRet = sal_False;
@@ -390,7 +390,7 @@ sal_Bool SvtFilePicker::FilterNameExists( const OUString& rTitle )
     return bRet;
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Bool SvtFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )
 {
     sal_Bool bRet = sal_False;
@@ -409,7 +409,7 @@ sal_Bool SvtFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters
     return bRet;
 }
 
-//------------------------------------------------------------------------------------
+
 void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
 {
     if ( !m_pFilterList )
@@ -422,9 +422,9 @@ void SvtFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
     }
 }
 
-//------------------------------------------------------------------------------------
+
 // class SvtFilePicker
-//------------------------------------------------------------------------------------
+
 SvtFilePicker::SvtFilePicker( const Reference < XMultiServiceFactory >& xFactory )
     :OCommonPicker( xFactory )
     ,m_pFilterList      ( NULL )
@@ -445,7 +445,7 @@ SvtFilePicker::~SvtFilePicker()
     delete m_pElemList;
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Int16 SvtFilePicker::implExecutePicker( )
 {
     getDialog()->SetFileCallback( this );
@@ -463,7 +463,7 @@ sal_Int16 SvtFilePicker::implExecutePicker( )
     return nRet;
 }
 
-//------------------------------------------------------------------------------------
+
 SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent )
 {
     WinBits nExtraBits;
@@ -482,43 +482,43 @@ SvtFileDialog* SvtFilePicker::implCreateDialog( Window* _pParent )
     return dialog;
 }
 
-//------------------------------------------------------------------------------------
+
 // disambiguate XInterface
-//------------------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base )
 
-//------------------------------------------------------------------------------------
+
 // disambiguate XTypeProvider
-//------------------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvtFilePicker, OCommonPicker, SvtFilePicker_Base )
 
-//------------------------------------------------------------------------------------
+
 // XExecutableDialog functions
-//------------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------------
+
+
 void SAL_CALL SvtFilePicker::setTitle( const OUString& _rTitle ) throw (RuntimeException)
 {
     OCommonPicker::setTitle( _rTitle );
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL SvtFilePicker::execute(  ) throw (RuntimeException)
 {
     return OCommonPicker::execute();
 }
 
-//------------------------------------------------------------------------------------
+
 // XAsynchronousExecutableDialog functions
-//------------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------------
+
+
 void SAL_CALL SvtFilePicker::setDialogTitle( const OUString& _rTitle ) throw (RuntimeException)
 {
     setTitle( _rTitle );
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener )
     throw (RuntimeException,
            std::exception)
@@ -530,9 +530,9 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const Reference< ::com::sun::sta
     getDialog()->StartExecuteModal( LINK( this, SvtFilePicker, DialogClosedHdl ) );
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePicker functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SvtFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( RuntimeException )
 {
@@ -625,9 +625,9 @@ Sequence< OUString > SAL_CALL SvtFilePicker::getFiles() throw( RuntimeException
     return aPath;
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePickerControlAccess functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
                                        sal_Int16 nControlAction,
@@ -673,7 +673,7 @@ void SAL_CALL SvtFilePicker::setValue( sal_Int16 nElementID,
     }
 }
 
-//------------------------------------------------------------------------------------
+
 
 Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAction )
     throw( RuntimeException )
@@ -710,7 +710,7 @@ Any SAL_CALL SvtFilePicker::getValue( sal_Int16 nElementID, sal_Int16 nControlAc
 }
 
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValue )
     throw ( RuntimeException )
 {
@@ -750,7 +750,7 @@ void SAL_CALL SvtFilePicker::setLabel( sal_Int16 nLabelID, const OUString& rValu
     }
 }
 
-//------------------------------------------------------------------------------------
+
 OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
     throw ( RuntimeException )
 {
@@ -783,7 +783,7 @@ OUString SAL_CALL SvtFilePicker::getLabel( sal_Int16 nLabelID )
     return aLabel;
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnable )
     throw( RuntimeException )
 {
@@ -823,9 +823,9 @@ void SAL_CALL SvtFilePicker::enableControl( sal_Int16 nElementID, sal_Bool bEnab
     }
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePickerNotifier functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePickerListener >& xListener ) throw ( RuntimeException )
 {
@@ -835,7 +835,7 @@ void SAL_CALL SvtFilePicker::addFilePickerListener( const Reference< XFilePicker
     m_xListener = xListener;
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePickerListener >& ) throw ( RuntimeException )
 {
     checkAlive();
@@ -844,9 +844,9 @@ void SAL_CALL SvtFilePicker::removeFilePickerListener( const Reference< XFilePic
     m_xListener.clear();
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePreview functions
-//------------------------------------------------------------------------------------
+
 
 Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
     throw ( RuntimeException )
@@ -861,7 +861,7 @@ Sequence< sal_Int16 > SAL_CALL SvtFilePicker::getSupportedImageFormats()
     return aFormats;
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException )
 {
     checkAlive();
@@ -875,7 +875,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getTargetColorDepth() throw ( RuntimeException
     return nDepth;
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException )
 {
     checkAlive();
@@ -889,7 +889,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableWidth() throw ( RuntimeException )
     return nWidth;
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException )
 {
     checkAlive();
@@ -903,7 +903,7 @@ sal_Int32 SAL_CALL SvtFilePicker::getAvailableHeight() throw ( RuntimeException
     return nHeight;
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage )
     throw ( IllegalArgumentException, RuntimeException )
 {
@@ -914,7 +914,7 @@ void SAL_CALL SvtFilePicker::setImage( sal_Int16 aImageFormat, const Any& rImage
         getDialog()->setImage( aImageFormat, rImage );
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
     throw ( RuntimeException )
 {
@@ -929,7 +929,7 @@ sal_Bool SAL_CALL SvtFilePicker::setShowState( sal_Bool bShowState )
     return bRet;
 }
 
-//------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException )
 {
     checkAlive();
@@ -943,9 +943,9 @@ sal_Bool SAL_CALL SvtFilePicker::getShowState() throw ( RuntimeException )
     return bRet;
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilterGroupManager functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
                                                 const Sequence< StringPair >& aFilters )
@@ -971,9 +971,9 @@ void SAL_CALL SvtFilePicker::appendFilterGroup( const OUString& sGroupTitle,
     m_pFilterList->insert( m_pFilterList->end(), FilterEntry( sGroupTitle, aFilters ) );
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilterManager functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
                                            const OUString& aFilter )
@@ -994,7 +994,7 @@ void SAL_CALL SvtFilePicker::appendFilter( const OUString& aTitle,
     m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) );
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
     throw( IllegalArgumentException, RuntimeException )
 {
@@ -1010,7 +1010,7 @@ void SAL_CALL SvtFilePicker::setCurrentFilter( const OUString& aTitle )
         getDialog()->SetCurFilter( aTitle );
 }
 
-//------------------------------------------------------------------------------------
+
 OUString SAL_CALL SvtFilePicker::getCurrentFilter()
     throw( RuntimeException )
 {
@@ -1023,9 +1023,9 @@ OUString SAL_CALL SvtFilePicker::getCurrentFilter()
 }
 
 
-//------------------------------------------------------------------------------------
+
 // XInitialization functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
     throw ( Exception, RuntimeException )
@@ -1081,7 +1081,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments )
     OCommonPicker::initialize( aArguments );
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
 {
     if ( _rName == "TemplateDescription" )
@@ -1107,9 +1107,9 @@ sal_Bool SvtFilePicker::implHandleInitializationArgument( const OUString& _rName
     return OCommonPicker::implHandleInitializationArgument( _rName, _rValue );
 }
 
-//------------------------------------------------------------------------------------
+
 // XServiceInfo
-//------------------------------------------------------------------------------------
+
 
 /* XServiceInfo */
 OUString SAL_CALL SvtFilePicker::getImplementationName() throw( RuntimeException )
diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx
index 012bad46a8b3..d2763257d25b 100644
--- a/fpicker/source/office/asyncfilepicker.cxx
+++ b/fpicker/source/office/asyncfilepicker.cxx
@@ -34,7 +34,7 @@ namespace svt
     //= AsyncPickerAction
     //====================================================================
     DBG_NAME( AsyncPickerAction )
-    //--------------------------------------------------------------------
+
     AsyncPickerAction::AsyncPickerAction( SvtFileDialog* _pDialog, SvtFileView* _pView, const Action _eAction )
         :m_refCount ( 0        )
         ,m_eAction  ( _eAction )
@@ -47,19 +47,19 @@ namespace svt
         DBG_ASSERT( m_pView, "AsyncPickerAction::AsyncPickerAction: invalid view!" );
     }
 
-    //--------------------------------------------------------------------
+
     AsyncPickerAction::~AsyncPickerAction()
     {
         DBG_DTOR( AsyncPickerAction, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AsyncPickerAction::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AsyncPickerAction::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -70,7 +70,7 @@ namespace svt
         return m_refCount;
     }
 
-    //--------------------------------------------------------------------
+
     void AsyncPickerAction::cancel()
     {
         DBG_TESTSOLARMUTEX();
@@ -81,7 +81,7 @@ namespace svt
             m_pView->CancelRunningAsyncAction();
     }
 
-    //--------------------------------------------------------------------
+
     void AsyncPickerAction::execute(
         const OUString& _rURL,
         const OUString& _rFilter,
@@ -151,7 +151,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( AsyncPickerAction, OnActionDone, void*, pEmptyArg )
     {
         DBG_TESTSOLARMUTEX();
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 5f2d8424516d..3602918efc28 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -45,7 +45,7 @@ namespace svt
     using namespace     ::com::sun::star::beans;
     using namespace     ::comphelper;
 
-    //---------------------------------------------------------------------
+
     OCommonPicker::OCommonPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory )
         :OCommonPicker_Base( m_aMutex )
         ,OPropertyContainer( GetBroadcastHelper() )
@@ -68,7 +68,7 @@ namespace svt
         );
     }
 
-    //---------------------------------------------------------------------
+
     OCommonPicker::~OCommonPicker()
     {
         if ( !GetBroadcastHelper().bDisposed )
@@ -78,19 +78,19 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     // disambiguate XInterface
-    //---------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OCommonPicker, OCommonPicker_Base, OPropertyContainer )
 
-    //---------------------------------------------------------------------
+
     // disambiguate XTypeProvider
-    //---------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCommonPicker, OCommonPicker_Base, OPropertyContainer )
 
-    //---------------------------------------------------------------------
+
     // XComponent related methods
-    //---------------------------------------------------------------------
+
     void OCommonPicker::checkAlive() const SAL_THROW( (DisposedException) )
     {
         if ( GetBroadcastHelper().bInDispose || GetBroadcastHelper().bDisposed )
@@ -107,7 +107,7 @@ namespace svt
             getDialog()->SetText( m_aTitle );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::disposing()
     {
         SolarMutexGuard aGuard;
@@ -129,16 +129,16 @@ namespace svt
         m_xDialogParent = NULL;
     }
 
-    //---------------------------------------------------------------------
+
     void OCommonPicker::stopWindowListening()
     {
         disposeComponent( m_xWindowListenerAdapter );
         disposeComponent( m_xParentListenerAdapter );
     }
 
-    //---------------------------------------------------------------------
+
     // XEventListener
-    //---------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -162,9 +162,9 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     // property set related methods
-    //---------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OCommonPicker::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -172,19 +172,19 @@ namespace svt
         return new cppu::OPropertyArrayHelper( aProps );
     }
 
-    //---------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL OCommonPicker::getInfoHelper()
     {
         return *const_cast< OCommonPicker* >( this )->getArrayHelper();
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL OCommonPicker::getPropertySetInfo(  ) throw(RuntimeException)
     {
         return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception)
     {
         OPropertyContainer::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
@@ -196,7 +196,7 @@ namespace svt
     }
 
 
-    //---------------------------------------------------------------------
+
     sal_Bool OCommonPicker::createPicker()
     {
         SolarMutexGuard aGuard;
@@ -245,9 +245,9 @@ namespace svt
         return NULL != m_pDlg;
     }
 
-    //---------------------------------------------------------------------
+
     // XControlAccess functions
-    //---------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const Any& aValue ) throw (IllegalArgumentException, RuntimeException)
     {
         checkAlive();
@@ -260,7 +260,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     Any SAL_CALL OCommonPicker::getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)
     {
         checkAlive();
@@ -275,9 +275,9 @@ namespace svt
         return Any();
     }
 
-    //---------------------------------------------------------------------
+
     // XControlInformation functions
-    //---------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControls(  ) throw (RuntimeException)
     {
         checkAlive();
@@ -292,7 +292,7 @@ namespace svt
         return Sequence< OUString >();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool SAL_CALL OCommonPicker::isControlSupported( const OUString& aControlName ) throw (RuntimeException)
     {
         checkAlive();
@@ -307,7 +307,7 @@ namespace svt
         return sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OCommonPicker::getSupportedControlProperties( const OUString& aControlName ) throw (IllegalArgumentException, RuntimeException)
     {
         checkAlive();
@@ -322,7 +322,7 @@ namespace svt
         return Sequence< OUString >();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool SAL_CALL OCommonPicker::isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (IllegalArgumentException, RuntimeException)
     {
         checkAlive();
@@ -337,16 +337,16 @@ namespace svt
         return sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     // XExecutableDialog functions
-    //---------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::setTitle( const OUString& _rTitle ) throw( RuntimeException )
     {
         SolarMutexGuard aGuard;
         m_aTitle = _rTitle;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int16 OCommonPicker::execute() throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -366,9 +366,9 @@ namespace svt
         return nResult;
     }
 
-    //---------------------------------------------------------------------
+
     // XCancellable functions
-    //---------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::cancel(  ) throw (RuntimeException)
     {
         {
@@ -391,7 +391,7 @@ namespace svt
         m_nCancelEvent = Application::PostUserEvent( LINK( this, OCommonPicker, OnCancelPicker ) );
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OCommonPicker, OnCancelPicker)
     {
         // By definition, the solar mutex is locked when we arrive here. Note that this
@@ -412,9 +412,9 @@ namespace svt
         return 0L;
     }
 
-    //------------------------------------------------------------------------------------
+
     // XInitialization functions
-    //------------------------------------------------------------------------------------
+
     void SAL_CALL OCommonPicker::initialize( const Sequence< Any >& _rArguments )
         throw ( Exception, RuntimeException )
     {
@@ -475,7 +475,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OCommonPicker::implHandleInitializationArgument( const OUString& _rName, const Any& _rValue ) SAL_THROW( ( Exception, RuntimeException ) )
     {
         sal_Bool bKnown = sal_True;
diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx
index 78a441b65d23..6072f11fbe37 100644
--- a/fpicker/source/office/fpinteraction.cxx
+++ b/fpicker/source/office/fpinteraction.cxx
@@ -37,7 +37,7 @@ namespace svt
     //= OFilePickerInteractionHandler
     //====================================================================
     DBG_NAME( OFilePickerInteractionHandler )
-    //--------------------------------------------------------------------
+
     OFilePickerInteractionHandler::OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster )
         :m_xMaster( _rxMaster )
         ,m_bUsed( sal_False )
@@ -47,13 +47,13 @@ namespace svt
         DBG_ASSERT( m_xMaster.is(), "OFilePickerInteractionHandler::OFilePickerInteractionHandler: invalid master handler!" );
     }
 
-    //--------------------------------------------------------------------
+
     OFilePickerInteractionHandler::~OFilePickerInteractionHandler( )
     {
         DBG_DTOR( OFilePickerInteractionHandler, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OFilePickerInteractionHandler::handle( const Reference< XInteractionRequest >& _rxRequest ) throw (RuntimeException)
     {
         if (!_rxRequest.is())
@@ -115,31 +115,31 @@ namespace svt
         m_xMaster->handle(_rxRequest);
     }
 
-    //--------------------------------------------------------------------
+
     void OFilePickerInteractionHandler::enableInterceptions( EInterceptedInteractions eInterceptions )
     {
         m_eInterceptions = eInterceptions;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OFilePickerInteractionHandler::wasUsed() const
     {
         return m_bUsed;
     }
 
-    //--------------------------------------------------------------------
+
     void OFilePickerInteractionHandler::resetUseState()
     {
         m_bUsed = sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     void OFilePickerInteractionHandler::forgetRequest()
     {
         m_aException = Any();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OFilePickerInteractionHandler::wasAccessDenied() const
     {
         InteractiveIOException aIoException;
diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx
index afd374ba5ca0..e12a4a91ed47 100644
--- a/fpicker/source/office/fpsmartcontent.cxx
+++ b/fpicker/source/office/fpsmartcontent.cxx
@@ -44,7 +44,7 @@ namespace svt
     //====================================================================
     //= SmartContent
     //====================================================================
-    //--------------------------------------------------------------------
+
     SmartContent::SmartContent()
         :m_pContent( NULL )
         ,m_eState( NOT_BOUND )
@@ -52,7 +52,7 @@ namespace svt
     {
     }
 
-    //--------------------------------------------------------------------
+
     SmartContent::SmartContent( const OUString& _rInitialURL )
         :m_pContent( NULL )
         ,m_eState( NOT_BOUND )
@@ -61,7 +61,7 @@ namespace svt
         bindTo( _rInitialURL );
     }
 
-    //--------------------------------------------------------------------
+
     SmartContent::~SmartContent()
     {
         /* This destructor originally contained the following blurb: "Do
@@ -78,7 +78,7 @@ namespace svt
         delete m_pContent;
     }
 
-    //--------------------------------------------------------------------
+
     void SmartContent::enableOwnInteractionHandler(::svt::OFilePickerInteractionHandler::EInterceptedInteractions eInterceptions)
     {
         Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext();
@@ -92,7 +92,7 @@ namespace svt
         m_xCmdEnv = new ::ucbhelper::CommandEnvironment( m_xOwnInteraction, Reference< XProgressHandler >() );
     }
 
-    //--------------------------------------------------------------------
+
     void SmartContent::enableDefaultInteractionHandler()
     {
         // Don't free the memory here! It will be done by the next
@@ -106,7 +106,7 @@ namespace svt
         m_xCmdEnv = new ucbhelper::CommandEnvironment( xGlobalInteractionHandler, Reference< XProgressHandler >() );
     }
 
-    //--------------------------------------------------------------------
+
     ::svt::OFilePickerInteractionHandler* SmartContent::getOwnInteractionHandler() const
     {
         if (!m_xOwnInteraction.is())
@@ -114,7 +114,7 @@ namespace svt
         return m_pOwnInteraction;
     }
 
-    //--------------------------------------------------------------------
+
     SmartContent::InteractionHandlerType SmartContent::queryCurrentInteractionHandler() const
     {
         if (m_xOwnInteraction.is())
@@ -126,7 +126,7 @@ namespace svt
         return IHT_DEFAULT;
     }
 
-    //--------------------------------------------------------------------
+
     void SmartContent::disableInteractionHandler()
     {
         // Don't free the memory here! It will be done by the next
@@ -137,7 +137,7 @@ namespace svt
         m_xCmdEnv.clear();
     }
 
-    //--------------------------------------------------------------------
+
     void SmartContent::bindTo( const OUString& _rURL )
     {
         if ( getURL() == _rURL )
@@ -182,7 +182,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SmartContent::implIs( const OUString& _rURL, Type _eType )
     {
         // bind to this content
@@ -215,7 +215,7 @@ namespace svt
         return bIs;
     }
 
-    //--------------------------------------------------------------------
+
     void SmartContent::getTitle( OUString& /* [out] */ _rTitle )
     {
         if ( !isBound() || isInvalid() )
@@ -237,7 +237,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SmartContent::hasParentFolder( )
     {
         if ( !isBound() || isInvalid() )
@@ -268,7 +268,7 @@ namespace svt
         return bRet;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SmartContent::canCreateFolder( )
     {
         if ( !isBound() || isInvalid() )
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index f50209a6c9f6..2a643856db66 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -124,7 +124,7 @@ using namespace InternalFilePickerElementIds;
 namespace
 {
 
-    //-----------------------------------------------------------------------------
+
     OUString getMostCurrentFilter( SvtExpFileDlg_Impl* pImpl )
     {
         DBG_ASSERT( pImpl, "invalid impl pointer" );
@@ -139,7 +139,7 @@ namespace
         return pFilter->GetType();
     }
 
-    //-----------------------------------------------------------------------------
+
     sal_Bool restoreCurrentFilter( SvtExpFileDlg_Impl* _pImpl )
     {
         DBG_ASSERT( _pImpl->GetCurFilter(), "restoreCurrentFilter: no current filter!" );
@@ -156,7 +156,7 @@ namespace
         return _pImpl->m_bNeedDelayedFilterExecute;
     }
 
-    //-----------------------------------------------------------------------------
+
     OUString GetFsysExtension_Impl( const OUString& rFile, const OUString& rLastFilterExt )
     {
         sal_Int32 nDotPos = rFile.lastIndexOf( '.' );
@@ -173,7 +173,7 @@ namespace
         return OUString();
     }
 
-    //-----------------------------------------------------------------------------
+
     void SetFsysExtension_Impl( OUString& rFile, const OUString& rExtension )
     {
         const sal_Unicode* p0 = rFile.getStr();
@@ -189,7 +189,7 @@ namespace
         rFile += rExtension;
     }
 
-    //-----------------------------------------------------------------------------
+
     // move the control with the given offset
     void lcl_MoveControl( Control* _pControl, sal_Int32 _nDeltaX, sal_Int32 _nDeltaY, sal_Int32* _pMaxY = NULL )
     {
@@ -209,7 +209,7 @@ namespace
         }
     }
 
-    //-------------------------------------------------------------------------
+
     void lcl_autoUpdateFileExtension( SvtFileDialog* _pDialog, const OUString& _rLastFilterExt )
     {
         // if auto extension is enabled ....
@@ -264,7 +264,7 @@ namespace
         }
     }
 
-    //-------------------------------------------------------------------------
+
     sal_Bool lcl_getHomeDirectory( const OUString& _rForURL, OUString& /* [out] */ _rHomeDir )
     {
         _rHomeDir = "";
@@ -300,7 +300,7 @@ namespace
         return !_rHomeDir.isEmpty();
     }
 
-    //---------------------------------------------------------------------
+
     static OUString lcl_ensureFinalSlash( const OUString& _rDir )
     {
         INetURLObject aWorkPathObj( _rDir, INET_PROT_FILE );
@@ -308,7 +308,7 @@ namespace
         return  aWorkPathObj.GetMainURL( INetURLObject::NO_DECODE );
     }
 
-    // -----------------------------------------------------------------------
+
     /** retrieves the value of an environment variable
         @return <TRUE/> if and only if the retrieved string value is not empty
     */
@@ -802,7 +802,7 @@ IMPL_STATIC_LINK_NOINSTANCE( SvtFileDialog, ViewHdl_Impl, ImageButton*, EMPTYARG
     return 0;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter, sal_Bool _bAllowUserDefExt )
 {
     // delete the old user filter and create a new one
@@ -845,13 +845,13 @@ sal_Bool SvtFileDialog::createNewUserFilter( const OUString& _rNewFilter, sal_Bo
     return bIsAllFiles;
 }
 
-//-----------------------------------------------------------------------------
+
 #define FLT_NONEMPTY        0x0001
 #define FLT_CHANGED         0x0002
 #define FLT_USERFILTER      0x0004
 #define FLT_ALLFILESFILTER  0x0008
 
-//-----------------------------------------------------------------------------
+
 sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter )
 {
     sal_uInt16 nReturn = 0;
@@ -916,7 +916,7 @@ sal_uInt16 SvtFileDialog::adjustFilter( const OUString& _rFilter )
     return nReturn;
 }
 
-//-----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl)
 {
     if ( m_pCurrentAsyncAction.is() )
@@ -931,7 +931,7 @@ IMPL_LINK_NOARG(SvtFileDialog, CancelHdl_Impl)
     return 1L;
 }
 
-//-----------------------------------------------------------------------------
+
 IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid )
 {
     if ( pThis->_pImp->_bMultiSelection && pThis->_pFileView->GetSelectionCount() > 1 )
@@ -1766,7 +1766,7 @@ public:
 
 //*****************************************************************************
 
-//---------------------------------------------------------------------
+
 void SvtFileDialog::updateListboxLabelSizes()
 {
     sal_Int16 nLineControlId[5] = {
@@ -1816,7 +1816,7 @@ bool implIsInvalid( const OUString & rURL )
 
 }
 
-//---------------------------------------------------------------------
+
 OUString SvtFileDialog::implGetInitialURL( const OUString& _rPath, const OUString& _rFallback )
 {
     // an URL parser for the fallback
@@ -1868,7 +1868,7 @@ OUString SvtFileDialog::implGetInitialURL( const OUString& _rPath, const OUStrin
     return aURLParser.GetMainURL( INetURLObject::NO_DECODE );
 }
 
-//---------------------------------------------------------------------
+
 short SvtFileDialog::Execute()
 {
     if ( !PrepareExecute() )
@@ -1900,7 +1900,7 @@ short SvtFileDialog::Execute()
     return nResult;
 }
 
-//---------------------------------------------------------------------
+
 void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
 {
     PrepareExecute();
@@ -1909,7 +1909,7 @@ void SvtFileDialog::StartExecuteModal( const Link& rEndDialogHdl )
     ModalDialog::StartExecuteModal( rEndDialogHdl );
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::onAsyncOperationStarted()
 {
     EnableUI( sal_False );
@@ -1918,7 +1918,7 @@ void SvtFileDialog::onAsyncOperationStarted()
     _pImp->_pBtnCancel->GrabFocus();
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::onAsyncOperationFinished()
 {
     EnableUI( sal_True );
@@ -1929,13 +1929,13 @@ void SvtFileDialog::onAsyncOperationFinished()
         // and to the user, the operation appears to be synchronous)
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::RemovablePlaceSelected(bool enable)
 {
     _pImp->_pPlaces->SetDelEnabled( enable );
 }
 
-//-------------------------------------------------------------------------
+
 void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCode )
 {
     try
@@ -1973,7 +1973,7 @@ void SvtFileDialog::displayIOException( const OUString& _rURL, IOErrorCode _eCod
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::EnableUI( sal_Bool _bEnable )
 {
     Enable( _bEnable );
@@ -1990,7 +1990,7 @@ void SvtFileDialog::EnableUI( sal_Bool _bEnable )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )
 {
     if ( !_pControl )
@@ -2011,7 +2011,7 @@ void SvtFileDialog::EnableControl( Control* _pControl, sal_Bool _bEnable )
         m_aDisabledControls.insert( _pControl );
 }
 
-//----------------------------------------------------------------------------
+
 
 short SvtFileDialog::PrepareExecute()
 {
@@ -2196,7 +2196,7 @@ short SvtFileDialog::PrepareExecute()
     return 1;
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action _eAction,
                                     const OUString& _rURL, const OUString& _rFilter )
 {
@@ -2325,7 +2325,7 @@ void SvtFileDialog::AddFilterGroup( const OUString& _rFilter, const Sequence< St
         implAddFilter( pSubFilters->First, pSubFilters->Second );
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::SetCurFilter( const OUString& rFilter )
 {
     DBG_ASSERT( !IsInExecute(), "SvtFileDialog::SetCurFilter: currently executing!" );
@@ -2554,7 +2554,7 @@ sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& r
     return sal_True;
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::implUpdateImages( )
 {
     m_aImages = ImageList( SvtResId( RID_FILEPICKER_IMAGES ) );
@@ -2567,7 +2567,7 @@ void SvtFileDialog::implUpdateImages( )
         _pImp->_pBtnNewFolder->SetModeImage( GetButtonImage( IMG_FILEDLG_CREATEFOLDER ) );
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::DataChanged( const DataChangedEvent& _rDCEvt )
 {
     if ( DATACHANGED_SETTINGS == _rDCEvt.GetType() )
@@ -2576,7 +2576,7 @@ void SvtFileDialog::DataChanged( const DataChangedEvent& _rDCEvt )
     ModalDialog::DataChanged( _rDCEvt );
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialog::Resize()
 {
     if ( IsRollUp() )
@@ -2629,7 +2629,7 @@ void SvtFileDialog::Resize()
         // This resize was only called to show or hide the indicator.
         return;
 
-    // -------------
+
     // move controls
 
     // controls to move vertically
@@ -2672,7 +2672,7 @@ void SvtFileDialog::Resize()
             lcl_MoveControl( *ppMoveControls, nDeltaX, 0 );
     }
 
-    // ---------------
+
     // resize controls
     {
         Control* aSizeControls[] =
@@ -2717,7 +2717,7 @@ void SvtFileDialog::Resize()
         _pFileNotifier->notify( DIALOG_SIZE_CHANGED, 0 );
 }
 
-//-----------------------------------------------------------------------------
+
 Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool _bLabelControl ) const
 {
     Control* pReturn = NULL;
@@ -2842,7 +2842,7 @@ Control* SvtFileDialog::getControl( sal_Int16 _nControlId, sal_Bool _bLabelContr
     return pReturn;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileDialog::enableControl( sal_Int16 _nControlId, sal_Bool _bEnable )
 {
     Control* pControl = getControl( _nControlId, sal_False );
@@ -2853,7 +2853,7 @@ void SvtFileDialog::enableControl( sal_Int16 _nControlId, sal_Bool _bEnable )
         EnableControl( pLabel, _bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileDialog::AddControls_Impl( )
 {
     // create the "insert as link" checkbox, if needed
@@ -2968,7 +2968,7 @@ void SvtFileDialog::AddControls_Impl( )
     initDefaultPlaces();
 }
 
-// -----------------------------------------------------------------------
+
 sal_Int32 SvtFileDialog::getTargetColorDepth()
 {
     if ( _pPrevBmp )
@@ -2977,7 +2977,7 @@ sal_Int32 SvtFileDialog::getTargetColorDepth()
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Int32 SvtFileDialog::getAvailableWidth()
 {
     if ( _pPrevBmp )
@@ -2986,7 +2986,7 @@ sal_Int32 SvtFileDialog::getAvailableWidth()
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Int32 SvtFileDialog::getAvailableHeight()
 {
     if ( _pPrevBmp )
@@ -2995,7 +2995,7 @@ sal_Int32 SvtFileDialog::getAvailableHeight()
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileDialog::setImage( sal_Int16 /*aImageFormat*/, const Any& rImage )
 {
     if ( ! _pPrevBmp || ! _pPrevBmp->IsVisible() )
@@ -3020,7 +3020,7 @@ void SvtFileDialog::setImage( sal_Int16 /*aImageFormat*/, const Any& rImage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SvtFileDialog::setShowState( sal_Bool /*bShowState*/ )
 {
     // #97633 for the system filedialog it's
@@ -3038,7 +3038,7 @@ sal_Bool SvtFileDialog::setShowState( sal_Bool /*bShowState*/ )
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 OUString SvtFileDialog::getCurrentFileText( ) const
 {
     OUString sReturn;
@@ -3047,7 +3047,7 @@ OUString SvtFileDialog::getCurrentFileText( ) const
     return sReturn;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileDialog::setCurrentFileText( const OUString& _rText, bool _bSelectAll )
 {
     if ( _pImp && _pImp->_pEdFileName )
@@ -3058,13 +3058,13 @@ void SvtFileDialog::setCurrentFileText( const OUString& _rText, bool _bSelectAll
     }
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SvtFileDialog::isAutoExtensionEnabled()
 {
     return _pImp->_pCbAutoExtension && _pImp->_pCbAutoExtension->IsChecked();
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SvtFileDialog::getShowState()
 {
     if ( _pPrevBmp )
@@ -3073,7 +3073,7 @@ sal_Bool SvtFileDialog::getShowState()
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileDialog::ReleaseOwnership( Window* pUserControl )
 
 /*
@@ -3351,7 +3351,7 @@ QueryFolderNameDialog::QueryFolderNameDialog(Window* _pParent,
         m_pNameLine->set_label( *pGroupName );
 };
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl)
 {
     // trim the strings
@@ -3360,7 +3360,7 @@ IMPL_LINK_NOARG(QueryFolderNameDialog, OKHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(QueryFolderNameDialog, NameHdl)
 {
     // trim the strings
diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx
index d1a9b00b8f99..e8630a196aa4 100644
--- a/fpicker/source/office/iodlgimp.cxx
+++ b/fpicker/source/office/iodlgimp.cxx
@@ -98,7 +98,7 @@ SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl()
 //= SvtFileDialogURLSelector
 //=============================================================================
 
-//-----------------------------------------------------------------------------
+
 SvtFileDialogURLSelector::SvtFileDialogURLSelector( SvtFileDialog* _pParent, const ResId& _rResId, sal_uInt16 _nButtonId )
     :MenuButton ( _pParent, _rResId )
     ,m_pParent  ( _pParent )
@@ -110,13 +110,13 @@ SvtFileDialogURLSelector::SvtFileDialogURLSelector( SvtFileDialog* _pParent, con
     SetDropDown( PUSHBUTTON_DROPDOWN_TOOLBOX );
 }
 
-//-----------------------------------------------------------------------------
+
 SvtFileDialogURLSelector::~SvtFileDialogURLSelector()
 {
     delete m_pMenu;
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtFileDialogURLSelector::Activate()
 {
     m_pMenu->Clear();
@@ -130,18 +130,18 @@ void SvtFileDialogURLSelector::Activate()
 //= SvtUpButton_Impl
 //=============================================================================
 
-//-----------------------------------------------------------------------------
+
 SvtUpButton_Impl::SvtUpButton_Impl( SvtFileDialog* pParent, const ResId& rResId )
     :SvtFileDialogURLSelector( pParent, rResId, IMG_FILEDLG_BTN_UP )
 {
 }
 
-//-----------------------------------------------------------------------------
+
 SvtUpButton_Impl::~SvtUpButton_Impl()
 {
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
 {
     SvtFileView* pBox = GetDialogParent()->GetView();
@@ -184,7 +184,7 @@ void SvtUpButton_Impl::FillURLMenu( PopupMenu* _pMenu )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtUpButton_Impl::Select()
 {
     sal_uInt16 nId = GetCurItemId();
@@ -198,7 +198,7 @@ void SvtUpButton_Impl::Select()
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtUpButton_Impl::Click()
 {
     GetDialogParent()->PrevLevel_Impl();
@@ -287,7 +287,7 @@ void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir )
 
 //*****************************************************************************
 #if defined DBG_UTIL
-//-----------------------------------------------------------------------------
+
 namespace {
     OUString lcl_DecoratedFilter( const OUString& _rOriginalFilter )
     {
@@ -299,14 +299,14 @@ namespace {
     }
 }
 #endif
-//-----------------------------------------------------------------------------
+
 
 void SvtExpFileDlg_Impl::ClearFilterList( )
 {
     _pLbFilter->Clear();
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter, const OUString& rDisplayName )
 {
     DBG_ASSERT( pFilter, "SvtExpFileDlg_Impl::SetCurFilter: invalid filter!" );
@@ -318,7 +318,7 @@ void SvtExpFileDlg_Impl::SetCurFilter( SvtFileDialogFilter_Impl* pFilter, const
     m_sCurrentFilterDisplayName = rDisplayName;
 }
 
-//-----------------------------------------------------------------------------
+
 void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl* _pFilterDesc )
 {
     OUString sName = _pFilterDesc->GetName();
@@ -332,7 +332,7 @@ void SvtExpFileDlg_Impl::InsertFilterListEntry( const SvtFileDialogFilter_Impl*
     _pLbFilter->SetEntryData( nPos, const_cast< void* >( static_cast< const void* >( _pFilterDesc ) ) );
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SvtExpFileDlg_Impl::InitFilterList( )
 {
@@ -351,7 +351,7 @@ void SvtExpFileDlg_Impl::InitFilterList( )
         InsertFilterListEntry( &(*_pFilter)[ nPos-- ] );
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SvtExpFileDlg_Impl::CreateFilterListControl( Window* _pParent, const ResId& _rId )
 {
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index f314a5f19b22..d0ae05d4ae64 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -34,9 +34,9 @@
 #include "../folderpicker/FOPServiceInfo.hxx"
 #include "../folderpicker/WinFOPImpl.hxx"
 
-//-----------------------------------------------
+
 // namespace directives
-//-----------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::com::sun::star::uno       ;
@@ -47,9 +47,9 @@ using namespace ::cppu                      ;
 using ::com::sun::star::ui::dialogs::XFilePicker;
 using ::com::sun::star::ui::dialogs::XFilePicker2;
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 static Reference< XInterface > SAL_CALL createInstance(
     const Reference< XMultiServiceFactory >& rServiceManager )
diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
index a9eee26a1f77..0898bfe608bb 100644
--- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx
+++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx
@@ -22,9 +22,9 @@
 #include "../misc/WinImplHelper.hxx"
 #include "FileOpenDlg.hxx"
 
-//------------------------------------------------------------------------
+
 // constants
-//------------------------------------------------------------------------
+
 
 namespace /* private */
 {
@@ -44,9 +44,9 @@ namespace /* private */
 
     const LPCTSTR CURRENT_INSTANCE = TEXT("CurrInst");
 
-    //------------------------------------------
+
     // find an appropriate parent window
-    //------------------------------------------
+
 
     inline bool is_current_process_window(HWND hwnd)
     {
@@ -65,9 +65,9 @@ namespace /* private */
     }
 };
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFileOpenDialog::CFileOpenDialog(
     bool bFileOpenDialog,
@@ -126,17 +126,17 @@ CFileOpenDialog::CFileOpenDialog(
     m_ofn.lCustData = reinterpret_cast<sal_IntPtr>(this);
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFileOpenDialog::~CFileOpenDialog()
 {
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle)
 {
@@ -144,9 +144,9 @@ void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle)
     m_ofn.lpstrTitle = reinterpret_cast<LPCTSTR>(m_dialogTitle.getStr());
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFileOpenDialog::setFilter(const OUString& aFilter)
 {
@@ -159,9 +159,9 @@ void CFileOpenDialog::setFilter(const OUString& aFilter)
     m_ofn.lpstrFilter = reinterpret_cast<LPCTSTR>(m_filterBuffer.getStr());
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex)
 {
@@ -170,18 +170,18 @@ bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex)
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const
 {
     return m_ofn.nFilterIndex;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName)
 {
@@ -190,9 +190,9 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName)
     m_ofn.lpstrFile = reinterpret_cast<LPTSTR>(const_cast<sal_Unicode*>(m_fileNameBuffer.getStr()));
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory)
 {
@@ -200,18 +200,18 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory)
     m_ofn.lpstrInitialDir = reinterpret_cast<LPCTSTR>(m_displayDirectory.getStr());
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const
 {
     return m_displayDirectory;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFileOpenDialog::getFullFileName() const
 {
@@ -219,18 +219,18 @@ OUString SAL_CALL CFileOpenDialog::getFullFileName() const
         _wcslenex(m_fileNameBuffer.getStr()));
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFileOpenDialog::getFileName() const
 {
     return OUString(m_fileTitleBuffer.getStr());
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString CFileOpenDialog::getFileExtension()
 {
@@ -241,9 +241,9 @@ OUString CFileOpenDialog::getFileExtension()
     return OUString();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension)
 {
@@ -251,9 +251,9 @@ void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension)
     m_ofn.lpstrDefExt  = reinterpret_cast<LPCTSTR>(m_defaultExtension.getStr());
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode)
 {
@@ -263,18 +263,18 @@ void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode)
         m_ofn.Flags &= ~OFN_ALLOWMULTISELECT;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 bool SAL_CALL CFileOpenDialog::getMultiSelectionMode() const
 {
     return ((m_ofn.Flags & OFN_ALLOWMULTISELECT) > 0);
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL CFileOpenDialog::doModal()
 {
@@ -304,27 +304,27 @@ sal_Int16 SAL_CALL CFileOpenDialog::doModal()
     return nRC;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFileOpenDialog::getLastDialogError() const
 {
     return CommDlgExtendedError();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 bool SAL_CALL CFileOpenDialog::preModal()
 {
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)
 {
@@ -339,9 +339,9 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult)
     }
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
 {
@@ -361,9 +361,9 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const
     return OUString();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
 {
@@ -383,9 +383,9 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const
     return OUString();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
 {
@@ -405,77 +405,77 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const
     return OUString();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&)
 {
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk()
 {
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::onSelChanged(HWND)
 {
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::onHelp()
 {
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::onInitDone()
 {
     centerPositionToParent();
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::onFolderChanged()
 {
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32)
 {
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16)
 {
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify )
 {
@@ -512,9 +512,9 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild)
 {
@@ -528,9 +528,9 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild)
     onInitDialog(hwndDlg);
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc(
     HWND hChildDlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
@@ -579,9 +579,9 @@ UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc(
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 LRESULT CALLBACK CFileOpenDialog::BaseDlgProc(
     HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam)
@@ -608,9 +608,9 @@ LRESULT CALLBACK CFileOpenDialog::BaseDlgProc(
         hWnd,wMessage,wParam,lParam);
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd)
 {
@@ -619,9 +619,9 @@ CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd)
         GetProp(hwnd, CURRENT_INSTANCE));
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CFileOpenDialog::centerPositionToParent() const
 {
diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx
index b78bacbb774f..105bb81d73e1 100644
--- a/fpicker/source/win32/filepicker/FilePicker.cxx
+++ b/fpicker/source/win32/filepicker/FilePicker.cxx
@@ -33,9 +33,9 @@
 
 #include <comphelper/sequenceasvector.hxx>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace com::sun::star;
 
@@ -44,9 +44,9 @@ using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
 
 #define FILE_PICKER_DLL_NAME  TEXT("fps.dll")
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -63,9 +63,9 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) :
     CFilePicker_Base(m_rbHelperMtx),
@@ -85,9 +85,9 @@ CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xSer
             hInstance ) );
 }
 
-//------------------------------------------------------------------------------------
+
 // XFPEventListenerManager
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePickerListener>& xListener)
     throw(uno::RuntimeException)
@@ -101,9 +101,9 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke
         rBHelper.aLC.addInterface( getCppuType( &xListener ), xListener );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener )
     throw(uno::RuntimeException)
@@ -116,9 +116,9 @@ void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePi
     rBHelper.aLC.removeInterface( getCppuType( &xListener ), xListener );
 }
 
-// -------------------------------------------------
+
 // XEventListener
-// -------------------------------------------------
+
 
 void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno::RuntimeException)
 {
@@ -128,9 +128,9 @@ void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno:
         removeFilePickerListener(xFilePickerListener);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent)
 {
@@ -139,9 +139,9 @@ void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent)
         new CFilePickerParamEventNotification(&XFilePickerListener::fileSelectionChanged,aEvent));
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent)
 {
@@ -150,9 +150,9 @@ void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent)
         new CFilePickerParamEventNotification(&XFilePickerListener::directoryChanged,aEvent));
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent)
 {
@@ -161,9 +161,9 @@ void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent)
         new CFilePickerParamEventNotification(&XFilePickerListener::controlStateChanged,aEvent));
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::dialogSizeChanged()
 {
@@ -171,9 +171,9 @@ void SAL_CALL CFilePicker::dialogSizeChanged()
         new CFilePickerEventNotification(&XFilePickerListener::dialogSizeChanged));
 }
 
-//-----------------------------------------------------------------------------------------
+
 // If there are more then one listener the return value of the last one wins
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
 {
@@ -217,45 +217,45 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const
     return aHelpText;
 }
 
-//-------------------------------------
+
 //
-//-------------------------------------
+
 
 bool CFilePicker::startupEventNotification(bool bStartupSuspended)
 {
     return m_aAsyncEventNotifier.startup(bStartupSuspended);
 }
 
-//-------------------------------------
+
 //
-//-------------------------------------
+
 
 void CFilePicker::shutdownEventNotification()
 {
     m_aAsyncEventNotifier.shutdown();
 }
 
-//-------------------------------------
+
 //
-//-------------------------------------
+
 
 void CFilePicker::suspendEventNotification()
 {
     m_aAsyncEventNotifier.suspend();
 }
 
-//-------------------------------------
+
 //
-//-------------------------------------
+
 
 void CFilePicker::resumeEventNotification()
 {
     m_aAsyncEventNotifier.resume();
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePicker functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::RuntimeException)
 {
@@ -264,9 +264,9 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt
     m_pImpl->setMultiSelectionMode(bMode);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException)
 {
@@ -275,9 +275,9 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx
     m_pImpl->setTitle(aTitle);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter)
     throw(lang::IllegalArgumentException, uno::RuntimeException)
@@ -287,9 +287,9 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString&
     m_pImpl->appendFilter(aTitle, aFilter);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)
     throw(lang::IllegalArgumentException, uno::RuntimeException)
@@ -299,9 +299,9 @@ void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle)
     m_pImpl->setCurrentFilter(aTitle);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
 {
@@ -310,9 +310,9 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException)
     return m_pImpl->getCurrentFilter();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
     throw (lang::IllegalArgumentException, uno::RuntimeException)
@@ -322,9 +322,9 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const
     m_pImpl->appendFilterGroup(sGroupTitle, aFilters);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
     throw(uno::RuntimeException)
@@ -334,9 +334,9 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName)
     m_pImpl->setDefaultName(aName);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)
     throw(lang::IllegalArgumentException, uno::RuntimeException)
@@ -346,9 +346,9 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory)
     m_pImpl->setDisplayDirectory(aDirectory);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException)
 {
@@ -357,9 +357,9 @@ OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException
     return m_pImpl->getDisplayDirectory();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException)
 {
@@ -368,9 +368,9 @@ uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeExcep
     return m_pImpl->getFiles();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException)
 {
     OSL_ASSERT(0 != m_pImpl.get());
@@ -408,9 +408,9 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R
     return lTarget.getAsConstList();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
 {
@@ -440,9 +440,9 @@ sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException)
     return ret;
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePicker functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlAction, const uno::Any& aValue)
     throw(uno::RuntimeException)
@@ -453,9 +453,9 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi
     m_pImpl->setValue(aControlId, aControlAction, aValue);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)
     throw(uno::RuntimeException)
@@ -466,9 +466,9 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl
     return m_pImpl->getValue(aControlId, aControlAction);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable)
 throw(uno::RuntimeException)
@@ -479,9 +479,9 @@ throw(uno::RuntimeException)
     m_pImpl->enableControl( aControlId, bEnable );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel)
     throw (uno::RuntimeException)
@@ -492,9 +492,9 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel
     m_pImpl->setLabel(aControlId, aLabel);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
     throw (uno::RuntimeException)
@@ -505,9 +505,9 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId)
     return m_pImpl->getLabel(aControlId);
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException)
 {
@@ -517,9 +517,9 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw
     return m_pImpl->getSupportedImageFormats();
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException)
 {
@@ -529,9 +529,9 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti
     return m_pImpl->getTargetColorDepth();
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException)
 {
@@ -541,9 +541,9 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException
     return m_pImpl->getAvailableWidth();
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException)
 {
@@ -553,9 +553,9 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio
     return m_pImpl->getAvailableHeight();
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)
     throw (lang::IllegalArgumentException, uno::RuntimeException)
@@ -566,9 +566,9 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma
     m_pImpl->setImage(aImageFormat, aImage);
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException)
 {
@@ -578,9 +578,9 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run
     return m_pImpl->setShowState(bShowState);
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)
 {
@@ -590,9 +590,9 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException)
     return m_pImpl->getShowState();
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
     throw( uno::Exception, uno::RuntimeException)
@@ -691,9 +691,9 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments)
             hInstance ) );
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilePicker::cancel()
     throw(uno::RuntimeException)
@@ -704,9 +704,9 @@ void SAL_CALL CFilePicker::cancel()
     m_pImpl->cancel();
 }
 
-// -------------------------------------------------
+
 // XServiceInfo
-// -------------------------------------------------
+
 
 OUString SAL_CALL CFilePicker::getImplementationName()
     throw(uno::RuntimeException)
@@ -721,9 +721,9 @@ sal_Bool SAL_CALL CFilePicker::supportsService(const OUString& ServiceName)
     return cppu::supportsService(this, ServiceName);
 }
 
-// -------------------------------------------------
+
 //  XServiceInfo
-// -------------------------------------------------
+
 
 uno::Sequence<OUString> SAL_CALL CFilePicker::getSupportedServiceNames()
     throw(uno::RuntimeException)
diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx
index 53d1e51f2c73..1ca694643b1e 100644
--- a/fpicker/source/win32/filepicker/FilterContainer.cxx
+++ b/fpicker/source/win32/filepicker/FilterContainer.cxx
@@ -31,14 +31,14 @@
 #pragma warning(pop)
 #endif
 
-//-------------------------------------------------------------------
+
 // namespace directives
-//-------------------------------------------------------------------
 
 
-//-------------------------------------------------------------------------------------
+
+
 // ctor
-//-------------------------------------------------------------------------------------
+
 
 CFilterContainer::CFilterContainer( sal_Int32 initSize ) :
     m_vFilters( initSize ),
@@ -46,9 +46,9 @@ CFilterContainer::CFilterContainer( sal_Int32 initSize ) :
 {
 }
 
-//-----------------------------------------------------------------------------------------
+
 // add a name/filter pair
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilterContainer::addFilter(
     const OUString& aName, const OUString& aFilter, sal_Bool bAllowDuplicates )
@@ -74,11 +74,11 @@ sal_Bool SAL_CALL CFilterContainer::addFilter(
     return ( pos < 0 ) ? sal_True : sal_False;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // delete a filter
 // Precondition: the container is not empty
 //               there is a filter identified by the given name
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilterContainer::delFilter( const OUString& aName )
 {
@@ -94,29 +94,29 @@ sal_Bool SAL_CALL CFilterContainer::delFilter( const OUString& aName )
     return ( pos > -1 ) ? sal_True : sal_False;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // return the number of filters currently in the container
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CFilterContainer::numFilter( )
 {
     return m_vFilters.size( );
 }
 
-//-----------------------------------------------------------------------------------------
+
 // clear all entries
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilterContainer::empty()
 {
     m_vFilters.clear( );
 }
 
-//-----------------------------------------------------------------------------------------
+
 // get a filter by name
 // Precondition: the container is not empty
 //               there is a filter identified by the name
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& theFilter ) const
 {
@@ -138,9 +138,9 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString&
     return (pos > -1 ) ? sal_True : sal_False;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const
 {
@@ -159,18 +159,18 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi
     return bRet;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const
 {
     return getFilterTagPos( aName );
 }
 
-//-----------------------------------------------------------------------------------------
+
 // returns the index of the filter identified by name
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) const
 {
@@ -188,9 +188,9 @@ sal_Int32 SAL_CALL CFilterContainer::getFilterTagPos( const OUString& aName ) co
     return -1;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // starts enumerating the filter in the container
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFilterContainer::beginEnumFilter( )
 {
@@ -198,9 +198,9 @@ void SAL_CALL CFilterContainer::beginEnumFilter( )
     m_bIterInitialized = sal_True;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // returns true if another filter has been retrieved
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEntry )
 {
@@ -216,13 +216,13 @@ sal_Bool SAL_CALL CFilterContainer::getNextFilter( FILTER_ENTRY_T& nextFilterEnt
     return bRet;
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL CFilterContainer::setCurrentFilter( const OUString& aName )
 {
     m_sCurrentFilter = aName;
 }
 
-//-----------------------------------------------------------------------------------------
+
 OUString SAL_CALL CFilterContainer::getCurrentFilter() const
 {
     return m_sCurrentFilter;
@@ -231,11 +231,11 @@ OUString SAL_CALL CFilterContainer::getCurrentFilter() const
 //###################################################################
 
 
-//-------------------------------------------------------------------
+
 // calculates the length of a '\0' separated filter, that means
 // length of the name + '\0' + length of the filter string +
 // a trailing '\0'
-//-------------------------------------------------------------------
+
 
 static sal_uInt32 _getLengthFilter( CFilterContainer::FILTER_ENTRY_T aFilterEntry )
 {
@@ -244,9 +244,9 @@ static sal_uInt32 _getLengthFilter( CFilterContainer::FILTER_ENTRY_T aFilterEntr
         aFilterEntry.second.getLength( ) + 1 );
 }
 
-//-------------------------------------------------------------------
+
 // calculates the length of all filters currently in the container
-//-------------------------------------------------------------------
+
 
 static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer )
 {
@@ -261,9 +261,9 @@ static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer )
     return ( totalLength > 0 ) ? totalLength + 1 : totalLength;
 }
 
-//-------------------------------------------------------------------
+
 //
-//-------------------------------------------------------------------
+
 
 inline
 void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength )
@@ -271,11 +271,11 @@ void _wcsmemcpy( sal_Unicode* pDest, const sal_Unicode* pSrc, sal_uInt32 nLength
     memcpy( pDest, pSrc, nLength * sizeof( sal_Unicode ) );
 }
 
-//-------------------------------------------------------------------
+
 // a helper trivial helper function to create a filter buffer in the
 // format the Win32 API requires,
 // e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0"
-//-------------------------------------------------------------------
+
 
 OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer )
 {
diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
index e061a63f3b3a..55d58e689c08 100644
--- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx
+++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx
@@ -41,16 +41,16 @@
 // means 3 pixel top and 3 pixel bottom
 #define VERT_BORDER_SPACE   6
 
-//---------------------------------------------------
+
 // static member initialization
-//---------------------------------------------------
+
 
 CFilePreview* CFilePreview::s_FilePreviewInst = NULL;
 CFilePreview::FILEPREVIEW_SINGLETON_DESTROYER_T CFilePreview::s_SingletonDestroyer;
 
-//---------------------------------------------------
+
 // some useful helper functions
-//---------------------------------------------------
+
 
 namespace // private
 {
@@ -60,9 +60,9 @@ namespace // private
         // of the preview window failed
     };
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     inline
     sal_Int32 SubDiv( sal_Int32 nNumber, sal_Int32 nMinuend, sal_Int32 nDenominator )
@@ -70,9 +70,9 @@ namespace // private
         return ( static_cast<sal_Int32>( ( nNumber - nMinuend ) / nDenominator ) );
     }
 
-    //------------------------------------------------------------
+
     // convert himetric to pixel
-    //------------------------------------------------------------
+
 
     inline
     sal_Int32 Himetric2Pixel( HDC hDC, sal_Int32 hmSize, sal_Int32 nIndex )
@@ -80,9 +80,9 @@ namespace // private
         return MulDiv( hmSize, GetDeviceCaps( hDC, nIndex), HIMETRIC_INCH );
     }
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     inline
     sal_uInt32 _getWidthRect( const RECT& aRect )
@@ -90,9 +90,9 @@ namespace // private
         return ( aRect.right - aRect.left );
     }
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     inline
     sal_uInt32 _getHeightRect( const RECT& aRect )
@@ -100,10 +100,10 @@ namespace // private
         return ( aRect.bottom - aRect.top );
     }
 
-    //------------------------------------------------------------
+
     // calc the upper left corner so that a given window will be
     // displayed centered within the given window
-    //------------------------------------------------------------
+
 
     inline
     POINT _calcULCorner( HWND hwnd, const CDimension& aPicSize )
@@ -121,11 +121,11 @@ namespace // private
         return ulCorner;
     }
 
-    //------------------------------------------------------------
+
     // test if a picture with the given dimensions fits into an
     // arbitrary window
     // we expect the width and height to be in pixel
-    //------------------------------------------------------------
+
 
     inline
     sal_Bool _pictureSizeFitsWindowSize( HWND hwnd, const CDimension& aPicSize )
@@ -140,11 +140,11 @@ namespace // private
                  ( ( nHeightWnd - VERT_BORDER_SPACE ) >= aPicSize.m_cy ) );
     }
 
-    //------------------------------------------------------------
+
     // calc the dimemsions so that a given picture fits into a
     // given window, if the picture fits into the given window
     // the original CDimension will be returned
-    //------------------------------------------------------------
+
 
     inline
     CDimension _scalePictureSize( HWND hwnd, const CDimension& aPicSize )
@@ -183,9 +183,9 @@ namespace // private
 } // end namespace
 
 
-//---------------------------------------------------
+
 // to ensure only one instance (singleton)
-//---------------------------------------------------
+
 
 CFilePreview* CFilePreview::createInstance(
     HWND aParent,
@@ -218,9 +218,9 @@ CFilePreview* CFilePreview::createInstance(
     return s_FilePreviewInst;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 CFilePreview::CFilePreview(
     HWND aParent,
@@ -272,9 +272,9 @@ CFilePreview::CFilePreview(
         throw CPreviewException( );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 CFilePreview::~CFilePreview( )
 {
@@ -285,9 +285,9 @@ CFilePreview::~CFilePreview( )
     OSL_POSTCOND( bRet, "Unregister preview window class failed" );
 }
 
-//---------------------------------------------------
+
 // sets the size of the preview window
-//---------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePreview::setSize( const CDimension& aSize )
 {
@@ -304,9 +304,9 @@ sal_Bool SAL_CALL CFilePreview::setSize( const CDimension& aSize )
         SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE );
 }
 
-//---------------------------------------------------
+
 // returns the dimension of the preview
-//---------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePreview::getSize( CDimension& theSize ) const
 {
@@ -321,11 +321,11 @@ sal_Bool SAL_CALL CFilePreview::getSize( CDimension& theSize ) const
     return bRet;
 }
 
-//---------------------------------------------------
+
 // sets the position of the upper left corner
 // of the preview window relative to the
 // upper left corner of the parent window
-//---------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePreview::setPos( POINT ulCorner )
 {
@@ -342,11 +342,11 @@ sal_Bool SAL_CALL CFilePreview::setPos( POINT ulCorner )
         SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
 }
 
-//---------------------------------------------------
+
 // returns the current position of the preview
 // relative to the upper left corner of the
 // parent window
-//---------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const
 {
@@ -365,9 +365,9 @@ sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const
     return bRet;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CFilePreview::enable( sal_Bool bEnable )
 {
@@ -378,14 +378,14 @@ void SAL_CALL CFilePreview::enable( sal_Bool bEnable )
     UpdateWindow( m_hwnd );
 }
 
-//---------------------------------------------------
+
 // shows the preview window
 // possible values see SHOW_STATE
 // SS_SHOW     - make the window visible
 // SS_HIDE     - hide the window
 // SS_ENABLED  - enable the window
 // SS_DISABLED - disable the window
-//---------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow )
 {
@@ -395,12 +395,12 @@ sal_Bool SAL_CALL CFilePreview::show( sal_Bool bShow )
     return ShowWindow( m_hwnd, showState );
 }
 
-//---------------------------------------------------
+
 // if the preview is shown and enabled
 // preview of the given file will be shown
 // returns true on success or false if an error
 // occurred (the file in not there or not accessible etc.)
-//---------------------------------------------------
+
 
 sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName )
 {
@@ -427,9 +427,9 @@ sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName )
     return sal_True;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC )
 {
@@ -480,9 +480,9 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC )
     }
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 sal_Bool CFilePreview::loadFile( const OUString& aFileName )
 {
@@ -551,9 +551,9 @@ CLEANUP_AND_EXIT:
     return ( SUCCEEDED( hr ) );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 LRESULT CALLBACK CFilePreview::WndProc(
     HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
index e1a29dcd8cee..d0d22a5319a2 100644
--- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx
@@ -56,9 +56,9 @@
 #pragma warning (pop)
 #endif
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 namespace fpicker{
 namespace win32{
@@ -66,9 +66,9 @@ namespace vista{
 
 #define FILE_PICKER_DLL_NAME  TEXT("fps.dll")
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -85,7 +85,7 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------------------------
+
 VistaFilePicker::VistaFilePicker(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR)
     : TVistaFilePickerBase  (m_aMutex                 )
     , m_xSMGR               (xSMGR                    )
@@ -96,12 +96,12 @@ VistaFilePicker::VistaFilePicker(const css::uno::Reference< css::lang::XMultiSer
 {
 }
 
-//-----------------------------------------------------------------------------------------
+
 VistaFilePicker::~VistaFilePicker()
 {
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener)
     throw(css::uno::RuntimeException)
 {
@@ -112,7 +112,7 @@ void SAL_CALL VistaFilePicker::addFilePickerListener(const css::uno::Reference<
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw(css::uno::RuntimeException)
 {
@@ -123,13 +123,13 @@ void SAL_CALL VistaFilePicker::removeFilePickerListener(const css::uno::Referenc
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-// -------------------------------------------------
+
 void SAL_CALL VistaFilePicker::disposing(const css::lang::EventObject& /*aEvent*/)
     throw(css::uno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode)
     throw(css::uno::RuntimeException)
 {
@@ -140,7 +140,7 @@ void SAL_CALL VistaFilePicker::setMultiSelectionMode(::sal_Bool bMode)
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
     throw(css::uno::RuntimeException)
 {
@@ -151,7 +151,7 @@ void SAL_CALL VistaFilePicker::setTitle(const OUString& sTitle)
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
                                             const OUString& sFilter)
     throw(css::lang::IllegalArgumentException,
@@ -165,7 +165,7 @@ void SAL_CALL VistaFilePicker::appendFilter(const OUString& sTitle ,
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
     throw(css::lang::IllegalArgumentException,
           css::uno::RuntimeException         )
@@ -177,7 +177,7 @@ void SAL_CALL VistaFilePicker::setCurrentFilter(const OUString& sTitle)
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 OUString SAL_CALL VistaFilePicker::getCurrentFilter()
     throw(css::uno::RuntimeException)
 {
@@ -190,7 +190,7 @@ OUString SAL_CALL VistaFilePicker::getCurrentFilter()
     return sTitle;
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&                              /*sGroupTitle*/,
                                                  const css::uno::Sequence< css::beans::StringPair >& rFilters   )
     throw (css::lang::IllegalArgumentException,
@@ -203,7 +203,7 @@ void SAL_CALL VistaFilePicker::appendFilterGroup(const OUString&
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
     throw(css::uno::RuntimeException)
 {
@@ -214,7 +214,7 @@ void SAL_CALL VistaFilePicker::setDefaultName(const OUString& sName )
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -239,7 +239,7 @@ void SAL_CALL VistaFilePicker::setDisplayDirectory(const OUString& sDirectory)
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
     throw(css::uno::RuntimeException)
 {
@@ -251,7 +251,7 @@ OUString SAL_CALL VistaFilePicker::getDisplayDirectory()
     return sDirectory;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // @deprecated cant be supported any longer ... see IDL description for further details
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
     throw(css::uno::RuntimeException)
@@ -266,7 +266,7 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getFiles()
     return lFiles;
 }
 
-//-----------------------------------------------------------------------------------------
+
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
     throw(css::uno::RuntimeException)
 {
@@ -280,7 +280,7 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
     return lFiles;
 }
 
-//-----------------------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL VistaFilePicker::execute()
     throw(css::uno::RuntimeException)
 {
@@ -313,9 +313,9 @@ css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSelectedFiles()
     return nResult;
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePicker functions
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL VistaFilePicker::setValue(      ::sal_Int16    nControlId    ,
                                               ::sal_Int16    nControlAction,
@@ -331,9 +331,9 @@ void SAL_CALL VistaFilePicker::setValue(      ::sal_Int16    nControlId    ,
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId    ,
                                                  ::sal_Int16 nControlAction)
@@ -349,9 +349,9 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId    ,
     return aValue;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
                                              ::sal_Bool  bEnable   )
@@ -365,9 +365,9 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId,
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL VistaFilePicker::setLabel(      ::sal_Int16      nControlId,
                                          const OUString& sLabel    )
@@ -381,9 +381,9 @@ void SAL_CALL VistaFilePicker::setLabel(      ::sal_Int16      nControlId,
     m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::NON_BLOCKED);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
     throw (css::uno::RuntimeException)
@@ -397,9 +397,9 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId)
     return sLabel;
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats()
     throw (css::uno::RuntimeException)
@@ -407,9 +407,9 @@ css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFor
     return css::uno::Sequence< sal_Int16 >();
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth()
     throw (css::uno::RuntimeException)
@@ -417,9 +417,9 @@ sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth()
     return 0;
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth()
     throw (css::uno::RuntimeException)
@@ -427,9 +427,9 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth()
     return 0;
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight()
     throw (css::uno::RuntimeException)
@@ -437,9 +437,9 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight()
     return 0;
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL VistaFilePicker::setImage(      sal_Int16      /*nImageFormat*/,
                                          const css::uno::Any& /*aImage      */)
@@ -448,9 +448,9 @@ void SAL_CALL VistaFilePicker::setImage(      sal_Int16      /*nImageFormat*/,
 {
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/)
     throw (css::uno::RuntimeException)
@@ -458,9 +458,9 @@ sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/)
     return sal_False;
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL VistaFilePicker::getShowState()
     throw (css::uno::RuntimeException)
@@ -468,9 +468,9 @@ sal_Bool SAL_CALL VistaFilePicker::getShowState()
     return sal_False;
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
     throw(css::uno::Exception       ,
@@ -592,18 +592,18 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An
     }
 }
 
-//------------------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL VistaFilePicker::cancel()
     throw(css::uno::RuntimeException)
 {
 }
 
-// -------------------------------------------------
+
 // XServiceInfo
-// -------------------------------------------------
+
 
 OUString SAL_CALL VistaFilePicker::getImplementationName()
     throw(css::uno::RuntimeException)
@@ -618,9 +618,9 @@ sal_Bool SAL_CALL VistaFilePicker::supportsService(const OUString& sServiceName)
     return cppu::supportsService(this, sServiceName);
 }
 
-// -------------------------------------------------
+
 //  XServiceInfo
-// -------------------------------------------------
+
 
 css::uno::Sequence< OUString > SAL_CALL VistaFilePicker::getSupportedServiceNames()
     throw(css::uno::RuntimeException)
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
index 3935ca298bb5..e6cec940e2b8 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx
@@ -37,15 +37,15 @@
 
 #include <osl/file.hxx>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 namespace fpicker{
 namespace win32{
 namespace vista{
 
-//-----------------------------------------------------------------------------------------
+
 VistaFilePickerEventHandler::VistaFilePickerEventHandler(IVistaFilePickerInternalNotify* pInternalNotify)
     : m_nRefCount           (0       )
     , m_nListenerHandle     (0       )
@@ -55,12 +55,12 @@ VistaFilePickerEventHandler::VistaFilePickerEventHandler(IVistaFilePickerInterna
 {
 }
 
-//-----------------------------------------------------------------------------------------
+
 VistaFilePickerEventHandler::~VistaFilePickerEventHandler()
 {
 }
 
-//-----------------------------------------------------------------------------------------
+
 HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rIID    ,
                                                                       void** ppObject)
 {
@@ -84,13 +84,13 @@ HRESULT STDMETHODCALLTYPE VistaFilePickerEventHandler::QueryInterface(REFIID rII
     return E_NOINTERFACE;
 }
 
-//-----------------------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef()
 {
     return osl_atomic_increment(&m_nRefCount);
 }
 
-//-----------------------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
 {
     ULONG nReturn = --m_nRefCount;
@@ -100,34 +100,34 @@ ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release()
     return nReturn;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnFileOk(IFileDialog* /*pDialog*/)
 {
     return E_NOTIMPL;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnFolderChanging(IFileDialog* /*pDialog*/,
                                                            IShellItem*  /*pFolder*/)
 {
     return E_NOTIMPL;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnFolderChange(IFileDialog* /*pDialog*/)
 {
     impl_sendEvent(E_DIRECTORY_CHANGED, 0);
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnSelectionChange(IFileDialog* /*pDialog*/)
 {
     impl_sendEvent(E_FILE_SELECTION_CHANGED, 0);
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog*                 /*pDialog*/  ,
 
                                                            IShellItem*                  /*pItem*/    ,
@@ -138,7 +138,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnShareViolation(IFileDialog*
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)
 {
     UINT nFileTypeIndex;
@@ -153,7 +153,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnTypeChange(IFileDialog* pDialog)
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnOverwrite(IFileDialog*            /*pDialog*/  ,
                                                       IShellItem*             /*pItem*/    ,
                                                       FDE_OVERWRITE_RESPONSE* /*pResponse*/)
@@ -161,7 +161,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnOverwrite(IFileDialog*            /*
     return E_NOTIMPL;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnItemSelected(IFileDialogCustomize* /*pCustomize*/,
 
                                                          DWORD                   nIDCtl      ,
@@ -173,7 +173,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnItemSelected(IFileDialogCustomize* /
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize* /*pCustomize*/,
                                                           DWORD                 nIDCtl    )
 {
@@ -182,7 +182,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnButtonClicked(IFileDialogCustomize*
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustomize* /*pCustomize*/,
                                                                DWORD                 nIDCtl    ,
                                                                BOOL                  bChecked  )
@@ -195,7 +195,7 @@ STDMETHODIMP VistaFilePickerEventHandler::OnCheckButtonToggled(IFileDialogCustom
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomize* /*pCustomize*/,
                                                               DWORD                 nIDCtl    )
 {
@@ -203,21 +203,21 @@ STDMETHODIMP VistaFilePickerEventHandler::OnControlActivating(IFileDialogCustomi
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePickerEventHandler::addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw( css::uno::RuntimeException )
 {
     m_lListener.addInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void SAL_CALL VistaFilePickerEventHandler::removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener )
     throw( css::uno::RuntimeException )
 {
     m_lListener.removeInterface(::getCppuType( (const css::uno::Reference< css::ui::dialogs::XFilePickerListener >*)NULL ), xListener);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void VistaFilePickerEventHandler::startListening( const TFileDialog& pBroadcaster )
 {
     static const sal_Bool STARTUP_SUSPENDED = sal_True;
@@ -230,7 +230,7 @@ void VistaFilePickerEventHandler::startListening( const TFileDialog& pBroadcaste
     m_pDialog->Advise(this, &m_nListenerHandle);
 }
 
-//-----------------------------------------------------------------------------------------
+
 void VistaFilePickerEventHandler::stopListening()
 {
     if (m_pDialog.is())
@@ -243,7 +243,7 @@ void VistaFilePickerEventHandler::stopListening()
 static const OUString PROP_CONTROL_ID("control_id");
 static const OUString PROP_PICKER_LISTENER("picker_listener");
 
-//-----------------------------------------------------------------------------------------
+
 class AsyncPickerEvents : public RequestHandler
 {
 public:
@@ -299,7 +299,7 @@ public:
     {}
 };
 
-//-----------------------------------------------------------------------------------------
+
 void VistaFilePickerEventHandler::impl_sendEvent(  EEventType eEventType,
                                                  ::sal_Int16  nControlID)
 {
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
index 64eb6752e79d..e892523a3ec2 100644
--- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
+++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx
@@ -55,9 +55,9 @@ namespace fpicker{
 namespace win32{
 namespace vista{
 
-//-----------------------------------------------------------------------------
+
 // types, const etcpp.
-//-----------------------------------------------------------------------------
+
 
 
 static const ::sal_Int16 INVALID_CONTROL_ID     = -1;
@@ -75,7 +75,7 @@ static const GUID CLIENTID_FILEOPEN_LINK_TEMPLATE   = {0x32237796, 0x1509, 0x49D
 static const GUID CLIENTID_FILEOPEN_PLAY            = {0x32CFB147, 0xF5AE, 0x4F90, 0xA1, 0xF1, 0x81, 0x20, 0x72, 0xBB, 0x2F, 0xC5};
 static const GUID CLIENTID_FILEOPEN_LINK            = {0x39AC4BAE, 0x7D2D, 0x46BC, 0xBE, 0x2E, 0xF8, 0x8C, 0xB5, 0x65, 0x5E, 0x6A};
 
-//-----------------------------------------------------------------------------
+
 OUString lcl_getURLFromShellItem (IShellItem* pItem)
 {
     LPOLESTR pStr = NULL;
@@ -103,7 +103,7 @@ OUString lcl_getURLFromShellItem (IShellItem* pItem)
     return sURL;
 }
 
-//-----------------------------------------------------------------------------------------
+
 ::std::vector< COMDLG_FILTERSPEC > lcl_buildFilterList(CFilterContainer& rContainer)
 {
     const sal_Int32                          c      = rContainer.numFilter();
@@ -125,7 +125,7 @@ OUString lcl_getURLFromShellItem (IShellItem* pItem)
     return lList;
 }
 
-//-----------------------------------------------------------------------------------------
+
 VistaFilePickerImpl::VistaFilePickerImpl()
     : m_iDialogOpen  ()
     , m_iDialogSave  ()
@@ -141,12 +141,12 @@ VistaFilePickerImpl::VistaFilePickerImpl()
     m_hParentWindow = choose_parent_window();
 }
 
-//-------------------------------------------------------------------------------
+
 VistaFilePickerImpl::~VistaFilePickerImpl()
 {
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::before()
 {
     // SYNCHRONIZED->
@@ -167,7 +167,7 @@ void VistaFilePickerImpl::before()
     }
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::doRequest(const RequestRef& rRequest)
 {
     try
@@ -265,13 +265,13 @@ void VistaFilePickerImpl::doRequest(const RequestRef& rRequest)
     {}
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::after()
 {
     CoUninitialize();
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_addFilePickerListener(const RequestRef& rRequest)
 {
     // SYNCHRONIZED outside !
@@ -290,7 +290,7 @@ void VistaFilePickerImpl::impl_sta_addFilePickerListener(const RequestRef& rRequ
         pHandlerImpl->addFilePickerListener(xListener);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_removeFilePickerListener(const RequestRef& rRequest)
 {
     // SYNCHRONIZED outside !
@@ -309,7 +309,7 @@ void VistaFilePickerImpl::impl_sta_removeFilePickerListener(const RequestRef& rR
         pHandlerImpl->removeFilePickerListener(xListener);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)
 {
     const OUString sTitle  = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
@@ -321,7 +321,7 @@ void VistaFilePickerImpl::impl_sta_appendFilter(const RequestRef& rRequest)
     m_lFilters.addFilter(sTitle, sFilter);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
 {
     const css::uno::Sequence< css::beans::StringPair > aFilterGroup  =
@@ -343,7 +343,7 @@ void VistaFilePickerImpl::impl_sta_appendFilterGroup(const RequestRef& rRequest)
     }
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_setCurrentFilter(const RequestRef& rRequest)
 {
     const OUString sTitle  = rRequest->getArgumentOrDefault(PROP_FILTER_TITLE, OUString());
@@ -354,7 +354,7 @@ void VistaFilePickerImpl::impl_sta_setCurrentFilter(const RequestRef& rRequest)
     m_lFilters.setCurrentFilter(sTitle);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)
 {
     TFileDialog iDialog = impl_getBaseDialogInterface();
@@ -386,7 +386,7 @@ void VistaFilePickerImpl::impl_sta_getCurrentFilter(const RequestRef& rRequest)
     // <- SYNCHRONIZED
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_CreateOpenDialog(const RequestRef& rRequest)
 {
     // SYNCHRONIZED->
@@ -428,7 +428,7 @@ void VistaFilePickerImpl::impl_sta_CreateOpenDialog(const RequestRef& rRequest)
         pHandlerImpl->startListening(iDialog);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_CreateSaveDialog(const RequestRef& rRequest)
 {
     // SYNCHRONIZED->
@@ -469,13 +469,13 @@ void VistaFilePickerImpl::impl_sta_CreateSaveDialog(const RequestRef& rRequest)
         pHandlerImpl->startListening(iDialog);
 }
 
-//-------------------------------------------------------------------------------
+
 static const ::sal_Int32 GROUP_VERSION         =   1;
 static const ::sal_Int32 GROUP_TEMPLATE        =   2;
 static const ::sal_Int32 GROUP_IMAGETEMPLATE   =   3;
 static const ::sal_Int32 GROUP_CHECKBOXES      =   4;
 
-//-------------------------------------------------------------------------------
+
 static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogCustomize iCustom, sal_uInt16 nControlId)
 {
     OUString aLabel = rResourceProvider.getResString(nControlId);
@@ -483,7 +483,7 @@ static void setLabelToControl(CResourceProvider& rResourceProvider, TFileDialogC
     iCustom->SetControlLabel(nControlId, reinterpret_cast<LPCWSTR>(aLabel.getStr()) );
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_Int32 nTemplate)
 {
     GUID aGUID = {};
@@ -610,7 +610,7 @@ void VistaFilePickerImpl::impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_I
 
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequest)
 {
     const ::sal_Bool bMultiSelection = rRequest->getArgumentOrDefault(PROP_MULTISELECTION_MODE, (::sal_Bool)sal_True);
@@ -632,7 +632,7 @@ void VistaFilePickerImpl::impl_sta_SetMultiSelectionMode(const RequestRef& rRequ
     iDialog->SetOptions ( nFlags );
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
 {
     OUString sTitle = rRequest->getArgumentOrDefault(PROP_TITLE, OUString());
@@ -646,7 +646,7 @@ void VistaFilePickerImpl::impl_sta_SetTitle(const RequestRef& rRequest)
     iDialog->SetTitle(reinterpret_cast<LPCTSTR>(sTitle.getStr()));
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
 {
     OUString sFileName = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
@@ -660,7 +660,7 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef& rRequest)
     iDialog->SetFileName(reinterpret_cast<LPCTSTR>(sFileName.getStr()));
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef& rRequest)
 {
     OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString());
@@ -712,7 +712,7 @@ void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef& rRequest)
         rRequest->setArgument( PROP_DIRECTORY, sFolder );
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)
 {
     OUString sFilename = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString());
@@ -737,7 +737,7 @@ void VistaFilePickerImpl::impl_sta_SetDefaultName(const RequestRef& rRequest)
     m_sFilename = sFilename;
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
 {
     // SYNCHRONIZED->
@@ -774,7 +774,7 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog()
 
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
 {
     // SYNCHRONIZED->
@@ -848,7 +848,7 @@ void VistaFilePickerImpl::impl_sta_getSelectedFiles(const RequestRef& rRequest)
     rRequest->setArgument(PROP_SELECTED_FILES, lFiles.getAsConstList());
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
 {
     impl_sta_setFiltersOnDialog();
@@ -960,7 +960,7 @@ void VistaFilePickerImpl::impl_sta_ShowDialogModal(const RequestRef& rRequest)
     rRequest->setArgument(PROP_DIALOG_SHOW_RESULT, sal_True);
 }
 
-//-------------------------------------------------------------------------------
+
 TFileDialog VistaFilePickerImpl::impl_getBaseDialogInterface()
 {
     TFileDialog iDialog;
@@ -984,7 +984,7 @@ TFileDialog VistaFilePickerImpl::impl_getBaseDialogInterface()
     return iDialog;
 }
 
-//-------------------------------------------------------------------------------
+
 TFileDialogCustomize VistaFilePickerImpl::impl_getCustomizeInterface()
 {
     TFileDialogCustomize iCustom;
@@ -1009,7 +1009,7 @@ TFileDialogCustomize VistaFilePickerImpl::impl_getCustomizeInterface()
     return iCustom;
 }
 
-//-------------------------------------------------------------------------------
+
 void lcl_removeControlItemsWorkaround(const TFileDialogCustomize& iCustom   ,
                                             ::sal_Int16           nControlId)
 {
@@ -1022,7 +1022,7 @@ void lcl_removeControlItemsWorkaround(const TFileDialogCustomize& iCustom   ,
         hResult = iCustom->RemoveControlItem(nControlId, i++);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)
 {
     ::sal_Int16   nId     = rRequest->getArgumentOrDefault(PROP_CONTROL_ID    , INVALID_CONTROL_ID    );
@@ -1097,7 +1097,7 @@ void VistaFilePickerImpl::impl_sta_SetControlValue(const RequestRef& rRequest)
         }
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
 {
     ::sal_Int16 nId     = rRequest->getArgumentOrDefault(PROP_CONTROL_ID    , INVALID_CONTROL_ID    );
@@ -1133,7 +1133,7 @@ void VistaFilePickerImpl::impl_sta_GetControlValue(const RequestRef& rRequest)
         rRequest->setArgument(PROP_CONTROL_VALUE, aValue);
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)
 {
     ::sal_Int16     nId    = rRequest->getArgumentOrDefault(PROP_CONTROL_ID   , INVALID_CONTROL_ID  );
@@ -1148,12 +1148,12 @@ void VistaFilePickerImpl::impl_sta_SetControlLabel(const RequestRef& rRequest)
     iCustom->SetControlLabel ( nId, reinterpret_cast<LPCTSTR>(sLabel.getStr()));
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_GetControlLabel(const RequestRef& /*rRequest*/)
 {
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)
 {
     ::sal_Int16 nId      = rRequest->getArgumentOrDefault(PROP_CONTROL_ID    , INVALID_CONTROL_ID  );
@@ -1174,7 +1174,7 @@ void VistaFilePickerImpl::impl_sta_EnableControl(const RequestRef& rRequest)
 
     iCustom->SetControlState(nId, eState);
 }
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::impl_SetDefaultExtension( const OUString& currentFilter )
 {
    TFileDialog iDialog = impl_getBaseDialogInterface();
@@ -1217,7 +1217,7 @@ static void impl_refreshFileDialog( TFileDialog iDialog )
     }
 }
 
-//-------------------------------------------------------------------------------
+
 void VistaFilePickerImpl::onAutoExtensionChanged (bool bChecked)
 {
     // SYNCHRONIZED->
diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
index ee2760b5c878..a493af6cc4e0 100644
--- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
+++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx
@@ -36,9 +36,9 @@
 #include <osl/thread.hxx>
 #include "filepickerstate.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace com::sun::star;
 
@@ -50,9 +50,9 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::ListboxControlActions;
 
-//-------------------------------------------------------------------------
+
 // to distinguish what to do in the enum child window callback function
-//-------------------------------------------------------------------------
+
 
 enum ECW_ACTION_T
 {
@@ -71,9 +71,9 @@ struct EnumParam
     {}
 };
 
-//-------------------------------------------------------------------------
+
 // ctor
-//-------------------------------------------------------------------------
+
 
 CWinFileOpenImpl::CWinFileOpenImpl(
     CFilePicker* aFilePicker,
@@ -95,9 +95,9 @@ CWinFileOpenImpl::CWinFileOpenImpl(
     m_FilePickerState = m_NonExecuteFilePickerState;
 }
 
-//------------------------------------------------------------------------
+
 // dtor
-//------------------------------------------------------------------------
+
 
 CWinFileOpenImpl::~CWinFileOpenImpl()
 {
@@ -105,9 +105,9 @@ CWinFileOpenImpl::~CWinFileOpenImpl()
     delete m_NonExecuteFilePickerState;
 }
 
-//------------------------------------------------------------------------
+
 // we expect the directory in URL format
-//------------------------------------------------------------------------
+
 
 void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
     throw( IllegalArgumentException, uno::RuntimeException )
@@ -135,18 +135,18 @@ void CWinFileOpenImpl::setDisplayDirectory(const OUString& aDirectory)
     CFileOpenDialog::setDisplayDirectory(aSysDirectory);
 }
 
-//------------------------------------------------------------------------
+
 // we return the directory in URL format
-//------------------------------------------------------------------------
+
 
 OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException)
 {
     return m_FilePickerState->getDisplayDirectory(this);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
     throw( IllegalArgumentException, uno::RuntimeException )
@@ -161,13 +161,13 @@ void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName)
     m_defaultName = aName;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // return format: URL
 // if multiselection is allowed there are two different cases
 // 1. one file selected: the sequence contains one entry path\filename.ext
 // 2. multiple files selected: the sequence contains multiple entries
 //    the first entry is the path url, all other entries are file names
-//-----------------------------------------------------------------------------------------
+
 
 uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()
     throw(uno::RuntimeException)
@@ -175,9 +175,9 @@ uno::Sequence<OUString> SAL_CALL CWinFileOpenImpl::getFiles()
     return m_FilePickerState->getFiles(this);
 }
 
-//-----------------------------------------------------------------------------------------
+
 // shows the FileOpen/FileSave dialog
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
 {
@@ -195,11 +195,11 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::execute(  ) throw(uno::RuntimeException)
     return rc;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // appends a new filter
 // returns false if the title (aTitle) was already added or the title or the filter are
 // empty
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUString& aFilter)
     throw(IllegalArgumentException, uno::RuntimeException)
@@ -222,9 +222,9 @@ void SAL_CALL CWinFileOpenImpl::appendFilter(const OUString& aTitle, const OUStr
         CFileOpenDialog::setFilterIndex(1);
 }
 
-//-----------------------------------------------------------------------------------------
+
 // sets a current filter
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
     throw( IllegalArgumentException, uno::RuntimeException)
@@ -240,9 +240,9 @@ void SAL_CALL CWinFileOpenImpl::setCurrentFilter(const OUString& aTitle)
     CFileOpenDialog::setFilterIndex(filterPos + 1);
 }
 
-//-----------------------------------------------------------------------------------------
+
 // returns the currently selected filter
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeException)
 {
@@ -260,18 +260,18 @@ OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeExcepti
     return currentFilter;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator()
 {
     m_filterContainer->addFilter(FILTER_SEPARATOR, ALL_FILES_WILDCARD, ALLOW_DUPLICATES);
 }
 
-//-----------------------------------------------------------------------------------------
+
 // XFilterGroupManager
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters)
     throw (IllegalArgumentException, uno::RuntimeException)
@@ -319,10 +319,10 @@ void SAL_CALL CWinFileOpenImpl::setValue(sal_Int16 aControlId, sal_Int16 aContro
         m_FilePickerState->setValue(aControlId, aControlAction, aValue);
 }
 
-//-----------------------------------------------------------------------------------------
+
 // returns the value of an custom template element
 // we assume that there are only checkboxes or comboboxes
-//-----------------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aControlAction)
     throw(uno::RuntimeException)
@@ -334,9 +334,9 @@ uno::Any SAL_CALL CWinFileOpenImpl::getValue(sal_Int16 aControlId, sal_Int16 aCo
         return uno::Any();
 }
 
-//-----------------------------------------------------------------------------------------
+
 // enables a custom template element
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEnable)
     throw(uno::RuntimeException)
@@ -346,9 +346,9 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna
         m_FilePickerState->enableControl(ControlID, bEnable);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel )
     throw (uno::RuntimeException)
@@ -358,9 +358,9 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString&
         m_FilePickerState->setLabel(aControlId, aLabel);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
         throw (uno::RuntimeException)
@@ -372,9 +372,9 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId )
         return OUString();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats()
     throw (uno::RuntimeException)
@@ -382,9 +382,9 @@ uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats()
     return m_Preview->getSupportedImageFormats();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth()
     throw (uno::RuntimeException)
@@ -392,9 +392,9 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth()
     return m_Preview->getTargetColorDepth();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth()
         throw (uno::RuntimeException)
@@ -402,9 +402,9 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth()
     return m_Preview->getAvailableWidth();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight()
     throw (uno::RuntimeException)
@@ -412,9 +412,9 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight()
     return m_Preview->getAvailableHeight();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage)
     throw (IllegalArgumentException, uno::RuntimeException)
@@ -422,9 +422,9 @@ void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any&
     m_Preview->setImage(aImageFormat,aImage);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState)
         throw (uno::RuntimeException)
@@ -432,9 +432,9 @@ sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState)
     return m_Preview->setShowState(bShowState);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CWinFileOpenImpl::getShowState()
     throw (uno::RuntimeException)
@@ -442,9 +442,9 @@ sal_Bool SAL_CALL CWinFileOpenImpl::getShowState()
     return m_Preview->getShowState();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::cancel()
 {
@@ -460,9 +460,9 @@ void SAL_CALL CWinFileOpenImpl::cancel()
     }
 }
 
-//-----------------------------------------------------------------------------------------
+
 // returns the id of a custom template element
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused()
 {
@@ -477,20 +477,20 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused()
     return sal::static_int_cast< sal_Int16 >(nID);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 inline sal_Bool SAL_CALL CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPINFO lphi) const
 {
     return ((lphi->iCtrlId != IDOK) && (lphi->iCtrlId != IDCANCEL) && (lphi->iCtrlId < ctlFirst));
 }
 
-//-----------------------------------------------------------------------------------------
+
 // our own DlgProc because we do subclass the dialog
 // we catch the WM_NCDESTROY message in order to erase an entry in our static map
 // if one instance dies
-//-----------------------------------------------------------------------------------------
+
 
 LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
     HWND hWnd, UINT wMessage, WPARAM wParam, LPARAM lParam)
@@ -559,15 +559,15 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc(
     return lResult;
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
 {
-    //-----------------------------------------
+
     // set the labels for all extendet controls
-    //-----------------------------------------
+
 
     sal_Int16 aCtrlId = sal::static_int_cast< sal_Int16 >(GetDlgCtrlID(hWnd));
     OUString aLabel = m_ResProvider.getResString(aCtrlId);
@@ -575,7 +575,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
         setLabel(aCtrlId, aLabel);
 }
 
-//-----------------------------------------------------------------
+
 // There may be problems with the layout of our custom controls,
 // so that they are not aligned with the standard controls of the
 // FileOpen dialog.
@@ -587,7 +587,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
 // the standard combobox cmb13 (defined in MS platform sdk dlgs.h)
 // and all push buttons will be left aligned with the standard
 // "OK" button
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl)
 {
@@ -595,9 +595,9 @@ void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl)
         m_CustomControlFactory->CreateCustomControl(hCustomControl,m_hwndFileOpenDlg));
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd)
 {
@@ -605,9 +605,9 @@ void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd)
     m_ExecuteFilePickerState->cacheControlState(hWnd, m_NonExecuteFilePickerState);
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)
 {
@@ -637,9 +637,9 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam)
     return bRet;
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk()
 {
@@ -655,9 +655,9 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk()
     return 0;
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::onSelChanged(HWND)
 {
@@ -790,9 +790,9 @@ void SAL_CALL CWinFileOpenImpl::onInitDone()
     CFileOpenDialog::onInitDone();
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::onFolderChanged()
 {
@@ -800,9 +800,9 @@ void SAL_CALL CWinFileOpenImpl::onFolderChanged()
     m_FilePicker->directoryChanged(evt);
 }
 
-//-----------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32)
 {
@@ -813,9 +813,9 @@ void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32)
     m_FilePicker->controlStateChanged(evt);
 }
 
-//-----------------------------------------------------------------------------------------
+
 // onMessageCommand handler
-//-----------------------------------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand(
     HWND, sal_uInt16 ctrlId, sal_uInt16)
@@ -832,9 +832,9 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand(
     return 0;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void CWinFileOpenImpl::onWMSize()
 {
@@ -843,27 +843,27 @@ void CWinFileOpenImpl::onWMSize()
     m_FilePicker->dialogSizeChanged();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void CWinFileOpenImpl::onWMShow(sal_Bool bShow)
 {
     m_Preview->notifyParentShow(bShow);
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void CWinFileOpenImpl::onWMWindowPosChanged()
 {
     m_Preview->notifyParentWindowPosChanged();
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)
 {
@@ -881,9 +881,9 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi)
     }
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg)
 {
@@ -894,9 +894,9 @@ void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg)
             reinterpret_cast<LONG_PTR>(SubClassFunc)));
 }
 
-//-----------------------------------------------------------------------------------------
+
 // processing before showing the dialog
-//-----------------------------------------------------------------------------------------
+
 
 bool SAL_CALL CWinFileOpenImpl::preModal()
 {
@@ -906,9 +906,9 @@ bool SAL_CALL CWinFileOpenImpl::preModal()
     return true;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // processing after showing the dialog
-//-----------------------------------------------------------------------------------------
+
 
 void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult)
 {
@@ -922,9 +922,9 @@ void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult)
     m_FilePickerState = m_NonExecuteFilePickerState;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
 {
@@ -972,9 +972,9 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension()
     // !!! HACK !!!
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
 {
diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
index 1d7450c5e5ef..35599c87e0d1 100644
--- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx
+++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx
@@ -26,16 +26,16 @@
 #include <memory>
 #include "SolarMutex.hxx"
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 using namespace com::sun::star;
 using ::com::sun::star::ui::dialogs::XFilePickerListener;
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelper) :
     m_hThread(0),
@@ -58,9 +58,9 @@ CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelpe
                                0);      /* automatic name */
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 CAsyncEventNotifier::~CAsyncEventNotifier()
 {
@@ -70,9 +70,9 @@ CAsyncEventNotifier::~CAsyncEventNotifier()
     CloseHandle(m_hEvents[1]);
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&                         aType    ,
                                                const uno::Reference< uno::XInterface >& xListener)
@@ -90,9 +90,9 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type&
     m_rBroadcastHelper.aLC.addInterface( aType, xListener );
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&                         aType    ,
                                                   const uno::Reference< uno::XInterface >& xListener)
@@ -105,9 +105,9 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type&
     m_rBroadcastHelper.aLC.removeInterface( aType, xListener );
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended)
 {
@@ -137,9 +137,9 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended)
     return m_bRun;
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::shutdown()
 {
@@ -175,27 +175,27 @@ void SAL_CALL CAsyncEventNotifier::shutdown()
     m_hThread = 0;
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void CAsyncEventNotifier::suspend()
 {
     ResetEvent(m_ResumeNotifying);
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void CAsyncEventNotifier::resume()
 {
     SetEvent(m_ResumeNotifying);
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotification)
 {
@@ -210,9 +210,9 @@ void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotifica
     }
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 size_t SAL_CALL CAsyncEventNotifier::getEventListSize()
 {
@@ -220,9 +220,9 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize()
     return m_EventList.size();
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::resetNotifyEvent()
 {
@@ -231,9 +231,9 @@ void SAL_CALL CAsyncEventNotifier::resetNotifyEvent()
         ResetEvent(m_NotifyEvent);
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord()
 {
@@ -241,9 +241,9 @@ CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord()
     return m_EventList.front();
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::removeNextEventRecord()
 {
@@ -251,9 +251,9 @@ void SAL_CALL CAsyncEventNotifier::removeNextEventRecord()
     m_EventList.pop_front();
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 void SAL_CALL CAsyncEventNotifier::run()
 {
@@ -297,9 +297,9 @@ void SAL_CALL CAsyncEventNotifier::run()
     } // while(m_bRun)
 }
 
-//------------------------------------------------
+
 //
-//------------------------------------------------
+
 
 unsigned int WINAPI CAsyncEventNotifier::ThreadProc(LPVOID pParam)
 {
diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx
index 65345b045b53..6be5e1dc03c2 100644
--- a/fpicker/source/win32/filepicker/controlaccess.cxx
+++ b/fpicker/source/win32/filepicker/controlaccess.cxx
@@ -23,24 +23,24 @@
 #include "controlaccess.hxx"
 #include "../misc/WinImplHelper.hxx"
 
-//------------------------------------------------------------
+
 // we are using a table based algorithm to dispatch control
 // actions there is one table containing one action table for
 // each control class and one action table per control class
 // which contains function pointer to control action functions
-//------------------------------------------------------------
 
-//------------------------------------------------------------
+
+
 // namespace directives
-//------------------------------------------------------------
+
 
 
 namespace // private
 {
 
-    //------------------------------------------------------------
+
     // table setup
-    //------------------------------------------------------------
+
 
     CTRL_SETVALUE_FUNCTION_T CheckboxSetValueFunctionTable[] =
     {
@@ -107,9 +107,9 @@ namespace // private
         { NULL, 0 }
     };
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction(
         CTRL_SETVALUE_FUNCTION_T* aCtrlSetValueFunctionTable, size_t aTableSize, sal_Int16 aCtrlAction )
@@ -122,9 +122,9 @@ namespace // private
         return aCtrlSetValueFunctionTable[aCtrlAction];
     }
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction(
         CTRL_GETVALUE_FUNCTION_T* aCtrlGetValueFunctionTable, size_t aTableSize, sal_Int16 aCtrlAction )
@@ -137,9 +137,9 @@ namespace // private
         return aCtrlGetValueFunctionTable[aCtrlAction];
     }
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     inline
     _ENTRY SAL_CALL GetCtrlClassSetValueFunctionTable( CTRL_CLASS aCtrlClass )
@@ -147,9 +147,9 @@ namespace // private
         return CtrlClassSetValueFunctionTable[aCtrlClass];
     }
 
-    //------------------------------------------------------------
+
     //
-    //------------------------------------------------------------
+
 
     inline
     _ENTRY SAL_CALL GetCtrlClassGetValueFunctionTable( CTRL_CLASS aCtrlClass )
@@ -173,9 +173,9 @@ namespace // private
 
 }; // end namespace
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction )
 {
@@ -188,9 +188,9 @@ CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass
         aCtrlAction );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction )
 {
@@ -203,9 +203,9 @@ CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass
         aCtrlAction );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl )
 {
@@ -234,9 +234,9 @@ CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl )
     return aCtrlClass;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 int SAL_CALL CommonFilePickerCtrlIdToWinFileOpenCtrlId( sal_Int16 aControlId )
 {
diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx
index 222bb1960bc2..6ef55b9e110f 100644
--- a/fpicker/source/win32/filepicker/controlcommand.cxx
+++ b/fpicker/source/win32/filepicker/controlcommand.cxx
@@ -22,9 +22,9 @@
 #include "controlcommandresult.hxx"
 #include "filepickerstate.hxx"
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommand::CControlCommand( sal_Int16 aControlId ) :
     m_NextCommand( NULL ),
@@ -32,17 +32,17 @@ CControlCommand::CControlCommand( sal_Int16 aControlId ) :
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommand::~CControlCommand( )
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandRequest* pRequest )
 {
@@ -68,27 +68,27 @@ CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandR
     return result;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommand* SAL_CALL CControlCommand::getNextCommand( ) const
 {
     return m_NextCommand;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CControlCommand::setNextCommand( CControlCommand* nextCommand )
 {
     m_NextCommand = nextCommand;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 sal_Int16 SAL_CALL CControlCommand::getControlId( ) const
 {
@@ -96,9 +96,9 @@ sal_Int16 SAL_CALL CControlCommand::getControlId( ) const
 }
 
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CValueControlCommand::CValueControlCommand(
         sal_Int16 aControlId,
@@ -110,9 +110,9 @@ CValueControlCommand::CValueControlCommand(
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState )
 {
@@ -124,9 +124,9 @@ void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState )
         m_aValue );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCommandRequest* aRequest )
 {
@@ -158,18 +158,18 @@ CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCom
     return result;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const
 {
     return m_aControlAction;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 ::com::sun::star::uno::Any SAL_CALL CValueControlCommand::getValue( ) const
 {
@@ -177,9 +177,9 @@ sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const
 }
 
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CLabelControlCommand::CLabelControlCommand(
         sal_Int16 aControlId,
@@ -189,9 +189,9 @@ CLabelControlCommand::CLabelControlCommand(
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState )
 {
@@ -200,9 +200,9 @@ void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState )
     aFilePickerState->setLabel( getControlId( ), m_aLabel );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCommandRequest* aRequest )
 {
@@ -235,18 +235,18 @@ CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCom
     return result;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 OUString SAL_CALL CLabelControlCommand::getLabel( ) const
 {
     return m_aLabel;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CEnableControlCommand::CEnableControlCommand(
         sal_Int16 aControlId,
@@ -256,9 +256,9 @@ CEnableControlCommand::CEnableControlCommand(
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CEnableControlCommand::exec( CFilePickerState* aFilePickerState )
 {
diff --git a/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx
index 98400a15a1c0..4e21d3f7e267 100644
--- a/fpicker/source/win32/filepicker/customcontrol.cxx
+++ b/fpicker/source/win32/filepicker/customcontrol.cxx
@@ -19,35 +19,35 @@
 
 #include "customcontrol.hxx"
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CCustomControl::~CCustomControl()
 {
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControl::AddControl(CCustomControl*)
 {
     // will be implemented by custom control containers
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControl::RemoveControl(CCustomControl*)
 {
     // will be implemented by custom control containers
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControl::RemoveAllControls()
 {
diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
index 312c59fa5e8e..0d6bcdb2b79a 100644
--- a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx
@@ -22,9 +22,9 @@
 #include <algorithm>
 #include <functional>
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 namespace /* private */
 {
@@ -56,18 +56,18 @@ namespace /* private */
     };
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CCustomControlContainer::~CCustomControlContainer()
 {
     RemoveAllControls();
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControlContainer::Align()
 {
@@ -77,9 +77,9 @@ void SAL_CALL CCustomControlContainer::Align()
         AlignCustomControl);
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControlContainer::SetFont(HFONT hFont)
 {
@@ -91,18 +91,18 @@ void SAL_CALL CCustomControlContainer::SetFont(HFONT hFont)
         aSetFontHelper);
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControlContainer::AddControl(CCustomControl* aCustomControl)
 {
     m_ControlContainer.push_back(aCustomControl);
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControlContainer::RemoveControl(CCustomControl* aCustomControl)
 {
@@ -118,9 +118,9 @@ void SAL_CALL CCustomControlContainer::RemoveControl(CCustomControl* aCustomCont
     }
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CCustomControlContainer::RemoveAllControls()
 {
diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
index b20f557c02f6..9d1fbf357e1a 100644
--- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx
+++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx
@@ -24,9 +24,9 @@
 #include "dialogcustomcontrols.hxx"
 #include <osl/diagnose.h>
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, HWND aParentHandle)
 {
@@ -66,9 +66,9 @@ CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle,
     return new CDummyCustomControl(aControlHandle,aParentHandle);
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CCustomControl* CCustomControlFactory::CreateCustomControlContainer()
 {
diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
index 5a9f4d4d567b..32a5646faab4 100644
--- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
+++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx
@@ -20,9 +20,9 @@
 #include "dialogcustomcontrols.hxx"
 #include <osl/diagnose.h>
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aParentHandle) :
     m_CustomControlHandle(aControlHandle),
@@ -30,9 +30,9 @@ CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aPa
 {
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont)
 {
@@ -43,9 +43,9 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont)
         (LPARAM)sal_True);
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle)
 {
@@ -79,102 +79,102 @@ void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle)
         SWP_NOACTIVATE);
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CDummyCustomControl::CDummyCustomControl(HWND, HWND)
 {
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CDummyCustomControl::Align()
 {
     // do nothing
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 void SAL_CALL CDummyCustomControl::SetFont(HFONT)
 {
     // do nothing
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CStaticCustomControl::CStaticCustomControl(HWND aControlHandle, HWND aParentHandle) :
     CDialogCustomControlBase(aControlHandle,aParentHandle)
 {
 }
 
-//-----------------------------------
+
 // Align to the "File name" static
 // text of the standard FileOpen dlg
-//-----------------------------------
+
 
 void SAL_CALL CStaticCustomControl::Align()
 {
     AlignToBuddy(GetDlgItem(m_ParentHandle,stc3));
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CPushButtonCustomControl::CPushButtonCustomControl(HWND aControlHandle, HWND aParentHandle) :
     CDialogCustomControlBase(aControlHandle,aParentHandle)
 {
 }
 
-//-----------------------------------
+
 // Align to the "OK" button of the
 // standard FileOpen dlg
-//-----------------------------------
+
 
 void SAL_CALL CPushButtonCustomControl::Align()
 {
     AlignToBuddy(GetDlgItem(m_ParentHandle,IDCANCEL));
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CComboboxCustomControl::CComboboxCustomControl(HWND aControlHandle, HWND aParentHandle) :
     CDialogCustomControlBase(aControlHandle,aParentHandle)
 {
 }
 
-//-----------------------------------
+
 // Align to the "File name" combobox
 // of the standard FileOpen dlg
-//-----------------------------------
+
 
 void SAL_CALL CComboboxCustomControl::Align()
 {
     AlignToBuddy(GetDlgItem(m_ParentHandle,cmb1));
 }
 
-//-----------------------------------
+
 //
-//-----------------------------------
+
 
 CCheckboxCustomControl::CCheckboxCustomControl(HWND aControlHandle, HWND aParentHandle) :
     CDialogCustomControlBase(aControlHandle,aParentHandle)
 {
 }
 
-//-----------------------------------
+
 // Align to the "File name" combobox
 // of the standard FileOpen dlg
-//-----------------------------------
+
 
 void SAL_CALL CCheckboxCustomControl::Align()
 {
diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx
index 1bfb21d35d29..66f46efff1e4 100644
--- a/fpicker/source/win32/filepicker/dibpreview.cxx
+++ b/fpicker/source/win32/filepicker/dibpreview.cxx
@@ -28,18 +28,18 @@
 #include <stdexcept>
 #include <string>
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::lang::IllegalArgumentException;
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 namespace /* private */
 {
@@ -48,17 +48,17 @@ namespace /* private */
 
 #define PREVIEWWND_CLASS_NAME TEXT("DIBPreviewWnd###")
 
-//---------------------------------------------------
+
 // static member initialization
-//---------------------------------------------------
+
 
 osl::Mutex CDIBPreview::s_Mutex;
 ATOM CDIBPreview::s_ClassAtom = 0;
 sal_Int32 CDIBPreview::s_RegisterDibPreviewWndCount = 0;
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) :
     m_Instance(instance)
@@ -95,9 +95,9 @@ CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) :
     }
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 CDIBPreview::~CDIBPreview( )
 {
@@ -109,9 +109,9 @@ CDIBPreview::~CDIBPreview( )
     UnregisterDibPreviewWindowClass();
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException)
 {
@@ -124,9 +124,9 @@ sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException)
     return clrRes;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException)
 {
@@ -141,9 +141,9 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException)
     return cx;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException)
 {
@@ -158,9 +158,9 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException)
     return cy;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
     throw (IllegalArgumentException, RuntimeException)
@@ -181,9 +181,9 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage)
     UpdateWindow(m_Hwnd);
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeException)
 {
@@ -192,27 +192,27 @@ sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeE
     return sal_True;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException)
 {
     return (sal_Bool)IsWindowVisible(m_Hwnd);
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 HWND SAL_CALL CDIBPreview::getWindowHandle() const
 {
     return m_Hwnd;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
 {
@@ -306,9 +306,9 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC)
     }
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 LRESULT CALLBACK CDIBPreview::WndProc(
     HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -374,9 +374,9 @@ LRESULT CALLBACK CDIBPreview::WndProc(
     return lResult;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass()
 {
@@ -417,9 +417,9 @@ ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass()
     return s_ClassAtom;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass()
 {
diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
index 97d545bdcf5b..275f4f59920b 100644
--- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx
+++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx
@@ -20,26 +20,26 @@
 #include "filepickereventnotification.hxx"
 #include <sal/types.h>
 
-//-----------------------------------
+
 // namespace directives
-//-----------------------------------
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::ui::dialogs;
 
-//-----------------------------------
+
 // A FilePicker event without
 // parameter
-//-----------------------------------
+
 
 CFilePickerEventNotification::CFilePickerEventNotification(EventListenerMethod_t EventListenerMethod) :
     m_EventListenerMethod(EventListenerMethod)
 {
 }
 
-//----------------------------------
+
 //
-//----------------------------------
+
 
 void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInterface > xListener )
 {
@@ -52,9 +52,9 @@ void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInt
 //##################################################
 
 
-//----------------------------------
+
 // A FilePicker event with parameter
-//----------------------------------
+
 
 CFilePickerParamEventNotification::CFilePickerParamEventNotification(EventListenerMethod_t EventListenerMethod, const FilePickerEvent& FilePickerEvent) :
     m_EventListenerMethod(EventListenerMethod),
@@ -62,9 +62,9 @@ CFilePickerParamEventNotification::CFilePickerParamEventNotification(EventListen
 {
 }
 
-//----------------------------------
+
 // A FilePicker event with parameter
-//----------------------------------
+
 
 void SAL_CALL CFilePickerParamEventNotification::notifyEventListener( Reference< XInterface > xListener )
 {
diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx
index 65e11c542690..971f44c1e7ea 100644
--- a/fpicker/source/win32/filepicker/filepickerstate.cxx
+++ b/fpicker/source/win32/filepicker/filepickerstate.cxx
@@ -34,9 +34,9 @@
 #include "FileOpenDlg.hxx"
 
 #include "../misc/WinImplHelper.hxx"
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 using com::sun::star::uno::Any;
 using com::sun::star::uno::Sequence;
@@ -47,42 +47,42 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::ListboxControlActions;
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 const sal_Int32 MAX_LABEL = 256;
 const sal_Int16 LISTBOX_LABEL_OFFSET = 100;
 
-//---------------------------------------------
+
 // declaration
-//---------------------------------------------
+
 
 CFilePickerState::~CFilePickerState( )
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CNonExecuteFilePickerState::CNonExecuteFilePickerState( ) :
     m_FirstControlCommand( NULL )
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CNonExecuteFilePickerState::~CNonExecuteFilePickerState( )
 {
     reset( );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue )
 {
@@ -92,9 +92,9 @@ void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_In
     addControlCommand( value_command );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
 {
@@ -135,9 +135,9 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int
     return aAny;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable )
 {
@@ -147,9 +147,9 @@ void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, s
     addControlCommand( enable_command );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel )
 {
@@ -159,9 +159,9 @@ void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const
     addControlCommand( label_command );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId )
 {
@@ -203,9 +203,9 @@ OUString MatchFixBrokenPath(const OUString& path)
     return path;
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 static OUString trimTrailingSpaces(const OUString& rString)
 {
     OUString aResult(rString);
@@ -281,9 +281,9 @@ Sequence< OUString > SAL_CALL CNonExecuteFilePickerState::getFiles( CFileOpenDia
     return aFilePathList;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog )
 {
@@ -300,9 +300,9 @@ OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDial
     return pathURL;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CNonExecuteFilePickerState::reset( )
 {
@@ -319,20 +319,20 @@ void SAL_CALL CNonExecuteFilePickerState::reset( )
     m_FirstControlCommand = NULL;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CControlCommand* SAL_CALL CNonExecuteFilePickerState::getControlCommand( ) const
 {
     return m_FirstControlCommand;
 }
 
-//---------------------------------------------
+
 // we append new control commands to the end
 // of the list so that we are sure the commands
 // will be executed as the client issued it
-//---------------------------------------------
+
 
 void SAL_CALL CNonExecuteFilePickerState::addControlCommand( CControlCommand* aControlCommand )
 {
@@ -355,18 +355,18 @@ void SAL_CALL CNonExecuteFilePickerState::addControlCommand( CControlCommand* aC
 
 //#######################################################################
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 CExecuteFilePickerState::CExecuteFilePickerState( HWND hwndDlg ) :
     m_hwndDlg( hwndDlg )
 {
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue )
 {
@@ -406,9 +406,9 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16
     lpfnSetValue( hwndCtrl, aValue, Reference< XInterface >( ), 3 );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction )
 {
@@ -445,9 +445,9 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16
     return lpfnGetValue( hwndCtrl );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable )
 {
@@ -458,9 +458,9 @@ void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_
     EnableWindow( hwndCtrl, bEnable );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel )
 {
@@ -478,9 +478,9 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS
     SetWindowText( hwndCtrl, reinterpret_cast<LPCTSTR>(aWinLabel.getStr( )) );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId )
 {
@@ -503,9 +503,9 @@ OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId )
     return ctrlLabel;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog* aFileOpenDialog )
 {
@@ -539,9 +539,9 @@ Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog
     return aFilePathList;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog )
 {
@@ -558,9 +558,9 @@ OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog*
     return pathURL;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* firstControlCommand )
 {
@@ -573,9 +573,9 @@ void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand*
     }
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFilePickerState* aNonExecFilePickerState )
 {
@@ -631,18 +631,18 @@ void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFil
     }
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 void SAL_CALL CExecuteFilePickerState::setHwnd( HWND hwndDlg )
 {
     m_hwndDlg = hwndDlg;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 inline sal_Bool SAL_CALL CExecuteFilePickerState::IsListboxControl( HWND hwndControl ) const
 {
@@ -652,22 +652,22 @@ inline sal_Bool SAL_CALL CExecuteFilePickerState::IsListboxControl( HWND hwndCon
     return ( LISTBOX == aCtrlClass );
 }
 
-//---------------------------------------------
+
 // because listboxes (comboboxes) and their labels
 // are separated we have to translate the listbox
 // id to their corresponding label id
 // the convention is that the label id of a listbox
 // is the id of the listbox + 100
-//---------------------------------------------
+
 
 inline sal_Int16 SAL_CALL CExecuteFilePickerState::ListboxIdToListboxLabelId( sal_Int16 aListboxId ) const
 {
     return ( aListboxId + LISTBOX_LABEL_OFFSET );
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aControlId ) const
 {
@@ -679,9 +679,9 @@ inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aCo
     return hwndCtrl;
 }
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 HWND SAL_CALL CExecuteFilePickerState::GetHwndDlgItem( sal_Int16 aControlId, sal_Bool bIncludeStdCtrls ) const
 {
diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
index 4a8eb9e8bfca..48ed997c3645 100644
--- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
+++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx
@@ -33,10 +33,10 @@
 namespace /* private */
 {
 
-    //-----------------------------------------------
+
     // This class prevents changing of the working
     // directory.
-    //-----------------------------------------------
+
     class CurDirGuard
     {
         sal_Bool m_bValid;
@@ -106,9 +106,9 @@ namespace /* private */
         }
     };
 
-    //-----------------------------------------------
+
     //
-    //-----------------------------------------------
+
 
     struct GetFileNameParam
     {
@@ -125,9 +125,9 @@ namespace /* private */
         int             m_ExtErr;
     };
 
-    //-----------------------------------------------
+
     //
-    //-----------------------------------------------
+
 
     unsigned __stdcall ThreadProc(void* pParam)
     {
@@ -151,10 +151,10 @@ namespace /* private */
         return 0;
     }
 
-    //-----------------------------------------------
+
     // exceutes GetOpenFileName/GetSaveFileName in
     // a separat thread
-    //-----------------------------------------------
+
 
     bool ThreadExecGetFileName(LPOPENFILENAME lpofn, bool bOpen, /*out*/ int& ExtErr)
     {
@@ -174,11 +174,11 @@ namespace /* private */
         return gfnp.m_bRet;
     }
 
-    //-----------------------------------------------
+
     // This function returns true if the calling
     // thread belongs to a Multithreaded Appartment
     // (MTA)
-    //-----------------------------------------------
+
 
     bool IsMTA()
     {
@@ -196,18 +196,18 @@ namespace /* private */
 } // namespace private
 
 
-//-----------------------------------------------
+
 //
-//-----------------------------------------------
+
 
 CGetFileNameWrapper::CGetFileNameWrapper() :
     m_ExtendedDialogError(0)
 {
 }
 
-//-----------------------------------------------
+
 //
-//-----------------------------------------------
+
 
 bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn)
 {
@@ -236,9 +236,9 @@ bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn)
     return bRet;
 }
 
-//-----------------------------------------------
+
 //
-//-----------------------------------------------
+
 
 bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn)
 {
@@ -262,9 +262,9 @@ bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn)
     return bRet;
 }
 
-//-----------------------------------------------
+
 //
-//-----------------------------------------------
+
 
 int CGetFileNameWrapper::commDlgExtendedError( )
 {
diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx
index 63be5564a7f2..3af46a0cc94c 100644
--- a/fpicker/source/win32/filepicker/helppopupwindow.cxx
+++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx
@@ -21,15 +21,15 @@
 #include "helppopupwindow.hxx"
 #include <osl/diagnose.h>
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 using osl::Mutex;
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 namespace /* private */
 {
@@ -54,17 +54,17 @@ const sal_Int32 OUTER_FRAME_WIDTH = 1; // pixel
 const DWORD INNER_FRAME_COLOR     = 0xC8D0D4;
 const sal_Int32 INNER_FRAME_WIDTH = 1; // pixel
 
-//---------------------------------------------------
+
 // static member initialization
-//---------------------------------------------------
+
 
 osl::Mutex CHelpPopupWindow::s_Mutex;
 ATOM CHelpPopupWindow::s_ClassAtom = 0;
 sal_Int32 CHelpPopupWindow::s_RegisterWndClassCount = 0;
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 CHelpPopupWindow::CHelpPopupWindow(
     HINSTANCE hInstance,
@@ -88,9 +88,9 @@ CHelpPopupWindow::CHelpPopupWindow(
     m_hBrushShadow  = CreatePatternBrush( m_hBitmapShadow );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 CHelpPopupWindow::~CHelpPopupWindow( )
 {
@@ -105,18 +105,18 @@ CHelpPopupWindow::~CHelpPopupWindow( )
     DeleteObject( m_hBrushShadow );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText )
 {
     m_HelpText = aHelpText;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y )
 {
@@ -153,9 +153,9 @@ void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y )
     ShowWindow( m_hwnd, SW_SHOW );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 HWND SAL_CALL CHelpPopupWindow::setParent( HWND hwndNewParent )
 {
@@ -166,10 +166,10 @@ HWND SAL_CALL CHelpPopupWindow::setParent( HWND hwndNewParent )
     return oldParent;
 }
 
-//---------------------------------------------------
+
 // calculates the necessary dimensions of the popup
 // window including the margins etc.
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::calcWindowRect( LPRECT lprect )
 {
@@ -215,9 +215,9 @@ void SAL_CALL CHelpPopupWindow::calcWindowRect( LPRECT lprect )
     ReleaseDC( m_hwnd, hdc );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* cy_new )
 {
@@ -240,9 +240,9 @@ void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32*
     *cy_new = rect.bottom;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::adjustWindowPos(
     sal_Int32 x, sal_Int32 y, sal_Int32 cx, sal_Int32 cy )
@@ -289,9 +289,9 @@ void SAL_CALL CHelpPopupWindow::adjustWindowPos(
     ReleaseDC( m_hwnd, hdc );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc )
 {
@@ -409,18 +409,18 @@ void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc )
     SetBkColor( hdc, oldBkColor );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::onNcDestroy()
 {
     m_hwnd = NULL;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd )
 {
@@ -448,9 +448,9 @@ void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd )
     ReleaseDC( m_hwnd, hdc );
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 LRESULT CALLBACK CHelpPopupWindow::WndProc(
     HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
@@ -522,9 +522,9 @@ LRESULT CALLBACK CHelpPopupWindow::WndProc(
     return lResult;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( )
 {
@@ -562,9 +562,9 @@ ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( )
     return s_ClassAtom;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( )
 {
diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx
index 23aab44f834a..c87f3b858479 100644
--- a/fpicker/source/win32/filepicker/previewadapter.cxx
+++ b/fpicker/source/win32/filepicker/previewadapter.cxx
@@ -28,17 +28,17 @@
 #include <memory>
 #include <stdexcept>
 
-//---------------------------------------------
+
 //
-//---------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
-//---------------------------------------------
+
 // An impl class to hide implementation details
 // from clients
-//---------------------------------------------
+
 
 class CPreviewAdapterImpl
 {
@@ -64,9 +64,9 @@ public:
 
     virtual HWND SAL_CALL getParent();
 
-    //-------------------------------------
+
     // parent notification handler
-    //-------------------------------------
+
 
     virtual void SAL_CALL notifyParentShow(sal_Bool bShow);
 
@@ -96,9 +96,9 @@ private:
     CPreviewAdapterImpl& operator=(const CPreviewAdapterImpl&);
 };
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) :
     m_Instance(instance),
@@ -108,44 +108,44 @@ CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) :
 {
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 CPreviewAdapterImpl::~CPreviewAdapterImpl()
 {
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 sal_Int32 SAL_CALL CPreviewAdapterImpl::getTargetColorDepth()
 {
     return m_Preview->getTargetColorDepth();
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableWidth()
 {
     return m_Preview->getAvailableWidth();
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight()
 {
     return m_Preview->getAvailableHeight();
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& aImage )
     throw (IllegalArgumentException,RuntimeException)
@@ -153,9 +153,9 @@ void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any&
     m_Preview->setImage(aImageFormat,aImage);
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState )
 {
@@ -164,18 +164,18 @@ sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState )
     return bRet;
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 sal_Bool SAL_CALL CPreviewAdapterImpl::getShowState()
 {
     return m_Preview->getShowState();
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent)
 {
@@ -185,18 +185,18 @@ void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent)
     calcRightMargin();
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 HWND SAL_CALL CPreviewAdapterImpl::getParent()
 {
     return m_FileDialog;
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::calcRightMargin()
 {
@@ -226,34 +226,34 @@ void SAL_CALL CPreviewAdapterImpl::calcRightMargin()
     m_RightMargin = rcFileDlg.right - rcFlb.right;
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::notifyParentShow(sal_Bool)
 {
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::notifyParentSizeChanged()
 {
     rearrangeLayout();
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::notifyParentWindowPosChanged()
 {
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
 {
@@ -346,9 +346,9 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout()
     }
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error)
 {
@@ -368,9 +368,9 @@ void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_
     m_Preview->setImage(aImgFrmt,aImg);
 }
 
-//-----------------------------------------
+
 //
-//-----------------------------------------
+
 
 HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const
 {
@@ -392,11 +392,11 @@ HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const
 //##############################################################
 
 
-//--------------------------------------------
+
 // Implementation for Windows 95/NT/ME/2000/XP
 // because:
 //
-//--------------------------------------------
+
 
 class CWin95NTPreviewAdapterImpl : public CPreviewAdapterImpl
 {
@@ -406,18 +406,18 @@ public:
     virtual void SAL_CALL notifyParentShow(sal_Bool bShow);
 };
 
-//--------------------------------------------
+
 //
-//--------------------------------------------
+
 
 CWin95NTPreviewAdapterImpl::CWin95NTPreviewAdapterImpl(HINSTANCE instance) :
     CPreviewAdapterImpl(instance)
 {
 }
 
-//--------------------------------------------
+
 //
-//--------------------------------------------
+
 
 void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow)
 {
@@ -438,26 +438,26 @@ void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow)
 //##############################################################
 
 
-//-------------------------------
+
 // ctor
-//-------------------------------
+
 
 CPreviewAdapter::CPreviewAdapter(HINSTANCE instance)
 {
     m_pImpl.reset(new CWin95NTPreviewAdapterImpl(instance));
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 CPreviewAdapter::~CPreviewAdapter()
 {
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats()
 {
@@ -466,36 +466,36 @@ Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats()
     return imgFormats;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL CPreviewAdapter::getTargetColorDepth()
 {
     return m_pImpl->getTargetColorDepth();
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL CPreviewAdapter::getAvailableWidth()
 {
     return m_pImpl->getAvailableWidth();
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight()
 {
     return m_pImpl->getAvailableHeight();
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aImage )
     throw (IllegalArgumentException, RuntimeException)
@@ -503,54 +503,54 @@ void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aIma
     m_pImpl->setImage(aImageFormat,aImage);
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL CPreviewAdapter::setShowState( sal_Bool bShowState )
 {
     return m_pImpl->setShowState(bShowState);
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL CPreviewAdapter::getShowState()
 {
     return m_pImpl->getShowState();
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL CPreviewAdapter::setParent(HWND parent)
 {
     m_pImpl->setParent(parent);
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL CPreviewAdapter::notifyParentShow(bool bShow)
 {
     m_pImpl->notifyParentShow(bShow);
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL CPreviewAdapter::notifyParentSizeChanged()
 {
     m_pImpl->notifyParentSizeChanged();
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL CPreviewAdapter::notifyParentWindowPosChanged()
 {
diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx
index e20b7b0c9e6f..97f5b7d4974f 100644
--- a/fpicker/source/win32/filepicker/previewbase.cxx
+++ b/fpicker/source/win32/filepicker/previewbase.cxx
@@ -25,9 +25,9 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 PreviewBase::PreviewBase() :
     m_ImageFormat(::com::sun::star::ui::dialogs::FilePreviewImageFormats::BITMAP),
@@ -35,44 +35,44 @@ PreviewBase::PreviewBase() :
 {
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 PreviewBase::~PreviewBase()
 {
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException)
 {
     return 0;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException)
 {
     return 0;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException)
 {
     return 0;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage )
     throw (IllegalArgumentException, RuntimeException)
@@ -90,9 +90,9 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s
     m_ImageFormat = aImageFormat;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,com::sun::star::uno::Any& aImage)
 {
@@ -100,9 +100,9 @@ void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,com::sun::star::uno:
     aImage       = m_ImageData;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (RuntimeException)
 {
@@ -110,27 +110,27 @@ sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (Runtim
     return sal_True;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException)
 {
     return sal_False;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 sal_Bool SAL_CALL PreviewBase::getImaginaryShowState() const
 {
     return m_bShowState;
 }
 
-//-------------------------------
+
 //
-//-------------------------------
+
 
 HWND SAL_CALL PreviewBase::getWindowHandle() const
 {
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index 9fa5112a8b6d..ed3838b70283 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -70,17 +70,17 @@ void TestFilterManager( Reference< XFilePicker > xFilePicker );
 
 #define RDB_SYSPATH "D:\\Projects\\gsl\\sysui\\wntmsci7\\bin\\applicat.rdb"
 
-//_________________________________________________________________________________________________________________________
+
 //  global variables
-//_________________________________________________________________________________________________________________________
+
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
 const OUString BMP_EXTENSION( "bmp" );
 
-//-------------------------------------------------------------------------------------------------------------------------
+
 // a test client
-//-------------------------------------------------------------------------------------------------------------------------
+
 
 class FilePickerListener : public WeakImplHelper1< XFilePickerListener >
 {
@@ -230,18 +230,18 @@ void SAL_CALL FilePickerListener::dialogSizeChanged( )
 {
 }
 
-//--------------------------------------------------------
+
 //  main
-//--------------------------------------------------------
+
 
 
 int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
 {
     printf("Starting test of FPS-Service\n");
 
-    //-------------------------------------------------
+
     // get the global service-manager
-    //-------------------------------------------------
+
 
     // Get global factory for uno services.
     OUString rdbName = OUString( RDB_SYSPATH );
@@ -254,9 +254,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         return(-1);
     }
 
-    //-------------------------------------------------
+
     // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
+
 
     Sequence< Any > arguments(1);
         arguments[0] = makeAny( FILEOPEN_READONLY_VERSION );
@@ -331,9 +331,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char* Env[]  )
         if ( xFPNotifier.is( ) )
             xFPNotifier->removeFilePickerListener( xFPListener );
 
-    //--------------------------------------------------
+
     // shutdown
-    //--------------------------------------------------
+
 
     // Cast factory to XComponent
     Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx
index 7619e0d99d1b..58adeeed1cc2 100644
--- a/fpicker/source/win32/folderpicker/FolderPicker.cxx
+++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx
@@ -24,9 +24,9 @@
 #include <cppuhelper/supportsservice.hxx>
 #include "WinFOPImpl.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
@@ -43,9 +43,9 @@ using namespace com::sun::star::ui::dialogs;
 
 #define FOLDERPICKER_IMPL_NAME  "com.sun.star.ui.dialogs.Win32FolderPicker"
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -57,9 +57,9 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceMgr ) :
     m_xServiceMgr( xServiceMgr )
@@ -67,9 +67,9 @@ CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceM
     m_pFolderPickerImpl = std::auto_ptr< CWinFolderPickerImpl > ( new CWinFolderPickerImpl( this ) );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeException )
 {
@@ -78,9 +78,9 @@ void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeEx
     m_pFolderPickerImpl->setTitle( aTitle );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory )
     throw( IllegalArgumentException, RuntimeException )
@@ -90,9 +90,9 @@ void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory )
     m_pFolderPickerImpl->setDisplayDirectory( aDirectory );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFolderPicker::getDisplayDirectory( )
     throw( RuntimeException )
@@ -102,9 +102,9 @@ OUString SAL_CALL CFolderPicker::getDisplayDirectory( )
     return m_pFolderPickerImpl->getDisplayDirectory( );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException )
 {
@@ -113,9 +113,9 @@ OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException )
     return m_pFolderPickerImpl->getDirectory( );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) throw( RuntimeException )
 {
@@ -124,9 +124,9 @@ void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) thro
     m_pFolderPickerImpl->setDescription( aDescription );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL CFolderPicker::execute( )
     throw( RuntimeException )
@@ -140,9 +140,9 @@ sal_Int16 SAL_CALL CFolderPicker::execute( )
     return m_pFolderPickerImpl->execute( );
 }
 
-// -------------------------------------------------
+
 // XServiceInfo
-// -------------------------------------------------
+
 
 OUString SAL_CALL CFolderPicker::getImplementationName(  )
     throw( RuntimeException )
@@ -157,9 +157,9 @@ sal_Bool SAL_CALL CFolderPicker::supportsService( const OUString& ServiceName )
     return cppu::supportsService(this, ServiceName);
 }
 
-// -------------------------------------------------
+
 //  XServiceInfo
-// -------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CFolderPicker::getSupportedServiceNames(   )
     throw( RuntimeException )
@@ -167,9 +167,9 @@ Sequence< OUString > SAL_CALL CFolderPicker::getSupportedServiceNames(   )
     return FolderPicker_getSupportedServiceNames();
 }
 
-// -------------------------------------------------
+
 //  XCancellable
-// -------------------------------------------------
+
 
 void SAL_CALL CFolderPicker::cancel( )
     throw(RuntimeException)
@@ -179,10 +179,10 @@ void SAL_CALL CFolderPicker::cancel( )
     m_pFolderPickerImpl->cancel( );
 }
 
-//------------------------------------------------
+
 // overwrite base class method, which is called
 // by base class dispose function
-//------------------------------------------------
+
 
 void SAL_CALL CFolderPicker::disposing()
 {
diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx
index c45519009e0a..4ceee8c661a3 100644
--- a/fpicker/source/win32/folderpicker/MtaFop.cxx
+++ b/fpicker/source/win32/folderpicker/MtaFop.cxx
@@ -71,10 +71,10 @@ namespace
         CloseHandle( aRequestContext->hEvent );
     }
 
-    //-------------------------------
+
     // Determine if current thread is
     // an MTA or STA thread
-    //-------------------------------
+
     bool IsMTA()
     {
         HRESULT hr = CoInitialize(NULL);
@@ -89,17 +89,17 @@ namespace
     }
 }
 
-//----------------------------------------------------------------
+
 //  static member initialization
-//----------------------------------------------------------------
+
 
 ATOM CMtaFolderPicker::s_ClassAtom = 0;
 osl::Mutex CMtaFolderPicker::s_Mutex;
 sal_Int32 CMtaFolderPicker::s_StaRequestWndRegisterCount = 0;
 
-//--------------------------------------------------------------------
+
 // ctor
-//--------------------------------------------------------------------
+
 
 CMtaFolderPicker::CMtaFolderPicker( sal_uInt32 Flags ) :
     m_hStaThread( NULL ),
@@ -139,7 +139,7 @@ CMtaFolderPicker::CMtaFolderPicker( sal_uInt32 Flags ) :
     m_bi.lpfn    = CMtaFolderPicker::FolderPickerCallback;
     m_bi.lParam  = reinterpret_cast< LPARAM >( this );
 
-    //---------------------------------------
+
     // read the default strings for title and
     // description from a resource file
 
@@ -172,9 +172,9 @@ CMtaFolderPicker::CMtaFolderPicker( sal_uInt32 Flags ) :
     OSL_ASSERT( m_hEvtThrdReady );
 }
 
-//--------------------------------------------------------------------
+
 // dtor
-//--------------------------------------------------------------------
+
 
 CMtaFolderPicker::~CMtaFolderPicker( )
 {
@@ -225,9 +225,9 @@ CMtaFolderPicker::~CMtaFolderPicker( )
     }
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 sal_Bool CMtaFolderPicker::browseForFolder( )
 {
@@ -309,63 +309,63 @@ sal_Bool CMtaFolderPicker::browseForFolder( )
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory )
 {
     m_displayDir = aDirectory;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( )
 {
     return m_displayDir;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 OUString SAL_CALL CMtaFolderPicker::getDirectory( )
 {
     return m_SelectedDir;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription )
 {
     m_Description = aDescription;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle )
 {
     m_dialogTitle = aTitle;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 OUString SAL_CALL CMtaFolderPicker::getTitle( )
 {
     return m_dialogTitle;
 }
 
-//-----------------------------------------------------
+
 // XCancellable
-//-----------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::cancel( )
 {
@@ -381,9 +381,9 @@ void SAL_CALL CMtaFolderPicker::cancel( )
     }
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
 {
@@ -409,9 +409,9 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( )
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
 {
@@ -424,9 +424,9 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList )
     }
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory )
 {
@@ -453,9 +453,9 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a
     return lpItemIdList;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList )
 {
@@ -471,9 +471,9 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI
     return path;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable )
 {
@@ -486,9 +486,9 @@ void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable )
         static_cast< LPARAM >( bEnable ) );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory )
 {
@@ -501,9 +501,9 @@ void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory )
         reinterpret_cast< LPARAM >( aDirectory.getStr( ) ) );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText )
 {
@@ -516,9 +516,9 @@ void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText )
         reinterpret_cast< LPARAM >( aStatusText.getStr( ) ) );
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::onInitialized( )
 {
@@ -536,9 +536,9 @@ void SAL_CALL CMtaFolderPicker::onInitialized( )
     }
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 sal_uInt32 CMtaFolderPicker::onValidateFailed()
 {
@@ -546,9 +546,9 @@ sal_uInt32 CMtaFolderPicker::onValidateFailed()
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 int CALLBACK CMtaFolderPicker::FolderPickerCallback( HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData )
 {
@@ -583,9 +583,9 @@ int CALLBACK CMtaFolderPicker::FolderPickerCallback( HWND hwnd, UINT uMsg, LPARA
     return nRC;
 }
 
-//--------------------------------------------------------------------
+
 // the window proc
-//--------------------------------------------------------------------
+
 
 LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
@@ -657,9 +657,9 @@ LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wPar
     return lResult;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( )
 {
@@ -688,9 +688,9 @@ sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( )
     return bIsWnd;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 unsigned int CMtaFolderPicker::run( )
 {
@@ -732,9 +732,9 @@ unsigned int CMtaFolderPicker::run( )
     return nRet;
 }
 
-//--------------------------------------------------------------------
+
 //
-//--------------------------------------------------------------------
+
 
 unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam )
 {
@@ -753,9 +753,9 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam )
     return result;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( )
 {
@@ -793,9 +793,9 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( )
     return s_ClassAtom;
 }
 
-//---------------------------------------------------
+
 //
-//---------------------------------------------------
+
 
 void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( )
 {
diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
index 9cf282aa48d7..578cd1de09d8 100644
--- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
+++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx
@@ -26,9 +26,9 @@
 #include <osl/file.hxx>
 #include "FolderPicker.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using com::sun::star::uno::RuntimeException;
 using com::sun::star::lang::IllegalArgumentException;
@@ -37,15 +37,15 @@ using com::sun::star::lang::EventObject;
 using namespace com::sun::star::ui::dialogs;
 using osl::FileBase;
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 const OUString BACKSLASH( "\\" );
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) :
    CMtaFolderPicker( BIF_RETURNONLYFSDIRS | BIF_RETURNFSANCESTORS | BIF_EDITBOX | BIF_VALIDATE ),
@@ -54,14 +54,14 @@ CWinFolderPickerImpl::CWinFolderPickerImpl( CFolderPicker* aFolderPicker ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 // get directory in URL format, convert it to system format and set the
 // member variable
 // If the given URL for the directory is invalid the function throws an
 // IllegalArgumentException
 // If the specified path is well formed but invalid for the underlying
 // OS the FolderPicker starts in the root of the file system hierarchie
-//------------------------------------------------------------------------
+
 
 void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirectory )
     throw( IllegalArgumentException, RuntimeException )
@@ -95,9 +95,9 @@ void SAL_CALL CWinFolderPickerImpl::setDisplayDirectory( const OUString& aDirect
     CMtaFolderPicker::setDisplayDirectory( sysDir );
 }
 
-//------------------------------------------------------------------------
+
 // we return the directory in URL format
-//------------------------------------------------------------------------
+
 
 OUString CWinFolderPickerImpl::getDisplayDirectory( )
     throw( RuntimeException )
@@ -112,9 +112,9 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( )
     return displayDirectoryURL;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException )
 {
@@ -127,9 +127,9 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException
     return dirURL;
 }
 
-//------------------------------------------------------------------------
+
 //
-//------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException )
 {
@@ -138,9 +138,9 @@ sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException )
         ::com::sun::star::ui::dialogs::ExecutableDialogResults::CANCEL;
 }
 
-//---------------------------------------------------------------------
+
 //
-//---------------------------------------------------------------------
+
 
 void CWinFolderPickerImpl::onSelChanged( const OUString& aNewPath )
 {
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index fddb157d4058..6dc141a20157 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -40,9 +40,9 @@
 
 #include <windows.h>
 
-//--------------------------------------------------------------
+
 //  namesapces
-//--------------------------------------------------------------
+
 
 using namespace ::rtl                   ;
 using namespace ::cppu                  ;
@@ -53,15 +53,15 @@ using namespace std                     ;
 
 #define RDB_SYSPATH "D:\\Projects\\gsl\\sysui\\wntmsci7\\bin\\applicat.rdb"
 
-//--------------------------------------------------------------
+
 //  global variables
-//--------------------------------------------------------------
+
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
-//--------------------------------------------------------------
+
 //  main
-//--------------------------------------------------------------
+
 
 
 int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
@@ -72,9 +72,9 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
 
     //CreateDeepDirectory( );
 
-    //-------------------------------------------------
+
     // get the global service-manager
-    //-------------------------------------------------
+
 
     // Get global factory for uno services.
     OUString rdbName = OUString( RDB_SYSPATH );
@@ -89,9 +89,9 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
 
     printf("Creating RegistryServiceFactory successful\n");
 
-    //-------------------------------------------------
+
     // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
+
 
     Reference< XFolderPicker2 > xFolderPicker;
 
@@ -124,9 +124,9 @@ int SAL_CALL main(int /*nArgc*/, char* /*Argv[]*/, char* /*Env[]*/  )
         MessageBox( NULL, "Exception caught!", "Error", MB_OK );
     }
 
-    //--------------------------------------------------
+
     // shutdown
-    //--------------------------------------------------
+
 
     // Cast factory to XComponent
     Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx
index c07a6752efa9..a00f8ff17ce4 100644
--- a/fpicker/source/win32/misc/WinImplHelper.cxx
+++ b/fpicker/source/win32/misc/WinImplHelper.cxx
@@ -24,9 +24,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-//------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------
+
 
 using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::uno::Reference;
@@ -34,16 +34,16 @@ using ::com::sun::star::uno::XInterface;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Sequence;
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 const OUString TILDE( "~" );
 const sal_Unicode   TILDE_SIGN = L'~';
 const OUString AMPERSAND( "&" );
 const sal_Unicode   AMPERSAND_SIGN = L'&';
 
-//------------------------------------------------------------
+
 // OS NAME          Platform                    Major   Minor
 //
 // Windows NT 3.51  VER_PLATFORM_WIN32_NT       3       51
@@ -55,11 +55,11 @@ const sal_Unicode   AMPERSAND_SIGN = L'&';
 // Windows 95       VER_PLATFORM_WIN32_WINDOWS  4       0
 // Windows 98       VER_PLATFORM_WIN32_WINDOWS  4       10
 // Windows ME       VER_PLATFORM_WIN32_WINDOWS  4       90
-//------------------------------------------------------------
 
-//------------------------------------------------------------
+
+
 // determine if we are running under Vista or newer OS
-//------------------------------------------------------------
+
 
 bool SAL_CALL IsWindowsVistaOrNewer()
 {
@@ -79,9 +79,9 @@ bool SAL_CALL IsWindowsVistaOrNewer()
     return bRet;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString )
 {
@@ -91,9 +91,9 @@ void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString )
     OSL_ASSERT( (CB_ERR != rc) && (CB_ERRSPACE != rc) );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition )
 {
@@ -126,9 +126,9 @@ OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition )
     return aString;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
     throw( IllegalArgumentException )
@@ -148,9 +148,9 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt
     ListboxAddString( hwnd, cbItem );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
     throw( IllegalArgumentException )
@@ -174,9 +174,9 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference<
     }
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
     throw( IllegalArgumentException )
@@ -206,9 +206,9 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc
             aArgPos );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInterface >&, sal_Int16 )
     throw( IllegalArgumentException )
@@ -226,9 +226,9 @@ void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInter
     while ( (lRet != CB_ERR) && (lRet > 0) );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
     throw( IllegalArgumentException )
@@ -262,9 +262,9 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref
             aArgPos );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 Any SAL_CALL ListboxGetItems( HWND hwnd )
 {
@@ -290,9 +290,9 @@ Any SAL_CALL ListboxGetItems( HWND hwnd )
     return aAny;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 Any SAL_CALL ListboxGetSelectedItem( HWND hwnd )
 {
@@ -306,9 +306,9 @@ Any SAL_CALL ListboxGetSelectedItem( HWND hwnd )
     return aAny;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd )
 {
@@ -322,9 +322,9 @@ Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd )
     return aAny;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 Any SAL_CALL CheckboxGetState( HWND hwnd )
 {
@@ -337,9 +337,9 @@ Any SAL_CALL CheckboxGetState( HWND hwnd )
     return aAny;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void SAL_CALL CheckboxSetState(
     HWND hwnd, const ::com::sun::star::uno::Any& aState, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos )
@@ -359,9 +359,9 @@ void SAL_CALL CheckboxSetState(
     SendMessageW( hwnd, BM_SETCHECK, wParam, 0 );
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr )
 {
@@ -379,9 +379,9 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr )
     return strLen;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar, OUStringBuffer& aBuffer )
 {
@@ -437,14 +437,14 @@ void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar,
     }
 }
 
-//------------------------------------------------------------
+
 // converts a soffice label to a windows label
 // the following rules for character replacements
 // will be done:
 // '~'  -> '&'
 // '~~' -> '~'
 // '&'  -> '&&'
-//------------------------------------------------------------
+
 
 OUString SOfficeToWindowsLabel( const OUString& aSOLabel )
 {
@@ -468,14 +468,14 @@ OUString SOfficeToWindowsLabel( const OUString& aSOLabel )
     return aWinLabel;
 }
 
-//------------------------------------------------------------
+
 // converts a windows label to a soffice label
 // the following rules for character replacements
 // will be done:
 // '&'  -> '~'
 // '&&' -> '&'
 // '~'  -> '~~'
-//------------------------------------------------------------
+
 
 OUString WindowsToSOfficeLabel( const OUString& aWinLabel )
 {
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index b700fbd370f8..e5063b5d2e38 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -29,23 +29,23 @@
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
-//------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------
+
 
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 #define FOLDERPICKER_TITLE            500
 #define FOLDER_PICKER_DEF_DESCRIPTION 501
 
-//------------------------------------------------------------
+
 // we have to translate control ids to resource ids
-//------------------------------------------------------------
+
 
 struct _Entry
 {
@@ -71,9 +71,9 @@ _Entry CtrlIdToResIdTable[] = {
 
 const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable );
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 sal_Int16 CtrlIdToResId( sal_Int32 aControlId )
 {
@@ -91,17 +91,17 @@ sal_Int16 CtrlIdToResId( sal_Int32 aControlId )
     return aResId;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 class CResourceProvider_Impl
 {
 public:
 
-    //-------------------------------------
+
     //
-    //-------------------------------------
+
 
     CResourceProvider_Impl( )
     {
@@ -110,18 +110,18 @@ public:
             "fps_office", Application::GetSettings().GetUILanguageTag());
     }
 
-    //-------------------------------------
+
     //
-    //-------------------------------------
+
 
     ~CResourceProvider_Impl( )
     {
         delete m_ResMgr;
     }
 
-    //-------------------------------------
+
     //
-    //-------------------------------------
+
 
     OUString getResString( sal_Int16 aId )
     {
@@ -148,27 +148,27 @@ public:
     SimpleResMgr* m_ResMgr;
 };
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 CResourceProvider::CResourceProvider( ) :
     m_pImpl( new CResourceProvider_Impl() )
 {
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 CResourceProvider::~CResourceProvider( )
 {
     delete m_pImpl;
 }
 
-//------------------------------------------------------------
+
 //
-//------------------------------------------------------------
+
 
 OUString CResourceProvider::getResString( sal_Int16 aId )
 {
diff --git a/fpicker/test/svdem.cxx b/fpicker/test/svdem.cxx
index aa6538663f04..b4127c212cf6 100644
--- a/fpicker/test/svdem.cxx
+++ b/fpicker/test/svdem.cxx
@@ -56,14 +56,14 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-// -----------------------------------------------------------------------
+
 
 // Forward declaration
 void Main();
 
 String aEmptyStr;
 
-// -----------------------------------------------------------------------
+
 
 SAL_IMPLEMENT_MAIN()
 {
@@ -85,7 +85,7 @@ SAL_IMPLEMENT_MAIN()
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 class MyWin : public WorkWindow
 {
@@ -107,7 +107,7 @@ private:
 
 };
 
-// -----------------------------------------------------------------------
+
 
 void Main()
 {
@@ -118,7 +118,7 @@ void Main()
     Application::Execute();
 }
 
-// -----------------------------------------------------------------------
+
 
 MyWin::MyWin( Window* pParent, WinBits nWinStyle )
     :WorkWindow( pParent, nWinStyle )
@@ -129,56 +129,56 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle )
     aOKBtn.Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::MouseMove( const MouseEvent& rMEvt )
 {
     WorkWindow::MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
 {
     WorkWindow::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
 {
     WorkWindow::MouseButtonUp( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::KeyInput( const KeyEvent& rKEvt )
 {
     WorkWindow::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::KeyUp( const KeyEvent& rKEvt )
 {
     WorkWindow::KeyUp( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::Paint( const Rectangle& rRect )
 {
     WorkWindow::Paint( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::Resize()
 {
     WorkWindow::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( MyWin, Test, PushButton*, pBtn )
 {
diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx
index 2c1d8d555a6b..b5cdfc9627f5 100644
--- a/framework/source/accelerators/acceleratorcache.cxx
+++ b/framework/source/accelerators/acceleratorcache.cxx
@@ -32,13 +32,13 @@
 namespace framework
 {
 
-//-----------------------------------------------
+
 AcceleratorCache::AcceleratorCache()
     : ThreadHelpBase(&Application::GetSolarMutex())
 {
 }
 
-//-----------------------------------------------
+
 AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
     : ThreadHelpBase(&Application::GetSolarMutex())
 {
@@ -46,14 +46,14 @@ AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
     m_lKey2Commands = rCopy.m_lKey2Commands;
 }
 
-//-----------------------------------------------
+
 AcceleratorCache::~AcceleratorCache()
 {
     // Dont save anything automaticly here.
     // The user has to do that explicitly!
 }
 
-//-----------------------------------------------
+
 void AcceleratorCache::takeOver(const AcceleratorCache& rCopy)
 {
     // SAFE -> ----------------------------------
@@ -66,14 +66,14 @@ void AcceleratorCache::takeOver(const AcceleratorCache& rCopy)
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 AcceleratorCache& AcceleratorCache::operator=(const AcceleratorCache& rCopy)
 {
     takeOver(rCopy);
     return *this;
 }
 
-//-----------------------------------------------
+
 sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const
 {
     // SAFE -> ----------------------------------
@@ -83,7 +83,7 @@ sal_Bool AcceleratorCache::hasKey(const css::awt::KeyEvent& aKey) const
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const
 {
     // SAFE -> ----------------------------------
@@ -93,7 +93,7 @@ sal_Bool AcceleratorCache::hasCommand(const OUString& sCommand) const
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
 {
     TKeyList lKeys;
@@ -117,7 +117,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getAllKeys() const
     return lKeys;
 }
 
-//-----------------------------------------------
+
 void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey    ,
                                          const OUString&    sCommand)
 {
@@ -135,7 +135,7 @@ void AcceleratorCache::setKeyCommandPair(const css::awt::KeyEvent& aKey    ,
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sCommand) const
 {
     TKeyList lKeys;
@@ -155,7 +155,7 @@ AcceleratorCache::TKeyList AcceleratorCache::getKeysByCommand(const OUString& sC
     return lKeys;
 }
 
-//-----------------------------------------------
+
 OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
 {
     OUString sCommand;
@@ -175,7 +175,7 @@ OUString AcceleratorCache::getCommandByKey(const css::awt::KeyEvent& aKey) const
     return sCommand;
 }
 
-//-----------------------------------------------
+
 void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
 {
     // SAFE -> ----------------------------------
@@ -202,7 +202,7 @@ void AcceleratorCache::removeKey(const css::awt::KeyEvent& aKey)
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void AcceleratorCache::removeCommand(const OUString& sCommand)
 {
     // SAFE -> ----------------------------------
diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx
index bbccd5578b55..8baaea10af91 100644
--- a/framework/source/accelerators/acceleratorconfiguration.cxx
+++ b/framework/source/accelerators/acceleratorconfiguration.cxx
@@ -73,7 +73,7 @@ namespace framework
         return sKeyBuffer.makeStringAndClear();
     }
 
-//-----------------------------------------------
+
 XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase  (&Application::GetSolarMutex())
     , m_xContext      (xContext                     )
@@ -82,13 +82,13 @@ XMLBasedAcceleratorConfiguration::XMLBasedAcceleratorConfiguration(const css::un
 {
 }
 
-//-----------------------------------------------
+
 XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration()
 {
     SAL_WARN_IF(m_pWriteCache, "fwk", "XMLBasedAcceleratorConfiguration::~XMLBasedAcceleratorConfiguration(): Changes not flushed. Ignore it ...");
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getAllKeyEvents()
     throw(css::uno::RuntimeException)
 {
@@ -102,7 +102,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
     throw(css::container::NoSuchElementException,
           css::uno::RuntimeException            )
@@ -120,7 +120,7 @@ OUString SAL_CALL XMLBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
                                                     const OUString&    sCommand )
                                                     throw(css::lang::IllegalArgumentException,
@@ -153,7 +153,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
 throw(css::container::NoSuchElementException,
       css::uno::RuntimeException            )
@@ -171,7 +171,7 @@ throw(css::container::NoSuchElementException,
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
           css::container::NoSuchElementException,
@@ -198,7 +198,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XMLBasedAcceleratorConfigurati
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
     throw(css::lang::IllegalArgumentException   ,
           css::uno::RuntimeException            )
@@ -237,7 +237,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XMLBasedAcceleratorConfiguration::g
     return lPreferredOnes;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
           css::container::NoSuchElementException,
@@ -263,7 +263,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
     throw(css::uno::Exception       ,
         css::uno::RuntimeException)
@@ -308,7 +308,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::reload()
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::store()
     throw(css::uno::Exception       ,
         css::uno::RuntimeException)
@@ -336,7 +336,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::store()
     m_aPresetHandler.commitUserChanges();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
@@ -360,7 +360,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
     // TODO inform listener about success, so it can flush the root and sub storage of this stream!
 }
 
-//-----------------------------------------------
+
 ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isModified()
     throw(css::uno::RuntimeException)
 {
@@ -370,7 +370,7 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::isReadOnly()
     throw(css::uno::RuntimeException)
 {
@@ -386,14 +386,14 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
     return !(xOut.is());
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
 }
 
-//-----------------------------------------------
+
 ::sal_Bool SAL_CALL XMLBasedAcceleratorConfiguration::hasStorage()
     throw(css::uno::RuntimeException)
 {
@@ -401,21 +401,21 @@ void SAL_CALL XMLBasedAcceleratorConfiguration::setStorage(const css::uno::Refer
     return sal_False;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::reset()
 throw(css::uno::RuntimeException)
 {
@@ -428,28 +428,28 @@ throw(css::uno::RuntimeException)
     reload();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::addResetListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XMLBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XMLBasedAcceleratorConfiguration::removeResetListener(): implement me");
 }
 
-//-----------------------------------------------
+
 // IStorageListener
 void XMLBasedAcceleratorConfiguration::changesOccurred(const OUString& /*sPath*/)
 {
     reload();
 }
 
-//-----------------------------------------------
+
 void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream)
 {
     // SAFE -> ----------------------------------
@@ -498,7 +498,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_load(const css::uno::Reference< c
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream)
 {
     // SAFE -> ----------------------------------
@@ -551,7 +551,7 @@ void XMLBasedAcceleratorConfiguration::impl_ts_save(const css::uno::Reference< c
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteAccessRequested)
 {
     // SAFE -> ----------------------------------
@@ -576,7 +576,7 @@ AcceleratorCache& XMLBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bWriteA
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
     OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
@@ -592,7 +592,7 @@ OUString XMLBasedAcceleratorConfiguration::impl_ts_getLocale() const
 *
 *******************************************************************************/
 
-//-----------------------------------------------
+
 XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::uno::Reference< css::uno::XComponentContext >& xContext)
                                 : ThreadHelpBase  (&Application::GetSolarMutex())
                                 , m_xContext      (xContext                     )
@@ -605,12 +605,12 @@ XCUBasedAcceleratorConfiguration::XCUBasedAcceleratorConfiguration(const css::un
              css::uno::UNO_QUERY );
 }
 
-//-----------------------------------------------
+
 XCUBasedAcceleratorConfiguration::~XCUBasedAcceleratorConfiguration()
 {
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getAllKeyEvents()
     throw(css::uno::RuntimeException)
 {
@@ -631,7 +631,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const css::awt::KeyEvent& aKeyEvent)
     throw(css::container::NoSuchElementException,
           css::uno::RuntimeException            )
@@ -655,7 +655,7 @@ OUString SAL_CALL XCUBasedAcceleratorConfiguration::getCommandByKeyEvent(const c
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyEvent& aKeyEvent,
                                                     const OUString&    sCommand )
                                                     throw(css::lang::IllegalArgumentException,
@@ -742,7 +742,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setKeyEvent(const css::awt::KeyE
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::KeyEvent& aKeyEvent)
     throw(css::container::NoSuchElementException,
           css::uno::RuntimeException            )
@@ -785,7 +785,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeKeyEvent(const css::awt::K
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfiguration::getKeyEventsByCommand(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
         css::container::NoSuchElementException,
@@ -820,7 +820,7 @@ css::uno::Sequence< css::awt::KeyEvent > SAL_CALL XCUBasedAcceleratorConfigurati
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const AcceleratorCache::TKeyList& lKeys)
 {
     AcceleratorCache::TKeyList::const_iterator pIt;
@@ -839,7 +839,7 @@ AcceleratorCache::TKeyList::const_iterator lcl_getPreferredKey(const Accelerator
     return lKeys.end();
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::getPreferredKeyEventsForCommandList(const css::uno::Sequence< OUString >& lCommandList)
     throw(css::lang::IllegalArgumentException   ,
         css::uno::RuntimeException            )
@@ -882,7 +882,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL XCUBasedAcceleratorConfiguration::g
     return lPreferredOnes;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(const OUString& sCommand)
     throw(css::lang::IllegalArgumentException   ,
         css::container::NoSuchElementException,
@@ -914,7 +914,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::removeCommandFromAllKeyEvents(co
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
     throw(css::uno::Exception       ,
         css::uno::RuntimeException)
@@ -955,7 +955,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reload()
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::store()
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
@@ -984,7 +984,7 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::store()
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
     throw(css::uno::Exception       ,
       css::uno::RuntimeException)
@@ -1051,28 +1051,28 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::storeToStorage(const css::uno::R
     aWriter.flush();
 }
 
-//-----------------------------------------------
+
 ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isModified()
     throw(css::uno::RuntimeException)
 {
     return sal_False;
 }
 
-//-----------------------------------------------
+
 ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::isReadOnly()
     throw(css::uno::RuntimeException)
 {
     return sal_False;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& /*xStorage*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::setStorage(): implement this HACK .-)");
 }
 
-//-----------------------------------------------
+
 ::sal_Bool SAL_CALL XCUBasedAcceleratorConfiguration::hasStorage()
     throw(css::uno::RuntimeException)
 {
@@ -1080,21 +1080,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::setStorage(const css::uno::Refer
         return sal_False;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::addConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addConfigurationListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeConfigurationListener(const css::uno::Reference< css::ui::XUIConfigurationListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeConfigurationListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
     throw(css::uno::RuntimeException)
 {
@@ -1116,21 +1116,21 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::reset()
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::addResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::addResetListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeResetListener(const css::uno::Reference< css::form::XResetListener >& /*xListener*/)
     throw(css::uno::RuntimeException)
 {
     SAL_INFO("fwk", "XCUBasedAcceleratorConfiguration::removeResetListener(): implement me");
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util::ChangesEvent& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -1182,34 +1182,34 @@ void SAL_CALL XCUBasedAcceleratorConfiguration::changesOccurred(const css::util:
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::disposing(const css::lang::EventObject& /*aSource*/)
     throw(css::uno::RuntimeException)
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::dispose()
     throw(css::uno::RuntimeException)
 {
     // nop
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ )
     throw(css::uno::RuntimeException)
 {
     // nop
 }
 
-//-----------------------------------------------
+
 void SAL_CALL XCUBasedAcceleratorConfiguration::removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& /*xListener*/ )
     throw(css::uno::RuntimeException)
 {
     // nop
 }
 
-//-----------------------------------------------
+
 void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg )
 {
     AcceleratorCache aReadCache = AcceleratorCache();
@@ -1318,7 +1318,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_load( sal_Bool bPreferred, const
         m_aSecondaryReadCache.takeOver(aReadCache);
 }
 
-//-----------------------------------------------
+
 void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& /*xCfg*/)
 {
     if (bPreferred)
@@ -1411,7 +1411,7 @@ void XCUBasedAcceleratorConfiguration::impl_ts_save(sal_Bool bPreferred, const c
     ::comphelper::ConfigurationHelper::flush(m_xCfg);
 }
 
-//-----------------------------------------------
+
 void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred )
 {
     css::uno::Reference< css::container::XNameAccess > xAccess;
@@ -1458,7 +1458,7 @@ void XCUBasedAcceleratorConfiguration::insertKeyToConfiguration( const css::awt:
         xCommand->replaceByName(sLocale, css::uno::makeAny(sCommand));
 }
 
-//-----------------------------------------------
+
 void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred )
 {
     css::uno::Reference< css::container::XNameAccess > xAccess;
@@ -1484,7 +1484,7 @@ void XCUBasedAcceleratorConfiguration::removeKeyFromConfiguration( const css::aw
     xContainer->removeByName(sKey);
 }
 
-//-----------------------------------------------
+
 void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey )
 {
     css::uno::Reference< css::container::XNameAccess > xAccess;
@@ -1555,7 +1555,7 @@ void XCUBasedAcceleratorConfiguration::reloadChanged( const OUString& sPrimarySe
     }
 }
 
-//-----------------------------------------------
+
 AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested)
 {
     // SAFE -> ----------------------------------
@@ -1604,7 +1604,7 @@ AcceleratorCache& XCUBasedAcceleratorConfiguration::impl_getCFG(sal_Bool bPrefer
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 OUString XCUBasedAcceleratorConfiguration::impl_ts_getLocale() const
 {
     OUString sISOLocale = officecfg::Setup::L10N::ooLocale::get();
diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx
index bf58b4cfa873..adb14034efb1 100644
--- a/framework/source/accelerators/documentacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx
@@ -55,7 +55,7 @@ class DocumentAcceleratorConfiguration : public DocumentAcceleratorConfiguration
 {
 private:
 
-    //----------------------------------
+
     /** points to the root storage of the outside document,
         where we can read/save our configuration data. */
     css::uno::Reference< css::embed::XStorage > m_xDocumentRoot;
@@ -110,7 +110,7 @@ private:
     void impl_ts_clearCache();
 };
 
-//-----------------------------------------------
+
 DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(
         const css::uno::Reference< css::uno::XComponentContext >& xContext,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& lArguments)
@@ -136,13 +136,13 @@ DocumentAcceleratorConfiguration::DocumentAcceleratorConfiguration(
     impl_ts_fillCache();
 }
 
-//-----------------------------------------------
+
 DocumentAcceleratorConfiguration::~DocumentAcceleratorConfiguration()
 {
     m_aPresetHandler.removeStorageListener(this);
 }
 
-//-----------------------------------------------
+
 void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
     throw(css::uno::RuntimeException)
 {
@@ -162,7 +162,7 @@ void SAL_CALL DocumentAcceleratorConfiguration::setStorage(const css::uno::Refer
         impl_ts_fillCache();
 }
 
-//-----------------------------------------------
+
 sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
     throw(css::uno::RuntimeException)
 {
@@ -172,7 +172,7 @@ sal_Bool SAL_CALL DocumentAcceleratorConfiguration::hasStorage()
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void DocumentAcceleratorConfiguration::impl_ts_fillCache()
 {
     // SAFE -> ----------------------------------
@@ -213,7 +213,7 @@ void DocumentAcceleratorConfiguration::impl_ts_fillCache()
     {}
 }
 
-//-----------------------------------------------
+
 void DocumentAcceleratorConfiguration::impl_ts_clearCache()
 {
     m_aPresetHandler.forgetCachedStorages();
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index 72f4234d71be..762dd15d500e 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -125,7 +125,7 @@ void GlobalAcceleratorConfiguration::fillCache()
         {}
 }
 
-//-----------------------------------------------
+
 //
 // XComponent.dispose(),  #i120029#, to release the cyclic reference
 //
diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx
index b0606f52a5a0..a74955d43e5e 100644
--- a/framework/source/accelerators/keymapping.cxx
+++ b/framework/source/accelerators/keymapping.cxx
@@ -27,7 +27,7 @@
 namespace framework
 {
 
-//_______________________________________________
+
 // helper
 
 KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
@@ -140,7 +140,7 @@ KeyMapping::KeyIdentifierInfo KeyMapping::KeyIdentifierMap[] =
     {0                            , ""               } // mark the end of this array!
 };
 
-//-----------------------------------------------
+
 KeyMapping::KeyMapping()
 {
     sal_Int32 i = 0;
@@ -156,12 +156,12 @@ KeyMapping::KeyMapping()
     }
 }
 
-//-----------------------------------------------
+
 KeyMapping::~KeyMapping()
 {
 }
 
-//-----------------------------------------------
+
 sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
     throw(css::lang::IllegalArgumentException)
 {
@@ -181,7 +181,7 @@ sal_uInt16 KeyMapping::mapIdentifierToCode(const OUString& sIdentifier)
     return (sal_uInt16)nCode;
 }
 
-//-----------------------------------------------
+
 OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
 {
     Code2IdentifierHash::const_iterator pIt = m_lCodeHash.find(nCode);
@@ -192,7 +192,7 @@ OUString KeyMapping::mapCodeToIdentifier(sal_uInt16 nCode)
     return OUString::number(nCode);
 }
 
-//-----------------------------------------------
+
 sal_Bool KeyMapping::impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier,
                                                                     sal_uInt16&      rCode      )
 {
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index e507b41ec402..84c2cb19658f 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -168,7 +168,7 @@ void ModuleAcceleratorConfiguration::fillCache()
         {}
 }
 
-//-----------------------------------------------
+
 //
 // XComponent.dispose(),  #i120029#, to release the cyclic reference
 //
diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx
index 25006679d1e8..bc12a8e1bda7 100644
--- a/framework/source/accelerators/presethandler.cxx
+++ b/framework/source/accelerators/presethandler.cxx
@@ -49,43 +49,43 @@ static const ::sal_Int32 ID_CORRUPT_UICONFIG_GENERAL = 3;
 namespace framework
 {
 
-//-----------------------------------------------
+
 OUString PresetHandler::PRESET_DEFAULT()
 {
     return OUString("default");
 }
 
-//-----------------------------------------------
+
 OUString PresetHandler::TARGET_CURRENT()
 {
     return OUString("current");
 }
 
-//-----------------------------------------------
+
 OUString PresetHandler::RESOURCETYPE_MENUBAR()
 {
     return OUString("menubar");
 }
 
-//-----------------------------------------------
+
 OUString PresetHandler::RESOURCETYPE_TOOLBAR()
 {
     return OUString("toolbar");
 }
 
-//-----------------------------------------------
+
 OUString PresetHandler::RESOURCETYPE_ACCELERATOR()
 {
     return OUString("accelerator");
 }
 
-//-----------------------------------------------
+
 OUString PresetHandler::RESOURCETYPE_STATUSBAR()
 {
     return OUString("statusbar");
 }
 
-//-----------------------------------------------
+
 PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase     (&Application::GetSolarMutex()        )
     , m_xContext         (xContext                                )
@@ -95,7 +95,7 @@ PresetHandler::PresetHandler(const css::uno::Reference< css::uno::XComponentCont
 {
 }
 
-//-----------------------------------------------
+
 PresetHandler::PresetHandler(const PresetHandler& rCopy)
     : ThreadHelpBase     (&Application::GetSolarMutex()        )
     , m_aLanguageTag( rCopy.m_aLanguageTag)
@@ -116,7 +116,7 @@ PresetHandler::PresetHandler(const PresetHandler& rCopy)
     m_sRelPathUser          = rCopy.m_sRelPathUser;
 }
 
-//-----------------------------------------------
+
 PresetHandler::~PresetHandler()
 {
     m_xWorkingStorageShare.clear();
@@ -143,7 +143,7 @@ PresetHandler::~PresetHandler()
     m_lDocumentStorages.forgetCachedStorages();
 }
 
-//-----------------------------------------------
+
 void PresetHandler::forgetCachedStorages()
 {
     // SAFE -> ----------------------------------
@@ -260,7 +260,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     return xStorage;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorageUser()
 {
     css::uno::Reference< css::embed::XStorage > xRoot = m_aSharedStorages->m_lStoragesUser.getRootStorage();
@@ -308,7 +308,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getOrCreateRootStorag
     return xStorage;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShare()
 {
     // SAFE -> ----------------------------------
@@ -317,7 +317,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageShar
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser()
 {
     // SAFE -> ----------------------------------
@@ -326,7 +326,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getWorkingStorageUser
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& /*xChild*/)
 {
     // SAFE -> ----------------------------------
@@ -338,7 +338,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageShare
     return m_aSharedStorages->m_lStoragesShare.getParentStorage(xWorking);
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(const css::uno::Reference< css::embed::XStorage >& /*xChild*/)
 {
     // SAFE -> ----------------------------------
@@ -350,7 +350,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::getParentStorageUser(
     return m_aSharedStorages->m_lStoragesUser.getParentStorage(xWorking);
 }
 
-//-----------------------------------------------
+
 void PresetHandler::connectToResource(      PresetHandler::EConfigType                   eConfigType  ,
                                       const OUString&                             sResource    ,
                                       const OUString&                             sModule      ,
@@ -557,7 +557,7 @@ void PresetHandler::connectToResource(      PresetHandler::EConfigType
     }
 }
 
-//-----------------------------------------------
+
 void PresetHandler::copyPresetToTarget(const OUString& sPreset,
                                        const OUString& sTarget)
 {
@@ -600,7 +600,7 @@ void PresetHandler::copyPresetToTarget(const OUString& sPreset,
     commitUserChanges();
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString& sPreset,
                                                                   sal_Bool bUseNoLangGlobal)
 {
@@ -622,7 +622,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openPreset(const OUString
     return xStream;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString& sTarget         ,
                                                                         sal_Bool         bCreateIfMissing)
 {
@@ -663,7 +663,7 @@ css::uno::Reference< css::io::XStream > PresetHandler::openTarget(const OUString
     return xStream;
 }
 
-//-----------------------------------------------
+
 void PresetHandler::commitUserChanges()
 {
     // SAFE -> ----------------------------------
@@ -700,7 +700,7 @@ void PresetHandler::commitUserChanges()
     }
 }
 
-//-----------------------------------------------
+
 void PresetHandler::addStorageListener(IStorageListener* pListener)
 {
     // SAFE -> ----------------------------------
@@ -730,7 +730,7 @@ void PresetHandler::addStorageListener(IStorageListener* pListener)
     }
 }
 
-//-----------------------------------------------
+
 void PresetHandler::removeStorageListener(IStorageListener* pListener)
 {
     // SAFE -> ----------------------------------
@@ -760,7 +760,7 @@ void PresetHandler::removeStorageListener(IStorageListener* pListener)
     }
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoringErrors(const OUString& sPath ,
                                                                                              sal_Int32        eMode ,
                                                                                              sal_Bool         bShare)
@@ -780,7 +780,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
     return xPath;
 }
 
-//-----------------------------------------------
+
 ::std::vector< OUString >::const_iterator PresetHandler::impl_findMatchingLocalizedValue(
         const ::std::vector< OUString >& lLocalizedValues,
         OUString& rLanguageTag,
@@ -811,7 +811,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openPathIgnoring
     return pFound;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPathIgnoringErrors(
         OUString&      sPath         ,
         sal_Int32             eMode         ,
@@ -851,7 +851,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
     return xLocalePath;
 }
 
-//-----------------------------------------------
+
 ::std::vector< OUString > PresetHandler::impl_getSubFolderNames(const css::uno::Reference< css::embed::XStorage >& xFolder)
 {
     css::uno::Reference< css::container::XNameAccess > xAccess(xFolder, css::uno::UNO_QUERY);
@@ -880,7 +880,7 @@ css::uno::Reference< css::embed::XStorage > PresetHandler::impl_openLocalizedPat
     return lSubFolders;
 }
 
-//-----------------------------------------------
+
 } // namespace framework
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 50a302890161..7047b64a9300 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -48,20 +48,20 @@
 namespace framework
 {
 
-//-----------------------------------------------
+
 StorageHolder::StorageHolder()
     : ThreadHelpBase(                                        )
 {
 }
 
-//-----------------------------------------------
+
 StorageHolder::~StorageHolder()
 {
     // TODO implement me
     // dispose/clear etcpp.
 }
 
-//-----------------------------------------------
+
 void StorageHolder::forgetCachedStorages()
 {
     // SAFE -> ----------------------------------
@@ -82,7 +82,7 @@ void StorageHolder::forgetCachedStorages()
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void StorageHolder::setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot)
 {
     // SAFE -> ----------------------------------
@@ -92,7 +92,7 @@ void StorageHolder::setRootStorage(const css::uno::Reference< css::embed::XStora
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() const
 {
     // SAFE -> ----------------------------------
@@ -101,7 +101,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getRootStorage() cons
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUString& sPath    ,
                                                                           sal_Int32        nOpenMode)
 {
@@ -186,7 +186,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openPath(const OUStri
     return xChild;
 }
 
-//-----------------------------------------------
+
 StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sPath)
 {
     OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
@@ -230,7 +230,7 @@ StorageHolder::TStorageList StorageHolder::getAllPathStorages(const OUString& sP
     return lStoragesOfPath;
 }
 
-//-----------------------------------------------
+
 void StorageHolder::commitPath(const OUString& sPath)
 {
     StorageHolder::TStorageList lStorages = getAllPathStorages(sPath);
@@ -257,7 +257,7 @@ void StorageHolder::commitPath(const OUString& sPath)
         xCommit->commit();
 }
 
-//-----------------------------------------------
+
 void StorageHolder::closePath(const OUString& rPath)
 {
     OUString sNormedPath = StorageHolder::impl_st_normPath(rPath);
@@ -307,7 +307,7 @@ void StorageHolder::closePath(const OUString& rPath)
     // <- SAFE ------------------------------
 }
 
-//-----------------------------------------------
+
 void StorageHolder::notifyPath(const OUString& sPath)
 {
     OUString sNormedPath = StorageHolder::impl_st_normPath(sPath);
@@ -334,7 +334,7 @@ void StorageHolder::notifyPath(const OUString& sPath)
     // <- SAFE ------------------------------
 }
 
-//-----------------------------------------------
+
 void StorageHolder::addStorageListener(      IStorageListener* pListener,
                                        const OUString&  sPath    )
 {
@@ -356,7 +356,7 @@ void StorageHolder::addStorageListener(      IStorageListener* pListener,
     // <- SAFE ------------------------------
 }
 
-//-----------------------------------------------
+
 void StorageHolder::removeStorageListener(      IStorageListener* pListener,
                                           const OUString&  sPath    )
 {
@@ -378,7 +378,7 @@ void StorageHolder::removeStorageListener(      IStorageListener* pListener,
     // <- SAFE ------------------------------
 }
 
-//-----------------------------------------------
+
 OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage)
 {
     // SAFE -> ------------------------------
@@ -402,14 +402,14 @@ OUString StorageHolder::getPathOfStorage(const css::uno::Reference< css::embed::
     // <- SAFE ------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild)
 {
     OUString sChildPath = getPathOfStorage(xChild);
     return getParentStorage(sChildPath);
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(const OUString& sChildPath)
 {
     // normed path = "a/b/c/" ... we search for "a/b/"
@@ -453,7 +453,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::getParentStorage(cons
     return css::uno::Reference< css::embed::XStorage >();
 }
 
-//-----------------------------------------------
+
 void StorageHolder::operator=(const StorageHolder& rCopy)
 {
     // SAFE -> ----------------------------------
@@ -466,7 +466,7 @@ void StorageHolder::operator=(const StorageHolder& rCopy)
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage  ,
                                                                                       const OUString&                             sSubStorage   ,
                                                                                             sal_Int32                                    eOpenMode     ,
@@ -506,7 +506,7 @@ css::uno::Reference< css::embed::XStorage > StorageHolder::openSubStorageWithFal
     return css::uno::Reference< css::embed::XStorage >();
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage  ,
                                                                                  const OUString&                             sSubStream    ,
                                                                                        sal_Int32                                    eOpenMode     ,
@@ -546,7 +546,7 @@ css::uno::Reference< css::io::XStream > StorageHolder::openSubStreamWithFallback
     return css::uno::Reference< css::io::XStream >();
 }
 
-//-----------------------------------------------
+
 OUString StorageHolder::impl_st_normPath(const OUString& sPath)
 {
     // path must start without "/" but end with "/"!
@@ -568,7 +568,7 @@ OUString StorageHolder::impl_st_normPath(const OUString& sPath)
     return sNormedPath;
 }
 
-//-----------------------------------------------
+
 OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
 {
     OUStringList lToken;
diff --git a/framework/source/classes/fwktabwindow.cxx b/framework/source/classes/fwktabwindow.cxx
index 5ca707a083b0..e0dca444282e 100644
--- a/framework/source/classes/fwktabwindow.cxx
+++ b/framework/source/classes/fwktabwindow.cxx
@@ -55,7 +55,7 @@ FwkTabControl::FwkTabControl( Window* pParent, const ResId& rResId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabControl::BroadcastEvent( sal_uLong nEvent )
 {
@@ -83,7 +83,7 @@ FwkTabPage::FwkTabPage(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 FwkTabPage::~FwkTabPage()
 {
@@ -91,7 +91,7 @@ FwkTabPage::~FwkTabPage()
     DeactivatePage();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabPage::CreateDialog()
 {
@@ -130,7 +130,7 @@ void FwkTabPage::CreateDialog()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool FwkTabPage::CallMethod( const OUString& rMethod )
 {
@@ -149,7 +149,7 @@ sal_Bool FwkTabPage::CallMethod( const OUString& rMethod )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabPage::ActivatePage()
 {
@@ -165,7 +165,7 @@ void FwkTabPage::ActivatePage()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabPage::DeactivatePage()
 {
@@ -175,7 +175,7 @@ void FwkTabPage::DeactivatePage()
         m_xPage->setVisible( sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabPage::Resize()
 {
@@ -204,14 +204,14 @@ FwkTabWindow::FwkTabWindow( Window* pParent ) :
     m_aTabCtrl.Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 FwkTabWindow::~FwkTabWindow()
 {
     ClearEntryList();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabWindow::ClearEntryList()
 {
@@ -226,7 +226,7 @@ void FwkTabWindow::ClearEntryList()
     m_TabList.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex )
 {
@@ -249,7 +249,7 @@ bool FwkTabWindow::RemoveEntry( sal_Int32 nIndex )
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
 {
     TabEntry* pEntry = NULL;
@@ -269,7 +269,7 @@ TabEntry* FwkTabWindow::FindEntry( sal_Int32 nIndex ) const
     return pEntry;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
 {
@@ -293,7 +293,7 @@ IMPL_LINK_NOARG(FwkTabWindow, ActivatePageHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
 {
@@ -301,7 +301,7 @@ IMPL_LINK_NOARG(FwkTabWindow, DeactivatePageHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabWindow::AddEventListener( const Link& rEventListener )
 {
@@ -313,7 +313,7 @@ void FwkTabWindow::RemoveEventListener( const Link& rEventListener )
     m_aTabCtrl.RemoveEventListener( rEventListener );
 }
 
-// -----------------------------------------------------------------------
+
 
 FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< beans::NamedValue >& rProperties )
 {
@@ -356,7 +356,7 @@ FwkTabPage* FwkTabWindow::AddTabPage( sal_Int32 nIndex, const uno::Sequence< bea
     return pEntry->m_pPage;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
 {
@@ -364,7 +364,7 @@ void FwkTabWindow::ActivatePage( sal_Int32 nIndex )
     ActivatePageHdl( &m_aTabCtrl );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FwkTabWindow::RemovePage( sal_Int32 nIndex )
 {
@@ -377,7 +377,7 @@ void FwkTabWindow::RemovePage( sal_Int32 nIndex )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void FwkTabWindow::Resize()
 {
     Size aPageSize = GetSizePixel();
diff --git a/framework/source/classes/fwlresid.cxx b/framework/source/classes/fwlresid.cxx
index 30fd281d93c4..a5e1552c8b6e 100644
--- a/framework/source/classes/fwlresid.cxx
+++ b/framework/source/classes/fwlresid.cxx
@@ -41,7 +41,7 @@ ResMgr* FwlResId::GetResManager()
     return pResMgr;
 }
 
-// -----------------------------------------------------------------------
+
 
 FwlResId::FwlResId( sal_uInt16 nId ) :
     ResId( nId, *FwlResId::GetResManager() )
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 6bacf4ed174f..57eeb412cae1 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -720,9 +720,9 @@ void MenuManager::CreatePicklistArguments( Sequence< PropertyValue >& aArgsList,
 }
 
 
-//_________________________________________________________________________________________________________________
+
 // vcl handler
-//_________________________________________________________________________________________________________________
+
 
 IMPL_LINK( MenuManager, Activate, Menu *, pMenu )
 {
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx
index 5f6ab50f5b8e..696a7518ded8 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -57,7 +57,7 @@ const char URL_CLOSEWIN[] = ".uno:CloseWin";
 const char URL_CLOSEFRAME[] = ".uno:CloseFrame";
 
 
-//-----------------------------------------------
+
 CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponentContext >& rxContext ,
                                  const css::uno::Reference< css::frame::XFrame >&          xFrame ,
                                  const OUString&                                           sTarget)
@@ -81,12 +81,12 @@ CloseDispatcher::CloseDispatcher(const css::uno::Reference< css::uno::XComponent
     }
 }
 
-//-----------------------------------------------
+
 CloseDispatcher::~CloseDispatcher()
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL CloseDispatcher::dispatch(const css::util::URL&                                  aURL      ,
                                         const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
     throw(css::uno::RuntimeException)
@@ -94,7 +94,7 @@ void SAL_CALL CloseDispatcher::dispatch(const css::util::URL&
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGroups()
     throw(css::uno::RuntimeException)
 {
@@ -104,7 +104,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL CloseDispatcher::getSupportedCommandGro
     return lGroups;
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
     throw(css::uno::RuntimeException)
 {
@@ -129,21 +129,21 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL CloseDispatcher::
     return css::uno::Sequence< css::frame::DispatchInformation >();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL CloseDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                  const css::util::URL&                                     /*aURL*/     )
     throw(css::uno::RuntimeException)
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL CloseDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                     const css::util::URL&                                     /*aURL*/     )
     throw(css::uno::RuntimeException)
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                         const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
@@ -231,7 +231,7 @@ void SAL_CALL CloseDispatcher::dispatchWithNotification(const css::util::URL&
         m_aAsyncCallback.Post(0);
 }
 
-//-----------------------------------------------
+
 /**
     @short      asynchronous callback
     @descr      We start all actions inside this object asnychronoue.
@@ -433,7 +433,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
     return 0;
 }
 
-//-----------------------------------------------
+
 sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Reference< css::frame::XFrame >& xFrame                ,
                                                               sal_Bool                                   bAllowSuspend         ,
                                                               sal_Bool                                   bCloseAllOtherViewsToo,
@@ -486,7 +486,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc
     return sal_True;
 }
 
-//-----------------------------------------------
+
 sal_Bool CloseDispatcher::implts_closeFrame()
 {
     // SAFE -> ----------------------------------
@@ -514,7 +514,7 @@ sal_Bool CloseDispatcher::implts_closeFrame()
     return sal_True;
 }
 
-//-----------------------------------------------
+
 sal_Bool CloseDispatcher::implts_establishBackingMode()
 {
     // SAFE -> ----------------------------------
@@ -545,7 +545,7 @@ sal_Bool CloseDispatcher::implts_establishBackingMode()
     return sal_True;
 }
 
-//-----------------------------------------------
+
 sal_Bool CloseDispatcher::implts_terminateApplication()
 {
     // SAFE -> ----------------------------------
@@ -559,7 +559,7 @@ sal_Bool CloseDispatcher::implts_terminateApplication()
     return xDesktop->terminate();
 }
 
-//-----------------------------------------------
+
 void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener,
                                                         sal_Int16                                                   nState   ,
                                                   const css::uno::Any&                                              aResult  )
@@ -575,7 +575,7 @@ void CloseDispatcher::implts_notifyResultListener(const css::uno::Reference< css
     xListener->dispatchFinished(aEvent);
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRightTargetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame ,
                                                                                               const OUString&                           sTarget)
 {
diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx
index d1f385b9f926..e65b925a22d7 100644
--- a/framework/source/dispatch/dispatchinformationprovider.cxx
+++ b/framework/source/dispatch/dispatchinformationprovider.cxx
@@ -32,7 +32,7 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext ,
                                                          const css::uno::Reference< css::frame::XFrame >&          xFrame)
     : ThreadHelpBase(&Application::GetSolarMutex())
@@ -41,12 +41,12 @@ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Referen
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 DispatchInformationProvider::~DispatchInformationProvider()
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupportedCommandGroups()
     throw (css::uno::RuntimeException)
 {
@@ -78,7 +78,7 @@ css::uno::Sequence< sal_Int16 > SAL_CALL DispatchInformationProvider::getSupport
     return lGroups.getAsConstList();
 }
 
-//_________________________________________________________________________________________________________________
+
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformationProvider::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
     throw (css::uno::RuntimeException)
 {
@@ -128,7 +128,7 @@ css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL DispatchInformati
     return lReturn;
 }
 
-//_________________________________________________________________________________________________________________
+
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatchInformationProvider > > DispatchInformationProvider::implts_getAllSubProvider()
 {
     // SAFE -> ----------------------------------
diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx
index 8a6327d3d914..8ef54766be83 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -185,27 +185,27 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
         return NULL;
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I) handle special cases which not right for using findFrame() first
-    //-----------------------------------------------------------------------------------------------------
 
-    //-----------------------------------------------------------------------------------------------------
+
+
     // I.I) "_blank"
     //  It's not the right place to create a new task here - because we are queried for a dispatch object
     //  only, which can handle such request. Such dispatcher should create the required task on demand.
     //  Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly
     //  here. Thats why we must "intercept" here.
-    //-----------------------------------------------------------------------------------------------------
+
     if (sTargetFrameName==SPECIALTARGET_BLANK)
     {
         if (implts_isLoadableContent(aURL))
             xDispatcher = implts_getOrCreateDispatchHelper( E_BLANKDISPATCHER, xDesktop );
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.II) "_default"
     //  This is a combination of search an empty task for recycling - or create a new one.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (sTargetFrameName==SPECIALTARGET_DEFAULT)
     {
         if (implts_isLoadableContent(aURL))
@@ -215,12 +215,12 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
             xDispatcher = implts_getOrCreateDispatchHelper( E_STARTMODULEDISPATCHER, xDesktop );
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.III) "_self", "", "_top"
     //  The desktop can't load any document - but he can handle some special protocols like "uno", "slot" ...
     //  Why is "top" here handled too? Because the desktop is the topest frame. Normaly it's superflous
     //  to use this target - but we can handle it in the same manner then "_self".
-    //-----------------------------------------------------------------------------------------------------
+
     else if (
              (sTargetFrameName==SPECIALTARGET_SELF)  ||
              (sTargetFrameName==SPECIALTARGET_TOP )  ||
@@ -230,12 +230,12 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
         xDispatcher = implts_searchProtocolHandler(aURL);
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.IV) no further special targets exist
     //  Now we have to search for the right target frame by calling findFrame() - but should provide our code
     //  against creation of a new task if no frame could be found.
     //  I said it b efore - it's allowed for dispatch() only.
-    //-----------------------------------------------------------------------------------------------------
+
     else
     {
         sal_Int32 nRightFlags  = nSearchFlags;
@@ -257,7 +257,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryDeskt
     return xDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrameDispatch( const css::uno::Reference< css::frame::XFrame > xFrame           ,
                                                                                           const css::util::URL&                           aURL             ,
@@ -266,23 +266,23 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
 {
     css::uno::Reference< css::frame::XDispatch > xDispatcher;
 
-    //-----------------------------------------------------------------------------------------------------
+
     // 0) Some URLs are dispatched in a generic way (e.g. by the menu) using the default target "".
     //    But they are specified to use her own fix target. Detect such URLs here and use the correct target.
-    //-----------------------------------------------------------------------------------------------------
+
 
     OUString sTargetName = sTargetFrameName;
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I) handle special cases which not right for using findFrame() first
-    //-----------------------------------------------------------------------------------------------------
 
-    //-----------------------------------------------------------------------------------------------------
+
+
     // I.I) "_blank", "_default"
     //  It's not the right place to create a new task here. Only the desktop can do that.
     //  Normaly the functionality for "_blank" is provided by findFrame() - but that would create it directly
     //  here. Thats why we must "intercept" here.
-    //-----------------------------------------------------------------------------------------------------
+
     if (
         (sTargetName==SPECIALTARGET_BLANK  ) ||
         (sTargetName==SPECIALTARGET_DEFAULT)
@@ -293,20 +293,20 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
             xDispatcher = xParent->queryDispatch(aURL, sTargetName, 0); // it's a special target - ignore search flags
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.II) "_menubar"
     //  Special mode on frame or task to receive the local menu. Not supported by findFrame()
-    //-----------------------------------------------------------------------------------------------------
+
     else if (sTargetName==SPECIALTARGET_MENUBAR)
     {
         xDispatcher = implts_getOrCreateDispatchHelper( E_MENUDISPATCHER, xFrame );
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.IV) "_beamer"
     //  Special sub frame of a top frame only. Search or create it. ... OK it's currently a little bit HACKI.
     //  Only the sfx (means the controller) can create it it.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (sTargetName==SPECIALTARGET_BEAMER)
     {
         css::uno::Reference< css::frame::XDispatchProvider > xBeamer( xFrame->findFrame( SPECIALTARGET_BEAMER, css::frame::FrameSearchFlag::CHILDREN | css::frame::FrameSearchFlag::SELF ), css::uno::UNO_QUERY );
@@ -324,10 +324,10 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
         }
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.V) "_parent"
     //  Our parent frame (if it exist) should handle this URL.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (sTargetName==SPECIALTARGET_PARENT)
     {
         css::uno::Reference< css::frame::XDispatchProvider > xParent( xFrame->getCreator(), css::uno::UNO_QUERY );
@@ -336,11 +336,11 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
             xDispatcher = xParent->queryDispatch(aURL, SPECIALTARGET_SELF, 0);
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.VI) "_top"
     //  This request must be forwarded to any parent frame, till we reach a top frame.
     //  If no parent exist, we can handle itself.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (sTargetName==SPECIALTARGET_TOP)
     {
         if (xFrame->isTop())
@@ -360,13 +360,13 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
         }
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.VII) "_self", ""
     //  Our owner frame should handle this URL. But we can't do it for all of them.
     //  So we ask the internal setted controller first. If he disagree we try to find a registered
     //  protocol handler. If this failed too - we check for a loadable content and in case of true
     //  we load it into the frame by returning specilized dispatch object.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (
              (sTargetName==SPECIALTARGET_SELF)  ||
              (sTargetName.isEmpty())
@@ -421,12 +421,12 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
         }
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.VI) no further special handlings exist
     //  Now we have to search for the right target frame by calling findFrame() - but should provide our code
     //  against creation of a new task if no frame could be found.
     //  I said it before - it's allowed for dispatch() only.
-    //-----------------------------------------------------------------------------------------------------
+
     else
     {
         sal_Int32 nRightFlags  = nSearchFlags;
@@ -467,7 +467,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_queryFrame
     return xDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      search for a registered protocol handler and ask him for a dispatch object
@@ -535,7 +535,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_searchProt
     return xDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      get or create new dispatch helper
@@ -646,7 +646,7 @@ css::uno::Reference< css::frame::XDispatch > DispatchProvider::implts_getOrCreat
     return xDispatchHelper;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      check URL for support by our used loader or handler
diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx
index 1b51d5c535e3..80d642d0962e 100644
--- a/framework/source/dispatch/mailtodispatcher.cxx
+++ b/framework/source/dispatch/mailtodispatcher.cxx
@@ -30,7 +30,7 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 // XInterface, XTypeProvider, XServiceInfo
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(MailToDispatcher                   ,
@@ -48,7 +48,7 @@ DEFINE_INIT_SERVICE(MailToDispatcher,
                     }
                    )
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      standard ctor
@@ -65,7 +65,7 @@ MailToDispatcher::MailToDispatcher( const css::uno::Reference< css::uno::XCompon
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      standard dtor
@@ -76,7 +76,7 @@ MailToDispatcher::~MailToDispatcher()
     m_xContext = NULL;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      decide if this dispatch implementation can be used for requested URL or not
@@ -97,7 +97,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL MailToDispatcher::queryDis
     return xDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      do the same like dispatch() but for multiple requests at the same time
@@ -117,7 +117,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Mail
     return lDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      dispatch URL with arguments
@@ -140,7 +140,7 @@ void SAL_CALL MailToDispatcher::dispatch( const css::util::URL&
     // No notification for status listener!
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      dispatch with guaranteed notifications about success
@@ -177,7 +177,7 @@ void SAL_CALL MailToDispatcher::dispatchWithNotification( const css::util::URL&
     }
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      threadsafe helper for dispatch calls
@@ -226,7 +226,7 @@ sal_Bool MailToDispatcher::implts_dispatch( const css::util::URL&
     return bSuccess;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      add/remove listener for state events
@@ -245,7 +245,7 @@ void SAL_CALL MailToDispatcher::addStatusListener( const css::uno::Reference< cs
     // not suported yet
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL MailToDispatcher::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
                                                       const css::util::URL&                                     /*aURL*/      ) throw( css::uno::RuntimeException )
diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx
index 65652772f1f4..bd4f2ccc104a 100644
--- a/framework/source/dispatch/servicehandler.cxx
+++ b/framework/source/dispatch/servicehandler.cxx
@@ -32,7 +32,7 @@ namespace framework{
 #define PROTOCOL_VALUE      "service:"
 #define PROTOCOL_LENGTH     8
 
-//_________________________________________________________________________________________________________________
+
 // XInterface, XTypeProvider, XServiceInfo
 
 DEFINE_XSERVICEINFO_MULTISERVICE(ServiceHandler                   ,
@@ -50,7 +50,7 @@ DEFINE_INIT_SERVICE(ServiceHandler,
                     }
                    )
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      standard ctor
@@ -67,7 +67,7 @@ ServiceHandler::ServiceHandler( const css::uno::Reference< css::lang::XMultiServ
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      standard dtor
@@ -78,7 +78,7 @@ ServiceHandler::~ServiceHandler()
     m_xFactory = NULL;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      decide if this dispatch implementation can be used for requested URL or not
@@ -99,7 +99,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL ServiceHandler::queryDispa
     return xDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      do the same like dispatch() but for multiple requests at the same time
@@ -119,7 +119,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Serv
     return lDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      dispatch URL with arguments
@@ -141,7 +141,7 @@ void SAL_CALL ServiceHandler::dispatch( const css::util::URL&
     // No notification for status listener!
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      dispatch with guaranteed notifications about success
@@ -179,7 +179,7 @@ void SAL_CALL ServiceHandler::dispatchWithNotification( const css::util::URL&
     }
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      threadsafe helper for dispatch calls
@@ -256,7 +256,7 @@ css::uno::Reference< css::uno::XInterface > ServiceHandler::implts_dispatch( con
     return xService;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short      add/remove listener for state events
@@ -275,7 +275,7 @@ void SAL_CALL ServiceHandler::addStatusListener( const css::uno::Reference< css:
     // not suported yet
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL ServiceHandler::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ ,
                                                     const css::util::URL&                                     /*aURL*/      ) throw( css::uno::RuntimeException )
diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx
index 1c9e51185bd1..a7627ab17580 100644
--- a/framework/source/dispatch/startmoduledispatcher.cxx
+++ b/framework/source/dispatch/startmoduledispatcher.cxx
@@ -53,7 +53,7 @@ namespace framework{
 namespace fpf = ::framework::pattern::frame;
 
 
-//-----------------------------------------------
+
 StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno::XComponentContext >&     rxContext,
                                              const css::uno::Reference< css::frame::XFrame >&              xFrame ,
                                              const OUString&                                        sTarget)
@@ -65,12 +65,12 @@ StartModuleDispatcher::StartModuleDispatcher(const css::uno::Reference< css::uno
 {
 }
 
-//-----------------------------------------------
+
 StartModuleDispatcher::~StartModuleDispatcher()
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL&                                  aURL      ,
                                               const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
     throw(css::uno::RuntimeException)
@@ -78,7 +78,7 @@ void SAL_CALL StartModuleDispatcher::dispatch(const css::util::URL&
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
-//-----------------------------------------------
+
 void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                               const css::uno::Sequence< css::beans::PropertyValue >&            /*lArguments*/,
                                                               const css::uno::Reference< css::frame::XDispatchResultListener >& xListener )
@@ -98,35 +98,35 @@ void SAL_CALL StartModuleDispatcher::dispatchWithNotification(const css::util::U
     implts_notifyResultListener(xListener, nResult, css::uno::Any());
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< ::sal_Int16 > SAL_CALL StartModuleDispatcher::getSupportedCommandGroups()
     throw(css::uno::RuntimeException)
 {
     return css::uno::Sequence< ::sal_Int16 >();
 }
 
-//-----------------------------------------------
+
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL StartModuleDispatcher::getConfigurableDispatchInformation(::sal_Int16 /*nCommandGroup*/)
     throw(css::uno::RuntimeException)
 {
     return css::uno::Sequence< css::frame::DispatchInformation >();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL StartModuleDispatcher::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                        const css::util::URL&                                     /*aURL*/     )
     throw(css::uno::RuntimeException)
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/,
                                                           const css::util::URL&                                     /*aURL*/     )
     throw(css::uno::RuntimeException)
 {
 }
 
-//-----------------------------------------------
+
 ::sal_Bool StartModuleDispatcher::implts_isBackingModePossible ()
 {
     if ( ! SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SSTARTMODULE))
@@ -160,7 +160,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere
     return bIsPossible;
 }
 
-//-----------------------------------------------
+
 ::sal_Bool StartModuleDispatcher::implts_establishBackingMode()
 {
     // SAFE -> ----------------------------------
@@ -182,7 +182,7 @@ void SAL_CALL StartModuleDispatcher::removeStatusListener(const css::uno::Refere
     return sal_True;
 }
 
-//-----------------------------------------------
+
 void StartModuleDispatcher::implts_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener,
                                                               ::sal_Int16                                                 nState   ,
                                                         const css::uno::Any&                                              aResult  )
diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx
index 717011ca8dde..cd6d9d83736a 100644
--- a/framework/source/dispatch/systemexec.cxx
+++ b/framework/source/dispatch/systemexec.cxx
@@ -36,7 +36,7 @@ namespace framework{
 #define PROTOCOL_VALUE      "systemexecute:"
 #define PROTOCOL_LENGTH     14
 
-//_________________________________________________________________________________________________________________
+
 // XInterface, XTypeProvider, XServiceInfo
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(SystemExec                   ,
@@ -54,7 +54,7 @@ DEFINE_INIT_SERVICE(SystemExec,
                     }
                    )
 
-//_________________________________________________________________________________________________________________
+
 
 SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
         //  Init baseclasses first
@@ -64,14 +64,14 @@ SystemExec::SystemExec( const css::uno::Reference< css::uno::XComponentContext >
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 
 SystemExec::~SystemExec()
 {
     m_xContext = NULL;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch( const css::util::URL&  aURL    ,
                                                                                  const OUString&,
@@ -83,7 +83,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL SystemExec::queryDispatch(
     return xDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL SystemExec::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor ) throw( css::uno::RuntimeException )
 {
@@ -99,7 +99,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Syst
     return lDispatcher;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL SystemExec::dispatch( const css::util::URL&                                  aURL       ,
                                     const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException )
@@ -107,7 +107,7 @@ void SAL_CALL SystemExec::dispatch( const css::util::URL&
     dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                     const css::uno::Sequence< css::beans::PropertyValue >&,
@@ -147,7 +147,7 @@ void SAL_CALL SystemExec::dispatchWithNotification( const css::util::URL&
         }
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
                                              const css::util::URL& ) throw( css::uno::RuntimeException )
@@ -155,7 +155,7 @@ void SAL_CALL SystemExec::addStatusListener( const css::uno::Reference< css::fra
     // not suported yet
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >&,
                                                 const css::util::URL& ) throw( css::uno::RuntimeException )
@@ -163,7 +163,7 @@ void SAL_CALL SystemExec::removeStatusListener( const css::uno::Reference< css::
     // not suported yet
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SystemExec::impl_notifyResultListener(const css::uno::Reference< css::frame::XDispatchResultListener >& xListener,
                                            const sal_Int16                                                   nState   )
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index 44a381c48a1e..d19695d0bd69 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -38,7 +38,7 @@
 
 namespace framework{
 
-//-----------------------------------------------
+
 WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >& xContext ,
                          const css::uno::Reference< css::frame::XFrame >&              xFrame)
     : ThreadHelpBase(                            )
@@ -49,14 +49,14 @@ WindowCommandDispatch::WindowCommandDispatch(const css::uno::Reference< css::uno
     impl_startListening();
 }
 
-//-----------------------------------------------
+
 WindowCommandDispatch::~WindowCommandDispatch()
 {
     impl_stopListening();
     m_xContext.clear();
 }
 
-//-----------------------------------------------
+
 void WindowCommandDispatch::impl_startListening()
 {
     ReadGuard aReadLock(m_aLock);
@@ -100,7 +100,7 @@ void WindowCommandDispatch::impl_stopListening()
 }
 
 
-//-----------------------------------------------
+
 IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
 {
     if ( ! pParam)
@@ -145,7 +145,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
     return 0L;
 }
 
-//-----------------------------------------------
+
 void WindowCommandDispatch::impl_dispatchCommand(const OUString& sCommand)
 {
     // ignore all errors here. It's clicking a menu entry only ...
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index 3fb7b8a90914..11c5685ca1c9 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -65,9 +65,9 @@ AddonMenu::~AddonMenu()
     }
 }
 
-// ------------------------------------------------------------------------
 
-// ------------------------------------------------------------------------
+
+
 // Check if command URL string has the unique prefix to identify addon popup menus
 sal_Bool AddonPopupMenu::IsCommandURLPrefix( const OUString& aCmdURL )
 {
@@ -85,7 +85,7 @@ AddonPopupMenu::~AddonPopupMenu()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame )
 {
@@ -101,7 +101,7 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame
     return xModel;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool AddonMenuManager::HasAddonMenuElements()
 {
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index a22ea22d821d..3ed1f1b6f7e7 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -38,9 +38,9 @@
 #include <algorithm>
 #include <vector>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::std                   ;
 using namespace ::utl                   ;
@@ -192,9 +192,9 @@ using namespace ::com::sun::star;
 
 #define EXPAND_PROTOCOL                                 "vnd.sun.star.expand:"
 
-//_________________________________________________________________________________________________________________
+
 //  private declarations!
-//_________________________________________________________________________________________________________________
+
 
 /*-****************************************************************************************************************
     @descr  struct to hold information about one menu entry.
@@ -205,21 +205,21 @@ namespace framework
 
 class AddonsOptions_Impl : public ConfigItem
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
 
          AddonsOptions_Impl();
         ~AddonsOptions_Impl();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      called for notify of configmanager
@@ -252,9 +252,9 @@ class AddonsOptions_Impl : public ConfigItem
 
         virtual void Commit();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  public interface
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      base implementation of public interface for "SvtDynamicMenuOptions"!
@@ -282,9 +282,9 @@ class AddonsOptions_Impl : public ConfigItem
         const MergeStatusbarInstructionContainer&       GetMergeStatusbarInstructions() const;
         void                                            ReadConfigurationData();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
         enum ImageSize
@@ -361,9 +361,9 @@ class AddonsOptions_Impl : public ConfigItem
         Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const;
         sal_Bool             CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const;
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
         ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName );
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index 4d49b4ee4168..622fcaab13a7 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -88,7 +88,7 @@ sal_uInt16 BmkMenu_Impl::GetMID()
     return m_nMID;
 }
 
-// ------------------------------------------------------------------------
+
 
 BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType )
     :AddonMenu(xFrame)
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx
index aae1aa421e5d..2aad958b80c5 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -175,7 +175,7 @@ void FrameListAnalyzer::impl_analyze()
                 SAL_INFO("fwk", "FrameListAnalyzer::impl_analyze(): ZOMBIE!");
             }
 
-            // -------------------------------------------------
+
             // a) Is it the special help task?
             //    Return it separated from any return list.
             if (
@@ -187,7 +187,7 @@ void FrameListAnalyzer::impl_analyze()
                 continue;
             }
 
-            // -------------------------------------------------
+
             // b) Or is includes this task the special backing component?
             //    Return it separated from any return list.
             //    But check if the reference task itself is the backing frame.
@@ -210,7 +210,7 @@ void FrameListAnalyzer::impl_analyze()
                 }
             }
 
-            // -------------------------------------------------
+
             // c) Or is it the a task, which uses the specified model?
             //    Add it to the list of "model frames".
             if ((m_eDetectMode & E_MODEL) == E_MODEL)
@@ -227,11 +227,11 @@ void FrameListAnalyzer::impl_analyze()
                 }
             }
 
-            // -------------------------------------------------
+
             // d) Or is it the a task, which use another or no model at all?
             //    Add it to the list of "other frames". But look for it's
             //    visible state ... if it's allowed to do so.
-            // -------------------------------------------------
+
             sal_Bool bHidden = sal_False;
             if ((m_eDetectMode & E_HIDDEN) == E_HIDDEN )
             {
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index 4316f8f1a545..e428fb5e600d 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -41,7 +41,7 @@ ResMgr* FwkResId::GetResManager()
     return pResMgr;
 }
 
-// -----------------------------------------------------------------------
+
 
 FwkResId::FwkResId( sal_uInt16 nId ) :
     ResId( nId, *FwkResId::GetResManager() )
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index c70b608ee3d8..61dc5bed6b97 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -63,25 +63,25 @@ class ContinuationFilterSelect : public comphelper::OInteraction< ::com::sun::st
 };  // class ContinuationFilterSelect
 
 
-//---------------------------------------------------------------------------------------------------------
+
 // initialize continuation with right start values
-//---------------------------------------------------------------------------------------------------------
+
 ContinuationFilterSelect::ContinuationFilterSelect()
     : m_sFilter( OUString() )
 {
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // handler should use it after selection to set user specified filter for transport
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL ContinuationFilterSelect::setFilter( const OUString& sFilter ) throw( css::uno::RuntimeException )
 {
     m_sFilter = sFilter;
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // read access to transported filter
-//---------------------------------------------------------------------------------------------------------
+
 OUString SAL_CALL ContinuationFilterSelect::getFilter() throw( css::uno::RuntimeException )
 {
     return m_sFilter;
@@ -105,10 +105,10 @@ private:
     ContinuationFilterSelect* m_pFilter;
 };
 
-//---------------------------------------------------------------------------------------------------------
+
 // initialize instance with all necessary information
 // We use it without any further checks on our member then ...!
-//---------------------------------------------------------------------------------------------------------
+
 RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL )
 {
     OUString temp;
@@ -126,39 +126,39 @@ RequestFilterSelect_Impl::RequestFilterSelect_Impl( const OUString& sURL )
     m_lContinuations[1] = css::uno::Reference< css::task::XInteractionContinuation >( m_pFilter );
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
-//---------------------------------------------------------------------------------------------------------
+
 sal_Bool RequestFilterSelect_Impl::isAbort() const
 {
     return m_pAbort->wasSelected();
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
-//---------------------------------------------------------------------------------------------------------
+
 OUString RequestFilterSelect_Impl::getFilter() const
 {
     return m_pFilter->getFilter();
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // handler call it to get type of request
 // Is hard coded to "please select filter" here. see ctor for further information.
-//---------------------------------------------------------------------------------------------------------
+
 css::uno::Any SAL_CALL RequestFilterSelect_Impl::getRequest() throw( css::uno::RuntimeException )
 {
     return m_aRequest;
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // handler call it to get possible continuations
 // We support "abort/select_filter" only here.
 // After interaction we support read access on these continuations on our c++ interface to
 // return user decision.
-//---------------------------------------------------------------------------------------------------------
+
 css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > SAL_CALL RequestFilterSelect_Impl::getContinuations() throw( css::uno::RuntimeException )
 {
     return m_lContinuations;
@@ -177,19 +177,19 @@ RequestFilterSelect::~RequestFilterSelect()
 }
 
 
-//---------------------------------------------------------------------------------------------------------
+
 // return abort state of interaction
 // If it is true, return value of method "getFilter()" will be unspecified then!
-//---------------------------------------------------------------------------------------------------------
+
 sal_Bool RequestFilterSelect::isAbort() const
 {
     return pImp->isAbort();
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // return user selected filter
 // Return value valid for non aborted interaction only. Please check "isAbort()" before you call these ony!
-//---------------------------------------------------------------------------------------------------------
+
 OUString RequestFilterSelect::getFilter() const
 {
     return pImp->getFilter();
diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx
index 6ccd422bfeeb..70108d6cec9c 100644
--- a/framework/source/fwe/helper/actiontriggerhelper.cxx
+++ b/framework/source/fwe/helper/actiontriggerhelper.cxx
@@ -44,9 +44,9 @@ using namespace com::sun::star::container;
 namespace framework
 {
 
-// ----------------------------------------------------------------------------
+
 // implementation helper ( menu => ActionTrigger )
-// ----------------------------------------------------------------------------
+
 
 sal_Bool IsSeparator( Reference< XPropertySet > xPropertySet )
 {
@@ -238,9 +238,9 @@ void InsertSubMenuItems( Menu* pSubMenu, sal_uInt16& nItemId, Reference< XIndexC
 }
 
 
-// ----------------------------------------------------------------------------
+
 // implementation helper ( ActionTrigger => menu )
-// ----------------------------------------------------------------------------
+
 
 Reference< XPropertySet > CreateActionTrigger( sal_uInt16 nItemId, const Menu* pMenu, const Reference< XIndexContainer >& rActionTriggerContainer ) throw ( RuntimeException )
 {
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index cec4c0a253a3..2e839c62ee9a 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -110,84 +110,84 @@ namespace framework
         bool                            m_documentDisposed;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::undoActionAdded( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         // not interested in
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::actionUndone( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         // not interested in
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::actionRedone( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         // not interested in
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::allActionsCleared( const EventObject& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         // not interested in
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::redoActionsCleared( const EventObject& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         // not interested in
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::resetAll( const EventObject& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         m_nRelativeContextDepth = 0;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::enteredContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         osl_atomic_increment( &m_nRelativeContextDepth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::enteredHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         osl_atomic_increment( &m_nRelativeContextDepth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::leftContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         osl_atomic_decrement( &m_nRelativeContextDepth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::leftHiddenContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         osl_atomic_decrement( &m_nRelativeContextDepth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::cancelledContext( const UndoManagerEvent& i_event ) throw (RuntimeException)
     {
         (void)i_event;
         osl_atomic_decrement( &m_nRelativeContextDepth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL UndoManagerContextListener::disposing( const EventObject& i_event ) throw (RuntimeException)
     {
         (void)i_event;
@@ -205,7 +205,7 @@ namespace framework
 
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_init( DocumentUndoGuard_Data& i_data, const Reference< XInterface >& i_undoSupplierComponent )
         {
             try
@@ -223,7 +223,7 @@ namespace framework
             }
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_restore( DocumentUndoGuard_Data& i_data )
         {
             try
@@ -242,7 +242,7 @@ namespace framework
     //==================================================================================================================
     //= DocumentUndoGuard
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent )
         :m_pData( new DocumentUndoGuard_Data )
     {
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index b02549db16b1..9588a0af6905 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -38,7 +38,7 @@
 
 namespace framework{
 
-//-----------------------------------------------
+
 TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext >& rxContext)
     : ::cppu::BaseMutex ()
     , m_xContext        (rxContext)
@@ -52,12 +52,12 @@ TitleHelper::TitleHelper(const css::uno::Reference< css::uno::XComponentContext
 {
 }
 
-//-----------------------------------------------
+
 TitleHelper::~TitleHelper()
 {
 }
 
-//-----------------------------------------------
+
 void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xOwner)
 {
     // SYNCHRONIZED ->
@@ -90,7 +90,7 @@ void TitleHelper::setOwner(const css::uno::Reference< css::uno::XInterface >& xO
     }
 }
 
-//-----------------------------------------------
+
 OUString SAL_CALL TitleHelper::getTitle()
     throw (css::uno::RuntimeException)
 {
@@ -115,7 +115,7 @@ OUString SAL_CALL TitleHelper::getTitle()
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::frame::XUntitledNumbers >& xNumbers)
 {
     // SYNCHRONIZED ->
@@ -126,7 +126,7 @@ void TitleHelper::connectWithUntitledNumbers (const css::uno::Reference< css::fr
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
     throw (css::uno::RuntimeException)
 {
@@ -142,7 +142,7 @@ void SAL_CALL TitleHelper::setTitle(const OUString& sTitle)
     impl_sendTitleChangedEvent ();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
     throw (css::uno::RuntimeException)
 {
@@ -150,7 +150,7 @@ void SAL_CALL TitleHelper::addTitleChangeListener(const css::uno::Reference< css
     m_aListener.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener );
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
     throw (css::uno::RuntimeException)
 {
@@ -158,7 +158,7 @@ void SAL_CALL TitleHelper::removeTitleChangeListener(const css::uno::Reference<
     m_aListener.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XTitleChangeListener >*)NULL ), xListener );
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEvent)
     throw (css::uno::RuntimeException)
 {
@@ -176,7 +176,7 @@ void SAL_CALL TitleHelper::titleChanged(const css::frame::TitleChangedEvent& aEv
     impl_updateTitle ();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent)
     throw (css::uno::RuntimeException)
 {
@@ -204,7 +204,7 @@ void SAL_CALL TitleHelper::notifyEvent(const css::document::EventObject& aEvent)
     impl_updateTitle ();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -232,7 +232,7 @@ void SAL_CALL TitleHelper::frameAction(const css::frame::FrameActionEvent& aEven
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
     throw (css::uno::RuntimeException)
 {
@@ -268,7 +268,7 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
     impl_sendTitleChangedEvent ();
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_sendTitleChangedEvent ()
 {
     // SYNCHRONIZED ->
@@ -297,7 +297,7 @@ void TitleHelper::impl_sendTitleChangedEvent ()
     }
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_updateTitle (bool init)
 {
     // SYNCHRONIZED ->
@@ -324,7 +324,7 @@ void TitleHelper::impl_updateTitle (bool init)
     }
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::frame::XModel >& xModel, bool init)
 {
     // SYNCHRONIZED ->
@@ -395,7 +395,7 @@ void TitleHelper::impl_updateTitleForModel (const css::uno::Reference< css::fram
         impl_sendTitleChangedEvent ();
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css::frame::XController >& xController, bool init)
 {
     // SYNCHRONIZED ->
@@ -461,7 +461,7 @@ void TitleHelper::impl_updateTitleForController (const css::uno::Reference< css:
         impl_sendTitleChangedEvent ();
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame, bool init)
 {
     if ( ! xFrame.is ())
@@ -582,7 +582,7 @@ void TitleHelper::impl_appendDebugVersion (OUStringBuffer&)
 }
 #endif
 
-//-----------------------------------------------
+
 void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::frame::XModel >& xModel)
 {
     css::uno::Reference< css::document::XEventBroadcaster > xBroadcaster(xModel, css::uno::UNO_QUERY);
@@ -592,28 +592,28 @@ void TitleHelper::impl_startListeningForModel (const css::uno::Reference< css::f
     xBroadcaster->addEventListener (static_cast< css::document::XEventListener* >(this));
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_startListeningForController (const css::uno::Reference< css::frame::XController >& xController)
 {
     css::uno::Reference< css::frame::XTitle > xSubTitle(xController->getModel (), css::uno::UNO_QUERY);
     impl_setSubTitle (xSubTitle);
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_startListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     xFrame->addFrameActionListener(this  );
     impl_updateListeningForFrame  (xFrame);
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_updateListeningForFrame (const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     css::uno::Reference< css::frame::XTitle > xSubTitle(xFrame->getController (), css::uno::UNO_QUERY);
     impl_setSubTitle (xSubTitle);
 }
 
-//-----------------------------------------------
+
 void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle)
 {
     // SYNCHRONIZED ->
@@ -640,7 +640,7 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl
         xNewBroadcaster->addTitleChangeListener (xThis);
 }
 
-//-----------------------------------------------
+
 OUString TitleHelper::impl_convertURL2Title(const OUString& sURL)
 {
     INetURLObject   aURL (sURL);
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 793b6bd04f9e..129dfe517bd6 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -85,7 +85,7 @@ namespace framework
         const Reference< XUndoAction >  m_xUndoAction;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UndoActionWrapper::UndoActionWrapper( Reference< XUndoAction > const& i_undoAction )
         :SfxUndoAction()
         ,m_xUndoAction( i_undoAction )
@@ -93,7 +93,7 @@ namespace framework
         ENSURE_OR_THROW( m_xUndoAction.is(), "illegal undo action" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UndoActionWrapper::~UndoActionWrapper()
     {
         try
@@ -108,7 +108,7 @@ namespace framework
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString UndoActionWrapper::GetComment() const
     {
         OUString sComment;
@@ -123,19 +123,19 @@ namespace framework
         return sComment;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoActionWrapper::Undo()
     {
         m_xUndoAction->undo();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoActionWrapper::Redo()
     {
         m_xUndoAction->redo();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UndoActionWrapper::CanRepeat(SfxRepeatTarget&) const
     {
         return false;
@@ -195,7 +195,7 @@ namespace framework
         ::osl::Condition            m_finishCondition;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
 
     //==================================================================================================================
     //= UndoManagerHelper_Impl
@@ -329,7 +329,7 @@ namespace framework
         void impl_reset();
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::disposing()
     {
         EventObject aEvent;
@@ -344,7 +344,7 @@ namespace framework
         m_disposed = true;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UndoManagerEvent UndoManagerHelper_Impl::buildEvent( OUString const& i_title ) const
     {
         UndoManagerEvent aEvent;
@@ -354,14 +354,14 @@ namespace framework
         return aEvent;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_notifyModified()
     {
         const EventObject aEvent( getXUndoManager() );
         m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvent );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::notify( OUString const& i_title,
         void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const UndoManagerEvent& ) )
     {
@@ -377,7 +377,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::notify( void ( SAL_CALL XUndoManagerListener::*i_notificationMethod )( const EventObject& ) )
     {
         const EventObject aEvent( getXUndoManager() );
@@ -388,7 +388,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::enterUndoContext( const OUString& i_title, const bool i_hidden, IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -402,7 +402,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::leaveUndoContext( IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -414,7 +414,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock )
     {
         if ( !i_action.is() )
@@ -434,7 +434,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::clear( IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -446,7 +446,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::clearRedo( IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -458,7 +458,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::reset( IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -470,7 +470,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::lock()
     {
         // SYNCHRONIZED --->
@@ -484,7 +484,7 @@ namespace framework
         // <--- SYNCHRONIZED
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::unlock()
     {
         // SYNCHRONIZED --->
@@ -501,7 +501,7 @@ namespace framework
         // <--- SYNCHRONIZED
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_processRequest( ::boost::function0< void > const& i_request, IMutexGuard& i_instanceLock )
     {
         // create the request, and add it to our queue
@@ -563,7 +563,7 @@ namespace framework
         while ( true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_enterUndoContext( const OUString& i_title, const bool i_hidden )
     {
         // SYNCHRONIZED --->
@@ -595,7 +595,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_leaveUndoContext()
     {
         // SYNCHRONIZED --->
@@ -655,7 +655,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_doUndoRedo( IMutexGuard& i_externalLock, const bool i_undo )
     {
         ::osl::Guard< ::framework::IMutex > aExternalGuard( i_externalLock.getGuardedMutex() );
@@ -703,7 +703,7 @@ namespace framework
         // So, we do not need to do this notification here ourself.
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_addUndoAction( const Reference< XUndoAction >& i_action )
     {
         // SYNCHRONIZED --->
@@ -733,7 +733,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_clear()
     {
         // SYNCHRONIZED --->
@@ -756,7 +756,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_clearRedo()
     {
         // SYNCHRONIZED --->
@@ -779,7 +779,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::impl_reset()
     {
         // SYNCHRONIZED --->
@@ -799,7 +799,7 @@ namespace framework
         impl_notifyModified();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::actionUndone( const OUString& i_actionComment )
     {
         UndoManagerEvent aEvent;
@@ -810,7 +810,7 @@ namespace framework
         impl_notifyModified();
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::actionRedone( const OUString& i_actionComment )
     {
         UndoManagerEvent aEvent;
@@ -821,7 +821,7 @@ namespace framework
         impl_notifyModified();
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::undoActionAdded( const OUString& i_actionComment )
     {
         if ( m_bAPIActionRunning )
@@ -830,7 +830,7 @@ namespace framework
         notify( i_actionComment, &XUndoManagerListener::undoActionAdded );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::cleared()
     {
         if ( m_bAPIActionRunning )
@@ -839,7 +839,7 @@ namespace framework
         notify( &XUndoManagerListener::allActionsCleared );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::clearedRedo()
     {
         if ( m_bAPIActionRunning )
@@ -848,7 +848,7 @@ namespace framework
         notify( &XUndoManagerListener::redoActionsCleared );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::resetAll()
     {
         if ( m_bAPIActionRunning )
@@ -857,7 +857,7 @@ namespace framework
         notify( &XUndoManagerListener::resetAll );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::listActionEntered( const OUString& i_comment )
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -870,7 +870,7 @@ namespace framework
         notify( i_comment, &XUndoManagerListener::enteredContext );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::listActionLeft( const OUString& i_comment )
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -885,7 +885,7 @@ namespace framework
         notify( i_comment, &XUndoManagerListener::leftContext );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::listActionLeftAndMerged()
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -900,7 +900,7 @@ namespace framework
         notify( &XUndoManagerListener::leftHiddenContext );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::listActionCancelled()
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -915,7 +915,7 @@ namespace framework
         notify( &XUndoManagerListener::cancelledContext );
     }
 
-     //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::undoManagerDying()
     {
         // TODO: do we need to care? Or is this the responsibility of our owner?
@@ -924,42 +924,42 @@ namespace framework
     //==================================================================================================================
     //= UndoManagerHelper
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl )
         :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UndoManagerHelper::~UndoManagerHelper()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::disposing()
     {
         m_pImpl->disposing();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::enterUndoContext( const OUString& i_title, IMutexGuard& i_instanceLock )
     {
         m_pImpl->enterUndoContext( i_title, false, i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::enterHiddenUndoContext( IMutexGuard& i_instanceLock )
     {
         m_pImpl->enterUndoContext( OUString(), true, i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::leaveUndoContext( IMutexGuard& i_instanceLock )
     {
         m_pImpl->leaveUndoContext( i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::undo( IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -973,7 +973,7 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper_Impl::redo( IMutexGuard& i_instanceLock )
     {
         impl_processRequest(
@@ -987,25 +987,25 @@ namespace framework
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::addUndoAction( const Reference< XUndoAction >& i_action, IMutexGuard& i_instanceLock )
     {
         m_pImpl->addUndoAction( i_action, i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::undo( IMutexGuard& i_instanceLock )
     {
         m_pImpl->undo( i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::redo( IMutexGuard& i_instanceLock )
     {
         m_pImpl->redo( i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool UndoManagerHelper::isUndoPossible() const
     {
         // SYNCHRONIZED --->
@@ -1017,7 +1017,7 @@ namespace framework
         // <--- SYNCHRONIZED
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool UndoManagerHelper::isRedoPossible() const
     {
         // SYNCHRONIZED --->
@@ -1029,7 +1029,7 @@ namespace framework
         // <--- SYNCHRONIZED
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         //..............................................................................................................
@@ -1077,61 +1077,61 @@ namespace framework
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString UndoManagerHelper::getCurrentUndoActionTitle() const
     {
         return lcl_getCurrentActionTitle( *m_pImpl, true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString UndoManagerHelper::getCurrentRedoActionTitle() const
     {
         return lcl_getCurrentActionTitle( *m_pImpl, false );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > UndoManagerHelper::getAllUndoActionTitles() const
     {
         return lcl_getAllActionTitles( *m_pImpl, true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > UndoManagerHelper::getAllRedoActionTitles() const
     {
         return lcl_getAllActionTitles( *m_pImpl, false );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::clear( IMutexGuard& i_instanceLock )
     {
         m_pImpl->clear( i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::clearRedo( IMutexGuard& i_instanceLock )
     {
         m_pImpl->clearRedo( i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::reset( IMutexGuard& i_instanceLock )
     {
         m_pImpl->reset( i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::lock()
     {
         m_pImpl->lock();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::unlock()
     {
         m_pImpl->unlock();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool UndoManagerHelper::isLocked()
     {
         // SYNCHRONIZED --->
@@ -1142,28 +1142,28 @@ namespace framework
         // <--- SYNCHRONIZED
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         if ( i_listener.is() )
             m_pImpl->addUndoManagerListener( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener )
     {
         if ( i_listener.is() )
             m_pImpl->removeUndoManagerListener( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::addModifyListener( const Reference< XModifyListener >& i_listener )
     {
         if ( i_listener.is() )
             m_pImpl->addModifyListener( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UndoManagerHelper::removeModifyListener( const Reference< XModifyListener >& i_listener )
     {
         if ( i_listener.is() )
diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
index 1a1d9831c65f..f6124b96e943 100644
--- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx
+++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx
@@ -31,13 +31,13 @@ PreventDuplicateInteraction::PreventDuplicateInteraction(const css::uno::Referen
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 
 PreventDuplicateInteraction::~PreventDuplicateInteraction()
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::task::XInteractionHandler >& xHandler)
 {
@@ -48,7 +48,7 @@ void PreventDuplicateInteraction::setHandler(const css::uno::Reference< css::tas
     // <- SAFE
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void PreventDuplicateInteraction::useDefaultUUIHandler()
 {
@@ -66,7 +66,7 @@ void PreventDuplicateInteraction::useDefaultUUIHandler()
     // <- SAFE
 }
 
-//_________________________________________________________________________________________________________________
+
 css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::uno::Type& aType )
     throw (css::uno::RuntimeException)
 {
@@ -80,7 +80,7 @@ css::uno::Any SAL_CALL PreventDuplicateInteraction::queryInterface( const css::u
     return ::cppu::WeakImplHelper1< css::task::XInteractionHandler2 >::queryInterface( aType );
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css::task::XInteractionRequest >& xRequest)
     throw(css::uno::RuntimeException)
@@ -136,7 +136,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
     }
 }
 
-//_________________________________________________________________________________________________________________
+
 
 ::sal_Bool SAL_CALL PreventDuplicateInteraction::handleInteractionRequest( const css::uno::Reference< css::task::XInteractionRequest >& xRequest )
             throw (css::uno::RuntimeException)
@@ -195,7 +195,7 @@ void SAL_CALL PreventDuplicateInteraction::handle(const css::uno::Reference< css
     return false;
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInteraction::InteractionInfo& aInteractionInfo)
 {
@@ -222,7 +222,7 @@ void PreventDuplicateInteraction::addInteractionRule(const PreventDuplicateInter
     // <- SAFE
 }
 
-//_________________________________________________________________________________________________________________
+
 
 sal_Bool PreventDuplicateInteraction::getInteractionInfo(const css::uno::Type&                               aInteraction,
                                                                PreventDuplicateInteraction::InteractionInfo* pReturn     ) const
diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx
index 3b81cbad5a9d..1be57a8b96ee 100644
--- a/framework/source/fwe/xml/menudocumenthandler.cxx
+++ b/framework/source/fwe/xml/menudocumenthandler.cxx
@@ -83,9 +83,9 @@ static const char CMD_PROTOCOL[]                = ".uno:";
 static const char ADDDIRECT_CMD[]               = ".uno:AddDirect" ;
 static const char AUTOPILOTMENU_CMD[]           = ".uno:AutoPilotMenu" ;
 
-//_________________________________________________________________________________________________________________
+
 //  using namespaces
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -151,7 +151,7 @@ static void ExtractMenuParameters( const Sequence< PropertyValue > rProp,
 }
 
 
-// -----------------------------------------------------------------------------
+
 // Base class implementation
 
 ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() :
@@ -222,7 +222,7 @@ void ReadMenuDocumentHandlerBase::initPropertyCommon(
     rProps[5].Value <<= ::com::sun::star::ui::ItemType::DEFAULT;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OReadMenuDocumentHandler::OReadMenuDocumentHandler(
     const Reference< XIndexContainer >& rMenuBarContainer )
@@ -305,7 +305,7 @@ void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName )
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 OReadMenuBarHandler::OReadMenuBarHandler(
     const Reference< XIndexContainer >& rMenuBarContainer,
@@ -455,7 +455,7 @@ void OReadMenuBarHandler::endElement( const OUString& aName )
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 
 OReadMenuHandler::OReadMenuHandler(
@@ -541,7 +541,7 @@ void SAL_CALL OReadMenuHandler::endElement( const OUString& aName )
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 
 OReadMenuPopupHandler::OReadMenuPopupHandler(
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx
index c2a63736c8a1..2a799f3b962d 100644
--- a/framework/source/fwe/xml/statusbardocumenthandler.cxx
+++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx
@@ -485,9 +485,9 @@ OUString OReadStatusBarDocumentHandler::getErrorLineString()
 }
 
 
-//_________________________________________________________________________________________________________________
+
 //  OWriteStatusBarDocumentHandler
-//_________________________________________________________________________________________________________________
+
 
 OWriteStatusBarDocumentHandler::OWriteStatusBarDocumentHandler(
     const Reference< XIndexAccess >& aStatusBarItems,
@@ -570,9 +570,9 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() throw
     m_xWriteDocumentHandler->endDocument();
 }
 
-//_________________________________________________________________________________________________________________
+
 //  protected member functions
-//_________________________________________________________________________________________________________________
+
 
 void OWriteStatusBarDocumentHandler::WriteStatusBarItem(
     const OUString& rCommandURL,
diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
index 7b69a975f925..19e94c9ac1e1 100644
--- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx
@@ -656,9 +656,9 @@ OUString OReadToolBoxDocumentHandler::getErrorLineString()
 }
 
 
-//_________________________________________________________________________________________________________________
+
 //  OWriteToolBoxDocumentHandler
-//_________________________________________________________________________________________________________________
+
 
 OWriteToolBoxDocumentHandler::OWriteToolBoxDocumentHandler(
     const Reference< XIndexAccess >& rItemAccess,
@@ -761,9 +761,9 @@ void OWriteToolBoxDocumentHandler::WriteToolBoxDocument() throw
     m_xWriteDocumentHandler->endDocument();
 }
 
-//_________________________________________________________________________________________________________________
+
 //  protected member functions
-//_________________________________________________________________________________________________________________
+
 
 void OWriteToolBoxDocumentHandler::WriteToolBoxItem(
     const OUString& rCommandURL,
diff --git a/framework/source/fwi/classes/converter.cxx b/framework/source/fwi/classes/converter.cxx
index 87c682a1ddf6..ff3560425f43 100644
--- a/framework/source/fwi/classes/converter.cxx
+++ b/framework/source/fwi/classes/converter.cxx
@@ -22,7 +22,7 @@
 
 namespace framework{
 
-//-----------------------------------------------------------------------------
+
 /**
  * converts a sequence of PropertyValue to a sequence of NamedValue.
  */
@@ -38,7 +38,7 @@ css::uno::Sequence< css::beans::NamedValue > Converter::convert_seqPropVal2seqNa
     return lDestination;
 }
 
-//-----------------------------------------------------------------------------
+
 /**
  * converts a sequence of unicode strings into a vector of such items
  */
diff --git a/framework/source/fwi/classes/propertysethelper.cxx b/framework/source/fwi/classes/propertysethelper.cxx
index 7ef56a6490d9..c0805ffd7274 100644
--- a/framework/source/fwi/classes/propertysethelper.cxx
+++ b/framework/source/fwi/classes/propertysethelper.cxx
@@ -26,7 +26,7 @@
 namespace framework{
 
 
-//-----------------------------------------------------------------------------
+
 PropertySetHelper::PropertySetHelper(      LockHelper*                                             pExternalLock               ,
                                            TransactionManager*                                     pExternalTransactionManager ,
                                            sal_Bool                                                bReleaseLockOnCall          )
@@ -38,12 +38,12 @@ PropertySetHelper::PropertySetHelper(      LockHelper*
 {
 }
 
-//-----------------------------------------------------------------------------
+
 PropertySetHelper::~PropertySetHelper()
 {
 }
 
-//-----------------------------------------------------------------------------
+
 void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster)
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
@@ -55,7 +55,7 @@ void PropertySetHelper::impl_setPropertyChangeBroadcaster(const css::uno::Refere
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property& aProperty)
     throw(css::beans::PropertyExistException,
           css::uno::Exception               )
@@ -73,7 +73,7 @@ void SAL_CALL PropertySetHelper::impl_addPropertyInfo(const css::beans::Property
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProperty)
     throw(css::beans::UnknownPropertyException,
           css::uno::Exception                 )
@@ -91,12 +91,12 @@ void SAL_CALL PropertySetHelper::impl_removePropertyInfo(const OUString& sProper
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::impl_enablePropertySet()
 {
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::impl_disablePropertySet()
 {
     TransactionGuard aTransaction(m_rTransactionManager, E_SOFTEXCEPTIONS);
@@ -115,7 +115,7 @@ void SAL_CALL PropertySetHelper::impl_disablePropertySet()
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEvent& aEvent)
 {
     /*  Dont use the lock here!
@@ -145,7 +145,7 @@ sal_Bool PropertySetHelper::impl_existsVeto(const css::beans::PropertyChangeEven
     return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChangeEvent& aEvent)
 {
     /*  Dont use the lock here!
@@ -171,7 +171,7 @@ void PropertySetHelper::impl_notifyChangeListener(const css::beans::PropertyChan
     }
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo()
     throw(css::uno::RuntimeException)
 {
@@ -181,7 +181,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PropertySetHelper::
     return xInfo;
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
                                                   const css::uno::Any&   aValue   )
     throw(css::beans::UnknownPropertyException,
@@ -247,7 +247,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue(const OUString& sProperty,
     impl_notifyChangeListener(aEvent);
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProperty)
     throw(css::beans::UnknownPropertyException,
           css::lang::WrappedTargetException   ,
@@ -270,7 +270,7 @@ css::uno::Any SAL_CALL PropertySetHelper::getPropertyValue(const OUString& sProp
     return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString&                                            sProperty,
                                                            const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
     throw(css::beans::UnknownPropertyException,
@@ -292,7 +292,7 @@ void SAL_CALL PropertySetHelper::addPropertyChangeListener(const OUString&
     m_lSimpleChangeListener.addInterface(sProperty, xListener);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString&                                            sProperty,
                                                               const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener)
     throw(css::beans::UnknownPropertyException,
@@ -314,7 +314,7 @@ void SAL_CALL PropertySetHelper::removePropertyChangeListener(const OUString&
     m_lSimpleChangeListener.removeInterface(sProperty, xListener);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString&                                            sProperty,
                                                            const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
     throw(css::beans::UnknownPropertyException,
@@ -336,7 +336,7 @@ void SAL_CALL PropertySetHelper::addVetoableChangeListener(const OUString&
     m_lVetoChangeListener.addInterface(sProperty, xListener);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString&                                            sProperty,
                                                               const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener)
     throw(css::beans::UnknownPropertyException,
@@ -358,7 +358,7 @@ void SAL_CALL PropertySetHelper::removeVetoableChangeListener(const OUString&
     m_lVetoChangeListener.removeInterface(sProperty, xListener);
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProperties()
     throw(css::uno::RuntimeException)
 {
@@ -382,7 +382,7 @@ css::uno::Sequence< css::beans::Property > SAL_CALL PropertySetHelper::getProper
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUString& sName)
     throw(css::beans::UnknownPropertyException,
           css::uno::RuntimeException          )
@@ -400,7 +400,7 @@ css::beans::Property SAL_CALL PropertySetHelper::getPropertyByName(const OUStrin
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL PropertySetHelper::hasPropertyByName(const OUString& sName)
     throw(css::uno::RuntimeException)
 {
diff --git a/framework/source/fwi/helper/networkdomain.cxx b/framework/source/fwi/helper/networkdomain.cxx
index 3bf207806758..3dc4ee9c5737 100644
--- a/framework/source/fwi/helper/networkdomain.cxx
+++ b/framework/source/fwi/helper/networkdomain.cxx
@@ -20,9 +20,9 @@
 #include <helper/networkdomain.hxx>
 
 #ifdef WNT
-//_________________________________________________________________________________________________________________
+
 //  Windows
-//_________________________________________________________________________________________________________________
+
 
 #define UNICODE
 #if defined _MSC_VER
@@ -51,9 +51,9 @@ static OUString GetUserDomain()
         return OUString();
 }
 
-//_________________________________________________________________________________________________________________
+
 //  Windows
-//_________________________________________________________________________________________________________________
+
 
 namespace framework
 {
@@ -77,15 +77,15 @@ OUString NetworkDomain::GetNTDomainName()
 #include <errno.h>
 #include <osl/thread.h>
 
-//_________________________________________________________________________________________________________________
+
 //  Unix
-//_________________________________________________________________________________________________________________
+
 
 #if defined( SOLARIS )
 
-//_________________________________________________________________________________________________________________
+
 //  Solaris
-//_________________________________________________________________________________________________________________
+
 
 #include <sys/systeminfo.h>
 #include <sal/alloca.h>
@@ -129,9 +129,9 @@ static rtl_uString *getDomainName()
 
 #elif defined( LINUX ) /* endif SOLARIS */
 
-//_________________________________________________________________________________________________________________
+
 //  Linux
-//_________________________________________________________________________________________________________________
+
 
 #include <unistd.h>
 #include <string.h>
@@ -170,9 +170,9 @@ static rtl_uString *getDomainName()
 
 #else /* LINUX */
 
-//_________________________________________________________________________________________________________________
+
 //  Other Unix
-//_________________________________________________________________________________________________________________
+
 
 static rtl_uString *getDomainName()
 {
@@ -181,9 +181,9 @@ static rtl_uString *getDomainName()
 
 #endif
 
-//_________________________________________________________________________________________________________________
+
 //  Unix
-//_________________________________________________________________________________________________________________
+
 
 namespace framework
 {
@@ -206,9 +206,9 @@ OUString NetworkDomain::GetNTDomainName()
 
 #else /* UNIX */
 
-//_________________________________________________________________________________________________________________
+
 //  Other operating systems (non-Windows and non-Unix)
-//_________________________________________________________________________________________________________________
+
 
 namespace framework
 {
diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx
index 59372b03a8f0..ffb18b091011 100644
--- a/framework/source/fwi/jobs/configaccess.cxx
+++ b/framework/source/fwi/jobs/configaccess.cxx
@@ -56,7 +56,7 @@ ConfigAccess::ConfigAccess( /*IN*/ const css::uno::Reference< css::uno::XCompone
 {
 }
 
-//________________________________
+
 /**
     @short  last chance to close an open configuration access point
     @descr  In case our user forgot to close this configuration point
@@ -68,7 +68,7 @@ ConfigAccess::~ConfigAccess()
     close();
 }
 
-//________________________________
+
 /**
     @short  return the internal mode of this instance
     @descr  May be the outside user need any information about successfully opened
@@ -84,7 +84,7 @@ ConfigAccess::EOpenMode ConfigAccess::getMode() const
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  open the configuration access in the specified mode
     @descr  We set the opened configuration access as our member. So any following method,
@@ -153,7 +153,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  close the internal opened configuration access and flush all changes
     @descr  It checks, if the given access is valid and react in the right way.
@@ -180,7 +180,7 @@ void ConfigAccess::close()
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  provides an access to the internal wrapped configuration access
     @descr  It's not allowed to safe this c++ (!) reference outside. You have
diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx
index 9091ce27788a..1b64c385501d 100644
--- a/framework/source/fwi/uielement/rootitemcontainer.cxx
+++ b/framework/source/fwi/uielement/rootitemcontainer.cxx
@@ -116,7 +116,7 @@ Any SAL_CALL RootItemContainer::queryInterface( const Type& _rType ) throw(Runti
         aRet = OPropertySetHelper::queryInterface( _rType );
     return aRet;
 }
-//------------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL RootItemContainer::getTypes(  ) throw(RuntimeException)
 {
     return comphelper::concatSequences(
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 39894a895854..5e5d3397ffde 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -186,9 +186,9 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons
     return xComponent;
 }
 
-//_________________________________________________________________________________________________________________
+
 //  debug methods
-//_________________________________________________________________________________________________________________
+
 
 /*-----------------------------------------------------------------------------------------------------------------
     The follow methods checks the parameter for other functions. If a parameter or his value is non valid,
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 1ef375529451..80b64c6fa646 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -140,9 +140,9 @@ void OComponentEnumeration::impl_resetObject()
     m_nPosition = 0 ;
 }
 
-//_________________________________________________________________________________________________________________
+
 //  debug methods
-//_________________________________________________________________________________________________________________
+
 
 /*-----------------------------------------------------------------------------------------------------------------
     The follow methods checks the parameter for other functions. If a parameter or his value is non valid,
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 9ee7777e6614..7c60eaae9b1e 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -144,18 +144,18 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
             // All searchflags are supported by this implementation!
             // If some flags should not be supported - don't call me with this flags!!!
 
-            //_____________________________________________________________________________________________________________
+
             // Search with AUTO-flag is not supported yet!
             // We think about right implementation.
             SAL_WARN_IF( (nSearchFlags & FrameSearchFlag::AUTO), "fwk", "OFrames::queryFrames(): Search with AUTO-flag is not supported yet!" );
 
-            //_____________________________________________________________________________________________________________
+
             // Search for ALL and GLOBAL is superflous!
             // We support all necessary flags, from which these two flags are derived.
             //      ALL     = PARENT + SELF  + CHILDREN + SIBLINGS
             //      GLOBAL  = ALL    + TASKS
 
-            //_____________________________________________________________________________________________________________
+
             // Add parent to list ... if any exist!
             if( nSearchFlags & FrameSearchFlag::PARENT )
             {
@@ -168,7 +168,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
                 }
             }
 
-            //_____________________________________________________________________________________________________________
+
             // Add owner to list if SELF is searched.
             if( nSearchFlags & FrameSearchFlag::SELF )
             {
@@ -177,7 +177,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
                 impl_appendSequence( seqFrames, seqSelf );
             }
 
-            //_____________________________________________________________________________________________________________
+
             // Add SIBLINGS to list.
             if( nSearchFlags & FrameSearchFlag::SIBLINGS )
             {
@@ -197,7 +197,7 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
                 m_bRecursiveSearchProtection = sal_False;
             }
 
-            //_____________________________________________________________________________________________________________
+
             // If searched for children, step over all elements in container and collect the information.
             if ( nSearchFlags & FrameSearchFlag::CHILDREN )
             {
@@ -370,9 +370,9 @@ void OFrames::impl_appendSequence(          Sequence< css::uno::Reference< XFram
     seqDestination = seqResult;
 }
 
-//_________________________________________________________________________________________________________________
+
 //  debug methods
-//_________________________________________________________________________________________________________________
+
 
 /*-----------------------------------------------------------------------------------------------------------------
     The follow methods checks the parameter for other functions. If a parameter or his value is non valid,
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index c7f588a8b13f..b3f7fc2a4cb7 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -18,7 +18,7 @@
  */
 
 
-//_______________________________________________
+
 // include files of own module
 #include <helper/statusindicator.hxx>
 #include <threadhelp/readguard.hxx>
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 1188c2062a11..9610ba17710d 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -54,7 +54,7 @@ namespace framework{
 sal_Int32 StatusIndicatorFactory::m_nInReschedule = 0;  /// static counter for rescheduling
 const char PROGRESS_RESOURCE[] = "private:resource/progressbar/progressbar";
 
-//-----------------------------------------------
+
 StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase      (         )
     , m_xContext          (xContext )
@@ -65,13 +65,13 @@ StatusIndicatorFactory::StatusIndicatorFactory(const css::uno::Reference< css::u
 {
 }
 
-//-----------------------------------------------
+
 StatusIndicatorFactory::~StatusIndicatorFactory()
 {
     impl_stopWakeUpThread();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
@@ -111,7 +111,7 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::
     impl_createProgress();
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFactory::createStatusIndicator()
     throw(css::uno::RuntimeException)
 {
@@ -121,7 +121,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL StatusIndicatorFacto
     return xIndicator;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL StatusIndicatorFactory::update()
     throw(css::uno::RuntimeException)
 {
@@ -132,7 +132,7 @@ void SAL_CALL StatusIndicatorFactory::update()
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
                                    const OUString&                                    sText ,
                                          sal_Int32                                           nRange)
@@ -162,7 +162,7 @@ void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatus
     impl_reschedule(sal_True);
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatusIndicator >& xChild)
 {
     // SAFE -> ----------------------------------
@@ -193,7 +193,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus
     impl_reschedule(sal_True);
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIndicator >& xChild)
 {
     // SAFE -> ----------------------------------
@@ -247,7 +247,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn
     impl_reschedule(sal_True);
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
                                      const OUString&                                    sText )
 {
@@ -277,7 +277,7 @@ void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStat
     impl_reschedule(sal_True);
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XStatusIndicator >& xChild ,
                                              sal_Int32                                           nValue )
 {
@@ -310,7 +310,7 @@ void StatusIndicatorFactory::setValue( const css::uno::Reference< css::task::XSt
     impl_reschedule(sal_False);
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
 {
     // SAFE -> ----------------------------------
@@ -403,7 +403,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
 
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::impl_createProgress()
 {
     // SAFE -> ----------------------------------
@@ -453,7 +453,7 @@ void StatusIndicatorFactory::impl_createProgress()
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::impl_showProgress()
 {
     // SAFE -> ----------------------------------
@@ -498,7 +498,7 @@ void StatusIndicatorFactory::impl_showProgress()
     }
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::impl_hideProgress()
 {
     // SAFE -> ----------------------------------
@@ -524,7 +524,7 @@ void StatusIndicatorFactory::impl_hideProgress()
     }
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce)
 {
     // SAFE ->
@@ -568,7 +568,7 @@ void StatusIndicatorFactory::impl_reschedule(sal_Bool bForce)
     }
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::impl_startWakeUpThread()
 {
     // SAFE ->
@@ -586,7 +586,7 @@ void StatusIndicatorFactory::impl_startWakeUpThread()
     // <- SAFE
 }
 
-//-----------------------------------------------
+
 void StatusIndicatorFactory::impl_stopWakeUpThread()
 {
     // SAFE ->
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index ad07ad8a2b7e..4a2b2b2422f9 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -29,7 +29,7 @@
 namespace framework {
 
 
-//-----------------------------------------------
+
 VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >&               xParentWindow)
     : ThreadHelpBase     (&Application::GetSolarMutex())
     , m_xParentWindow    (xParentWindow                )
@@ -43,12 +43,12 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWin
                 static_cast< css::task::XStatusIndicator* >(this));
 }
 
-//-----------------------------------------------
+
 VCLStatusIndicator::~VCLStatusIndicator()
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
                                               sal_Int32        nRange)
     throw(css::uno::RuntimeException)
@@ -89,7 +89,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL VCLStatusIndicator::reset()
     throw(css::uno::RuntimeException)
 {
@@ -103,7 +103,7 @@ void SAL_CALL VCLStatusIndicator::reset()
     // <- SOLAR SAFE ----------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL VCLStatusIndicator::end()
     throw(css::uno::RuntimeException)
 {
@@ -130,7 +130,7 @@ void SAL_CALL VCLStatusIndicator::end()
     // <- SOLAR SAFE ----------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
     throw(css::uno::RuntimeException)
 {
@@ -149,7 +149,7 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
     // <- SOLAR SAFE ----------------------------
 }
 
-//-----------------------------------------------
+
 void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
     throw(css::uno::RuntimeException)
 {
@@ -181,7 +181,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue)
     // <- SOLAR SAFE ----------------------------
 }
 
-//-----------------------------------------------
+
 void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar   ,
                                            Window* pParentWindow)
 {
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 6cf080495a09..67977728290c 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -18,7 +18,7 @@
  */
 
 
-//_______________________________________________
+
 // include files of own module
 #include <helper/wakeupthread.hxx>
 #include <threadhelp/readguard.hxx>
diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx
index 5ee17200f6de..41da0e2ddd38 100644
--- a/framework/source/interaction/quietinteraction.cxx
+++ b/framework/source/interaction/quietinteraction.cxx
@@ -41,7 +41,7 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 
 QuietInteraction::QuietInteraction()
     : ThreadHelpBase     ( &Application::GetSolarMutex() )
@@ -49,7 +49,7 @@ QuietInteraction::QuietInteraction()
 {
 }
 
-//_________________________________________________________________________________________________________________
+
 
 void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XInteractionRequest >& xRequest ) throw( css::uno::RuntimeException )
 {
@@ -138,7 +138,7 @@ void SAL_CALL QuietInteraction::handle( const css::uno::Reference< css::task::XI
         xAbort->select();
 }
 
-//_________________________________________________________________________________________________________________
+
 
 css::uno::Any QuietInteraction::getRequest() const
 {
@@ -148,7 +148,7 @@ css::uno::Any QuietInteraction::getRequest() const
     /* } SAFE */
 }
 
-//_________________________________________________________________________________________________________________
+
 
 sal_Bool QuietInteraction::wasUsed() const
 {
diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx
index af7e5afe9646..ff915e2032aa 100644
--- a/framework/source/jobs/helponstartup.cxx
+++ b/framework/source/jobs/helponstartup.cxx
@@ -18,14 +18,14 @@
  */
 
 
-//_______________________________________________
+
 // include own header
 #include <jobs/helponstartup.hxx>
 #include <threadhelp/resetableguard.hxx>
 #include <loadenv/targethelper.hxx>
 #include <services.h>
 
-//_______________________________________________
+
 // include others
 #include <comphelper/configurationhelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -34,7 +34,7 @@
 #include <vcl/help.hxx>
 #include <rtl/ustrbuf.hxx>
 
-//_______________________________________________
+
 // include interfaces
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
@@ -99,19 +99,19 @@ DEFINE_INIT_SERVICE(HelpOnStartup,
                     }
                    )
 
-//-----------------------------------------------
+
 HelpOnStartup::HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase(     )
     , m_xContext    (xContext)
 {
 }
 
-//-----------------------------------------------
+
 HelpOnStartup::~HelpOnStartup()
 {
 }
 
-//-----------------------------------------------
+
 // css.task.XJob
 css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
     throw(css::lang::IllegalArgumentException,
@@ -159,7 +159,7 @@ css::uno::Any SAL_CALL HelpOnStartup::execute(const css::uno::Sequence< css::bea
     return css::uno::Any();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -177,7 +177,7 @@ void SAL_CALL HelpOnStartup::disposing(const css::lang::EventObject& aEvent)
     // <- SAFE
 }
 
-//-----------------------------------------------
+
 OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments)
 {
     ::comphelper::SequenceAsHashMap lArgs        (lArguments);
@@ -229,7 +229,7 @@ OUString HelpOnStartup::its_getModuleIdFromEnv(const css::uno::Sequence< css::be
     return sModuleId;
 }
 
-//-----------------------------------------------
+
 OUString HelpOnStartup::its_getCurrentHelpURL()
 {
     // SAFE ->
@@ -271,7 +271,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
     return sCurrentHelpURL;
 }
 
-//-----------------------------------------------
+
 ::sal_Bool HelpOnStartup::its_isHelpUrlADefaultOne(const OUString& sHelpURL)
 {
     if (sHelpURL.isEmpty())
@@ -318,7 +318,7 @@ OUString HelpOnStartup::its_getCurrentHelpURL()
     return sal_False;
 }
 
-//-----------------------------------------------
+
 OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule)
 {
     // SAFE ->
@@ -356,7 +356,7 @@ OUString HelpOnStartup::its_checkIfHelpEnabledAndGetURL(const OUString& sModule)
     return sHelpURL;
 }
 
-//-----------------------------------------------
+
 OUString HelpOnStartup::ist_createHelpURL(const OUString& sBaseURL,
                                                  const OUString& sLocale ,
                                                  const OUString& sSystem )
diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx
index 7e234a33e473..e89cde7fd1ea 100644
--- a/framework/source/jobs/job.cxx
+++ b/framework/source/jobs/job.cxx
@@ -36,7 +36,7 @@
 
 namespace framework{
 
-//________________________________
+
 /**
     @short      standard ctor
     @descr      It initialize this new instance. But it set some generic parameters here only.
@@ -65,7 +65,7 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont
 {
 }
 
-//________________________________
+
 /**
     @short      standard ctor
     @descr      It initialize this new instance. But it set some generic parameters here only.
@@ -94,7 +94,7 @@ Job::Job( /*IN*/ const css::uno::Reference< css::uno::XComponentContext >& xCont
 {
 }
 
-//________________________________
+
 /**
     @short  superflous!
     @descr  Releasing of memory and reference must be done inside die() call.
@@ -104,7 +104,7 @@ Job::~Job()
 {
 }
 
-//________________________________
+
 /**
     @short  set (or delete) a listener for sending dispatch result events
     @descr  Because this object is used in a wrapped mode ... the original listener
@@ -154,7 +154,7 @@ void Job::setJobData( const JobData& aData )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  runs the job
     @descr  It doesn't matter, if the job is an asynchronous or
@@ -281,7 +281,7 @@ void Job::execute( /*IN*/ const css::uno::Sequence< css::beans::NamedValue >& lD
     die();
 }
 
-//________________________________
+
 /**
     @short  kill this job
     @descr  It doesn't matter if this request is called from inside or
@@ -327,7 +327,7 @@ void Job::die()
     /* SAFE { */
 }
 
-//________________________________
+
 /**
     @short  generates list of arguments for job execute
     @descr  There exist a set of information, which can be needed by a job.
@@ -428,7 +428,7 @@ css::uno::Sequence< css::beans::NamedValue > Job::impl_generateJobArgs( /*IN*/ c
     return lAllArgs;
 }
 
-//________________________________
+
 /**
     @short  analyze the given job result and change the job configuration
     @descr  Note: Some results can be handled only, if this job has a valid configuration!
@@ -494,7 +494,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult )
     /* SAFE { */
 }
 
-//________________________________
+
 /**
     @short  starts listening for office shutdown and closing of our
             given target frame (if it's a valid reference)
@@ -574,7 +574,7 @@ void Job::impl_startListening()
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  release listener connection for office shutdown
     @descr  see description of impl_startListening()
@@ -639,7 +639,7 @@ void Job::impl_stopListening()
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  callback from any asynchronous executed job
 
@@ -683,7 +683,7 @@ void SAL_CALL Job::jobFinished( /*IN*/ const css::uno::Reference< css::task::XAs
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  prevent internal wrapped job against office termination
     @descr  This event is broadcasted by the desktop instance and ask for an office termination.
@@ -728,7 +728,7 @@ void SAL_CALL Job::queryTermination( /*IN*/ const css::lang::EventObject& ) thro
 }
 
 
-//________________________________
+
 /**
     @short  inform us about office termination
     @descr  Instead of the method queryTermination(), here is no chance to disagree with that.
@@ -748,7 +748,7 @@ void SAL_CALL Job::notifyTermination( /*IN*/ const css::lang::EventObject& ) thr
     // Do nothing else here. Our internal resources was released ...
 }
 
-//________________________________
+
 /**
     @short  prevent internal wrapped job against frame closing
     @descr  This event is broadcasted by the frame instance and ask for closing.
@@ -833,7 +833,7 @@ void SAL_CALL Job::queryClosing( const css::lang::EventObject& aEvent         ,
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  inform us about frame closing
     @descr  Instead of the method queryClosing(), here is no chance to disagree with that.
@@ -848,7 +848,7 @@ void SAL_CALL Job::notifyClosing( const css::lang::EventObject& ) throw(css::uno
     // Do nothing else here. Our internal resources was released ...
 }
 
-//________________________________
+
 /**
     @short      shouldn't be called normaly
     @descr      But it doesn't matter, who called it. We have to kill our internal
diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx
index 603f9ae341b6..37a40e232221 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -53,7 +53,7 @@ JobData::JobData( const css::uno::Reference< css::uno::XComponentContext >& rxCo
     impl_reset();
 }
 
-//________________________________
+
 /**
     @short  copy ctor
     @descr  Sometimes such job data container must be moved from one using place
@@ -69,7 +69,7 @@ JobData::JobData( const JobData& rCopy )
     *this = rCopy;
 }
 
-//________________________________
+
 /**
     @short  operator for coping JobData instances
     @descr  Sometimes such job data container must be moved from one using place
@@ -96,7 +96,7 @@ void JobData::operator=( const JobData& rCopy )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  let this instance die
     @descr  There is no chance any longer to work. We have to
@@ -107,7 +107,7 @@ JobData::~JobData()
     impl_reset();
 }
 
-//________________________________
+
 /**
     @short      initalize this instance as a job with configuration
     @descr      They given alias can be used to address some configuration data.
@@ -178,7 +178,7 @@ void JobData::setAlias( const OUString& sAlias )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      initalize this instance as a job without configuration
     @descr      This job has no configuration data. We have to forget all old information
@@ -202,7 +202,7 @@ void JobData::setService( const OUString& sService )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      initialize this instance with new job values.
     @descr      It reads automaticly all properties of the specified
@@ -238,7 +238,7 @@ void JobData::setEvent( const OUString& sEvent ,
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      set the new job specific arguments
     @descr      If a job finish his work, it can give us a new list of arguments (which
@@ -294,7 +294,7 @@ void JobData::setJobConfig( const css::uno::Sequence< css::beans::NamedValue >&
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      set a new excution result
     @descr      Every executed job can have returned a result.
@@ -323,7 +323,7 @@ void JobData::setResult( const JobResult& aResult )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  set a new environment descriptor for this job
     @descr  It must(!) be done everytime this container is initialized
@@ -339,7 +339,7 @@ void JobData::setEnvironment( EEnvironment eEnvironment )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      these functions provides access to our internal members
     @descr      These member represent any information about the job
@@ -353,7 +353,7 @@ JobData::EMode JobData::getMode() const
     /* } SAFE */
 }
 
-//________________________________
+
 
 JobData::EEnvironment JobData::getEnvironment() const
 {
@@ -363,7 +363,7 @@ JobData::EEnvironment JobData::getEnvironment() const
     /* } SAFE */
 }
 
-//________________________________
+
 
 OUString JobData::getEnvironmentDescriptor() const
 {
@@ -390,7 +390,7 @@ OUString JobData::getEnvironmentDescriptor() const
     return sDescriptor;
 }
 
-//________________________________
+
 
 OUString JobData::getService() const
 {
@@ -400,7 +400,7 @@ OUString JobData::getService() const
     /* } SAFE */
 }
 
-//________________________________
+
 
 OUString JobData::getEvent() const
 {
@@ -410,7 +410,7 @@ OUString JobData::getEvent() const
     /* } SAFE */
 }
 
-//________________________________
+
 
 css::uno::Sequence< css::beans::NamedValue > JobData::getJobConfig() const
 {
@@ -420,7 +420,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getJobConfig() const
     /* } SAFE */
 }
 
-//________________________________
+
 
 css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
 {
@@ -449,7 +449,7 @@ css::uno::Sequence< css::beans::NamedValue > JobData::getConfig() const
     return lConfig;
 }
 
-//________________________________
+
 /**
     @short  return information, if this job is part of the global configuration package
             org.openoffice.Office.Jobs
@@ -469,7 +469,7 @@ sal_Bool JobData::hasConfig() const
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      mark a job as non startable for further requests
     @descr      We don't remove the configuration entry! We set a timestamp value only.
@@ -517,7 +517,7 @@ void JobData::disableJob()
     /* } SAFE */
 }
 
-//________________________________
+
 /**
  */
 sal_Bool isEnabled( const OUString& sAdminTime ,
@@ -543,7 +543,7 @@ sal_Bool isEnabled( const OUString& sAdminTime ,
            );
 }
 
-//________________________________
+
 /**
  */
 void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >&              rxContext,
@@ -561,7 +561,7 @@ void JobData::appendEnabledJobsForEvent( const css::uno::Reference< css::uno::XC
     }
 }
 
-//________________________________
+
 /**
  */
 sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const
@@ -585,7 +585,7 @@ sal_Bool JobData::hasCorrectContext(const OUString& rModuleIdent) const
     return sal_False;
 }
 
-//________________________________
+
 /**
  */
 css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -656,7 +656,7 @@ css::uno::Sequence< OUString > JobData::getEnabledJobsForEvent( const css::uno::
     return lEnabledJobs;
 }
 
-//________________________________
+
 /**
     @short      reset all internal structures
     @descr      If someone recycles this instance, he can switch from one
diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx
index 4cda0c03b20d..03cd4a9bea40 100644
--- a/framework/source/jobs/jobdispatch.cxx
+++ b/framework/source/jobs/jobdispatch.cxx
@@ -49,7 +49,7 @@ using namespace framework;
 
 namespace {
 
-//_______________________________________
+
 /**
     @short  implements a dispatch object for jobs
     @descr  Such dispatch object will be used by the generic dispatch mechanism if
@@ -78,7 +78,7 @@ private:
     /** name of module (writer, impress etc.) the frame is for */
     OUString m_sModuleIdentifier;
 
-//___________________________________
+
 // native interface methods
 
 public:
@@ -141,7 +141,7 @@ public:
                                                     const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException);
 };
 
-//________________________________
+
 /**
     @short      standard ctor
     @descr      It initialize this new instance.
@@ -155,7 +155,7 @@ JobDispatch::JobDispatch( /*IN*/ const css::uno::Reference< css::uno::XComponent
 {
 }
 
-//________________________________
+
 /**
     @short  let this instance die
     @descr  We have to release all used resources and free used memory.
@@ -167,7 +167,7 @@ JobDispatch::~JobDispatch()
     m_xFrame.clear();
 }
 
-//________________________________
+
 /**
     @short  implementation of XInitalization
     @descr  A protocol handler can provide this functionality, if it wish to get additional information
@@ -204,7 +204,7 @@ void SAL_CALL JobDispatch::initialize( const css::uno::Sequence< css::uno::Any >
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short  implementation of XDispatchProvider::queryDispatches()
     @descr  Every protocol handler will be asked for his agreement, if an URL was queried
@@ -235,7 +235,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL JobDispatch::queryDispatch
     return xDispatch;
 }
 
-//________________________________
+
 /**
     @short  implementation of XDispatchProvider::queryDispatches()
     @descr  It's an optimized access for remote, so you can ask for
@@ -261,7 +261,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL JobD
     return lDispatches;
 }
 
-//________________________________
+
 /**
     @short  implementation of XNotifyingDispatch::dispatchWithNotification()
     @descr  It creates the job service implementation and call execute on it.
@@ -305,7 +305,7 @@ void SAL_CALL JobDispatch::dispatchWithNotification( /*IN*/ const css::util::URL
     }
 }
 
-//________________________________
+
 /**
     @short  dispatch an event
     @descr  We search all registered jobs for this event and execute it.
@@ -388,7 +388,7 @@ void JobDispatch::impl_dispatchEvent( /*IN*/ const OUString&
     }
 }
 
-//________________________________
+
 /**
     @short  dispatch a service
     @descr  We use the given name only to create and if possible to initialize
@@ -440,7 +440,7 @@ void JobDispatch::impl_dispatchService( /*IN*/ const OUString&
     pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs));
 }
 
-//________________________________
+
 /**
     @short  dispatch an alias
     @descr  We use this alias to locate a job inside the configuration
@@ -491,7 +491,7 @@ void JobDispatch::impl_dispatchAlias( /*IN*/ const OUString&
     pJob->execute(Converter::convert_seqPropVal2seqNamedVal(lArgs));
 }
 
-//________________________________
+
 /**
     @short  implementation of XDispatch::dispatch()
     @descr  Because the methods dispatch() and dispatchWithNotification() are different in her parameters
@@ -511,7 +511,7 @@ void SAL_CALL JobDispatch::dispatch( /*IN*/ const css::util::URL&
     dispatchWithNotification(aURL, lArgs, css::uno::Reference< css::frame::XDispatchResultListener >());
 }
 
-//________________________________
+
 /**
     @short  not supported
 */
@@ -520,7 +520,7 @@ void SAL_CALL JobDispatch::addStatusListener( /*IN*/ const css::uno::Reference<
 {
 }
 
-//________________________________
+
 /**
     @short  not supported
 */
diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx
index c595f5cd1c64..98ac5ae6163d 100644
--- a/framework/source/jobs/jobexecutor.cxx
+++ b/framework/source/jobs/jobexecutor.cxx
@@ -188,7 +188,7 @@ void JobExecutor::disposing() {
     }
 }
 
-//________________________________
+
 
 /**
     @short  implementation of XJobExecutor interface
@@ -246,7 +246,7 @@ void SAL_CALL JobExecutor::trigger( const OUString& sEvent ) throw(css::uno::Run
     }
 }
 
-//________________________________
+
 
 void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent ) throw(css::uno::RuntimeException)
 {
@@ -335,7 +335,7 @@ void SAL_CALL JobExecutor::notifyEvent( const css::document::EventObject& aEvent
     }
 }
 
-//________________________________
+
 
 void SAL_CALL JobExecutor::elementInserted( const css::container::ContainerEvent& aEvent ) throw(css::uno::RuntimeException)
 {
@@ -372,7 +372,7 @@ void SAL_CALL JobExecutor::elementReplaced( const css::container::ContainerEvent
     // I'm not interested on changed items :-)
 }
 
-//________________________________
+
 
 /** @short  the used cfg changes notifier wish to be released in its reference.
 
diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx
index f0336dfd969a..703cbc538d90 100644
--- a/framework/source/jobs/jobresult.cxx
+++ b/framework/source/jobs/jobresult.cxx
@@ -44,7 +44,7 @@ JobResult::JobResult()
     m_eParts = E_NOPART;
 }
 
-//________________________________
+
 /**
     @short      special ctor
     @descr      It initialize this new instance with a pure job execution result
@@ -129,7 +129,7 @@ JobResult::JobResult( /*IN*/ const css::uno::Any& aResult )
     }
 }
 
-//________________________________
+
 /**
     @short      copy dtor
     @descr      -
@@ -144,7 +144,7 @@ JobResult::JobResult( const JobResult& rCopy )
     m_aDispatchResult = rCopy.m_aDispatchResult ;
 }
 
-//________________________________
+
 /**
     @short      standard dtor
     @descr      Free all internally used resources at the end of living.
@@ -154,7 +154,7 @@ JobResult::~JobResult()
     // Nothing really to do here.
 }
 
-//________________________________
+
 /**
     @short      =operator
     @descr      Must be implemented to overwrite this instance with another one.
@@ -175,7 +175,7 @@ void JobResult::operator=( const JobResult& rCopy )
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      checks for existing parts of the analyzed result
     @descr      The internal flag mask was set after analyzing of the pure result.
@@ -196,7 +196,7 @@ sal_Bool JobResult::existPart( sal_uInt32 eParts ) const
     /* } SAFE */
 }
 
-//________________________________
+
 /**
     @short      provides access to our internal members
     @descr      The return value will be valid only in case a call of
@@ -213,7 +213,7 @@ css::uno::Sequence< css::beans::NamedValue > JobResult::getArguments() const
     /* } SAFE */
 }
 
-//________________________________
+
 
 css::frame::DispatchResultEvent JobResult::getDispatchResult() const
 {
diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx
index 71e7f51b6fab..bfcc75b944e1 100644
--- a/framework/source/jobs/joburl.cxx
+++ b/framework/source/jobs/joburl.cxx
@@ -100,7 +100,7 @@ JobURL::JobURL( /*IN*/ const OUString& sURL )
     }
 }
 
-//________________________________
+
 /**
     @short      knows, if this job URL object hold a valid URL inside
 
@@ -113,7 +113,7 @@ sal_Bool JobURL::isValid() const
     return (m_eRequest!=E_UNKNOWN);
 }
 
-//________________________________
+
 /**
     @short      get the event item of this job URL
     @descr      Because the three possible parts of such URL (event, alias, service)
@@ -146,7 +146,7 @@ sal_Bool JobURL::getEvent( /*OUT*/ OUString& sEvent ) const
     return bSet;
 }
 
-//________________________________
+
 /**
     @short      get the alias item of this job URL
     @descr      Because the three possible parts of such URL (event, alias, service)
@@ -179,7 +179,7 @@ sal_Bool JobURL::getAlias( /*OUT*/ OUString& sAlias ) const
     return bSet;
 }
 
-//________________________________
+
 /**
     @short      get the service item of this job URL
     @descr      Because the three possible parts of such URL (event, service, service)
@@ -212,7 +212,7 @@ sal_Bool JobURL::getService( /*OUT*/ OUString& sService ) const
     return bSet;
 }
 
-//________________________________
+
 /**
     @short      searches for a special identifier in the given string and split it
     @descr      If the given identifier could be found at the beginning of the given string,
@@ -274,7 +274,7 @@ sal_Bool JobURL::implst_split( /*IN*/  const OUString& sPart           ,
     return bPartFound;
 }
 
-//________________________________
+
 /**
     @short      special debug method
     @descr      It's the entry point method to start a self component check for this class.
@@ -324,7 +324,7 @@ void JobURL::impldbg_checkIt()
     JobURL::impldbg_checkURL("vnd.sun.star.job:service=css.myService?serviceArg1;alias=myAlias?aliasArg=564", E_EVENT | E_ALIAS, ""         , "myAlias", "css.myService", NULL                              , "aliasArg=564"       , "serviceArg1" );
 }
 
-//________________________________
+
 /**
     @short      helper debug method
     @descr      It uses the given parameter to create a new instance of a JobURL.
@@ -528,7 +528,7 @@ void JobURL::impldbg_checkURL( /*IN*/ const sal_Char*  pURL                 ,
     SAL_INFO("fwk.joburl", OUString(sMsg));
 }
 
-//________________________________
+
 /**
     @short      helper debug method
     @descr      It returns a representation of the internal object state
@@ -565,7 +565,7 @@ OUString JobURL::impldbg_toString() const
     return sBuffer.makeStringAndClear();
 }
 
-//________________________________
+
 
 sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const
 {
@@ -583,7 +583,7 @@ sal_Bool JobURL::getServiceArgs( /*OUT*/ OUString& sServiceArgs ) const
     return bSet;
 }
 
-//________________________________
+
 
 sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const
 {
@@ -601,7 +601,7 @@ sal_Bool JobURL::getEventArgs( /*OUT*/ OUString& sEventArgs ) const
     return bSet;
 }
 
-//________________________________
+
 
 sal_Bool JobURL::getAliasArgs( /*OUT*/ OUString& sAliasArgs ) const
 {
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 94647185454d..508ad1680628 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -18,7 +18,7 @@
  */
 
 
-//_______________________________________________
+
 // include own header
 
 #include <jobs/shelljob.hxx>
@@ -26,7 +26,7 @@
 #include <threadhelp/readguard.hxx>
 #include <services.h>
 
-//_______________________________________________
+
 // include others
 
 #include <osl/file.hxx>
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
-//_______________________________________________
+
 // include interfaces
 
 #include <com/sun/star/util/PathSubstitution.hpp>
@@ -61,7 +61,7 @@ static const OUString PROP_DEACTIVATEJOBIFDONE("DeactivateJobIfDone");
 /** address job configuration property "CheckExitCode". */
 static const OUString PROP_CHECKEXITCODE("CheckExitCode");
 
-//-----------------------------------------------
+
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(ShellJob                   ,
                                    ::cppu::OWeakObject        ,
@@ -78,19 +78,19 @@ DEFINE_INIT_SERVICE(ShellJob,
                     }
                    )
 
-//-----------------------------------------------
+
 ShellJob::ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase(     )
     , m_xContext    (xContext)
 {
 }
 
-//-----------------------------------------------
+
 ShellJob::~ShellJob()
 {
 }
 
-//-----------------------------------------------
+
 css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::NamedValue >& lJobArguments)
     throw(css::lang::IllegalArgumentException,
           css::uno::Exception                ,
@@ -128,7 +128,7 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N
     return css::uno::Any();
 }
 
-//-----------------------------------------------
+
 css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
 {
     css::uno::Sequence< css::beans::NamedValue > aAnswer(1);
@@ -138,7 +138,7 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation()
     return css::uno::makeAny(aAnswer);
 }
 
-//-----------------------------------------------
+
 OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand)
 {
     // SYNCHRONIZED ->
@@ -161,7 +161,7 @@ OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand)
     return OUString();
 }
 
-//-----------------------------------------------
+
 ::sal_Bool ShellJob::impl_execute(const OUString&                       sCommand      ,
                                   const css::uno::Sequence< OUString >& lArguments    ,
                                         ::sal_Bool                             bCheckExitCode)
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 81fd7dd51548..17160890e46a 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -1219,9 +1219,9 @@ throw (RuntimeException)
     implts_reset( sal_True );
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // XMenuBarMergingAcceptor
-//---------------------------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL LayoutManager::setMergedMenuBar(
     const Reference< XIndexAccess >& xMergedMenuBar )
 throw (uno::RuntimeException)
@@ -2289,9 +2289,9 @@ throw (RuntimeException)
     implts_doLayout_notify( sal_True );
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  ILayoutNotifications
-//---------------------------------------------------------------------------------------------------------
+
 void LayoutManager::requestLayout( Hint eHint )
 {
     if ( eHint == HINT_TOOLBARSPACE_HAS_CHANGED )
@@ -2540,9 +2540,9 @@ void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rB
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //      XMenuCloser
-//---------------------------------------------------------------------------------------------------------
+
 void LayoutManager::implts_updateMenuBarClose()
 {
     WriteGuard aWriteLock( m_aLock );
@@ -2626,9 +2626,9 @@ IMPL_LINK_NOARG(LayoutManager, SettingsChanged)
     return 1;
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XLayoutManagerEventBroadcaster
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL LayoutManager::addLayoutManagerEventListener( const uno::Reference< frame::XLayoutManagerListener >& xListener )
 throw (uno::RuntimeException)
 {
@@ -2662,9 +2662,9 @@ void LayoutManager::implts_notifyListeners( short nEvent, uno::Any aInfoParam )
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //      XWindowListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL LayoutManager::windowResized( const awt::WindowEvent& aEvent )
 throw( uno::RuntimeException )
 {
@@ -2780,9 +2780,9 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl)
     return 0;
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //      XFrameActionListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL LayoutManager::frameAction( const FrameActionEvent& aEvent )
 throw ( RuntimeException )
 {
@@ -3110,9 +3110,9 @@ void SAL_CALL LayoutManager::elementReplaced( const ui::ConfigurationEvent& Even
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //      OPropertySetHelper
-//---------------------------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL LayoutManager::convertFastPropertyValue( Any&       aConvertedValue,
                                                            Any&       aOldValue,
                                                            sal_Int32  nHandle,
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index cb3c844f28c3..e495407495b1 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -82,9 +82,9 @@ ToolbarLayoutManager::~ToolbarLayoutManager()
     delete m_pAddonOptions;
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XInterface
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL ToolbarLayoutManager::acquire() throw()
 {
     OWeakObject::acquire();
@@ -1566,9 +1566,9 @@ void ToolbarLayoutManager::implts_destroyDockingAreaWindows()
     xBottomDockingWindow->dispose();
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // persistence methods
-//---------------------------------------------------------------------------------------------------------
+
 
 sal_Bool ToolbarLayoutManager::implts_readWindowStateData( const OUString& aName, UIElement& rElementData )
 {
@@ -3215,9 +3215,9 @@ void ToolbarLayoutManager::implts_renumberRowColumnData(
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XWindowListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL ToolbarLayoutManager::windowResized( const awt::WindowEvent& aEvent )
 throw( uno::RuntimeException )
 {
@@ -3283,9 +3283,9 @@ throw( uno::RuntimeException )
 {
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XDockableWindowListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL ToolbarLayoutManager::startDocking( const awt::DockingEvent& e )
 throw (uno::RuntimeException)
 {
@@ -3840,9 +3840,9 @@ throw (uno::RuntimeException)
 {
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XUIConfigurationListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL ToolbarLayoutManager::elementInserted( const ui::ConfigurationEvent& rEvent )
 throw (uno::RuntimeException)
 {
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index e22d65da3668..5085f37874a1 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -106,14 +106,14 @@ class LoadEnvListener : private ThreadHelpBase
 
     public:
 
-        //_______________________________________
+
         LoadEnvListener(LoadEnv* pLoadEnv)
             : m_bWaitingResult(true)
             , m_pLoadEnv(pLoadEnv)
         {
         }
 
-        //_______________________________________
+
         // frame.XLoadEventListener
         virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
             throw(css::uno::RuntimeException);
@@ -121,12 +121,12 @@ class LoadEnvListener : private ThreadHelpBase
         virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
             throw(css::uno::RuntimeException);
 
-        //_______________________________________
+
         // frame.XDispatchResultListener
         virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
             throw(css::uno::RuntimeException);
 
-        //_______________________________________
+
         // lang.XEventListener
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException);
@@ -208,7 +208,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
     return xComponent;
 }
 
-//-----------------------------------------------
+
 utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor)
 {
     utl::MediaDescriptor lDescriptor(lOutsideDescriptor);
@@ -568,7 +568,7 @@ void LoadEnv::impl_setResult(sal_Bool bResult)
 LoadEnv::EContentType LoadEnv::classifyContent(const OUString&                                 sURL            ,
                                                const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor)
 {
-    //-------------------------------------------
+
     // (i) Filter some special well known URL protocols,
     //     which can not be handled or loaded in general.
     //     Of course an empty URL must be ignored here too.
@@ -591,7 +591,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
         return E_UNSUPPORTED_CONTENT;
     }
 
-    //-------------------------------------------
+
     // (ii) Some special URLs indicates a given input stream,
     //      a full featured document model directly or
     //      specify a request for opening an empty document.
@@ -654,7 +654,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
     css::uno::Sequence< OUString >                  lTypesReg(1);
 
 
-    //-------------------------------------------
+
     // (iii) If a FrameLoader service (or at least
     //      a Filter) can be found, which supports
     //      this URL - it must be a loadable content.
@@ -680,7 +680,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
     if (xSet->hasMoreElements())
         return E_CAN_BE_LOADED;
 
-    //-------------------------------------------
+
     // (iv) Some URL protocols are supported by special services.
     //      E.g. ContentHandler.
     //      Such contents can be handled ... but not loaded.
@@ -695,7 +695,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
     if (xSet->hasMoreElements())
         return E_CAN_BE_HANDLED;
 
-    //-------------------------------------------
+
     // (v) Last but not least the UCB is used inside office to
     //     load contents. He has a special configuration to know
     //     which URL schemata can be used inside office.
@@ -703,7 +703,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
     if (xUCB->queryContentProvider(sURL).is())
         return E_CAN_BE_LOADED;
 
-    //-------------------------------------------
+
     // (TODO) At this point, we have no idea .-)
     //        But it seems to be better, to break all
     //        further requests for this URL. Otherwise
@@ -975,7 +975,7 @@ sal_Bool LoadEnv::impl_handleContent()
     return sal_False;
 }
 
-//-----------------------------------------------
+
 sal_Bool LoadEnv::impl_furtherDocsAllowed()
 {
     // SAFE ->
@@ -1056,7 +1056,7 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
     return bAllowed;
 }
 
-//-----------------------------------------------
+
 sal_Bool LoadEnv::impl_loadContent()
     throw(LoadEnvException, css::uno::RuntimeException)
 {
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index c2f9d962c5be..72e024636e11 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -52,7 +52,7 @@ DEFINE_INIT_SERVICE(
 
 #include <typelib/typedescription.h>
 
-//--------------------------------------------------------------------------------------------------
+
 void flatten_struct_members(
     ::std::vector< Any > * vec, void const * data,
     typelib_CompoundTypeDescription * pTD )
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 4c68e819e45f..9a205b1a7faf 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -49,7 +49,7 @@ DEFINE_INIT_SERVICE(
     }
 )
 
-//_____________________________________________________________________________
+
 /**
     @short  standard constructor to create instance
     @descr  Because an instance will be initialized by her interface methods
@@ -64,7 +64,7 @@ DispatchRecorderSupplier::DispatchRecorderSupplier( const css::uno::Reference< c
 {
 }
 
-//_____________________________________________________________________________
+
 /**
     @short  standard destructor
     @descr  We are a helper and not a real service. So we don't provide
@@ -76,7 +76,7 @@ DispatchRecorderSupplier::~DispatchRecorderSupplier()
     m_xDispatchRecorder = NULL;
 }
 
-//_____________________________________________________________________________
+
 /**
     @short      set a new dispatch recorder on this supplier
     @descr      Because there can exist more then one recorder implementations
@@ -101,7 +101,7 @@ void SAL_CALL DispatchRecorderSupplier::setDispatchRecorder( const css::uno::Ref
     m_xDispatchRecorder=xRecorder;
     // => SAFE
 }
-//_____________________________________________________________________________
+
 /**
     @short      provides access to the dispatch recorder of this supplier
     @descr      Such recorder can be used outside to record dispatches.
@@ -124,7 +124,7 @@ css::uno::Reference< css::frame::XDispatchRecorder > SAL_CALL DispatchRecorderSu
     // => SAFE
 }
 
-//_____________________________________________________________________________
+
 /**
     @short      execute a dispatch request and record it
     @descr      If given dispatch object provides right recording interface it
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 01519ba09fee..1e79c177b3d5 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -103,7 +103,7 @@ using namespace framework;
 
 namespace {
 
-//---------------------------------------
+
 /** @short  hold all needed information for an asynchronous dispatch alive.
 
     @descr  Because some operations are forced to be executed asynchronously
@@ -126,7 +126,7 @@ public:
 
 public:
 
-    //---------------------------------------
+
     /** @short  can be set from outside and is provided to
                 our internal started operations.
 
@@ -138,16 +138,16 @@ public:
      */
     css::uno::Reference< css::task::XStatusIndicator > m_xProgress;
 
-    //---------------------------------------
+
     /** TODO document me */
     OUString m_sSavePath;
 
-    //---------------------------------------
+
     /** @short  define the current cache entry, which should be used for current
                 backup or cleanUp operation ... which is may be done asynchronous */
     sal_Int32 m_nWorkingEntryID;
 
-    //---------------------------------------
+
     /** @short  used for asyncoperations, to prevent us from dying.
 
         @descr  If our dispatch() method was forced to start the
@@ -159,7 +159,7 @@ public:
     css::uno::Reference< css::uno::XInterface > m_xHoldRefForAsyncOpAlive;
 };
 
-//_______________________________________________
+
 /**
     implements the functionality of AutoSave and AutoRecovery
     of documents - including features of an EmergencySave in
@@ -263,13 +263,13 @@ public:
         E_USER_AUTO_SAVE            = 2048
     };
 
-    //---------------------------------------
+
     /** @short  combine different information about one office document. */
     struct TDocumentInfo
     {
         public:
 
-            //-------------------------------
+
             TDocumentInfo()
                 : DocumentState   (E_UNKNOWN)
                 , UsedForSaving   (sal_False)
@@ -278,11 +278,11 @@ public:
                 , ID              (-1       )
             {}
 
-            //-------------------------------
+
             /** @short  points to the document. */
             css::uno::Reference< css::frame::XModel > Document;
 
-            //-------------------------------
+
             /** @short  knows, if the document is really modified since the last autosave,
                         or  was postponed, because it was an active one etcpp...
 
@@ -295,14 +295,14 @@ public:
              */
             sal_Int32 DocumentState;
 
-            //-------------------------------
+
             /** Because our applications not ready for concurrent save requests at the same time,
                 we have supress our own AutoSave for the moment, a document will be already saved
                 by others.
              */
             sal_Bool UsedForSaving;
 
-            //-------------------------------
+
             /** For every user action, which modifies a document (e.g. key input) we get
                 a notification as XModifyListener. That seems to be a "performance issue" .-)
                 So we decided to listen for such modify events only for the time in which the document
@@ -310,7 +310,7 @@ public:
             */
             sal_Bool ListenForModify;
 
-            //-------------------------------
+
             /** For SessionSave we must close all open documents by ourself.
                 But because we are listen for documents events, we get some ...
                 and deregister these documents from our configuration.
@@ -319,7 +319,7 @@ public:
             */
             sal_Bool IgnoreClosing;
 
-            //-------------------------------
+
             /** TODO: document me */
             OUString OrgURL;
             OUString FactoryURL;
@@ -340,104 +340,104 @@ public:
             sal_Int32 ID;
     };
 
-    //---------------------------------------
+
     /** @short  used to know every currently open document. */
     typedef ::std::vector< TDocumentInfo > TDocumentList;
 
-//___________________________________________
+
 // member
 
 private:
 
-    //---------------------------------------
+
     /** @short  the global uno service manager.
         @descr  Must be used to create own needed services.
      */
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-    //---------------------------------------
+
     /** @short  points to the underlying recovery configuration.
         @descr  This instance does not cache - it calls directly the
                 configuration API!
       */
     css::uno::Reference< css::container::XNameAccess > m_xRecoveryCFG;
 
-    //---------------------------------------
+
     /** @short  proxy weak binding to forward Events to ourself without
                 an ownership cycle
       */
     css::uno::Reference< css::util::XChangesListener > m_xRecoveryCFGListener;
 
-    //---------------------------------------
+
     /** @short  points to the used configuration package or.openoffice.Setup
         @descr  This instance does not cache - it calls directly the
                 configuration API!
       */
     css::uno::Reference< css::container::XNameAccess > m_xModuleCFG;
 
-    //---------------------------------------
+
     /** @short  holds the global event broadcaster alive,
                 where we listen for new created documents.
       */
     css::uno::Reference< css::frame::XGlobalEventBroadcaster > m_xNewDocBroadcaster;
 
-    //---------------------------------------
+
     /** @short  proxy weak binding to forward Events to ourself without
                 an ownership cycle
       */
     css::uno::Reference< css::document::XEventListener > m_xNewDocBroadcasterListener;
 
-    //---------------------------------------
+
     /** @short  because we stop/restart listening sometimes, it's a good idea to know
                 if we already registered as listener .-)
     */
     sal_Bool m_bListenForDocEvents;
     sal_Bool m_bListenForConfigChanges;
 
-    //---------------------------------------
+
     /** @short  specify the time intervall between two save actions.
         @descr  Time is measured in [min].
      */
     sal_Int32 m_nAutoSaveTimeIntervall;
 
-    //---------------------------------------
+
     /** @short  for an asynchronous operation we must know, if there is
                 at least one running job (may be asynchronous!).
      */
     sal_Int32 m_eJob;
 
-    //---------------------------------------
+
     /** @short  the timer, which is used to be informed about the next
                 saving time ...
      */
     Timer m_aTimer;
 
-    //---------------------------------------
+
     /** @short  make our dispatch asynchronous ... if required to do so! */
     ::vcl::EventPoster m_aAsyncDispatcher;
 
-    //---------------------------------------
+
     /** @see    DispatchParams
      */
     DispatchParams m_aDispatchParams;
 
-    //---------------------------------------
+
     /** @short  indicates, which time period is currently used by the
                 internal timer.
      */
     ETimerType m_eTimerType;
 
-    //---------------------------------------
+
     /** @short  this cache is used to hold all information about
                 recovery/emergency save documents alive.
      */
     TDocumentList m_lDocCache;
 
-    //---------------------------------------
+
     // TODO document me
     sal_Int32 m_nIdPool;
 
-    //---------------------------------------
+
     /** @short  contains all status listener registered at this instance.
      */
     ListenerHash m_lListener;
@@ -465,7 +465,7 @@ private:
     sal_Int32 m_nMinSpaceDocSave;
     sal_Int32 m_nMinSpaceConfigSave;
 
-    //---------------------------------------
+
     /** @short  special debug option to make testing faster.
 
         @descr  We dont interpret the timer unit as [min] ...
@@ -476,11 +476,11 @@ private:
     sal_Bool m_dbg_bMakeItFaster;
     #endif
 
-    //---------------------------------------
+
     // HACK ... TODO
     css::uno::Reference< css::task::XStatusIndicator > m_xExternalProgress;
 
-//___________________________________________
+
 // interface
 
 public:
@@ -521,7 +521,7 @@ public:
     // XTypeProvider
     virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException);
 
-    //---------------------------------------
+
     // css.frame.XDispatch
     virtual void SAL_CALL dispatch(const css::util::URL&                                  aURL      ,
                                    const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
@@ -535,7 +535,7 @@ public:
                                                const css::util::URL&                                     aURL     )
         throw(css::uno::RuntimeException);
 
-    //---------------------------------------
+
     // css.document.XEventListener
     /** @short  informs about created/opened documents.
 
@@ -549,24 +549,24 @@ public:
     virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent)
         throw(css::uno::RuntimeException);
 
-    //---------------------------------------
+
     // css.util.XChangesListener
     virtual void SAL_CALL changesOccurred(const css::util::ChangesEvent& aEvent)
         throw(css::uno::RuntimeException);
 
-    //---------------------------------------
+
     // css.util.XModifyListener
     virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
         throw(css::uno::RuntimeException);
 
-    //---------------------------------------
+
     // css.lang.XEventListener
     virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
         throw(css::uno::RuntimeException);
 
 protected:
 
-    //---------------------------------------
+
     // OPropertySetHelper
 
     virtual sal_Bool SAL_CALL convertFastPropertyValue(      css::uno::Any& aConvertedValue,
@@ -590,7 +590,7 @@ protected:
 private:
     virtual void SAL_CALL disposing() SAL_OVERRIDE;
 
-    //---------------------------------------
+
     /** @short  open the underlying configuration.
 
         @descr  This method must be called every time
@@ -609,7 +609,7 @@ private:
       */
     css::uno::Reference< css::container::XNameAccess > implts_openConfig();
 
-    //---------------------------------------
+
     /** @short  read the underlying configuration.
 
         @descr  After that we know the initial state - means:
@@ -624,7 +624,7 @@ private:
       */
     void implts_readConfig();
 
-    //---------------------------------------
+
     /** @short  read the underlying configuration...
 
         @descr  ... but only keys related to the AutoSave mechanism.
@@ -638,22 +638,22 @@ private:
       */
     void implts_readAutoSaveConfig();
 
-    //---------------------------------------
+
     // TODO document me
     void implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo                ,
                                       sal_Bool                     bRemoveIt = sal_False);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_startListening();
     void implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_stopListening();
     void implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo);
 
-    //---------------------------------------
+
     /** @short  stops and may be(!) restarts the timer.
 
         @descr  A running timer is stopped every time here.
@@ -668,7 +668,7 @@ private:
      */
     void implts_updateTimer();
 
-    //---------------------------------------
+
     /** @short  stop the timer.
 
         @descr  Double calls will be ignored - means we do
@@ -681,21 +681,21 @@ private:
      */
     void implts_stopTimer();
 
-    //---------------------------------------
+
     /** @short  callback of our internal timer.
      */
     DECL_LINK(implts_timerExpired, void*);
 
-    //---------------------------------------
+
     /** @short  makes our dispatch() method asynchronous!
      */
     DECL_LINK(implts_asyncDispatch, void*);
 
-    //---------------------------------------
+
     /** @short  implements the dispatch real. */
     void implts_dispatch(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     /** @short  validate new detected document and add it into the internal
                 document list.
 
@@ -711,7 +711,7 @@ private:
      */
     void implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument);
 
-    //---------------------------------------
+
     /** @short  remove the specified document from our internal document list.
 
         @param  xDocument
@@ -728,24 +728,24 @@ private:
     void implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument                ,
                                          sal_Bool                                   bStopListening = sal_True);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument      ,
                                                        sal_Bool                                   bSaveInProgress);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument);
 
-    //---------------------------------------
+
     /** @short  search a document inside given list.
 
         @param  rList
@@ -764,12 +764,12 @@ private:
     static TDocumentList::iterator impl_searchDocument(      AutoRecovery::TDocumentList&               rList    ,
                                                        const css::uno::Reference< css::frame::XModel >& xDocument);
 
-    //---------------------------------------
+
     /** TODO document me */
     void implts_changeAllDocVisibility(sal_Bool bVisible);
     void implts_prepareSessionShutdown();
 
-    //---------------------------------------
+
     /** @short  save all current opened documents to a specific
                 backup directory.
 
@@ -809,7 +809,7 @@ private:
                                                    sal_Bool        bRemoveLockFiles,
                                              const DispatchParams* pParams        = 0);
 
-    //---------------------------------------
+
     /** @short  save one of the current documents to a specific
                 backup directory.
 
@@ -847,7 +847,7 @@ private:
                                  AutoRecovery::TDocumentInfo&                        rInfo            ,
                            const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress);
 
-    //---------------------------------------
+
     /** @short  recovery all documents, which was saved during
                 a crash before.
 
@@ -857,19 +857,19 @@ private:
      */
     AutoRecovery::ETimerType implts_openDocs(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_openOneDoc(const OUString&               sURL       ,
                                  utl::MediaDescriptor& lDescriptor,
                                  AutoRecovery::TDocumentInfo&   rInfo      );
 
-    //---------------------------------------
+
     // TODO document me
     void implts_generateNewTempURL(const OUString&               sBackupPath     ,
                                          utl::MediaDescriptor& rMediaDescriptor,
                                          AutoRecovery::TDocumentInfo&   rInfo           );
 
-    //---------------------------------------
+
     /** @short  notifies all interested listener about the current state
                 of the currently running operation.
 
@@ -889,7 +889,7 @@ private:
     void implts_informListener(      sal_Int32                      eJob  ,
                                const css::frame::FeatureStateEvent& aEvent);
 
-    //---------------------------------------
+
     /** short   create a feature event struct, which can be send
                 to any interested listener.
 
@@ -932,16 +932,16 @@ private:
         }
     };
 
-    //---------------------------------------
+
 
     // TODO document me
     void implts_resetHandleStates(sal_Bool bLoadCache);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo);
 
@@ -955,39 +955,39 @@ private:
     */
     void implts_persistAllActiveViewNames();
 
-    //---------------------------------------
+
     // TODO document me
     void implts_prepareEmergencySave();
 
-    //---------------------------------------
+
     // TODO document me
     void implts_doEmergencySave(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_doRecovery(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_doSessionSave(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_doSessionQuietQuit(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_doSessionRestore(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_backupWorkingEntry(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     // TODO document me
     void implts_cleanUpWorkingEntry(const DispatchParams& aParams);
 
-    //---------------------------------------
+
     /** try to make sure that all changed config items (not our used
         config access only) will be flushed back to disc.
 
@@ -998,13 +998,13 @@ private:
      */
     void impl_flushALLConfigChanges();
 
-    //---------------------------------------
+
     // TODO document me
     AutoRecovery::EFailureSafeResult implts_copyFile(const OUString& sSource    ,
                                                      const OUString& sTargetPath,
                                                      const OUString& sTargetName);
 
-    //---------------------------------------
+
     /** @short  converts m_eJob into a job description, which
                 can be used to inform an outside listener
                 about the current running operation
@@ -1019,7 +1019,7 @@ private:
      */
     static OUString implst_getJobDescription(sal_Int32 eJob);
 
-    //---------------------------------------
+
     /** @short  mape the given URL to an internal int representation.
 
         @param  aURL
@@ -1041,7 +1041,7 @@ private:
     /// TODO document me
     static void impl_showFullDiscError();
 
-    //---------------------------------------
+
     /** @short  try to create/use a progress and set it inside the
                 environment.
 
@@ -1073,7 +1073,7 @@ private:
                                    utl::MediaDescriptor&             rArgs    ,
                              const css::uno::Reference< css::frame::XFrame >& xNewFrame);
 
-    //---------------------------------------
+
     /** try to remove the specified file from disc.
 
         Every URL supported by our UCB component can be used here.
@@ -1091,7 +1091,7 @@ private:
      */
     void st_impl_removeFile(const OUString& sURL);
 
-    //---------------------------------------
+
     /** try to remove ".lock" file from disc if office will be terminated
         not using the offical way .-)
 
@@ -1102,7 +1102,7 @@ private:
 };
 
 
-//-----------------------------------------------
+
 // recovery.xcu
 static const char CFG_PACKAGE_RECOVERY[] = "org.openoffice.Office.Recovery/";
 static const char CFG_ENTRY_RECOVERYLIST[] = "RecoveryList";
@@ -1205,7 +1205,7 @@ static const sal_Int32       GIVE_UP_RETRY                          =   1; // in
 // force "return sal_False" for the method impl_enoughDiscSpace().
 // #define SIMULATE_FULL_DISC
 
-//-----------------------------------------------
+
 class CacheLockGuard
 {
     private:
@@ -1236,7 +1236,7 @@ class CacheLockGuard
         void unlock();
 };
 
-//-----------------------------------------------
+
 CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner                      ,
                                osl::Mutex&   rMutex                      ,
                                sal_Int32&    rCacheLock                  ,
@@ -1249,14 +1249,14 @@ CacheLockGuard::CacheLockGuard(AutoRecovery* pOwner                      ,
     lock(bLockForAddRemoveVectorItems);
 }
 
-//-----------------------------------------------
+
 CacheLockGuard::~CacheLockGuard()
 {
     unlock();
     m_xOwner.clear();
 }
 
-//-----------------------------------------------
+
 void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
 {
     /* SAFE */ {
@@ -1291,7 +1291,7 @@ void CacheLockGuard::lock(sal_Bool bLockForAddRemoveVectorItems)
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void CacheLockGuard::unlock()
 {
     /* SAFE */ {
@@ -1313,13 +1313,13 @@ void CacheLockGuard::unlock()
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 DispatchParams::DispatchParams()
     : m_nWorkingEntryID(-1)
 {
 };
 
-//-----------------------------------------------
+
 DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap&             lArgs ,
                                const css::uno::Reference< css::uno::XInterface >& xOwner)
 {
@@ -1329,7 +1329,7 @@ DispatchParams::DispatchParams(const ::comphelper::SequenceAsHashMap&
     m_xHoldRefForAsyncOpAlive = xOwner;
 };
 
-//-----------------------------------------------
+
 DispatchParams::DispatchParams(const DispatchParams& rCopy)
 {
     m_xProgress               = rCopy.m_xProgress;
@@ -1338,11 +1338,11 @@ DispatchParams::DispatchParams(const DispatchParams& rCopy)
     m_xHoldRefForAsyncOpAlive = rCopy.m_xHoldRefForAsyncOpAlive;
 };
 
-//-----------------------------------------------
+
 DispatchParams::~DispatchParams()
 {};
 
-//-----------------------------------------------
+
 DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy)
 {
     m_xProgress               = rCopy.m_xProgress;
@@ -1352,7 +1352,7 @@ DispatchParams& DispatchParams::operator=(const DispatchParams& rCopy)
     return *this;
 }
 
-//-----------------------------------------------
+
 void DispatchParams::forget()
 {
     m_sSavePath       = "";
@@ -1361,7 +1361,7 @@ void DispatchParams::forget()
     m_xHoldRefForAsyncOpAlive.clear();
 };
 
-//-----------------------------------------------
+
 AutoRecovery::AutoRecovery(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : AutoRecovery_BASE         (*static_cast<Mutex *>(this))
     , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper)
@@ -1396,7 +1396,7 @@ void AutoRecovery::initListeners()
     m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired));
 }
 
-//-----------------------------------------------
+
 AutoRecovery::~AutoRecovery()
 {
     disposing();
@@ -1423,7 +1423,7 @@ Sequence< css::uno::Type > SAL_CALL AutoRecovery::getTypes(  ) throw(css::uno::R
     );
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::dispatch(const css::util::URL&                                  aURL      ,
                                      const css::uno::Sequence< css::beans::PropertyValue >& lArguments)
     throw(css::uno::RuntimeException)
@@ -1520,7 +1520,7 @@ void AutoRecovery::ListenerInformer::stop()
     m_bStopped = true;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
 {
     sal_Int32 eJob;
@@ -1658,7 +1658,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams)
         implts_startListening();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
                                               const css::util::URL&                                     aURL     )
     throw(css::uno::RuntimeException)
@@ -1692,7 +1692,7 @@ void SAL_CALL AutoRecovery::addStatusListener(const css::uno::Reference< css::fr
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css::frame::XStatusListener >& xListener,
                                                  const css::util::URL&                                     aURL     )
     throw(css::uno::RuntimeException)
@@ -1703,7 +1703,7 @@ void SAL_CALL AutoRecovery::removeStatusListener(const css::uno::Reference< css:
     m_lListener.removeInterface(aURL.Complete, xListener);
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -1772,7 +1772,7 @@ void SAL_CALL AutoRecovery::notifyEvent(const css::document::EventObject& aEvent
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -1826,7 +1826,7 @@ void SAL_CALL AutoRecovery::changesOccurred(const css::util::ChangesEvent& aEven
     implts_updateTimer();
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -1837,7 +1837,7 @@ void SAL_CALL AutoRecovery::modified(const css::lang::EventObject& aEvent)
     implts_markDocumentModifiedAgainstLastBackup(xDocument);
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
     throw(css::uno::RuntimeException)
 {
@@ -1869,7 +1869,7 @@ void SAL_CALL AutoRecovery::disposing(const css::lang::EventObject& aEvent)
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConfig()
 {
     /* SAFE */ {
@@ -1922,7 +1922,7 @@ css::uno::Reference< css::container::XNameAccess > AutoRecovery::implts_openConf
     return xCFG;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_readAutoSaveConfig()
 {
     css::uno::Reference< css::container::XHierarchicalNameAccess > xCommonRegistry(implts_openConfig(), css::uno::UNO_QUERY);
@@ -1968,7 +1968,7 @@ void AutoRecovery::implts_readAutoSaveConfig()
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_readConfig()
 {
     implts_readAutoSaveConfig();
@@ -2055,7 +2055,7 @@ void AutoRecovery::implts_readConfig()
     implts_updateTimer();
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo)
 {
     if (rInfo.AppModule.isEmpty())
@@ -2118,7 +2118,7 @@ void AutoRecovery::implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocume
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo& rInfo)
 {
     ENSURE_OR_THROW2(
@@ -2136,7 +2136,7 @@ void AutoRecovery::implts_specifyAppModuleAndFactory(AutoRecovery::TDocumentInfo
     lModuleDescription[OUString(CFG_ENTRY_PROP_FACTORYSERVICE)] >>= rInfo.FactoryService;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i_rInfo )
 {
     ENSURE_OR_THROW2( i_rInfo.Document.is(), "need at document, at the very least", *this );
@@ -2177,7 +2177,7 @@ void AutoRecovery::implts_collectActiveViewNames( AutoRecovery::TDocumentInfo& i
     ::std::copy( aViewNames.begin(), aViewNames.end(), i_rInfo.ViewNames.getArray() );
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_persistAllActiveViewNames()
 {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -2193,7 +2193,7 @@ void AutoRecovery::implts_persistAllActiveViewNames()
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rInfo, sal_Bool bRemoveIt)
 {
     css::uno::Reference< css::container::XHierarchicalNameAccess > xCFG;
@@ -2299,7 +2299,7 @@ void AutoRecovery::implts_flushConfigItem(const AutoRecovery::TDocumentInfo& rIn
     while(nRetry>0);
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_startListening()
 {
     css::uno::Reference< css::util::XChangesNotifier > xCFG;
@@ -2345,7 +2345,7 @@ void AutoRecovery::implts_startListening()
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_stopListening()
 {
     css::uno::Reference< css::util::XChangesNotifier > xCFG;
@@ -2378,7 +2378,7 @@ void AutoRecovery::implts_stopListening()
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo)
 {
     if (rInfo.ListenForModify)
@@ -2393,7 +2393,7 @@ void AutoRecovery::implts_startModifyListeningOnDoc(AutoRecovery::TDocumentInfo&
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo& rInfo)
 {
     if (! rInfo.ListenForModify)
@@ -2408,7 +2408,7 @@ void AutoRecovery::implts_stopModifyListeningOnDoc(AutoRecovery::TDocumentInfo&
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_updateTimer()
 {
     implts_stopTimer();
@@ -2448,7 +2448,7 @@ void AutoRecovery::implts_updateTimer()
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_stopTimer()
 {
     osl::MutexGuard g(cppu::WeakComponentImplHelperBase::rBHelper.rMutex);
@@ -2458,7 +2458,7 @@ void AutoRecovery::implts_stopTimer()
     m_aTimer.Stop();
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
 {
     try
@@ -2555,7 +2555,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired)
     return 0;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch)
 {
     DispatchParams aParams;
@@ -2576,7 +2576,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_asyncDispatch)
     return 0;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame::XModel >& xDocument)
 {
     // ignore corrupted events, where no document is given ... Runtime Error ?!
@@ -2699,7 +2699,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
     aCacheLock.unlock();
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::frame::XModel >& xDocument     ,
                                                    sal_Bool                                   bStopListening)
 {
@@ -2747,7 +2747,7 @@ void AutoRecovery::implts_deregisterDocument(const css::uno::Reference< css::fra
     implts_flushConfigItem(aInfo, sal_True); // sal_True => remove it from config
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::Reference< css::frame::XModel >& xDocument)
 {
     CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
@@ -2769,7 +2769,7 @@ void AutoRecovery::implts_markDocumentModifiedAgainstLastBackup(const css::uno::
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::frame::XModel >& xDocument)
 {
     CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
@@ -2800,7 +2800,7 @@ void AutoRecovery::implts_updateModifiedState(const css::uno::Reference< css::fr
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Reference< css::frame::XModel >& xDocument      ,
                                                                  sal_Bool                                   bSaveInProgress)
 {
@@ -2818,7 +2818,7 @@ void AutoRecovery::implts_updateDocumentUsedForSavingState(const css::uno::Refer
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::frame::XModel >& xDocument)
 {
     CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
@@ -2869,7 +2869,7 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr
     AutoRecovery::st_impl_removeFile(sRemoveURL2);
 }
 
-//-----------------------------------------------
+
 AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument(      AutoRecovery::TDocumentList&               rList    ,
                                                                         const css::uno::Reference< css::frame::XModel >& xDocument)
 {
@@ -2885,7 +2885,7 @@ AutoRecovery::TDocumentList::iterator AutoRecovery::impl_searchDocument(      Au
     return pIt;
 }
 
-//-----------------------------------------------
+
 namespace
 {
     void lcl_changeVisibility( const css::uno::Reference< css::frame::XFramesSupplier >& i_rFrames, sal_Bool i_bVisible )
@@ -2912,14 +2912,14 @@ namespace
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_changeAllDocVisibility(sal_Bool bVisible)
 {
     css::uno::Reference< css::frame::XFramesSupplier > xDesktop( css::frame::Desktop::create(m_xContext), css::uno::UNO_QUERY);
     lcl_changeVisibility( xDesktop, bVisible );
 }
 
-//-----------------------------------------------
+
 /* Currently the document is not closed in case of crash,
    so the lock file must be removed explicitly
 */
@@ -2948,7 +2948,7 @@ void lc_removeLockFile(AutoRecovery::TDocumentInfo& rInfo)
 }
 
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_prepareSessionShutdown()
 {
     SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_prepareSessionShutdown() starts ...");
@@ -3013,7 +3013,7 @@ void AutoRecovery::implts_prepareSessionShutdown()
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 /* TODO WORKAROUND:
 
         #i64599#
@@ -3041,7 +3041,7 @@ sal_Bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo)
     return bNoAutoSave;
 }
 
-//-----------------------------------------------
+
 AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAllowUserIdleLoop,
                                                              sal_Bool        bRemoveLockFiles,
                                                        const DispatchParams* pParams           )
@@ -3214,7 +3214,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_saveDocs(      sal_Bool        bAl
     return eTimer;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_saveOneDoc(const OUString&                                    sBackupPath      ,
                                            AutoRecovery::TDocumentInfo&                        rInfo            ,
                                      const css::uno::Reference< css::task::XStatusIndicator >& xExternalProgress)
@@ -3345,7 +3345,7 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
     AutoRecovery::st_impl_removeFile(sRemoveFile);
 }
 
-//-----------------------------------------------
+
 AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aParams)
 {
     AutoRecovery::ETimerType eTimer = AutoRecovery::E_DONT_START_TIMER;
@@ -3540,7 +3540,7 @@ AutoRecovery::ETimerType AutoRecovery::implts_openDocs(const DispatchParams& aPa
     return eTimer;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
                                            utl::MediaDescriptor& lDescriptor,
                                            AutoRecovery::TDocumentInfo&   rInfo      )
@@ -3660,7 +3660,7 @@ void AutoRecovery::implts_openOneDoc(const OUString&               sURL       ,
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_generateNewTempURL(const OUString&               sBackupPath     ,
                                                    utl::MediaDescriptor& /*rMediaDescriptor*/,
                                                    AutoRecovery::TDocumentInfo&   rInfo           )
@@ -3696,7 +3696,7 @@ void AutoRecovery::implts_generateNewTempURL(const OUString&               sBack
     rInfo.NewTempURL = aTempFile.GetURL();
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_informListener(      sal_Int32                      eJob  ,
                                          const css::frame::FeatureStateEvent& aEvent)
 {
@@ -3724,7 +3724,7 @@ void AutoRecovery::implts_informListener(      sal_Int32                      eJ
     }
 }
 
-//-----------------------------------------------
+
 OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
 {
     // describe the current running operation
@@ -3761,7 +3761,7 @@ OUString AutoRecovery::implst_getJobDescription(sal_Int32 eJob)
     return sFeature.makeStringAndClear();
 }
 
-//-----------------------------------------------
+
 sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
 {
     if ( aURL.Protocol == CMD_PROTOCOL )
@@ -3792,7 +3792,7 @@ sal_Int32 AutoRecovery::implst_classifyJob(const css::util::URL& aURL)
     return AutoRecovery::E_NO_JOB;
 }
 
-//-----------------------------------------------
+
 css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(      sal_Int32                    eJob      ,
                                                                            const OUString&             sEventType,
                                                                                  AutoRecovery::TDocumentInfo* pInfo     )
@@ -3821,7 +3821,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent(
     return aEvent;
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/)
 {
     CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
@@ -3847,7 +3847,7 @@ void AutoRecovery::implts_resetHandleStates(sal_Bool /*bLoadCache*/)
     } /* SAFE */
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_prepareEmergencySave()
 {
     // Be sure to know all open documents really .-)
@@ -3857,7 +3857,7 @@ void AutoRecovery::implts_prepareEmergencySave()
     implts_changeAllDocVisibility(sal_False);
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
 {
     // Write a hint "we chrashed" into the configuration, so
@@ -3906,7 +3906,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams)
     AutoRecovery::st_impl_removeLockFile();
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_doRecovery(const DispatchParams& aParams)
 {
     AutoRecovery::ETimerType eSuggestedTimer = AutoRecovery::E_DONT_START_TIMER;
@@ -3933,7 +3933,7 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams)
         ::comphelper::ConfigurationHelper::E_STANDARD);
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
 {
     SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionSave()");
@@ -3972,7 +3972,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams)
     impl_flushALLConfigChanges();
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/)
 {
     SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionQuietQuit()");
@@ -4004,7 +4004,7 @@ void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/)
 }
 
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams)
 {
     SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionRestore() ...");
@@ -4039,7 +4039,7 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams)
     SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_doSessionRestore()");
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
 {
     CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE);
@@ -4076,7 +4076,7 @@ void AutoRecovery::implts_backupWorkingEntry(const DispatchParams& aParams)
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
 {
     CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_ADD_REMOVE);
@@ -4099,7 +4099,7 @@ void AutoRecovery::implts_cleanUpWorkingEntry(const DispatchParams& aParams)
     }
 }
 
-//-----------------------------------------------
+
 AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& sSource    ,
                                                                const OUString& sTargetPath,
                                                                const OUString& sTargetName)
@@ -4139,7 +4139,7 @@ AutoRecovery::EFailureSafeResult AutoRecovery::implts_copyFile(const OUString& s
     return AutoRecovery::E_COPIED;
 }
 
-//-----------------------------------------------
+
 sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue(      css::uno::Any& /*aConvertedValue*/,
                                                                css::uno::Any& /*aOldValue*/      ,
                                                                sal_Int32      /*nHandle*/        ,
@@ -4150,7 +4150,7 @@ sal_Bool SAL_CALL AutoRecovery::convertFastPropertyValue(      css::uno::Any& /*
     return sal_False;
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast(      sal_Int32      /*nHandle*/,
                                                              const css::uno::Any& /*aValue*/ )
     throw(css::uno::Exception)
@@ -4158,7 +4158,7 @@ void SAL_CALL AutoRecovery::setFastPropertyValue_NoBroadcast(      sal_Int32
     // not needed currently
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
                                                  sal_Int32      nHandle) const
 {
@@ -4205,7 +4205,7 @@ void SAL_CALL AutoRecovery::getFastPropertyValue(css::uno::Any& aValue ,
     }
 }
 
-//-----------------------------------------------
+
 const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor()
 {
     const css::beans::Property pPropertys[] =
@@ -4218,7 +4218,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto
     return lPropertyDescriptor;
 }
 
-//-----------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SAL_CALL AutoRecovery::getInfoHelper()
 {
     static ::cppu::OPropertyArrayHelper* pInfoHelper = 0;
@@ -4235,7 +4235,7 @@ const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescripto
     return (*pInfoHelper);
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPropertySetInfo()
     throw(css::uno::RuntimeException)
 {
@@ -4254,7 +4254,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL AutoRecovery::getPr
     return (*pInfo);
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()
 {
     SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList() ...");
@@ -4327,7 +4327,7 @@ void AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()
     SAL_INFO("fwk.autorecovery", "... AutoRecovery::implts_verifyCacheAgainstDesktopDocumentList()");
 }
 
-//-----------------------------------------------
+
 sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
 {
 #ifdef SIMULATE_FULL_DISC
@@ -4356,7 +4356,7 @@ sal_Bool AutoRecovery::impl_enoughDiscSpace(sal_Int32 nRequiredSpace)
 #endif // SIMULATE_FULL_DISC
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::impl_showFullDiscError()
 {
     OUString sBtn(FWK_RESSTR(STR_FULL_DISC_RETRY_BUTTON));
@@ -4376,7 +4376,7 @@ void AutoRecovery::impl_showFullDiscError()
     dlgError.Execute();
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&               rInfo    ,
                                                 utl::MediaDescriptor&             rArgs    ,
                                           const css::uno::Reference< css::frame::XFrame >& xNewFrame)
@@ -4442,7 +4442,7 @@ void AutoRecovery::impl_establishProgress(const AutoRecovery::TDocumentInfo&
     rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR(), xInternalProgress);
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo&               rInfo    ,
                                              utl::MediaDescriptor&             rArgs    ,
                                        const css::uno::Reference< css::frame::XFrame >& xNewFrame)
@@ -4477,7 +4477,7 @@ void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo&
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::impl_flushALLConfigChanges()
 {
     try
@@ -4500,7 +4500,7 @@ void AutoRecovery::impl_flushALLConfigChanges()
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::st_impl_removeFile(const OUString& sURL)
 {
     if ( sURL.isEmpty())
@@ -4516,7 +4516,7 @@ void AutoRecovery::st_impl_removeFile(const OUString& sURL)
     }
 }
 
-//-----------------------------------------------
+
 void AutoRecovery::st_impl_removeLockFile()
 {
     try
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 87fd71303de0..6ca2fb3ab3ec 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -99,14 +99,14 @@ void Desktop::constructorInit()
     OFrames* pFramesHelper = new OFrames( this, &m_aChildTaskContainer );
     m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Initialize a new dispatchhelper-object to handle dispatches.
     // We use these helper as slave for our interceptor helper ... not directly!
     // But he is event listener on THIS instance!
     DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this );
     css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism.
     // Set created dispatch provider as slowest slave of it.
     // Hold interception helper by reference only - not by pointer!
@@ -233,7 +233,7 @@ sal_Bool SAL_CALL Desktop::terminate()
 
     aReadLock.unlock(); // end synchronize
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Ask normal terminate listener. They could stop terminate without closing any open document.
     Desktop::TTerminateListenerList lCalledTerminationListener;
     ::sal_Bool                      bVeto = sal_False;
@@ -244,7 +244,7 @@ sal_Bool SAL_CALL Desktop::terminate()
         return sal_False;
     }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // try to close all open frames.
     // Allow using of any UI ... because Desktop.terminate() was designed as UI functionality in the past.
     ::sal_Bool bAllowUI      = sal_True;
@@ -255,7 +255,7 @@ sal_Bool SAL_CALL Desktop::terminate()
         return sal_False;
     }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Normal listener had no problem ...
     // all frames was closed ...
     // now it's time to ask our specialized listener.
@@ -965,13 +965,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
 {
     css::uno::Reference< css::frame::XFrame > xTarget;
 
-    //-----------------------------------------------------------------------------------------------------
+
     // 0) Ignore wrong parameter!
     //    We don't support search for following special targets.
     //    If we reject this requests - we mustnt check for such names
     //    in following code again and again. If we do not so -wrong
     //    search results can occur!
-    //-----------------------------------------------------------------------------------------------------
+
     if (
         (sTargetFrameName==SPECIALTARGET_DEFAULT  )   ||    // valid for dispatches - not for findFrame()!
         (sTargetFrameName==SPECIALTARGET_MENUBAR  )   ||    // valid for dispatches - not for findFrame()!
@@ -983,35 +983,35 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
         return NULL;
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I) check for special defined targets first which must be handled exclusive.
     //    force using of "if() else if() ..."
-    //-----------------------------------------------------------------------------------------------------
 
-    //-----------------------------------------------------------------------------------------------------
+
+
     // I.I) "_blank"
     //  create a new task as child of this desktop instance
     //  Note: Used helper TaskCreator use us automaticly ...
-    //-----------------------------------------------------------------------------------------------------
+
     if ( sTargetFrameName==SPECIALTARGET_BLANK )
     {
         TaskCreator aCreator( m_xContext );
         xTarget = aCreator.createTask(sTargetFrameName,sal_False);
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.II) "_top"
     //  We are top by definition
-    //-----------------------------------------------------------------------------------------------------
+
     else if ( sTargetFrameName==SPECIALTARGET_TOP )
     {
         xTarget = this;
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.III) "_self", ""
     //  This mean this "frame" in every case.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (
              ( sTargetFrameName==SPECIALTARGET_SELF ) ||
              ( sTargetFrameName.isEmpty()           )
@@ -1022,20 +1022,20 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
 
     else
     {
-        //-------------------------------------------------------------------------------------------------
+
         // II) otherwise use optional given search flags
         //  force using of combinations of such flags. means no "else" part of use if() statements.
         //  But we ust break further searches if target was already found.
         //  Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT
         //  TASK and CREATE are handled special.
         //  But note: Such flags are not valid for the desktop - especialy SIBLINGS or PARENT.
-        //-------------------------------------------------------------------------------------------------
 
-        //-------------------------------------------------------------------------------------------------
+
+
         // II.I) SELF
         //  Check for right name. If it's the searched one return ourself - otherwise
         //  ignore this flag.
-        //-------------------------------------------------------------------------------------------------
+
         if (
             (nSearchFlags &  css::frame::FrameSearchFlag::SELF)  &&
             (m_sName == sTargetFrameName)
@@ -1044,7 +1044,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
             xTarget = this;
         }
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.II) TASKS
         //  This is a special flag. Normaly it regulate search inside tasks and forbid access to parent trees.
         //  But the desktop exists outside such task trees. They are our sub trees. So the desktop implement
@@ -1052,7 +1052,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
         //  search on ALL child frames. May that can be useful to get access on opened document tasks
         //  only without filter out all non really required sub frames ...
         //  Used helper method on our container doesn't create any frame - it's a search only.
-        //-------------------------------------------------------------------------------------------------
+
         if (
             ( ! xTarget.is()                                  ) &&
             (nSearchFlags & css::frame::FrameSearchFlag::TASKS)
@@ -1061,13 +1061,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
             xTarget = m_aChildTaskContainer.searchOnDirectChildrens(sTargetFrameName);
         }
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.III) CHILDREN
         //  Search on all children for the given target name.
         //  An empty name value can't occur here - because it must be already handled as "_self"
         //  before. Used helper function of container doesn't create any frame.
         //  It makes a deep search only.
-        //-------------------------------------------------------------------------------------------------
+
         if (
             ( ! xTarget.is()                                     ) &&
             (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN)
@@ -1076,11 +1076,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::findFrame( const OUS
             xTarget = m_aChildTaskContainer.searchOnAllChildrens(sTargetFrameName);
         }
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.IV) CREATE
         //  If we haven't found any valid target frame by using normal flags - but user allowed us to create
         //  a new one ... we should do that. Used TaskCreator use us automaticly as parent!
-        //-------------------------------------------------------------------------------------------------
+
         if (
             ( ! xTarget.is()                                   )    &&
             (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
@@ -1366,7 +1366,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
     /* UNSAFE AREA ----------------------------------------------------------------------------------------- */
 }
 
-//-----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL Desktop::leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent )
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -1375,7 +1375,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference< css::task::XInteractio
     return m_xTitleNumberGenerator->leaseNumber (xComponent);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber )
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -1384,7 +1384,7 @@ void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber )
     m_xTitleNumberGenerator->releaseNumber (nNumber);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent )
     throw (css::lang::IllegalArgumentException,
            css::uno::RuntimeException         )
@@ -1393,7 +1393,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const css::uno::Reference< css
     m_xTitleNumberGenerator->releaseNumberForComponent (xComponent);
 }
 
-//-----------------------------------------------------------------------------
+
 OUString SAL_CALL Desktop::getUntitledPrefix()
     throw (css::uno::RuntimeException)
 {
diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx
index f3aeaf66c146..a6d51d7f3900 100644
--- a/framework/source/services/dispatchhelper.cxx
+++ b/framework/source/services/dispatchhelper.cxx
@@ -30,7 +30,7 @@
 
 namespace framework{
 
-//_______________________________________________
+
 // XInterface, XTypeProvider, XServiceInfo
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper                   ,
@@ -40,7 +40,7 @@ DEFINE_XSERVICEINFO_MULTISERVICE_2(DispatchHelper                   ,
 
 DEFINE_INIT_SERVICE( DispatchHelper, {} )
 
-//_______________________________________________
+
 
 /** ctor.
 
@@ -53,7 +53,7 @@ DispatchHelper::DispatchHelper( const css::uno::Reference< css::uno::XComponentC
 {
 }
 
-//_______________________________________________
+
 
 /** dtor.
 */
@@ -61,7 +61,7 @@ DispatchHelper::~DispatchHelper()
 {
 }
 
-//_______________________________________________
+
 
 /** capsulate all steps of a dispatch request and provide so an easy way for dispatches.
 
@@ -151,7 +151,7 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch(
     return aResult;
 }
 
-//_______________________________________________
+
 
 /** callback for started dispatch with guaranteed notifications.
 
@@ -175,7 +175,7 @@ void SAL_CALL DispatchHelper::dispatchFinished( const css::frame::DispatchResult
     /* } SAFE */
 }
 
-//_______________________________________________
+
 
 /** we has to realease our broadcaster reference.
 
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 14d5d69b98bd..a0f7d274d9fd 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -179,9 +179,9 @@ public:
         return aSeq;
     }
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XComponentLoader
-    //---------------------------------------------------------------------------------------------------------
+
     virtual css::uno::Reference< css::lang::XComponent > SAL_CALL loadComponentFromURL(
             const OUString& sURL,
             const OUString& sTargetFrameName,
@@ -192,16 +192,16 @@ public:
                css::uno::RuntimeException );
 
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XFramesSupplier
-    //---------------------------------------------------------------------------------------------------------
+
     virtual css::uno::Reference< css::frame::XFrames >          SAL_CALL getFrames                          (                                                                                                   ) throw( css::uno::RuntimeException );
     virtual css::uno::Reference< css::frame::XFrame >           SAL_CALL getActiveFrame                     (                                                                                                   ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL setActiveFrame                     (   const   css::uno::Reference< css::frame::XFrame >&                          xFrame              ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XFrame
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL initialize                         (   const   css::uno::Reference< css::awt::XWindow >&                           xWindow             ) throw( css::uno::RuntimeException );
     virtual css::uno::Reference< css::awt::XWindow >            SAL_CALL getContainerWindow                 (                                                                                                   ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL setCreator                         (   const   css::uno::Reference< css::frame::XFramesSupplier >&                 xCreator            ) throw( css::uno::RuntimeException );
@@ -222,59 +222,59 @@ public:
     virtual void                                                SAL_CALL addFrameActionListener             (   const   css::uno::Reference< css::frame::XFrameActionListener >&            xListener           ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL removeFrameActionListener          (   const   css::uno::Reference< css::frame::XFrameActionListener >&            xListener           ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XComponent
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL dispose                            (                                                                                                   ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL addEventListener                   (   const   css::uno::Reference< css::lang::XEventListener >&                   xListener           ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL removeEventListener                (   const   css::uno::Reference< css::lang::XEventListener >&                   xListener           ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XStatusIndicatorFactory
-    //---------------------------------------------------------------------------------------------------------
+
     virtual css::uno::Reference< css::task::XStatusIndicator >  SAL_CALL createStatusIndicator              (                                                                                                   ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XDispatchProvider
-    //---------------------------------------------------------------------------------------------------------
+
     virtual css::uno::Reference< css::frame::XDispatch >        SAL_CALL queryDispatch                      (   const   css::util::URL&                                                     aURL                ,
                                                                                                                 const   OUString&                                                    sTargetFrameName    ,
                                                                                                                         sal_Int32                                                           nSearchFlags        ) throw( css::uno::RuntimeException );
     virtual css::uno::Sequence<
                 css::uno::Reference< css::frame::XDispatch > >  SAL_CALL queryDispatches                    (   const   css::uno::Sequence< css::frame::DispatchDescriptor >&               lDescriptor         ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XDispatchProviderInterception
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL registerDispatchProviderInterceptor(   const   css::uno::Reference< css::frame::XDispatchProviderInterceptor >&    xInterceptor        ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL releaseDispatchProviderInterceptor (   const   css::uno::Reference< css::frame::XDispatchProviderInterceptor >&    xInterceptor        ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XDispatchInformationProvider
-    //---------------------------------------------------------------------------------------------------------
+
     virtual css::uno::Sequence< sal_Int16 >                       SAL_CALL getSupportedCommandGroups         (                       ) throw (css::uno::RuntimeException);
     virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup) throw (css::uno::RuntimeException);
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XWindowListener
     //  Attention: windowResized() and windowShown() are implement only! All other are empty!
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL windowResized                      (   const   css::awt::WindowEvent&                                              aEvent              ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL windowMoved                        (   const   css::awt::WindowEvent&                                              /*aEvent*/          ) throw( css::uno::RuntimeException ) {};
     virtual void                                                SAL_CALL windowShown                        (   const   css::lang::EventObject&                                             aEvent              ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL windowHidden                       (   const   css::lang::EventObject&                                             aEvent              ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XFocusListener
     //  Attention: focusLost() not implemented yet!
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL focusGained                        (   const   css::awt::FocusEvent&                                               aEvent              ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL focusLost                          (   const   css::awt::FocusEvent&                                               /*aEvent*/          ) throw( css::uno::RuntimeException ) {};
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XTopWindowListener
     //  Attention: windowActivated(), windowDeactivated() and windowClosing() are implement only! All other are empty!
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL windowActivated                    (   const   css::lang::EventObject&                                             aEvent              ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL windowDeactivated                  (   const   css::lang::EventObject&                                             aEvent              ) throw( css::uno::RuntimeException );
     virtual void                                                SAL_CALL windowOpened                       (   const   css::lang::EventObject&                                             /*aEvent*/          ) throw( css::uno::RuntimeException ) {};
@@ -283,48 +283,48 @@ public:
     virtual void                                                SAL_CALL windowMinimized                    (   const   css::lang::EventObject&                                             /*aEvent*/          ) throw( css::uno::RuntimeException ) {};
     virtual void                                                SAL_CALL windowNormalized                   (   const   css::lang::EventObject&                                             /*aEvent*/          ) throw( css::uno::RuntimeException ) {};
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XEventListener
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void                                                SAL_CALL disposing                          (   const   css::lang::EventObject&                                             aEvent              ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XActionLockable
-    //---------------------------------------------------------------------------------------------------------
+
     virtual sal_Bool    SAL_CALL isActionLocked  (                 ) throw( css::uno::RuntimeException );
     virtual void        SAL_CALL addActionLock   (                 ) throw( css::uno::RuntimeException );
     virtual void        SAL_CALL removeActionLock(                 ) throw( css::uno::RuntimeException );
     virtual void        SAL_CALL setActionLocks  ( sal_Int16 nLock ) throw( css::uno::RuntimeException );
     virtual sal_Int16   SAL_CALL resetActionLocks(                 ) throw( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XCloseable
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException,
                                                                      css::uno::RuntimeException   );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XCloseBroadcaster
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void SAL_CALL addCloseListener   ( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException);
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XTitle
-    //---------------------------------------------------------------------------------------------------------
+
     virtual OUString SAL_CALL getTitle(                               ) throw (css::uno::RuntimeException);
     virtual void            SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException);
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XTitleChangeBroadcaster
-    //---------------------------------------------------------------------------------------------------------
+
     virtual void SAL_CALL addTitleChangeListener   ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException);
     virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException);
 
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XFrame2 attributes
-    //---------------------------------------------------------------------------------------------------------
+
     virtual css::uno::Reference<css::container::XNameContainer> SAL_CALL getUserDefinedAttributes() throw (css::uno::RuntimeException);
 
     virtual css::uno::Reference<css::frame::XDispatchRecorderSupplier> SAL_CALL getDispatchRecorderSupplier() throw (css::uno::RuntimeException);
@@ -334,9 +334,9 @@ public:
     virtual void SAL_CALL setLayoutManager(const css::uno::Reference<css::uno::XInterface>&) throw (css::uno::RuntimeException);
 
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  PropertySetHelper => XPropertySet, XPropertySetInfo
-    //---------------------------------------------------------------------------------------------------------
+
 private:
 
     void impl_initializePropInfo();
@@ -348,9 +348,9 @@ private:
     virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
                                                                sal_Int32        nHandle  );
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private methods
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
 
@@ -378,10 +378,10 @@ private:
     void impl_setCloser                  ( const css::uno::Reference< css::frame::XFrame2 >& xFrame , sal_Bool bState );
     void impl_disposeContainerWindow     (       css::uno::Reference< css::awt::XWindow >&       xWindow          );
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  debug methods
 //  (should be private everyway!)
-//-------------------------------------------------------------------------------------------------------------
+
 
     /*-****************************************************************************************************//**
         @short      debug-method to check incoming parameter of some other mehods of this class
@@ -588,18 +588,18 @@ void Frame::initListeners()
 {
     css::uno::Reference< css::uno::XInterface > xThis(static_cast< ::cppu::OWeakObject* >(this), css::uno::UNO_QUERY_THROW);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Initialize a new dispatchhelper-object to handle dispatches.
     // We use these helper as slave for our interceptor helper ... not directly!
     // But he is event listener on THIS instance!
     DispatchProvider* pDispatchHelper = new DispatchProvider( m_xContext, this );
     css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( static_cast< ::cppu::OWeakObject* >(pDispatchHelper), css::uno::UNO_QUERY );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     DispatchInformationProvider* pInfoHelper = new DispatchInformationProvider(m_xContext, this);
     m_xDispatchInfoHelper = css::uno::Reference< css::frame::XDispatchInformationProvider >( static_cast< ::cppu::OWeakObject* >(pInfoHelper), css::uno::UNO_QUERY );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Initialize a new interception helper object to handle dispatches and implement an interceptor mechanism.
     // Set created dispatch provider as slowest slave of it.
     // Hold interception helper by reference only - not by pointer!
@@ -607,7 +607,7 @@ void Frame::initListeners()
     InterceptionHelper* pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
     m_xDispatchHelper = css::uno::Reference< css::frame::XDispatchProvider >( static_cast< ::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Initialize a new XFrames-helper-object to handle XIndexAccess and XElementAccess.
     // We hold member as reference ... not as pointer too!
     // Attention: We share our frame container with this helper. Container is threadsafe himself ... So I think we can do that.
@@ -615,7 +615,7 @@ void Frame::initListeners()
     OFrames* pFramesHelper = new OFrames( this, &m_aChildFrameContainer );
     m_xFramesHelper = css::uno::Reference< css::frame::XFrames >( static_cast< ::cppu::OWeakObject* >(pFramesHelper), css::uno::UNO_QUERY );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Initialize a the drop target listener.
     // We hold member as reference ... not as pointer too!
     OpenFileDropTargetListener* pDropListener = new OpenFileDropTargetListener( m_xContext, this );
@@ -628,16 +628,16 @@ void Frame::initListeners()
     SAL_WARN_IF( !m_xFramesHelper.is(), "fwk", "Frame::Frame(): Frames helper isn't valid. XFrames, XIndexAccess and XElementAcces are not supported!" );
     SAL_WARN_IF( !m_xDropTargetListener.is(), "fwk", "Frame::Frame(): DropTarget helper isn't valid. Drag and drop without functionality!" );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // establish notifies for changing of "disabled commands" configuration during runtime
     m_aCommandOptions.EstablisFrameCallback(this);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // Create an initial layout manager
     // Create layout manager and connect it to the newly created frame
     m_xLayoutManager = css::frame::LayoutManager::create(m_xContext);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // set information about all supported properties at the base class helper PropertySetHelper
     impl_initializePropInfo();
 }
@@ -1116,13 +1116,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
 {
     css::uno::Reference< css::frame::XFrame > xTarget;
 
-    //-----------------------------------------------------------------------------------------------------
+
     // 0) Ignore wrong parameter!
     //    We don't support search for following special targets.
     //    If we reject this requests - we mustnt check for such names
     //    in following code again and again. If we do not so -wrong
     //    search results can occur!
-    //-----------------------------------------------------------------------------------------------------
+
     if (
         (sTargetFrameName==SPECIALTARGET_DEFAULT  )   ||    // valid for dispatches - not for findFrame()!
         (sTargetFrameName==SPECIALTARGET_MENUBAR  )         // valid for dispatches - not for findFrame()!
@@ -1131,10 +1131,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
         return NULL;
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I) check for special defined targets first which must be handled exclusive.
     //    force using of "if() else if() ..."
-    //-----------------------------------------------------------------------------------------------------
+
 
     // get threadsafe some necessary member which are necessary for following functionality
     /* SAFE { */
@@ -1146,32 +1146,32 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
     aReadLock.unlock();
     /* } SAFE */
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.I) "_blank"
     //  Not allowed for a normal frame - but for the desktop.
     //  Use helper class to do so. It use the desktop automaticly.
-    //-----------------------------------------------------------------------------------------------------
+
     if ( sTargetFrameName==SPECIALTARGET_BLANK )
     {
         TaskCreator aCreator(xContext);
         xTarget = aCreator.createTask(sTargetFrameName,sal_False);
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.II) "_parent"
     //  It doesn't matter if we have a valid parent or not. User ask for him and get it.
     //  An empty result is a valid result too.
-    //-----------------------------------------------------------------------------------------------------
+
     else if ( sTargetFrameName==SPECIALTARGET_PARENT )
     {
         xTarget = xParent;
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.III) "_top"
     //  If we are not the top frame in this hierarchy, we must forward request to our parent.
     //  Otherwhise we must return ourself.
-    //-----------------------------------------------------------------------------------------------------
+
     else if ( sTargetFrameName==SPECIALTARGET_TOP )
     {
         if (bIsTopFrame)
@@ -1180,10 +1180,10 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             xTarget = xParent->findFrame(SPECIALTARGET_TOP,0);
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.IV) "_self", ""
     //  This mean this frame in every case.
-    //-----------------------------------------------------------------------------------------------------
+
     else if (
         ( sTargetFrameName==SPECIALTARGET_SELF ) ||
         ( sTargetFrameName.isEmpty()           )
@@ -1192,12 +1192,12 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
         xTarget = this;
     }
 
-    //-----------------------------------------------------------------------------------------------------
+
     // I.V) "_beamer"
     //  This is a special sub frame of any task. We must return it if we found it on our direct children
     //  or create it there if it not already exists.
     //  Note: Such beamer exists for task(top) frames only!
-    //-----------------------------------------------------------------------------------------------------
+
     else if ( sTargetFrameName==SPECIALTARGET_BEAMER )
     {
         // We are a task => search or create the beamer
@@ -1220,13 +1220,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
 
     else
     {
-        //-------------------------------------------------------------------------------------------------
+
         // II) otherwise use optional given search flags
         //  force using of combinations of such flags. means no "else" part of use if() statements.
         //  But we ust break further searches if target was already found.
         //  Order of using flags is fix: SELF - CHILDREN - SIBLINGS - PARENT
         //  TASK and CREATE are handled special.
-        //-------------------------------------------------------------------------------------------------
+
 
         // get threadsafe some necessary member which are necessary for following functionality
         /* SAFE { */
@@ -1235,11 +1235,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
         aReadLock.unlock();
         /* } SAFE */
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.I) SELF
         //  Check for right name. If it's the searched one return ourself - otherwise
         //  ignore this flag.
-        //-------------------------------------------------------------------------------------------------
+
         if (
             (nSearchFlags &  css::frame::FrameSearchFlag::SELF)  &&
             (sOwnName     == sTargetFrameName                 )
@@ -1248,13 +1248,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             xTarget = this;
         }
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.II) CHILDREN
         //  Search on all children for the given target name.
         //  An empty name value can't occur here - because it must be already handled as "_self"
         //  before. Used helper function of container doesn't create any frame.
         //  It makes a deep search only.
-        //-------------------------------------------------------------------------------------------------
+
         if (
             ( ! xTarget.is()                                     ) &&
             (nSearchFlags & css::frame::FrameSearchFlag::CHILDREN)
@@ -1263,19 +1263,19 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             xTarget = m_aChildFrameContainer.searchOnAllChildrens(sTargetFrameName);
         }
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.III) TASKS
         //  This is a special flag. It regulate search on this task tree only or allow search on
         //  all other ones (which are sibling trees of us) too.
         //  Upper search must stop at this frame if we are the topest one and the TASK flag isn't set
         //  or we can ignore it if we have no valid parent.
-        //-------------------------------------------------------------------------------------------------
+
         if (
             (   bIsTopFrame && (nSearchFlags & css::frame::FrameSearchFlag::TASKS) )   ||
             ( ! bIsTopFrame                                                        )
            )
         {
-            //-------------------------------------------------------------------------------------------------
+
             // II.III.I) SIBLINGS
             //  Search on all our direct siblings - means all children of our parent.
             //  Use this flag in combination with TASK. We must supress such upper search if
@@ -1287,7 +1287,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             //  if we call it with the CHILDREN flag. We don't need that - we need the direct container
             //  items of our parent only to start searches there. So we must use the container interface
             //  XIndexAccess instead of XFrames.
-            //-------------------------------------------------------------------------------------------------
+
             if (
                 ( ! xTarget.is()                                      ) &&
                 (nSearchFlags &  css::frame::FrameSearchFlag::SIBLINGS) &&
@@ -1327,12 +1327,12 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
                 }
             }
 
-            //-------------------------------------------------------------------------------------------------
+
             // II.III.II) PARENT
             //  Forward search to our parent (if he exists.)
             //  To prevent us against recursive and superflous calls (which can occur if we allow him
             //  to search on his children too) we must change used search flags.
-            //-------------------------------------------------------------------------------------------------
+
             if (
                 ( ! xTarget.is()                                    ) &&
                 (nSearchFlags &  css::frame::FrameSearchFlag::PARENT) &&
@@ -1350,11 +1350,11 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
             }
         }
 
-        //-------------------------------------------------------------------------------------------------
+
         // II.IV) CREATE
         //  If we haven't found any valid target frame by using normal flags - but user allowed us to create
         //  a new one ... we should do that. Used TaskCreator use Desktop instance automaticly as parent!
-        //-------------------------------------------------------------------------------------------------
+
         if (
             ( ! xTarget.is()                                   )    &&
             (nSearchFlags & css::frame::FrameSearchFlag::CREATE)
@@ -1437,7 +1437,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException )
     aWriteLock.unlock();
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
 
-    //_________________________________________________________________________________________________________
+
     //  1)  If I'am not active before ...
     if( eState == E_INACTIVE )
     {
@@ -1470,7 +1470,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException )
         implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_ACTIVATED );
     }
 
-    //_________________________________________________________________________________________________________
+
     //  2)  I was active before or current activated and there is a path from here to bottom, who CAN be active.
     //      But ouer direct child of path is not active yet.
     //      (It can be, if activation occur in the middle of a current path!)
@@ -1480,7 +1480,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException )
         xActiveChild->activate();
     }
 
-    //_________________________________________________________________________________________________________
+
     //  3)  I was active before or current activated. But if I have no active child => I will get the focus!
     if ( eState == E_ACTIVE && !xActiveChild.is() )
     {
@@ -1528,14 +1528,14 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
     // Work only, if there something to do!
     if( eState != E_INACTIVE )
     {
-        //_____________________________________________________________________________________________________
+
         //  1)  Deactivate all active children.
         if ( xActiveChild.is() && xActiveChild->isActive() )
         {
             xActiveChild->deactivate();
         }
 
-        //_____________________________________________________________________________________________________
+
         //  2)  If I have the focus - I will lost it now.
         if( eState == E_FOCUS )
         {
@@ -1548,7 +1548,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
             implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_UI_DEACTIVATING );
         }
 
-        //_____________________________________________________________________________________________________
+
         //  3)  If I'am active - I will be deactivated now.
         if( eState == E_ACTIVE )
         {
@@ -1560,7 +1560,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException )
             implts_sendFrameActionEvent( css::frame::FrameAction_FRAME_DEACTIVATING );
         }
 
-        //_____________________________________________________________________________________________________
+
         //  4)  If there is a path from here to my parent ...
         //      ... I'am on the top or in the middle of deactivated subtree and action was started here.
         //      I must deactivate all frames from here to top, which are members of current path.
@@ -1655,7 +1655,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException )
 sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::XWindow >&       xComponentWindow ,
                                         const   css::uno::Reference< css::frame::XController >& xController      ) throw( css::uno::RuntimeException )
 {
-    //_____________________________________________________________________________________________________
+
     // Ignore this HACK of sfx2!
     // He call us with an valid controller without a valid window ... Thats not allowed!
     if  ( xController.is() && ! xComponentWindow.is() )
@@ -1663,7 +1663,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
 
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
 
-    //_____________________________________________________________________________________________________
+
     // Get threadsafe some copies of used members.
     /* SAFE { */
     ReadGuard aReadLock( m_aLock );
@@ -1676,7 +1676,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     aReadLock.unlock();
     /* } SAFE */
 
-    //_____________________________________________________________________________________________________
+
     // stop listening on old window
     // May it produce some trouble.
     // But don't forget to listen on new window again ... or reactivate listening
@@ -1687,7 +1687,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     if (bWasConnected)
         implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_DETACHING );
 
-    //_____________________________________________________________________________________________________
+
     // otherwise release old component first
     // Always release controller before releasing window,
     // because controller may want to access its window!
@@ -1723,7 +1723,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
         xOldController = NULL;
     }
 
-    //_____________________________________________________________________________________________________
+
     // Now it's time to release the component window.
     // If controller wasn't released successfully - this code line shouldn't be reached.
     // Because in case of "suspend()==false" we return immediately with false ...
@@ -1754,7 +1754,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
         xOldComponentWindow = NULL;
     }
 
-    //_____________________________________________________________________________________________________
+
     // Now it's time to set the new component ...
     // By the way - find out our new "load state" - means if we have a valid component inside.
     /* SAFE { */
@@ -1766,14 +1766,14 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     aWriteLock.unlock();
     /* } SAFE */
 
-    //_____________________________________________________________________________________________________
+
     // notifies all interest listener, that current component was changed or a new one was loaded
     if (bIsConnected && bWasConnected)
         implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_REATTACHED );
     else if (bIsConnected && !bWasConnected)
         implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED   );
 
-    //_____________________________________________________________________________________________________
+
     // A new component window doesn't know anything about current active/focus states.
     // Set this information on it!
     if (
@@ -3192,13 +3192,13 @@ void Frame::implts_setIconOnWindow()
 
     if( xContainerWindow.is() && xController.is() )
     {
-        //-------------------------------------------------------------------------------------------------------------
+
         // a) set default value to an invalid one. So we can start further searches for right icon id, if
         //    first steps failed!
         //    We must reset it to any fallback value - if no search step returns a valid result.
         sal_Int32 nIcon = -1;
 
-        //-------------------------------------------------------------------------------------------------------------
+
         // b) try to find information on controller propertyset directly
         //    Don't forget to catch possible exceptions - because these property is an optional one!
         css::uno::Reference< css::beans::XPropertySet > xSet( xController, css::uno::UNO_QUERY );
@@ -3216,7 +3216,7 @@ void Frame::implts_setIconOnWindow()
             }
         }
 
-        //-------------------------------------------------------------------------------------------------------------
+
         // c) if b) failed ... analyze argument list of currently loaded document insde the frame to find the filter.
         //    He can be used to detect right factory - and these can be used to match factory to icon ...
         if( nIcon == -1 )
@@ -3230,14 +3230,14 @@ void Frame::implts_setIconOnWindow()
             }
         }
 
-        //-------------------------------------------------------------------------------------------------------------
+
         // d) if all steps failed - use fallback!
         if( nIcon == -1 )
         {
             nIcon = 0;
         }
 
-        //-------------------------------------------------------------------------------------------------------------
+
         // e) set icon on container window now
         //    Don't forget SolarMutex! We use vcl directly :-(
         //    Check window pointer for right WorkWindow class too!!!
@@ -3390,7 +3390,7 @@ void Frame::implts_checkSuicide()
         {}
 }
 
-//_______________________________________________________________
+
 
 /** little helper to enable/disable the menu closer at the menubar of the given frame.
 
@@ -3423,7 +3423,7 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame
         {}
 }
 
-//_______________________________________________________________
+
 
 /** it checks, which of the top level task frames must have the special menu closer for
     switching to the backing window mode.
@@ -3461,7 +3461,7 @@ void Frame::impl_checkMenuCloser()
     // specify the new frame, which must have this special state ...
     css::uno::Reference< css::frame::XFrame2 > xNewCloserFrame;
 
-    // -----------------------------
+
     // a)
     // If there exist ate least one other frame - there are two frames currently open.
     // But we can enable this closer only, if one of these two tasks includes the help module.
@@ -3481,7 +3481,7 @@ void Frame::impl_checkMenuCloser()
         // Because it's set at the special member aAnalyzer.m_xBackingComponent ... :-)
         xNewCloserFrame.set( aAnalyzer.m_lOtherVisibleFrames[0], css::uno::UNO_QUERY_THROW );
     }
-    // -----------------------------
+
     // b)
     // There is no other frame ... means no other document frame. The help module
     // will be handled separately and must(!) be ignored here ... excepting weself includes the help.
@@ -3513,9 +3513,9 @@ void Frame::impl_checkMenuCloser()
     /* } STATIC SAFE */
 }
 
-//_________________________________________________________________________________________________________________
+
 //  debug methods
-//_________________________________________________________________________________________________________________
+
 
 //*****************************************************************************************************************
 // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer!
diff --git a/framework/source/services/modulemanager.cxx b/framework/source/services/modulemanager.cxx
index 4b590bea2d94..a19a39ecded0 100644
--- a/framework/source/services/modulemanager.cxx
+++ b/framework/source/services/modulemanager.cxx
@@ -49,13 +49,13 @@ class ModuleManager:
 {
 private:
 
-    //---------------------------------------
+
     /** the global uno service manager.
         Must be used to create own needed services.
      */
     css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-    //---------------------------------------
+
     /** points to the underlying configuration.
         This ModuleManager does not cache - it calls directly the
         configuration API!
@@ -121,7 +121,7 @@ public:
 
 private:
 
-    //---------------------------------------
+
     /** @short  makes the real identification of the module.
 
         @descr  It checks for the optional but preferred interface
diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx
index d7e1f6f3c8de..90d61d2b6b13 100644
--- a/framework/source/services/pathsettings.cxx
+++ b/framework/source/services/pathsettings.cxx
@@ -456,7 +456,7 @@ private:
     css::uno::Reference< css::container::XNameAccess >    fa_getCfgNew();
 };
 
-//-----------------------------------------------------------------------------
+
 PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentContext >& xContext )
     : PathSettings_BASE(*(static_cast<osl::Mutex *>(this)))
     , ::cppu::OPropertySetHelper(cppu::WeakComponentImplHelperBase::rBHelper)
@@ -466,7 +466,7 @@ PathSettings::PathSettings( const css::uno::Reference< css::uno::XComponentConte
 {
 }
 
-//-----------------------------------------------------------------------------
+
 PathSettings::~PathSettings()
 {
     disposing();
@@ -490,7 +490,7 @@ void SAL_CALL PathSettings::disposing()
     m_pPropHelp = 0;
 }
 
-//------------------------------------------------------------------
+
 css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rType )
     throw(css::uno::RuntimeException)
 {
@@ -500,7 +500,7 @@ css::uno::Any SAL_CALL PathSettings::queryInterface( const css::uno::Type& _rTyp
     return aRet;
 }
 
-//------------------------------------------------------------------
+
 css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes(  )
     throw(css::uno::RuntimeException)
 {
@@ -510,7 +510,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL PathSettings::getTypes(  )
     );
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEvent)
     throw (css::uno::RuntimeException)
 {
@@ -541,7 +541,7 @@ void SAL_CALL PathSettings::changesOccurred(const css::util::ChangesEvent& aEven
         impl_rebuildPropertyDescriptor();
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
     throw(css::uno::RuntimeException)
 {
@@ -551,7 +551,7 @@ void SAL_CALL PathSettings::disposing(const css::lang::EventObject& aSource)
         m_xCfgNew.clear();
 }
 
-//-----------------------------------------------------------------------------
+
 OUString PathSettings::getStringProperty(const OUString& p1)
     throw(css::uno::RuntimeException)
 {
@@ -561,14 +561,14 @@ OUString PathSettings::getStringProperty(const OUString& p1)
     return s;
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::setStringProperty(const OUString& p1, const OUString& p2)
     throw(css::uno::RuntimeException)
 {
     ::cppu::OPropertySetHelper::setPropertyValue(p1, css::uno::Any(p2));
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_readAll()
 {
     try
@@ -591,7 +591,7 @@ void PathSettings::impl_readAll()
     impl_rebuildPropertyDescriptor();
 }
 
-//-----------------------------------------------------------------------------
+
 // NO substitution here ! It's done outside ...
 OUStringList PathSettings::impl_readOldFormat(const OUString& sPath)
 {
@@ -618,7 +618,7 @@ OUStringList PathSettings::impl_readOldFormat(const OUString& sPath)
     return aPathVal;
 }
 
-//-----------------------------------------------------------------------------
+
 // NO substitution here ! It's done outside ...
 PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
 {
@@ -664,7 +664,7 @@ PathSettings::PathInfo PathSettings::impl_readNewFormat(const OUString& sPath)
     return aPathVal;
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath)
 {
     m_bIgnoreEvents = sal_True;
@@ -710,7 +710,7 @@ void PathSettings::impl_storePath(const PathSettings::PathInfo& aPath)
     m_bIgnoreEvents = sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
                                           const OUStringList&           lOld )
 {
@@ -739,7 +739,7 @@ void PathSettings::impl_mergeOldUserPaths(      PathSettings::PathInfo& rPath,
     }
 }
 
-//-----------------------------------------------------------------------------
+
 PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath          ,
                                                             sal_Bool         bNotifyListener)
 {
@@ -846,7 +846,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath
     return eOp;
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUString& sPath)
 {
     OUString sOldStyleProp = sPath;
@@ -890,7 +890,7 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt
     return lIDs;
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_notifyPropListener(      PathSettings::EChangeOp /*eOp*/     ,
                                            const OUString&        sPath   ,
                                            const PathSettings::PathInfo* pPathOld,
@@ -968,7 +968,7 @@ void PathSettings::impl_notifyPropListener(      PathSettings::EChangeOp /*eOp*/
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_subst(      OUStringList&                                          lVals   ,
                               const css::uno::Reference< css::util::XStringSubstitution >& xSubst  ,
                                     sal_Bool                                               bReSubst)
@@ -990,7 +990,7 @@ void PathSettings::impl_subst(      OUStringList&
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_subst(PathSettings::PathInfo& aPath   ,
                               sal_Bool                bReSubst)
 {
@@ -1004,7 +1004,7 @@ void PathSettings::impl_subst(PathSettings::PathInfo& aPath   ,
         aPath.sWritePath = xSubst->substituteVariables(aPath.sWritePath, sal_False);
 }
 
-//-----------------------------------------------------------------------------
+
 OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& rPath) const
 {
     OUStringList::const_iterator pIt;
@@ -1041,7 +1041,7 @@ OUString PathSettings::impl_convertPath2OldStyle(const PathSettings::PathInfo& r
     return sPathVal.makeStringAndClear();
 }
 
-//-----------------------------------------------------------------------------
+
 OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePath) const
 {
     OUStringList lList;
@@ -1057,7 +1057,7 @@ OUStringList PathSettings::impl_convertOldStyle2Path(const OUString& sOldStylePa
     return lList;
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath,
                                                OUStringList&           lList)
 {
@@ -1086,7 +1086,7 @@ void PathSettings::impl_purgeKnownPaths(const PathSettings::PathInfo& rPath,
         lList.erase(pItem);
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_rebuildPropertyDescriptor()
 {
     // SAFE ->
@@ -1146,7 +1146,7 @@ void PathSettings::impl_rebuildPropertyDescriptor()
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const
 {
     const PathSettings::PathInfo* pPath = impl_getPathAccessConst(nID);
@@ -1185,7 +1185,7 @@ css::uno::Any PathSettings::impl_getPathValue(sal_Int32 nID) const
     return aVal;
 }
 
-//-----------------------------------------------------------------------------
+
 void PathSettings::impl_setPathValue(      sal_Int32      nID ,
                                      const css::uno::Any& aVal)
 {
@@ -1292,7 +1292,7 @@ void PathSettings::impl_setPathValue(      sal_Int32      nID ,
     pOrgPath->takeOver(aChangePath);
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const
 {
     OUStringList::const_iterator pIt;
@@ -1308,7 +1308,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUStringList& lPath) const
     return sal_True;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const
 {
     // allow empty path to reset a path.
@@ -1321,7 +1321,7 @@ sal_Bool PathSettings::impl_isValidPath(const OUString& sPath) const
     return (! INetURLObject(sPath).HasError());
 }
 
-//-----------------------------------------------------------------------------
+
 OUString impl_extractBaseFromPropName(const OUString& sPropName)
 {
     sal_Int32 i = sPropName.indexOf(POSTFIX_INTERNAL_PATHS);
@@ -1337,7 +1337,7 @@ OUString impl_extractBaseFromPropName(const OUString& sPropName)
     return sPropName;
 }
 
-//-----------------------------------------------------------------------------
+
 PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle)
 {
     // SAFE ->
@@ -1357,7 +1357,7 @@ PathSettings::PathInfo* PathSettings::impl_getPathAccess(sal_Int32 nHandle)
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nHandle) const
 {
     // SAFE ->
@@ -1377,7 +1377,7 @@ const PathSettings::PathInfo* PathSettings::impl_getPathAccessConst(sal_Int32 nH
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL PathSettings::convertFastPropertyValue(      css::uno::Any& aConvertedValue,
                                                                css::uno::Any& aOldValue      ,
                                                                sal_Int32      nHandle        ,
@@ -1394,7 +1394,7 @@ sal_Bool SAL_CALL PathSettings::convertFastPropertyValue(      css::uno::Any& aC
                 aConvertedValue);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast(      sal_Int32      nHandle,
                                                              const css::uno::Any& aValue )
     throw(css::uno::Exception)
@@ -1403,20 +1403,20 @@ void SAL_CALL PathSettings::setFastPropertyValue_NoBroadcast(      sal_Int32
     impl_setPathValue(nHandle, aValue);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL PathSettings::getFastPropertyValue(css::uno::Any& aValue ,
                                                  sal_Int32      nHandle) const
 {
     aValue = impl_getPathValue(nHandle);
 }
 
-//-----------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& SAL_CALL PathSettings::getInfoHelper()
 {
     return *m_pPropHelp;
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPropertySetInfo()
     throw(css::uno::RuntimeException)
 {
@@ -1424,7 +1424,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL PathSettings::getPr
             ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()));
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubstitution()
 {
     css::uno::Reference< css::util::XStringSubstitution > xSubst;
@@ -1450,7 +1450,7 @@ css::uno::Reference< css::util::XStringSubstitution > PathSettings::fa_getSubsti
     return xSubst;
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld()
 {
     const OUString CFG_NODE_OLD("org.openoffice.Office.Common/Path/Current");
@@ -1479,7 +1479,7 @@ css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgOld()
     return xCfg;
 }
 
-//-----------------------------------------------------------------------------
+
 css::uno::Reference< css::container::XNameAccess > PathSettings::fa_getCfgNew()
 {
     const OUString CFG_NODE_NEW("org.openoffice.Office.Paths/Paths");
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 8f480f81cce0..6734ff030a5b 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -393,9 +393,9 @@ static const FixedVariable aFixedVarTable[] =
     { RTL_CONSTASCII_STRINGPARAM("$(brandbaseurl)"),PREDEFVAR_BRANDBASEURL, true  }
 };
 
-//_________________________________________________________________________________________________________________
+
 //      Implementation helper classes
-//_________________________________________________________________________________________________________________
+
 
 OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystemFromString( const OUString& aOSString )
 {
@@ -488,9 +488,9 @@ void SubstitutePathVariables_Impl::Commit()
 }
 
 
-//_________________________________________________________________________________________________________________
+
 //      private methods
-//_________________________________________________________________________________________________________________
+
 
 OperatingSystem SubstitutePathVariables_Impl::GetOperatingSystem()
 {
@@ -822,9 +822,9 @@ throw ( NoSuchElementException, RuntimeException )
     return impl_getSubstituteVariableValue( aVariable );
 }
 
-//_________________________________________________________________________________________________________________
+
 //      protected methods
-//_________________________________________________________________________________________________________________
+
 
 IMPL_LINK_NOARG(SubstitutePathVariables, implts_ConfigurationNotify)
 {
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index 2630ff951a4b..0e38d780a6a3 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -122,9 +122,9 @@ public:
         return aSeq;
     }
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XSimpleTabController
-    //---------------------------------------------------------------------------------------------------------
+
 
     virtual sal_Int32 SAL_CALL insertTab() throw ( css::uno::RuntimeException );
     virtual void SAL_CALL removeTab( sal_Int32 nID ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException );
@@ -135,9 +135,9 @@ public:
     virtual void SAL_CALL addTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException );
     virtual void SAL_CALL removeTabListener( const css::uno::Reference< css::awt::XTabListener >& Listener ) throw ( css::uno::RuntimeException );
 
-    //---------------------------------------------------------------------------------------------------------
+
     //  XComponent
-    //---------------------------------------------------------------------------------------------------------
+
 
     virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException );
     virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw ( css::uno::RuntimeException );
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index a45a72afd362..c683ff44bc76 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -55,7 +55,7 @@ class TaskCreatorService : private osl::Mutex,
 {
 private:
 
-    //---------------------------------------
+
     /** @short  the global uno service manager.
         @descr  Must be used to create own needed services.
      */
@@ -115,19 +115,19 @@ private:
     OUString impl_filterNames( const OUString& sName );
 };
 
-//-----------------------------------------------
+
 TaskCreatorService::TaskCreatorService(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : TaskCreatorService_BASE(*static_cast<osl::Mutex *>(this))
     , m_xContext         (xContext                     )
 {
 }
 
-//-----------------------------------------------
+
 TaskCreatorService::~TaskCreatorService()
 {
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstance()
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
@@ -135,7 +135,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
     return createInstanceWithArguments(css::uno::Sequence< css::uno::Any >());
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createInstanceWithArguments(const css::uno::Sequence< css::uno::Any >& lArguments)
     throw(css::uno::Exception       ,
           css::uno::RuntimeException)
@@ -218,7 +218,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
     return css::uno::Reference< css::uno::XInterface >(xFrame, css::uno::UNO_QUERY_THROW);
 }
 
-//-----------------------------------------------
+
 void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) const
 {
     // SYNCHRONIZED ->
@@ -229,7 +229,7 @@ void TaskCreatorService::implts_applyDocStyleToWindow(const css::uno::Reference<
     // <- SYNCHRONIZED
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContainerWindow( const css::uno::Reference< css::awt::XWindow >& xParentWindow ,
                                                                                            const css::awt::Rectangle&                      aPosSize      ,
                                                                                                  sal_Bool                                  bTopWindow    )
@@ -286,7 +286,7 @@ css::uno::Reference< css::awt::XWindow > TaskCreatorService::implts_createContai
     return xWindow;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFrame( const css::uno::Reference< css::frame::XFrame >& xParentFrame    ,
                                                                                   const css::uno::Reference< css::awt::XWindow >&  xContainerWindow,
                                                                                   const OUString&                           sName           )
@@ -315,7 +315,7 @@ css::uno::Reference< css::frame::XFrame2 > TaskCreatorService::implts_createFram
     return xNewFrame;
 }
 
-//-----------------------------------------------
+
 void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame )
 {
     // Special feature: It's allowed for frames using a top level window only!
@@ -330,7 +330,7 @@ void TaskCreatorService::implts_establishWindowStateListener( const css::uno::Re
     xInit->initialize(lInitData);
 }
 
-//-----------------------------------------------
+
 void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Reference< css::frame::XFrame2 >& xFrame )
 {
     // Special feature: It's allowed for frames using a top level window only!
@@ -344,7 +344,7 @@ void TaskCreatorService::implts_establishDocModifyListener( const css::uno::Refe
     xInit->initialize(lInitData);
 }
 
-//-----------------------------------------------
+
 void TaskCreatorService::implts_establishTitleBarUpdate( const css::uno::Reference< css::frame::XFrame2 >& xFrame )
 {
     TitleBarUpdate* pHelper = new TitleBarUpdate (m_xContext);
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index c03e0b1d8357..21061fe1a0b1 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -36,9 +36,9 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star;
 
@@ -103,9 +103,9 @@ TabWindow::~TabWindow()
 {
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // Helper
-//---------------------------------------------------------------------------------------------------------
+
 
 void TabWindow::implts_LayoutWindows() const
 {
@@ -232,9 +232,9 @@ void TabWindow::implts_SendNotification( Notification eNotify, sal_Int32 ID, con
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // Links
-//---------------------------------------------------------------------------------------------------------
+
 
 IMPL_LINK( TabWindow, Activate, TabControl*, pTabControl )
 {
@@ -266,9 +266,9 @@ IMPL_LINK( TabWindow, Deactivate, TabControl*, pTabControl )
     return 1;
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // XInitilization
-//---------------------------------------------------------------------------------------------------------
+
 
 void SAL_CALL TabWindow::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 throw (css::uno::Exception, css::uno::RuntimeException)
@@ -423,9 +423,9 @@ throw (css::uno::Exception, css::uno::RuntimeException)
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XComponent
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL TabWindow::dispose() throw (css::uno::RuntimeException)
 {
     // Send message to all listener and forget her references.
@@ -491,17 +491,17 @@ throw (css::uno::RuntimeException)
     m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener );
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // XEventListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL TabWindow::disposing( const css::lang::EventObject& )
 throw( css::uno::RuntimeException )
 {
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // XWindowListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL TabWindow::windowResized( const css::awt::WindowEvent& )
 throw( css::uno::RuntimeException )
 {
@@ -548,9 +548,9 @@ throw( css::uno::RuntimeException )
         pTabControl->Hide();
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // XTopWindowListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL TabWindow::windowOpened( const css::lang::EventObject& )
 throw (css::uno::RuntimeException)
 {
@@ -589,9 +589,9 @@ throw (css::uno::RuntimeException)
 {
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XSimpleTabController
-//---------------------------------------------------------------------------------------------------------
+
 
 ::sal_Int32 SAL_CALL TabWindow::insertTab()
 throw (css::uno::RuntimeException)
@@ -815,9 +815,9 @@ throw (css::uno::RuntimeException)
         ::getCppuType( ( const css::uno::Reference< css::awt::XTabListener >* ) NULL ), xListener );
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  OPropertySetHelper
-//---------------------------------------------------------------------------------------------------------
+
 
 // XPropertySet helper
 sal_Bool SAL_CALL TabWindow::convertFastPropertyValue( css::uno::Any&       aConvertedValue ,
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 718447bbf2eb..90297d3d876d 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -31,9 +31,9 @@
 #include <vcl/svapp.hxx>
 #include <rtl/ustrbuf.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index b75b7fd66451..7f5f090c43e6 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -34,16 +34,16 @@
 #include <rtl/instance.hxx>
 #include <cppuhelper/implbase2.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::com::sun::star;
 
 
-//_________________________________________________________________________________________________________________
+
 //  Namespace
-//_________________________________________________________________________________________________________________
+
 
 static const char GLOBALSETTINGS_ROOT_ACCESS[]              = "/org.openoffice.Office.UI.GlobalSettings/Toolbars";
 
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx
index b83766c41fb7..076c6291c014 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.cxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx
@@ -147,7 +147,7 @@ static OUString getCanonicalName( const OUString& rFileName )
     return aBuf.makeStringAndClear();
 }
 
-//_________________________________________________________________________________________________________________
+
 
 CmdImageList::CmdImageList( const uno::Reference< uno::XComponentContext >& rxContext, const OUString& aModuleIdentifier ) :
     m_bVectorInit( sal_False ),
@@ -320,7 +320,7 @@ bool CmdImageList::hasImage( sal_Int16 /*nImageType*/, const OUString& rCommandU
     return impl_getImageCommandNameVector();
 }
 
-//_________________________________________________________________________________________________________________
+
 
 GlobalImageList::GlobalImageList( const uno::Reference< uno::XComponentContext >& rxContext ) :
     CmdImageList( rxContext, OUString() ),
diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx
index 611629d25ab1..ee8cbe638638 100644
--- a/framework/source/uiconfiguration/moduleimagemanager.cxx
+++ b/framework/source/uiconfiguration/moduleimagemanager.cxx
@@ -48,9 +48,9 @@
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::XInterface;
diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx
index 079d4a28bd44..aa6aaf01f867 100644
--- a/framework/source/uielement/addonstoolbarmanager.cxx
+++ b/framework/source/uielement/addonstoolbarmanager.cxx
@@ -58,9 +58,9 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 755da4671850..0049f6f21ecd 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::util;
 namespace framework
 {
 
-// ------------------------------------------------------------------
+
 
 // Wrapper class to notify controller about events from combobox.
 // Unfortunaltly the events are notifed through virtual methods instead
@@ -135,7 +135,7 @@ bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// ------------------------------------------------------------------
+
 
 ComboboxToolbarController::ComboboxToolbarController(
     const Reference< XComponentContext >& rxContext,
@@ -159,13 +159,13 @@ ComboboxToolbarController::ComboboxToolbarController(
     m_pToolbar->SetItemWindow( m_nID, m_pComboBox );
 }
 
-// ------------------------------------------------------------------
+
 
 ComboboxToolbarController::~ComboboxToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL ComboboxToolbarController::dispose()
 throw ( RuntimeException )
@@ -180,7 +180,7 @@ throw ( RuntimeException )
     m_pComboBox = 0;
 }
 
-// ------------------------------------------------------------------
+
 Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 2 );
@@ -194,7 +194,7 @@ Sequence<PropertyValue> ComboboxToolbarController::getExecuteArgs(sal_Int16 KeyM
     return aArgs;
 }
 
-// ------------------------------------------------------------------
+
 
 void ComboboxToolbarController::Select()
 {
@@ -259,7 +259,7 @@ bool ComboboxToolbarController::PreNotify( NotifyEvent& rNEvt )
     return false;
 }
 
-// --------------------------------------------------------
+
 
 void ComboboxToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx
index 1d64c569801e..71a4b4947c91 100644
--- a/framework/source/uielement/complextoolbarcontroller.cxx
+++ b/framework/source/uielement/complextoolbarcontroller.cxx
@@ -50,7 +50,7 @@ using namespace ::com::sun::star::util;
 namespace framework
 {
 
-// ------------------------------------------------------------------
+
 
 ComplexToolbarController::ComplexToolbarController(
     const Reference< XComponentContext >& rxContext,
@@ -66,13 +66,13 @@ ComplexToolbarController::ComplexToolbarController(
     m_xURLTransformer.set( URLTransformer::create(m_xContext) );
 }
 
-// ------------------------------------------------------------------
+
 
 ComplexToolbarController::~ComplexToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL ComplexToolbarController::dispose()
 throw ( RuntimeException )
@@ -87,7 +87,7 @@ throw ( RuntimeException )
     m_nID = 0;
 }
 
-// ------------------------------------------------------------------
+
 Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 1 );
@@ -97,7 +97,7 @@ Sequence<PropertyValue> ComplexToolbarController::getExecuteArgs(sal_Int16 KeyMo
     aArgs[0].Value <<= KeyModifier;
     return aArgs;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ComplexToolbarController::execute( sal_Int16 KeyModifier )
 throw ( RuntimeException )
 {
@@ -136,7 +136,7 @@ throw ( RuntimeException )
     }
 }
 
-// ------------------------------------------------------------------
+
 
 void ComplexToolbarController::statusChanged( const FeatureStateEvent& Event )
 throw ( RuntimeException )
@@ -206,7 +206,7 @@ throw ( RuntimeException )
     }
 }
 
-// ------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
 {
@@ -227,7 +227,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, ExecuteHdl_Impl, ExecuteI
    return 0;
 }
 
-// ------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*, pNotifyInfo )
 {
@@ -252,7 +252,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ComplexToolbarController, Notify_Impl, NotifyInfo*,
    return 0;
 }
 
-// ------------------------------------------------------------------
+
 
 void ComplexToolbarController::addNotifyInfo(
     const OUString&                      aEventName,
@@ -282,7 +282,7 @@ void ComplexToolbarController::addNotifyInfo(
     }
 }
 
-// --------------------------------------------------------
+
 sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow )
 {
     const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
@@ -294,7 +294,7 @@ sal_Int32 ComplexToolbarController::getFontSizePixel( const Window* pWindow )
     return aPixelSize.Height();
 }
 
-// --------------------------------------------------------
+
 
 uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromCommand( const OUString& aCommand ) const
 {
@@ -310,7 +310,7 @@ uno::Reference< frame::XDispatch > ComplexToolbarController::getDispatchFromComm
     return xDispatch;
 }
 
-// --------------------------------------------------------
+
 
 const ::com::sun::star::util::URL& ComplexToolbarController::getInitializedURL()
 {
diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
index 190428d918df..fef232b39d45 100644
--- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::util;
 namespace framework
 {
 
-// ------------------------------------------------------------------
+
 
 // Wrapper class to notify controller about events from ListBox.
 // Unfortunaltly the events are notifed through virtual methods instead
@@ -118,7 +118,7 @@ bool ListBoxControl::PreNotify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// ------------------------------------------------------------------
+
 
 DropdownToolbarController::DropdownToolbarController(
     const Reference< XComponentContext >&    rxContext,
@@ -143,13 +143,13 @@ DropdownToolbarController::DropdownToolbarController(
     m_pListBoxControl->SetDropDownLineCount( 5 );
 }
 
-// ------------------------------------------------------------------
+
 
 DropdownToolbarController::~DropdownToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL DropdownToolbarController::dispose()
 throw ( RuntimeException )
@@ -164,7 +164,7 @@ throw ( RuntimeException )
     m_pListBoxControl = 0;
 }
 
-// ------------------------------------------------------------------
+
 Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 2 );
@@ -178,7 +178,7 @@ Sequence<PropertyValue> DropdownToolbarController::getExecuteArgs(sal_Int16 KeyM
     return aArgs;
 }
 
-// ------------------------------------------------------------------
+
 
 void DropdownToolbarController::Select()
 {
@@ -210,7 +210,7 @@ bool DropdownToolbarController::PreNotify( NotifyEvent& /*rNEvt*/ )
     return false;
 }
 
-// --------------------------------------------------------
+
 
 void DropdownToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx
index 954d3ae5056b..211de6c724df 100644
--- a/framework/source/uielement/edittoolbarcontroller.cxx
+++ b/framework/source/uielement/edittoolbarcontroller.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::util;
 namespace framework
 {
 
-// ------------------------------------------------------------------
+
 
 // Wrapper class to notify controller about events from edit.
 // Unfortunaltly the events are notifed through virtual methods instead
@@ -117,7 +117,7 @@ bool EditControl::PreNotify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// ------------------------------------------------------------------
+
 
 EditToolbarController::EditToolbarController(
     const Reference< XComponentContext >&    rxContext,
@@ -140,13 +140,13 @@ EditToolbarController::EditToolbarController(
     m_pToolbar->SetItemWindow( m_nID, m_pEditControl );
 }
 
-// ------------------------------------------------------------------
+
 
 EditToolbarController::~EditToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL EditToolbarController::dispose()
 throw ( RuntimeException )
@@ -161,7 +161,7 @@ throw ( RuntimeException )
     m_pEditControl = 0;
 }
 
-// ------------------------------------------------------------------
+
 Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 2 );
@@ -175,7 +175,7 @@ Sequence<PropertyValue> EditToolbarController::getExecuteArgs(sal_Int16 KeyModif
     return aArgs;
 }
 
-// ------------------------------------------------------------------
+
 
 void EditToolbarController::Modify()
 {
@@ -214,7 +214,7 @@ bool EditToolbarController::PreNotify( NotifyEvent& rNEvt )
     return false;
 }
 
-// --------------------------------------------------------
+
 
 void EditToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx
index 4105279a73e0..1f243371660d 100644
--- a/framework/source/uielement/fontmenucontroller.cxx
+++ b/framework/source/uielement/fontmenucontroller.cxx
@@ -36,9 +36,9 @@
 #include <vcl/mnemonic.hxx>
 #include <osl/mutex.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx
index 22752cd2686d..69625f061181 100644
--- a/framework/source/uielement/fontsizemenucontroller.cxx
+++ b/framework/source/uielement/fontsizemenucontroller.cxx
@@ -38,9 +38,9 @@
 #include <svtools/ctrltool.hxx>
 #include <osl/mutex.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx
index 04de4a921efd..1b866b0a88b3 100644
--- a/framework/source/uielement/footermenucontroller.cxx
+++ b/framework/source/uielement/footermenucontroller.cxx
@@ -38,9 +38,9 @@
 #include <vcl/i18nhelp.hxx>
 #include <rtl/ustrbuf.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx
index 1854b8761d90..f0656db07bd4 100644
--- a/framework/source/uielement/headermenucontroller.cxx
+++ b/framework/source/uielement/headermenucontroller.cxx
@@ -39,9 +39,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
index f6f6bdbdf172..3065fe785c8a 100644
--- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx
@@ -60,7 +60,7 @@ namespace framework
 
 static uno::WeakReference< util::XMacroExpander > m_xMacroExpander;
 
-// ------------------------------------------------------------------
+
 
 uno::Reference< util::XMacroExpander > GetMacroExpander()
 {
@@ -96,7 +96,7 @@ static void SubstituteVariables( OUString& aURL )
     }
 }
 
-// ------------------------------------------------------------------
+
 
 ImageButtonToolbarController::ImageButtonToolbarController(
     const Reference< XComponentContext >&    rxContext,
@@ -114,13 +114,13 @@ ImageButtonToolbarController::ImageButtonToolbarController(
     m_pToolbar->SetItemImage( m_nID, aImage );
 }
 
-// ------------------------------------------------------------------
+
 
 ImageButtonToolbarController::~ImageButtonToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL ImageButtonToolbarController::dispose()
 throw ( RuntimeException )
@@ -129,7 +129,7 @@ throw ( RuntimeException )
     ComplexToolbarController::dispose();
 }
 
-// ------------------------------------------------------------------
+
 
 void ImageButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 5749f0013257..e2c982cd902c 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -52,9 +52,9 @@
 #include <map>
 #include <set>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 using namespace ::com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index aca7a24becaf..9226539ad224 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -754,9 +754,9 @@ static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId)
         pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false );
 }
 
-//_________________________________________________________________________________________________________________
+
 // vcl handler
-//_________________________________________________________________________________________________________________
+
 
 namespace {
 
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index b602b3932a72..16da1544849d 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -46,9 +46,9 @@
 #include <unotools/moduleoptions.hxx>
 #include <osl/mutex.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
index a6f702d53da2..b1c88f89fb31 100644
--- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx
+++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star::util;
 namespace framework
 {
 
-// ------------------------------------------------------------------
+
 
 // Wrapper class to notify controller about events from combobox.
 // Unfortunaltly the events are notifed through virtual methods instead
@@ -171,7 +171,7 @@ bool SpinfieldControl::PreNotify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// ------------------------------------------------------------------
+
 
 SpinfieldToolbarController::SpinfieldToolbarController(
     const Reference< XComponentContext >&    rxContext,
@@ -201,13 +201,13 @@ SpinfieldToolbarController::SpinfieldToolbarController(
     m_pToolbar->SetItemWindow( m_nID, m_pSpinfieldControl );
 }
 
-// ------------------------------------------------------------------
+
 
 SpinfieldToolbarController::~SpinfieldToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL SpinfieldToolbarController::dispose()
 throw ( RuntimeException )
@@ -222,7 +222,7 @@ throw ( RuntimeException )
     m_pSpinfieldControl = 0;
 }
 
-// ------------------------------------------------------------------
+
 Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 2 );
@@ -239,7 +239,7 @@ Sequence<PropertyValue> SpinfieldToolbarController::getExecuteArgs(sal_Int16 Key
     return aArgs;
 }
 
-// ------------------------------------------------------------------
+
 
 void SpinfieldToolbarController::Up()
 {
@@ -336,7 +336,7 @@ bool SpinfieldToolbarController::PreNotify( NotifyEvent& rNEvt )
     return false;
 }
 
-// --------------------------------------------------------
+
 
 void SpinfieldToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
index 03068017932d..5dbe7a306d8b 100644
--- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx
+++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::util;
 namespace framework
 {
 
-// ------------------------------------------------------------------
+
 
 ToggleButtonToolbarController::ToggleButtonToolbarController(
     const Reference< XComponentContext >&    rxContext,
@@ -72,13 +72,13 @@ ToggleButtonToolbarController::ToggleButtonToolbarController(
         m_pToolbar->SetItemBits( m_nID, TIB_DROPDOWN | m_pToolbar->GetItemBits( m_nID ) );
 }
 
-// ------------------------------------------------------------------
+
 
 ToggleButtonToolbarController::~ToggleButtonToolbarController()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void SAL_CALL ToggleButtonToolbarController::dispose()
 throw ( RuntimeException )
@@ -87,7 +87,7 @@ throw ( RuntimeException )
     ComplexToolbarController::dispose();
 }
 
-// ------------------------------------------------------------------
+
 Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16 KeyModifier) const
 {
     Sequence<PropertyValue> aArgs( 2 );
@@ -100,7 +100,7 @@ Sequence<PropertyValue> ToggleButtonToolbarController::getExecuteArgs(sal_Int16
     return aArgs;
 }
 
-// ------------------------------------------------------------------
+
 
 uno::Reference< awt::XWindow > SAL_CALL ToggleButtonToolbarController::createPopupWindow()
 throw (::com::sun::star::uno::RuntimeException)
@@ -133,7 +133,7 @@ throw (::com::sun::star::uno::RuntimeException)
     return xWindow;
 }
 
-// ------------------------------------------------------------------
+
 
 void ToggleButtonToolbarController::executeControlCommand( const ::com::sun::star::frame::ControlCommand& rControlCommand )
 {
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index a1afbab0d253..ce4df551fefd 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -75,9 +75,9 @@
 #include <boost/bind.hpp>
 #include <svtools/acceleratorexecute.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 
 using namespace ::com::sun::star::awt;
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx
index aea77062fcd8..45b576561d1c 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -56,9 +56,9 @@
 #include <unotools/cmdoptions.hxx>
 #include <svtools/miscopt.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index 6e31dc6b23cb..413aabc0204d 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -46,9 +46,9 @@ using namespace com::sun::star::configuration;
 using namespace com::sun::star::container;
 using namespace ::com::sun::star::frame;
 
-//_________________________________________________________________________________________________________________
+
 //  Namespace
-//_________________________________________________________________________________________________________________
+
 
 struct ModuleToCommands
 {
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index dd61fa55ef7b..35c55755171e 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -33,18 +33,18 @@
 #include <rtl/ustrbuf.hxx>
 #include <cppuhelper/weak.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Defines
-//_________________________________________________________________________________________________________________
+
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
-//_________________________________________________________________________________________________________________
+
 //  Namespace
-//_________________________________________________________________________________________________________________
+
 
 namespace framework
 {
diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx
index 9e1f5a46050c..342bb280e3df 100644
--- a/framework/source/xml/acceleratorconfigurationreader.cxx
+++ b/framework/source/xml/acceleratorconfigurationreader.cxx
@@ -33,7 +33,7 @@
 
 namespace framework{
 
-//-----------------------------------------------
+
 /* Throws a SaxException in case a wrong formated XML
    structure was detected.
 
@@ -56,7 +56,7 @@ namespace framework{
                 css::uno::Any());                                       \
     }
 
-//-----------------------------------------------
+
 AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache& rContainer)
     : ThreadHelpBase          (&Application::GetSolarMutex())
     , m_rContainer            (rContainer                   )
@@ -65,19 +65,19 @@ AcceleratorConfigurationReader::AcceleratorConfigurationReader(AcceleratorCache&
 {
 }
 
-//-----------------------------------------------
+
 AcceleratorConfigurationReader::~AcceleratorConfigurationReader()
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::startDocument()
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException )
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::endDocument()
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException )
@@ -94,7 +94,7 @@ void SAL_CALL AcceleratorConfigurationReader::endDocument()
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&                                      sElement      ,
                                                            const css::uno::Reference< css::xml::sax::XAttributeList >& xAttributeList)
     throw(css::xml::sax::SAXException,
@@ -186,7 +186,7 @@ void SAL_CALL AcceleratorConfigurationReader::startElement(const OUString&
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElement)
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException )
@@ -210,21 +210,21 @@ void SAL_CALL AcceleratorConfigurationReader::endElement(const OUString& sElemen
     }
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::characters(const OUString&)
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException )
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::ignorableWhitespace(const OUString&)
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException )
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUString& /*sTarget*/,
                                                                     const OUString& /*sData*/  )
     throw(css::xml::sax::SAXException,
@@ -232,7 +232,7 @@ void SAL_CALL AcceleratorConfigurationReader::processingInstruction(const OUStri
 {
 }
 
-//-----------------------------------------------
+
 void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno::Reference< css::xml::sax::XLocator >& xLocator)
     throw(css::xml::sax::SAXException,
           css::uno::RuntimeException )
@@ -240,7 +240,7 @@ void SAL_CALL AcceleratorConfigurationReader::setDocumentLocator(const css::uno:
     m_xLocator = xLocator;
 }
 
-//-----------------------------------------------
+
 AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::implst_classifyElement(const OUString& sElement)
 {
     AcceleratorConfigurationReader::EXMLElement eElement;
@@ -257,7 +257,7 @@ AcceleratorConfigurationReader::EXMLElement AcceleratorConfigurationReader::impl
     return eElement;
 }
 
-//-----------------------------------------------
+
 AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::implst_classifyAttribute(const OUString& sAttribute)
 {
     AcceleratorConfigurationReader::EXMLAttribute eAttribute;
@@ -282,7 +282,7 @@ AcceleratorConfigurationReader::EXMLAttribute AcceleratorConfigurationReader::im
     return eAttribute;
 }
 
-//-----------------------------------------------
+
 OUString AcceleratorConfigurationReader::implts_getErrorLineString()
 {
     if (!m_xLocator.is())
diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx
index 70fa9ab70adf..f18a72b9de21 100644
--- a/framework/source/xml/acceleratorconfigurationwriter.cxx
+++ b/framework/source/xml/acceleratorconfigurationwriter.cxx
@@ -35,7 +35,7 @@
 namespace framework{
 
 
-//-----------------------------------------------
+
 AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const AcceleratorCache&                                       rContainer,
                                                                const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig   )
     : ThreadHelpBase(&Application::GetSolarMutex())
@@ -44,12 +44,12 @@ AcceleratorConfigurationWriter::AcceleratorConfigurationWriter(const Accelerator
 {
 }
 
-//-----------------------------------------------
+
 AcceleratorConfigurationWriter::~AcceleratorConfigurationWriter()
 {
 }
 
-//-----------------------------------------------
+
 void AcceleratorConfigurationWriter::flush()
 {
     // SAFE -> ----------------------------------
@@ -101,7 +101,7 @@ void AcceleratorConfigurationWriter::flush()
     xCFG->endDocument();
 }
 
-//-----------------------------------------------
+
 void AcceleratorConfigurationWriter::impl_ts_writeKeyCommandPair(const css::awt::KeyEvent&                                     aKey    ,
                                                                  const OUString&                                        sCommand,
                                                                  const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig )
diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx
index aab1e819c665..131e214c8513 100644
--- a/framework/source/xml/imagesdocumenthandler.cxx
+++ b/framework/source/xml/imagesdocumenthandler.cxx
@@ -601,9 +601,9 @@ OUString OReadImagesDocumentHandler::getErrorLineString()
 }
 
 
-//_________________________________________________________________________________________________________________
+
 //  OWriteImagesDocumentHandler
-//_________________________________________________________________________________________________________________
+
 
 OWriteImagesDocumentHandler::OWriteImagesDocumentHandler(
     const ImageListsDescriptor& aItems,
@@ -676,9 +676,9 @@ void OWriteImagesDocumentHandler::WriteImagesDocument() throw
     m_xWriteDocumentHandler->endDocument();
 }
 
-//_________________________________________________________________________________________________________________
+
 //  protected member functions
-//_________________________________________________________________________________________________________________
+
 
 void OWriteImagesDocumentHandler::WriteImageList( const ImageListItemDescriptor* pImageList ) throw
 ( SAXException, RuntimeException )
diff --git a/hwpfilter/source/cspline.cxx b/hwpfilter/source/cspline.cxx
index dc4f87f90dcd..cc238b3fb127 100644
--- a/hwpfilter/source/cspline.cxx
+++ b/hwpfilter/source/cspline.cxx
@@ -48,7 +48,7 @@
 // usage.
 
 #include "solver.h"
-//-----------------------------------------------------------------------------
+
 void NaturalSpline (int N, double* x, double* a, double*& b, double*& c,
     double*& d)
 {
diff --git a/hwpfilter/source/mzstring.cxx b/hwpfilter/source/mzstring.cxx
index 0c9cb56c3b5e..cdd85bce5bec 100644
--- a/hwpfilter/source/mzstring.cxx
+++ b/hwpfilter/source/mzstring.cxx
@@ -248,7 +248,7 @@ void MzString::replace(int pos, char ch)
 }
 
 
-//------------------------------------------------------------------------
+
 // Private Methods.
 //
 
diff --git a/hwpfilter/source/solver.cxx b/hwpfilter/source/solver.cxx
index 94a43890144e..334f61c2227f 100644
--- a/hwpfilter/source/solver.cxx
+++ b/hwpfilter/source/solver.cxx
@@ -20,7 +20,7 @@
 #include <math.h>
 #include "solver.h"
 
-//---------------------------------------------------------------------------
+
 double** mgcLinearSystemD::NewMatrix (int N)
 {
   double** A = new double*[N];
@@ -42,14 +42,14 @@ double** mgcLinearSystemD::NewMatrix (int N)
   }
   return A;
 }
-//---------------------------------------------------------------------------
+
 void mgcLinearSystemD::DeleteMatrix (int N, double** A)
 {
   for (int row = 0; row < N; row++)
     delete[] A[row];
   delete[] A;
 }
-//---------------------------------------------------------------------------
+
 double* mgcLinearSystemD::NewVector (int N)
 {
   double* B = new double[N];
@@ -60,7 +60,7 @@ double* mgcLinearSystemD::NewVector (int N)
     B[row] = 0;
   return B;
 }
-//---------------------------------------------------------------------------
+
 int mgcLinearSystemD::Solve (int n, double** a, double* b)
 {
   int* indxc = new int[n];
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx
index 44298154e38b..4637c14e39ec 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -38,7 +38,7 @@
 static LanguageType nImplSystemLanguage = LANGUAGE_DONTKNOW;
 static LanguageType nImplSystemUILanguage = LANGUAGE_DONTKNOW;
 
-// -----------------------------------------------------------------------
+
 
 // Get locale of category LC_CTYPE of environment variables
 static const sal_Char* getLangFromEnvironment()
@@ -57,7 +57,7 @@ static const sal_Char* getLangFromEnvironment()
     return pLang;
 }
 
-// -----------------------------------------------------------------------
+
 
 // Get locale of category LC_MESSAGES of environment variables
 static const sal_Char* getUILangFromEnvironment()
@@ -78,7 +78,7 @@ static const sal_Char* getUILangFromEnvironment()
     return pLang;
 }
 
-// -----------------------------------------------------------------------
+
 
 typedef const sal_Char * (*getLangFromEnv)();
 
@@ -120,7 +120,7 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 LanguageType MsLangId::getPlatformSystemLanguage()
 {
@@ -128,7 +128,7 @@ LanguageType MsLangId::getPlatformSystemLanguage()
     return nImplSystemLanguage;
 }
 
-// -----------------------------------------------------------------------
+
 
 LanguageType MsLangId::getPlatformSystemUILanguage()
 {
diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index 293aa78e82ad..750e5a21d79b 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -45,7 +45,7 @@ static LanguageType GetSVLang( LANGID nWinLangId )
     return LanguageType( static_cast<sal_uInt16>(nWinLangId & 0xffff));
 }
 
-// -----------------------------------------------------------------------
+
 
 typedef LANGID (WINAPI *getLangFromEnv)();
 
@@ -79,7 +79,7 @@ static void getPlatformSystemLanguageImpl( LanguageType& rSystemLanguage,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 LanguageType MsLangId::getPlatformSystemLanguage()
 {
@@ -88,7 +88,7 @@ LanguageType MsLangId::getPlatformSystemLanguage()
     return nImplSystemLanguage;
 }
 
-// -----------------------------------------------------------------------
+
 
 LanguageType MsLangId::getPlatformSystemUILanguage()
 {
diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx
index 990e25ffd7c7..57690c051e02 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -124,7 +124,7 @@ struct IsoLangOtherEntry
     const sal_Char*     mpLanguage;
 };
 
-// -----------------------------------------------------------------------
+
 
 // Entries for languages are lower case, for countries upper case, as
 // recommended by rfc5646 (obsoletes rfc4646 (obsoletes rfc3066 (obsoletes
@@ -777,7 +777,7 @@ OUString Bcp47CountryEntry::getTagString() const
     return lang::Locale( I18NLANGTAG_QLT, OUString::createFromAscii( maCountry), getTagString());
 }
 
-// -----------------------------------------------------------------------
+
 
 // In this table are the countries which should mapped to a specific
 // english language
@@ -846,7 +846,7 @@ static IsoLangEngEntry const aImplIsoLangEngEntries[] =
     { LANGUAGE_DONTKNOW,                    ""   }          // marks end of table
 };
 
-// -----------------------------------------------------------------------
+
 
 static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries[] =
 {
@@ -859,7 +859,7 @@ static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries[] =
     { LANGUAGE_DONTKNOW,                    "",   ""         }  // marks end of table
 };
 
-// -----------------------------------------------------------------------
+
 
 // in this table are only names to find the best language
 static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries2[] =
@@ -870,7 +870,7 @@ static IsoLangNoneStdEntry const aImplIsoNoneStdLangEntries2[] =
     { LANGUAGE_DONTKNOW,                    "",   ""         }  // marks end of table
 };
 
-// -----------------------------------------------------------------------
+
 
 // in this table are only names to find the best language
 static IsoLangOtherEntry const aImplOtherEntries[] =
@@ -980,7 +980,7 @@ Label_Override_Lang_Locale:
     // Not found. Passed rLocale argument remains unchanged.
 }
 
-// -----------------------------------------------------------------------
+
 
 // static
 com::sun::star::lang::Locale MsLangId::Conversion::getLocale( const IsoLanguageCountryEntry * pEntry )
@@ -1328,7 +1328,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OUString& rL
     return LANGUAGE_DONTKNOW;
 }
 
-// -----------------------------------------------------------------------
+
 
 // static
 LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLang,
@@ -1339,7 +1339,7 @@ LanguageType MsLangId::Conversion::convertIsoNamesToLanguage( const OString& rLa
     return convertIsoNamesToLanguage( aLang, aCountry);
 }
 
-// -----------------------------------------------------------------------
+
 
 struct IsoLangGLIBCModifiersEntry
 {
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 9afb85cc8960..86034d5f531d 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -547,7 +547,7 @@ DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyVal
 {
      // the Sequence of PropertyValues is expected to have at least 4 elements:
      // elt Name              Type             purpose
-     // -----------------------------------------------------------------
+
      //
      // 0.  "Prefix"          OUString
      // 1.  "NumberingType"   sal_Int16        type of formatting from style::NumberingType (roman, arabic, etc)
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index 7a9505a51c92..53be916c9c0e 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -20,10 +20,10 @@
 #include <stdio.h>
 #include <string.h>
 #include "LocaleNode.hxx"
-//-----------------------------------------
+
 // The document handler, which is needed for the saxparser
 // The Documenthandler for reading sax
-//-----------------------------------------
+
 OFileWriter::OFileWriter(const char *pcFile, const char *locale ) {
 
     strncpy( m_pcFile , pcFile, sizeof(m_pcFile) );
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index e0a1bc91bafe..f443141eb729 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -1346,7 +1346,7 @@ LocaleDataImpl::getContinuousNumberingLevels( const lang::Locale& rLocale ) thro
 namespace com{ namespace sun{ namespace star{ namespace lang {
     struct  Locale;
 }}}}
-//-----------------------------------------------------------------------------
+
 struct OutlineNumberingLevel_Impl
 {
     OUString        sPrefix;
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index c9ccc13f3719..2997d312f1e7 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.cxx
@@ -105,9 +105,9 @@ public:
     Sequence< sal_Int8> m_seq;
 };
 
-//-------------------------------
+
 // Helper : create an input stream from a file
-//------------------------------
+
 Reference< XInputStream > createStreamFromFile(
     const char *pcFile )
 {
@@ -329,10 +329,10 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         Reference< XComponentContext > xContext(
             defaultBootstrap_InitialComponentContext());
 
-        //--------------------------------
+
         // parser demo
         // read xml from a file and count elements
-        //--------------------------------
+
         Reference< XParser > rParser = Parser::create(xContext);
 
         int nError = 0;
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index d0e576f2c654..93b38d72a0df 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -94,7 +94,7 @@ typedef uno::Reference<
         TRLT_IMPLNAME_PREFIX  #implName, \
         &implName##_CreateInstance }
 
-// -------------------------------------------------------------------------------------
+
 
 using namespace i18n;
 
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index 90399d333f18..12ba7a1a100d 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-/*************************************************************************
+/*
 
     Weighted Levenshtein Distance
     including wildcards
@@ -53,9 +53,7 @@
 
     See also: German computer magazine
     c't 07/89 pages 192-208 and c't 03/94 pages 230-239
-
-*************************************************************************/
-
+*/
 
 #include <string.h>
 
@@ -69,7 +67,7 @@
 #undef min
 #endif
 
-#define LEVDISBIG   (nLimit + 1)    // Returnwert wenn Distanz > nLimit
+#define LEVDISBIG   (nLimit + 1)    // Return value if distance > nLimit
 #define LEVDISDOUBLEBUF 2048        // dadrueber wird nicht mehr gedoppelt
 
 // Balance, aus Geschwindigkeitsgruenden ist dieses keine Funktion
@@ -109,11 +107,11 @@ static sal_Int32 Impl_WLD_StringLen( const sal_Unicode* pStr )
     return (sal_Int32)(pTempStr-pStr);
 }
 
-// Distanz von String zu Pattern
+// Distance from string to pattern
 int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
 {
-    int nSPMin = 0;     // StrafPunkteMinimum
-    int nRepS = 0;      // fuer SplitCount
+    int nSPMin = 0;     // penalty point Minimum
+    int nRepS = 0;      // for SplitCount
 
     // Laengendifferenz von Pattern und String
     int nLenDiff = nPatternLen - nStars - nStringLen;
@@ -163,7 +161,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
         npDistance[0] = nInsQ0;     // mit einfachem Einfuegen geht's los
         npDistance[1] = nInsQ0;
         npDistance[2] = nInsQ0;
-        int nReplacePos = -1;       // tristate Flag
+        int nReplacePos = -1;       // tristate flag
         int nDelCnt = 0;
         for ( sal_Int32 i=1; i <= nStringLen; i++, nDelCnt += nDelR0 )
         {
@@ -232,7 +230,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
                 nPij = 0;           // p(i,j)
                 if ( nReplacePos < 0 )
                 {
-                    int nBalance = 0;   // gleiche Anzahl c
+                    int nBalance = 0;   // same quantity c
                     LEVDISBALANCE( j, i-1 );
                     if ( !nBalance )
                         nReplacePos = 0;    // keine Ersetzung mehr
@@ -249,7 +247,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
             if ( bSplitCount )
             {
                 if ( nReplacePos < 0 && nPij && npDistance[i] == d1 + nPij )
-                {   // diese Stelle wird ersetzt
+                {   // this poition will be replaced
                     nRepS++;
                     nReplacePos = i;
                 }
@@ -261,7 +259,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
                     // Replace keins. Buchstabendreher werden hier erfasst
                     // und der ReplaceS zurueckgenommen, wodurch das doppelte
                     // Limit zum Tragen kommt.
-                    int nBalance = 0;   // gleiche Anzahl c
+                    int nBalance = 0;   // same quantity c
                     LEVDISBALANCE( j, i-1 );
                     if ( !nBalance )
                     {   // einer wurde ersetzt, der ein Insert war
@@ -279,7 +277,7 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
         if ( bSplitCount )
         {
             if ( nRepS && nLenDiff > 0 )
-                nRepS -= nLenDiff;      // Inserts wurden mitgezaehlt
+                nRepS -= nLenDiff;      // Inserts were counted
             if ( (nSPMin <= 2 * nLimit)
                     && (npDistance[nStringLen] <= 2 * nLimit)
                     && (nRepS * nRepP0 <= nLimit) )
@@ -290,25 +288,23 @@ int WLevDistance::WLD( const sal_Unicode* cString, sal_Int32 nStringLen )
     }
 }
 
-
-
-// Berechnung von nLimit,   nReplP0,    nInsQ0,     nDelR0,     bSplitCount
-// aus Userwerten           nOtherX,    nShorterY,  nLongerZ,   bRelaxed
+// Calculating nLimit,   nReplP0,    nInsQ0,     nDelR0,     bSplitCount
+// from user values           nOtherX,    nShorterY,  nLongerZ,   bRelaxed
 int WLevDistance::CalcLPQR( int nX, int nY, int nZ, bool bRelaxed )
 {
-    if ( nX < 0 ) nX = 0;       // nur positive Werte
+    if ( nX < 0 ) nX = 0;       // only positive values
     if ( nY < 0 ) nY = 0;
     if ( nZ < 0 ) nZ = 0;
-    if (0 == Min3( nX, nY, nZ ))     // mindestens einer 0
+    if (0 == Min3( nX, nY, nZ ))     // at least one 0
     {
         int nMid, nMax;
-        nMax = Max3( nX, nY, nZ );      // entweder 0 bei drei 0 oder Max
-        if ( 0 == (nMid = Mid3( nX, nY, nZ )) )     // sogar zwei 0
-            nLimit = nMax;  // entweder 0 oder einziger >0
-        else        // einer 0
+        nMax = Max3( nX, nY, nZ );      // either 0 for three 0s or Max
+        if ( 0 == (nMid = Mid3( nX, nY, nZ )) )     // even two 0
+            nLimit = nMax;  // either 0 or the only one >0
+        else        // one is 0
             nLimit = KGV( nMid, nMax );
     }
-    else        // alle drei nicht 0
+    else        // all three of them are not 0
         nLimit = KGV( KGV( nX, nY ), nZ );
     nRepP0 = ( nX ? nLimit / nX : nLimit + 1 );
     nInsQ0 = ( nY ? nLimit / nY : nLimit + 1 );
@@ -317,8 +313,6 @@ int WLevDistance::CalcLPQR( int nX, int nY, int nZ, bool bRelaxed )
     return( nLimit );
 }
 
-
-
 // Groesster Gemeinsamer Teiler nach Euklid (Kettendivision)
 // Sonderfall: 0 und irgendwas geben 1
 int WLevDistance::GGT( int a, int b )
@@ -337,8 +331,6 @@ int WLevDistance::GGT( int a, int b )
     return( a ? a : b);
 }
 
-
-
 // Kleinstes Gemeinsames Vielfaches: a * b / GGT(a,b)
 int WLevDistance::KGV( int a, int b )
 {
@@ -348,8 +340,7 @@ int WLevDistance::KGV( int a, int b )
         return( (b / GGT(a,b)) * a );
 }
 
-
-// Minimum von drei Werten
+// Minimum of three values
 inline int WLevDistance::Min3( int x, int y, int z )
 {
     if ( x < y )
@@ -358,9 +349,7 @@ inline int WLevDistance::Min3( int x, int y, int z )
         return( y < z ? y : z );
 }
 
-
-
-// mittlerer von drei Werten
+// The value in the middle
 int WLevDistance::Mid3( int x, int y, int z )
 {
     int min = Min3(x,y,z);
@@ -372,9 +361,7 @@ int WLevDistance::Mid3( int x, int y, int z )
         return( x < y ? x : y);
 }
 
-
-
-// Maximum von drei Werten
+// Maximum of three values
 int WLevDistance::Max3( int x, int y, int z )
 {
     if ( x > y )
@@ -383,8 +370,6 @@ int WLevDistance::Max3( int x, int y, int z )
         return( y > z ? y : z );
 }
 
-
-
 // Daten aus CTor initialisieren
 void WLevDistance::InitData( const sal_Unicode* cPattern )
 {
@@ -395,12 +380,12 @@ void WLevDistance::InitData( const sal_Unicode* cPattern )
     const sal_Unicode* cp1 = cPattern;
     sal_Unicode* cp2 = cpPattern;
     bool* bp = bpPatIsWild;
-    // Pattern kopieren, Sternchen zaehlen, escaped Jokers
+    // copy pattern, count asterisks, escaped Jokers
     while ( *cp1 )
     {
         if ( *cp1 == '\\' )     // maybe escaped
         {
-            if ( *(cp1+1) == '*' || *(cp1+1) == '?' )   // naechstes Joker?
+            if ( *(cp1+1) == '*' || *(cp1+1) == '?' )   // next Joker?
             {
                 cp1++;          // skip '\\'
                 nPatternLen--;
@@ -420,7 +405,6 @@ void WLevDistance::InitData( const sal_Unicode* cPattern )
     *cp2 = '\0';
 }
 
-
 WLevDistance::WLevDistance( const sal_Unicode* cPattern,
                             int nOtherX, int nShorterY, int nLongerZ,
                             bool bRelaxed ) :
@@ -433,7 +417,6 @@ WLevDistance::WLevDistance( const sal_Unicode* cPattern,
     CalcLPQR( nOtherX, nShorterY, nLongerZ, bRelaxed );
 }
 
-
 // CopyCTor
 WLevDistance::WLevDistance( const WLevDistance& rWLD ) :
     nPatternLen( rWLD.nPatternLen ),
@@ -459,7 +442,6 @@ WLevDistance::WLevDistance( const WLevDistance& rWLD ) :
     cpPattern[i] = '\0';
 }
 
-
 // DTor
 WLevDistance::~WLevDistance()
 {
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 62e38d775736..c5ac12add07b 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -424,7 +424,7 @@ SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 st
     return sres;
 }
 
-//---------------------------------------------------------------------
+
 
 bool TextSearch::IsDelimiter( const OUString& rStr, sal_Int32 nPos ) const
 {
@@ -792,7 +792,7 @@ void TextSearch::RESrchPrepare( const ::com::sun::star::util::SearchOptions& rOp
     }
 }
 
-//---------------------------------------------------------------------------
+
 
 static bool lcl_findRegex( RegexMatcher * pRegexMatcher, sal_Int32 nStartPos, UErrorCode & rIcuErr )
 {
@@ -932,7 +932,7 @@ SearchResult TextSearch::RESrchBkwrd( const OUString& searchStr,
     return aRet;
 }
 
-//---------------------------------------------------------------------------
+
 
 // search for words phonetically
 SearchResult TextSearch::ApproxSrchFrwrd( const OUString& searchStr,
diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx
index adeb46d5fadf..94799b77e6a4 100644
--- a/io/source/stm/odata.cxx
+++ b/io/source/stm/odata.cxx
@@ -894,7 +894,7 @@ Sequence<OUString> ODataOutputStream_getSupportedServiceNames(void)
     return aRet;
 }
 
-//--------------------------------------
+
 struct equalObjectContainer_Impl
 {
     bool operator()(const Reference< XInterface > & s1,
@@ -904,7 +904,7 @@ struct equalObjectContainer_Impl
     }
 };
 
-//-----------------------------------------------------------------------------
+
 struct hashObjectContainer_Impl
 {
     size_t operator()(const Reference< XInterface > & xRef) const
diff --git a/io/source/stm/omark.cxx b/io/source/stm/omark.cxx
index 7f0261e40b41..af476040d272 100644
--- a/io/source/stm/omark.cxx
+++ b/io/source/stm/omark.cxx
@@ -471,11 +471,11 @@ Sequence<OUString> OMarkableOutputStream_getSupportedServiceNames(void)
 
 
 
-//------------------------------------------------
+
 //
 // XMarkableInputStream
 //
-//------------------------------------------------
+
 
 class OMarkableInputStream :
     public WeakImplHelper5
diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx
index 93b4f51e49ed..35d1233e5ad5 100644
--- a/io/source/stm/opump.cxx
+++ b/io/source/stm/opump.cxx
@@ -303,7 +303,7 @@ void Pump::run()
     }
 }
 
-// ------------------------------------------------------------
+
 
 /*
  * XConnectable
@@ -315,7 +315,7 @@ void Pump::setPredecessor( const Reference< XConnectable >& xPred ) throw()
     m_xPred = xPred;
 }
 
-// ------------------------------------------------------------
+
 
 Reference< XConnectable > Pump::getPredecessor() throw()
 {
@@ -323,7 +323,7 @@ Reference< XConnectable > Pump::getPredecessor() throw()
     return m_xPred;
 }
 
-// ------------------------------------------------------------
+
 
 void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw()
 {
@@ -331,7 +331,7 @@ void Pump::setSuccessor( const Reference< XConnectable >& xSucc ) throw()
     m_xSucc = xSucc;
 }
 
-// ------------------------------------------------------------
+
 
 Reference< XConnectable > Pump::getSuccessor() throw()
 {
@@ -339,7 +339,7 @@ Reference< XConnectable > Pump::getSuccessor() throw()
     return m_xSucc;
 }
 
-// -----------------------------------------------------------------
+
 
 /*
  * XActiveDataControl
@@ -350,14 +350,14 @@ void Pump::addListener( const Reference< XStreamListener >& xListener ) throw()
     m_cnt.addInterface( xListener );
 }
 
-// ------------------------------------------------------------
+
 
 void Pump::removeListener( const Reference< XStreamListener >& xListener ) throw()
 {
     m_cnt.removeInterface( xListener );
 }
 
-// ------------------------------------------------------------
+
 
 void Pump::start() throw( RuntimeException )
 {
@@ -377,7 +377,7 @@ void Pump::start() throw( RuntimeException )
     }
 }
 
-// ------------------------------------------------------------
+
 
 void Pump::terminate() throw()
 {
@@ -391,7 +391,7 @@ void Pump::terminate() throw()
     fireClose();
 }
 
-// ------------------------------------------------------------
+
 
 /*
  * XActiveDataSink
@@ -407,7 +407,7 @@ void Pump::setInputStream( const Reference< XInputStream >& xStream ) throw()
     // data transfer starts in XActiveDataControl::start
 }
 
-// ------------------------------------------------------------
+
 
 Reference< XInputStream > Pump::getInputStream() throw()
 {
@@ -415,7 +415,7 @@ Reference< XInputStream > Pump::getInputStream() throw()
     return m_xInput;
 }
 
-// ------------------------------------------------------------
+
 
 /*
  * XActiveDataSource
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index 6730d2d49c85..6ac56583619c 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -400,7 +400,7 @@ OUString    OMarkableOutputStreamTest_getImplementationName() throw ()
 
 
 
-//-----------------------------------------------------
+
 // Input stream
 
 
diff --git a/io/test/testcomponent.cxx b/io/test/testcomponent.cxx
index e0a63c5d4173..260c723a1036 100644
--- a/io/test/testcomponent.cxx
+++ b/io/test/testcomponent.cxx
@@ -18,7 +18,7 @@
  */
 
 
-//------------------------------------------------------
+
 // testcomponent - Loads a service and its testcomponent from dlls performs a test.
 // Expands the dll-names depending on the actual environment.
 // Example : testcomponent com.sun.star.io.Pipe stm
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index f7f5fd786d85..5278443c6ec2 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -45,7 +45,7 @@ static bool s_inited = false;
 
 extern "C" { static void SAL_CALL thisModule() {} }
 
-//--------------------------------------------------------------------------------------------------
+
 static bool inited_juhx( JNIEnv * jni_env )
 {
     if (s_inited)
diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx
index 34ccf25cc26f..115019da1d74 100644
--- a/jvmaccess/workbench/javainfo/javainfotest.cxx
+++ b/jvmaccess/workbench/javainfo/javainfotest.cxx
@@ -95,7 +95,7 @@ bool test_constructor2()
     JavaInfo a("file:///d:/java/j2sdk1.4.1_01");
 //    -----------------------------------------------------
 //    JavaInfo a("file:///usr/local2/jl/java/j2sdk1.4.0");
-//------------------------------------------------------------
+
 //    JavaInfo a("file:///local/jl/java/j2sdk1.4.0");
     try{
         JavaInfo info= JavaInfo(OUString(), 0);
@@ -300,7 +300,7 @@ bool test_isEqual()
 
     JavaInfo c("file:///c:/local/r/j2sdk1.4.0");// not Accessible
     JavaInfo d("file:///d:/java/copy_j2sdk1.4.0");
-//-------------------------------------------------------------------
+
 //     JavaInfo a("file:///usr/local2/jl/java/j2re1_3_1_02");
 //     JavaInfo b("file:///usr/local2/jl/java/j2re1_3_1_02");
 
diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx
index 75e5816a78cb..0ff666f89321 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.cxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.cxx
@@ -539,15 +539,15 @@ void LwpCellLayout::RegisterDefaultCell()
                 pBorders->SetWidth(enumXFBorderBottom, 0);
                 break;
             case enumWholeBorder:
-                //--
+
                 //||
-                //--
+
                 // nothing to remove
                 break;
             case enumNoLeftBorder:
                 //
                 //| |
-                //--
+
                 // remove left line
                 pBorders->SetWidth(enumXFBorderLeft, 0);
                 break;
diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
index 505403261968..e017c0858e69 100644
--- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx
@@ -74,7 +74,7 @@ void XFListLevel::ToXml(IXFStream * /*pStrm*/)
 {
 }
 
-//----------------------------------------------------
+
 
 void XFListlevelNumber::ToXml(IXFStream *pStrm)
 {
@@ -153,7 +153,7 @@ void    XFListLevelBullet::ToXml(IXFStream *pStrm)
     pStrm->EndElement( A2OUSTR("text:list-level-style-bullet") );
 }
 
-//----------------------------------------------------
+
 XFListStyle::XFListStyle()
 {
     XFNumFmt    nf;
diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index e7f9ef817870..f9e605dc8c33 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -48,7 +48,7 @@ using namespace connectivity::mysqlc;
 
 #include <stdio.h>
 
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::container;
 using namespace com::sun::star::lang;
@@ -729,7 +729,7 @@ sal_Int32 OConnection::getMysqlVersion()
 //  }
 //  return 0;
 //}
-// -----------------------------------------------------------------------------
+
 OUString OConnection::transFormPreparedStatement(const OUString& _sSQL)
 {
     OUString sSqlStatement = _sSQL;
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index bf086af3ca8a..e19ab9fe9416 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -55,7 +55,7 @@ using mysqlc_sdbc_driver::getStringFromAny;
 static std::string wild("%");
 
 
-// -----------------------------------------------------------------------------
+
 void lcl_setRows_throw(const Reference< XResultSet >& _xResultSet,sal_Int32 _nType,const std::vector< std::vector< Any > >& _rRows)
 {
     Reference< XInitialization> xIni(_xResultSet,UNO_QUERY);
diff --git a/mysqlc/source/mysqlc_general.cxx b/mysqlc/source/mysqlc_general.cxx
index ba330478fed6..4cf7e9842345 100644
--- a/mysqlc/source/mysqlc_general.cxx
+++ b/mysqlc/source/mysqlc_general.cxx
@@ -31,7 +31,7 @@ using com::sun::star::uno::Any;
 
 namespace mysqlc_sdbc_driver
 {
-// -----------------------------------------------------------------------------
+
 void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const Reference< XInterface >& _rxContext, const Any* _pNextException )
     throw (SQLException)
 {
diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx
index 036984290125..5176b46ba1eb 100644
--- a/mysqlc/source/mysqlc_resultsetmetadata.cxx
+++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
 }
diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx
index 0d5de2b47f7d..7fce927430eb 100644
--- a/mysqlc/source/mysqlc_statement.cxx
+++ b/mysqlc/source/mysqlc_statement.cxx
@@ -37,7 +37,7 @@
 #include <osl/thread.h>
 
 using namespace connectivity::mysqlc;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
diff --git a/o3tl/qa/cow_wrapper_clients.cxx b/o3tl/qa/cow_wrapper_clients.cxx
index bfb53f22a9bd..d49dd092865b 100644
--- a/o3tl/qa/cow_wrapper_clients.cxx
+++ b/o3tl/qa/cow_wrapper_clients.cxx
@@ -103,7 +103,7 @@ bool cow_wrapper_client2::operator<( const cow_wrapper_client2& rRHS ) const
     return maImpl < rRHS.maImpl;
 }
 
-// ---------------------------------------------------------------------------
+
 
 cow_wrapper_client3::cow_wrapper_client3() : maImpl()
 {
@@ -170,7 +170,7 @@ bool cow_wrapper_client3::operator<( const cow_wrapper_client3& rRHS ) const
     return maImpl < rRHS.maImpl;
 }
 
-// ---------------------------------------------------------------------------
+
 
 namespace { struct theDefaultClient4 : public rtl::Static< o3tl::cow_wrapper< int >,
                                                             theDefaultClient4 > {}; }
diff --git a/o3tl/qa/test-cow_wrapper.cxx b/o3tl/qa/test-cow_wrapper.cxx
index e3682064dc75..82bc2be8d91b 100644
--- a/o3tl/qa/test-cow_wrapper.cxx
+++ b/o3tl/qa/test-cow_wrapper.cxx
@@ -171,7 +171,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(cow_wrapper_test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index ff0e49c05fa9..d89fc7323775 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.cxx
@@ -220,7 +220,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class range_test
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(range_test);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/o3tl/qa/test-sorted_vector.cxx b/o3tl/qa/test-sorted_vector.cxx
index ee2e818a555e..5f068d998ca0 100644
--- a/o3tl/qa/test-sorted_vector.cxx
+++ b/o3tl/qa/test-sorted_vector.cxx
@@ -260,7 +260,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(sorted_vector_test);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
index 3d6a5ef16d59..6cf87bb1651a 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx
@@ -46,12 +46,12 @@
 
 using namespace connectivity::skeleton;
 
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
-// --------------------------------------------------------------------------------
+
 OConnection::OConnection(SkeletonDriver*    _pDriver)
                          : OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this),
                          OMetaConnection_BASE(m_aMutex),
@@ -63,7 +63,7 @@ OConnection::OConnection(SkeletonDriver*    _pDriver)
 {
     m_pDriver->acquire();
 }
-//-----------------------------------------------------------------------------
+
 OConnection::~OConnection()
 {
     if(!isClosed())
@@ -71,13 +71,13 @@ OConnection::~OConnection()
     m_pDriver->release();
     m_pDriver = NULL;
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OConnection::release() throw()
 {
     relase_ChildImpl();
 }
-// -----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
 void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
@@ -132,10 +132,10 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
     osl_atomic_decrement( &m_refCount );
 }
 // XServiceInfo
-// --------------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.skeleton.OConnection", "com.sun.star.sdbc.Connection")
 
-// --------------------------------------------------------------------------------
+
 Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -147,7 +147,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -163,7 +163,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::
     m_aStatements.push_back(WeakReferenceHelper(xReturn));
     return xReturn;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -172,7 +172,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::
     // not implemented yet :-) a task to do
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -180,14 +180,14 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::
 
     return _sSql;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
     // here you  have to set your commit mode please have a look at the jdbc documentation to get a clear explanation
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -197,7 +197,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit(  ) throw(SQLException, RuntimeExce
 
     return sal_True;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -205,7 +205,7 @@ void SAL_CALL OConnection::commit(  ) throw(SQLException, RuntimeException)
 
     // when you database does support transactions you should commit here
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -214,7 +214,7 @@ void SAL_CALL OConnection::rollback(  ) throw(SQLException, RuntimeException)
 
     // same as commit but for the other case
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -222,7 +222,7 @@ sal_Bool SAL_CALL OConnection::isClosed(  ) throw(SQLException, RuntimeException
     // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent)
     return OConnection_BASE::rBHelper.bDisposed;
 }
-// --------------------------------------------------------------------------------
+
 Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -239,7 +239,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData(  ) throw(SQLEx
 
     return xMetaData;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -247,7 +247,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException,
 
     // set you connection to readonly
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -256,7 +256,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
     // return if your connection to readonly
     return sal_False;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -264,7 +264,7 @@ void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQ
 
     // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do
 }
-// --------------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -274,7 +274,7 @@ void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQ
     // return your current catalog
     return ::rtl::OUString();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -283,7 +283,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE
     // set your isolation level
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -293,7 +293,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation(  ) throw(SQLException,
     // please have a look at @see com.sun.star.sdbc.TransactionIsolation
     return TransactionIsolation::NONE;
 }
-// --------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -303,12 +303,12 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getT
 
     return NULL;
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
     // the other way around
 }
-// --------------------------------------------------------------------------------
+
 // XCloseable
 void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
 {
@@ -320,19 +320,19 @@ void SAL_CALL OConnection::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// --------------------------------------------------------------------------------
+
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     // when you collected some warnings -> return it
     return Any();
 }
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     // you should clear your collected warnings here
 }
-//--------------------------------------------------------------------
+
 void OConnection::buildTypeInfo() throw( SQLException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -377,7 +377,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
     Reference< XCloseable> xClose(xRs,UNO_QUERY);
     xClose->close();
 }
-//------------------------------------------------------------------------------
+
 void OConnection::disposing()
 {
     // we noticed that we should be destroied in near future so we have to dispose our statements
@@ -397,7 +397,7 @@ void OConnection::disposing()
     dispose_ChildImpl();
     OConnection_BASE::disposing();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
index 05c74a020ecb..017faf0650fa 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx
@@ -57,11 +57,11 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
         osl_atomic_decrement( &m_refCount );
     }
 }
-// -------------------------------------------------------------------------
+
 ODatabaseMetaData::~ODatabaseMetaData()
 {
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aVal;
@@ -71,136 +71,136 @@ ODatabaseMetaData::~ODatabaseMetaData()
 
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aVal;
@@ -209,25 +209,25 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLExc
     }
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
     ::rtl::OUString aVal("\"");
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aVal;
     return aVal;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart(  ) throw(SQLException, RuntimeException)
 {
     sal_Bool bValue = sal_False;
@@ -236,638 +236,638 @@ sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart(  ) throw(SQLException, Ru
     }
     return bValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_True; // should be supported at least
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue("sdbc:skeleton:");
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
 {
     return 1;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation(  ) throw(SQLException, RuntimeException)
 {
     return TransactionIsolation::NONE;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     ::rtl::OUString aValue;
     return aValue;
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength(  ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nValue = 0; // 0 means no limit
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection(  ) throw(SQLException, RuntimeException)
 {
     return (Reference< XConnection >)m_pConnection;//new OConnection(m_aConnectionHandle);
 }
-// -------------------------------------------------------------------------
+
 // here follow all methods which return a resultset
 // the first methods is an example implementation how to use this resultset
 // of course you could implement it on your and you should do this because
 // the general way is more memory expensive
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
     const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
     const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern,
     const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     const Any& catalog, const ::rtl::OUString& schemaPattern,
     const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
     const Any& catalog, const ::rtl::OUString& schemaPattern,
     const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
     const Any& catalog, const ::rtl::OUString& schemaPattern,
     const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
     sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier(
     const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope,
     sal_Bool nullable ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
     const Any& primaryCatalog, const ::rtl::OUString& primarySchema,
     const ::rtl::OUString& primaryTable, const Any& foreignCatalog,
@@ -875,14 +875,14 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
 {
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
 {
     OSL_FAIL("Not implemented yet!");
     throw SQLException();
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
index 78d8145f8cd5..4134c83aff47 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SDriver.cxx
@@ -53,12 +53,12 @@ namespace connectivity
         }
     }
 }
-// --------------------------------------------------------------------------------
+
 SkeletonDriver::SkeletonDriver()
     : ODriver_BASE(m_aMutex)
 {
 }
-// --------------------------------------------------------------------------------
+
 void SkeletonDriver::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -76,7 +76,7 @@ void SkeletonDriver::disposing()
 }
 
 // static ServiceInfo
-//------------------------------------------------------------------------------
+
 rtl::OUString SkeletonDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
     return rtl::OUString("com.sun.star.comp.sdbc.SkeletonDriver");
@@ -118,7 +118,7 @@ Reference< XConnection > SAL_CALL SkeletonDriver::connect( const ::rtl::OUString
 
     return xCon;
 }
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SkeletonDriver::acceptsURL( const ::rtl::OUString& url )
         throw(SQLException, RuntimeException)
 {
@@ -126,23 +126,23 @@ sal_Bool SAL_CALL SkeletonDriver::acceptsURL( const ::rtl::OUString& url )
     // change the URL format to your needs, but please aware that the first on who accepts the URl wins.
     return url.startsWith("sdbc:skeleton:");
 }
-// --------------------------------------------------------------------------------
+
 Sequence< DriverPropertyInfo > SAL_CALL SkeletonDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     // if you have something special to say, return it here :-)
     return Sequence< DriverPropertyInfo >();
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SkeletonDriver::getMajorVersion(  ) throw(RuntimeException)
 {
     return 0; // depends on you
 }
-// --------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SkeletonDriver::getMinorVersion(  ) throw(RuntimeException)
 {
     return 1; // depends on you
 }
-// --------------------------------------------------------------------------------
+
 
 //.........................................................................
 namespace connectivity
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
index 17217402462f..1e9563a55f23 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx
@@ -62,21 +62,21 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const TTypeInf
     ,m_nNumParams(0)
 {
 }
-// -----------------------------------------------------------------------------
+
 OPreparedStatement::~OPreparedStatement()
 {
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatement_BASE2::queryInterface(rType);
@@ -84,12 +84,12 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt
         aRet = OPreparedStatement_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -100,7 +100,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData(  ) thr
         m_xMetaData = new OResultSetMetaData(getOwnConnection());
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException)
 {
@@ -121,7 +121,7 @@ void SAL_CALL OPreparedStatement::close(  ) throw(SQLException, RuntimeException
     // Remove this Statement object from the Connection object's
     // list
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeException)
 {
@@ -132,7 +132,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute(  ) throw(SQLException, RuntimeExc
     // same as in statement with the difference that this statement also can contain parameter
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, RuntimeException)
 {
@@ -142,14 +142,14 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
     // same as in statement with the difference that this statement also can contain parameter
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -158,7 +158,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection(  ) throw(SQ
 
     return (Reference< XConnection >)m_pConnection;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLException, RuntimeException)
 {
@@ -170,7 +170,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery(  ) throw(SQLE
 
     return rs;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
@@ -178,7 +178,7 @@ void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -186,7 +186,7 @@ void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x
 
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException)
 {
@@ -194,7 +194,7 @@ void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date&
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time& aVal ) throw(SQLException, RuntimeException)
@@ -203,7 +203,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const Time&
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException)
 {
@@ -211,7 +211,7 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException)
 {
@@ -220,7 +220,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x
 
 }
 
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException)
 {
@@ -228,7 +228,7 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x )
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
@@ -236,7 +236,7 @@ void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 aVal ) throw(SQLException, RuntimeException)
 {
@@ -244,7 +244,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 a
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(SQLException, RuntimeException)
 {
@@ -252,7 +252,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException)
 {
@@ -260,7 +260,7 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException)
 {
@@ -268,7 +268,7 @@ void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Refer
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException)
 {
@@ -276,7 +276,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException)
 {
@@ -284,7 +284,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
@@ -292,7 +292,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
     ::osl::MutexGuard aGuard( m_aMutex );
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException)
 {
@@ -300,7 +300,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
@@ -308,7 +308,7 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
@@ -316,7 +316,7 @@ void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
@@ -324,7 +324,7 @@ void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequ
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 
 void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
@@ -333,7 +333,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex,
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -341,27 +341,27 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OPreparedStatement::clearBatch(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch(  ) throw(SQLException, RuntimeException)
 {
     return Sequence< sal_Int32 > ();
 }
-// -------------------------------------------------------------------------
+
 void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     switch(nHandle)
@@ -378,13 +378,13 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
             OStatement_Base::setFastPropertyValue_NoBroadcast(nHandle,rValue);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex)
 {
     if( !_parameterIndex || _parameterIndex > m_nNumParams)
         throw SQLException();
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
index 5399186f9e77..b8e688c886fe 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx
@@ -97,7 +97,7 @@ void OResultSet::disposing(void)
     m_aStatement    = NULL;
     m_xMetaData     = NULL;
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OPropertySetHelper::queryInterface(rType);
@@ -105,7 +105,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
         aRet = OResultSet_BASE::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
  Sequence<  Type > SAL_CALL OResultSet::getTypes(  ) throw( RuntimeException)
 {
     OTypeCollection aTypes(
@@ -115,7 +115,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
     return concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
 {
@@ -135,7 +135,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) t
             break;
     return i;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -144,7 +144,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 column
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -154,7 +154,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 col
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLExcep
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -173,7 +173,7 @@ sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLExceptio
     sal_Int8 nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -183,7 +183,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro
 
     return Sequence< sal_Int8 >();
 }
-// -------------------------------------------------------------------------
+
 
 Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -194,7 +194,7 @@ Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, R
     Date nRet;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -205,7 +205,7 @@ double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLExceptio
     double nRet = 0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -216,7 +216,7 @@ float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException,
     float nVal(0);
     return nVal;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -226,7 +226,7 @@ sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLExceptio
     sal_Int32 nRet=0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
 {
@@ -236,7 +236,7 @@ sal_Int32 SAL_CALL OResultSet::getRow(  ) throw(SQLException, RuntimeException)
     sal_Int32 nValue = 0;
     return nValue;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -245,7 +245,7 @@ sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLExcepti
 
     return sal_Int64();
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLException, RuntimeException)
 {
@@ -257,7 +257,7 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData(  ) throw(SQLEx
         m_xMetaData = new OResultSetMetaData(m_pStatement->getOwnConnection());
     return m_xMetaData;
 }
-// -------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -266,7 +266,7 @@ Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw
     return NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -275,7 +275,7 @@ Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(S
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -283,7 +283,7 @@ Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 columnIndex ) throw(S
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -292,7 +292,7 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQL
 
     return NULL;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
@@ -301,7 +301,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::co
 
     return Any();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -312,7 +312,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
     sal_Int16 nRet=0;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 
 ::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -324,7 +324,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
     ::rtl::OUString nRet;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
@@ -335,7 +335,7 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, R
     Time nRet;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 
 DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
@@ -348,7 +348,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLExc
     DateTime nRet;
     return nRet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
@@ -360,7 +360,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst(  ) throw(SQLException, RuntimeExcep
     // return true means there is no data
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -368,7 +368,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast(  ) throw(SQLException, RuntimeExcepti
 
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -377,7 +377,7 @@ sal_Bool SAL_CALL OResultSet::isFirst(  ) throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -386,7 +386,7 @@ sal_Bool SAL_CALL OResultSet::isLast(  ) throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -395,13 +395,13 @@ void SAL_CALL OResultSet::beforeFirst(  ) throw(SQLException, RuntimeException)
     // move before the first row so that isBeforeFirst returns false
     // the same for other movement methods
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
 {
@@ -412,7 +412,7 @@ void SAL_CALL OResultSet::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 {
@@ -421,7 +421,7 @@ sal_Bool SAL_CALL OResultSet::first(  ) throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 {
@@ -430,7 +430,7 @@ sal_Bool SAL_CALL OResultSet::last(  ) throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -438,7 +438,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -446,7 +446,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -454,7 +454,7 @@ sal_Bool SAL_CALL OResultSet::previous(  ) throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -463,7 +463,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement(  ) throw(SQLException
 
     return m_aStatement.get();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
@@ -473,7 +473,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted(  ) throw(SQLException, RuntimeExceptio
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -482,7 +482,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted(  ) throw(SQLException, RuntimeExcepti
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -491,7 +491,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated(  ) throw(SQLException, RuntimeExceptio
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 {
@@ -501,7 +501,7 @@ sal_Bool SAL_CALL OResultSet::next(  ) throw(SQLException, RuntimeException)
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
@@ -511,7 +511,7 @@ sal_Bool SAL_CALL OResultSet::wasNull(  ) throw(SQLException, RuntimeException)
 
     return m_bWasNull;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
 {
@@ -519,16 +519,16 @@ void SAL_CALL OResultSet::cancel(  ) throw(RuntimeException)
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
 }
-// -------------------------------------------------------------------------
+
 Any SAL_CALL OResultSet::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     return Any();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -536,7 +536,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, RuntimeException)
 
     // you only have to implement this if you want to insert new rows
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -545,20 +545,20 @@ void SAL_CALL OResultSet::updateRow(  ) throw(SQLException, RuntimeException)
 
     // only when you allow updates
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
@@ -568,21 +568,21 @@ void SAL_CALL OResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcepti
 
     // only when you allow insert's
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException)
 {
@@ -590,14 +590,14 @@ void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) thr
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException)
 {
@@ -605,28 +605,28 @@ void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) thro
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException)
 {
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -----------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException)
 {
@@ -634,28 +634,28 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const Date& x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) throw(SQLException, RuntimeException)
 {
@@ -663,7 +663,7 @@ void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const Time& x ) thr
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime& x ) throw(SQLException, RuntimeException)
 {
@@ -671,7 +671,7 @@ void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const DateTime
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
@@ -679,28 +679,28 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
@@ -708,7 +708,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any&
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
 
 }
-// -------------------------------------------------------------------------
+
 // XRowLocate
 Any SAL_CALL OResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 {
@@ -719,7 +719,7 @@ Any SAL_CALL OResultSet::getBookmark(  ) throw( SQLException,  RuntimeException)
 
      return Any();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -727,7 +727,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const  Any& bookmark ) throw( SQLE
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_Int32 rows ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -735,7 +735,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const  Any& bookmark, sal_
 
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::compareBookmarks( const  Any& first, const  Any& second ) throw( SQLException,  RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -744,17 +744,17 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const  Any& first, const  Any&
 
     return CompareBookmark::NOT_EQUAL;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw( SQLException,  RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSet::hashBookmark( const  Any& bookmark ) throw( SQLException,  RuntimeException)
 {
     throw SQLException();
 }
-// -------------------------------------------------------------------------
+
 // XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const  Sequence<  Any >& rows ) throw( SQLException,  RuntimeException)
 {
@@ -763,7 +763,7 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const  Sequence<  Any >&
 
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
     Sequence< Property > aProps(6);
@@ -778,12 +778,12 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 
     return new OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 IPropertyArrayHelper & OResultSet::getInfoHelper()
 {
     return *const_cast<OResultSet*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OResultSet::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -806,7 +806,7 @@ sal_Bool OResultSet::convertFastPropertyValue(
     }
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::setFastPropertyValue_NoBroadcast(
                                 sal_Int32 nHandle,
                                 const Any& rValue
@@ -829,7 +829,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast(
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OResultSet::getFastPropertyValue(
                                 Any& rValue,
                                 sal_Int32 nHandle
@@ -846,22 +846,22 @@ void OResultSet::getFastPropertyValue(
             ;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::acquire() throw()
 {
     OResultSet_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OResultSet::release() throw()
 {
     OResultSet_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
index 727abb91410b..5f061e58dd13 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx
@@ -40,132 +40,132 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
-// -------------------------------------------------------------------------
+
 OResultSetMetaData::~OResultSetMetaData()
 {
 }
-// -------------------------------------------------------------------------
-// -------------------------------------------------------------------------
+
+
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return 50;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     sal_Int32 nType = 0;
     return nType;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount(  ) throw(SQLException, RuntimeException)
 {
     // this make no sense here so you have to change this
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 ::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString("Column") + ::rtl::OUString::number(column);
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return ::rtl::OUString();
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_True;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 ;
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
index 4873522982b5..83c3870bae5f 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SServices.cxx
@@ -62,7 +62,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc)
 // It contains of 3 special functions that have to be exported.
 //
 
-//---------------------------------------------------------------------------------------
+
 void REGISTER_PROVIDER(
         const OUString& aServiceImplName,
         const Sequence< OUString>& Services,
@@ -80,7 +80,7 @@ void REGISTER_PROVIDER(
 }
 
 
-//---------------------------------------------------------------------------------------
+
 struct ProviderRequest
 {
     Reference< XSingleServiceFactory > xRet;
@@ -118,7 +118,7 @@ struct ProviderRequest
     void* getProvider() const { return xRet.get(); }
 };
 
-//---------------------------------------------------------------------------------------
+
 extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
                     const sal_Char* pImplementationName,
                     void* pServiceManager,
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
index 040159c02611..b5faafbfaa8c 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx
@@ -47,7 +47,7 @@
 #include "propertyids.hxx"
 
 using namespace connectivity::skeleton;
-//------------------------------------------------------------------------------
+
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -56,7 +56,7 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
 using namespace com::sun::star::util;
-//------------------------------------------------------------------------------
+
 OStatement_Base::OStatement_Base(OConnection* _pConnection )
     : OStatement_BASE(m_aMutex),
     OPropertySetHelper(OStatement_BASE::rBHelper),
@@ -65,11 +65,11 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
 {
     m_pConnection->acquire();
 }
-// -----------------------------------------------------------------------------
+
 OStatement_Base::~OStatement_Base()
 {
 }
-//------------------------------------------------------------------------------
+
 void OStatement_Base::disposeResultSet()
 {
     // free the cursor if alive
@@ -78,7 +78,7 @@ void OStatement_Base::disposeResultSet()
         xComp->dispose();
     m_xResultSet.clear();
 }
-//------------------------------------------------------------------------------
+
 void OStatement_BASE2::disposing()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -92,12 +92,12 @@ void OStatement_BASE2::disposing()
     dispose_ChildImpl();
     OStatement_Base::disposing();
 }
-//-----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_BASE2::release() throw()
 {
     relase_ChildImpl();
 }
-//-----------------------------------------------------------------------------
+
 Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aRet = OStatement_BASE::queryInterface(rType);
@@ -105,7 +105,7 @@ Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(Runtime
         aRet = OPropertySetHelper::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 {
     ::cppu::OTypeCollection aTypes(
@@ -115,7 +115,7 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes(  ) throw(RuntimeException)
 
     return concatSequences(aTypes.getTypes(),OStatement_BASE::getTypes());
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
 {
@@ -123,7 +123,7 @@ void SAL_CALL OStatement_Base::cancel(  ) throw(RuntimeException)
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
     // cancel the current sql statement
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
 {
@@ -134,13 +134,13 @@ void SAL_CALL OStatement_Base::close(  ) throw(SQLException, RuntimeException)
     }
     dispose();
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement::clearBatch(  ) throw(SQLException, RuntimeException)
 {
     // if you support batches clear it here
 }
-// -------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -149,7 +149,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(S
     // returns true when a resultset is available
     return sal_False;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -163,7 +163,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUS
     m_xResultSet = xRS; // we nedd a reference to it for later use
     return xRS;
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLException, RuntimeException)
 {
@@ -173,12 +173,12 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection(  ) throw(SQLEx
     // just return our connection here
     return (Reference< XConnection >)m_pConnection;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OStatement_Base::getUpdateCount(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     return 0;
 }
-// -------------------------------------------------------------------------
+
 
 Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException)
 {
@@ -187,7 +187,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
         aRet = OStatement_Base::queryInterface(rType);
     return aRet;
 }
-// -------------------------------------------------------------------------
+
 
 void SAL_CALL OStatement::addBatch( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
 {
@@ -197,7 +197,7 @@ void SAL_CALL OStatement::addBatch( const ::rtl::OUString& sql ) throw(SQLExcept
 
     m_aBatchList.push_back(sql);
 }
-// -------------------------------------------------------------------------
+
 Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -205,7 +205,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
 
     return Sequence< sal_Int32 >();
 }
-// -------------------------------------------------------------------------
+
 
 
 sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
@@ -217,7 +217,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql )
     return 0;
 
 }
-// -------------------------------------------------------------------------
+
 
 Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLException, RuntimeException)
 {
@@ -227,7 +227,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet(  ) throw(SQLExce
 //  return our save resultset here
     return m_xResultSet;
 }
-// -------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, RuntimeException)
 {
@@ -238,9 +238,9 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults(  ) throw(SQLException, Runtim
     // and has one more at this moment return true
     return sal_False;
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -249,9 +249,9 @@ Any SAL_CALL OStatement_Base::getWarnings(  ) throw(SQLException, RuntimeExcepti
 
     return makeAny(m_aLastWarning);
 }
-// -------------------------------------------------------------------------
 
-// -------------------------------------------------------------------------
+
+
 void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -260,7 +260,7 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
 
     m_aLastWarning = SQLWarning();
 }
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* OStatement_Base::createArrayHelper( ) const
 {
     // this properties are define by the service statement
@@ -282,12 +282,12 @@ void SAL_CALL OStatement_Base::clearWarnings(  ) throw(SQLException, RuntimeExce
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
 
-// -------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper & OStatement_Base::getInfoHelper()
 {
     return *const_cast<OStatement_Base*>(this)->getArrayHelper();
 }
-// -------------------------------------------------------------------------
+
 sal_Bool OStatement_Base::convertFastPropertyValue(
                             Any & rConvertedValue,
                             Any & rOldValue,
@@ -299,7 +299,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue(
     // here we have to try to convert
     return bConverted;
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
 {
     // set the value to what ever is necessary
@@ -319,7 +319,7 @@ void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const A
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
     switch(nHandle)
@@ -338,33 +338,33 @@ void OStatement_Base::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
             ;
     }
 }
-// -------------------------------------------------------------------------
+
 IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement");
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::acquire() throw()
 {
     OStatement_BASE::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement_Base::release() throw()
 {
     OStatement_BASE::release();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::acquire() throw()
 {
     OStatement_BASE2::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatement::release() throw()
 {
     OStatement_BASE2::release();
 }
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo(  ) throw(RuntimeException)
 {
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx
index 832f59757f34..9b69be270c2e 100644
--- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx
+++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/propertyids.cxx
@@ -105,7 +105,7 @@ namespace skeleton
                 if(aIter->second)
                     rtl_uString_release(aIter->second);
         }
-        // ------------------------------------------------------------------------------
+
         ::rtl::OUString OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
         {
             ::rtl::OUString sRet;
@@ -116,7 +116,7 @@ namespace skeleton
                 sRet = aIter->second;
             return sRet;
         }
-        // ------------------------------------------------------------------------------
+
         ::rtl::OUString OPropertyMap::fillValue(sal_Int32 _nIndex)
         {
             rtl_uString* pStr = NULL;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index dfb9f6b8850f..bfb662e758f5 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -286,9 +286,9 @@ void XFlatXml::setDocumentLocator(const Reference<XLocator>& doclocator)
     m_rDocumentHandler->setDocumentLocator(doclocator);
 }
 
-// --------------------------------------
+
 // Component management
-// --------------------------------------
+
 Reference< XInterface > SAL_CALL CreateInstance( const Reference< XMultiServiceFactory > &r)
 {
     return Reference< XInterface >(( OWeakObject *)new XFlatXml(r));
diff --git a/odk/examples/cpp/custompanel/ctp_factory.cxx b/odk/examples/cpp/custompanel/ctp_factory.cxx
index 9c8d5c50ddb2..7ff959a47586 100644
--- a/odk/examples/cpp/custompanel/ctp_factory.cxx
+++ b/odk/examples/cpp/custompanel/ctp_factory.cxx
@@ -51,18 +51,18 @@ namespace sd { namespace colortoolpanel
     //==================================================================================================================
     //= ToolPanelFactory
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelFactory::ToolPanelFactory( const Reference< XComponentContext >& i_rContext )
         :m_xContext( i_rContext )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelFactory::~ToolPanelFactory()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XUIElement > SAL_CALL ToolPanelFactory::createUIElement( const OUString& i_rResourceURL, const Sequence< PropertyValue >& i_rArgs ) throw (NoSuchElementException, IllegalArgumentException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -127,7 +127,7 @@ namespace sd { namespace colortoolpanel
         return aServiceNames;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL ToolPanelFactory::Create( const Reference< XComponentContext >& i_rContext ) throw (RuntimeException)
     {
         return *( new ToolPanelFactory( i_rContext ) );
diff --git a/odk/examples/cpp/custompanel/ctp_panel.cxx b/odk/examples/cpp/custompanel/ctp_panel.cxx
index c84c13c77a09..e486de7e4d79 100644
--- a/odk/examples/cpp/custompanel/ctp_panel.cxx
+++ b/odk/examples/cpp/custompanel/ctp_panel.cxx
@@ -100,7 +100,7 @@ namespace sd { namespace colortoolpanel
     //==================================================================================================================
     //= class SingleColorPanel
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext, const Reference< XWindow >& i_rParentWindow, const ::sal_Int32 i_nPanelColor )
         :SingleColorPanel_Base( m_aMutex )
         ,m_xWindow()
@@ -124,12 +124,12 @@ namespace sd { namespace colortoolpanel
         osl_atomic_decrement( &m_refCount );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SingleColorPanel::~SingleColorPanel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWindow > SAL_CALL SingleColorPanel::getWindow() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -138,7 +138,7 @@ namespace sd { namespace colortoolpanel
         return m_xWindow;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -151,7 +151,7 @@ namespace sd { namespace colortoolpanel
         return Reference< XAccessible >( getWindow(), UNO_QUERY );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent ) throw (RuntimeException)
     {
         try
@@ -170,13 +170,13 @@ namespace sd { namespace colortoolpanel
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource ) throw (RuntimeException)
     {
         (void)i_rSource;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SingleColorPanel::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -198,7 +198,7 @@ namespace sd { namespace colortoolpanel
     //==================================================================================================================
     //= PanelUIElement
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelUIElement::PanelUIElement( const Reference< XComponentContext >& i_rContext, const Reference< XWindow >& i_rParentWindow,
         const OUString& i_rResourceURL, const ::sal_Int32 i_nPanelColor )
         :PanelUIElement_Base( m_aMutex )
@@ -207,31 +207,31 @@ namespace sd { namespace colortoolpanel
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelUIElement::~PanelUIElement()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XFrame > SAL_CALL PanelUIElement::getFrame() throw (RuntimeException)
     {
         // TODO
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL PanelUIElement::getResourceURL() throw (RuntimeException)
     {
         return m_sResourceURL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL PanelUIElement::getType() throw (RuntimeException)
     {
         return UIElementType::TOOLPANEL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL PanelUIElement::getRealInterface(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -240,7 +240,7 @@ namespace sd { namespace colortoolpanel
         return m_xToolPanel;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL PanelUIElement::disposing()
     {
         Reference< XComponent > xPanelComponent( m_xToolPanel, UNO_QUERY_THROW );
diff --git a/odk/examples/cpp/custompanel/ctp_services.cxx b/odk/examples/cpp/custompanel/ctp_services.cxx
index a8f5702ea9c5..d67dddd1aa81 100644
--- a/odk/examples/cpp/custompanel/ctp_services.cxx
+++ b/odk/examples/cpp/custompanel/ctp_services.cxx
@@ -48,7 +48,7 @@ namespace sd { namespace colortoolpanel
 
 extern "C"
 {
-    //------------------------------------------------------------------------------------------------------------------
+
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
         return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::sd::colortoolpanel::s_aServiceEntries );
diff --git a/oovbaapi/ooo/vba/XErrObject.idl b/oovbaapi/ooo/vba/XErrObject.idl
index a3b01d34ff55..8a5f344186f6 100644
--- a/oovbaapi/ooo/vba/XErrObject.idl
+++ b/oovbaapi/ooo/vba/XErrObject.idl
@@ -28,7 +28,7 @@ module ooo {  module vba  {
 */
 interface XErrObject : ::com::sun::star::uno::XInterface
 {
-  //-----------------------------------------------------------------------
+  
   /**
   */
   [attribute] long Number;
diff --git a/oox/source/core/recordparser.cxx b/oox/source/core/recordparser.cxx
index 0f302b840bec..68fc0c821750 100644
--- a/oox/source/core/recordparser.cxx
+++ b/oox/source/core/recordparser.cxx
@@ -59,7 +59,7 @@ private:
     RecordParser*           mpParser;
 };
 
-// ----------------------------------------------------------------------------
+
 
 void Locator::dispose()
 {
@@ -118,7 +118,7 @@ private:
     ContextInfoVec      maStack;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ContextStack::ContextStack( FragmentHandlerRef xHandler ) :
     mxHandler( xHandler )
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index ea2cc07f86f0..fdee37b8bb3b 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -186,7 +186,7 @@ XmlFilterBase::~XmlFilterBase()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XmlFilterBase::importDocumentProperties()
 {
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 39082a2d9c66..f7091bd8dec1 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star;
 namespace oox {
 namespace docprop {
 
-// ------------------------------------------------
+
 OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentContext >& xContext,
                                           const uno::Reference< document::XDocumentProperties > xDocProp )
     : m_xContext( xContext )
@@ -50,12 +50,12 @@ OOXMLDocPropHandler::OOXMLDocPropHandler( const uno::Reference< uno::XComponentC
         throw uno::RuntimeException();
 }
 
-// ------------------------------------------------
+
 OOXMLDocPropHandler::~OOXMLDocPropHandler()
 {
 }
 
-// ------------------------------------------------
+
 void OOXMLDocPropHandler::InitNew()
 {
     m_nState = 0;
@@ -65,7 +65,7 @@ void OOXMLDocPropHandler::InitNew()
     m_nInBlock = 0;
 }
 
-// ------------------------------------------------
+
 void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny )
 {
     if ( !m_aCustomPropertyName.isEmpty() )
@@ -91,7 +91,7 @@ void OOXMLDocPropHandler::AddCustomProperty( const uno::Any& aAny )
     }
 }
 
-// ------------------------------------------------
+
 util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChars )
 {
     oslDateTime aOslDTime = { 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -189,7 +189,7 @@ util::DateTime OOXMLDocPropHandler::GetDateTimeFromW3CDTF( const OUString& aChar
             aOslDTime.Day, aOslDTime.Month, aOslDTime.Year, false);
 }
 
-// ------------------------------------------------
+
 uno::Sequence< OUString > OOXMLDocPropHandler::GetKeywordsSet( const OUString& aChars )
 {
     if ( !aChars.isEmpty() )
@@ -212,7 +212,7 @@ uno::Sequence< OUString > OOXMLDocPropHandler::GetKeywordsSet( const OUString& a
     return uno::Sequence< OUString >();
 }
 
-// ------------------------------------------------
+
 void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
 {
     uno::Sequence< beans::NamedValue > aSet = m_xDocProp->getDocumentStatistics();
@@ -264,22 +264,22 @@ void OOXMLDocPropHandler::UpdateDocStatistic( const OUString& aChars )
     }
 }
 
-// ------------------------------------------------
+
 // com.sun.star.xml.sax.XFastDocumentHandler
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::startDocument()
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::endDocument()
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
     InitNew();
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -287,7 +287,7 @@ void SAL_CALL OOXMLDocPropHandler::setDocumentLocator( const uno::Reference< xml
 
 
 // com.sun.star.xml.sax.XFastContextHandler
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const uno::Reference< xml::sax::XFastAttributeList >& xAttribs )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -329,7 +329,7 @@ void SAL_CALL OOXMLDocPropHandler::startFastElement( ::sal_Int32 nElement, const
     m_nInBlock++;
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespace, const OUString& aName, const uno::Reference< xml::sax::XFastAttributeList >& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -341,7 +341,7 @@ void SAL_CALL OOXMLDocPropHandler::startUnknownElement( const OUString& aNamespa
     m_nInBlock++;
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -361,7 +361,7 @@ void SAL_CALL OOXMLDocPropHandler::endFastElement( ::sal_Int32 )
     }
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUString& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -369,7 +369,7 @@ void SAL_CALL OOXMLDocPropHandler::endUnknownElement( const OUString&, const OUS
         m_nInBlock--;
 }
 
-// ------------------------------------------------
+
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createFastChildContext( ::sal_Int32, const uno::Reference< xml::sax::XFastAttributeList >& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -377,14 +377,14 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::cr
     return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) );
 }
 
-// ------------------------------------------------
+
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL OOXMLDocPropHandler::createUnknownChildContext( const OUString&, const OUString&, const uno::Reference< xml::sax::XFastAttributeList >& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
     return uno::Reference< xml::sax::XFastContextHandler >( static_cast< xml::sax::XFastContextHandler* >( this ) );
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
@@ -668,13 +668,13 @@ void SAL_CALL OOXMLDocPropHandler::characters( const OUString& aChars )
     }
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::ignorableWhitespace( const OUString& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// ------------------------------------------------
+
 void SAL_CALL OOXMLDocPropHandler::processingInstruction( const OUString&, const OUString& )
     throw (xml::sax::SAXException, uno::RuntimeException)
 {
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index cba883f84d00..01296719f69b 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -63,7 +63,7 @@ struct TitleKey : public ::std::pair< ObjectType, ::std::pair< sal_Int32, sal_In
                             { first = eObjType; second.first = nMainIdx; second.second = nSubIdx; }
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** A helper structure to store all data related to title objects. Needed for
     the conversion of manual title positions that needs the old Chart1 API.
@@ -103,7 +103,7 @@ void TitleLayoutInfo::convertTitlePos( ConverterRoot& rRoot, const Reference< cs
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 /*  The following local functions implement getting the XShape interface of all
     supported title objects (chart and axes). This needs some effort due to the
@@ -165,7 +165,7 @@ struct ConverterData
                         ~ConverterData();
 };
 
-// ----------------------------------------------------------------------------
+
 
 ConverterData::ConverterData(
         XmlFilterBase& rFilter,
@@ -350,7 +350,7 @@ double lclCalcRelSize( double fPos, double fSize, sal_Int32 nSizeMode )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 LayoutConverter::LayoutConverter( const ConverterRoot& rParent, LayoutModel& rModel ) :
     ConverterBase< LayoutModel >( rParent, rModel )
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index a840381df2cc..1d21c74ed0d8 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -116,7 +116,7 @@ static const AutoFormatPatternEntry spAutoFormatPattern4[] =
 #undef AUTOFORMAT_PATTERN_COLORMOD
 #undef AUTOFORMAT_PATTERN_END
 
-// ----------------------------------------------------------------------------
+
 
 struct AutoFormatEntry
 {
@@ -409,7 +409,7 @@ const AutoFormatEntry* lclGetAutoFormatEntry( const AutoFormatEntry* pEntries, s
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 struct AutoTextEntry
 {
@@ -460,7 +460,7 @@ const AutoTextEntry* lclGetAutoTextEntry( const AutoTextEntry* pEntries, sal_Int
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Property identifiers for common chart objects, to be used in ShapePropertyInfo. */
 static const sal_Int32 spnCommonPropIds[] =
@@ -499,7 +499,7 @@ static const ShapePropertyInfo saLinearPropInfo( spnLinearPropIds, false, true,
 /** Property info for filled data series, to be used in ShapePropertyMap. */
 static const ShapePropertyInfo saFilledPropInfo( spnFilledPropIds, false, true, true, true );
 
-// ----------------------------------------------------------------------------
+
 
 /** Contains information about formatting of a specific chart object type. */
 struct ObjectTypeFormatEntry
@@ -553,7 +553,7 @@ static const ObjectTypeFormatEntry spObjTypeFormatEntries[] =
 #undef TYPEFORMAT_FRAME
 #undef TYPEFORMAT_LINE
 
-// ----------------------------------------------------------------------------
+
 
 void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptionsModel& rPicOptions )
 {
@@ -567,7 +567,7 @@ void lclConvertPictureOptions( FillProperties& orFillProps, const PictureOptions
 
 struct ObjectFormatterData;
 
-// ----------------------------------------------------------------------------
+
 
 class DetailFormatterBase
 {
@@ -595,7 +595,7 @@ protected:
     ColorPatternVec     maColorPattern;     /// Different cycling colors for data series.
 };
 
-// ----------------------------------------------------------------------------
+
 
 class LineFormatter : public DetailFormatterBase
 {
@@ -614,7 +614,7 @@ private:
     LinePropertiesPtr   mxAutoLine;         /// Automatic line properties.
 };
 
-// ----------------------------------------------------------------------------
+
 
 class FillFormatter : public DetailFormatterBase
 {
@@ -634,7 +634,7 @@ private:
     FillPropertiesPtr   mxAutoFill;         /// Automatic fill properties.
 };
 
-// ----------------------------------------------------------------------------
+
 
 class EffectFormatter : public DetailFormatterBase
 {
@@ -650,7 +650,7 @@ public:
                             sal_Int32 nSeriesIdx ) const;
 };
 
-// ----------------------------------------------------------------------------
+
 
 class TextFormatter : public DetailFormatterBase
 {
@@ -673,7 +673,7 @@ private:
     TextCharacterPropertiesPtr mxAutoText;  /// Automatic text properties.
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Formatter for a specific object type. */
 class ObjectTypeFormatter
@@ -721,7 +721,7 @@ private:
     const ObjectTypeFormatEntry& mrEntry;   /// Additional settings.
 };
 
-// ----------------------------------------------------------------------------
+
 
 struct ObjectFormatterData
 {
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index 8fcb6253bb5f..7244b6035906 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -92,7 +92,7 @@ private:
     bool                mbPieChart;
 };
 
-// ----------------------------------------------------------------------------
+
 
 AxesSetConverter::AxesSetConverter( const ConverterRoot& rParent, AxesSetModel& rModel ) :
     ConverterBase< AxesSetModel >( rParent, rModel ),
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx
index d2640ff11e79..88ceccfb1269 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -43,7 +43,7 @@ void ClrMap::setColorMap( sal_Int32 nClrToken, sal_Int32 nMappedClrToken )
     maClrMap[ nClrToken ] = nMappedClrToken;
 }
 
-//-----------------------------------------------------------------------------------------
+
 
 ClrScheme::ClrScheme()
 {
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index 84dbd35774d0..da050d837cd9 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -44,7 +44,7 @@ struct PresetColorsPool
     explicit            PresetColorsPool();
 };
 
-// ----------------------------------------------------------------------------
+
 
 PresetColorsPool::PresetColorsPool() :
     maDmlColors( static_cast< size_t >( XML_TOKEN_COUNT ), API_RGB_TRANSPARENT ),
@@ -143,16 +143,16 @@ PresetColorsPool::PresetColorsPool() :
         maVmlColors[ static_cast< size_t >( pnEntry[ 0 ] ) ] = pnEntry[ 1 ];
 }
 
-// ----------------------------------------------------------------------------
+
 
 struct StaticPresetColorsPool : public ::rtl::Static< PresetColorsPool, StaticPresetColorsPool > {};
 
-// ----------------------------------------------------------------------------
+
 
 const double DEC_GAMMA          = 2.3;
 const double INC_GAMMA          = 1.0 / DEC_GAMMA;
 
-// ----------------------------------------------------------------------------
+
 
 inline void lclRgbToRgbComponents( sal_Int32& ornR, sal_Int32& ornG, sal_Int32& ornB, sal_Int32 nRgb )
 {
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 32b73a812292..cd43a1507f15 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -220,7 +220,7 @@ OUString GetFormulaParameter( const EnhancedCustomShapeParameter& rParameter )
     return aRet;
 }
 
-// ---------------------------------------------------------------------
+
 
 static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCustomShapeProperties, const OUString& rValue, bool bNoSymbols = true )
 {
@@ -437,7 +437,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
     return aRet;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_GeomGuideList
 class GeomGuideListContext : public ContextHandler2
 {
@@ -635,14 +635,14 @@ ContextHandlerRef GeomGuideListContext::onCreateContext( sal_Int32 aElementToken
     return this;
 }
 
-// ---------------------------------------------------------------------
+
 
 static const OUString GetGeomGuideName( const OUString& rValue )
 {
     return rValue;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_AdjPoint2D
 class AdjPoint2DContext : public ContextHandler2
 {
@@ -657,7 +657,7 @@ AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper& rParent, const Attr
     rAdjPoint2D.Second = GetAdjCoordinate( rCustomShapeProperties, rAttribs.getString( XML_y ).get(), true );
 }
 
-// ---------------------------------------------------------------------
+
 // CT_XYAdjustHandle
 class XYAdjustHandleContext : public ContextHandler2
 {
@@ -709,7 +709,7 @@ ContextHandlerRef XYAdjustHandleContext::onCreateContext( sal_Int32 aElementToke
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_PolarAdjustHandle
 class PolarAdjustHandleContext : public ContextHandler2
 {
@@ -761,7 +761,7 @@ ContextHandlerRef PolarAdjustHandleContext::onCreateContext( sal_Int32 aElementT
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_AdjustHandleList
 class AdjustHandleListContext : public ContextHandler2
 {
@@ -798,7 +798,7 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_ConnectionSite
 class ConnectionSiteContext : public ContextHandler2
 {
@@ -826,7 +826,7 @@ ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32 aElementToke
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_Path2DMoveTo
 class Path2DMoveToContext : public ContextHandler2
 {
@@ -853,7 +853,7 @@ ContextHandlerRef Path2DMoveToContext::onCreateContext( sal_Int32 aElementToken,
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_Path2DLineTo
 class Path2DLineToContext : public ContextHandler2
 {
@@ -880,7 +880,7 @@ ContextHandlerRef Path2DLineToContext::onCreateContext( sal_Int32 aElementToken,
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_Path2DQuadBezierTo
 class Path2DQuadBezierToContext : public ContextHandler2
 {
@@ -914,7 +914,7 @@ ContextHandlerRef Path2DQuadBezierToContext::onCreateContext( sal_Int32 aElement
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_Path2DCubicBezierTo
 class Path2DCubicBezierToContext : public ContextHandler2
 {
@@ -952,7 +952,7 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_Path2DContext
 class Path2DContext : public ContextHandler2
 {
@@ -1151,7 +1151,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_Path2DList
 class Path2DListContext : public ContextHandler2
 {
@@ -1188,7 +1188,7 @@ ContextHandlerRef Path2DListContext::onCreateContext( sal_Int32 aElementToken, c
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_CustomGeometry2D
 CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& /* rAttribs */, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
@@ -1232,7 +1232,7 @@ ContextHandlerRef CustomShapeGeometryContext::onCreateContext( sal_Int32 aElemen
     return 0;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_PresetGeometry2D
 PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
@@ -1251,7 +1251,7 @@ ContextHandlerRef PresetShapeGeometryContext::onCreateContext( sal_Int32 aElemen
         return this;
 }
 
-// ---------------------------------------------------------------------
+
 // CT_PresetTextShape
 PresetTextShapeContext::PresetTextShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx
index 1c5de59bbba3..821d7f477b57 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -68,7 +68,7 @@ double GetPositiveFixedPercentage( const OUString& sValue )
     return fPercent;
 }
 
-// --------------------------------------------------------------------
+
 
 /** converts the attributes from an CT_TLPoint into an awt Point with 1/1000% */
 awt::Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs )
@@ -76,7 +76,7 @@ awt::Point GetPointPercent( const Reference< XFastAttributeList >& xAttribs )
     return awt::Point( GetPercent( xAttribs->getOptionalValue( XML_x ) ), GetCoordinate( xAttribs->getOptionalValue( XML_y ) ) );
 }
 
-// --------------------------------------------------------------------
+
 
 /** converts the ST_TextFontSize to point */
 float GetTextSize( const OUString& sValue )
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index 2364ee64757f..53997888e6aa 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -20,7 +20,7 @@ using namespace ::com::sun::star::xml::sax;
 // CT_EffectProperties
 
 namespace oox { namespace drawingml {
-// ---------------------------------------------------------------------
+
 
 EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper& rParent,
     EffectProperties& rEffectProperties ) throw()
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 2fca061a8482..34a208a37218 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -168,7 +168,7 @@ sal_Int32 lclGetArrowSize( sal_Int32 nToken )
     return OOX_ARROWSIZE_MEDIUM;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void lclPushMarkerProperties( ShapePropertyMap& rPropMap,
         const LineArrowProperties& rArrowProps, sal_Int32 nLineWidth, bool bLineEnd )
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index 5761ed0ee273..3195e569881b 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::xml::sax;
 // CT_LineProperties
 
 namespace oox { namespace drawingml {
-// ---------------------------------------------------------------------
+
 
 LinePropertiesContext::LinePropertiesContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs,
     LineProperties& rLineProperties ) throw()
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index da1b2b9f742f..d6d1f27cdcc6 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -50,7 +50,7 @@ ShapePropertiesContext::ShapePropertiesContext( ContextHandler2Helper& rParent,
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ContextHandlerRef ShapePropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
diff --git a/oox/source/drawingml/shapestylecontext.cxx b/oox/source/drawingml/shapestylecontext.cxx
index 9dc27f02d0a8..4d54a9ab736a 100644
--- a/oox/source/drawingml/shapestylecontext.cxx
+++ b/oox/source/drawingml/shapestylecontext.cxx
@@ -28,9 +28,9 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-// ---------------
+
 // CT_ShapeStyle
-// ---------------
+
 ShapeStyleContext::ShapeStyleContext( ContextHandler2Helper& rParent, Shape& rShape )
 : ContextHandler2( rParent )
 , mrShape( rShape )
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 48cf3ec5e72b..9821149cf98c 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-// --------------------------------------------------------------------
+
 
 // CT_TextParagraph
 class TextParagraphContext : public ContextHandler2
@@ -47,7 +47,7 @@ protected:
     TextParagraph& mrParagraph;
 };
 
-// --------------------------------------------------------------------
+
 TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, TextParagraph& rPara )
 : ContextHandler2( rParent )
 , mrParagraph( rPara )
@@ -55,7 +55,7 @@ TextParagraphContext::TextParagraphContext( ContextHandler2Helper& rParent, Text
     mbEnableTrimSpace = false;
 }
 
-// --------------------------------------------------------------------
+
 
 ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
@@ -94,7 +94,7 @@ ContextHandlerRef TextParagraphContext::onCreateContext( sal_Int32 aElementToken
 
     return 0;
 }
-// --------------------------------------------------------------------
+
 
 RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, TextRunPtr pRunPtr )
 : ContextHandler2( rParent )
@@ -103,7 +103,7 @@ RegularTextRunContext::RegularTextRunContext( ContextHandler2Helper& rParent, Te
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void RegularTextRunContext::onEndElement( )
 {
@@ -123,7 +123,7 @@ void RegularTextRunContext::onEndElement( )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void RegularTextRunContext::onCharacters( const OUString& aChars )
 {
@@ -133,7 +133,7 @@ void RegularTextRunContext::onCharacters( const OUString& aChars )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs)
 {
@@ -154,7 +154,7 @@ ContextHandlerRef RegularTextRunContext::onCreateContext( sal_Int32 aElementToke
     return this;
 }
 
-// --------------------------------------------------------------------
+
 
 TextBodyContext::TextBodyContext( ContextHandler2Helper& rParent, TextBody& rTextBody )
 : ContextHandler2( rParent )
@@ -162,7 +162,7 @@ TextBodyContext::TextBodyContext( ContextHandler2Helper& rParent, TextBody& rTex
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
@@ -188,7 +188,7 @@ ContextHandlerRef TextBodyContext::onCreateContext( sal_Int32 aElementToken, con
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 } }
 
diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx
index b57171455463..41db7b43d863 100644
--- a/oox/source/drawingml/textliststylecontext.cxx
+++ b/oox/source/drawingml/textliststylecontext.cxx
@@ -38,7 +38,7 @@ TextListStyleContext::~TextListStyleContext()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
@@ -73,7 +73,7 @@ ContextHandlerRef TextListStyleContext::onCreateContext( sal_Int32 aElementToken
     return this;
 }
 
-// --------------------------------------------------------------------
+
 
 } }
 
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 99a0c0c18ee4..9e0544616d8f 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -161,7 +161,7 @@ TextParagraphPropertiesContext::~TextParagraphPropertiesContext()
         rPropertyMap[ PROP_ParaAdjust ] <<= mrTextParagraphProperties.getParaAdjust().get();
 }
 
-// --------------------------------------------------------------------
+
 
 ContextHandlerRef TextParagraphPropertiesContext::onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs )
 {
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index fc46d830d688..271b5e0bf557 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -1536,7 +1536,7 @@ Output::Output( const Reference< XComponentContext >& rxContext, const OUString&
         mxStrm->writeString( OUString( OOX_DUMP_BOM ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void Output::newLine()
 {
@@ -1692,7 +1692,7 @@ void Output::endMultiItems()
         newLine();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void Output::writeChar( sal_Unicode cChar, sal_Int32 nCount )
 {
@@ -1741,7 +1741,7 @@ void Output::writeDateTime( const util::DateTime& rDateTime )
     writeDec( rDateTime.Seconds, 2, '0' );
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool Output::implIsValid() const
 {
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index d488b7d12d70..94251ef2c90c 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -1601,7 +1601,7 @@ const sal_uInt16 VBA_FORMSITE_CLASSTABLEMASK    = 0x7FFF;
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 VbaFormSiteObject::VbaFormSiteObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
@@ -1674,7 +1674,7 @@ const sal_uInt8 AX_FORM_SITECOUNTTYPE_MASK      = 0x7F;
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 VbaFStreamObject::VbaFStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName, VbaFormSharedData& rFormData ) :
     mrFormData( rFormData )
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 7fea8e36bb30..46fe76c8eb94 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -842,7 +842,7 @@ void ChartExport::exportChart( Reference< ::com::sun::star::chart::XChartDocumen
     } // if( xDocPropSet.is())
 
     // chart element
-    // -------------
+
     FSHelperPtr pFS = GetFS();
     pFS->startElement( FSNS( XML_c, XML_chart ),
             FSEND );
@@ -1028,7 +1028,7 @@ void ChartExport::exportPlotArea( )
         return;
 
     // plot-area element
-    // -----------------
+
     FSHelperPtr pFS = GetFS();
     pFS->startElement( FSNS( XML_c, XML_plotArea ),
             FSEND );
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index 8f0707a80703..f455a6ecb6fd 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -67,7 +67,7 @@ sal_Unicode lclGetXChar( const sal_Unicode*& rpcStr, const sal_Unicode* pcEnd )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int32 AttributeConversion::decodeToken( const OUString& rValue )
 {
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index bc2f76ffae1c..d233db353c9e 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -48,7 +48,7 @@ struct ValueRangeComp
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 void ValueRangeSet::insert( const ValueRange& rRange )
 {
diff --git a/oox/source/helper/progressbar.cxx b/oox/source/helper/progressbar.cxx
index 6b6dd014e540..926ef1b36dbe 100644
--- a/oox/source/helper/progressbar.cxx
+++ b/oox/source/helper/progressbar.cxx
@@ -41,7 +41,7 @@ IProgressBar::~IProgressBar()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ISegmentProgressBar::~ISegmentProgressBar()
 {
@@ -100,7 +100,7 @@ private:
     double              mfFreeStart;
 };
 
-// ----------------------------------------------------------------------------
+
 
 SubSegment::SubSegment( IProgressBar& rParentProgress, double fStartPos, double fLength ) :
     mrParentProgress( rParentProgress ),
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index e168cbba6fbc..20e232dec62d 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -127,7 +127,7 @@ private:
     PropertyNameMap     maPropMap;
 };
 
-// ----------------------------------------------------------------------------
+
 
 GenericPropertySet::GenericPropertySet( const PropertyMap& rPropMap )
 {
diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx
index b0755bc2ec04..9e270094d2b1 100644
--- a/oox/source/helper/storagebase.cxx
+++ b/oox/source/helper/storagebase.cxx
@@ -61,7 +61,7 @@ void lclSplitFirstElement( OUString& orElement, OUString& orRemainder, OUString
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 StorageBase::StorageBase( const Reference< XInputStream >& rxInStream, bool bBaseStreamAccess ) :
     mxInStream( rxInStream ),
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 92c0a2d9c484..0a10ac2fa0ec 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -64,7 +64,7 @@ private:
     BinaryInputStream*  mpInStrm;
 };
 
-// ----------------------------------------------------------------------------
+
 
 UnoBinaryInputStream::UnoBinaryInputStream( BinaryInputStream& rInStrm ) :
     mpInStrm( &rInStrm )
diff --git a/oox/source/ole/axbinaryreader.cxx b/oox/source/ole/axbinaryreader.cxx
index b78f428794fd..38f8575e5240 100644
--- a/oox/source/ole/axbinaryreader.cxx
+++ b/oox/source/ole/axbinaryreader.cxx
@@ -127,7 +127,7 @@ bool lclReadString( AxAlignedInputStream& rInStrm, OUString& rValue, sal_uInt32
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 AxBinaryPropertyReader::ComplexProperty::~ComplexProperty()
 {
@@ -175,7 +175,7 @@ bool AxBinaryPropertyReader::PictureProperty::readProperty( AxAlignedInputStream
     return OleHelper::importStdPic( mrPicData, rInStrm, true );
 }
 
-// ----------------------------------------------------------------------------
+
 
 AxBinaryPropertyReader::AxBinaryPropertyReader( BinaryInputStream& rInStrm, bool b64BitPropFlags ) :
     maInStrm( rInStrm ),
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index a6408b279bb9..09826b50ad67 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -100,7 +100,7 @@ void lclWriteString( AxAlignedOutputStream& rOutStrm, OUString& rValue, sal_uInt
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 AxBinaryPropertyWriter::ComplexProperty::~ComplexProperty()
 {
@@ -118,7 +118,7 @@ bool AxBinaryPropertyWriter::StringProperty::writeProperty( AxAlignedOutputStrea
     return true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 AxBinaryPropertyWriter::AxBinaryPropertyWriter( BinaryOutputStream& rOutStrm, bool b64BitPropFlags ) :
     maOutStrm( rOutStrm ),
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 8b7d7b0868f4..f25e8afa3250 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -90,7 +90,7 @@ const sal_uInt32 COMCTL_SCROLLBAR_HOR       = 0x00000010;
 const sal_uInt32 COMCTL_ID_PROGRESSBAR_50   = 0xE6E17E84;
 const sal_uInt32 COMCTL_ID_PROGRESSBAR_60   = 0x97AB8A01;
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt32 AX_CMDBUTTON_DEFFLAGS      = 0x0000001B;
 const sal_uInt32 AX_LABEL_DEFFLAGS          = 0x0080001B;
@@ -150,7 +150,7 @@ const sal_Int32 AX_CONTAINER_CYCLEALL       = 0;
 
 const sal_Int32 AX_CONTAINER_SCR_NONE       = 0x00;
 
-// ----------------------------------------------------------------------------
+
 
 const sal_Int16 API_BORDER_NONE             = 0;
 const sal_Int16 API_BORDER_SUNKEN           = 1;
@@ -160,7 +160,7 @@ const sal_Int16 API_STATE_UNCHECKED         = 0;
 const sal_Int16 API_STATE_CHECKED           = 1;
 const sal_Int16 API_STATE_DONTKNOW          = 2;
 
-// ----------------------------------------------------------------------------
+
 
 /** Tries to extract a range address from a defined name. */
 bool lclExtractRangeFromName( CellRangeAddress& orRangeAddr, const Reference< XModel >& rxDocModel, const OUString& rAddressString )
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index cf1f3beb8954..584fbec11ea8 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -96,7 +96,7 @@ inline sal_Int32 lclDecodeBgrColor( sal_uInt32 nOleColor )
     return static_cast< sal_Int32 >( lclSwapRedBlue( nOleColor ) & 0xFFFFFF );
 }
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt32 OLE_STDPIC_ID              = 0x0000746C;
 
@@ -197,7 +197,7 @@ GUIDCNamePairMap& classIdToGUIDCNamePairMap::get()
     return theInst.mnIdToGUIDCNamePairMap;
 }
 
-// ----------------------------------------------------------------------------
+
 
 template< typename Type >
 void lclAppendHex( OUStringBuffer& orBuffer, Type nValue )
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index d6d47f04c1f0..c7ce3aa7cf95 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -85,7 +85,7 @@ private:
     OUString            maElementName;
 };
 
-// ----------------------------------------------------------------------------
+
 
 OleOutputStream::OleOutputStream( const Reference< XComponentContext >& rxContext,
         const Reference< XNameContainer >& rxStorage, const OUString& rElementName ) :
@@ -214,7 +214,7 @@ OleStorage::~OleStorage()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 void OleStorage::initStorage( const Reference< XInputStream >& rxInStream )
 {
diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 4ad463d16d01..19a87087caba 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -77,7 +77,7 @@ const sal_uInt32 VBA_SITE_DEFFLAGS              = 0x00000033;
 const sal_uInt8 VBA_SITEINFO_COUNT              = 0x80;
 const sal_uInt8 VBA_SITEINFO_MASK               = 0x7F;
 
-// ----------------------------------------------------------------------------
+
 
 /** Collects names of all controls in a user form or container control. Allows
     to generate unused names for dummy controls separating option groups.
@@ -124,7 +124,7 @@ OUString VbaControlNamesSet::generateDummyName()
     return aCtrlName;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Functor that inserts the name of a control into a VbaControlNamesSet. */
 struct VbaControlNameInserter
@@ -135,7 +135,7 @@ public:
     inline void         operator()( const VbaFormControl& rControl ) { mrCtrlNames.insertName( rControl ); }
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** A dummy invisible form control (fixed label without text) that is used to
     separate two groups of option buttons.
@@ -776,7 +776,7 @@ bool lclEatKeyword( OUString& rCodeLine, const OUString& rKeyword )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 VbaUserForm::VbaUserForm( const Reference< XComponentContext >& rxContext,
         const Reference< XModel >& rxDocModel, const GraphicHelper& rGraphicHelper, bool bDefaultColorBgr ) :
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index b58710d0efcc..2d881734d4de 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -81,7 +81,7 @@ bool lclReadConfigItem( const Reference< XInterface >& rxConfigAccess, const OUS
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 VbaFilterConfig::VbaFilterConfig( const Reference< XComponentContext >& rxContext, const OUString& rConfigCompName )
 {
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index fac91bc7e034..dd1ba5ac3429 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -27,7 +27,7 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace ppt {
-// ---------------------------------------------------------------------
+
 
 BackgroundPropertiesContext::BackgroundPropertiesContext( FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties )
 : FragmentHandler2( rParent )
diff --git a/oox/source/ppt/customshowlistcontext.cxx b/oox/source/ppt/customshowlistcontext.cxx
index eb7d255480d7..70ecf0cfa953 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -65,7 +65,7 @@ CustomShowContext::~CustomShowContext( )
     return this;
 }
 
-//---------------------------------------------------------------------------
+
 
 CustomShowListContext::CustomShowListContext( FragmentHandler2& rParent,
     std::vector< CustomShow >& rCustomShowList )
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index c96d794a1fde..f0b5db7dd88c 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -110,7 +110,7 @@ namespace oox { namespace ppt {
     }
 
 // BEGIN CUT&PASTE from sd/source/filter/ppt/pptinanimations.hxx
-// --------------------------------------------------------------------
+
     static void fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
     {
         try
@@ -176,7 +176,7 @@ namespace oox { namespace ppt {
         }
     }
 
-// --------------------------------------------------------------------
+
 
     static void fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
     {
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index c42045191b1e..b1e77075a4bf 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -64,7 +64,7 @@ bool lclExtractDouble( double& orfValue, sal_Int32& ornEndPos, const OUString& r
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 bool ConversionHelper::separatePair( OUString& orValue1, OUString& orValue2,
         const OUString& rValue, sal_Unicode cSep )
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index b8d86122ca67..573e976b1c40 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -77,7 +77,7 @@ inline void lclAppendToBuffer( OStringBuffer& rBuffer, const sal_Char* pcBeg, co
     rBuffer.append( pcBeg, static_cast< sal_Int32 >( pcEnd - pcBeg ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void lclProcessAttribs( OStringBuffer& rBuffer, const sal_Char* pcBeg, const sal_Char* pcEnd )
 {
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 17b8818a405c..1d50f40272f4 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -83,7 +83,7 @@ namespace {
 const sal_Int32 VML_SHAPETYPE_PICTUREFRAME  = 75;
 const sal_Int32 VML_SHAPETYPE_HOSTCONTROL   = 201;
 
-// ----------------------------------------------------------------------------
+
 
 awt::Point lclGetAbsPoint( const awt::Point& rRelPoint, const awt::Rectangle& rShapeRect, const awt::Rectangle& rCoordSys )
 {
@@ -130,7 +130,7 @@ void ShapeTypeModel::assignUsed( const ShapeTypeModel& rSource )
     moGraphicTitle.assignIfUsed( rSource.moGraphicTitle );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ShapeType::ShapeType( Drawing& rDrawing ) :
     mrDrawing( rDrawing )
@@ -237,7 +237,7 @@ ClientData::ClientData() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ShapeModel::ShapeModel()
 {
@@ -259,7 +259,7 @@ ClientData& ShapeModel::createClientData()
     return *mxClientData;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ShapeBase::ShapeBase( Drawing& rDrawing ) :
     ShapeType( rDrawing )
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 8943f367cf07..122a2b788732 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -93,7 +93,7 @@ void APChooseDevicePage::fill( PrinterInfo& rInfo )
         rInfo.m_aFeatures = "";
 }
 
-//--------------------------------------------------------------------
+
 
 APChooseDriverPage::APChooseDriverPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_CHOOSEDRIVER ) ),
@@ -304,7 +304,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 APNamePage::APNamePage( AddPrinterDialog* pParent, const OUString& rInitName, DeviceKind::type eKind )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_NAME ) ),
@@ -352,7 +352,7 @@ void APNamePage::fill( PrinterInfo& rInfo )
     rInfo.m_aPrinterName = m_aNameEdt.GetText();
 }
 
-//--------------------------------------------------------------------
+
 
 APCommandPage::APCommandPage( AddPrinterDialog* pParent, DeviceKind::type eKind )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_COMMAND ) ),
@@ -468,7 +468,7 @@ void APCommandPage::fill( PrinterInfo& rInfo )
     rInfo.m_aCommand = m_aCommandBox.GetText();
 }
 
-//--------------------------------------------------------------------
+
 
 APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_OLDPRINTERS ) ),
@@ -656,7 +656,7 @@ void APOldPrinterPage::fill( PrinterInfo& )
 {
 }
 
-//--------------------------------------------------------------------
+
 
 APFaxDriverPage::APFaxDriverPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_FAXDRIVER ) ),
@@ -688,7 +688,7 @@ void APFaxDriverPage::fill( PrinterInfo& rInfo )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 APPdfDriverPage::APPdfDriverPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_PDFDRIVER ) ),
@@ -722,7 +722,7 @@ void APPdfDriverPage::fill( PrinterInfo& rInfo )
         rInfo.m_aDriverName = "ADISTILL";
 }
 
-//--------------------------------------------------------------------
+
 
 AddPrinterDialog::AddPrinterDialog( Window* pParent )
         : ModalDialog( pParent, PaResId( RID_ADD_PRINTER_DIALOG ) ),
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 2ed6b5bb7715..68937760558b 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -66,7 +66,7 @@ OUString MyApp::ReadStringHook( const OUString& rStr )
 };
 
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 MyApp::Exception( sal_uInt16 nError )
 {
@@ -85,9 +85,9 @@ int MyApp::Main()
 
     EnableAutoHelpId();
 
-    //-------------------------------------------------
+
     // create the global service-manager
-    //-------------------------------------------------
+
     Reference< XComponentContext > xCtx;
     Reference< XMultiServiceFactory > xFactory;
     try
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 67ab55740003..9e4d6ccee07a 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -68,7 +68,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, con
         rBox.SelectEntry( m_aInvalidString );
 }
 
-// --------------------------------------------------------------------------
+
 
 /*
  * RTSDialog
@@ -108,7 +108,7 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const OUString& rPrinter, boo
     ActivatePage(m_pTabControl);
 }
 
-// --------------------------------------------------------------------------
+
 
 RTSDialog::~RTSDialog()
 {
@@ -118,7 +118,7 @@ RTSDialog::~RTSDialog()
     delete m_pCommandPage;
 }
 
-// --------------------------------------------------------------------------
+
 
 IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
 {
@@ -152,7 +152,7 @@ IMPL_LINK( RTSDialog, ActivatePage, TabControl*, pTabCtrl )
     return 0;
 }
 
-// --------------------------------------------------------------------------
+
 
 IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
 {
@@ -187,7 +187,7 @@ IMPL_LINK( RTSDialog, ClickButton, Button*, pButton )
     return 0;
 }
 
-// --------------------------------------------------------------------------
+
 
 /*
  * RTSPaperPage
@@ -225,13 +225,13 @@ RTSPaperPage::RTSPaperPage(RTSDialog* pParent)
     update();
 }
 
-// --------------------------------------------------------------------------
+
 
 RTSPaperPage::~RTSPaperPage()
 {
 }
 
-// --------------------------------------------------------------------------
+
 
 void RTSPaperPage::update()
 {
@@ -278,7 +278,7 @@ void RTSPaperPage::update()
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
 {
@@ -312,7 +312,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, ListBox*, pBox )
     return 0;
 }
 
-// --------------------------------------------------------------------------
+
 
 /*
  * RTSDevicePage
@@ -398,13 +398,13 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent )
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 RTSDevicePage::~RTSDevicePage()
 {
 }
 
-// --------------------------------------------------------------------------
+
 
 void RTSDevicePage::update()
 {
@@ -434,7 +434,7 @@ sal_uLong RTSDevicePage::getColorDevice()
     return 0;
 }
 
-// ------------------------------------------------------------------
+
 
 sal_uLong RTSDevicePage::getLevel()
 {
@@ -444,7 +444,7 @@ sal_uLong RTSDevicePage::getLevel()
     return nLevel < 10 ? nLevel-1 : 0;
 }
 
-// ------------------------------------------------------------------
+
 
 sal_uLong RTSDevicePage::getPDFDevice()
 {
@@ -456,7 +456,7 @@ sal_uLong RTSDevicePage::getPDFDevice()
     return -1;      //explicitly PS
 }
 
-// ------------------------------------------------------------------
+
 
 IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
 {
@@ -478,7 +478,7 @@ IMPL_LINK( RTSDevicePage, SelectHdl, ListBox*, pBox )
     return 0;
 }
 
-// ------------------------------------------------------------------
+
 
 void RTSDevicePage::FillValueBox( const PPDKey* pKey )
 {
@@ -503,7 +503,7 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
     m_pPPDValueBox->SelectEntryPos( m_pPPDValueBox->GetEntryPos( (void*)pValue ) );
 }
 
-// --------------------------------------------------------------------------
+
 
 /*
  * RTSOtherPage
@@ -536,13 +536,13 @@ RTSOtherPage::RTSOtherPage( RTSDialog* pParent ) :
     initValues();
 }
 
-// ------------------------------------------------------------------
+
 
 RTSOtherPage::~RTSOtherPage()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 void RTSOtherPage::initValues()
 {
@@ -573,7 +573,7 @@ void RTSOtherPage::initValues()
     m_aCommentEdt.SetText( m_pParent->m_aJobData.m_aComment );
 }
 
-// ------------------------------------------------------------------
+
 
 void RTSOtherPage::save()
 {
@@ -599,7 +599,7 @@ void RTSOtherPage::save()
     m_pParent->m_aJobData.m_aComment = m_aCommentEdt.GetText();
 }
 
-// ------------------------------------------------------------------
+
 
 IMPL_LINK( RTSOtherPage, ClickBtnHdl, Button*, pButton )
 {
diff --git a/padmin/source/titlectrl.cxx b/padmin/source/titlectrl.cxx
index 5d2cfb50a984..5185d4a45141 100644
--- a/padmin/source/titlectrl.cxx
+++ b/padmin/source/titlectrl.cxx
@@ -30,13 +30,13 @@ TitleImage::TitleImage( Window* pParent, const ResId& rResId ) :
     SetFont( aFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 TitleImage::~TitleImage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void TitleImage::arrange()
 {
@@ -51,7 +51,7 @@ void TitleImage::arrange()
     m_aTextPos.Y() = ( aCtrlSize.Height() - aTextSize.Height() ) / 2;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TitleImage::Paint( const Rectangle& )
 {
@@ -65,7 +65,7 @@ void TitleImage::Paint( const Rectangle& )
     DrawText( m_aTextPos, m_aText );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TitleImage::SetText( const OUString& rText )
 {
@@ -74,7 +74,7 @@ void TitleImage::SetText( const OUString& rText )
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TitleImage::SetImage( const Image& rImage )
 {
@@ -83,7 +83,7 @@ void TitleImage::SetImage( const Image& rImage )
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TitleImage::SetBackgroundColor( const Color& rColor )
 {
diff --git a/pyuno/source/module/pyuno_util.cxx b/pyuno/source/module/pyuno_util.cxx
index a8da336c7314..6d88afe695f6 100644
--- a/pyuno/source/module/pyuno_util.cxx
+++ b/pyuno/source/module/pyuno_util.cxx
@@ -114,9 +114,9 @@ PyRef getObjectFromUnoModule( const Runtime &runtime, const char * func )
 }
 
 
-//------------------------------------------------------------------------------------
+
 // Logging
-//------------------------------------------------------------------------------------
+
 
 bool isLog( RuntimeCargo * cargo, sal_Int32 loglevel )
 {
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index 2b40055e1cbd..989b5238f5a2 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -126,7 +126,7 @@ uno::Sequence< OUString > lcl_getLineOptionals()
     };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
-// -----------------------------------------------------------------------------
+
 OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext)
 :FixedLineBase(m_aMutex)
 ,FixedLinePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getLineOptionals())
@@ -140,7 +140,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
     m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager());
     m_aProps.aComponent.m_nWidth = MIN_WIDTH;
 }
-// -----------------------------------------------------------------------------
+
 OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContext
                        ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
                        ,uno::Reference< drawing::XShape >& _xShape
@@ -181,13 +181,13 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OFixedLine::~OFixedLine()
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_REFCOUNT( OFixedLine, FixedLineBase )
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = FixedLineBase::queryInterface(_rType);
@@ -198,24 +198,24 @@ uno::Any SAL_CALL OFixedLine::queryInterface( const uno::Type& _rType ) throw (u
 
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::dispose() throw(uno::RuntimeException)
 {
     FixedLinePropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 OUString OFixedLine::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OFixedLine");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OFixedLine::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -223,133 +223,133 @@ uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static(  ) throw(
 
     return aServices;
 }
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OFixedLine::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OFixedLine(xContext));
 }
 
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 // XReportComponent
 REPORTCOMPONENT_IMPL3(OFixedLine,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OFixedLine)
-// -----------------------------------------------------------------------------
+
 ::sal_Int16  SAL_CALL OFixedLine::getControlBorder( ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setControlBorder( ::sal_Int16 /*_border*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OFixedLine::getControlBorderColor() throw (beans::UnknownPropertyException,uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setControlBorderColor( ::sal_Int32 /*_bordercolor*/ ) throw (beans::UnknownPropertyException,lang::IllegalArgumentException,uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedLine::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return FixedLinePropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedLinePropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFixedLine::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return FixedLinePropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedLinePropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedLinePropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedLinePropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedLinePropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // XReportControlModel
 OUString SAL_CALL OFixedLine::getDataField() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OFixedLine::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ ) throw (uno::RuntimeException,beans::UnknownPropertyException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFixedLine::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setControlBackgroundTransparent( ::sal_Bool /*_controlbackgroundtransparent*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFixedLine::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setPrintWhenGroupChange( ::sal_Bool /*_printwhengroupchange*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OFixedLine::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setConditionalPrintExpression( const OUString& /*_conditionalprintexpression*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone(  ) throw (uno::RuntimeException)
 {
@@ -357,159 +357,159 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedLine::createClone(  ) throw (u
     uno::Reference< report::XFixedLine> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDLINE),uno::UNO_QUERY_THROW);
     return xSet.get();
 }
-// -----------------------------------------------------------------------------
+
 
 // XFixedLine
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OFixedLine::getOrientation() throw (beans::UnknownPropertyException,uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nOrientation;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setOrientation( ::sal_Int32 _orientation ) throw (beans::UnknownPropertyException,uno::RuntimeException)
 {
     set(PROPERTY_ORIENTATION,_orientation,m_nOrientation);
 }
-// -----------------------------------------------------------------------------
+
 drawing::LineStyle SAL_CALL OFixedLine::getLineStyle() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineStyle;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setLineStyle( drawing::LineStyle _linestyle ) throw (uno::RuntimeException)
 {
     set(PROPERTY_LINESTYLE,_linestyle,m_LineStyle);
 }
-// -----------------------------------------------------------------------------
+
 drawing::LineDash SAL_CALL OFixedLine::getLineDash() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineDash;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setLineDash( const drawing::LineDash& _linedash ) throw (uno::RuntimeException)
 {
     set(PROPERTY_LINEDASH,_linedash,m_LineDash);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OFixedLine::getLineColor() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineColor;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setLineColor( ::sal_Int32 _linecolor ) throw (uno::RuntimeException)
 {
     set(PROPERTY_LINECOLOR,_linecolor,m_LineColor);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL OFixedLine::getLineTransparence() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineTransparence;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setLineTransparence( ::sal_Int16 _linetransparence ) throw (uno::RuntimeException)
 {
     set(PROPERTY_LINETRANSPARENCE,_linetransparence,m_LineTransparence);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OFixedLine::getLineWidth() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_LineWidth;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setLineWidth( ::sal_Int32 _linewidth ) throw (uno::RuntimeException)
 {
     set(PROPERTY_LINEWIDTH,_linewidth,m_LineWidth);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OFixedLine::getParent(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getParent(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     OShapeHelper::setParent(Parent,this);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XFormatCondition > SAL_CALL OFixedLine::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException)
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OFixedLine::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.addContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.removeContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OFixedLine::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFixedLine::hasElements(  ) throw (uno::RuntimeException)
 {
     return m_aProps.hasElements();
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OFixedLine::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.insertByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.removeByIndex(Index);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OFixedLine::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.replaceByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OFixedLine::getCount(  ) throw (uno::RuntimeException)
 {
     return m_aProps.getCount();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFixedLine::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aProps.getByIndex( Index );
 }
-// -----------------------------------------------------------------------------
+
 // XShape
 awt::Point SAL_CALL OFixedLine::getPosition(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getPosition(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException)
 {
     OShapeHelper::setPosition(aPosition,this);
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL OFixedLine::getSize(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getSize(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException)
 {
     const char hundredthmmC[] = "0\xe2\x80\x89\xC2\xB5""m"; // in UTF-8: 0, thin space, µ (micro), m (meter)
@@ -520,7 +520,7 @@ void SAL_CALL OFixedLine::setSize( const awt::Size& aSize ) throw (beans::Proper
         throw beans::PropertyVetoException("Too small height for FixedLine; minimum is " + OUString::number(MIN_HEIGHT) + hundredthmm, static_cast<cppu::OWeakObject*>(this));
     OShapeHelper::setSize(aSize,this);
 }
-// -----------------------------------------------------------------------------
+
 // XShapeDescriptor
 OUString SAL_CALL OFixedLine::getShapeType(  ) throw (uno::RuntimeException)
 {
@@ -529,7 +529,7 @@ OUString SAL_CALL OFixedLine::getShapeType(  ) throw (uno::RuntimeException)
         return m_aProps.aComponent.m_xShape->getShapeType();
     return OUString("com.sun.star.drawing.ControlShape");
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OFixedLine::getHyperLinkURL() throw (uno::RuntimeException, beans::UnknownPropertyException)
 {
     throw beans::UnknownPropertyException();
@@ -566,7 +566,7 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( ::sal_Bool /*_printrepeatedval
     throw beans::UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 // =============================================================================
 } // namespace reportdesign
 // =============================================================================
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 0255ba8b7c82..3858fcb514e9 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -41,7 +41,7 @@ uno::Sequence< OUString > lcl_getFixedTextOptionals()
     OUString pProps[] = { OUString(PROPERTY_DATAFIELD),OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
-// -----------------------------------------------------------------------------
+
 OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext)
 :FixedTextBase(m_aMutex)
 ,FixedTextPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals())
@@ -50,7 +50,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex
     m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager());
     m_aProps.aComponent.m_nBorder = 0; // no border
 }
-// -----------------------------------------------------------------------------
+
 OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContext
                        ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
                        ,uno::Reference< drawing::XShape >& _xShape)
@@ -67,13 +67,13 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext > const & _xContex
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OFixedText::~OFixedText()
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_REFCOUNT( OFixedText, FixedTextBase )
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = FixedTextBase::queryInterface(_rType);
@@ -85,25 +85,25 @@ uno::Any SAL_CALL OFixedText::queryInterface( const uno::Type& _rType ) throw (u
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::dispose() throw(uno::RuntimeException)
 {
     FixedTextPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
     uno::Reference< report::XFixedText> xHoldAlive = this;
 }
-// -----------------------------------------------------------------------------
+
 OUString OFixedText::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OFixedText");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OFixedText::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -111,99 +111,99 @@ uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static(  ) throw(
 
     return aServices;
 }
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OFixedText::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OFixedText(xContext));
 }
 
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 // XReportComponent
 REPORTCOMPONENT_IMPL(OFixedText,m_aProps.aComponent)
 REPORTCOMPONENT_IMPL2(OFixedText,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OFixedText)
 REPORTCONTROLFORMAT_IMPL(OFixedText,m_aProps.aFormatProperties)
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFixedText::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return FixedTextPropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedTextPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFixedText::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return FixedTextPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedTextPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedTextPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedTextPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FixedTextPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // XReportControlModel
 OUString SAL_CALL OFixedText::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------------
+
+
 ::sal_Bool SAL_CALL OFixedText::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OFixedText::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
-// -----------------------------------------------------------------------------
+
 
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone(  ) throw (uno::RuntimeException)
@@ -212,7 +212,7 @@ uno::Reference< util::XCloneable > SAL_CALL OFixedText::createClone(  ) throw (u
     uno::Reference< report::XFixedText> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_FIXEDTEXT),uno::UNO_QUERY_THROW);
     return xSet.get();
 }
-// -----------------------------------------------------------------------------
+
 
 // XFixedText
 OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException)
@@ -220,99 +220,99 @@ OUString SAL_CALL OFixedText::getLabel() throw (uno::RuntimeException)
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sLabel;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setLabel( const OUString& _label ) throw (uno::RuntimeException)
 {
     set(PROPERTY_LABEL,_label,m_sLabel);
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OFixedText::getParent(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getParent(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     OShapeHelper::setParent(Parent,this);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XFormatCondition > SAL_CALL OFixedText::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException)
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OFixedText::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.addContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.removeContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OFixedText::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFixedText::hasElements(  ) throw (uno::RuntimeException)
 {
     return m_aProps.hasElements();
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OFixedText::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.insertByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.removeByIndex(Index);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OFixedText::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.replaceByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OFixedText::getCount(  ) throw (uno::RuntimeException)
 {
     return m_aProps.getCount();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFixedText::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aProps.getByIndex( Index );
 }
-// -----------------------------------------------------------------------------
+
 // XShape
 awt::Point SAL_CALL OFixedText::getPosition(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getPosition(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException)
 {
     OShapeHelper::setPosition(aPosition,this);
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL OFixedText::getSize(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getSize(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException)
 {
     OShapeHelper::setSize(aSize,this);
 }
-// -----------------------------------------------------------------------------
+
 
 // XShapeDescriptor
 OUString SAL_CALL OFixedText::getShapeType(  ) throw (uno::RuntimeException)
@@ -322,8 +322,8 @@ OUString SAL_CALL OFixedText::getShapeType(  ) throw (uno::RuntimeException)
         return m_aProps.aComponent.m_xShape->getShapeType();
     return OUString("com.sun.star.drawing.ControlShape");
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 // =============================================================================
 } // namespace reportdesign
 // =============================================================================
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 6190851cb295..e504b648605f 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -33,43 +33,43 @@ namespace reportdesign
 // =============================================================================
     using namespace com::sun::star;
     using namespace comphelper;
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OFormatCondition(xContext));
 }
 
-// -----------------------------------------------------------------------------
+
 OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext)
 :FormatConditionBase(m_aMutex)
 ,FormatConditionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
 ,m_bEnabled(sal_True)
 {
 }
-// -----------------------------------------------------------------------------
+
 OFormatCondition::~OFormatCondition()
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2(OFormatCondition,FormatConditionBase,FormatConditionPropertySet)
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::dispose() throw(uno::RuntimeException)
 {
     FormatConditionPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 OUString OFormatCondition::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OFormatCondition");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OFormatCondition::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -77,75 +77,75 @@ uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static(  )
 
     return aServices;
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormatCondition::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return FormatConditionPropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormatConditionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFormatCondition::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return FormatConditionPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormatConditionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormatConditionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormatConditionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormatConditionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // XFormatCondition
 ::sal_Bool SAL_CALL OFormatCondition::getEnabled() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bEnabled;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::setEnabled( ::sal_Bool _enabled ) throw (uno::RuntimeException)
 {
     set(PROPERTY_ENABLED,_enabled,m_bEnabled);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OFormatCondition::getFormula() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sFormula;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormatCondition::setFormula( const OUString& _formula ) throw (uno::RuntimeException)
 {
     set(PROPERTY_FORMULA,_formula,m_sFormula);
 }
-// -----------------------------------------------------------------------------
+
 // XReportControlFormat
 REPORTCONTROLFORMAT_IMPL(OFormatCondition,m_aFormatProperties)
 // =============================================================================
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index fef22daf19b8..a62ffe38e894 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -37,7 +37,7 @@ namespace reportdesign
 // =============================================================================
     using namespace com::sun::star;
     using namespace comphelper;
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OFormattedField::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OFormattedField(xContext));
@@ -48,7 +48,7 @@ uno::Sequence< OUString > lcl_getFormattedFieldOptionals()
     OUString pProps[] = { OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
-// -----------------------------------------------------------------------------
+
 OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext)
 :FormattedFieldBase(m_aMutex)
 ,FormattedFieldPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getFormattedFieldOptionals())
@@ -57,7 +57,7 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
 {
     m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FORMATTEDFIELD,m_aProps.aComponent.m_xContext->getServiceManager());
 }
-// -----------------------------------------------------------------------------
+
 OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const & _xContext
                                  ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
                                  ,uno::Reference< drawing::XShape >& _xShape)
@@ -74,13 +74,13 @@ OFormattedField::OFormattedField(uno::Reference< uno::XComponentContext > const
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OFormattedField::~OFormattedField()
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_REFCOUNT( OFormattedField, FormattedFieldBase )
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = FormattedFieldBase::queryInterface(_rType);
@@ -92,7 +92,7 @@ uno::Any SAL_CALL OFormattedField::queryInterface( const uno::Type& _rType ) thr
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException)
 {
     FormattedFieldPropertySet::dispose();
@@ -100,18 +100,18 @@ void SAL_CALL OFormattedField::dispose() throw(uno::RuntimeException)
     m_xFormatsSupplier.clear();
     m_xFunction.clear();
 }
-// -----------------------------------------------------------------------------
+
 OUString OFormattedField::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OFormattedField");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OFormattedField::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(2);
@@ -120,29 +120,29 @@ uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static(  ) t
 
     return aServices;
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 // XReportComponent
 REPORTCOMPONENT_IMPL(OFormattedField,m_aProps.aComponent)
 REPORTCOMPONENT_IMPL2(OFormattedField,m_aProps.aComponent)
 REPORTCOMPONENT_NOMASTERDETAIL(OFormattedField)
 REPORTCONTROLFORMAT_IMPL(OFormattedField,m_aProps.aFormatProperties)
 
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFormattedField::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return FormattedFieldPropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     // special case here /// TODO check
@@ -151,67 +151,67 @@ void SAL_CALL OFormattedField::setPropertyValue( const OUString& aPropertyName,
     else
         FormattedFieldPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFormattedField::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return FormattedFieldPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormattedFieldPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormattedFieldPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormattedFieldPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FormattedFieldPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // XReportControlModel
 OUString SAL_CALL OFormattedField::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aDataField;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFormattedField::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OFormattedField::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
 
-// -----------------------------------------------------------------------------
+
 
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone(  ) throw (uno::RuntimeException)
@@ -232,9 +232,9 @@ uno::Reference< util::XCloneable > SAL_CALL OFormattedField::createClone(  ) thr
     }
     return xSet.get();
 }
-// -----------------------------------------------------------------------------
+
 // XFormattedField
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OFormattedField::getFormatKey() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -245,7 +245,7 @@ void SAL_CALL OFormattedField::setFormatKey(::sal_Int32 _formatkey) throw (uno::
 {
     set(PROPERTY_FORMATKEY,_formatkey,m_nFormatKey);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getFormatsSupplier() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -263,99 +263,99 @@ uno::Reference< util::XNumberFormatsSupplier > SAL_CALL OFormattedField::getForm
     }
     return m_xFormatsSupplier;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& _formatssupplier ) throw (uno::RuntimeException)
 {
     set(PROPERTY_FORMATSSUPPLIER,_formatssupplier,m_xFormatsSupplier);
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OFormattedField::getParent(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getParent(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     OShapeHelper::setParent(Parent,this);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XFormatCondition > SAL_CALL OFormattedField::createFormatCondition(  ) throw (uno::Exception, uno::RuntimeException)
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OFormattedField::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.addContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.removeContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OFormattedField::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFormattedField::hasElements(  ) throw (uno::RuntimeException)
 {
     return m_aProps.hasElements();
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OFormattedField::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.insertByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.removeByIndex(Index);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OFormattedField::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.replaceByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OFormattedField::getCount(  ) throw (uno::RuntimeException)
 {
     return m_aProps.getCount();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFormattedField::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aProps.getByIndex( Index );
 }
-// -----------------------------------------------------------------------------
+
 // XShape
 awt::Point SAL_CALL OFormattedField::getPosition(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getPosition(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException)
 {
     OShapeHelper::setPosition(aPosition,this);
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL OFormattedField::getSize(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getSize(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException)
 {
     OShapeHelper::setSize(aSize,this);
 }
-// -----------------------------------------------------------------------------
+
 
 // XShapeDescriptor
 OUString SAL_CALL OFormattedField::getShapeType(  ) throw (uno::RuntimeException)
@@ -365,7 +365,7 @@ OUString SAL_CALL OFormattedField::getShapeType(  ) throw (uno::RuntimeException
         return m_aProps.aComponent.m_xShape->getShapeType();
    return OUString("com.sun.star.drawing.ControlShape");
 }
-// -----------------------------------------------------------------------------
+
 // =============================================================================
 } // namespace reportdesign
 // =============================================================================
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index c82cceea048d..978acbf98110 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -30,13 +30,13 @@ namespace reportdesign
 // =============================================================================
     using namespace com::sun::star;
     using namespace comphelper;
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OFunction(xContext));
 }
 
-// -----------------------------------------------------------------------------
+
 OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
 :FunctionBase(m_aMutex)
 ,FunctionPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
@@ -46,30 +46,30 @@ OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
 {
     m_sInitialFormula.IsPresent = sal_False;
 }
-// -----------------------------------------------------------------------------
+
 OFunction::~OFunction()
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2(OFunction,FunctionBase,FunctionPropertySet)
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::dispose() throw(uno::RuntimeException)
 {
     FunctionPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 OUString OFunction::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OFunction");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OFunction::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -77,119 +77,119 @@ uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static(  ) throw(u
 
     return aServices;
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OFunction::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return FunctionPropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FunctionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFunction::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return FunctionPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FunctionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FunctionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FunctionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     FunctionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // report::XFunction:
 ::sal_Bool SAL_CALL OFunction::getPreEvaluated() throw (uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
     return m_bPreEvaluated;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OFunction::setPreEvaluated(::sal_Bool the_value) throw (uno::RuntimeException)
 {
     set(PROPERTY_PREEVALUATED,the_value,m_bPreEvaluated);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFunction::getDeepTraversing() throw (uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
     return m_bDeepTraversing;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OFunction::setDeepTraversing(::sal_Bool the_value) throw (uno::RuntimeException)
 {
     set(PROPERTY_DEEPTRAVERSING,the_value,m_bDeepTraversing);
 }
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL OFunction::getName() throw (uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
     return m_sName;
 }
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OFunction::setName(const OUString & the_value) throw (uno::RuntimeException)
 {
     set(PROPERTY_NAME,the_value,m_sName);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OFunction::getFormula() throw (uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
     return m_sFormula;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::setFormula(const OUString & the_value) throw (uno::RuntimeException)
 {
     set(PROPERTY_FORMULA,the_value,m_sFormula);
 }
-// -----------------------------------------------------------------------------
+
 beans::Optional< OUString> SAL_CALL OFunction::getInitialFormula() throw (uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
     return m_sInitialFormula;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::setInitialFormula(const beans::Optional< OUString> & the_value) throw (uno::RuntimeException)
 {
     set(PROPERTY_INITIALFORMULA,the_value,m_sInitialFormula);
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OFunction::getParent(  ) throw (uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     osl::MutexGuard g(m_aMutex);
@@ -201,7 +201,7 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par
     else
         m_xParent = uno::WeakReference< report::XFunctions >();
 }
-// -----------------------------------------------------------------------------
+
 
 // =============================================================================
 } // namespace reportdesign
diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx
index a61cce2c1046..b8eb5d2d797c 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -29,7 +29,7 @@ namespace reportdesign
 {
 // =============================================================================
     using namespace com::sun::star;
-// -----------------------------------------------------------------------------
+
 OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xParent,const uno::Reference< uno::XComponentContext >& context)
 :FunctionsBase(m_aMutex)
 ,m_aContainerListeners(m_aMutex)
@@ -37,18 +37,18 @@ OFunctions::OFunctions(const uno::Reference< report::XFunctionsSupplier >& _xPar
 ,m_xParent(_xParent)
 {
 }
-//--------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 OFunctions::~OFunctions()
 {
 }
-//--------------------------------------------------------------------------
+
 void SAL_CALL OFunctions::dispose() throw(uno::RuntimeException)
 {
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 void SAL_CALL OFunctions::disposing()
@@ -59,14 +59,14 @@ void SAL_CALL OFunctions::disposing()
     m_aContainerListeners.disposeAndClear( aDisposeEvent );
     m_xContext.clear();
 }
-// -----------------------------------------------------------------------------
+
 // XFunctionsSupplier
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XFunction > SAL_CALL OFunctions::createFunction(  ) throw (uno::RuntimeException)
 {
     return new OFunction(m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -94,7 +94,7 @@ void SAL_CALL OFunctions::insertByIndex( ::sal_Int32 Index, const uno::Any& aEle
     m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Reference< report::XFunction > xFunction;
@@ -110,7 +110,7 @@ void SAL_CALL OFunctions::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO
     container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), uno::makeAny(xFunction), uno::Any());
     m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -130,14 +130,14 @@ void SAL_CALL OFunctions::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele
     container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), Element, aOldElement);
     m_aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OFunctions::getCount(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aFunctions.size();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -146,41 +146,41 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index ) throw (lang::Index
     ::std::advance(aPos,Index);
     return uno::makeAny(*aPos);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OFunctions::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XFunction>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OFunctions::hasElements(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return !m_aFunctions.empty();
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OFunctions::getParent(  ) throw (uno::RuntimeException)
 {
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunctions::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     throw lang::NoSupportException();
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OFunctions::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aContainerListeners.addInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OFunctions::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aContainerListeners.removeInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void OFunctions::checkIndex(sal_Int32 _nIndex)
 {
     if ( _nIndex < 0 || static_cast<sal_Int32>(m_aFunctions.size()) <= _nIndex )
diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx
index ee640a09400f..7344d3a61268 100644
--- a/reportdesign/source/core/api/Group.cxx
+++ b/reportdesign/source/core/api/Group.cxx
@@ -36,7 +36,7 @@ namespace reportdesign
 // =============================================================================
     using namespace com::sun::star;
     using namespace comphelper;
-// -----------------------------------------------------------------------------
+
 OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
                ,const uno::Reference< uno::XComponentContext >& _xContext)
 :GroupBase(m_aMutex)
@@ -50,13 +50,13 @@ OGroup::OGroup(const uno::Reference< report::XGroups >& _xParent
     }
     osl_atomic_decrement( &m_refCount );
 }
-//--------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 OGroup::~OGroup()
 {
 }
-//--------------------------------------------------------------------------
+
 void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource)
 {
     ::comphelper::copyProperties(_xSource.get(),static_cast<GroupPropertySet*>(this));
@@ -73,37 +73,37 @@ void OGroup::copyGroup(const uno::Reference< report::XGroup >& _xSource)
         OSection::lcl_copySection(_xSource->getFooter(),m_xFooter);
     }
 }
-//--------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2(OGroup,GroupBase,GroupPropertySet)
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OGroup::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.Group");
 }
-//------------------------------------------------------------------------------
+
 uno::Sequence< OUString> OGroup::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
 {
     uno::Sequence< OUString> aSupported(1);
     aSupported.getArray()[0] = SERVICE_GROUP;
     return aSupported;
 }
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString> SAL_CALL OGroup::getSupportedServiceNames() throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OGroup::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::dispose() throw(uno::RuntimeException)
 {
     GroupPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 void SAL_CALL OGroup::disposing()
@@ -113,25 +113,25 @@ void SAL_CALL OGroup::disposing()
     ::comphelper::disposeComponent(m_xFunctions);
     m_xContext.clear();
 }
-// -----------------------------------------------------------------------------
+
 // XGroup
 ::sal_Bool SAL_CALL OGroup::getSortAscending() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_eSortAscending;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setSortAscending( ::sal_Bool _sortascending ) throw (uno::RuntimeException)
 {
     set(PROPERTY_SORTASCENDING,_sortascending,m_aProps.m_eSortAscending);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OGroup::getHeaderOn() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xHeader.is();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeException)
 {
     if ( bool(_headeron) != m_xHeader.is() )
@@ -140,13 +140,13 @@ void SAL_CALL OGroup::setHeaderOn( ::sal_Bool _headeron ) throw (uno::RuntimeExc
         setSection(PROPERTY_HEADERON,_headeron,sName,m_xHeader);
     }
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OGroup::getFooterOn() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xFooter.is();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeException)
 {
     if ( bool(_footeron) != m_xFooter.is() )
@@ -155,7 +155,7 @@ void SAL_CALL OGroup::setFooterOn( ::sal_Bool _footeron ) throw (uno::RuntimeExc
         setSection(PROPERTY_FOOTERON,_footeron,sName,m_xFooter);
     }
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container::NoSuchElementException, uno::RuntimeException)
 {
     uno::Reference< report::XSection > xRet;
@@ -168,7 +168,7 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getHeader() throw (container
         throw container::NoSuchElementException();
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container::NoSuchElementException, uno::RuntimeException)
 {
     uno::Reference< report::XSection > xRet;
@@ -181,13 +181,13 @@ uno::Reference< report::XSection > SAL_CALL OGroup::getFooter() throw (container
         throw container::NoSuchElementException();
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL OGroup::getGroupOn() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_nGroupOn;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     if ( _groupon < report::GroupOn::DEFAULT || _groupon > report::GroupOn::INTERVAL )
@@ -197,24 +197,24 @@ void SAL_CALL OGroup::setGroupOn( ::sal_Int16 _groupon ) throw (lang::IllegalArg
                         ,m_xContext);
     set(PROPERTY_GROUPON,_groupon,m_aProps.m_nGroupOn);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OGroup::getGroupInterval() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_nGroupInterval;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setGroupInterval( ::sal_Int32 _groupinterval ) throw (uno::RuntimeException)
 {
     set(PROPERTY_GROUPINTERVAL,_groupinterval,m_aProps.m_nGroupInterval);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL OGroup::getKeepTogether() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_nKeepTogether;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     if ( _keeptogether < report::KeepTogether::NO || _keeptogether > report::KeepTogether::WITH_FIRST_DETAIL )
@@ -224,92 +224,92 @@ void SAL_CALL OGroup::setKeepTogether( ::sal_Int16 _keeptogether ) throw (lang::
                         ,m_xContext);
     set(PROPERTY_KEEPTOGETHER,_keeptogether,m_aProps.m_nKeepTogether);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XGroups > SAL_CALL OGroup::getGroups() throw (uno::RuntimeException)
 {
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OGroup::getExpression() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_sExpression;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setExpression( const OUString& _expression ) throw (uno::RuntimeException)
 {
     set(PROPERTY_EXPRESSION,_expression,m_aProps.m_sExpression);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OGroup::getStartNewColumn() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_bStartNewColumn;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setStartNewColumn( ::sal_Bool _startnewcolumn ) throw (uno::RuntimeException)
 {
     set(PROPERTY_STARTNEWCOLUMN,_startnewcolumn,m_aProps.m_bStartNewColumn);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 ::sal_Bool SAL_CALL OGroup::getResetPageNumber() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.m_bResetPageNumber;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setResetPageNumber( ::sal_Bool _resetpagenumber ) throw (uno::RuntimeException)
 {
     set(PROPERTY_RESETPAGENUMBER,_resetpagenumber,m_aProps.m_bResetPageNumber);
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OGroup::getParent(  ) throw (uno::RuntimeException)
 {
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     throw lang::NoSupportException();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OGroup::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return GroupPropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     GroupPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OGroup::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return GroupPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     GroupPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     GroupPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     GroupPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroup::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     GroupPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void OGroup::setSection(     const OUString& _sProperty
                             ,const sal_Bool& _bOn
                             ,const OUString& _sName
@@ -325,7 +325,7 @@ void OGroup::setSection(     const OUString& _sProperty
     }
     l.notify();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XFunctions > SAL_CALL OGroup::getFunctions() throw (uno::RuntimeException)
 {
     return m_xFunctions;
diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx
index f1ca56a495b2..d878789c398c 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -28,7 +28,7 @@ namespace reportdesign
 {
 // =============================================================================
     using namespace com::sun::star;
-// -----------------------------------------------------------------------------
+
 OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,const uno::Reference< uno::XComponentContext >& context)
 :GroupsBase(m_aMutex)
 ,m_aContainerListeners(m_aMutex)
@@ -36,13 +36,13 @@ OGroups::OGroups(const uno::Reference< report::XReportDefinition >& _xParent,con
 ,m_xParent(_xParent)
 {
 }
-//--------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 OGroups::~OGroups()
 {
 }
-//--------------------------------------------------------------------------
+
 void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource)
 {
     sal_Int32 nCount = _xSource->getCount();
@@ -54,12 +54,12 @@ void OGroups::copyGroups(const uno::Reference< report::XGroups >& _xSource)
         pGroup->copyGroup(xGroup);
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroups::dispose() throw(uno::RuntimeException)
 {
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 void SAL_CALL OGroups::disposing()
@@ -70,18 +70,18 @@ void SAL_CALL OGroups::disposing()
     m_aContainerListeners.disposeAndClear( aDisposeEvent );
     m_xContext.clear();
 }
-// -----------------------------------------------------------------------------
+
 // XGroups
 uno::Reference< report::XReportDefinition > SAL_CALL OGroups::getReportDefinition() throw (uno::RuntimeException)
 {
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XGroup > SAL_CALL OGroups::createGroup(  ) throw (uno::RuntimeException)
 {
     return new OGroup(this,m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -108,7 +108,7 @@ void SAL_CALL OGroups::insertByIndex( ::sal_Int32 Index, const uno::Any& aElemen
     m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Reference< report::XGroup > xGroup;
@@ -123,7 +123,7 @@ void SAL_CALL OGroups::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutO
     container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), uno::makeAny(xGroup), uno::Any());
     m_aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -143,14 +143,14 @@ void SAL_CALL OGroups::replaceByIndex( ::sal_Int32 Index, const uno::Any& Elemen
     container::ContainerEvent aEvent(static_cast<container::XContainer*>(this), uno::makeAny(Index), Element, aOldElement);
     m_aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OGroups::getCount(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aGroups.size();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -159,41 +159,41 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOut
     ::std::advance(aPos,Index);
     return uno::makeAny(*aPos);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OGroups::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XGroup>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OGroups::hasElements(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return !m_aGroups.empty();
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OGroups::getParent(  ) throw (uno::RuntimeException)
 {
     return m_xParent;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroups::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     throw lang::NoSupportException();
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OGroups::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aContainerListeners.addInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OGroups::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aContainerListeners.removeInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void OGroups::checkIndex(sal_Int32 _nIndex)
 {
     if ( _nIndex < 0 || static_cast<sal_Int32>(m_aGroups.size()) <= _nIndex )
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 264828630db3..84c383a3db6f 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -112,7 +112,7 @@ uno::Sequence< OUString > lcl_getImageOptionals()
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
 
-// -----------------------------------------------------------------------------
+
 OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext)
 :ImageControlBase(m_aMutex)
 ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals())
@@ -122,7 +122,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
 {
     m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_IMAGECONTROL,m_aProps.aComponent.m_xContext->getServiceManager());
 }
-// -----------------------------------------------------------------------------
+
 OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _xContext
                            ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
                            ,uno::Reference< drawing::XShape >& _xShape)
@@ -140,14 +140,14 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OImageControl::~OImageControl()
 {
 }
-// -----------------------------------------------------------------------------
+
 //IMPLEMENT_FORWARD_XINTERFACE2(OImageControl,ImageControlBase,ImageControlPropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OImageControl, ImageControlBase )
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = ImageControlBase::queryInterface(_rType);
@@ -160,24 +160,24 @@ uno::Any SAL_CALL OImageControl::queryInterface( const uno::Type& _rType ) throw
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::dispose() throw(uno::RuntimeException)
 {
     ImageControlPropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
-// -----------------------------------------------------------------------------
+
 OUString OImageControl::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OImageControl");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OImageControl::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -185,23 +185,23 @@ uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static(  ) thr
 
     return aServices;
 }
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OImageControl::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OImageControl(xContext));
 }
 
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 // XReportComponent
 REPORTCOMPONENT_IMPL(OImageControl,m_aProps.aComponent)
 REPORTCOMPONENT_IMPL2(OImageControl,m_aProps.aComponent)
@@ -235,7 +235,7 @@ void SAL_CALL OImageControl::setHyperLinkName(const OUString & the_value) throw
     set(PROPERTY_HYPERLINKNAME,the_value,m_aProps.aFormatProperties.sHyperLinkName);
 }
 
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OImageControl::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -263,78 +263,78 @@ void SAL_CALL OImageControl::setControlBackgroundTransparent( ::sal_Bool _contro
         set(PROPERTY_CONTROLBACKGROUND,static_cast<sal_Int32>(COL_TRANSPARENT),m_aProps.aFormatProperties.nBackgroundColor);
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OImageControl::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return ImageControlPropertySet::getPropertySetInfo();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ImageControlPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OImageControl::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return ImageControlPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ImageControlPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ImageControlPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ImageControlPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ImageControlPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // XReportControlModel
 OUString SAL_CALL OImageControl::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aDataField;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setDataField( const OUString& _datafield ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_DATAFIELD,_datafield,m_aProps.aDataField);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 ::sal_Bool SAL_CALL OImageControl::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OImageControl::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
 
-// -----------------------------------------------------------------------------
+
 
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone(  ) throw (uno::RuntimeException)
@@ -343,32 +343,32 @@ uno::Reference< util::XCloneable > SAL_CALL OImageControl::createClone(  ) throw
     uno::Reference< report::XImageControl> xSet(cloneObject(xSource,m_aProps.aComponent.m_xFactory,SERVICE_IMAGECONTROL),uno::UNO_QUERY_THROW);
     return xSet.get();
 }
-// -----------------------------------------------------------------------------
+
 
 // XImageControl
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OImageControl::getImageURL() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aImageURL;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setImageURL( const OUString& _imageurl ) throw (uno::RuntimeException)
 {
     set(PROPERTY_IMAGEURL,_imageurl,m_aImageURL);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< awt::XImageProducer > SAL_CALL OImageControl::getImageProducer(  ) throw (uno::RuntimeException)
 {
     return uno::Reference< awt::XImageProducer >();
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OImageControl::getParent(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getParent(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     OShapeHelper::setParent(Parent,this);
@@ -377,79 +377,79 @@ uno::Reference< report::XFormatCondition > SAL_CALL OImageControl::createFormatC
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OImageControl::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.addContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.removeContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OImageControl::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OImageControl::hasElements(  ) throw (uno::RuntimeException)
 {
     return m_aProps.hasElements();
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OImageControl::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.insertByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.removeByIndex(Index);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OImageControl::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.replaceByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OImageControl::getCount(  ) throw (uno::RuntimeException)
 {
     return m_aProps.getCount();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OImageControl::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aProps.getByIndex( Index );
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 // XShape
 awt::Point SAL_CALL OImageControl::getPosition(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getPosition(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException)
 {
     OShapeHelper::setPosition(aPosition,this);
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL OImageControl::getSize(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getSize(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException)
 {
     OShapeHelper::setSize(aSize,this);
 }
-// -----------------------------------------------------------------------------
+
 
 // XShapeDescriptor
 OUString SAL_CALL OImageControl::getShapeType(  ) throw (uno::RuntimeException)
@@ -459,26 +459,26 @@ OUString SAL_CALL OImageControl::getShapeType(  ) throw (uno::RuntimeException)
         return m_aProps.aComponent.m_xShape->getShapeType();
     return OUString("com.sun.star.drawing.ControlShape");
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL OImageControl::getScaleMode() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nScaleMode;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setScaleMode( ::sal_Int16 _scalemode ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     if ( _scalemode < awt::ImageScaleMode::NONE ||_scalemode > awt::ImageScaleMode::ANISOTROPIC )
         throw lang::IllegalArgumentException();
     set(PROPERTY_SCALEMODE,_scalemode,m_nScaleMode);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OImageControl::getPreserveIRI() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bPreserveIRI;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OImageControl::setPreserveIRI( ::sal_Bool _preserveiri ) throw (uno::RuntimeException)
 {
     set(PROPERTY_PRESERVEIRI,_preserveiri,m_bPreserveIRI);
diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx
index 8af0d83053c1..6671ed539ac1 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -104,7 +104,7 @@ OFormatProperties::OFormatProperties()
     aFontDescriptor.Weight = awt::FontWeight::NORMAL;
     aFontDescriptor.CharacterWidth = awt::FontWidth::NORMAL;
 }
-// -----------------------------------------------------------------------------
+
 void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xShape,const uno::Reference< report::XReportComponent>& _xTunnel,oslInterlockedCount& _rRefCount)
 {
     osl_atomic_increment( &_rRefCount );
@@ -123,7 +123,7 @@ void OReportComponentProperties::setShape(uno::Reference< drawing::XShape >& _xS
     }
     osl_atomic_decrement( &_rRefCount );
 }
-// -----------------------------------------------------------------------------
+
 OReportComponentProperties::~OReportComponentProperties()
 {
     if ( m_xProxy.is() )
diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx
index f6138af9db3e..8586ff8028aa 100644
--- a/reportdesign/source/core/api/ReportControlModel.cxx
+++ b/reportdesign/source/core/api/ReportControlModel.cxx
@@ -44,24 +44,24 @@ bool operator==( const ::com::sun::star::awt::FontDescriptor& _lhs, const ::com:
         &&  ( _lhs.Type           == _rhs.Type );
 }
 
-// -----------------------------------------------------------------------------
+
 // XContainer
 void OReportControlModel::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     aContainerListeners.addInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void OReportControlModel::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     aContainerListeners.removeInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool OReportControlModel::hasElements(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return !m_aFormatConditions.empty();
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -83,7 +83,7 @@ void OReportControlModel::insertByIndex( ::sal_Int32 Index, const uno::Any& Elem
     container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any());
     aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 void OReportControlModel::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any Element;
@@ -98,7 +98,7 @@ void OReportControlModel::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexO
     container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any());
     aContainerListeners.notifyEach(&container::XContainerListener::elementRemoved,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -115,14 +115,14 @@ void OReportControlModel::replaceByIndex( ::sal_Int32 Index, const uno::Any& Ele
     container::ContainerEvent aEvent(xBroadcaster, uno::makeAny(Index), Element, uno::Any());
     aContainerListeners.notifyEach(&container::XContainerListener::elementReplaced,aEvent);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 OReportControlModel::getCount(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     return m_aFormatConditions.size();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     uno::Any aElement;
@@ -133,18 +133,18 @@ uno::Any OReportControlModel::getByIndex( ::sal_Int32 Index ) throw (lang::Index
     }
     return aElement;
 }
-// -----------------------------------------------------------------------------
+
 void OReportControlModel::checkIndex(sal_Int32 _nIndex)
 {
     if ( _nIndex < 0 || static_cast<sal_Int32>(m_aFormatConditions.size()) <= _nIndex )
         throw lang::IndexOutOfBoundsException();
 }
-// -----------------------------------------------------------------------------
+
 bool OReportControlModel::isInterfaceForbidden(const uno::Type& _rType)
 {
     return (_rType == ::getCppuType((const uno::Reference< beans::XPropertyState>* )0) || _rType == ::getCppuType((const uno::Reference< beans::XMultiPropertySet>* )0));
 }
-// -----------------------------------------------------------------------------
+
 } // reportdesign
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index 8fbb3578b633..1bdb2a7af138 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -60,7 +60,7 @@ namespace reportdesign
     using namespace com::sun::star;
     using namespace comphelper;
 
-// -----------------------------------------------------------------------------
+
 OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentContext >& context)
 :ReportEngineBase(m_aMutex)
 ,ReportEnginePropertySet(context,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),uno::Sequence< OUString >())
@@ -68,33 +68,33 @@ OReportEngineJFree::OReportEngineJFree( const uno::Reference< uno::XComponentCon
 ,m_nMaxRows(0)
 {
 }
-// -----------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 OReportEngineJFree::~OReportEngineJFree()
 {
 }
-//--------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2(OReportEngineJFree,ReportEngineBase,ReportEnginePropertySet)
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::dispose() throw(uno::RuntimeException)
 {
     ReportEnginePropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
     m_xActiveConnection.clear();
 }
-// -----------------------------------------------------------------------------
+
 OUString OReportEngineJFree::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OReportEngineJFree");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OReportEngineJFree::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -102,23 +102,23 @@ uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static(
 
     return aServices;
 }
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OReportEngineJFree::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OReportEngineJFree(xContext));
 }
 
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 // XReportEngine
     // Attributes
 uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getReportDefinition() throw (uno::RuntimeException)
@@ -126,7 +126,7 @@ uno::Reference< report::XReportDefinition > SAL_CALL OReportEngineJFree::getRepo
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xReport;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< report::XReportDefinition >& _report ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     if ( !_report.is() )
@@ -142,18 +142,18 @@ void SAL_CALL OReportEngineJFree::setReportDefinition( const uno::Reference< rep
     }
     l.notify();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< task::XStatusIndicator > SAL_CALL OReportEngineJFree::getStatusIndicator() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_StatusIndicator;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::setStatusIndicator( const uno::Reference< task::XStatusIndicator >& _statusindicator ) throw (uno::RuntimeException)
 {
     set(PROPERTY_STATUSINDICATOR,_statusindicator,m_StatusIndicator);
 }
-// -----------------------------------------------------------------------------
+
 OUString OReportEngineJFree::getNewOutputName()
 {
     OUString sOutputName;
@@ -264,18 +264,18 @@ OUString OReportEngineJFree::getNewOutputName()
     }
     return sOutputName;
 }
-// -----------------------------------------------------------------------------
+
 // Methods
 uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentModel( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
 {
     return createDocumentAlive(NULL,true);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
 {
     return createDocumentAlive(_frame,false);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive( const uno::Reference< frame::XFrame >& _frame,bool _bHidden ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
 {
     uno::Reference< frame::XModel > xModel;
@@ -322,7 +322,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportEngineJFree::createDocumentAlive
     }
     return xModel;
 }
-// -----------------------------------------------------------------------------
+
 util::URL SAL_CALL OReportEngineJFree::createDocument( ) throw (lang::DisposedException, lang::IllegalArgumentException, uno::Exception, uno::RuntimeException)
 {
     util::URL aRet;
@@ -334,7 +334,7 @@ util::URL SAL_CALL OReportEngineJFree::createDocument( ) throw (lang::DisposedEx
     }
     return aRet;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::interrupt(  ) throw (lang::DisposedException, uno::Exception, uno::RuntimeException)
 {
     {
@@ -342,60 +342,60 @@ void SAL_CALL OReportEngineJFree::interrupt(  ) throw (lang::DisposedException,
         ::connectivity::checkDisposed(ReportEngineBase::rBHelper.bDisposed);
     }
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OReportEngineJFree::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return ReportEnginePropertySet::getPropertySetInfo();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ReportEnginePropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OReportEngineJFree::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return ReportEnginePropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ReportEnginePropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ReportEnginePropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ReportEnginePropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ReportEnginePropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< sdbc::XConnection > SAL_CALL OReportEngineJFree::getActiveConnection() throw (uno::RuntimeException)
 {
     return m_xActiveConnection;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::setActiveConnection( const uno::Reference< sdbc::XConnection >& _activeconnection ) throw (lang::IllegalArgumentException, uno::RuntimeException)
 {
     if ( !_activeconnection.is() )
         throw lang::IllegalArgumentException();
     set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_xActiveConnection);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OReportEngineJFree::getMaxRows() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nMaxRows;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 _MaxRows ) throw (uno::RuntimeException)
 {
     set(PROPERTY_MAXROWS,_MaxRows,m_nMaxRows);
diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx
index 224c275ffe90..8d627d62f482 100644
--- a/reportdesign/source/core/api/ReportVisitor.cxx
+++ b/reportdesign/source/core/api/ReportVisitor.cxx
@@ -26,7 +26,7 @@ OReportVisitor::OReportVisitor(ITraverseReport* _pTraverseReport)
 {
     OSL_ENSURE(m_pTraverseReport,"ReportDefintion must be not NULL!");
 }
-// -----------------------------------------------------------------------------
+
 void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xReportDefinition)
 {
     OSL_ENSURE(_xReportDefinition.is(),"ReportDefinition is NULL!");
@@ -67,7 +67,7 @@ void OReportVisitor::start(const uno::Reference< report::XReportDefinition>& _xR
     if ( _xReportDefinition->getReportFooterOn() )
         m_pTraverseReport->traverseReportFooter(_xReportDefinition->getReportFooter());
 }
-// -----------------------------------------------------------------------------
+
 void OReportVisitor::start(const uno::Reference< report::XGroup>& _xGroup)
 {
     OSL_ENSURE(_xGroup.is(),"Group is NULL!");
diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx
index a597c6bf5929..f3efc5567540 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -44,7 +44,7 @@ namespace reportdesign
     using namespace com::sun::star;
     using namespace comphelper;
 
-// -----------------------------------------------------------------------------
+
 uno::Sequence< OUString> lcl_getGroupAbsent()
 {
     OUString pProps[] = {
@@ -55,7 +55,7 @@ uno::Sequence< OUString> lcl_getGroupAbsent()
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Sequence< OUString> lcl_getAbsent(bool _bPageSection)
 {
     if ( _bPageSection )
@@ -102,7 +102,7 @@ uno::Reference<report::XSection> OSection::createOSection(
     return pNew;
 }
 
-// -----------------------------------------------------------------------------
+
 OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
                    ,const uno::Reference< report::XGroup >& xParentGroup
                    ,const uno::Reference< uno::XComponentContext >& context
@@ -127,16 +127,16 @@ OSection::OSection(const uno::Reference< report::XReportDefinition >& xParentDef
 ,m_bInInsertNotify(false)
 {
 }
-//--------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 OSection::~OSection()
 {
 }
-//--------------------------------------------------------------------------
+
 //IMPLEMENT_FORWARD_XINTERFACE2(OSection,SectionBase,SectionPropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OSection, SectionBase )
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = SectionBase::queryInterface(_rType);
@@ -149,7 +149,7 @@ uno::Any SAL_CALL OSection::queryInterface( const uno::Type& _rType ) throw (uno
     return aReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::dispose() throw(uno::RuntimeException)
 {
     OSL_ENSURE(!rBHelper.bDisposed,"Already disposed!");
@@ -163,7 +163,7 @@ void SAL_CALL OSection::dispose() throw(uno::RuntimeException)
     cppu::WeakComponentImplHelperBase::dispose();
 
 }
-// -----------------------------------------------------------------------------
+
 // TODO: VirtualFunctionFinder: This is virtual function!
 //
 void SAL_CALL OSection::disposing()
@@ -172,29 +172,29 @@ void SAL_CALL OSection::disposing()
     m_aContainerListeners.disposeAndClear( aDisposeEvent );
     m_xContext.clear();
 }
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OSection::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.Section");
 }
-//------------------------------------------------------------------------------
+
 uno::Sequence< OUString> OSection::getSupportedServiceNames_Static(void) throw( uno::RuntimeException )
 {
     uno::Sequence< OUString> aSupported(1);
     aSupported.getArray()[0] = SERVICE_SECTION;
     return aSupported;
 }
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString> SAL_CALL OSection::getSupportedServiceNames() throw(uno::RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OSection::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException)
 {
     return cppu::supportsService(this, _rServiceName);
 }
-// -----------------------------------------------------------------------------
+
 void OSection::init()
 {
     uno::Reference< report::XReportDefinition> xReport = getReportDefinition();
@@ -217,48 +217,48 @@ void OSection::init()
         assert(m_refCount > 1);
     }
 }
-// -----------------------------------------------------------------------------
+
 // XSection
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::getVisible() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bVisible;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setVisible( ::sal_Bool _visible ) throw (uno::RuntimeException)
 {
     set(PROPERTY_VISIBLE,_visible,m_bVisible);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OSection::getName() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sName;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setName( const OUString& _name ) throw (uno::RuntimeException)
 {
     set(PROPERTY_NAME,_name,m_sName);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_uInt32 SAL_CALL OSection::getHeight() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_nHeight;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setHeight( ::sal_uInt32 _height ) throw (uno::RuntimeException)
 {
     set(PROPERTY_HEIGHT,_height,m_nHeight);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OSection::getBackColor() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bBacktransparent ? COL_TRANSPARENT : m_nBackgroundColor;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno::RuntimeException)
 {
     sal_Bool bTransparent = _backgroundcolor == static_cast<sal_Int32>(COL_TRANSPARENT);
@@ -266,31 +266,31 @@ void SAL_CALL OSection::setBackColor( ::sal_Int32 _backgroundcolor ) throw (uno:
     if ( !bTransparent )
         set(PROPERTY_BACKCOLOR,_backgroundcolor,m_nBackgroundColor);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::getBackTransparent() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bBacktransparent;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setBackTransparent( ::sal_Bool _backtransparent ) throw (uno::RuntimeException)
 {
     set(PROPERTY_BACKTRANSPARENT,_backtransparent,m_bBacktransparent);
     if ( _backtransparent )
         set(PROPERTY_BACKCOLOR,static_cast<sal_Int32>(COL_TRANSPARENT),m_nBackgroundColor);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OSection::getConditionalPrintExpression() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_sConditionalPrintExpression;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (uno::RuntimeException)
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_sConditionalPrintExpression);
 }
-// -----------------------------------------------------------------------------
+
 void OSection::checkNotPageHeaderFooter()
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -303,7 +303,7 @@ void OSection::checkNotPageHeaderFooter()
             throw beans::UnknownPropertyException();
     }
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL OSection::getForceNewPage() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -311,7 +311,7 @@ void OSection::checkNotPageHeaderFooter()
     checkNotPageHeaderFooter();
     return m_nForceNewPage;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     if ( _forcenewpage < report::ForceNewPage::NONE || _forcenewpage > report::ForceNewPage::BEFORE_AFTER_SECTION )
@@ -322,14 +322,14 @@ void SAL_CALL OSection::setForceNewPage( ::sal_Int16 _forcenewpage ) throw (lang
     checkNotPageHeaderFooter();
     set(PROPERTY_FORCENEWPAGE,_forcenewpage,m_nForceNewPage);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int16 SAL_CALL OSection::getNewRowOrCol() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkNotPageHeaderFooter();
     return m_nNewRowOrCol;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     if ( _newroworcol < report::ForceNewPage::NONE || _newroworcol > report::ForceNewPage::BEFORE_AFTER_SECTION )
@@ -341,14 +341,14 @@ void SAL_CALL OSection::setNewRowOrCol( ::sal_Int16 _newroworcol ) throw (lang::
 
     set(PROPERTY_NEWROWORCOL,_newroworcol,m_nNewRowOrCol);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::getKeepTogether() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkNotPageHeaderFooter();
     return m_bKeepTogether;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     {
@@ -358,27 +358,27 @@ void SAL_CALL OSection::setKeepTogether( ::sal_Bool _keeptogether ) throw (lang:
 
     set(PROPERTY_KEEPTOGETHER,_keeptogether,m_bKeepTogether);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::getCanGrow() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setCanGrow( ::sal_Bool /*_cangrow*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::getCanShrink() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setCanShrink( ::sal_Bool /*_canshrink*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException(); ///TODO: unsupported at the moment
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::getRepeatSection() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -387,7 +387,7 @@ void SAL_CALL OSection::setCanShrink( ::sal_Bool /*_canshrink*/ ) throw (lang::I
         throw beans::UnknownPropertyException();
     return m_bRepeatSection;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setRepeatSection( ::sal_Bool _repeatsection ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     {
@@ -398,13 +398,13 @@ void SAL_CALL OSection::setRepeatSection( ::sal_Bool _repeatsection ) throw (lan
     }
     set(PROPERTY_REPEATSECTION,_repeatsection,m_bRepeatSection);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XGroup > SAL_CALL OSection::getGroup() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xGroup;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefinition() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -419,7 +419,7 @@ uno::Reference< report::XReportDefinition > SAL_CALL OSection::getReportDefiniti
 
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 const ::std::vector< OUString >& lcl_getControlModelMap()
 {
     static ::std::vector< OUString > s_sControlModels;
@@ -434,7 +434,7 @@ const ::std::vector< OUString >& lcl_getControlModelMap()
     return s_sControlModels;
 
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportComponent( const OUString& _sReportComponentSpecifier ) throw (uno::Exception, lang::IllegalArgumentException,uno::RuntimeException)
 {
     ::osl::ResettableMutexGuard aGuard(m_aMutex);
@@ -467,7 +467,7 @@ uno::Reference< report::XReportComponent > SAL_CALL OSection::createReportCompon
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -476,7 +476,7 @@ uno::Sequence< OUString > SAL_CALL OSection::getAvailableReportComponentNames(
     const OUString* pRet = aRet.empty() ? 0 : &aRet[0];
     return uno::Sequence< OUString >(pRet, aRet.size());
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OSection::getParent(  ) throw (uno::RuntimeException)
 {
@@ -489,90 +489,90 @@ uno::Reference< uno::XInterface > SAL_CALL OSection::getParent(  ) throw (uno::R
     }
     return  xRet;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::setParent( const uno::Reference< uno::XInterface >& /*Parent*/ ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     throw lang::NoSupportException();
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OSection::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aContainerListeners.addInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aContainerListeners.removeInterface(xListener);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OSection::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XReportComponent>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OSection::hasElements(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xDrawPage.is() ? m_xDrawPage->hasElements() : sal_False;
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OSection::getCount(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xDrawPage.is() ? m_xDrawPage->getCount() : 0;
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OSection::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_xDrawPage.is() ? m_xDrawPage->getByIndex(Index) : uno::Any();
 }
-// -----------------------------------------------------------------------------
+
 // XEnumerationAccess
 uno::Reference< container::XEnumeration > SAL_CALL OSection::createEnumeration(  ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return new ::comphelper::OEnumerationByIndex(static_cast<XSection*>(this));
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OSection::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
     return SectionPropertySet::getPropertySetInfo();
 }
-// -------------------------------------------------------------------------
+
 void SAL_CALL OSection::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     SectionPropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OSection::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return SectionPropertySet::getPropertyValue( PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     SectionPropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     SectionPropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     SectionPropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void OSection::lcl_copySection(const uno::Reference< report::XSection>& _xSource,uno::Reference< report::XSection>& _xDest)
 {
     if ( _xSource.is() )
@@ -591,7 +591,7 @@ void OSection::lcl_copySection(const uno::Reference< report::XSection>& _xSource
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException)
 {
     {
@@ -603,7 +603,7 @@ void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) t
     }
     notifyElementAdded(xShape);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OSection::remove( const uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException)
 {
     {
@@ -654,9 +654,9 @@ sal_Bool SAL_CALL OSection::hasForms() throw (uno::RuntimeException)
         : 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // com::sun::star::lang::XUnoTunnel
-//------------------------------------------------------------------
+
 sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw (uno::RuntimeException)
 {
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
@@ -664,7 +664,7 @@ sal_Int64 OSection::getSomething( const uno::Sequence< sal_Int8 > & rId ) throw
     return (m_xDrawPage_Tunnel.is()) ? m_xDrawPage_Tunnel->getSomething(rId) : 0;
 }
 
-// -----------------------------------------------------------------------------
+
 OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >& _rxComponent )
 {
     OSection* pContent( NULL );
@@ -675,7 +675,7 @@ OSection* OSection::getImplementation( const uno::Reference< uno::XInterface >&
 
     return pContent;
 }
-//------------------------------------------------------------------------
+
 uno::Sequence< sal_Int8 > OSection::getUnoTunnelImplementationId()
 {
     static ::cppu::OImplementationId * pId = 0;
@@ -690,7 +690,7 @@ uno::Sequence< sal_Int8 > OSection::getUnoTunnelImplementationId()
     }
     return pId->getImplementationId();
 }
-// -----------------------------------------------------------------------------
+
 void OSection::notifyElementAdded(const uno::Reference< drawing::XShape >& xShape )
 {
     if ( !m_bInInsertNotify )
@@ -699,7 +699,7 @@ void OSection::notifyElementAdded(const uno::Reference< drawing::XShape >& xShap
         m_aContainerListeners.notifyEach(&container::XContainerListener::elementInserted,aEvent);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSection::notifyElementRemoved(const uno::Reference< drawing::XShape >& xShape)
 {
     if ( !m_bInRemoveNotify )
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index 1dd7bcff84ea..c95b0e4068eb 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -51,7 +51,7 @@ uno::Sequence< OUString > lcl_getShapeOptionals()
     return uno::Sequence< OUString >(pProps,sizeof(pProps)/sizeof(pProps[0]));
 }
 
-// -----------------------------------------------------------------------------
+
 OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
 :ShapeBase(m_aMutex)
 ,ShapePropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getShapeOptionals())
@@ -61,7 +61,7 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext)
 {
     m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_SHAPE,m_aProps.aComponent.m_xContext->getServiceManager());
 }
-// -----------------------------------------------------------------------------
+
 OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
                ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
                ,uno::Reference< drawing::XShape >& _xShape
@@ -87,14 +87,14 @@ OShape::OShape(uno::Reference< uno::XComponentContext > const & _xContext
     }
     osl_atomic_decrement( &m_refCount );
 }
-// -----------------------------------------------------------------------------
+
 OShape::~OShape()
 {
 }
-// -----------------------------------------------------------------------------
+
 //IMPLEMENT_FORWARD_XINTERFACE2(OShape,ShapeBase,ShapePropertySet)
 IMPLEMENT_FORWARD_REFCOUNT( OShape, ShapeBase )
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = ShapeBase::queryInterface(_rType);
@@ -107,30 +107,30 @@ uno::Any SAL_CALL OShape::queryInterface( const uno::Type& _rType ) throw (uno::
     return aReturn.hasValue() ? aReturn : (m_aProps.aComponent.m_xProxy.is() ? m_aProps.aComponent.m_xProxy->queryAggregation(_rType) : aReturn);
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::dispose() throw(uno::RuntimeException)
 {
     ShapePropertySet::dispose();
     cppu::WeakComponentImplHelperBase::dispose();
 }
-//------------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return *(new OShape(xContext));
 }
 
-// -----------------------------------------------------------------------------
+
 OUString OShape::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.Shape");
 }
 
-//--------------------------------------------------------------------------
+
 OUString SAL_CALL OShape::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > OShape::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -138,7 +138,7 @@ uno::Sequence< OUString > OShape::getSupportedServiceNames_Static(  ) throw(uno:
 
     return aServices;
 }
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(uno::RuntimeException)
 {
     if(m_sServiceName.isEmpty())
@@ -154,46 +154,46 @@ uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames(  ) throw(un
         return aServices;
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OShape::supportsService(const OUString& ServiceName) throw( uno::RuntimeException )
 {
 
     return cppu::supportsService(this, ServiceName);
 }
-// -----------------------------------------------------------------------------
+
 // XReportComponent
 REPORTCOMPONENT_IMPL(OShape,m_aProps.aComponent)
 REPORTCOMPONENT_IMPL2(OShape,m_aProps.aComponent)
 REPORTCOMPONENT_MASTERDETAIL(OShape,m_aProps.aComponent)
 REPORTCONTROLFORMAT_IMPL2(OShape,m_aProps.aFormatProperties)
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OShape::getControlBackground() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setControlBackground( ::sal_Int32 /*_backgroundcolor*/ ) throw (uno::RuntimeException,beans::UnknownPropertyException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OShape::getControlBackgroundTransparent() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setControlBackgroundTransparent( ::sal_Bool /*_controlbackgroundtransparent*/ ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< beans::XPropertySetInfo > SAL_CALL OShape::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
 
     //return ShapePropertySet::getPropertySetInfo();
     return cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() );
 }
-// -----------------------------------------------------------------------------
+
 cppu::IPropertyArrayHelper& OShape::getInfoHelper()
 {
     if ( !m_pAggHelper.get() )
@@ -206,7 +206,7 @@ cppu::IPropertyArrayHelper& OShape::getInfoHelper()
     return *(m_pAggHelper.get());
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
     getInfoHelper();
@@ -216,7 +216,7 @@ void SAL_CALL OShape::setPropertyValue( const OUString& aPropertyName, const uno
     if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY )
         ShapePropertySet::setPropertyValue( aPropertyName, aValue );
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     getInfoHelper();
@@ -227,7 +227,7 @@ uno::Any SAL_CALL OShape::getPropertyValue( const OUString& PropertyName ) throw
         return ShapePropertySet::getPropertyValue( PropertyName);
     return uno::Any();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     getInfoHelper();
@@ -237,7 +237,7 @@ void SAL_CALL OShape::addPropertyChangeListener( const OUString& aPropertyName,
     if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || aPropertyName.isEmpty() )
         ShapePropertySet::addPropertyChangeListener( aPropertyName, xListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     getInfoHelper();
@@ -247,7 +247,7 @@ void SAL_CALL OShape::removePropertyChangeListener( const OUString& aPropertyNam
     if( m_pAggHelper->classifyProperty(aPropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || aPropertyName.isEmpty() )
         ShapePropertySet::removePropertyChangeListener( aPropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     getInfoHelper();
@@ -257,7 +257,7 @@ void SAL_CALL OShape::addVetoableChangeListener( const OUString& PropertyName, c
     if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || PropertyName.isEmpty() )
         ShapePropertySet::addVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener >& aListener ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     getInfoHelper();
@@ -267,40 +267,40 @@ void SAL_CALL OShape::removeVetoableChangeListener( const OUString& PropertyName
     if( m_pAggHelper->classifyProperty(PropertyName) == OPropertyArrayAggregationHelper::DELEGATOR_PROPERTY || PropertyName.isEmpty() )
         ShapePropertySet::removeVetoableChangeListener( PropertyName, aListener );
 }
-// -----------------------------------------------------------------------------
+
 // XReportControlModel
 OUString SAL_CALL OShape::getDataField() throw ( beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setDataField( const OUString& /*_datafield*/ ) throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException)
 {
     throw beans::UnknownPropertyException();
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OShape::getPrintWhenGroupChange() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.bPrintWhenGroupChange;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setPrintWhenGroupChange( ::sal_Bool _printwhengroupchange ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_PRINTWHENGROUPCHANGE,_printwhengroupchange,m_aProps.bPrintWhenGroupChange);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OShape::getConditionalPrintExpression() throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_aProps.aConditionalPrintExpression;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setConditionalPrintExpression( const OUString& _conditionalprintexpression ) throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     set(PROPERTY_CONDITIONALPRINTEXPRESSION,_conditionalprintexpression,m_aProps.aConditionalPrintExpression);
 }
-// -----------------------------------------------------------------------------
+
 
 // XCloneable
 uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  ) throw (uno::RuntimeException)
@@ -329,13 +329,13 @@ uno::Reference< util::XCloneable > SAL_CALL OShape::createClone(  ) throw (uno::
     }
     return xSet.get();
 }
-// -----------------------------------------------------------------------------
+
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OShape::getParent(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getParent(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setParent( const uno::Reference< uno::XInterface >& Parent ) throw (lang::NoSupportException, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -345,78 +345,78 @@ uno::Reference< report::XFormatCondition > SAL_CALL OShape::createFormatConditio
 {
     return new OFormatCondition(m_aProps.aComponent.m_xContext);
 }
-// -----------------------------------------------------------------------------
+
 // XContainer
 void SAL_CALL OShape::addContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.addContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::removeContainerListener( const uno::Reference< container::XContainerListener >& xListener ) throw (uno::RuntimeException)
 {
     m_aProps.removeContainerListener(xListener);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL OShape::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference<report::XFormatCondition>*>(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OShape::hasElements(  ) throw (uno::RuntimeException)
 {
     return m_aProps.hasElements();
 }
-// -----------------------------------------------------------------------------
+
 // XIndexContainer
 void SAL_CALL OShape::insertByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.insertByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::removeByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.removeByIndex(Index);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexReplace
 void SAL_CALL OShape::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     m_aProps.replaceByIndex(Index,Element);
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL OShape::getCount(  ) throw (uno::RuntimeException)
 {
     return m_aProps.getCount();
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OShape::getByIndex( ::sal_Int32 Index ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     return m_aProps.getByIndex( Index );
 }
-// -----------------------------------------------------------------------------
+
 // XShape
 awt::Point SAL_CALL OShape::getPosition(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getPosition(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setPosition( const awt::Point& aPosition ) throw (uno::RuntimeException)
 {
     OShapeHelper::setPosition(aPosition,this);
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL OShape::getSize(  ) throw (uno::RuntimeException)
 {
     return OShapeHelper::getSize(this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setSize( const awt::Size& aSize ) throw (beans::PropertyVetoException, uno::RuntimeException)
 {
     OShapeHelper::setSize(aSize,this);
 }
-// -----------------------------------------------------------------------------
+
 
 // XShapeDescriptor
 OUString SAL_CALL OShape::getShapeType(  ) throw (uno::RuntimeException)
@@ -426,46 +426,46 @@ OUString SAL_CALL OShape::getShapeType(  ) throw (uno::RuntimeException)
         return m_aProps.aComponent.m_xShape->getShapeType();
     return OUString("com.sun.star.drawing.CustomShape");
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OShape::getZOrder() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_ZORDER) >>= m_nZOrder;
     return m_nZOrder;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setZOrder( ::sal_Int32 _zorder ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_ZORDER,uno::makeAny(_zorder));
     set(PROPERTY_ZORDER,_zorder,m_nZOrder);
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OShape::getOpaque() throw (::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     return m_bOpaque;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setOpaque( ::sal_Bool _opaque ) throw (::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     set(PROPERTY_OPAQUE,_opaque,m_bOpaque);
 }
-// -----------------------------------------------------------------------------
+
 drawing::HomogenMatrix3 SAL_CALL OShape::getTransformation() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_TRANSFORMATION) >>= m_Transformation;
     return m_Transformation;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setTransformation( const drawing::HomogenMatrix3& _transformation ) throw (uno::RuntimeException)
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_TRANSFORMATION,uno::makeAny(_transformation));
     set(PROPERTY_TRANSFORMATION,_transformation,m_Transformation);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -473,40 +473,40 @@ OUString SAL_CALL OShape::getCustomShapeEngine() throw (uno::RuntimeException)
 
     return m_CustomShapeEngine;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setCustomShapeEngine( const OUString& _customshapeengine ) throw (uno::RuntimeException)
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEENGINE,uno::makeAny(_customshapeengine));
     set(PROPERTY_CUSTOMSHAPEENGINE,_customshapeengine,m_CustomShapeEngine);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OShape::getCustomShapeData() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEDATA) >>= m_CustomShapeData;
     return m_CustomShapeData;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setCustomShapeData( const OUString& _customshapedata ) throw (uno::RuntimeException)
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEDATA,uno::makeAny(_customshapedata));
     set(PROPERTY_CUSTOMSHAPEDATA,_customshapedata,m_CustomShapeData);
 }
-// -----------------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > SAL_CALL OShape::getCustomShapeGeometry() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     m_aProps.aComponent.m_xProperty->getPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY) >>= m_CustomShapeGeometry;
     return m_CustomShapeGeometry;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::PropertyValue >& _customshapegeometry ) throw (uno::RuntimeException)
 {
     m_aProps.aComponent.m_xProperty->setPropertyValue(PROPERTY_CUSTOMSHAPEGEOMETRY,uno::makeAny(_customshapegeometry));
     set(PROPERTY_CUSTOMSHAPEGEOMETRY,_customshapegeometry,m_CustomShapeGeometry);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 
 // =============================================================================
 }// namespace reportdesign
diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx
index be6dacb58c6d..718f2b4cc66a 100644
--- a/reportdesign/source/core/api/Tools.cxx
+++ b/reportdesign/source/core/api/Tools.cxx
@@ -39,7 +39,7 @@ uno::Reference< report::XSection> lcl_getSection(const uno::Reference< uno::XInt
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 void throwIllegallArgumentException( const OUString& _sTypeName
                                     ,const uno::Reference< uno::XInterface >& ExceptionContext_
                                     ,const ::sal_Int16& ArgumentPosition_
@@ -50,7 +50,7 @@ void throwIllegallArgumentException( const OUString& _sTypeName
     sErrorMessage = sErrorMessage.replaceAt(sErrorMessage.indexOf('#'),2,_sTypeName);
     throw lang::IllegalArgumentException(sErrorMessage,ExceptionContext_,ArgumentPosition_);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XReportComponent>& _xReportComponent
     ,const uno::Reference< lang::XMultiServiceFactory>& _xFactory
     ,const OUString& _sServiceName)
@@ -60,7 +60,7 @@ uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XRe
     ::comphelper::copyProperties(_xReportComponent.get(),xClone.get());
     return xClone.get();
 }
-// -----------------------------------------------------------------------------
+
 
 // =============================================================================
 } // namespace reportdesign
diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx
index 08c1fcf6bd69..cf4cd2311be9 100644
--- a/reportdesign/source/core/misc/conditionalexpression.cxx
+++ b/reportdesign/source/core/misc/conditionalexpression.cxx
@@ -24,13 +24,13 @@ namespace rptui
     // =============================================================================
     // = ConditionalExpression
     // =============================================================================
-    // -----------------------------------------------------------------------------
+
     ConditionalExpression::ConditionalExpression( const sal_Char* _pAsciiPattern )
         :m_sPattern( OUString::createFromAscii( _pAsciiPattern ) )
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     OUString ConditionalExpression::assembleExpression( const OUString& _rFieldDataSource, const OUString& _rLHS, const OUString& _rRHS ) const
     {
         OUString sExpression( m_sPattern );
@@ -59,7 +59,7 @@ namespace rptui
         return sExpression;
     }
 
-    // -----------------------------------------------------------------------------
+
     bool ConditionalExpression::matchExpression( const OUString& _rExpression, const OUString& _rFieldDataSource, OUString& _out_rLHS, OUString& _out_rRHS ) const
     {
         (void)_rExpression;
@@ -165,7 +165,7 @@ namespace rptui
     // =============================================================================
     // = ConditionalExpressionFactory
     // =============================================================================
-    // -----------------------------------------------------------------------------
+
     size_t ConditionalExpressionFactory::getKnownConditionalExpressions( ConditionalExpressions& _out_rCondExp )
     {
         ConditionalExpressions aEmpty;
diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx
index b14d4ad2966b..f5ac039e8591 100644
--- a/reportdesign/source/core/misc/conditionupdater.cxx
+++ b/reportdesign/source/core/misc/conditionupdater.cxx
@@ -39,17 +39,17 @@ namespace rptui
     //====================================================================
     //= ConditionUpdater
     //====================================================================
-    //--------------------------------------------------------------------
+
     ConditionUpdater::ConditionUpdater()
     {
     }
 
-    //--------------------------------------------------------------------
+
     ConditionUpdater::~ConditionUpdater()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void ConditionUpdater::notifyPropertyChange( const PropertyChangeEvent& _rEvent )
     {
         if ( !impl_lateInit_nothrow() )
@@ -65,7 +65,7 @@ namespace rptui
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ConditionUpdater::impl_lateInit_nothrow()
     {
         if ( !m_aConditionalExpressions.empty() )
@@ -75,7 +75,7 @@ namespace rptui
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void ConditionUpdater::impl_adjustFormatConditions_nothrow( const Reference< XReportControlModel >& _rxRptControlModel,
         const OUString& _rOldDataSource, const OUString& _rNewDataSource )
     {
diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx
index 689c5d9581cd..a05b58fbb0dc 100644
--- a/reportdesign/source/core/misc/reportformula.cxx
+++ b/reportdesign/source/core/misc/reportformula.cxx
@@ -30,7 +30,7 @@ namespace rptui
 
     namespace
     {
-        //----------------------------------------------------------------
+
         const OUString&  lcl_getExpressionPrefix( sal_Int32* _pTakeLengthOrNull = NULL )
         {
             static OUString s_sPrefix( "rpt:" );
@@ -39,7 +39,7 @@ namespace rptui
             return s_sPrefix;
         }
 
-        //----------------------------------------------------------------
+
         const OUString&  lcl_getFieldPrefix( sal_Int32* _pTakeLengthOrNull = NULL )
         {
             static OUString s_sPrefix( "field:" );
@@ -52,14 +52,14 @@ namespace rptui
     //====================================================================
     //= ReportFormula
     //====================================================================
-    //--------------------------------------------------------------------
+
     ReportFormula::ReportFormula( const OUString& _rFormula )
         :m_eType( Invalid )
     {
         impl_construct( _rFormula );
     }
 
-    //--------------------------------------------------------------------
+
     ReportFormula::ReportFormula( const BindType _eType, const OUString& _rFieldOrExpression )
         :m_eType( _eType )
     {
@@ -91,11 +91,11 @@ namespace rptui
 
         m_sUndecoratedContent = _rFieldOrExpression;
     }
-    //--------------------------------------------------------------------
+
     ReportFormula::~ReportFormula()
     {
     }
-    //--------------------------------------------------------------------
+
     void ReportFormula::impl_construct( const OUString& _rFormula )
     {
         m_sCompleteFormula = _rFormula;
@@ -126,7 +126,7 @@ namespace rptui
         m_eType = Invalid;
     }
 
-    //--------------------------------------------------------------------
+
     OUString ReportFormula::getBracketedFieldOrExpression() const
     {
         bool bIsField = ( getType() == Field );
@@ -139,7 +139,7 @@ namespace rptui
 
         return aFieldContent.makeStringAndClear();
     }
-    //--------------------------------------------------------------------
+
     const OUString& ReportFormula::getUndecoratedContent() const
     {
         return m_sUndecoratedContent;
@@ -155,7 +155,7 @@ namespace rptui
         m_sUndecoratedContent   = _rHd.m_sUndecoratedContent;
         return *this;
     }
-    //--------------------------------------------------------------------
+
     OUString ReportFormula::getEqualUndecoratedContent() const
     {
         OUStringBuffer aBuffer;
diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx
index 2e8714e4d930..17d896fa0d9b 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -22,7 +22,7 @@
 // ---- needed as long as we have no contexts for components ---
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-//---------------------------------------------------
+
 #include <osl/thread.h>
 #include <com/sun/star/util/XMacroExpander.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -40,13 +40,13 @@ namespace reportdesign
     //==================================================================
     SimpleResMgr* ResourceManager::m_pImpl = NULL;
 
-    //------------------------------------------------------------------
+
     ResourceManager::EnsureDelete::~EnsureDelete()
     {
         delete ResourceManager::m_pImpl;
     }
 
-    //------------------------------------------------------------------
+
     void ResourceManager::ensureImplExists(const uno::Reference< lang::XMultiComponentFactory >& /* _rM */)
     {
         if (!m_pImpl)
@@ -58,7 +58,7 @@ namespace reportdesign
         }
     }
 
-    //------------------------------------------------------------------
+
     OUString ResourceManager::loadString(sal_uInt16 _nResId,const uno::Reference< lang::XMultiComponentFactory >& _rM)
     {
         OUString sReturn;
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx
index 7a8759b904b6..8600ddd12641 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -54,20 +54,20 @@ public:
     ResMgr* getResManager();
 };
 
-//-------------------------------------------------------------------------
+
 OModuleImpl::OModuleImpl()
     :m_pResources(NULL)
 {
 }
 
-//-------------------------------------------------------------------------
+
 OModuleImpl::~OModuleImpl()
 {
     if (m_pResources)
         delete m_pResources;
 }
 
-//-------------------------------------------------------------------------
+
 ResMgr* OModuleImpl::getResManager()
 {
     // note that this method is not threadsafe, which counts for the whole class !
@@ -92,21 +92,21 @@ namespace
 
 sal_Int32       OModule::s_nClients = 0;
 OModuleImpl*    OModule::s_pImpl = NULL;
-//-------------------------------------------------------------------------
+
 ResMgr* OModule::getResManager()
 {
     ENTER_MOD_METHOD();
     return s_pImpl->getResManager();
 }
 
-//-------------------------------------------------------------------------
+
 void OModule::registerClient()
 {
     ::osl::MutexGuard aGuard(theOModuleMutex::get());
     ++s_nClients;
 }
 
-//-------------------------------------------------------------------------
+
 void OModule::revokeClient()
 {
     ::osl::MutexGuard aGuard(theOModuleMutex::get());
@@ -117,7 +117,7 @@ void OModule::revokeClient()
     }
 }
 
-//-------------------------------------------------------------------------
+
 void OModule::ensureImpl()
 {
     if (s_pImpl)
diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx
index e10f891eade4..bb806638e89c 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -86,11 +86,11 @@ OPropertyMediator::OPropertyMediator(const Reference< XPropertySet>& _xSource
     }
     osl_atomic_decrement(&m_refCount);
 }
-// -----------------------------------------------------------------------------
+
 OPropertyMediator::~OPropertyMediator()
 {
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt ) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -156,13 +156,13 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt
         m_bInChange = sal_False;
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPropertyMediator::disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     disposing();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OPropertyMediator::disposing()
 {
     stopListening();
@@ -171,7 +171,7 @@ void SAL_CALL OPropertyMediator::disposing()
     m_xDest.clear();
     m_xDestInfo.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OPropertyMediator::stopListening()
 {
     if ( m_xSource.is() )
@@ -179,7 +179,7 @@ void OPropertyMediator::stopListening()
     if ( m_xDest.is() )
         m_xDest->removePropertyChangeListener(OUString(), this);
 }
-// -----------------------------------------------------------------------------
+
 void OPropertyMediator::startListening()
 {
     if ( m_xSource.is() )
@@ -187,7 +187,7 @@ void OPropertyMediator::startListening()
     if ( m_xDest.is() )
         m_xDest->addPropertyChangeListener(OUString(), this);
 }
-// -----------------------------------------------------------------------------
+
 //........................................................................
 }   // namespace dbaccess
 //........................................................................
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 63ce08fd7e6b..2b1ba67c7be3 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -45,7 +45,7 @@ using namespace reportdesign;
 using namespace com::sun::star;
 TYPEINIT1(OReportModel,SdrModel);
 
-//----------------------------------------------------------------------------
+
 
 OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition) :
     SdrModel(SvtPathOptions().GetPalettePath(),NULL,_pReportDefinition)
@@ -57,13 +57,13 @@ OReportModel::OReportModel(::reportdesign::OReportDefinition* _pReportDefinition
     SetSdrUndoFactory(new OReportUndoFactory);
 }
 
-//----------------------------------------------------------------------------
+
 OReportModel::~OReportModel()
 {
     detachController();
     m_pUndoEnv->release();
 }
-// -----------------------------------------------------------------------------
+
 void OReportModel::detachController()
 {
     m_pReportDefinition = NULL;
@@ -72,14 +72,14 @@ void OReportModel::detachController()
     ClearUndoBuffer();
     m_pUndoEnv->Clear(OXUndoEnvironment::Accessor());
 }
-//----------------------------------------------------------------------------
+
 SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/)
 {
     OSL_FAIL("Who called me!");
     return NULL;
 }
 
-//----------------------------------------------------------------------------
+
 
 void OReportModel::SetChanged( bool bChanged )
 {
@@ -87,25 +87,25 @@ void OReportModel::SetChanged( bool bChanged )
     SetModified( bChanged );
 }
 
-//----------------------------------------------------------------------------
+
 
 OXUndoEnvironment&  OReportModel::GetUndoEnv()
 {
     return *m_pUndoEnv;
 }
-//----------------------------------------------------------------------------
+
 void OReportModel::SetModified(sal_Bool _bModified)
 {
     if ( m_pController )
         m_pController->setModified(_bModified);
 }
-// -----------------------------------------------------------------------------
+
 SdrPage* OReportModel::RemovePage(sal_uInt16 nPgNum)
 {
     OReportPage* pPage = dynamic_cast<OReportPage*>(SdrModel::RemovePage(nPgNum));
     return pPage;
 }
-// -----------------------------------------------------------------------------
+
 OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection >& _xSection)
 {
     SolarMutexGuard aSolarGuard;
@@ -114,7 +114,7 @@ OReportPage* OReportModel::createNewPage(const uno::Reference< report::XSection
     m_pUndoEnv->AddSection(_xSection);
     return pPage;
 }
-// -----------------------------------------------------------------------------
+
 OReportPage* OReportModel::getPage(const uno::Reference< report::XSection >& _xSection)
 {
     OReportPage* pPage = NULL;
@@ -127,7 +127,7 @@ OReportPage* OReportModel::getPage(const uno::Reference< report::XSection >& _xS
     }
     return pPage;
 }
-// -----------------------------------------------------------------------------
+
 SvxNumType OReportModel::GetPageNumType() const
 {
     uno::Reference< report::XReportDefinition > xReportDefinition( getReportDefinition() );
@@ -136,19 +136,19 @@ SvxNumType OReportModel::GetPageNumType() const
     return SVX_ARABIC;
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XReportDefinition > OReportModel::getReportDefinition() const
 {
     uno::Reference< report::XReportDefinition > xReportDefinition = m_pReportDefinition;
     OSL_ENSURE( xReportDefinition.is(), "OReportModel::getReportDefinition: invalid model at our controller!" );
     return xReportDefinition;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OReportModel::createUnoModel()
 {
     return uno::Reference< uno::XInterface >(getReportDefinition(),uno::UNO_QUERY);
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OReportModel::createShape(const OUString& aServiceSpecifier,uno::Reference< drawing::XShape >& _rShape,sal_Int32 nOrientation)
 {
     uno::Reference< uno::XInterface > xRet;
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx
index fb1f18585de8..daf58bf1eebf 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -81,7 +81,7 @@ using namespace reportdesign;
 using namespace container;
 using namespace script;
 using namespace report;
-//----------------------------------------------------------------------------
+
 sal_uInt16 OObjectBase::getObjectType(const uno::Reference< report::XReportComponent>& _xComponent)
 {
     uno::Reference< lang::XServiceInfo > xServiceInfo( _xComponent , uno::UNO_QUERY );
@@ -315,13 +315,13 @@ OObjectBase::OObjectBase(const uno::Reference< report::XReportComponent>& _xComp
 {
     m_xReportComponent = _xComponent;
 }
-//----------------------------------------------------------------------------
+
 OObjectBase::OObjectBase(const OUString& _sComponentName)
 :m_sComponentName(_sComponentName)
 ,m_bIsListening(sal_False)
 {
 }
-//----------------------------------------------------------------------------
+
 OObjectBase::~OObjectBase()
 {
     m_xMediator.reset();
@@ -348,7 +348,7 @@ uno::Reference< beans::XPropertySet> OObjectBase::getAwtComponent()
 {
     return uno::Reference< beans::XPropertySet>();
 }
-//----------------------------------------------------------------------------
+
 void OObjectBase::StartListening()
 {
     OSL_ENSURE(!isListening(), "OUnoObject::StartListening: already listening!");
@@ -365,7 +365,7 @@ void OObjectBase::StartListening()
         }
     }
 }
-//----------------------------------------------------------------------------
+
 void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
 {
     OSL_ENSURE(!m_xReportComponent.is() || isListening(), "OUnoObject::EndListening: not listening currently!");
@@ -389,7 +389,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/)
         m_xPropertyChangeListener.clear();
     }
 }
-//----------------------------------------------------------------------------
+
 void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
 {
     // set properties
@@ -406,17 +406,17 @@ void OObjectBase::SetPropsFromRect(const Rectangle& _rRect)
         //pModel->GetRefDevice()->Invalidate(INVALIDATE_CHILDREN);
     }
 }
-//----------------------------------------------------------------------------
+
 void OObjectBase::_propertyChange( const  beans::PropertyChangeEvent& /*evt*/ ) throw( uno::RuntimeException)
 {
 }
-//----------------------------------------------------------------------------
+
 void OObjectBase::SetObjectItemHelper(const SfxPoolItem& /*rItem*/)
 {
     // do nothing
 }
 
-//----------------------------------------------------------------------------
+
 sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const
 {
     sal_Bool bSupports = sal_False;
@@ -429,7 +429,7 @@ sal_Bool OObjectBase::supportsService( const OUString& _sServiceName ) const
     return bSupports;
 }
 
-//----------------------------------------------------------------------------
+
 void OObjectBase::ensureSdrObjectOwnership( const uno::Reference< uno::XInterface >& _rxShape )
 {
     // UNDO in the report designer is implemented at the level of the XShapes, not
@@ -450,7 +450,7 @@ void OObjectBase::ensureSdrObjectOwnership( const uno::Reference< uno::XInterfac
     }
 }
 
-//----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OObjectBase::getUnoShapeOf( SdrObject& _rSdrObject )
 {
     uno::Reference< uno::XInterface > xShape( _rSdrObject.getWeakUnoShape() );
@@ -467,7 +467,7 @@ uno::Reference< uno::XInterface > OObjectBase::getUnoShapeOf( SdrObject& _rSdrOb
     return xShape;
 }
 
-//----------------------------------------------------------------------------
+
 TYPEINIT1(OCustomShape, SdrObjCustomShape);
 OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xComponent
                            )
@@ -477,7 +477,7 @@ OCustomShape::OCustomShape(const uno::Reference< report::XReportComponent>& _xCo
     impl_setUnoShape( uno::Reference< uno::XInterface >(_xComponent,uno::UNO_QUERY) );
     m_bIsListening = sal_True;
 }
-//----------------------------------------------------------------------------
+
 OCustomShape::OCustomShape(const OUString& _sComponentName)
           :SdrObjCustomShape()
           ,OObjectBase(_sComponentName)
@@ -485,7 +485,7 @@ OCustomShape::OCustomShape(const OUString& _sComponentName)
     m_bIsListening = sal_True;
 }
 
-//----------------------------------------------------------------------------
+
 OCustomShape::~OCustomShape()
 {
 }
@@ -494,22 +494,22 @@ sal_uInt16 OCustomShape::GetObjIdentifier() const
 {
     return sal_uInt16(OBJ_CUSTOMSHAPE);
 }
-//----------------------------------------------------------------------------
+
 sal_uInt32 OCustomShape::GetObjInventor() const
 {
     return ReportInventor;
 }
-//----------------------------------------------------------------------------
+
 SdrPage* OCustomShape::GetImplPage() const
 {
     return GetPage();
 }
-//----------------------------------------------------------------------------
+
 void OCustomShape::SetSnapRectImpl(const Rectangle& _rRect)
 {
     SetSnapRect( _rRect );
 }
-//----------------------------------------------------------------------------
+
 sal_Int32 OCustomShape::GetStep() const
 {
     // get step property
@@ -517,7 +517,7 @@ sal_Int32 OCustomShape::GetStep() const
     OSL_FAIL("Who called me!");
     return nStep;
 }
-//----------------------------------------------------------------------------
+
 void OCustomShape::NbcMove( const Size& rSize )
 {
     if ( m_bIsListening )
@@ -540,20 +540,20 @@ void OCustomShape::NbcMove( const Size& rSize )
     else
         SdrObjCustomShape::NbcMove( rSize );
 }
-//----------------------------------------------------------------------------
+
 void OCustomShape::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
 {
     SdrObjCustomShape::NbcResize( rRef, xFract, yFract );
 
     SetPropsFromRect(GetSnapRect());
 }
-//----------------------------------------------------------------------------
+
 void OCustomShape::NbcSetLogicRect(const Rectangle& rRect)
 {
     SdrObjCustomShape::NbcSetLogicRect(rRect);
     SetPropsFromRect(rRect);
 }
-//----------------------------------------------------------------------------
+
 bool OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
     bool bResult = SdrObjCustomShape::EndCreate(rStat, eCmd);
@@ -572,7 +572,7 @@ bool OCustomShape::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
     return bResult;
 }
 
-//----------------------------------------------------------------------------
+
 void OCustomShape::SetObjectItemHelper(const SfxPoolItem& rItem)
 {
     SetObjectItem(rItem);
@@ -586,7 +586,7 @@ uno::Reference< beans::XPropertySet> OCustomShape::getAwtComponent()
     return uno::Reference< beans::XPropertySet>(m_xReportComponent,uno::UNO_QUERY);
 }
 
-//----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OCustomShape::getUnoShape()
 {
     uno::Reference< uno::XInterface> xShape = OObjectBase::getUnoShapeOf( *this );
@@ -606,10 +606,10 @@ void OCustomShape::impl_setUnoShape( const uno::Reference< uno::XInterface >& rx
     m_xReportComponent.clear();
 }
 
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
+
 TYPEINIT1(OUnoObject, SdrUnoObj);
-//----------------------------------------------------------------------------
+
 OUnoObject::OUnoObject(const OUString& _sComponentName
                        ,const OUString& rModelName
                        ,sal_uInt16   _nObjectType)
@@ -620,7 +620,7 @@ OUnoObject::OUnoObject(const OUString& _sComponentName
     if ( !rModelName.isEmpty() )
         impl_initializeModel_nothrow();
 }
-//----------------------------------------------------------------------------
+
 OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xComponent
                        ,const OUString& rModelName
                        ,sal_uInt16   _nObjectType)
@@ -634,7 +634,7 @@ OUnoObject::OUnoObject(const uno::Reference< report::XReportComponent>& _xCompon
         impl_initializeModel_nothrow();
 
 }
-//----------------------------------------------------------------------------
+
 OUnoObject::~OUnoObject()
 {
 }
@@ -678,22 +678,22 @@ sal_uInt16 OUnoObject::GetObjIdentifier() const
 {
     return sal_uInt16(m_nObjectType);
 }
-//----------------------------------------------------------------------------
+
 sal_uInt32 OUnoObject::GetObjInventor() const
 {
     return ReportInventor;
 }
-//----------------------------------------------------------------------------
+
 SdrPage* OUnoObject::GetImplPage() const
 {
     return GetPage();
 }
-//----------------------------------------------------------------------------
+
 void OUnoObject::SetSnapRectImpl(const Rectangle& _rRect)
 {
     SetSnapRect( _rRect );
 }
-//----------------------------------------------------------------------------
+
 sal_Int32 OUnoObject::GetStep() const
 {
     // get step property
@@ -702,7 +702,7 @@ sal_Int32 OUnoObject::GetStep() const
     return nStep;
 }
 
-//----------------------------------------------------------------------------
+
 void OUnoObject::NbcMove( const Size& rSize )
 {
 
@@ -750,7 +750,7 @@ void OUnoObject::NbcMove( const Size& rSize )
         SdrUnoObj::NbcMove( rSize );
 }
 
-//----------------------------------------------------------------------------
+
 
 void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
 {
@@ -765,7 +765,7 @@ void OUnoObject::NbcResize(const Point& rRef, const Fraction& xFract, const Frac
     // start listening
     OObjectBase::StartListening();
 }
-//----------------------------------------------------------------------------
+
 void OUnoObject::NbcSetLogicRect(const Rectangle& rRect)
 {
     SdrUnoObj::NbcSetLogicRect(rRect);
@@ -778,7 +778,7 @@ void OUnoObject::NbcSetLogicRect(const Rectangle& rRect)
     // start listening
     OObjectBase::StartListening();
 }
-//----------------------------------------------------------------------------
+
 
 bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
@@ -809,7 +809,7 @@ bool OUnoObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 
     return bResult;
 }
-//----------------------------------------------------------------------------
+
 OUString OUnoObject::GetDefaultName(const OUnoObject* _pObj)
 {
     sal_uInt16 nResId = 0;
@@ -942,9 +942,9 @@ OUnoObject* OUnoObject::Clone() const
 {
     return CloneHelper< OUnoObject >();
 }
-//----------------------------------------------------------------------------
+
 // OOle2Obj
-//----------------------------------------------------------------------------
+
 TYPEINIT1(OOle2Obj, SdrOle2Obj);
 OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,sal_uInt16 _nType)
           :SdrOle2Obj()
@@ -956,7 +956,7 @@ OOle2Obj::OOle2Obj(const uno::Reference< report::XReportComponent>& _xComponent,
     impl_setUnoShape( uno::Reference< uno::XInterface >( _xComponent, uno::UNO_QUERY ) );
     m_bIsListening = sal_True;
 }
-//----------------------------------------------------------------------------
+
 OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
           :SdrOle2Obj()
           ,OObjectBase(_sComponentName)
@@ -965,7 +965,7 @@ OOle2Obj::OOle2Obj(const OUString& _sComponentName,sal_uInt16 _nType)
 {
     m_bIsListening = sal_True;
 }
-//----------------------------------------------------------------------------
+
 OOle2Obj::~OOle2Obj()
 {
 }
@@ -974,22 +974,22 @@ sal_uInt16 OOle2Obj::GetObjIdentifier() const
 {
     return m_nType;
 }
-//----------------------------------------------------------------------------
+
 sal_uInt32 OOle2Obj::GetObjInventor() const
 {
     return ReportInventor;
 }
-//----------------------------------------------------------------------------
+
 SdrPage* OOle2Obj::GetImplPage() const
 {
     return GetPage();
 }
-//----------------------------------------------------------------------------
+
 void OOle2Obj::SetSnapRectImpl(const Rectangle& _rRect)
 {
     SetSnapRect( _rRect );
 }
-//----------------------------------------------------------------------------
+
 sal_Int32 OOle2Obj::GetStep() const
 {
     // get step property
@@ -998,7 +998,7 @@ sal_Int32 OOle2Obj::GetStep() const
     return nStep;
 }
 
-//----------------------------------------------------------------------------
+
 void OOle2Obj::NbcMove( const Size& rSize )
 {
 
@@ -1051,7 +1051,7 @@ void OOle2Obj::NbcMove( const Size& rSize )
         SdrOle2Obj::NbcMove( rSize );
 }
 
-//----------------------------------------------------------------------------
+
 
 void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fraction& yFract)
 {
@@ -1066,7 +1066,7 @@ void OOle2Obj::NbcResize(const Point& rRef, const Fraction& xFract, const Fracti
     // start listening
     OObjectBase::StartListening();
 }
-//----------------------------------------------------------------------------
+
 void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
 {
     SdrOle2Obj::NbcSetLogicRect(rRect);
@@ -1079,7 +1079,7 @@ void OOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
     // start listening
     OObjectBase::StartListening();
 }
-//----------------------------------------------------------------------------
+
 
 bool OOle2Obj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
@@ -1260,7 +1260,7 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor
     }
     return xReturn;
 }
-//----------------------------------------------------------------------------
+
 //============================================================================
 } // rptui
 //============================================================================
diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx
index 80752efb0c79..ac676eb9dbb4 100644
--- a/reportdesign/source/core/sdr/RptObjectListener.cxx
+++ b/reportdesign/source/core/sdr/RptObjectListener.cxx
@@ -26,34 +26,34 @@ namespace rptui
 // OObjectListener
 //============================================================================
 
-//----------------------------------------------------------------------------
+
 OObjectListener::OObjectListener(OObjectBase* _pObject)
           :m_pObject(_pObject)
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 OObjectListener::~OObjectListener()
 {
 }
 
 // XEventListener
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL OObjectListener::disposing( const  ::com::sun::star::lang::EventObject& ) throw( ::com::sun::star::uno::RuntimeException)
 {
 }
 
 // XPropertyChangeListener
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL OObjectListener::propertyChange( const  ::com::sun::star::beans::PropertyChangeEvent& evt ) throw( ::com::sun::star::uno::RuntimeException)
 {
     m_pObject->_propertyChange( evt );
 }
 
-//----------------------------------------------------------------------------
+
 
 //============================================================================
 // DlgEdHint
@@ -61,7 +61,7 @@ void SAL_CALL OObjectListener::propertyChange( const  ::com::sun::star::beans::P
 
 TYPEINIT1( DlgEdHint, SfxHint );
 
-//----------------------------------------------------------------------------
+
 
 DlgEdHint::DlgEdHint(DlgEdHintKind eHint)
     : eHintKind(eHint)
@@ -69,11 +69,11 @@ DlgEdHint::DlgEdHint(DlgEdHintKind eHint)
 {
 }
 
-//----------------------------------------------------------------------------
+
 DlgEdHint::~DlgEdHint()
 {
 }
-//----------------------------------------------------------------------------
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx
index f20360611eab..8eba54be8f5d 100644
--- a/reportdesign/source/core/sdr/RptPage.cxx
+++ b/reportdesign/source/core/sdr/RptPage.cxx
@@ -29,7 +29,7 @@ namespace rptui
 using namespace ::com::sun::star;
 TYPEINIT1( OReportPage, SdrPage );
 
-//----------------------------------------------------------------------------
+
 OReportPage::OReportPage( OReportModel& _rModel
                          ,const uno::Reference< report::XSection >& _xSection
                          ,bool bMasterPage )
@@ -40,7 +40,7 @@ OReportPage::OReportPage( OReportModel& _rModel
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 OReportPage::OReportPage( const OReportPage& rPage )
     :SdrPage( rPage )
@@ -51,20 +51,20 @@ OReportPage::OReportPage( const OReportPage& rPage )
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 OReportPage::~OReportPage()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 SdrPage* OReportPage::Clone() const
 {
     return new OReportPage( *this );
 }
 
-//----------------------------------------------------------------------------
+
 sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& _xObject)
 {
     sal_uLong nCount = GetObjCount();
@@ -80,7 +80,7 @@ sal_uLong OReportPage::getIndexOf(const uno::Reference< report::XReportComponent
     }
     return i;
 }
-//----------------------------------------------------------------------------
+
 void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent >& _xObject)
 {
     sal_uLong nPos = getIndexOf(_xObject);
@@ -93,7 +93,7 @@ void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent
         RemoveObject(nPos);
     }
 }
-// -----------------------------------------------------------------------------
+
 SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum)
 {
     SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
@@ -115,7 +115,7 @@ SdrObject* OReportPage::RemoveObject(sal_uLong nObjNum)
     }
     return pObj;
 }
-//----------------------------------------------------------------------------
+
 void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!");
@@ -131,17 +131,17 @@ void OReportPage::insertObject(const uno::Reference< report::XReportComponent >&
     if ( pObject )
         pObject->StartListening();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XSection > OReportPage::getSection() const
 {
     return m_xSection;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > OReportPage::createUnoPage()
 {
     return static_cast<cppu::OWeakObject*>( new reportdesign::OReportDrawPage(this,m_xSection) );
 }
-// -----------------------------------------------------------------------------
+
 void OReportPage::removeTempObject(SdrObject *_pToRemoveObj)
 {
     if (_pToRemoveObj)
@@ -174,7 +174,7 @@ void OReportPage::resetSpecialMode()
 
     m_bSpecialInsertMode = false;
 }
-// -----------------------------------------------------------------------------
+
 void OReportPage::NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason)
 {
     SdrPage::NbcInsertObject(pObj, nPos, pReason);
diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx
index b8738c2fff17..bcb94ed259c6 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -56,7 +56,7 @@ namespace rptui
     using namespace util;
     using namespace container;
     using namespace report;
-//----------------------------------------------------------------------------
+
 ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> OGroupHelper::getMemberFunction(const Reference< XSection >& _xSection)
 {
     ::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> pMemFunSection = ::std::mem_fun(&OGroupHelper::getFooter);
@@ -65,7 +65,7 @@ namespace rptui
         pMemFunSection = ::std::mem_fun(&OGroupHelper::getHeader);
     return pMemFunSection;
 }
-// -----------------------------------------------------------------------------
+
 ::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> OReportHelper::getMemberFunction(const Reference< XSection >& _xSection)
 {
     uno::Reference< report::XReportDefinition> xReportDefinition(_xSection->getReportDefinition());
@@ -81,9 +81,9 @@ namespace rptui
     return pMemFunSection;
 }
 
-//------------------------------------------------------------------------------
+
 TYPEINIT1( OCommentUndoAction,          SdrUndoAction );
-//----------------------------------------------------------------------------
+
 OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID)
     :SdrUndoAction(_rMod)
 {
@@ -94,15 +94,15 @@ OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,sal_uInt16 nCommentID)
 OCommentUndoAction::~OCommentUndoAction()
 {
 }
-//----------------------------------------------------------------------------
+
 void OCommentUndoAction::Undo()
 {
 }
-//----------------------------------------------------------------------------
+
 void OCommentUndoAction::Redo()
 {
 }
-//------------------------------------------------------------------------------
+
 OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod
                                              ,Action _eAction
                                              ,const uno::Reference< container::XIndexContainer > _xContainer
@@ -118,7 +118,7 @@ OUndoContainerAction::OUndoContainerAction(SdrModel& _rMod
         // we now own the element
         m_xOwnElement = m_xElement;
 }
-//------------------------------------------------------------------------------
+
 OUndoContainerAction::~OUndoContainerAction()
 {
     // if we own the object ....
@@ -150,7 +150,7 @@ OUndoContainerAction::~OUndoContainerAction()
         }
     }
 }
-//------------------------------------------------------------------------------
+
 void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
 {
     if ( m_xContainer.is() )
@@ -162,7 +162,7 @@ void OUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
     m_xOwnElement = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void OUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
 {
     OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv();
@@ -188,7 +188,7 @@ void OUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
     m_xOwnElement = m_xElement;
 }
 
-//------------------------------------------------------------------------------
+
 void OUndoContainerAction::Undo()
 {
     if ( m_xElement.is() )
@@ -217,7 +217,7 @@ void OUndoContainerAction::Undo()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OUndoContainerAction::Redo()
 {
     if ( m_xElement.is() )
@@ -244,7 +244,7 @@ void OUndoContainerAction::Redo()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod
                                              ,Action _eAction
                                              ,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -257,7 +257,7 @@ OUndoGroupSectionAction::OUndoGroupSectionAction(SdrModel& _rMod
 ,m_pMemberFunction(_pMemberFunction)
 {
 }
-//------------------------------------------------------------------------------
+
 void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) )
 {
     OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv();
@@ -274,7 +274,7 @@ void OUndoGroupSectionAction::implReInsert( ) SAL_THROW( ( Exception ) )
     m_xOwnElement = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void OUndoGroupSectionAction::implReRemove( ) SAL_THROW( ( Exception ) )
 {
         OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv();
@@ -290,7 +290,7 @@ void OUndoGroupSectionAction::implReRemove( ) SAL_THROW( ( Exception ) )
     // from now on, we own this object
     m_xOwnElement = m_xElement;
 }
-//----------------------------------------------------------------------------
+
 OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod
                                              ,Action _eAction
                                              ,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -303,7 +303,7 @@ OUndoReportSectionAction::OUndoReportSectionAction(SdrModel& _rMod
 ,m_pMemberFunction(_pMemberFunction)
 {
 }
-//------------------------------------------------------------------------------
+
 void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) )
 {
     OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv();
@@ -326,7 +326,7 @@ void OUndoReportSectionAction::implReInsert( ) SAL_THROW( ( Exception ) )
     m_xOwnElement = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void OUndoReportSectionAction::implReRemove( ) SAL_THROW( ( Exception ) )
 {
     OXUndoEnvironment& rEnv = static_cast< OReportModel& >( rMod ).GetUndoEnv();
@@ -341,7 +341,7 @@ void OUndoReportSectionAction::implReRemove( ) SAL_THROW( ( Exception ) )
     // from now on, we own this object
     m_xOwnElement = m_xElement;
 }
-//------------------------------------------------------------------------------
+
 ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const PropertyChangeEvent& evt)
                      :OCommentUndoAction(rNewMod,0)
                      ,m_xObj(evt.Source, UNO_QUERY)
@@ -350,23 +350,23 @@ ORptUndoPropertyAction::ORptUndoPropertyAction(SdrModel& rNewMod, const Property
                      ,m_aOldValue(evt.OldValue)
 {
 }
-//------------------------------------------------------------------------------
+
 void ORptUndoPropertyAction::Undo()
 {
     setProperty(sal_True);
 }
 
-//------------------------------------------------------------------------------
+
 void ORptUndoPropertyAction::Redo()
 {
     setProperty(sal_False);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet> ORptUndoPropertyAction::getObject()
 {
     return m_xObj;
 }
-// -----------------------------------------------------------------------------
+
 void ORptUndoPropertyAction::setProperty(sal_Bool _bOld)
 {
     Reference< XPropertySet> xObj = getObject();
@@ -402,12 +402,12 @@ OUndoPropertyGroupSectionAction::OUndoPropertyGroupSectionAction(SdrModel& _rMod
 ,m_pMemberFunction(_pMemberFunction)
 {
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet> OUndoPropertyGroupSectionAction::getObject()
 {
     return m_pMemberFunction(&m_aGroupHelper).get();
 }
-// -----------------------------------------------------------------------------
+
 OUndoPropertyReportSectionAction::OUndoPropertyReportSectionAction(SdrModel& _rMod
                                              ,const PropertyChangeEvent& evt
                                              ,::std::mem_fun_t< uno::Reference< report::XSection >
@@ -419,7 +419,7 @@ OUndoPropertyReportSectionAction::OUndoPropertyReportSectionAction(SdrModel& _rM
 ,m_pMemberFunction(_pMemberFunction)
 {
 }
-// -----------------------------------------------------------------------------
+
 Reference< XPropertySet> OUndoPropertyReportSectionAction::getObject()
 {
     return m_pMemberFunction(&m_aReportHelper).get();
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx
index 0f54f75a36d6..c98528025aac 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -58,7 +58,7 @@ namespace rptui
     using namespace util;
     using namespace container;
     using namespace report;
-//----------------------------------------------------------------------------
+
 
 
 struct PropertyInfo
@@ -92,7 +92,7 @@ struct ObjectInfo
 
 typedef ::std::map< Reference< XPropertySet >, ObjectInfo, ::comphelper::OInterfaceCompare< XPropertySet > >    PropertySetInfoCache;
 
-// -----------------------------------------------------------------------------
+
 
 class OXUndoEnvironmentImpl
 {
@@ -122,19 +122,19 @@ OXUndoEnvironmentImpl::OXUndoEnvironmentImpl(OReportModel& _rModel) : m_rModel(_
 {
 }
 
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
 OXUndoEnvironment::OXUndoEnvironment(OReportModel& _rModel)
                    :m_pImpl(new OXUndoEnvironmentImpl(_rModel) )
 {
     StartListening(m_pImpl->m_rModel);
 }
 
-//------------------------------------------------------------------------------
+
 OXUndoEnvironment::~OXUndoEnvironment()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OXUndoEnvironment::Lock()
 {
     OSL_ENSURE(m_refCount,"Illegal call to dead object!");
@@ -147,7 +147,7 @@ void OXUndoEnvironment::UnLock()
     osl_atomic_decrement( &m_pImpl->m_nLocks );
 }
 sal_Bool OXUndoEnvironment::IsLocked() const { return m_pImpl->m_nLocks != 0; }
-// -----------------------------------------------------------------------------
+
 void OXUndoEnvironment::RemoveSection(OReportPage* _pPage)
 {
     if ( _pPage )
@@ -157,7 +157,7 @@ void OXUndoEnvironment::RemoveSection(OReportPage* _pPage)
             RemoveElement( xSection );
     }
 }
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::Clear(const Accessor& /*_r*/)
 {
     OUndoEnvLock aLock(*this);
@@ -185,7 +185,7 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/)
         EndListening(m_pImpl->m_rModel);
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::ModeChanged()
 {
     m_pImpl->m_bReadOnly = !m_pImpl->m_bReadOnly;
@@ -196,15 +196,15 @@ void OXUndoEnvironment::ModeChanged()
         EndListening(m_pImpl->m_rModel);
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if (rHint.ISA(SfxSimpleHint) && ((SfxSimpleHint&)rHint).GetId() == SFX_HINT_MODECHANGED )
         ModeChanged();
 }
-// -----------------------------------------------------------------------------
+
 //  XEventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException )
 {
     // check if it's an object we have cached information about
@@ -220,7 +220,7 @@ void SAL_CALL OXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeE
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEvent ) throw(uno::RuntimeException)
 {
 
@@ -346,7 +346,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv
     m_pImpl->m_rModel.GetSdrUndoManager()->AddUndoAction( pUndo );
     pController->InvalidateAll();
 }
-// -----------------------------------------------------------------------------
+
 ::std::vector< uno::Reference< container::XChild> >::const_iterator OXUndoEnvironment::getSection(const Reference<container::XChild>& _xContainer) const
 {
     ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = m_pImpl->m_aSections.end();
@@ -363,7 +363,7 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const PropertyChangeEvent& _rEv
     return aFind;
 }
 // XContainerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -414,13 +414,13 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const ContainerEvent& evt) thro
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::implSetModified()
 {
     m_pImpl->m_rModel.SetModified( sal_True );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -436,7 +436,7 @@ void SAL_CALL OXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thro
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -481,13 +481,13 @@ void SAL_CALL OXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException)
 {
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::AddSection(const Reference< report::XSection > & _xSection)
 {
     OUndoEnvLock aLock(*this);
@@ -505,7 +505,7 @@ void OXUndoEnvironment::AddSection(const Reference< report::XSection > & _xSecti
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::RemoveSection(const Reference< report::XSection > & _xSection)
 {
     OUndoEnvLock aLock(*this);
@@ -520,7 +520,7 @@ void OXUndoEnvironment::RemoveSection(const Reference< report::XSection > & _xSe
     catch(uno::Exception&){}
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element)
 {
     // am Container horchen
@@ -547,7 +547,7 @@ void OXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > &
 }
 
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(())
 {
     OSL_PRECOND( _rxContainer.is(), "OXUndoEnvironment::switchListening: invalid container!" );
@@ -584,7 +584,7 @@ void OXUndoEnvironment::switchListening( const Reference< XIndexAccess >& _rxCon
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(())
 {
     OSL_PRECOND( _rxObject.is(), "OXUndoEnvironment::switchListening: how should I listen at a NULL object?" );
@@ -617,7 +617,7 @@ void OXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObjec
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
 {
     if ( !IsLocked() )
@@ -631,7 +631,7 @@ void OXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
     switchListening( _rxElement, true );
 }
 
-//------------------------------------------------------------------------------
+
 void OXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement)
 {
     uno::Reference<beans::XPropertySet> xProp(_rxElement,uno::UNO_QUERY);
diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx
index a55d0f165107..8973577c1fd3 100644
--- a/reportdesign/source/core/sdr/formatnormalizer.cxx
+++ b/reportdesign/source/core/sdr/formatnormalizer.cxx
@@ -54,7 +54,7 @@ namespace rptui
     //====================================================================
     //= FormatNormalizer
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormatNormalizer::FormatNormalizer( const OReportModel& _rModel )
         :m_rModel( _rModel )
         ,m_xReportDefinition( )
@@ -62,12 +62,12 @@ namespace rptui
     {
     }
 
-    //--------------------------------------------------------------------
+
     FormatNormalizer::~FormatNormalizer()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void FormatNormalizer::notifyPropertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent )
     {
         if ( !impl_lateInit() )
@@ -84,7 +84,7 @@ namespace rptui
             impl_onFormattedProperttyChange( xFormatted, _rEvent.PropertyName );
     }
 
-    //--------------------------------------------------------------------
+
     void FormatNormalizer::notifyElementInserted( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement )
     {
         if ( !impl_lateInit() )
@@ -97,7 +97,7 @@ namespace rptui
         impl_adjustFormatToDataFieldType_nothrow( xFormatted );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormatNormalizer::impl_lateInit()
     {
         if ( m_xReportDefinition.is() )
@@ -107,7 +107,7 @@ namespace rptui
         return m_xReportDefinition.is();
     }
 
-    //--------------------------------------------------------------------
+
     void FormatNormalizer::impl_onDefinitionPropertyChange( const OUString& _rChangedPropName )
     {
         if  ( _rChangedPropName != "Command" && _rChangedPropName != "CommandType" && _rChangedPropName != "EscapeProcessing" )
@@ -116,7 +116,7 @@ namespace rptui
         m_bFieldListDirty = true;
     }
 
-    //--------------------------------------------------------------------
+
     void FormatNormalizer::impl_onFormattedProperttyChange( const Reference< XFormattedField >& _rxFormatted, const OUString& _rChangedPropName )
     {
         if  ( _rChangedPropName != "DataField" )
@@ -126,7 +126,7 @@ namespace rptui
         impl_adjustFormatToDataFieldType_nothrow( _rxFormatted );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void lcl_collectFields_throw( const Reference< XIndexAccess >& _rxColumns, FormatNormalizer::FieldList& _inout_rFields )
@@ -156,7 +156,7 @@ namespace rptui
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool FormatNormalizer::impl_ensureUpToDateFieldList_nothrow()
     {
         if ( !m_bFieldListDirty )
@@ -204,7 +204,7 @@ namespace rptui
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void FormatNormalizer::impl_adjustFormatToDataFieldType_nothrow( const Reference< XFormattedField >& _rxFormatted )
     {
         if ( !impl_ensureUpToDateFieldList_nothrow() )
diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx
index c30a9fe0830a..ba336c623040 100644
--- a/reportdesign/source/filter/xml/dbloader2.cxx
+++ b/reportdesign/source/filter/xml/dbloader2.cxx
@@ -39,12 +39,12 @@ using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::ui::dialogs;
 using ::com::sun::star::awt::XWindow;
 
-// -------------------------------------------------------------------------
+
 ORptTypeDetection::ORptTypeDetection(Reference< XComponentContext > const & xContext)
 : m_xContext(xContext)
 {
 }
-// -------------------------------------------------------------------------
+
 OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::PropertyValue >& Descriptor ) throw (RuntimeException)
 {
 
@@ -77,32 +77,32 @@ OUString SAL_CALL ORptTypeDetection::detect( Sequence< ::com::sun::star::beans::
     }
     return OUString();
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL
         ORptTypeDetection::create(Reference< XComponentContext > const & xContext)
 {
     return *(new ORptTypeDetection(xContext));
 }
-// -------------------------------------------------------------------------
+
 // XServiceInfo
 OUString SAL_CALL ORptTypeDetection::getImplementationName() throw(  )
 {
     return getImplementationName_Static();
 }
-// -------------------------------------------------------------------------
+
 
 // XServiceInfo
 sal_Bool SAL_CALL ORptTypeDetection::supportsService(const OUString& ServiceName) throw(  )
 {
     return cppu::supportsService(this, ServiceName);
 }
-// -------------------------------------------------------------------------
+
 // XServiceInfo
 Sequence< OUString > SAL_CALL ORptTypeDetection::getSupportedServiceNames(void) throw(  )
 {
     return getSupportedServiceNames_Static();
 }
-// -------------------------------------------------------------------------
+
 // ORegistryServiceManager_Static
 Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
@@ -110,9 +110,9 @@ Sequence< OUString > ORptTypeDetection::getSupportedServiceNames_Static(void) th
     aSNS[0] = "com.sun.star.document.ExtendedTypeDetection";
     return aSNS;
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 }//rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
index 2fb68ef3eaf3..01859585e6f9 100644
--- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx
+++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx
@@ -68,20 +68,20 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 OXMLAutoStylePoolP::OXMLAutoStylePoolP(ORptExport& rTempORptExport):
     SvXMLAutoStylePoolP(rTempORptExport),
     rORptExport(rTempORptExport)
 {
 }
-// -----------------------------------------------------------------------------
+
 OXMLAutoStylePoolP::~OXMLAutoStylePoolP()
 {
 }
-// -----------------------------------------------------------------------------
 
-//----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 094e7d7b6e17..89c84f3c2562 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -91,11 +91,11 @@ OXMLCell::OXMLCell( ORptFilter& rImport
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 OXMLCell::~OXMLCell()
 {
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLCell::CreateChildContext(
         sal_uInt16 _nPrefix,
         const OUString& _rLocalName,
@@ -182,7 +182,7 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLCell::EndElement()
 {
     if ( m_bContainsShape )
@@ -241,18 +241,18 @@ void OXMLCell::EndElement()
     else
         OXMLHelper::copyStyleElements(GetOwnImport().isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent.get());
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLCell::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
+
 void OXMLCell::setComponent(const uno::Reference< report::XReportComponent >& _xComponent)
 {
     m_pCell->m_xComponent = _xComponent;
     m_xComponent = _xComponent;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLCell::Characters( const OUString& rChars )
 {
     if ( !rChars.isEmpty() )
@@ -273,8 +273,8 @@ void OXMLCell::setContainsShape(bool _bContainsShape)
     m_bContainsShape = _bContainsShape;
 }
 
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx
index 24da3e340800..a893f390b2bb 100644
--- a/reportdesign/source/filter/xml/xmlColumn.cxx
+++ b/reportdesign/source/filter/xml/xmlColumn.cxx
@@ -75,12 +75,12 @@ OXMLRowColumn::OXMLRowColumn( ORptFilter& rImport
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLRowColumn::~OXMLRowColumn()
 {
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLRowColumn::CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -119,7 +119,7 @@ SvXMLImportContext* OXMLRowColumn::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLRowColumn::fillStyle(const OUString& _sStyleName)
 {
     if ( !_sStyleName.isEmpty() )
@@ -158,17 +158,17 @@ void OXMLRowColumn::fillStyle(const OUString& _sStyleName)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLRowColumn::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
+
 void OXMLRowColumn::EndElement()
 {
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx
index e6cfe1fca8ce..aa9bccc204f7 100644
--- a/reportdesign/source/filter/xml/xmlComponent.cxx
+++ b/reportdesign/source/filter/xml/xmlComponent.cxx
@@ -88,14 +88,14 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLComponent::~OXMLComponent()
 {
 }
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
index 578d3f55a68a..2a30beb892ac 100644
--- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
+++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx
@@ -71,19 +71,19 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport,
         OSL_FAIL("Exception catched while putting Function props!");
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLCondPrtExpr::~OXMLCondPrtExpr()
 {
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void OXMLCondPrtExpr::Characters( const OUString& rChars )
 {
     m_xComponent->setPropertyValue(PROPERTY_CONDITIONALPRINTEXPRESSION,makeAny(rChars));
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 7404861e877b..4784722aa80b 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -110,12 +110,12 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
     }
 
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLControlProperty::~OXMLControlProperty()
 {
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLControlProperty::CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -144,7 +144,7 @@ SvXMLImportContext* OXMLControlProperty::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLControlProperty::EndElement()
 {
     if ( !m_aSetting.Name.isEmpty() && m_xControl.is() )
@@ -161,13 +161,13 @@ void OXMLControlProperty::EndElement()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OXMLControlProperty::Characters( const OUString& rChars )
 {
     if ( m_pContainer )
         m_pContainer->addValue(rChars);
 }
-// -----------------------------------------------------------------------------
+
 void OXMLControlProperty::addValue(const OUString& _sValue)
 {
     Any aValue;
@@ -183,12 +183,12 @@ void OXMLControlProperty::addValue(const OUString& _sValue)
         m_aSequence[nPos] = aValue;
     }
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLControlProperty::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
+
 Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpectedType, const OUString& _rReadCharacters)
 {
     Any aReturn;
@@ -321,7 +321,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
 
     return aReturn;
 }
-//---------------------------------------------------------------------
+
 ::com::sun::star::util::Time OXMLControlProperty::implGetTime(double _nValue)
 {
     ::com::sun::star::util::Time aTime;
@@ -338,7 +338,7 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
     return aTime;
 }
 
-//---------------------------------------------------------------------
+
 ::com::sun::star::util::Date OXMLControlProperty::implGetDate(double _nValue)
 {
     Date aToolsDate((sal_uInt32)_nValue);
@@ -346,8 +346,8 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
     ::utl::typeConvert(aToolsDate, aDate);
     return aDate;
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 692bca00db75..c4b450e35f8c 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -59,7 +59,7 @@
 
 #include <boost/bind.hpp>
 
-//--------------------------------------------------------------------------
+
 namespace rptxml
 {
     using namespace xmloff;
@@ -70,34 +70,34 @@ namespace rptxml
     using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::xml;
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > ORptExportHelper::create(Reference< XComponentContext > const & xContext)
     {
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_SETTINGS ));
     }
-    //---------------------------------------------------------------------
+
     OUString ORptExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
         return OUString("com.sun.star.comp.report.XMLSettingsExporter");
     }
-    //---------------------------------------------------------------------
+
     Sequence< OUString > ORptExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
         aSupported[0] = "com.sun.star.document.ExportFilter";
         return aSupported;
     }
-    //---------------------------------------------------------------------
+
     Reference< XInterface > ORptContentExportHelper::create(Reference< XComponentContext > const & xContext)
     {
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_CONTENT ));
     }
-    //---------------------------------------------------------------------
+
     OUString ORptContentExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
         return OUString("com.sun.star.comp.report.XMLContentExporter");
     }
-    //---------------------------------------------------------------------
+
     Sequence< OUString > ORptContentExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -105,18 +105,18 @@ namespace rptxml
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > ORptStylesExportHelper::create(Reference< XComponentContext > const & xContext)
     {
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_STYLES | EXPORT_MASTERSTYLES | EXPORT_AUTOSTYLES |
             EXPORT_FONTDECLS|EXPORT_OASIS ));
     }
-    //---------------------------------------------------------------------
+
     OUString ORptStylesExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
         return OUString("com.sun.star.comp.report.XMLStylesExporter");
     }
-    //---------------------------------------------------------------------
+
     Sequence< OUString > ORptStylesExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -124,17 +124,17 @@ namespace rptxml
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > ORptMetaExportHelper::create(Reference< XComponentContext > const & xContext)
     {
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_META ));
     }
-    //---------------------------------------------------------------------
+
     OUString ORptMetaExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
         return OUString("com.sun.star.comp.report.XMLMetaExporter");
     }
-    //---------------------------------------------------------------------
+
     Sequence< OUString > ORptMetaExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -142,17 +142,17 @@ namespace rptxml
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
     Reference< XInterface > ODBFullExportHelper::create(Reference< XComponentContext > const & xContext)
     {
         return static_cast< XServiceInfo* >(new ORptExport(xContext, getImplementationName_Static(), EXPORT_ALL));
     }
-    //---------------------------------------------------------------------
+
     OUString ODBFullExportHelper::getImplementationName_Static(  ) throw (RuntimeException)
     {
         return OUString("com.sun.star.comp.report.XMLFullExporter");
     }
-    //---------------------------------------------------------------------
+
     Sequence< OUString > ODBFullExportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
     {
         Sequence< OUString > aSupported(1);
@@ -160,7 +160,7 @@ namespace rptxml
         return aSupported;
     }
 
-    //---------------------------------------------------------------------
+
 
     class OSpecialHanldeXMLExportPropertyMapper : public SvXMLExportPropertyMapper
     {
@@ -181,7 +181,7 @@ namespace rptxml
             // nothing to do here
         }
     };
-// -----------------------------------------------------------------------------
+
 void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
 {
     ORptExport::TSectionsGrid::iterator aSectionIter = _rGrid.begin();
@@ -212,7 +212,7 @@ void lcl_adjustColumnSpanOverRows(ORptExport::TSectionsGrid& _rGrid)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUString const & implementationName, sal_uInt16 nExportFlag)
 : SvXMLExport( util::MeasureUnit::MM_100TH, _rxContext, implementationName, XML_REPORT, EXPORT_OASIS)
 ,m_bAllreadyFilled(sal_False)
@@ -302,19 +302,19 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext, OUStrin
     GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME),
         m_xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX));
 }
-// -----------------------------------------------------------------------------
+
 Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext)
 {
     return *(new ORptExport(xContext, getImplementationName_Static(), EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_FONTDECLS));
 }
 
-// -----------------------------------------------------------------------------
+
 OUString ORptExport::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.ExportFilter");
 }
 
-//--------------------------------------------------------------------------
+
 uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aServices(1);
@@ -323,7 +323,7 @@ uno::Sequence< OUString > ORptExport::getSupportedServiceNames_Static(  ) throw(
     return aServices;
 }
 
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions)
 {
     const sal_Int32 nCount = _xFunctions->getCount();
@@ -334,7 +334,7 @@ void ORptExport::exportFunctions(const Reference<XIndexAccess>& _xFunctions)
         exportFunction(xFunction);
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction)
 {
     exportFormula(XML_FORMULA,_xFunction->getFormula());
@@ -349,7 +349,7 @@ void ORptExport::exportFunction(const uno::Reference< XFunction>& _xFunction)
 
     SvXMLElementExport aFunction(*this,XML_NAMESPACE_REPORT, XML_FUNCTION, sal_True, sal_True);
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xReportComponet)
 {
     const uno::Sequence< OUString> aMasterFields = _xReportComponet->getMasterFields();
@@ -372,7 +372,7 @@ void ORptExport::exportMasterDetailFields(const Reference<XReportComponent>& _xR
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefinition)
 {
     if ( _xReportDefinition.is() )
@@ -416,7 +416,7 @@ void ORptExport::exportReport(const Reference<XReportDefinition>& _xReportDefini
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComponent)
 {
     OSL_ENSURE(_xReportComponent.is(),"No component interface!");
@@ -427,7 +427,7 @@ void ORptExport::exportComponent(const Reference<XReportComponent>& _xReportComp
 
     SvXMLElementExport aElem(*this,XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT, sal_False, sal_False);
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _xReportElement)
 {
     OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF");
@@ -451,7 +451,7 @@ void ORptExport::exportFormatConditions(const Reference<XReportControlModel>& _x
         OSL_FAIL("Can not access format condition!");
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xReportElement)
 {
     OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF");
@@ -479,7 +479,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep
     if ( xParent.is() )
         exportComponent(_xReportElement.get());
 }
-// -----------------------------------------------------------------------------
+
 void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sal_Int32>& _aPosY,ORptExport::TGrid& _rColumns)
 {
     sal_Int32 nCountX = _aPosX.size() - 1;
@@ -495,7 +495,7 @@ void lcl_calculate(const ::std::vector<sal_Int32>& _aPosX,const ::std::vector<sa
             }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames)
 {
     ::std::vector< XMLPropertyState > aPropertyStates;
@@ -510,7 +510,7 @@ void ORptExport::collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_I
         _rStyleNames.push_back(GetAutoStylePool()->Add(_nFamily, aPropertyStates ));
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp)
 {
     OSL_ENSURE(_xProp != NULL,"Section is NULL -> GPF");
@@ -662,7 +662,7 @@ void ORptExport::exportSectionAutoStyle(const Reference<XSection>& _xProp)
     lcl_adjustColumnSpanOverRows(m_aSectionsGrid);
     exportReportComponentAutoStyles(_xProp);
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xProp)
 {
     const sal_Int32 nCount = _xProp->getCount();
@@ -701,7 +701,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference<XSection>& _xPr
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader)
 {
     OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF");
@@ -739,7 +739,7 @@ void ORptExport::exportSection(const Reference<XSection>& _xSection,bool bHeader
 
     exportContainer(_xSection);
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportTableColumns(const Reference< XSection>& _xSection)
 {
     SvXMLElementExport aColumns(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, sal_True, sal_True);
@@ -756,7 +756,7 @@ void ORptExport::exportTableColumns(const Reference< XSection>& _xSection)
         SvXMLElementExport aColumn(*this,XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, sal_True, sal_True);
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportContainer(const Reference< XSection>& _xSection)
 {
     OSL_ENSURE(_xSection.is(),"Section is NULL -> GPF");
@@ -1001,7 +1001,7 @@ void ORptExport::exportContainer(const Reference< XSection>& _xSection)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 OUString ORptExport::convertFormula(const OUString& _sFormula)
 {
     OUString sFormula = _sFormula;
@@ -1009,7 +1009,7 @@ OUString ORptExport::convertFormula(const OUString& _sFormula)
         sFormula = "";
     return sFormula;
 }
-// -----------------------------------------------------------------------------
+
 bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula)
 {
     const OUString sFieldData = convertFormula(_sFormula);
@@ -1023,7 +1023,7 @@ bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OU
 
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,const OUString& _sName)
 {
     Reference<XPropertySet> xFind(_xProp);
@@ -1035,7 +1035,7 @@ void ORptExport::exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt,
         m_aAutoStyleNames.erase(aFind);
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDefinition,sal_Int32 _nPos,sal_Bool _bExportAutoStyle)
 {
     sal_Bool bGroupExported = sal_False;
@@ -1130,7 +1130,7 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
     }
     return bGroupExported;
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormattedField>& _xParentFormattedField)
 {
     const uno::Reference<report::XReportControlFormat> xFormat(_xProp,uno::UNO_QUERY);
@@ -1240,20 +1240,20 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
     if ( !aPropertyStates.empty() )
         m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp,GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_CELL, aPropertyStates )));
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportAutoStyle(const Reference<XSection>& _xProp)
 {
     ::std::vector< XMLPropertyState > aPropertyStates( m_xTableStylesExportPropertySetMapper->Filter(_xProp.get()) );
     if ( !aPropertyStates.empty() )
         m_aAutoStyleNames.insert( TPropertyStyleMap::value_type(_xProp.get(),GetAutoStylePool()->Add( XML_STYLE_FAMILY_TABLE_TABLE, aPropertyStates )));
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::SetBodyAttributes()
 {
     Reference<XReportDefinition> xProp(getReportDefinition());
     exportReportAttributes(xProp);
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xReport)
 {
     if ( _xReport.is() )
@@ -1285,17 +1285,17 @@ void ORptExport::exportReportAttributes(const Reference<XReportDefinition>& _xRe
             AddAttribute(XML_NAMESPACE_DRAW, XML_NAME,sName);
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::_ExportContent()
 {
     exportReport(getReportDefinition());
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::_ExportMasterStyles()
 {
     GetPageExport()->exportMasterStyles( sal_True );
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::collectComponentStyles()
 {
     if ( m_bAllreadyFilled )
@@ -1322,7 +1322,7 @@ void ORptExport::collectComponentStyles()
             exportSectionAutoStyle(xProp->getReportFooter());
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::_ExportAutoStyles()
 {
     // there are no styles that require their own autostyles
@@ -1360,7 +1360,7 @@ void ORptExport::_ExportAutoStyles()
     if( (getExportFlags() & EXPORT_MASTERSTYLES) != 0 )
         GetPageExport()->exportAutoStyles();
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::_ExportStyles(bool bUsed)
 {
     SvXMLExport::_ExportStyles(bUsed);
@@ -1368,29 +1368,29 @@ void ORptExport::_ExportStyles(bool bUsed)
     // write draw:style-name for object graphic-styles
     GetShapeExport()->ExportGraphicDefaults();
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 ORptExport::exportDoc(enum ::xmloff::token::XMLTokenEnum eClass)
 {
     return SvXMLExport::exportDoc( eClass );
 }
-// -----------------------------------------------------------------------------
+
 OUString ORptExport::implConvertNumber(sal_Int32 _nValue)
 {
     OUStringBuffer aBuffer;
     ::sax::Converter::convertNumber(aBuffer, _nValue);
     return aBuffer.makeStringAndClear();
 }
-// -----------------------------------------------------------------------------
+
 UniReference < XMLPropertySetMapper > ORptExport::GetCellStylePropertyMapper() const
 {
     return m_xCellStylesPropertySetMapper;
 }
-// -----------------------------------------------------------------------------
+
 SvXMLAutoStylePoolP* ORptExport::CreateAutoStylePool()
 {
     return new OXMLAutoStylePoolP(*this);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc ) throw(IllegalArgumentException, RuntimeException)
 {
     m_xReportDefinition.set(xDoc,UNO_QUERY_THROW);
@@ -1398,14 +1398,14 @@ void SAL_CALL ORptExport::setSourceDocument( const Reference< XComponent >& xDoc
 
     SvXMLExport::setSourceDocument(xDoc);
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::_ExportFontDecls()
 {
     GetFontAutoStylePool(); // make sure the pool is created
     collectComponentStyles();
     SvXMLExport::_ExportFontDecls();
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xReportElement)
 {
     OSL_PRECOND(_xReportElement.is(),"Element is null!");
@@ -1462,13 +1462,13 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
         GetTextParagraphExport()->exportText(sExpr,bPrevCharIsSpace);
     }
 }
-// -----------------------------------------------------------------------------
+
 XMLShapeExport* ORptExport::CreateShapeExport()
 {
     XMLShapeExport* pShapeExport = new XMLShapeExport( *this, XMLTextParagraphExport::CreateShapeExtPropMapper( *this ) );
     return pShapeExport;
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddParagraph)
 {
     UniReference< XMLShapeExport > xShapeExport = GetShapeExport();
@@ -1503,7 +1503,7 @@ void ORptExport::exportShapes(const Reference< XSection>& _xSection,bool _bAddPa
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups)
 {
     if ( _xGroups.is() )
@@ -1601,8 +1601,8 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
     }
 }
 
-// -----------------------------------------------------------------------------
+
 }// rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 9a1cda5fb721..53e5502bb115 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -81,7 +81,7 @@ ExportDocumentHandler::ExportDocumentHandler(uno::Reference< uno::XComponentCont
     ,m_bCountColumnHeader(false)
 {
 }
-// -----------------------------------------------------------------------------
+
 ExportDocumentHandler::~ExportDocumentHandler()
 {
     if ( m_xProxy.is() )
@@ -92,7 +92,7 @@ ExportDocumentHandler::~ExportDocumentHandler()
 }
 IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler)
 IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE )
-//------------------------------------------------------------------------
+
 OUString SAL_CALL ExportDocumentHandler::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
@@ -116,7 +116,7 @@ OUString ExportDocumentHandler::getImplementationName_Static(  ) throw(uno::Runt
     return OUString("com.sun.star.comp.report.ExportDocumentHandler");
 }
 
-//------------------------------------------------------------------------
+
 uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
 {
     uno::Sequence< OUString > aSupported(1);
@@ -124,7 +124,7 @@ uno::Sequence< OUString > ExportDocumentHandler::getSupportedServiceNames_static
     return aSupported;
 }
 
-//------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL ExportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )
 {
     return *(new ExportDocumentHandler( _rxContext ));
@@ -237,7 +237,7 @@ void SAL_CALL ExportDocumentHandler::startElement(const OUString & _sName, const
     if ( bExport )
         m_xDelegatee->startElement(_sName,xAttribs);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ExportDocumentHandler::endElement(const OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)
 {
     bool bExport = true;
@@ -343,13 +343,13 @@ void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >
         }
     }
 }
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = ExportDocumentHandler_BASE::queryInterface(_rType);
     return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn);
 }
-// --------------------------------------------------------------------------------
+
 uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes(  ) throw (uno::RuntimeException)
 {
     if ( m_xTypeProvider.is() )
@@ -359,7 +359,7 @@ uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes(  ) throw (u
         );
     return ExportDocumentHandler_BASE::getTypes();
 }
-// -----------------------------------------------------------------------------
+
 void ExportDocumentHandler::exportTableRows()
 {
     const OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) );
@@ -432,8 +432,8 @@ void ExportDocumentHandler::exportTableRows()
 
     m_xDelegatee->endElement(sRow);
 }
-// -----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index bfbab186c9ea..03a0aa3fba1f 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -74,7 +74,7 @@ OXMLCharContent::OXMLCharContent(
     ,m_pFixedContent(_pFixedContent)
 {
 }
-// -----------------------------------------------------------------------------
+
 OXMLCharContent::OXMLCharContent(
         SvXMLImport& rImport,
         OXMLFixedContent* _pFixedContent,
@@ -86,7 +86,7 @@ OXMLCharContent::OXMLCharContent(
     ,m_pFixedContent(_pFixedContent)
 {
 }
-// -----------------------------------------------------------------------------
+
 void OXMLCharContent::InsertControlCharacter(sal_Int16   _nControl)
 {
     switch( _nControl )
@@ -99,12 +99,12 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16   _nControl)
             break;
     }
 }
-// -----------------------------------------------------------------------------
+
 void OXMLCharContent::InsertString(const OUString& _sString)
 {
     m_pFixedContent->Characters(_sString);
 }
-// -----------------------------------------------------------------------------
+
 
 
 OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport,
@@ -118,14 +118,14 @@ OXMLFixedContent::OXMLFixedContent( ORptFilter& rImport,
 ,m_bFormattedField(false)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLFixedContent::~OXMLFixedContent()
 {
 
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -176,7 +176,7 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
     }
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLFixedContent::EndElement()
 {
     if ( m_pInP )
@@ -206,7 +206,7 @@ void OXMLFixedContent::EndElement()
         OXMLReportElementBase::EndElement();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OXMLFixedContent::Characters( const OUString& rChars )
 {
     m_sLabel += rChars;
@@ -223,8 +223,8 @@ void OXMLFixedContent::Characters( const OUString& rChars )
     }
 }
 
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
index 9162f4e25a51..54014cd415c9 100644
--- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx
+++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx
@@ -85,18 +85,18 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport,
         OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLFormatCondition::~OXMLFormatCondition()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OXMLFormatCondition::EndElement()
 {
     OXMLHelper::copyStyleElements(m_rImport.isOldFormat(),m_sStyleName,GetImport().GetAutoStyles(),m_xComponent.get());
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index fe363e80490f..cc0a95a1d00e 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -83,13 +83,13 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
         OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
-// -----------------------------------------------------------------------------
+
 OXMLFormattedField::~OXMLFormattedField()
 {
 }
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx
index 0d4f24013e9f..ee5a7f89c8f8 100644
--- a/reportdesign/source/filter/xml/xmlFunction.cxx
+++ b/reportdesign/source/filter/xml/xmlFunction.cxx
@@ -93,17 +93,17 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLFunction::~OXMLFunction()
 {
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLFunction::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
+
 void OXMLFunction::EndElement()
 {
     if ( m_bAddToReport )
@@ -123,9 +123,9 @@ void OXMLFunction::EndElement()
         }
     }
 }
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 70738392047b..3670a4ab9f2d 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -185,13 +185,13 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLGroup::~OXMLGroup()
 {
 
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLGroup::CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -244,12 +244,12 @@ SvXMLImportContext* OXMLGroup::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLGroup::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
+
 void OXMLGroup::EndElement()
 {
     try
@@ -261,9 +261,9 @@ void OXMLGroup::EndElement()
         OSL_FAIL("Exception catched!");
     }
 }
-// -----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 55c8e9efa345..d65163d16489 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -61,11 +61,11 @@ namespace rptxml
 OPropertyHandlerFactory::OPropertyHandlerFactory()
 {
 }
-// -----------------------------------------------------------------------------
+
 OPropertyHandlerFactory::~OPropertyHandlerFactory()
 {
 }
-// -----------------------------------------------------------------------------
+
 const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 _nType) const
 {
     const XMLPropertyHandler* pHandler = NULL;
@@ -99,13 +99,13 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
         PutHdlCache(nType, pHandler);
     return pHandler;
 }
-// -----------------------------------------------------------------------------
+
 #define MAP_CONST_T_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE,      context, SvtSaveOptions::ODFVER_010, false }
 #define MAP_CONST_P_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_PARAGRAPH,  context, SvtSaveOptions::ODFVER_010, false }
 #define MAP_CONST_S( name, prefix, token, type, context )  { name, sizeof(name)-1,      XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_SECTION,    context, SvtSaveOptions::ODFVER_010, false }
 #define MAP_CONST_C_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, XML_NAMESPACE_##prefix, XML_##token, type|XML_TYPE_PROP_TABLE_CELL, context, SvtSaveOptions::ODFVER_010, false }
 #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 ,0, SvtSaveOptions::ODFVER_010, false}
-// -----------------------------------------------------------------------------
+
 UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _bOldFormat, bool bForExport)
 {
     if ( _bOldFormat )
@@ -152,7 +152,7 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylePropertyMap(bool _
         return new XMLPropertySetMapper((XMLPropertyMapEntry*)s_aXMLCellStylesProperties,new OPropertyHandlerFactory(), bForExport);
     }
 }
-// -----------------------------------------------------------------------------
+
 const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps()
 {
     static const XMLPropertyMapEntry aXMLTableStylesProperties[] =
@@ -163,7 +163,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetTableStyleProps()
     };
     return aXMLTableStylesProperties;
 }
-// -----------------------------------------------------------------------------
+
 const XMLPropertyMapEntry* OXMLHelper::GetRowStyleProps()
 {
     static const XMLPropertyMapEntry aXMLStylesProperties[] =
@@ -173,7 +173,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetRowStyleProps()
     };
     return aXMLStylesProperties;
 }
-// -----------------------------------------------------------------------------
+
 const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps()
 {
     static const XMLPropertyMapEntry aXMLColumnStylesProperties[] =
@@ -183,7 +183,7 @@ const XMLPropertyMapEntry* OXMLHelper::GetColumnStyleProps()
     };
     return aXMLColumnStylesProperties;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions()
 {
     static const SvXMLEnumMapEntry s_aXML_EnumMap[] =
@@ -195,7 +195,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetReportPrintOptions()
     };
     return s_aXML_EnumMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions()
 {
     static const SvXMLEnumMapEntry s_aXML_EnumMap[] =
@@ -207,7 +207,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetForceNewPageOptions()
     };
     return s_aXML_EnumMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions()
 {
     static const SvXMLEnumMapEntry s_aXML_EnumMap[] =
@@ -218,7 +218,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetKeepTogetherOptions()
     };
     return s_aXML_EnumMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions()
 {
     static const SvXMLEnumMapEntry s_aXML_EnumMap[] =
@@ -229,7 +229,7 @@ const SvXMLEnumMapEntry* OXMLHelper::GetCommandTypeOptions()
     };
     return s_aXML_EnumMap;
 }
-// -----------------------------------------------------------------------------
+
 #define PROPERTY_ID_FONTNAME         1
 #define PROPERTY_ID_FONTHEIGHT       2
 #define PROPERTY_ID_FONTWIDTH        3
@@ -314,7 +314,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const OUString& _sStyleName,
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
 {
     static comphelper::PropertyMapEntry const pMap[] =
@@ -327,7 +327,7 @@ uno::Reference<beans::XPropertySet> OXMLHelper::createBorderPropertySet()
     };
     return comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
 }
-// -----------------------------------------------------------------------------
+
 SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
 {
     static const SvXMLTokenMapEntry aElemTokenMap[]=
@@ -354,7 +354,7 @@ SvXMLTokenMap* OXMLHelper::GetReportElemTokenMap()
     };
     return new SvXMLTokenMap( aElemTokenMap );
 }
-// -----------------------------------------------------------------------------
+
 SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap()
 {
     static const SvXMLTokenMapEntry aElemTokenMap[]=
@@ -366,7 +366,7 @@ SvXMLTokenMap* OXMLHelper::GetSubDocumentElemTokenMap()
     };
     return new SvXMLTokenMap( aElemTokenMap );
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions()
 {
        static const SvXMLEnumMapEntry s_aXML_EnumMap[] =
@@ -377,9 +377,9 @@ const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions()
        };
        return s_aXML_EnumMap;
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 } // rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index 82845d7ee2e9..9564825c606d 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -39,7 +39,7 @@ namespace rptxml
     using namespace ::com::sun::star::xml::sax;
 
 
-// -----------------------------------------------------------------------------
+
 OXMLImage::OXMLImage( ORptFilter& rImport,
                 sal_uInt16 nPrfx, const OUString& rLName,
                 const Reference< XAttributeList > & _xAttrList
@@ -104,16 +104,16 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
         OSL_FAIL("Exception catched while filling the image props");
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLImage::~OXMLImage()
 {
 
 }
-// -----------------------------------------------------------------------------
 
-//----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
index 1763b025b9e6..709236335876 100644
--- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx
@@ -53,7 +53,7 @@ ImportDocumentHandler::ImportDocumentHandler(uno::Reference< uno::XComponentCont
     ,m_xContext(context)
 {
 }
-// -----------------------------------------------------------------------------
+
 ImportDocumentHandler::~ImportDocumentHandler()
 {
     if ( m_xProxy.is() )
@@ -64,7 +64,7 @@ ImportDocumentHandler::~ImportDocumentHandler()
 }
 IMPLEMENT_GET_IMPLEMENTATION_ID(ImportDocumentHandler)
 IMPLEMENT_FORWARD_REFCOUNT( ImportDocumentHandler, ImportDocumentHandler_BASE )
-//------------------------------------------------------------------------
+
 OUString SAL_CALL ImportDocumentHandler::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
@@ -95,7 +95,7 @@ uno::Sequence< OUString > ImportDocumentHandler::getSupportedServiceNames_static
     return aSupported;
 }
 
-//------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL ImportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )
 {
     return *(new ImportDocumentHandler( _rxContext ));
@@ -385,13 +385,13 @@ void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >
 
     m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap());
 }
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL ImportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
 {
     uno::Any aReturn = ImportDocumentHandler_BASE::queryInterface(_rType);
     return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn);
 }
-// --------------------------------------------------------------------------------
+
 uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes(  ) throw (uno::RuntimeException)
 {
     if ( m_xTypeProvider.is() )
@@ -402,8 +402,8 @@ uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes(  ) throw (u
     return ImportDocumentHandler_BASE::getTypes();
 }
 
-// -----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx
index 135c514199d4..83f5c9cdafff 100644
--- a/reportdesign/source/filter/xml/xmlMasterFields.cxx
+++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx
@@ -71,13 +71,13 @@ OXMLMasterFields::OXMLMasterFields( ORptFilter& rImport,
     if ( !sMasterField.isEmpty() )
         m_pReport->addMasterDetailPair(::std::pair< OUString,OUString >(sMasterField,sDetailField));
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLMasterFields::~OXMLMasterFields()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLMasterFields::CreateChildContext(
         sal_uInt16 _nPrefix,
         const OUString& _rLocalName,
@@ -104,8 +104,8 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext(
     return pContext;
 }
 
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
index 855dbd349241..c96da30a10e9 100644
--- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx
@@ -23,10 +23,10 @@
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
 
-//--------------------------------------------------------------------------
+
 namespace rptxml
 {
-//--------------------------------------------------------------------------
+
     using namespace ::com::sun::star;
     using namespace xmloff;
     using namespace ::com::sun::star::report;
@@ -35,12 +35,12 @@ namespace rptxml
 OXMLRptPropHdlFactory::OXMLRptPropHdlFactory()
 {
 }
-// -----------------------------------------------------------------------------
+
 OXMLRptPropHdlFactory::~OXMLRptPropHdlFactory()
 {
 }
-// -----------------------------------------------------------------------------
+
 }// rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx
index 812135ffefa1..0dee143809f1 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -102,13 +102,13 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
         OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLReport::~OXMLReport()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OXMLReport::impl_initRuntimeDefaults() const
 {
@@ -126,7 +126,7 @@ void OXMLReport::impl_initRuntimeDefaults() const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvXMLImportContext* OXMLReport::CreateChildContext(
         sal_uInt16 nPrefix,
@@ -198,7 +198,7 @@ SvXMLImportContext* OXMLReport::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLReport::EndElement()
 {
     Reference< XFunctions > xFunctions = m_xComponent->getFunctions();
@@ -213,14 +213,14 @@ void OXMLReport::EndElement()
     if ( !m_aDetailFields.empty() )
         m_xComponent->setDetailFields(Sequence< OUString>(&*m_aDetailFields.begin(),m_aDetailFields.size()));
 }
-// -----------------------------------------------------------------------------
+
 void OXMLReport::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair)
 {
     m_aMasterFields.push_back(_aPair.first);
     m_aDetailFields.push_back(_aPair.second);
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx
index 9d6862dbe663..197e20e660ad 100644
--- a/reportdesign/source/filter/xml/xmlReportElement.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElement.cxx
@@ -76,13 +76,13 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport,
         OSL_FAIL("Exception catched while filling the report definition props");
     }
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLReportElement::~OXMLReportElement()
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 SvXMLImportContext* OXMLReportElement::CreateChildContext(
         sal_uInt16 _nPrefix,
@@ -121,13 +121,13 @@ SvXMLImportContext* OXMLReportElement::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLReportElement::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
index 18e5dc45822e..1a536696c04e 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx
@@ -41,12 +41,12 @@ OXMLReportElementBase::OXMLReportElementBase( ORptFilter& rImport
 ,m_xComponent(_xComponent)
 {
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLReportElementBase::~OXMLReportElementBase()
 {
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLReportElementBase::CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -57,7 +57,7 @@ SvXMLImportContext* OXMLReportElementBase::CreateChildContext(
         pContext = new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLReportElementBase::_CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -88,7 +88,7 @@ SvXMLImportContext* OXMLReportElementBase::_CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLReportElementBase::EndElement()
 {
     try
@@ -101,8 +101,8 @@ void OXMLReportElementBase::EndElement()
         OSL_FAIL("Exception caught while inserting a new control!");
     }
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx
index 156e3e36dba3..3857a1f2e66e 100644
--- a/reportdesign/source/filter/xml/xmlRow.cxx
+++ b/reportdesign/source/filter/xml/xmlRow.cxx
@@ -75,12 +75,12 @@ OXMLRow::OXMLRow( ORptFilter& rImport
     }
 
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLRow::~OXMLRow()
 {
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLRow::CreateChildContext(
         sal_uInt16 nPrefix,
         const OUString& rLocalName,
@@ -117,7 +117,7 @@ SvXMLImportContext* OXMLRow::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLRow::EndElement()
 {
     if ( m_sStyleName.getLength() )
@@ -156,13 +156,13 @@ void OXMLRow::EndElement()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLRow::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx
index a3eeb02179a5..3a979645193b 100644
--- a/reportdesign/source/filter/xml/xmlSection.cxx
+++ b/reportdesign/source/filter/xml/xmlSection.cxx
@@ -99,11 +99,11 @@ OXMLSection::OXMLSection( ORptFilter& rImport,
         OSL_FAIL("Exception catched while filling the section props");
     }
 }
-// -----------------------------------------------------------------------------
+
 OXMLSection::~OXMLSection()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 SvXMLImportContext* OXMLSection::CreateChildContext(
         sal_uInt16 _nPrefix,
@@ -128,14 +128,14 @@ SvXMLImportContext* OXMLSection::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLSection::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index a712ca4486e2..b41318ab9a1d 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace xmloff::token;
 
-// -----------------------------------------------------------------------------
+
 
 class OSpecialHanldeXMLImportPropertyMapper : public SvXMLImportPropertyMapper
 {
@@ -85,13 +85,13 @@ OControlStyleContext::OControlStyleContext( ORptFilter& rImport,
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 OControlStyleContext::~OControlStyleContext()
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPropSet )
 {
@@ -123,11 +123,11 @@ void OControlStyleContext::FillPropertySet(const Reference< XPropertySet > & rPr
     }
     XMLPropStyleContext::FillPropertySet(rPropSet);
 }
-// -----------------------------------------------------------------------------
+
 void OControlStyleContext::SetDefaults()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue)
 {
@@ -136,7 +136,7 @@ void OControlStyleContext::AddProperty(const sal_Int16 nContextID, const uno::An
     XMLPropertyState aPropState(nIndex, rValue);
     GetProperties().push_back(aPropState); // has to be insertes in a sort order later
 }
-// -----------------------------------------------------------------------------
+
 void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
                                         const OUString& rLocalName,
                                         const OUString& rValue )
@@ -149,12 +149,12 @@ void OControlStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
     else
         XMLPropStyleContext::SetAttribute( nPrefixKey, rLocalName, rValue );
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OControlStyleContext::GetOwnImport() const
 {
     return m_rImport;
 }
-// -----------------------------------------------------------------------------
+
 
 OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
         sal_uInt16 nPrfx ,
@@ -172,13 +172,13 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 OReportStylesContext::~OReportStylesContext()
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 void OReportStylesContext::EndElement()
 {
@@ -188,7 +188,7 @@ void OReportStylesContext::EndElement()
     else
         GetImport().GetStyles()->CopyStylesToDoc(sal_True);
 }
-// -----------------------------------------------------------------------------
+
 
 UniReference < SvXMLImportPropertyMapper >
     OReportStylesContext::GetImportPropertyMapper(
@@ -246,7 +246,7 @@ UniReference < SvXMLImportPropertyMapper >
 
     return xMapper;
 }
-// -----------------------------------------------------------------------------
+
 SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
@@ -269,7 +269,7 @@ SvXMLStyleContext *OReportStylesContext::CreateDefaultStyleStyleChildContext(
     }
     return pStyle;
 }
-// ----------------------------------------------------------------------------
+
 SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
         const Reference< xml::sax::XAttributeList > & xAttrList )
@@ -296,7 +296,7 @@ SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext(
 
     return pStyle;
 }
-// -----------------------------------------------------------------------------
+
 Reference < XNameContainer >
         OReportStylesContext::GetStylesContainer( sal_uInt16 nFamily ) const
 {
@@ -381,7 +381,7 @@ Reference < XNameContainer >
 
     return xStyles;
 }
-// -----------------------------------------------------------------------------
+
 
 OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const
 {
@@ -408,7 +408,7 @@ OUString OReportStylesContext::GetServiceName( sal_uInt16 nFamily ) const
     }
     return sServiceName;
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 OReportStylesContext::GetIndex(const sal_Int16 nContextID)
 {
@@ -421,19 +421,19 @@ sal_Int32 OReportStylesContext::GetIndex(const sal_Int16 nContextID)
     }
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OReportStylesContext::GetOwnImport() const
 {
     return m_rImport;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 OReportStylesContext::GetFamily( const OUString& rFamily ) const
 {
     sal_uInt16 nFamily = SvXMLStylesContext::GetFamily(rFamily);
     return nFamily;
 }
-// -----------------------------------------------------------------------------
+
 } // rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index 3de5ae72c4ac..ab74e204d9ab 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -50,13 +50,13 @@ OXMLSubDocument::OXMLSubDocument( ORptFilter& rImport,
 {
 
 }
-// -----------------------------------------------------------------------------
+
 
 OXMLSubDocument::~OXMLSubDocument()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* OXMLSubDocument::_CreateChildContext(
         sal_uInt16 _nPrefix,
         const OUString& _rLocalName,
@@ -99,7 +99,7 @@ SvXMLImportContext* OXMLSubDocument::_CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLSubDocument::EndElement()
 {
     if ( m_bContainsShape )
@@ -138,14 +138,14 @@ void OXMLSubDocument::EndElement()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OXMLSubDocument::addMasterDetailPair(const ::std::pair< OUString,OUString >& _aPair)
 {
     m_aMasterFields.push_back(_aPair.first);
     m_aDetailFields.push_back(_aPair.second);
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx
index 245158be2b86..4cb109d05dca 100644
--- a/reportdesign/source/filter/xml/xmlTable.cxx
+++ b/reportdesign/source/filter/xml/xmlTable.cxx
@@ -112,11 +112,11 @@ OXMLTable::OXMLTable( ORptFilter& rImport
         OSL_FAIL("Exception catched while filling the section props");
     }
 }
-// -----------------------------------------------------------------------------
+
 OXMLTable::~OXMLTable()
 {
 }
-// -----------------------------------------------------------------------------
+
 
 SvXMLImportContext* OXMLTable::CreateChildContext(
         sal_uInt16 _nPrefix,
@@ -154,12 +154,12 @@ SvXMLImportContext* OXMLTable::CreateChildContext(
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 ORptFilter& OXMLTable::GetOwnImport()
 {
     return static_cast<ORptFilter&>(GetImport());
 }
-// -----------------------------------------------------------------------------
+
 void OXMLTable::EndElement()
 {
     try
@@ -270,7 +270,7 @@ void OXMLTable::EndElement()
         OSL_FAIL("OXMLTable::EndElement -> exception catched");
     }
 }
-// -----------------------------------------------------------------------------
+
 void OXMLTable::addCell(const Reference<XReportComponent>& _xElement)
 {
     uno::Reference<report::XShape> xShape(_xElement,uno::UNO_QUERY);
@@ -293,15 +293,15 @@ void OXMLTable::addCell(const Reference<XReportComponent>& _xElement)
     if ( !xShape.is() )
         m_nColSpan = m_nRowSpan = 1;
 }
-// -----------------------------------------------------------------------------
+
 void OXMLTable::incrementRowIndex()
 {
     ++m_nRowIndex;
     m_nColumnIndex = 0;
     m_aGrid.push_back(::std::vector<TCell>(m_aWidth.size()));
 }
-//----------------------------------------------------------------------------
+
 } // namespace rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index e2ab7904cffe..cf02246efb00 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -275,35 +275,35 @@ sal_Int32 ReadThroughComponent(
     return 1;
 }
 
-//---------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > ORptImportHelper::create(uno::Reference< uno::XComponentContext > const & xContext)
 {
     return static_cast< XServiceInfo* >(new ORptFilter(xContext, IMPORT_SETTINGS ));
 }
-//---------------------------------------------------------------------
+
 OUString ORptImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
 {
     return OUString(SERVICE_SETTINGSIMPORTER);
 }
-//---------------------------------------------------------------------
+
 Sequence< OUString > ORptImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
     aSupported[0] = SERVICE_IMPORTFILTER;
     return aSupported;
 }
-//---------------------------------------------------------------------
+
 Reference< XInterface > ORptContentImportHelper::create(const Reference< XComponentContext > & xContext)
 {
     return static_cast< XServiceInfo* >(new ORptFilter(xContext,IMPORT_AUTOSTYLES |   IMPORT_CONTENT | IMPORT_SCRIPTS |
         IMPORT_FONTDECLS ));
 }
-//---------------------------------------------------------------------
+
 OUString ORptContentImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
 {
     return OUString(SERVICE_CONTENTIMPORTER);
 }
-//---------------------------------------------------------------------
+
 Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
@@ -311,19 +311,19 @@ Sequence< OUString > ORptContentImportHelper::getSupportedServiceNames_Static(
     return aSupported;
 }
 
-//---------------------------------------------------------------------
+
 Reference< XInterface > ORptStylesImportHelper::create(Reference< XComponentContext > const & xContext)
 {
     return static_cast< XServiceInfo* >(new ORptFilter(xContext,
         IMPORT_STYLES | IMPORT_MASTERSTYLES | IMPORT_AUTOSTYLES |
         IMPORT_FONTDECLS ));
 }
-//---------------------------------------------------------------------
+
 OUString ORptStylesImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
 {
     return OUString(SERVICE_STYLESIMPORTER);
 }
-//---------------------------------------------------------------------
+
 Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
@@ -331,18 +331,18 @@ Sequence< OUString > ORptStylesImportHelper::getSupportedServiceNames_Static(  )
     return aSupported;
 }
 
-//---------------------------------------------------------------------
+
 Reference< XInterface > ORptMetaImportHelper::create(Reference< XComponentContext > const & xContext)
 {
     return static_cast< XServiceInfo* >(new ORptFilter(xContext,
         IMPORT_META));
 }
-//---------------------------------------------------------------------
+
 OUString ORptMetaImportHelper::getImplementationName_Static(  ) throw (RuntimeException)
 {
     return OUString(SERVICE_METAIMPORTER);
 }
-//---------------------------------------------------------------------
+
 Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
     Sequence< OUString > aSupported(1);
@@ -350,9 +350,9 @@ Sequence< OUString > ORptMetaImportHelper::getSupportedServiceNames_Static(  ) t
     return aSupported;
 }
 
-// -------------
+
 // - ORptFilter -
-// -------------
+
 ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sal_uInt16 nImportFlags )
     :SvXMLImport(_rxContext, getImplementationName_Static(), nImportFlags)
 {
@@ -373,18 +373,18 @@ ORptFilter::ORptFilter( const uno::Reference< XComponentContext >& _rxContext,sa
     m_xTableStylesPropertySetMapper = new XMLTextPropertySetMapper( TEXT_PROP_MAP_TABLE_DEFAULTS, false );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ORptFilter::~ORptFilter() throw()
 {
 }
-//------------------------------------------------------------------------------
+
 uno::Reference< XInterface > ORptFilter::create(uno::Reference< XComponentContext > const & xContext)
 {
     return *(new ORptFilter(xContext));
 }
 
-// -----------------------------------------------------------------------------
+
 OUString ORptFilter::getImplementationName_Static(  ) throw(uno::RuntimeException)
 {
     return OUString("com.sun.star.comp.report.OReportFilter");
@@ -415,7 +415,7 @@ sal_Bool SAL_CALL ORptFilter::filter( const Sequence< PropertyValue >& rDescript
 
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
     throw (RuntimeException)
 {
@@ -616,7 +616,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
 
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
                                       const OUString& rLocalName,
                                       const uno::Reference< xml::sax::XAttributeList >& xAttrList )
@@ -679,7 +679,7 @@ SvXMLImportContext* ORptFilter::CreateContext( sal_uInt16 nPrefix,
 
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
 {
     if ( !m_pDocElemTokenMap.get() )
@@ -700,21 +700,21 @@ const SvXMLTokenMap& ORptFilter::GetDocElemTokenMap() const
     }
     return *m_pDocElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetReportElemTokenMap() const
 {
     if ( !m_pReportElemTokenMap.get() )
         m_pReportElemTokenMap.reset(OXMLHelper::GetReportElemTokenMap());
     return *m_pReportElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetSubDocumentElemTokenMap() const
 {
     if ( !m_pSubDocumentElemTokenMap.get() )
         m_pSubDocumentElemTokenMap.reset(OXMLHelper::GetSubDocumentElemTokenMap());
     return *m_pSubDocumentElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
 {
     if ( !m_pFunctionElemTokenMap.get() )
@@ -732,7 +732,7 @@ const SvXMLTokenMap& ORptFilter::GetFunctionElemTokenMap() const
     }
     return *m_pFunctionElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
 {
     if ( !m_pFormatElemTokenMap.get() )
@@ -748,7 +748,7 @@ const SvXMLTokenMap& ORptFilter::GetFormatElemTokenMap() const
     }
     return *m_pFormatElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
 {
     if ( !m_pGroupElemTokenMap.get() )
@@ -774,7 +774,7 @@ const SvXMLTokenMap& ORptFilter::GetGroupElemTokenMap() const
     }
     return *m_pGroupElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
 {
     if ( !m_pElemTokenMap.get() )
@@ -792,7 +792,7 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const
     }
     return *m_pElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
 {
     if ( !m_pControlElemTokenMap.get() )
@@ -814,7 +814,7 @@ const SvXMLTokenMap& ORptFilter::GetControlElemTokenMap() const
     }
     return *m_pControlElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
 {
     if ( !m_pControlElemTokenMap.get() )
@@ -836,7 +836,7 @@ const SvXMLTokenMap& ORptFilter::GetControlPropertyElemTokenMap() const
     }
     return *m_pControlElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
 {
     if ( !m_pComponentElemTokenMap.get() )
@@ -852,7 +852,7 @@ const SvXMLTokenMap& ORptFilter::GetComponentElemTokenMap() const
     }
     return *m_pComponentElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
 {
     if ( !m_pColumnTokenMap.get() )
@@ -876,7 +876,7 @@ const SvXMLTokenMap& ORptFilter::GetColumnTokenMap() const
     }
     return *m_pColumnTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
 {
     if ( !m_pSectionElemTokenMap.get() )
@@ -899,7 +899,7 @@ const SvXMLTokenMap& ORptFilter::GetSectionElemTokenMap() const
     }
     return *m_pSectionElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
 {
     if ( !m_pCellElemTokenMap.get() )
@@ -924,7 +924,7 @@ const SvXMLTokenMap& ORptFilter::GetCellElemTokenMap() const
     }
     return *m_pCellElemTokenMap;
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName,
                                      const uno::Reference< XAttributeList>& xAttrList, sal_Bool bIsAutoStyle )
 {
@@ -939,20 +939,20 @@ SvXMLImportContext* ORptFilter::CreateStylesContext(const OUString& rLocalName,
     }
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImport&         ORptFilter::getGlobalContext()
 {
     return *this;
 }
-// -----------------------------------------------------------------------------
+
 void ORptFilter::enterEventContext()
 {
 }
-// -----------------------------------------------------------------------------
+
 void ORptFilter::leaveEventContext()
 {
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext *ORptFilter::CreateFontDeclsContext(
         const OUString& rLocalName,
         const uno::Reference< xml::sax::XAttributeList > & xAttrList )
@@ -964,23 +964,23 @@ SvXMLImportContext *ORptFilter::CreateFontDeclsContext(
     SetFontDecls( pFSContext );
     return pFSContext;
 }
-// -----------------------------------------------------------------------------
+
 XMLShapeImportHelper* ORptFilter::CreateShapeImport()
 {
     return new XMLShapeImportHelper( *this,GetModel() );
 }
-// -----------------------------------------------------------------------------
+
 void ORptFilter::FinishStyles()
 {
     if( GetStyles() )
         GetStyles()->FinishStyles( sal_True );
 }
-// -----------------------------------------------------------------------------
+
 OUString ORptFilter::convertFormula(const OUString& _sFormula)
 {
     return _sFormula;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL ORptFilter::startDocument( void )
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
@@ -994,7 +994,7 @@ void SAL_CALL ORptFilter::startDocument( void )
         SvXMLImport::startDocument();
     }
 }
-// -----------------------------------------------------------------------------
+
 void ORptFilter::endDocument( void )
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
@@ -1013,17 +1013,17 @@ void ORptFilter::endDocument( void )
     // delegate to parent: takes care of error handling
     SvXMLImport::endDocument();
 }
-// -----------------------------------------------------------------------------
+
 void ORptFilter::removeFunction(const OUString& _sFunctionName)
 {
     m_aFunctions.erase(_sFunctionName);
 }
-// -----------------------------------------------------------------------------
+
 void ORptFilter::insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction)
 {
     m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction));
 }
-// -----------------------------------------------------------------------------
+
 SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,const uno::Reference<xml::sax::XAttributeList>&)
 {
     SvXMLImportContext* pContext = NULL;
@@ -1035,7 +1035,7 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const OUString& rLocalName,con
     }
     return pContext;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ORptFilter::isOldFormat() const
 {
     sal_Bool bOldFormat = sal_True;
@@ -1051,8 +1051,8 @@ sal_Bool ORptFilter::isOldFormat() const
     return bOldFormat;
 }
 
-// -----------------------------------------------------------------------------
+
 }// rptxml
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 2084035a1894..2a04a82fc5d2 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -82,7 +82,7 @@ protected:
 private:
     using SvTreeListBox::ExecuteDrop;
 };
-// -----------------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDescriptors()
 {
     uno::Sequence< beans::PropertyValue > aArgs(GetSelectionCount());
@@ -101,7 +101,7 @@ uno::Sequence< beans::PropertyValue > OAddFieldWindowListBox::getSelectedFieldDe
 //==================================================================
 // class OAddFieldWindowListBox
 //==================================================================
-//------------------------------------------------------------------------------
+
 OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent )
     :SvTreeListBox( _pParent, WB_TABSTOP|WB_BORDER|WB_SORT )
     ,m_pTabWin( _pParent )
@@ -112,24 +112,24 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent )
     SetHighlightRange( );
 }
 
-//------------------------------------------------------------------------------
+
 OAddFieldWindowListBox::~OAddFieldWindowListBox()
 {
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int8 OAddFieldWindowListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return DND_ACTION_NONE;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int8 OAddFieldWindowListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
 {
     return DND_ACTION_NONE;
 }
 
-//------------------------------------------------------------------------------
+
 void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
 {
     if ( GetSelectionCount() < 1 )
@@ -145,7 +145,7 @@ void OAddFieldWindowListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_r
 //========================================================================
 // class OAddFieldWindow
 //========================================================================
-//-----------------------------------------------------------------------
+
 OAddFieldWindow::OAddFieldWindow(Window* pParent
                                  ,const uno::Reference< beans::XPropertySet >& _xRowSet
                                  )
@@ -208,7 +208,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent
     }
 }
 
-//-----------------------------------------------------------------------
+
 OAddFieldWindow::~OAddFieldWindow()
 {
     if ( m_pListBox.get() )
@@ -226,7 +226,7 @@ OAddFieldWindow::~OAddFieldWindow()
         m_pContainerListener->dispose();
 }
 
-//-----------------------------------------------------------------------
+
 void OAddFieldWindow::GetFocus()
 {
     if ( m_pListBox.get() )
@@ -234,13 +234,13 @@ void OAddFieldWindow::GetFocus()
     else
         FloatingWindow::GetFocus();
 }
-//-----------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > OAddFieldWindow::getSelectedFieldDescriptors()
 {
     return m_pListBox->getSelectedFieldDescriptors();
 }
 
-//-----------------------------------------------------------------------
+
 bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
 {
     if ( EVENT_KEYINPUT == _rNEvt.GetType() )
@@ -258,7 +258,7 @@ bool OAddFieldWindow::PreNotify( NotifyEvent& _rNEvt )
 
     return FloatingWindow::PreNotify( _rNEvt );
 }
-//-----------------------------------------------------------------------
+
 void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt ) throw( uno::RuntimeException )
 {
     OSL_ENSURE( _evt.Source == m_xRowSet, "OAddFieldWindow::_propertyChanged: where did this come from?" );
@@ -266,7 +266,7 @@ void OAddFieldWindow::_propertyChanged( const beans::PropertyChangeEvent& _evt )
     Update();
 }
 
-//-----------------------------------------------------------------------
+
 namespace
 {
     void lcl_addToList( OAddFieldWindowListBox& _rListBox, const uno::Sequence< OUString >& _rEntries )
@@ -295,7 +295,7 @@ namespace
     }
 }
 
-//-----------------------------------------------------------------------
+
 void OAddFieldWindow::Update()
 {
     SolarMutexGuard aSolarGuard;
@@ -370,7 +370,7 @@ void OAddFieldWindow::Update()
     }
 }
 
-//-----------------------------------------------------------------------
+
 void OAddFieldWindow::Resize()
 {
     FloatingWindow::Resize();
@@ -410,12 +410,12 @@ void OAddFieldWindow::Resize()
     Point aFTPos( aRelated.Width(), aFLPos.Y() + aFLSize.Height() + aRelated.Height() );
     m_aHelpText.SetPosSizePixel( aFTPos, aHelpTextSize );
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< sdbc::XConnection> OAddFieldWindow::getConnection() const
 {
     return uno::Reference< sdbc::XConnection>(m_xRowSet->getPropertyValue( PROPERTY_ACTIVECONNECTION ),uno::UNO_QUERY);
 }
-// -----------------------------------------------------------------------------
+
 void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAccessDescriptor& _rDescriptor)
 {
     if ( _pSelected && m_xColumns.is() )
@@ -443,7 +443,7 @@ void OAddFieldWindow::fillDescriptor(SvTreeListEntry* _pSelected,::svx::ODataAcc
             _rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent )  throw(::com::sun::star::uno::RuntimeException)
 {
     if ( m_pListBox.get() )
@@ -462,7 +462,7 @@ void OAddFieldWindow::_elementInserted( const container::ContainerEvent& _rEvent
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( m_pListBox.get() )
@@ -472,18 +472,18 @@ void OAddFieldWindow::_elementRemoved( const container::ContainerEvent& /*_rEven
             lcl_addToList( *m_pListBox, m_xColumns );
     }
 }
-// -----------------------------------------------------------------------------
+
 void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OAddFieldWindow, OnSelectHdl, void* ,/*_pAddFieldDlg*/)
 {
     m_aActions.EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 ));
 
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
 {
     if ( m_aCreateLink.IsSet() )
@@ -491,7 +491,7 @@ IMPL_LINK( OAddFieldWindow, OnDoubleClickHdl, void* ,/*_pAddFieldDlg*/)
 
     return 0L;
 }
-//------------------------------------------------------------------------------
+
 ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_ADDFIELD_DLG_SC;
@@ -499,7 +499,7 @@ ImageList OAddFieldWindow::getImageList(sal_Int16 _eBitmapSet) const
         nN = IMG_ADDFIELD_DLG_LC;
     return ImageList(ModuleRes(nN));
 }
-//------------------------------------------------------------------
+
 void OAddFieldWindow::resizeControls(const Size& _rDiff)
 {
     // we use large images so we must change them
@@ -508,7 +508,7 @@ void OAddFieldWindow::resizeControls(const Size& _rDiff)
         Invalidate();
     }
 }
-//------------------------------------------------------------------
+
 IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
 {
     const sal_uInt16 nCurItem = m_aActions.GetCurItemId();
@@ -544,7 +544,7 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ )
     }
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 // =============================================================================
 } // namespace rptui
 // =============================================================================
diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx
index 70cf99736b50..8c7dabb6fd76 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -107,13 +107,13 @@ namespace rptui
         FreeResource();
     }
 
-    //------------------------------------------------------------------------
+
     ConditionalFormattingDialog::~ConditionalFormattingDialog()
     {
         m_aConditions.clear();
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_updateConditionIndicies()
     {
         sal_Int32 nIndex = 0;
@@ -126,7 +126,7 @@ namespace rptui
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_conditionCountChanged()
     {
         if ( m_aConditions.empty() )
@@ -137,20 +137,20 @@ namespace rptui
         impl_layoutAll();
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::addCondition( size_t _nAddAfterIndex )
     {
         OSL_PRECOND( _nAddAfterIndex < impl_getConditionCount(), "ConditionalFormattingDialog::addCondition: illegal condition index!" );
         impl_addCondition_nothrow( _nAddAfterIndex + 1 );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::deleteCondition( size_t _nCondIndex )
     {
         impl_deleteCondition_nothrow( _nCondIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_addCondition_nothrow( size_t _nNewCondIndex )
     {
         UpdateLocker aLockUpdates( *this );
@@ -180,7 +180,7 @@ namespace rptui
         impl_ensureConditionVisible( _nNewCondIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_focusCondition( size_t _nCondIndex )
     {
         OSL_PRECOND( _nCondIndex < impl_getConditionCount(),
@@ -190,7 +190,7 @@ namespace rptui
         m_aConditions[ _nCondIndex ]->GrabFocus();
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_deleteCondition_nothrow( size_t _nCondIndex )
     {
         UpdateLocker aLockUpdates( *this );
@@ -238,7 +238,7 @@ namespace rptui
             impl_focusCondition( nNewFocusIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_moveCondition_nothrow( size_t _nCondIndex, bool _bMoveUp )
     {
         size_t nOldConditionIndex( _nCondIndex );
@@ -283,7 +283,7 @@ namespace rptui
         impl_ensureConditionVisible( nNewConditionIndex );
     }
 
-    // -----------------------------------------------------------------------------
+
     long ConditionalFormattingDialog::impl_getConditionWidth() const
     {
         const Size aDialogSize( GetOutputSizePixel() );
@@ -291,7 +291,7 @@ namespace rptui
         return aDialogSize.Width() - aScrollBarWidth.Width();
     }
 
-    // -----------------------------------------------------------------------------
+
     IMPL_LINK( ConditionalFormattingDialog, OnScroll, ScrollBar*, /*_pNotInterestedIn*/ )
     {
         size_t nFirstCondIndex( impl_getFirstVisibleConditionIndex() );
@@ -308,7 +308,7 @@ namespace rptui
         return 0;
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_layoutConditions( Point& _out_rBelowLastVisible )
     {
         // position the condition's playground
@@ -331,7 +331,7 @@ namespace rptui
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_layoutAll()
     {
         // condition's positions
@@ -358,7 +358,7 @@ namespace rptui
         aPos += LogicToPixel( Point( 0, BUTTON_HEIGHT + RELATED_CONTROLS ), MAP_APPFONT );
         setPosSizePixel( 0, 0, 0, aPos.Y(), WINDOW_POSSIZE_HEIGHT );
     }
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_initializeConditions()
     {
         try
@@ -381,7 +381,7 @@ namespace rptui
         impl_conditionCountChanged();
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor )
     {
         OSL_PRECOND( _nCommandId, "ConditionalFormattingDialog::applyCommand: illegal command id!" );
@@ -410,7 +410,7 @@ namespace rptui
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::moveConditionUp( size_t _nCondIndex )
     {
         OSL_PRECOND( _nCondIndex > 0, "ConditionalFormattingDialog::moveConditionUp: cannot move up the first condition!" );
@@ -418,7 +418,7 @@ namespace rptui
             impl_moveCondition_nothrow( _nCondIndex, true );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::moveConditionDown( size_t _nCondIndex )
     {
         OSL_PRECOND( _nCondIndex < impl_getConditionCount(), "ConditionalFormattingDialog::moveConditionDown: cannot move down the last condition!" );
@@ -426,7 +426,7 @@ namespace rptui
             impl_moveCondition_nothrow( _nCondIndex, false );
     }
 
-    // -----------------------------------------------------------------------------
+
     OUString ConditionalFormattingDialog::getDataField() const
     {
         OUString sDataField;
@@ -441,7 +441,7 @@ namespace rptui
         return sDataField;
     }
 
-    // -----------------------------------------------------------------------------
+
     short ConditionalFormattingDialog::Execute()
     {
         short nRet = ModalDialog::Execute();
@@ -491,7 +491,7 @@ namespace rptui
         return nRet;
     }
 
-    // -----------------------------------------------------------------------------
+
     bool ConditionalFormattingDialog::PreNotify( NotifyEvent& _rNEvt )
     {
         switch ( _rNEvt.GetType() )
@@ -502,7 +502,7 @@ namespace rptui
             const KeyCode& rKeyCode = pKeyEvent->GetKeyCode();
             if ( rKeyCode.IsMod1() && rKeyCode.IsMod2() )
             {
-                if ( rKeyCode.GetCode() == 0x0508 ) // -
+                if ( rKeyCode.GetCode() == 0x0508 )
                 {
                     impl_deleteCondition_nothrow( impl_getFocusedConditionIndex( 0 ) );
                     return true;
@@ -544,19 +544,19 @@ namespace rptui
         return ModalDialog::PreNotify( _rNEvt );
     }
 
-    // -----------------------------------------------------------------------------
+
     size_t ConditionalFormattingDialog::impl_getFirstVisibleConditionIndex() const
     {
         return (size_t)m_aCondScroll.GetThumbPos();
     }
 
-    // -----------------------------------------------------------------------------
+
     size_t ConditionalFormattingDialog::impl_getLastVisibleConditionIndex() const
     {
         return ::std::min( impl_getFirstVisibleConditionIndex() + MAX_CONDITIONS, impl_getConditionCount() ) - 1;
     }
 
-    // -----------------------------------------------------------------------------
+
     size_t ConditionalFormattingDialog::impl_getFocusedConditionIndex( sal_Int32 _nFallBackIfNone ) const
     {
         size_t nIndex( 0 );
@@ -571,7 +571,7 @@ namespace rptui
         return _nFallBackIfNone;
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_updateScrollBarRange()
     {
         long nMax = ( impl_getConditionCount() > MAX_CONDITIONS ) ? impl_getConditionCount() - MAX_CONDITIONS + 1 : 0;
@@ -581,7 +581,7 @@ namespace rptui
         m_aCondScroll.SetVisibleSize( 1 );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_scrollTo( size_t _nTopCondIndex )
     {
         OSL_PRECOND( _nTopCondIndex + MAX_CONDITIONS <= impl_getConditionCount(),
@@ -590,7 +590,7 @@ namespace rptui
         OnScroll( &m_aCondScroll );
     }
 
-    // -----------------------------------------------------------------------------
+
     void ConditionalFormattingDialog::impl_ensureConditionVisible( size_t _nCondIndex )
     {
         OSL_PRECOND( _nCondIndex < impl_getConditionCount(),
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx
index 2d3e23eaa270..c1dcb3891412 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -71,13 +71,13 @@ ConditionField::ConditionField( Condition* _pParent, const ResId& _rResId ) : Ed
     m_pSubEdit->Show();
     Resize();
 }
-// -----------------------------------------------------------------------------
+
 ConditionField::~ConditionField()
 {
     SetSubEdit(NULL);
     delete m_pSubEdit;
 }
-// -----------------------------------------------------------------------------
+
 void ConditionField::Resize()
 {
     Edit::Resize();
@@ -87,7 +87,7 @@ void ConditionField::Resize()
     m_aFormula.SetPosSizePixel(aButtonPos,aButtonSize);
     m_pSubEdit->SetPosSizePixel(Point(0,0),Size(aButtonPos.X() ,aSize.Height()));
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( ConditionField, OnFormula, Button*, /*_pClickedButton*/ )
 {
     OUString sFormula(m_pSubEdit->GetText());
@@ -131,7 +131,7 @@ public:
     void StartSelection();
     void SetSlotId(sal_uInt16 _nSlotId);
 };
-// -----------------------------------------------------------------------------
+
 OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
 :FloatingWindow(_pParent, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK|WB_DIALOGCONTROL ))
 ,m_pCondition(_pCondition)
@@ -174,13 +174,13 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition)
     SetOutputSizePixel( aSize );
     m_aColorSet.Show();
 }
-// -----------------------------------------------------------------------------
+
 void OColorPopup::KeyInput( const KeyEvent& rKEvt )
 {
     m_aColorSet.KeyInput(rKEvt);
 }
 
-// -----------------------------------------------------------------------------
+
 void OColorPopup::Resize()
 {
     Size aSize = GetOutputSizePixel();
@@ -189,12 +189,12 @@ void OColorPopup::Resize()
     m_aColorSet.SetPosSizePixel( Point(2,2), aSize );
 }
 
-// -----------------------------------------------------------------------------
+
 void OColorPopup::StartSelection()
 {
     m_aColorSet.StartSelection();
 }
-// -----------------------------------------------------------------------------
+
 void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
 {
     m_nSlotId = _nSlotId;
@@ -204,7 +204,7 @@ void OColorPopup::SetSlotId(sal_uInt16 _nSlotId)
         m_aColorSet.SetText( OUString(ModuleRes( STR_TRANSPARENT )) );
     }
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(OColorPopup, SelectHdl)
 {
     sal_uInt16 nItemId = m_aColorSet.GetSelectItemId();
@@ -225,7 +225,7 @@ IMPL_LINK_NOARG(OColorPopup, SelectHdl)
 // =============================================================================
 // = Condition
 // =============================================================================
-// -----------------------------------------------------------------------------
+
 Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rptui::OReportController& _rController )
     :Control(_pParent, ModuleRes(WIN_CONDITION))
     ,m_rController( _rController )
@@ -306,7 +306,7 @@ Condition::Condition( Window* _pParent, IConditionalFormatAction& _rAction, ::rp
     ConditionalExpressionFactory::getKnownConditionalExpressions( m_aConditionalExpressions );
 }
 
-// -----------------------------------------------------------------------------
+
 Condition::~Condition()
 {
     m_bInDestruction = true;
@@ -315,7 +315,7 @@ Condition::~Condition()
     delete m_pBtnUpdaterFontColor;
     delete m_pBtnUpdaterBackgroundColor;
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
 {
     sal_uInt16 nId( m_aActions.GetCurItemId() );
@@ -343,7 +343,7 @@ IMPL_LINK( Condition, DropdownClick, ToolBox*, /*pToolBar*/ )
 
     return 1;
 }
-//------------------------------------------------------------------
+
 IMPL_LINK( Condition, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
 {
     Color aCol(COL_AUTO);
@@ -351,7 +351,7 @@ IMPL_LINK( Condition, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
     return 0L;
 }
 
-//------------------------------------------------------------------
+
 IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
 {
     if ( _pClickedButton == &m_aMoveUp )
@@ -365,7 +365,7 @@ IMPL_LINK( Condition, OnConditionAction, Button*, _pClickedButton )
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
 {
     if ( _nCommandId == SID_ATTR_CHAR_COLOR2 )
@@ -375,7 +375,7 @@ void Condition::ApplyCommand( sal_uInt16 _nCommandId, const ::Color& _rColor)
 
     m_rAction.applyCommand( m_nCondIndex, _nCommandId, _rColor );
 }
-//------------------------------------------------------------------------------
+
 ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
 {
     sal_Int16 nN = IMG_CONDFORMAT_DLG_SC;
@@ -383,7 +383,7 @@ ImageList Condition::getImageList(sal_Int16 _eBitmapSet) const
         nN = IMG_CONDFORMAT_DLG_LC;
     return ImageList(ModuleRes(nN));
 }
-//------------------------------------------------------------------
+
 void Condition::resizeControls(const Size& _rDiff)
 {
     // we use large images so we must change them
@@ -392,7 +392,7 @@ void Condition::resizeControls(const Size& _rDiff)
         Invalidate();
     }
 }
-// -----------------------------------------------------------------------------
+
 void Condition::Paint( const Rectangle& rRect )
 {
     Control::Paint(rRect);
@@ -402,7 +402,7 @@ void Condition::Paint( const Rectangle& rRect )
     ColorChanger aColors( this, rStyleSettings.GetShadowColor(), rStyleSettings.GetDialogColor() );
     DrawRect( impl_getToolBarBorderRect() );
 }
-// -----------------------------------------------------------------------------
+
 void Condition::StateChanged( StateChangedType nType )
 {
     Control::StateChanged( nType );
@@ -419,7 +419,7 @@ void Condition::StateChanged( StateChangedType nType )
         checkImageList();
     }
 }
-// -----------------------------------------------------------------------------
+
 void Condition::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Control::DataChanged( rDCEvt );
@@ -433,7 +433,7 @@ void Condition::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::GetFocus()
 {
     Control::GetFocus();
@@ -441,14 +441,14 @@ void Condition::GetFocus()
         m_aCondLHS.GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::Resize()
 {
     Control::Resize();
     impl_layoutAll();
 }
 
-// -----------------------------------------------------------------------------
+
 Rectangle Condition::impl_getToolBarBorderRect() const
 {
     const Point aToolbarPos( m_aActions.GetPosPixel() );
@@ -464,7 +464,7 @@ Rectangle Condition::impl_getToolBarBorderRect() const
     return aBorderRect;
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::impl_layoutAll()
 {
     // if our width changed, resize/-position some controls
@@ -506,21 +506,21 @@ void Condition::impl_layoutAll()
     impl_layoutOperands();
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( Condition, OnTypeSelected, ListBox*, /*_pNotInterestedIn*/ )
 {
     impl_layoutOperands();
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( Condition, OnOperationSelected, ListBox*, /*_pNotInterestedIn*/ )
 {
     impl_layoutOperands();
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::impl_layoutOperands()
 {
     const ConditionType eType( impl_getCurrentConditionType() );
@@ -570,7 +570,7 @@ void Condition::impl_layoutOperands()
     m_aCondRHS.Show( bHaveRHS );
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::impl_setCondition( const OUString& _rConditionFormula )
 {
     // determine the condition's type and comparison operation
@@ -622,7 +622,7 @@ void Condition::impl_setCondition( const OUString& _rConditionFormula )
     impl_layoutOperands();
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::setCondition( const uno::Reference< report::XFormatCondition >& _rxCondition )
 {
     OSL_PRECOND( _rxCondition.is(), "Condition::setCondition: empty condition object!" );
@@ -643,7 +643,7 @@ void Condition::setCondition( const uno::Reference< report::XFormatCondition >&
     updateToolbar( _rxCondition.get() );
 }
 
-// -----------------------------------------------------------------------------
+
 void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat >& _xReportControlFormat)
 {
     OSL_ENSURE(_xReportControlFormat.is(),"XReportControlFormat is NULL!");
@@ -674,7 +674,7 @@ void Condition::updateToolbar(const uno::Reference< report::XReportControlFormat
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void Condition::fillFormatCondition(const uno::Reference< report::XFormatCondition >& _xCondition)
 {
     const ConditionType eType( impl_getCurrentConditionType() );
@@ -697,7 +697,7 @@ void Condition::fillFormatCondition(const uno::Reference< report::XFormatConditi
     ReportFormula aFormula( ReportFormula::Expression, sUndecoratedFormula );
     _xCondition->setFormula( aFormula.getCompleteFormula() );
 }
-// -----------------------------------------------------------------------------
+
 void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount )
 {
     m_nCondIndex = _nCondIndex;
@@ -710,7 +710,7 @@ void Condition::setConditionIndex( size_t _nCondIndex, size_t _nCondCount )
     m_aMoveDown.Enable( _nCondIndex < _nCondCount - 1 );
 }
 
-// -----------------------------------------------------------------------------
+
 bool Condition::isEmpty() const
 {
     return m_aCondLHS.GetText().isEmpty();
diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx
index c3c30dcb1373..42ecde726f94 100644
--- a/reportdesign/source/ui/dlg/DateTime.cxx
+++ b/reportdesign/source/ui/dlg/DateTime.cxx
@@ -91,7 +91,7 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
         aCheckBoxes[i]->SetClickHdl(LINK(this,ODateTimeDialog,CBClickHdl));
 
 }
-// -----------------------------------------------------------------------------
+
     void ODateTimeDialog::InsertEntry(sal_Int16 _nNumberFormatId)
     {
         const bool bTime = util::NumberFormat::TIME == _nNumberFormatId;
@@ -110,11 +110,11 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
             pListBox->SetEntryData(nPos, reinterpret_cast<void*>(*pIter));
         }
     }
-//------------------------------------------------------------------------
+
 ODateTimeDialog::~ODateTimeDialog()
 {
 }
-// -----------------------------------------------------------------------------
+
 short ODateTimeDialog::Execute()
 {
     short nRet = ModalDialog::Execute();
@@ -166,7 +166,7 @@ short ODateTimeDialog::Execute()
     }
     return nRet;
 }
-// -----------------------------------------------------------------------------
+
 OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,const uno::Reference< util::XNumberFormats>& _xFormats,bool _bTime)
 {
     uno::Reference< beans::XPropertySet> xFormSet = _xFormats->getByKey(_nNumberFormatKey);
@@ -191,7 +191,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con
     OSL_ENSURE(xPreviewer.is(),"XNumberFormatPreviewer is null!");
     return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,sal_True);
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
 {
    (void)_pBox;
@@ -211,7 +211,7 @@ IMPL_LINK( ODateTimeDialog, CBClickHdl, CheckBox*, _pBox )
     }
     return 1L;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const
 {
     sal_Int32 nFormatKey;
diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx
index 2b0e4077b51c..33a3a50c2147 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -73,7 +73,7 @@ FormulaDialog::FormulaDialog(Window* pParent
 void FormulaDialog::notifyChange()
 {
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDialog::fill()
 {
     SetMeText(m_sFormula);
@@ -172,19 +172,19 @@ IFunctionManager* FormulaDialog::getFunctionManager()
 {
     return m_aFunctionManager.get();
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDialog::ShowReference(const OUString& /*_sRef*/)
 {
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDialog::HideReference( bool /*bDoneRefMode*/)
 {
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDialog::ReleaseFocus( RefEdit* /*pEdit*/, RefButton* /*pButton*/)
 {
 }
-// -----------------------------------------------------------------------------
+
 void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
 {
     ::std::pair<RefButton*,RefEdit*> aPair = RefInputStartBefore( _pEdit, _pButton );
@@ -211,7 +211,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton)
     m_pAddField->Show();
 
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg)
 {
     const uno::Sequence< beans::PropertyValue > aArgs = _pAddFieldDlg->getSelectedFieldDescriptors();
@@ -235,22 +235,22 @@ IMPL_LINK( FormulaDialog, OnClickHdl, OAddFieldWindow* ,_pAddFieldDlg)
 
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< sheet::XFormulaParser> FormulaDialog::getFormulaParser() const
 {
     return m_xParser.get();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< sheet::XFormulaOpCodeMapper> FormulaDialog::getFormulaOpCodeMapper() const
 {
     return m_xOpCodeMapper;
 }
-// -----------------------------------------------------------------------------
+
 table::CellAddress FormulaDialog::getReferencePosition() const
 {
     return table::CellAddress();
 }
-// -----------------------------------------------------------------------------
+
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr<formula::FormulaTokenArray> FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& _aTokenList)
 {
diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx
index 06753d8d7653..4b6dd5fa7b88 100644
--- a/reportdesign/source/ui/dlg/GroupExchange.cxx
+++ b/reportdesign/source/ui/dlg/GroupExchange.cxx
@@ -40,7 +40,7 @@ namespace rptui
         : m_aGroupRow(_aGroupRow)
     {
     }
-    // -----------------------------------------------------------------------------
+
     void OGroupExchange::AddSupportedFormats()
     {
         if ( m_aGroupRow.getLength() )
@@ -48,7 +48,7 @@ namespace rptui
             AddFormat(OGroupExchange::getReportGroupId());
         }
     }
-    // -----------------------------------------------------------------------------
+
     sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
     {
         sal_uLong nFormat = SotExchange::GetFormat(rFlavor);
@@ -58,12 +58,12 @@ namespace rptui
         }
         return sal_False;
     }
-    // -----------------------------------------------------------------------------
+
     void OGroupExchange::ObjectReleased()
     {
         m_aGroupRow.realloc(0);
     }
-    // -----------------------------------------------------------------------------
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 80cefa6fc7b4..34fd85035dbe 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -168,7 +168,7 @@ public:
 //========================================================================
 // class OFieldExpressionControl
 //========================================================================
-//------------------------------------------------------------------------
+
 OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent,const ResId& _rResId )
     :EditBrowseBox( _pParent, _rResId,EBBF_NONE, WB_TABSTOP | BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_AUTOSIZE_LASTCOL |
                                   BROWSER_KEEPSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL)
@@ -184,7 +184,7 @@ OFieldExpressionControl::OFieldExpressionControl( OGroupsSortingDialog* _pParent
     SetBorderStyle(WINDOW_BORDER_MONO);
 }
 
-//------------------------------------------------------------------------
+
 OFieldExpressionControl::~OFieldExpressionControl()
 {
     acquire();
@@ -199,7 +199,7 @@ OFieldExpressionControl::~OFieldExpressionControl()
 
     delete m_pComboCell;
 }
-//------------------------------------------------------------------------------
+
 uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
 {
     uno::Sequence<uno::Any> aList;
@@ -232,7 +232,7 @@ uno::Sequence<uno::Any> OFieldExpressionControl::fillSelectedGroups()
     }
     return aList;
 }
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /*_rPosPixel*/ )
 {
     if ( m_pParent && !m_pParent->isReadOnly( ) )
@@ -247,7 +247,7 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /*
         }
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
 {
     sal_Int8 nAction = DND_ACTION_NONE;
@@ -264,7 +264,7 @@ sal_Int8 OFieldExpressionControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt
     }
     return nAction;
 }
-//------------------------------------------------------------------------------
+
 sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
 {
     sal_Int8 nAction = DND_ACTION_NONE;
@@ -285,7 +285,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE
     }
     return nAction;
 }
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect)
 {
     if ( _aGroups.getLength() )
@@ -325,14 +325,14 @@ void OFieldExpressionControl::moveGroups(const uno::Sequence<uno::Any>& _aGroups
         Invalidate();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OFieldExpressionControl::fillColumns(const uno::Reference< container::XNameAccess>& _xColumns)
 {
     m_pComboCell->Clear();
     if ( _xColumns.is() )
         lcl_addToList_throw(*m_pComboCell,m_aColumnInfo,_xColumns);
 }
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::lateInit()
 {
     uno::Reference< report::XGroups > xGroups = m_pParent->getGroups();
@@ -382,8 +382,8 @@ void OFieldExpressionControl::lateInit()
 
     RowInserted(0, m_aGroupPositions.size(), sal_True);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ )
 {
 
@@ -391,18 +391,18 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ )
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const
 {
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OFieldExpressionControl::SaveModified()
 {
     return SaveModified(true);
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
 {
     sal_Int32 nRow = GetCurRow();
@@ -482,7 +482,7 @@ sal_Bool OFieldExpressionControl::SaveModified(bool _bAppendRow)
 
     return sal_True;
 }
-//------------------------------------------------------------------------------
+
 OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/ ) const
 {
     OUString sText;
@@ -512,13 +512,13 @@ OUString OFieldExpressionControl::GetCellText( long nRow, sal_uInt16 /*nColId*/
     return sText;
 }
 
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/, long nRow, sal_uInt16 nColumnId )
 {
 
     m_pComboCell->SetText( GetCellText( nRow, nColumnId ) );
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
 {
 
@@ -533,7 +533,7 @@ sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol)
     m_pParent->DisplayData( m_nDataPos );
     return sal_True;
 }
-//------------------------------------------------------------------------------
+
 CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ )
 {
     ComboBoxCellController* pCellController = new ComboBoxCellController( m_pComboCell );
@@ -541,7 +541,7 @@ CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt1
     return pCellController;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool OFieldExpressionControl::SeekRow( long _nRow )
 {
     // die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche Zeile gepainted wird
@@ -550,7 +550,7 @@ sal_Bool OFieldExpressionControl::SeekRow( long _nRow )
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
 {
     OUString aText  =const_cast< OFieldExpressionControl*>(this)->GetCellText( m_nCurrentPos, nColumnId );
@@ -567,7 +567,7 @@ void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rR
     if( rDev.IsClipRegion() )
         rDev.SetClipRegion();
 }
-//------------------------------------------------------------------------------
+
 EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
 {
     if (nRow >= 0 && nRow == m_nDataPos)
@@ -587,13 +587,13 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const
     return EditBrowseBox::CLEAN;
 }
 //  XEventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OFieldExpressionControl::disposing(const lang::EventObject& /*e*/) throw( uno::RuntimeException )
 {
 }
-//------------------------------------------------------------------------------
+
 // XContainerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OFieldExpressionControl::elementInserted(const container::ContainerEvent& evt) throw(uno::RuntimeException)
 {
     if ( m_bIgnoreEvent )
@@ -633,11 +633,11 @@ void SAL_CALL OFieldExpressionControl::elementInserted(const container::Containe
         Invalidate();
     }
 }
-//------------------------------------------------------------------------------
+
 void SAL_CALL OFieldExpressionControl::elementReplaced(const container::ContainerEvent& /*evt*/) throw(uno::RuntimeException)
 {
 }
-//------------------------------------------------------------------------------
+
 void SAL_CALL OFieldExpressionControl::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -661,12 +661,12 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const container::Container
         }
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OFieldExpressionControl::IsDeleteAllowed( )
 {
     return !m_pParent->isReadOnly() && GetSelectRowCount() > 0;
 }
-//------------------------------------------------------------------------
+
 void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt )
 {
     if (IsDeleteAllowed())
@@ -681,7 +681,7 @@ void OFieldExpressionControl::KeyInput( const KeyEvent& rEvt )
     }
     EditBrowseBox::KeyInput(rEvt);
 }
-//------------------------------------------------------------------------
+
 void OFieldExpressionControl::Command(const CommandEvent& rEvt)
 {
     switch (rEvt.GetCommand())
@@ -736,7 +736,7 @@ void OFieldExpressionControl::Command(const CommandEvent& rEvt)
     }
 
 }
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::DeleteRows()
 {
 
@@ -797,15 +797,15 @@ void OFieldExpressionControl::DeleteRows()
     m_bIgnoreEvent = false;
     Invalidate();
 }
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
+
+
 void OFieldExpressionControl::cut()
 {
     copy();
     DeleteRows();
 }
 
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::copy()
 {
     //////////////////////////////////////////////////////////////////////
@@ -822,7 +822,7 @@ void OFieldExpressionControl::copy()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::paste()
 {
     TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
@@ -833,7 +833,7 @@ void OFieldExpressionControl::paste()
         m_nPasteEvent = Application::PostUserEvent( LINK(this, OFieldExpressionControl, DelayedPaste) );
     }
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK( OFieldExpressionControl, DelayedPaste, void*,  )
 {
     m_nPasteEvent = 0;
@@ -846,14 +846,14 @@ IMPL_LINK( OFieldExpressionControl, DelayedPaste, void*,  )
 
     return 0;
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK( OFieldExpressionControl, DelayedDelete, void*,  )
 {
     m_nDeleteEvent = 0;
     DeleteRows();
     return 0;
 }
-//------------------------------------------------------------------------------
+
 void OFieldExpressionControl::InsertRows( long nRow )
 {
 
@@ -911,7 +911,7 @@ void OFieldExpressionControl::InsertRows( long nRow )
 
     RowInserted( nRow,nSize,sal_True );
 }
-//------------------------------------------------------------------------------
+
 
 //========================================================================
 // class OGroupsSortingDialog
@@ -1006,7 +1006,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent
     FreeResource();
 }
 
-//------------------------------------------------------------------------
+
 OGroupsSortingDialog::~OGroupsSortingDialog()
 {
     delete m_pFieldExpression;
@@ -1015,12 +1015,12 @@ OGroupsSortingDialog::~OGroupsSortingDialog()
     if ( m_pCurrentGroupListener.is() )
         m_pCurrentGroupListener->dispose();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OGroupsSortingDialog::isReadOnly( ) const
 {
     return m_bReadOnly;
 }
-//------------------------------------------------------------------------------
+
 void OGroupsSortingDialog::UpdateData( )
 {
     m_pFieldExpression->Invalidate();
@@ -1029,7 +1029,7 @@ void OGroupsSortingDialog::UpdateData( )
     m_pFieldExpression->ActivateCell(nCurRow, m_pFieldExpression->GetCurColumnId());
     DisplayData(nCurRow);
 }
-//------------------------------------------------------------------------------
+
 void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow )
 {
     sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
@@ -1065,7 +1065,7 @@ void OGroupsSortingDialog::DisplayData( sal_Int32 _nRow )
         displayGroup(xGroup);
     }
 }
-//------------------------------------------------------------------------------
+
 void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
 {
     sal_Int32 nGroupPos = m_pFieldExpression->getGroupPosition(_nRow);
@@ -1097,7 +1097,7 @@ void OGroupsSortingDialog::SaveData( sal_Int32 _nRow)
         pControls[i]->SaveValue();
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName)
 {
     sal_Int32 nDataType = sdbc::DataType::VARCHAR;
@@ -1119,7 +1119,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const OUString& _sColumnName)
 
     return nDataType;
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl )
 {
     if ( m_pFieldExpression && m_pFieldExpression->getExpressionControl() )
@@ -1142,7 +1142,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusGot, Control*, pControl )
     }
     return 0L;
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl )
 {
     if ( m_pFieldExpression && pControl == &m_aGroupIntervalEd )
@@ -1152,7 +1152,7 @@ IMPL_LINK(OGroupsSortingDialog, OnControlFocusLost, Control*, pControl )
     }
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
 {
 
@@ -1195,7 +1195,7 @@ IMPL_LINK( OGroupsSortingDialog, OnFormatAction, ToolBox*, /*NOTINTERESTEDIN*/ )
     }
     return 1L;
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
 {
     if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() )
@@ -1229,12 +1229,12 @@ IMPL_LINK( OGroupsSortingDialog, LBChangeHdl, ListBox*, pListBox )
     }
     return 1L;
 }
-// -----------------------------------------------------------------------------
+
 void OGroupsSortingDialog::showHelpText(sal_uInt16 _nResId)
 {
     m_aHelpWindow.SetText(OUString(ModuleRes(_nResId)));
 }
-// -----------------------------------------------------------------------------
+
 void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
 {
     uno::Reference< report::XGroup > xGroup(_rEvent.Source,uno::UNO_QUERY);
@@ -1243,13 +1243,13 @@ void OGroupsSortingDialog::_propertyChanged(const beans::PropertyChangeEvent& _r
     else
         fillColumns();
 }
-// -----------------------------------------------------------------------------
+
 void OGroupsSortingDialog::fillColumns()
 {
     m_xColumns = m_pController->getColumns();
     m_pFieldExpression->fillColumns(m_xColumns);
 }
-// -----------------------------------------------------------------------------
+
 void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _xGroup)
 {
     m_aHeaderLst.SelectEntryPos(_xGroup->getHeaderOn() ? 0 : 1 );
@@ -1340,7 +1340,7 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference<report::XGroup>& _x
         pControlsLst2[i]->SetReadOnly(bReadOnly);
     m_aGroupIntervalEd.SetReadOnly(bReadOnly);
 }
-//------------------------------------------------------------------------------
+
 void OGroupsSortingDialog::Resize()
 {
     Window::Resize();
@@ -1375,7 +1375,7 @@ void OGroupsSortingDialog::Resize()
     Point aHelpPos = m_aHelpWindow.GetPosPixel();
     m_aHelpWindow.SetSizePixel(Size(aTotalOutputSize.Width() - aHelpPos.X(),aTotalOutputSize.Height() - aHelpPos.Y()));
 }
-//------------------------------------------------------------------------------
+
 void OGroupsSortingDialog::checkButtons(sal_Int32 _nRow)
 {
     sal_Int32 nGroupCount = m_xGroups->getCount();
@@ -1419,7 +1419,7 @@ ImageList OGroupsSortingDialog::getImageList(sal_Int16 _eBitmapSet) const
     return ImageList(ModuleRes( nN ));
 }
 
-//------------------------------------------------------------------
+
 void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
 {
     // we use large images so we must change them
@@ -1429,7 +1429,7 @@ void OGroupsSortingDialog::resizeControls(const Size& _rDiff)
     }
 }
 
-//------------------------------------------------------------------
+
 // load the images
 ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType) SAL_THROW (( com::sun::star::lang::IllegalArgumentException ))
 {
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index 9e16f84ccd37..b551087dcc03 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -78,7 +78,7 @@ sal_uInt16 lcl_getImageId(const uno::Reference< report::XReportComponent>& _xEle
         nId = SID_DRAWTBX_CS_BASIC;
     return nId;
 }
-// -----------------------------------------------------------------------------
+
 OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement)
 {
     OSL_ENSURE(_xElement.is(),"Found report element which is NULL!");
@@ -103,7 +103,7 @@ OUString lcl_getName(const uno::Reference< beans::XPropertySet>& _xElement)
     }
     return sName.makeStringAndClear();
 }
-// -----------------------------------------------------------------------------
+
 
 class NavigatorTree :   public ::cppu::BaseMutex
                     ,   public SvTreeListBox
@@ -206,7 +206,7 @@ public:
 private:
     using SvTreeListBox::ExecuteDrop;
 };
-// -----------------------------------------------------------------------------
+
 NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
         :SvTreeListBox( pParent, WB_TABSTOP| WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL|WB_HASBUTTONSATROOT )
         ,comphelper::OSelectionChangeListener(m_aMutex)
@@ -244,7 +244,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController )
     SetSelectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
     SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
 }
-// -----------------------------------------------------------------------------
+
 NavigatorTree::~NavigatorTree()
 {
     SvTreeListEntry* pCurrent = First();
@@ -256,7 +256,7 @@ NavigatorTree::~NavigatorTree()
     m_pReportListener->dispose();
     m_pSelectionListener->dispose();
 }
-//------------------------------------------------------------------------------
+
 void NavigatorTree::Command( const CommandEvent& rEvt )
 {
     sal_Bool bHandled = sal_False;
@@ -340,7 +340,7 @@ void NavigatorTree::Command( const CommandEvent& rEvt )
     if (!bHandled)
         SvTreeListBox::Command( rEvt );
 }
-// -----------------------------------------------------------------------------
+
 sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
 {
     sal_Int8 nDropOption = DND_ACTION_NONE;
@@ -393,12 +393,12 @@ sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& _rEvt )
 
     return nDropOption;
 }
-// -------------------------------------------------------------------------
+
 sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& /*_rEvt*/ )
 {
     return DND_ACTION_NONE;
 }
-// -------------------------------------------------------------------------
+
 void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel )
 {
     m_pDragedEntry = GetEntry(_rPosPixel);
@@ -407,7 +407,7 @@ void NavigatorTree::StartDrag( sal_Int8 /*_nAction*/, const Point& _rPosPixel )
         EndSelection();
     }
 }
-//------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer)
 {
     if (--m_nTimerCounter > 0)
@@ -444,7 +444,7 @@ IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer)
     return 0L;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/)
 {
     if ( !m_pSelectionListener->locked() )
@@ -460,7 +460,7 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/)
 
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException)
 {
     m_pSelectionListener->lock();
@@ -496,7 +496,7 @@ void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (
     }
     m_pSelectionListener->unlock();
 }
-// -----------------------------------------------------------------------------
+
 SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition,UserData* _pData)
 {
     SvTreeListEntry* pEntry = NULL;
@@ -509,7 +509,7 @@ SvTreeListEntry* NavigatorTree::insertEntry(const OUString& _sName,SvTreeListEnt
         pEntry = InsertEntry(_sName,_pParent,sal_False,_nPosition,_pData);
     return pEntry;
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xSection,SvTreeListEntry* _pParent,sal_uInt16 _nImageId,sal_uLong _nPosition)
 {
     SvTreeListEntry* pSection = insertEntry(_xSection->getName(),_pParent,_nImageId,_nPosition,new UserData(this,_xSection));
@@ -528,7 +528,7 @@ void NavigatorTree::traverseSection(const uno::Reference< report::XSection>& _xS
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>& _xFunctions,SvTreeListEntry* _pParent)
 {
     SvTreeListEntry* pFunctions = insertEntry(OUString(ModuleRes(RID_STR_FUNCTIONS)), _pParent, SID_RPT_NEW_FUNCTION, LIST_APPEND, new UserData(this,_xFunctions));
@@ -539,7 +539,7 @@ void NavigatorTree::traverseFunctions(const uno::Reference< report::XFunctions>&
         insertEntry(xElement->getName(),pFunctions,SID_RPT_NEW_FUNCTION,LIST_APPEND,new UserData(this,xElement));
     }
 }
-// -----------------------------------------------------------------------------
+
 SvTreeListEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _xContent)
 {
     SvTreeListEntry* pRet = NULL;
@@ -560,50 +560,50 @@ SvTreeListEntry* NavigatorTree::find(const uno::Reference< uno::XInterface >& _x
     }
     return pRet;
 }
-// -----------------------------------------------------------------------------
+
 // ITraverseReport
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseReport(const uno::Reference< report::XReportDefinition>& _xReport)
 {
     insertEntry(_xReport->getName(),m_pMasterReport,SID_SELECT_REPORT,LIST_APPEND,new UserData(this,_xReport));
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseReportFunctions(const uno::Reference< report::XFunctions>& _xFunctions)
 {
     SvTreeListEntry* pReport = find(_xFunctions->getParent());
     traverseFunctions(_xFunctions,pReport);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseReportHeader(const uno::Reference< report::XSection>& _xSection)
 {
     SvTreeListEntry* pReport = find(_xSection->getReportDefinition());
     traverseSection(_xSection,pReport,SID_REPORTHEADERFOOTER);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseReportFooter(const uno::Reference< report::XSection>& _xSection)
 {
     SvTreeListEntry* pReport = find(_xSection->getReportDefinition());
     traverseSection(_xSection,pReport,SID_REPORTHEADERFOOTER);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traversePageHeader(const uno::Reference< report::XSection>& _xSection)
 {
     SvTreeListEntry* pReport = find(_xSection->getReportDefinition());
     traverseSection(_xSection,pReport,SID_PAGEHEADERFOOTER);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traversePageFooter(const uno::Reference< report::XSection>& _xSection)
 {
     SvTreeListEntry* pReport = find(_xSection->getReportDefinition());
     traverseSection(_xSection,pReport,SID_PAGEHEADERFOOTER);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseGroups(const uno::Reference< report::XGroups>& _xGroups)
 {
     SvTreeListEntry* pReport = find(_xGroups->getReportDefinition());
     insertEntry(OUString(ModuleRes(RID_STR_GROUPS)), pReport, SID_SORTINGANDGROUPING, LIST_APPEND, new UserData(this,_xGroups));
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup)
 {
     uno::Reference< report::XGroups> xGroups(_xGroup->getParent(),uno::UNO_QUERY);
@@ -611,34 +611,34 @@ void NavigatorTree::traverseGroup(const uno::Reference< report::XGroup>& _xGroup
     OSL_ENSURE(pGroups,"No Groups inserted so far. Why!");
     insertEntry(_xGroup->getExpression(),pGroups,SID_GROUP,rptui::getPositionInIndexAccess(xGroups.get(),_xGroup),new UserData(this,_xGroup));
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseGroupFunctions(const uno::Reference< report::XFunctions>& _xFunctions)
 {
     SvTreeListEntry* pGroup = find(_xFunctions->getParent());
     traverseFunctions(_xFunctions,pGroup);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseGroupHeader(const uno::Reference< report::XSection>& _xSection)
 {
     SvTreeListEntry* pGroup = find(_xSection->getGroup());
     OSL_ENSURE(pGroup,"No group found");
     traverseSection(_xSection,pGroup,SID_GROUPHEADER,1);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseGroupFooter(const uno::Reference< report::XSection>& _xSection)
 {
     SvTreeListEntry* pGroup = find(_xSection->getGroup());
     OSL_ENSURE(pGroup,"No group found");
     traverseSection(_xSection,pGroup,SID_GROUPFOOTER);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::traverseDetail(const uno::Reference< report::XSection>& _xSection)
 {
     uno::Reference< report::XReportDefinition> xReport = _xSection->getReportDefinition();
     SvTreeListEntry* pParent = find(xReport);
     traverseSection(_xSection,pParent,SID_ICON_DETAIL);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
 {
     uno::Reference< report::XReportDefinition> xReport(_rEvent.Source,uno::UNO_QUERY);
@@ -668,7 +668,7 @@ void NavigatorTree::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent )
 {
     SvTreeListEntry* pEntry = find(_rEvent.Source);
@@ -698,7 +698,7 @@ void NavigatorTree::_elementInserted( const container::ContainerEvent& _rEvent )
     if ( !IsExpanded(pEntry) )
         Expand(pEntry);
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::_elementRemoved( const container::ContainerEvent& _rEvent )
 {
     uno::Reference<beans::XPropertySet> xProp(_rEvent.Element,uno::UNO_QUERY);
@@ -712,7 +712,7 @@ void NavigatorTree::_elementRemoved( const container::ContainerEvent& _rEvent )
         PaintEntry(pParent);
     }
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent )
 {
     uno::Reference<beans::XPropertySet> xProp(_rEvent.ReplacedElement,uno::UNO_QUERY);
@@ -727,12 +727,12 @@ void NavigatorTree::_elementReplaced( const container::ContainerEvent& _rEvent )
         SetEntryText(pEntry,sName);
     }
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::_disposing(const lang::EventObject& _rSource)throw( uno::RuntimeException)
 {
     removeEntry(find(_rSource.Source));
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::removeEntry(SvTreeListEntry* _pEntry,bool _bRemove)
 {
     if ( _pEntry )
@@ -748,7 +748,7 @@ void NavigatorTree::removeEntry(SvTreeListEntry* _pEntry,bool _bRemove)
             GetModel()->Remove(_pEntry);
     }
 }
-// -----------------------------------------------------------------------------
+
 NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno::XInterface>& _xContent)
     : OPropertyChangeListener(m_aMutex)
     , OContainerListener(m_aMutex)
@@ -782,7 +782,7 @@ NavigatorTree::UserData::UserData(NavigatorTree* _pTree,const uno::Reference<uno
         m_pContainerListener = new ::comphelper::OContainerListenerAdapter(this,xContainer);
     }
 }
-// -----------------------------------------------------------------------------
+
 NavigatorTree::UserData::~UserData()
 {
     if ( m_pContainerListener.is() )
@@ -790,7 +790,7 @@ NavigatorTree::UserData::~UserData()
     if ( m_pListener.is() )
         m_pListener->dispose();
 }
-// -----------------------------------------------------------------------------
+
 // OPropertyChangeListener
 void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
 {
@@ -835,29 +835,29 @@ void NavigatorTree::UserData::_propertyChanged(const beans::PropertyChangeEvent&
     catch(const uno::Exception &)
     {}
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::UserData::_elementInserted( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException)
 {
     m_pTree->_elementInserted( _rEvent );
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::UserData::_elementRemoved( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException)
 {
     m_pTree->_elementRemoved( _rEvent );
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::UserData::_elementReplaced( const container::ContainerEvent& _rEvent ) throw(uno::RuntimeException)
 {
     m_pTree->_elementReplaced( _rEvent );
 }
-// -----------------------------------------------------------------------------
+
 void NavigatorTree::UserData::_disposing(const lang::EventObject& _rSource) throw( uno::RuntimeException)
 {
     m_pTree->_disposing( _rSource );
 }
-// -----------------------------------------------------------------------------
+
 // class ONavigatorImpl
-// -----------------------------------------------------------------------------
+
 class ONavigatorImpl
 {
     ONavigatorImpl(const ONavigatorImpl&);
@@ -882,11 +882,11 @@ ONavigatorImpl::ONavigatorImpl(OReportController& _rController,ONavigator* _pPar
     lang::EventObject aEvent(m_rController);
     m_pNavigatorTree->_selectionChanged(aEvent);
 }
-//------------------------------------------------------------------------
+
 ONavigatorImpl::~ONavigatorImpl()
 {
 }
-// -----------------------------------------------------------------------------
+
 const long STD_WIN_SIZE_X = 210;
 const long STD_WIN_SIZE_Y = 280;
 const long LISTBOX_BORDER = 2;
@@ -907,13 +907,13 @@ ONavigator::ONavigator( Window* _pParent
     Show();
 
 }
-// -----------------------------------------------------------------------------
 
-//------------------------------------------------------------------------
+
+
 ONavigator::~ONavigator()
 {
 }
-//------------------------------------------------------------------------------
+
 void ONavigator::Resize()
 {
     FloatingWindow::Resize();
@@ -930,8 +930,8 @@ void ONavigator::Resize()
 
     m_pImpl->m_pNavigatorTree->SetPosSizePixel( aLBPos, aLBSize );
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 void ONavigator::GetFocus()
 {
     Window::GetFocus();
diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx
index eb3b3f06919a..c5aa2e5a958c 100644
--- a/reportdesign/source/ui/dlg/PageNumber.cxx
+++ b/reportdesign/source/ui/dlg/PageNumber.cxx
@@ -60,11 +60,11 @@ OPageNumberDialog::OPageNumberDialog( Window* _pParent
 
 }
 
-//------------------------------------------------------------------------
+
 OPageNumberDialog::~OPageNumberDialog()
 {
 }
-// -----------------------------------------------------------------------------
+
 short OPageNumberDialog::Execute()
 {
     short nRet = ModalDialog::Execute();
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 8cef137d0ed3..ca9807bbabb5 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -226,7 +226,7 @@ void SAL_CALL DataProviderHandler::setPropertyValue(const OUString & PropertyNam
             break;
     }
 }
-// -----------------------------------------------------------------------------
+
 void DataProviderHandler::impl_updateChartTitle_throw(const uno::Any& _aValue)
 {
     uno::Reference<chart2::XTitled> xTitled(m_xChartModel,uno::UNO_QUERY);
@@ -516,7 +516,7 @@ bool DataProviderHandler::impl_dialogLinkedFields_nothrow( ::osl::ClearableMutex
     _rClearBeforeDialog.clear();
     return ( xDialog->execute() != 0 );
 }
-// -----------------------------------------------------------------------------
+
 bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
 {
     uno::Sequence<uno::Any> aSeq(2);
diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx
index d058364123c7..c4156bac2bc6 100644
--- a/reportdesign/source/ui/inspection/DefaultInspection.cxx
+++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx
@@ -50,7 +50,7 @@ namespace rptui
     //====================================================================
     //= DefaultComponentInspectorModel
     //====================================================================
-    //--------------------------------------------------------------------
+
     DefaultComponentInspectorModel::DefaultComponentInspectorModel( const Reference< XComponentContext >& _rxContext)
         :m_xContext( _rxContext )
         ,m_bConstructed( false )
@@ -98,7 +98,7 @@ namespace rptui
         return *(new DefaultComponentInspectorModel( _rxContext ));
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Any > SAL_CALL DefaultComponentInspectorModel::getHandlerFactories() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -129,39 +129,39 @@ namespace rptui
 
         return aReturn;
     }
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL DefaultComponentInspectorModel::getHasHelpSection() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_bHasHelpSection;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMinHelpTextLines() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_nMinHelpTextLines;
     }
-    //--------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL DefaultComponentInspectorModel::getIsReadOnly() throw (::com::sun::star::uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_bIsReadOnly;
     }
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultComponentInspectorModel::setIsReadOnly( ::sal_Bool _isreadonly ) throw (::com::sun::star::uno::RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         m_bIsReadOnly = _isreadonly;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getMaxHelpTextLines() throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
         return m_nMaxHelpTextLines;
     }
-    //--------------------------------------------------------------------
+
     void SAL_CALL DefaultComponentInspectorModel::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
@@ -186,12 +186,12 @@ namespace rptui
         throw lang::IllegalArgumentException( OUString(), *this, 0 );
     }
 
-    //--------------------------------------------------------------------
+
     void DefaultComponentInspectorModel::createDefault()
     {
         m_bConstructed = true;
     }
-    //--------------------------------------------------------------------
+
     void DefaultComponentInspectorModel::createWithHelpSection( sal_Int32 _nMinHelpTextLines, sal_Int32 _nMaxHelpTextLines )
     {
         if ( ( _nMinHelpTextLines <= 0 ) || ( _nMaxHelpTextLines <= 0 ) || ( _nMinHelpTextLines > _nMaxHelpTextLines ) )
@@ -202,7 +202,7 @@ namespace rptui
         m_nMaxHelpTextLines = _nMaxHelpTextLines;
         m_bConstructed = true;
     }
-    //--------------------------------------------------------------------
+
     Sequence< PropertyCategoryDescriptor > SAL_CALL DefaultComponentInspectorModel::describeCategories(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -230,7 +230,7 @@ namespace rptui
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultComponentInspectorModel::getPropertyOrderIndex( const OUString& _rPropertyName ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard(m_aMutex);
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index ec3ef752847f..3ac307067e5e 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -128,17 +128,17 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin
     }
 };
 
-// -----------------------------------------------------------------------------
+
 OUString lcl_getQuotedFunctionName(const OUString& _sFunction)
 {
     return "[" + _sFunction + "]";
 }
-// -----------------------------------------------------------------------------
+
 OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction)
 {
     return lcl_getQuotedFunctionName(_xFunction->getName());
 }
-// -----------------------------------------------------------------------------
+
 void lcl_collectFunctionNames(const uno::Reference< report::XFunctions>& _xFunctions,TFunctions& _rFunctionNames)
 {
     uno::Reference< report::XFunctionsSupplier> xParent(_xFunctions->getParent(),uno::UNO_QUERY_THROW);
@@ -149,7 +149,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XFunctions>& _xFunct
         _rFunctionNames.insert(TFunctions::value_type(lcl_getQuotedFunctionName(xFunction),TFunctionPair(xFunction,xParent)));
     }
 }
-// -----------------------------------------------------------------------------
+
 void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection,TFunctions& _rFunctionNames)
 {
     const uno::Reference< report::XReportDefinition> xReportDefinition = _xSection->getReportDefinition();
@@ -168,7 +168,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection
     }
     lcl_collectFunctionNames(xReportDefinition->getFunctions(),_rFunctionNames);
 }
-// -----------------------------------------------------------------------------
+
 void lcl_convertFormulaTo(const uno::Any& _aPropertyValue,uno::Any& _rControlValue)
 {
     OUString sName;
@@ -196,7 +196,7 @@ template <typename T, T base> T lcl_round(T value)
 }
 
 } // anonymous namespace
-// -----------------------------------------------------------------------------
+
 bool GeometryHandler::impl_isDataField(const OUString& _sName) const
 {
     const OUString* pEnd = m_aFieldNames.getConstArray() + m_aFieldNames.getLength();
@@ -209,7 +209,7 @@ bool GeometryHandler::impl_isDataField(const OUString& _sName) const
     }
     return bIsField;
 }
-// -----------------------------------------------------------------------------
+
 OUString GeometryHandler::impl_convertToFormula( const uno::Any& _rControlValue )
 {
     OUString sName;
@@ -243,11 +243,11 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
     {
     }
 }
-// -----------------------------------------------------------------------------
+
 GeometryHandler::~GeometryHandler()
 {
 }
-//------------------------------------------------------------------------
+
 OUString SAL_CALL GeometryHandler::getImplementationName(  ) throw(uno::RuntimeException)
 {
     return getImplementationName_Static();
@@ -666,13 +666,13 @@ void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, c
         m_xReportComponent->setPropertyValue(PropertyName, aNewValue);
 }
 
-// -----------------------------------------------------------------------------
+
 beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_xFormComponentHandler->getPropertyState(PropertyName);
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::implCreateListLikeControl(
         const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
         ,inspection::LineDescriptor & out_Descriptor
@@ -686,7 +686,7 @@ void GeometryHandler::implCreateListLikeControl(
 
     implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox);
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::implCreateListLikeControl(
         const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
         ,inspection::LineDescriptor & out_Descriptor
@@ -705,7 +705,7 @@ void GeometryHandler::implCreateListLikeControl(
     out_Descriptor.Control = xListControl.get();
     ::std::for_each( _aEntries.begin(), _aEntries.end(),::boost::bind( &inspection::XStringListControl::appendListEntry, xListControl,_1 ));
 }
-// -----------------------------------------------------------------------------
+
 
 inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException)
 {
@@ -914,7 +914,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
     }
     return aOut;
 }
-// -----------------------------------------------------------------------------
+
 beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
 {
     uno::Sequence< beans::Property > aProps = getSupportedProperties();
@@ -1260,8 +1260,8 @@ void SAL_CALL GeometryHandler::removePropertyChangeListener(const uno::Reference
     m_aPropertyListeners.removeListener( _rxListener );
     m_xFormComponentHandler->removePropertyChangeListener(_rxListener);
 }
-// -----------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedProperties() throw (uno::RuntimeException)
 {
     ::std::vector< beans::Property > aNewProps;
@@ -1544,7 +1544,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & Actuati
 {
     return m_xFormComponentHandler->suspend(Suspend);
 }
-// -----------------------------------------------------------------------------
+
 bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
 {
     _out_rSelectedClause = "";
@@ -1601,7 +1601,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause,
 
     return bSuccess;
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::checkPosAndSize(  const awt::Point& _aNewPos,
                                     const awt::Size& _aSize)
 {
@@ -1629,7 +1629,7 @@ void GeometryHandler::checkPosAndSize(  const awt::Point& _aNewPos,
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _out_rList) const
 {
     if ( m_nDataFieldType == FUNCTION )
@@ -1637,7 +1637,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _o
     else if ( m_nDataFieldType == USER_DEF_FUNCTION )
         ::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>());
 }
-// -----------------------------------------------------------------------------
+
 OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const
 {
     ::std::vector< OUString > aList;
@@ -1656,7 +1656,7 @@ OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIN
     }
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMimetype) const
 {
     ::comphelper::MimeConfigurationHelper aMimeHelper(m_xContext);
@@ -1668,7 +1668,7 @@ OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMim
         sRet = _sMimetype;
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out_rList) const
 {
     try
@@ -1692,7 +1692,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out
         OSL_FAIL("Exception caught!");
     }
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out_rList) const
 {
     try
@@ -1723,7 +1723,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out
         OSL_FAIL("Exception caught!");
     }
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUString& _rsNamePostFix)
 {
     uno::Reference< report::XFunctionsSupplier> xReturn;
@@ -1787,7 +1787,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUS
 
     return xReturn;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
                                             ,OUString& _rDataField
                                             ,const uno::Reference< report::XFunctionsSupplier>& _xFunctionsSupplier
@@ -1838,7 +1838,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
     }
     return bDefaultFunction;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< report::XFunction>& _xFunction
                                             ,OUString& _rDataField
                                             ,OUString& _rsDefaultFunctionName) const
@@ -1878,7 +1878,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
     }
     return bDefaultFunction;
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::loadDefaultFunctions()
 {
     if ( m_aDefaultFunctions.empty() )
@@ -1918,7 +1918,7 @@ void GeometryHandler::loadDefaultFunctions()
         m_aDefaultFunctions.push_back(aDefault);
     }
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField)
 {
     try
@@ -1968,7 +1968,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard
         OSL_FAIL("Exception caught!");
     }
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::removeFunction()
 {
     if ( m_xFunction.is() )
@@ -1989,7 +1989,7 @@ void GeometryHandler::removeFunction()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const OUString& _sOldFunctionName,const OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType)
 {
     const OUString sNewFunction = m_sDefaultFunction;
@@ -2024,7 +2024,7 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co
 
     _aGuard.reset();
 }
-//------------------------------------------------------------------------
+
 void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rFieldNames ) const
 {
     _rFieldNames.realloc(0);
@@ -2058,7 +2058,7 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rF
         OSL_FAIL( "GeometryHandler::impl_initFieldList_nothrow: caught an exception!" );
     }
 }
-// -----------------------------------------------------------------------------
+
 bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunctionName,OUString& _Out_sScope) const
 {
     ::std::pair<TFunctions::const_iterator,TFunctions::const_iterator> aFind = m_aFunctionNames.equal_range(_sQuotedFunctionName);
@@ -2092,7 +2092,7 @@ bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunct
     }
     return aFind.first != aFind.second;
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const OUString& _sDataField,const DefaultFunction& _aFunction)
 {
     if ( m_bNewFunction )
@@ -2127,7 +2127,7 @@ void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const O
     m_aFunctionNames.insert(TFunctions::value_type(sQuotedFunctionName,TFunctionPair(m_xFunction,xFunctionsSupplier)));
     m_bNewFunction = true;
 }
-// -----------------------------------------------------------------------------
+
 void GeometryHandler::impl_setCounterFunction_throw()
 {
     OUString sNamePostFix;
@@ -2142,7 +2142,7 @@ void GeometryHandler::impl_setCounterFunction_throw()
     OBlocker aBlocker(m_bIn);
     m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula( uno::makeAny(sQuotedFunctionName))));
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString& _sDataField) const
 {
     sal_uInt32 nDataFieldType = UNDEF_DATA;
@@ -2174,7 +2174,7 @@ sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString& _sDataFi
     }
     return nDataFieldType;
 }
-// -----------------------------------------------------------------------------
+
 // XEventListener
 void SAL_CALL GeometryHandler::disposing(const lang::EventObject& ) throw( uno::RuntimeException )
 {
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index eeb786d59bf8..b20c8a9300d6 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -54,7 +54,7 @@ namespace rptui
                         sal_uInt32             _nUIFlags);
     };
 
-    //------------------------------------------------------------------------
+
     OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId,
                                    const OUString& aString, const OString& sHid, sal_uInt32 _nUIFlags)
        :sName(_rName)
@@ -65,7 +65,7 @@ namespace rptui
     {
     }
 
-    //------------------------------------------------------------------------
+
     // Vergleichen von PropertyInfo
     struct PropertyInfoLessByName : public ::std::binary_function< OPropertyInfoImpl, OPropertyInfoImpl, bool >
     {
@@ -90,7 +90,7 @@ namespace rptui
 
     sal_uInt16              OPropertyInfoService::s_nCount = 0;
     OPropertyInfoImpl*      OPropertyInfoService::s_pPropertyInfos = NULL;
-    //------------------------------------------------------------------------
+
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo()
     {
         if ( s_pPropertyInfos )
@@ -155,35 +155,35 @@ namespace rptui
         return s_pPropertyInfos;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int32 OPropertyInfoService::getPropertyId(const OUString& _rName) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_rName);
         return pInfo ? pInfo->nId : -1;
     }
 
-    //------------------------------------------------------------------------
+
     OUString OPropertyInfoService::getPropertyTranslation(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->sTranslation : OUString();
     }
 
-    //------------------------------------------------------------------------
+
     OString OPropertyInfoService::getPropertyHelpId(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->sHelpId : OString();
     }
 
-    //------------------------------------------------------------------------
+
     sal_uInt32 OPropertyInfoService::getPropertyUIFlags(sal_Int32 _nId) const
     {
         const OPropertyInfoImpl* pInfo = getPropertyInfo(_nId);
         return (pInfo) ? pInfo->nUIFlags : 0;
     }
 
-    //------------------------------------------------------------------------
+
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(const OUString& _rName)
     {
         // intialisierung
@@ -201,7 +201,7 @@ namespace rptui
     }
 
 
-    //------------------------------------------------------------------------
+
     const OPropertyInfoImpl* OPropertyInfoService::getPropertyInfo(sal_Int32 _nId)
     {
         // intialisierung
@@ -216,7 +216,7 @@ namespace rptui
         return NULL;
     }
 
-    //------------------------------------------------------------------------
+
     bool OPropertyInfoService::isComposable( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxFormComponentHandler )
     {
         sal_Int32 nId = getPropertyId( _rPropertyName );
@@ -229,7 +229,7 @@ namespace rptui
         return _rxFormComponentHandler->isComposable( _rPropertyName );
     }
 
-    //------------------------------------------------------------------------
+
     void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler)
     {
         uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties();
diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx
index d37137cf072f..3e4f4d2384a1 100644
--- a/reportdesign/source/ui/misc/ColorListener.cxx
+++ b/reportdesign/source/ui/misc/ColorListener.cxx
@@ -37,12 +37,12 @@ OColorListener::OColorListener(Window* _pParent ,const OUString& _sColorEntry)
     m_nColor = m_aExtendedColorConfig.GetColorValue(CFG_REPORTDESIGNER,m_sColorEntry).getColor();
     m_nTextBoundaries = m_aColorConfig.GetColorValue(::svtools::DOCBOUNDARIES).nColor;
 }
-// -----------------------------------------------------------------------------
+
 OColorListener::~OColorListener()
 {
     EndListening(m_aExtendedColorConfig);
 }
-// -----------------------------------------------------------------------
+
 void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint)
 {
     if (rHint.ISA(SfxSimpleHint)
@@ -54,7 +54,7 @@ void OColorListener::Notify(SfxBroadcaster & /*rBc*/, SfxHint const & rHint)
         Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_NOERASE);
     }
 }
-//-----------------------------------------------------------------------------
+
 void OColorListener::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -66,7 +66,7 @@ void OColorListener::DataChanged( const DataChangedEvent& rDCEvt )
         Invalidate();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OColorListener::setCollapsed(sal_Bool _bCollapsed)
 {
     if ( m_bCollapsed != _bCollapsed )
@@ -76,7 +76,7 @@ void OColorListener::setCollapsed(sal_Bool _bCollapsed)
             m_aCollapsedLink.Call(this);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OColorListener::setMarked(sal_Bool _bMark)
 {
     if ( m_bMarked != _bMark)
diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 59bb0bba9b32..f82c130cfebb 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -50,12 +50,12 @@ sal_Unicode FunctionManager::getSingleToken(const formula::IFunctionManager::ETo
     }
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 FunctionManager::getCount() const
 {
     return m_xMgr->getCount();
 }
-// -----------------------------------------------------------------------------
+
 const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos) const
 {
     if ( _nPos >= m_aCategoryIndex.size() )
@@ -66,7 +66,7 @@ const formula::IFunctionCategory* FunctionManager::getCategory(sal_uInt32 _nPos)
     }
     return m_aCategoryIndex[_nPos]->second.get();
 }
-// -----------------------------------------------------------------------------
+
 const formula::IFunctionDescription* FunctionManager::getFunctionByName(const OUString& _sFunctionName) const
 {
     const formula::IFunctionDescription* pDesc = NULL;
@@ -79,11 +79,11 @@ const formula::IFunctionDescription* FunctionManager::getFunctionByName(const OU
     }
     return pDesc;
 }
-// -----------------------------------------------------------------------------
+
 void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& /*_rLastRUFunctions*/) const
 {
 }
-// -----------------------------------------------------------------------------
+
 ::boost::shared_ptr< FunctionDescription > FunctionManager::get(const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription) const
 {
     ::boost::shared_ptr< FunctionDescription > pDesc;
@@ -107,7 +107,7 @@ void FunctionManager::fillLastRecentlyUsedFunctions(::std::vector< const formula
     }
     return pDesc;
 }
-// -----------------------------------------------------------------------------
+
 FunctionCategory::FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPos,const uno::Reference< report::meta::XFunctionCategory>& _xCategory)
 : m_xCategory(_xCategory)
 ,m_nFunctionCount(_xCategory->getCount())
@@ -115,12 +115,12 @@ FunctionCategory::FunctionCategory(const FunctionManager* _pFMgr,sal_uInt32 _nPo
 ,m_pFunctionManager(_pFMgr)
 {
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 FunctionCategory::getCount() const
 {
     return m_nFunctionCount;
 }
-// -----------------------------------------------------------------------------
+
 const formula::IFunctionDescription* FunctionCategory::getFunction(sal_uInt32 _nPos) const
 {
     if ( _nPos >= m_aFunctions.size() && _nPos < m_nFunctionCount )
@@ -131,22 +131,22 @@ const formula::IFunctionDescription* FunctionCategory::getFunction(sal_uInt32 _n
     }
     return m_aFunctions[_nPos].get();
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 FunctionCategory::getNumber() const
 {
     return m_nNumber;
 }
-// -----------------------------------------------------------------------------
+
 const formula::IFunctionManager* FunctionCategory::getFunctionManager() const
 {
     return m_pFunctionManager;
 }
-// -----------------------------------------------------------------------------
+
 OUString FunctionCategory::getName() const
 {
     return m_xCategory->getName();
 }
-// -----------------------------------------------------------------------------
+
 FunctionDescription::FunctionDescription(const formula::IFunctionCategory* _pFunctionCategory,const uno::Reference< report::meta::XFunctionDescription>& _xFunctionDescription)
 : m_xFunctionDescription(_xFunctionDescription)
 , m_pFunctionCategory(_pFunctionCategory)
@@ -157,22 +157,22 @@ OUString FunctionDescription::getFunctionName() const
 {
     return m_xFunctionDescription->getName();
 }
-// -----------------------------------------------------------------------------
+
 const formula::IFunctionCategory* FunctionDescription::getCategory() const
 {
     return m_pFunctionCategory;
 }
-// -----------------------------------------------------------------------------
+
 OUString FunctionDescription::getDescription() const
 {
     return m_xFunctionDescription->getDescription();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 FunctionDescription::getSuppressedArgumentCount() const
 {
     return m_aParameter.getLength();
 }
-// -----------------------------------------------------------------------------
+
 OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArguments) const
 {
     OUString sFormula;
@@ -187,7 +187,7 @@ OUString FunctionDescription::getFormula(const ::std::vector< OUString >& _aArgu
     }
     return sFormula;
 }
-// -----------------------------------------------------------------------------
+
 void FunctionDescription::fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const
 {
     const sal_Int32 nCount = m_aParameter.getLength();
@@ -196,47 +196,47 @@ void FunctionDescription::fillVisibleArgumentMapping(::std::vector<sal_uInt16>&
         _rArguments.push_back(i);
     }
 }
-// -----------------------------------------------------------------------------
+
 void FunctionDescription::initArgumentInfo()  const
 {
 }
-// -----------------------------------------------------------------------------
+
 OUString FunctionDescription::getSignature() const
 {
     return m_xFunctionDescription->getSignature();
 }
-// -----------------------------------------------------------------------------
+
 OString FunctionDescription::getHelpId() const
 {
     return OString();
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 FunctionDescription::getParameterCount() const
 {
     return m_aParameter.getLength();
 }
-// -----------------------------------------------------------------------------
+
 OUString FunctionDescription::getParameterName(sal_uInt32 _nPos) const
 {
     if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) )
         return m_aParameter[_nPos].Name;
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 OUString FunctionDescription::getParameterDescription(sal_uInt32 _nPos) const
 {
     if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) )
         return m_aParameter[_nPos].Description;
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const
 {
     if ( _nPos < static_cast<sal_uInt32>(m_aParameter.getLength()) )
         return m_aParameter[_nPos].IsOptional;
     return false;
 }
-// -----------------------------------------------------------------------------
+
 // =============================================================================
 } // rptui
 // =============================================================================
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx
index 887d945d0063..034d26fccac1 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -46,7 +46,7 @@ namespace rptui
     using namespace container;
     using namespace report;
 
-//----------------------------------------------------------------------------
+
 namespace
 {
     void lcl_collectElements(const uno::Reference< report::XSection >& _xSection,::std::vector< uno::Reference< drawing::XShape> >& _rControls)
@@ -64,7 +64,7 @@ namespace
             }
         }
     }
-    //----------------------------------------------------------------------------
+
     void lcl_insertElements(const uno::Reference< report::XSection >& _xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls)
     {
         if ( _xSection.is() )
@@ -88,7 +88,7 @@ namespace
             }
         }
     }
-    //----------------------------------------------------------------------------
+
     void lcl_setValues(const uno::Reference< report::XSection >& _xSection,const ::std::vector< ::std::pair< OUString ,uno::Any> >& _aValues)
     {
         if ( _xSection.is() )
@@ -109,9 +109,9 @@ namespace
         }
     }
 }
-//----------------------------------------------------------------------------
+
 TYPEINIT1( OSectionUndo,         OCommentUndoAction );
-//----------------------------------------------------------------------------
+
 OSectionUndo::OSectionUndo(OReportModel& _rMod
                            ,sal_uInt16 _nSlot
                            ,Action _eAction
@@ -122,7 +122,7 @@ OSectionUndo::OSectionUndo(OReportModel& _rMod
 ,m_bInserted(false)
 {
 }
-// -----------------------------------------------------------------------------
+
 OSectionUndo::~OSectionUndo()
 {
     if ( !m_bInserted )
@@ -151,7 +151,7 @@ OSectionUndo::~OSectionUndo()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xSection)
 {
     m_aControls.clear();
@@ -173,7 +173,7 @@ void OSectionUndo::collectControls(const uno::Reference< report::XSection >& _xS
     {
     }
 }
-//----------------------------------------------------------------------------
+
 void OSectionUndo::Undo()
 {
     try
@@ -194,7 +194,7 @@ void OSectionUndo::Undo()
         OSL_FAIL( "OSectionUndo::Undo: caught an exception!" );
     }
 }
-//----------------------------------------------------------------------------
+
 void OSectionUndo::Redo()
 {
     try
@@ -215,9 +215,9 @@ void OSectionUndo::Redo()
         OSL_FAIL( "OSectionUndo::Redo: caught an exception!" );
     }
 }
-//----------------------------------------------------------------------------
+
 TYPEINIT1( OReportSectionUndo,         OSectionUndo );
-//----------------------------------------------------------------------------
+
 OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
                                        ,::std::mem_fun_t< uno::Reference< report::XSection >
                                             ,OReportHelper> _pMemberFunction
@@ -231,11 +231,11 @@ OReportSectionUndo::OReportSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
     if( m_eAction == Removed )
         collectControls(m_pMemberFunction(&m_aReportHelper));
 }
-// -----------------------------------------------------------------------------
+
 OReportSectionUndo::~OReportSectionUndo()
 {
 }
-//----------------------------------------------------------------------------
+
 void OReportSectionUndo::implReInsert( )
 {
     const uno::Sequence< beans::PropertyValue > aArgs;
@@ -245,7 +245,7 @@ void OReportSectionUndo::implReInsert( )
     lcl_setValues(xSection,m_aValues);
     m_bInserted = true;
 }
-//----------------------------------------------------------------------------
+
 void OReportSectionUndo::implReRemove( )
 {
     if( m_eAction == Removed )
@@ -254,9 +254,9 @@ void OReportSectionUndo::implReRemove( )
     m_pController->executeChecked(m_nSlot,aArgs);
     m_bInserted = false;
 }
-//----------------------------------------------------------------------------
+
 TYPEINIT1( OGroupSectionUndo,         OSectionUndo );
-//----------------------------------------------------------------------------
+
 OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
                                        ,::std::mem_fun_t< uno::Reference< report::XSection >
                                             ,OGroupHelper> _pMemberFunction
@@ -275,7 +275,7 @@ OGroupSectionUndo::OGroupSectionUndo(OReportModel& _rMod,sal_uInt16 _nSlot
         collectControls(xSection);
     }
 }
-//----------------------------------------------------------------------------
+
 OUString OGroupSectionUndo::GetComment() const
 {
     if ( m_sName.isEmpty() )
@@ -293,7 +293,7 @@ OUString OGroupSectionUndo::GetComment() const
     }
     return m_strComment + m_sName;
 }
-//----------------------------------------------------------------------------
+
 void OGroupSectionUndo::implReInsert( )
 {
     uno::Sequence< beans::PropertyValue > aArgs(2);
@@ -309,7 +309,7 @@ void OGroupSectionUndo::implReInsert( )
     lcl_setValues(xSection,m_aValues);
     m_bInserted = true;
 }
-//----------------------------------------------------------------------------
+
 void OGroupSectionUndo::implReRemove( )
 {
     if( m_eAction == Removed )
@@ -325,9 +325,9 @@ void OGroupSectionUndo::implReRemove( )
     m_pController->executeChecked(m_nSlot,aArgs);
     m_bInserted = false;
 }
-//----------------------------------------------------------------------------
+
 TYPEINIT1( OGroupUndo,         OCommentUndoAction );
-//----------------------------------------------------------------------------
+
 OGroupUndo::OGroupUndo(OReportModel& _rMod
                        ,sal_uInt16 nCommentID
                        ,Action  _eAction
@@ -340,7 +340,7 @@ OGroupUndo::OGroupUndo(OReportModel& _rMod
 {
     m_nLastPosition = getPositionInIndexAccess(m_xReportDefinition->getGroups().get(),m_xGroup);
 }
-//----------------------------------------------------------------------------
+
 void OGroupUndo::implReInsert( )
 {
     try
@@ -352,7 +352,7 @@ void OGroupUndo::implReInsert( )
         OSL_FAIL("Exception catched while undoing remove group");
     }
 }
-//----------------------------------------------------------------------------
+
 void OGroupUndo::implReRemove( )
 {
     try
@@ -364,7 +364,7 @@ void OGroupUndo::implReRemove( )
         OSL_FAIL("Exception catched while redoing remove group");
     }
 }
-//----------------------------------------------------------------------------
+
 void OGroupUndo::Undo()
 {
     switch ( m_eAction )
@@ -379,7 +379,7 @@ void OGroupUndo::Undo()
     }
 
 }
-//----------------------------------------------------------------------------
+
 void OGroupUndo::Redo()
 {
     switch ( m_eAction )
@@ -393,7 +393,7 @@ void OGroupUndo::Redo()
         break;
     }
 }
-//----------------------------------------------------------------------------
+
 //============================================================================
 } // rptui
 //============================================================================
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 12895e4478f1..2ac3787e315b 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -156,7 +156,7 @@ namespace rptui
 {
 using namespace ::com::sun::star;
 using namespace formula;
-// -----------------------------------------------------------------------------
+
 void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 _nPos)
 {
     OSL_ENSURE(_xGroup.is(),"Group is NULL -> GPF");
@@ -174,7 +174,7 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
         _xGroup->getFooter()->setName(sName);
     }
 }
-// -----------------------------------------------------------------------------
+
 ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener(const uno::Reference< report::XReportDefinition >& _xReportDefinition,::comphelper::OPropertyChangeListener* _pListener)
 {
     ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> pRet = NULL;
@@ -193,10 +193,10 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32
     return pRet;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
-    // -------------------------------------------------------------------------
+
     Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat, awt::FontDescriptor& _out_rControlFont ,sal_uInt16 _nWichFont)
     {
         if ( !_rxReportControlFormat.is() )
@@ -220,13 +220,13 @@ namespace
         return VCLUnoHelper::CreateFont( _out_rControlFont, aDefaultFont );
     }
 
-    // -------------------------------------------------------------------------
+
     Font lcl_getReportControlFont( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,sal_uInt16 _nWhich )
     {
         awt::FontDescriptor aAwtFont;
         return lcl_getReportControlFont( _rxReportControlFormat, aAwtFont, _nWhich );
     }
-    // -------------------------------------------------------------------------
+
     const Font lcl_setFont(const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
         SfxItemSet& _rItemSet,sal_uInt16 _nWhich,sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nLanguage,sal_uInt16 _nPosture, sal_uInt16 _nWeight)
     {
@@ -317,7 +317,7 @@ namespace
             ++aIt;
         }
     }
-    // -------------------------------------------------------------------------
+
     void lcl_CharPropertiesToItems( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
         SfxItemSet& _rItemSet )
     {
@@ -365,7 +365,7 @@ namespace
         lcl_setFont(_rxReportControlFormat, _rItemSet,COMPLEX,ITEMID_FONT_COMPLEX,ITEMID_FONTHEIGHT_COMPLEX,ITEMID_LANGUAGE_COMPLEX,ITEMID_POSTURE_COMPLEX,ITEMID_WEIGHT_COMPLEX );
     }
 
-    // -------------------------------------------------------------------------
+
     void lcl_pushBack( uno::Sequence< beans::NamedValue >& _out_rProperties, const OUString& _sName, const uno::Any& _rValue )
     {
         sal_Int32 nLen( _out_rProperties.getLength() );
@@ -373,7 +373,7 @@ namespace
         _out_rProperties[ nLen ] = beans::NamedValue( _sName, _rValue );
     }
 
-    // -------------------------------------------------------------------------
+
     void lcl_initAwtFont( const Font& _rOriginalFont, const SfxItemSet& _rItemSet, awt::FontDescriptor& _out_rAwtFont,
         sal_uInt16 _nFont, sal_uInt16 _nFontHeight,sal_uInt16 _nPosture, sal_uInt16 _nWeight)
     {
@@ -438,7 +438,7 @@ namespace
         _out_rAwtFont = VCLUnoHelper::CreateFontDescriptor( aNewFont );
     }
 
-    // -------------------------------------------------------------------------
+
     void lcl_itemsToCharProperties( const Font& _rOriginalControlFont,const Font& _rOriginalControlFontAsian,const Font& _rOriginalControlFontComplex, const SfxItemSet& _rItemSet, uno::Sequence< beans::NamedValue >& _out_rProperties )
     {
         const SfxPoolItem* pItem( NULL );
@@ -559,7 +559,7 @@ namespace
         }
     }
 
-    // -------------------------------------------------------------------------
+
     template< class ATTRIBUTE_TYPE >
     void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName,
         const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
@@ -570,7 +570,7 @@ namespace
             (_rxReportControlFormat.get()->*pSetter)( aAttributeValue );
     }
 
-    // -------------------------------------------------------------------------
+
     void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName,
         const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
         void (SAL_CALL report::XReportControlFormat::*pSetter)( const OUString& ) )
@@ -580,7 +580,7 @@ namespace
             (_rxReportControlFormat.get()->*pSetter)( aAttributeValue );
     }
 
-    // -------------------------------------------------------------------------
+
     void lcl_applyFontAttribute( const ::comphelper::NamedValueCollection& _rAttrValues, const sal_Char* _pAttributeName,
         const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
         void (SAL_CALL report::XReportControlFormat::*pSetter)( const lang::Locale& ) )
@@ -591,7 +591,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxReportControlFormat,
         const uno::Reference< awt::XWindow>& _rxParentWindow, uno::Sequence< beans::NamedValue >& _out_rNewValues )
 {
@@ -601,7 +601,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
 
     _out_rNewValues = uno::Sequence< beans::NamedValue >();
 
-    // ------------
+
     // UNO->ItemSet
     static SfxItemInfo aItemInfos[] =
     {
@@ -741,7 +741,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
 
     return bSuccess;
 }
-// -----------------------------------------------------------------------------
+
 bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::Reference< awt::XWindow>& _rxParentWindow )
 {
     OSL_PRECOND( _xShape.is() && _rxParentWindow.is(), "openAreaDialog: invalid parameters!" );
@@ -778,7 +778,7 @@ bool openAreaDialog( const uno::Reference<report::XShape >& _xShape,const uno::R
     return bSuccess;
 }
 
-// -----------------------------------------------------------------------------
+
 void applyCharacterSettings( const uno::Reference< report::XReportControlFormat >& _rxReportControlFormat, const uno::Sequence< beans::NamedValue >& _rSettings )
 {
     ::comphelper::NamedValueCollection aSettings( _rSettings );
@@ -837,7 +837,7 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc)
 {
     OSL_ENSURE(_pWindow,"Window can not be null!");
@@ -847,7 +847,7 @@ void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem
         _rMemFunc( pSystemWindow->GetTaskPaneList(), _pToRegister );
     }
 }
-// -----------------------------------------------------------------------------
+
 SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, bool _bAllObjects, SdrObject* _pIgnore, sal_Int16 _nIgnoreType)
 {
     SdrObject* pOverlappedObj = NULL;
@@ -875,7 +875,7 @@ SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, boo
     }
     return pOverlappedObj;
 }
-// -----------------------------------------------------------------------------
+
 bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength)
 {
     for(int i=0;i<_nListLength;i++)
@@ -913,7 +913,7 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _
     return pOverlappedObj;
 }
 
-//----------------------------------------------------------------------------
+
 SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMarkedObjects)
 {
     SdrObject* pOverlappedObj = NULL;
@@ -925,7 +925,7 @@ SdrObject* isOver(SdrObject* _pObj,SdrPage& _rPage,SdrView& _rView,bool _bUnMark
     return pOverlappedObj;
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Sequence< OUString > getParameterNames( const uno::Reference< sdbc::XRowSet >& _rxRowSet )
 {
     uno::Sequence< OUString > aNames;
@@ -956,7 +956,7 @@ uno::Sequence< OUString > getParameterNames( const uno::Reference< sdbc::XRowSet
 
     return aNames;
 }
-// -----------------------------------------------------------------------------
+
 Rectangle getRectangleFromControl(SdrObject* _pControl)
 {
     if (_pControl)
@@ -972,7 +972,7 @@ Rectangle getRectangleFromControl(SdrObject* _pControl)
     }
     return Rectangle();
 }
-// -----------------------------------------------------------------------------
+
 // check overlapping
 void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,bool _bInsert)
 {
@@ -995,7 +995,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo
     if ( !bOverlapping && _bInsert ) // now insert objects
         rSectionView.InsertObjectAtView(_pControl,*rSectionView.GetSdrPageView(),SDRINSERT_ADDMARK);
 }
-// -----------------------------------------------------------------------------
+
 void setZoomFactor(const Fraction& _aZoom,Window& _rWindow)
 {
     MapMode aMapMode( _rWindow.GetMapMode() );
@@ -1003,7 +1003,7 @@ void setZoomFactor(const Fraction& _aZoom,Window& _rWindow)
     aMapMode.SetScaleY(_aZoom);
     _rWindow.SetMapMode(aMapMode);
 }
-// -----------------------------------------------------------------------------
+
 bool openDialogFormula_nothrow( OUString& _in_out_rFormula
                                , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _xContext
                                , const uno::Reference< awt::XWindow>& _xInspectorWindow
@@ -1054,8 +1054,8 @@ bool openDialogFormula_nothrow( OUString& _in_out_rFormula
 
     return bSuccess;
 }
-// -----------------------------------------------------------------------------
+
 } // namespace rptui
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index f4c5512b98c5..494031867491 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -49,24 +49,24 @@ OUString OStatusbarController::getImplementationName_Static() throw( RuntimeExce
 {
     return OUString("com.sun.star.report.comp.StatusbarController");
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString> OStatusbarController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(1);
     aSupported[0] = "com.sun.star.frame.StatusbarController";
     return aSupported;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OStatusbarController::supportsService( const OUString& ServiceName ) throw (RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
-//-------------------------------------------------------------------------
+
 Sequence< OUString> SAL_CALL OStatusbarController::getSupportedServiceNames() throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > OStatusbarController::create(Reference< XComponentContext > const & xContext)
 {
     return *(new OStatusbarController(xContext));
@@ -79,7 +79,7 @@ OStatusbarController::OStatusbarController(const Reference< XComponentContext >&
 ,m_nId(1)
 {
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
 {
     StatusbarController::initialize(_rArguments);
@@ -207,14 +207,14 @@ throw (::com::sun::star::uno::RuntimeException)
     if ( m_rController.is() )
         m_rController->doubleClick( aPos );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OStatusbarController::update() throw ( RuntimeException )
 {
     ::svt::StatusbarController::update();
     if ( m_rController.is() )
         m_rController->update();
 }
-// -----------------------------------------------------------------------------
+
 // XComponent
 void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 95750f21f3cb..f6fe3bd77845 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -59,34 +59,34 @@ OUString SAL_CALL OToolboxController::getImplementationName() throw( RuntimeExce
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------------
+
 OUString OToolboxController::getImplementationName_Static() throw( RuntimeException )
 {
     return OUString("com.sun.star.report.comp.ReportToolboxController");
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString> OToolboxController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(1);
     aSupported[0] = "com.sun.star.report.ReportToolboxController";
     return aSupported;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OToolboxController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
 {
     return cppu::supportsService(this, ServiceName);
 }
-//-------------------------------------------------------------------------
+
 Sequence< OUString> SAL_CALL OToolboxController::getSupportedServiceNames() throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > OToolboxController::create(Reference< XComponentContext > const & xContext)
 {
     return * new OToolboxController(xContext);
 }
-// -----------------------------------------------------------------------------
+
 OToolboxController::OToolboxController(const Reference< XComponentContext >& _rxORB)
     : m_pToolbarController(NULL)
     ,m_nToolBoxId(1)
@@ -97,11 +97,11 @@ OToolboxController::OToolboxController(const Reference< XComponentContext >& _rx
     osl_atomic_decrement(&m_refCount);
 
 }
-// -----------------------------------------------------------------------------
+
 OToolboxController::~OToolboxController()
 {
 }
-// -----------------------------------------------------------------------------
+
 // XInterface
 Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (RuntimeException)
 {
@@ -110,17 +110,17 @@ Any SAL_CALL OToolboxController::queryInterface( const Type& _rType ) throw (Run
         aReturn = TToolboxController_BASE::queryInterface(_rType);
     return aReturn;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OToolboxController::acquire() throw ()
 {
     ToolboxController::acquire();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OToolboxController::release() throw ()
 {
     ToolboxController::release();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
 {
     ToolboxController::initialize(_rArguments);
@@ -197,7 +197,7 @@ void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments
         pToolBox->SetItemBits(m_nToolBoxId,pToolBox->GetItemBits(m_nToolBoxId) | TIB_DROPDOWN);
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -266,7 +266,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException)
 {
     // execute the menu
@@ -279,12 +279,12 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw
 
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw (uno::RuntimeException)
 {
     return m_nSlotId == SID_DRAWTBX_CS_BASIC;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException)
 {
     SolarMutexGuard aSolarMutexGuard;
@@ -294,7 +294,7 @@ OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeExc
         return xSub->getSubToolbarName();
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException)
 {
     SolarMutexGuard aSolarMutexGuard;
@@ -306,7 +306,7 @@ void SAL_CALL OToolboxController::functionSelected( const OUString& rCommand ) t
         xSub->functionSelected(m_aCommandURL = rCommand);
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OToolboxController::updateImage(  ) throw (uno::RuntimeException)
 {
     SolarMutexGuard aSolarMutexGuard;
@@ -316,7 +316,7 @@ void SAL_CALL OToolboxController::updateImage(  ) throw (uno::RuntimeException)
     if ( xSub.is() )
         xSub->updateImage();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< awt::XWindow > SAL_CALL OToolboxController::createItemWindow( const uno::Reference< awt::XWindow >& _xParent)
 throw (uno::RuntimeException)
 {
@@ -334,7 +334,7 @@ throw (uno::RuntimeException)
     }
     return xWindow;
 }
-// -----------------------------------------------------------------------------
+
 //..........................................................................
 } // rptui
 //..........................................................................
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 8a2a7260af32..613999d815bd 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -86,7 +86,7 @@ public:
 //==================================================================
 // class ODesignView
 //==================================================================
-//------------------------------------------------------------------------------
+
 ODesignView::ODesignView(   Window* pParent,
                             const Reference< XComponentContext >& _rxOrb,
                             OReportController& _rController) :
@@ -129,7 +129,7 @@ ODesignView::ODesignView(   Window* pParent,
     m_aMarkTimer.SetTimeoutHdl( LINK( this, ODesignView, MarkTimeout ) );
 }
 
-//------------------------------------------------------------------------------
+
 ODesignView::~ODesignView()
 {
     m_bDeleted = sal_True;
@@ -171,14 +171,14 @@ ODesignView::~ODesignView()
         m_pTaskPane = NULL;
     }
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::initialize()
 {
     SetMapMode( MapMode( MAP_100TH_MM ) );
     m_aScrollWindow.initialize();
     m_aScrollWindow.Show();
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::DataChanged( const DataChangedEvent& rDCEvt )
 {
     ODataView::DataChanged( rDCEvt );
@@ -190,7 +190,7 @@ void ODesignView::DataChanged( const DataChangedEvent& rDCEvt )
         Invalidate();
     }
 }
-//------------------------------------------------------------------------------
+
 bool ODesignView::PreNotify( NotifyEvent& rNEvt )
 {
     bool nRet = ODataView::PreNotify(rNEvt); // 1 := has to be handled here
@@ -223,7 +223,7 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt )
 
     return nRet;
 }
-//------------------------------------------------------------------------------
+
 void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
 {
     if ( !_rPlayground.IsEmpty() )
@@ -278,12 +278,12 @@ void ODesignView::resizeDocumentView(Rectangle& _rPlayground)
     _rPlayground.SetSize( Size( 0, 0 ) );
 
 }
-// -----------------------------------------------------------------------------
+
 // set the view readonly or not
 void ODesignView::setReadOnly(sal_Bool /*_bReadOnly*/)
 {
 }
-//----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ODesignView, MarkTimeout)
 {
     if ( m_pPropWin && m_pPropWin->IsVisible() )
@@ -301,7 +301,7 @@ IMPL_LINK_NOARG(ODesignView, MarkTimeout)
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 void ODesignView::SetMode( DlgEdMode _eNewMode )
 {
     m_eMode = _eNewMode;
@@ -310,62 +310,62 @@ void ODesignView::SetMode( DlgEdMode _eNewMode )
 
     m_aScrollWindow.SetMode(_eNewMode);
 }
-//----------------------------------------------------------------------------
+
 void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
 {
     m_eActObj = eObj;
     m_aScrollWindow.SetInsertObj( eObj,_sShapeType );
 }
-//----------------------------------------------------------------------------
+
 OUString ODesignView::GetInsertObjString() const
 {
     return m_aScrollWindow.GetInsertObjString();
 }
-//----------------------------------------------------------------------------
+
 
 sal_uInt16 ODesignView::GetInsertObj() const
 {
     return m_eActObj;
 }
 
-//----------------------------------------------------------------------------
+
 void ODesignView::Cut()
 {
     Copy();
     Delete();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ODesignView::Copy()
 {
     m_aScrollWindow.Copy();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ODesignView::Paste()
 {
     m_aScrollWindow.Paste();
 }
-//----------------------------------------------------------------------------
+
 void ODesignView::Delete()
 {
     m_aScrollWindow.Delete();
 }
-//----------------------------------------------------------------------------
+
 sal_Bool ODesignView::HasSelection() const
 {
     return m_aScrollWindow.HasSelection();
 }
-//----------------------------------------------------------------------------
+
 
 sal_Bool ODesignView::IsPasteAllowed() const
 {
     return m_aScrollWindow.IsPasteAllowed();
 }
 
-//----------------------------------------------------------------------------
+
 void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView)
 {
     if ( m_pCurrentView != &_rView )
@@ -382,32 +382,32 @@ void ODesignView::UpdatePropertyBrowserDelayed(OSectionView& _rView)
     m_aMarkTimer.Start();
 }
 
-//----------------------------------------------------------------------------
+
 void ODesignView::toggleGrid(sal_Bool _bGridVisible)
 {
      m_aScrollWindow.toggleGrid(_bGridVisible);
 }
-//----------------------------------------------------------------------------
+
 sal_uInt16 ODesignView::getSectionCount() const
 {
     return m_aScrollWindow.getSectionCount();
 }
-//----------------------------------------------------------------------------
+
 void ODesignView::showRuler(sal_Bool _bShow)
 {
      m_aScrollWindow.showRuler(_bShow);
 }
-//----------------------------------------------------------------------------
+
 void ODesignView::removeSection(sal_uInt16 _nPosition)
 {
      m_aScrollWindow.removeSection(_nPosition);
 }
-//----------------------------------------------------------------------------
+
 void ODesignView::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition)
 {
      m_aScrollWindow.addSection(_xSection,_sColorEntry,_nPosition);
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::GetFocus()
 {
     Window::GetFocus();
@@ -419,14 +419,14 @@ void ODesignView::GetFocus()
             pSectionWindow->GrabFocus();
     }
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::ImplInitSettings()
 {
     SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ));
     SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
-//-----------------------------------------------------------------------------
+
 IMPL_LINK( ODesignView, SplitHdl, void*,  )
 {
     const Size aOutputSize = GetOutputSizePixel();
@@ -444,17 +444,17 @@ IMPL_LINK( ODesignView, SplitHdl, void*,  )
 
     return 0L;
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::SelectAll(const sal_uInt16 _nObjectType)
 {
      m_aScrollWindow.SelectAll(_nObjectType);
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::unmarkAllObjects(OSectionView* _pSectionView)
 {
     m_aScrollWindow.unmarkAllObjects(_pSectionView);
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::togglePropertyBrowser(bool _bToogleOn)
 {
     if ( !m_pPropWin && _bToogleOn )
@@ -483,7 +483,7 @@ void ODesignView::togglePropertyBrowser(bool _bToogleOn)
             m_aMarkTimer.Start();
     }
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xReportComponent)
 {
     if ( m_xReportComponent != _xReportComponent )
@@ -495,12 +495,12 @@ void ODesignView::showProperties(const uno::Reference< uno::XInterface>& _xRepor
         m_aMarkTimer.Start();
     }
 }
-//-----------------------------------------------------------------------------
+
 sal_Bool ODesignView::isReportExplorerVisible() const
 {
     return m_pReportExplorer && m_pReportExplorer->IsVisible();
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::toggleReportExplorer()
 {
     if ( !m_pReportExplorer )
@@ -516,12 +516,12 @@ void ODesignView::toggleReportExplorer()
     else
         m_pReportExplorer->Show(!m_pReportExplorer->IsVisible());
 }
-//-----------------------------------------------------------------------------
+
 sal_Bool ODesignView::isAddFieldVisible() const
 {
     return m_pAddField && m_pAddField->IsVisible();
 }
-//-----------------------------------------------------------------------------
+
 void ODesignView::toggleAddField()
 {
     if ( !m_pAddField )
@@ -555,7 +555,7 @@ void ODesignView::toggleAddField()
     else
         m_pAddField->Show(!m_pAddField->IsVisible());
 }
-// -------------------------------------------------------------------------
+
 uno::Reference< report::XSection > ODesignView::getCurrentSection() const
 {
     uno::Reference< report::XSection > xSection;
@@ -564,7 +564,7 @@ uno::Reference< report::XSection > ODesignView::getCurrentSection() const
 
     return xSection;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XReportComponent > ODesignView::getCurrentControlModel() const
 {
     uno::Reference< report::XReportComponent > xModel;
@@ -574,48 +574,48 @@ uno::Reference< report::XReportComponent > ODesignView::getCurrentControlModel()
     }
     return xModel;
 }
-// -------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> ODesignView::getMarkedSection(NearSectionAccess nsa) const
 {
     return  m_aScrollWindow.getMarkedSection(nsa);
 }
-//-----------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> ODesignView::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const
 {
     return  m_aScrollWindow.getSectionWindow(_xSection);
 }
-// -------------------------------------------------------------------------
+
 void ODesignView::markSection(const sal_uInt16 _nPos)
 {
     m_aScrollWindow.markSection(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const
 {
     m_aScrollWindow.fillCollapsedSections(_rCollapsedPositions);
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::collapseSections(const uno::Sequence< beans::PropertyValue>& _aCollpasedSections)
 {
     m_aScrollWindow.collapseSections(_aCollpasedSections);
 }
-// -----------------------------------------------------------------------------
+
 OUString ODesignView::getCurrentPage() const
 {
     return m_pPropWin ? m_pPropWin->getCurrentPage() : OUString();
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::setCurrentPage(const OUString& _sLastActivePage)
 {
     if ( m_pPropWin )
         m_pPropWin->setCurrentPage(_sLastActivePage);
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects)
 {
     m_aScrollWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection,bBoundRects);
 }
-//------------------------------------------------------------------------------
+
 sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
 {
     if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) )
@@ -626,7 +626,7 @@ sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
         return sal_False;
     return m_aScrollWindow.handleKeyEvent(_rEvent);
 }
-//------------------------------------------------------------------------
+
 void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
 {
     m_aScrollWindow.setMarked(_xSection,_bMark);
@@ -635,7 +635,7 @@ void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,s
     else
         m_pCurrentView = NULL;
 }
-//------------------------------------------------------------------------
+
 void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,sal_Bool _bMark)
 {
     m_aScrollWindow.setMarked(_aShapes,_bMark);
@@ -644,7 +644,7 @@ void ODesignView::setMarked(const uno::Sequence< uno::Reference< report::XReport
     else
         m_xReportComponent.clear();
 }
-//------------------------------------------------------------------------------
+
 void ODesignView::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() )
@@ -654,7 +654,7 @@ void ODesignView::MouseButtonDown( const MouseEvent& rMEvt )
     }
     ODataView::MouseButtonDown(rMEvt);
 }
-// -----------------------------------------------------------------------------
+
 uno::Any ODesignView::getCurrentlyShownProperty() const
 {
     uno::Any aRet;
@@ -676,38 +676,38 @@ uno::Any ODesignView::getCurrentlyShownProperty() const
     }
     return aRet;
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
 {
     m_aScrollWindow.fillControlModelSelection(_rSelection);
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::setGridSnap(sal_Bool bOn)
 {
     m_aScrollWindow.setGridSnap(bOn);
 
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::setDragStripes(sal_Bool bOn)
 {
     m_aScrollWindow.setDragStripes(bOn);
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ODesignView::isHandleEvent(sal_uInt16 /*_nId*/) const
 {
     return m_pPropWin && m_pPropWin->HasChildPathFocus();
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 ODesignView::getMarkedObjectCount() const
 {
     return m_aScrollWindow.getMarkedObjectCount();
 }
-// -----------------------------------------------------------------------------
+
 void ODesignView::zoom(const Fraction& _aZoom)
 {
     m_aScrollWindow.zoom(_aZoom);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 ODesignView::getZoomFactor(SvxZoomType _eType) const
 {
     return m_aScrollWindow.getZoomFactor(_eType);
diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx
index 54b0c39b61f6..1da0cebecd25 100644
--- a/reportdesign/source/ui/report/EndMarker.cxx
+++ b/reportdesign/source/ui/report/EndMarker.cxx
@@ -38,11 +38,11 @@ OEndMarker::OEndMarker(Window* _pParent ,const OUString& _sColorEntry)
     SetUniqueId(HID_RPT_ENDMARKER);
     ImplInitSettings();
 }
-// -----------------------------------------------------------------------------
+
 OEndMarker::~OEndMarker()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OEndMarker::Paint( const Rectangle& /*rRect*/ )
 {
     Fraction aCornerSpace(long(CORNER_SPACE));
@@ -75,7 +75,7 @@ void OEndMarker::Paint( const Rectangle& /*rRect*/ )
         DrawPolyLine(Polygon(PixelToLogic(aRect)),LineInfo(LINE_SOLID,2));
     }
 }
-// -----------------------------------------------------------------------
+
 void OEndMarker::ImplInitSettings()
 {
     EnableChildTransparentMode( true );
@@ -85,7 +85,7 @@ void OEndMarker::ImplInitSettings()
     SetBackground( Wallpaper( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor)  );
     SetFillColor( Application::GetSettings().GetStyleSettings().GetShadowColor() );
 }
-// -----------------------------------------------------------------------
+
 void OEndMarker::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( !rMEvt.IsLeft() && !rMEvt.IsRight())
diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx
index efbc65ca26e4..9ee741795d13 100644
--- a/reportdesign/source/ui/report/FixedTextColor.cxx
+++ b/reportdesign/source/ui/report/FixedTextColor.cxx
@@ -55,11 +55,11 @@ namespace rptui
     {
     }
 
-    //--------------------------------------------------------------------
+
     FixedTextColor::~FixedTextColor()
     {
     }
-    // -----------------------------------------------------------------------------
+
 
     void FixedTextColor::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
     {
@@ -80,19 +80,19 @@ namespace rptui
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void FixedTextColor::setPropertyTextColor(const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, sal_Int32 _nTextColor)
     {
         _xVclWindowPeer->setProperty(PROPERTY_TEXTCOLOR, uno::makeAny(sal_Int32(_nTextColor)));
     }
 
-    // -----------------------------------------------------------------------------
+
     void FixedTextColor::notifyElementInserted( const uno::Reference< uno::XInterface >& _rxElement )
     {
         handle(_rxElement);
     }
 
-// -----------------------------------------------------------------------------
+
     void FixedTextColor::handle( const uno::Reference< uno::XInterface >& _rxElement )
     {
         uno::Reference< report::XFixedText > xFixedText( _rxElement, uno::UNO_QUERY );
@@ -151,7 +151,7 @@ namespace rptui
     }
 
 
-// -----------------------------------------------------------------------------
+
     // XPropertyChangeListener
     uno::Reference<awt::XControl> FixedTextColor::getXControl(const uno::Reference< report::XFixedText >& _xFixedText) throw(uno::RuntimeException)
     {
@@ -185,7 +185,7 @@ namespace rptui
         return xControl;
     }
 
-// -----------------------------------------------------------------------------
+
     uno::Reference<awt::XVclWindowPeer> FixedTextColor::getVclWindowPeer(const uno::Reference< report::XFixedText >& _xComponent) throw(uno::RuntimeException)
     {
         uno::Reference<awt::XVclWindowPeer> xVclWindowPeer;
diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
index 8322f676f441..2d4042e6c0a6 100644
--- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
+++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx
@@ -48,14 +48,14 @@ namespace rptui
     using namespace ::com::sun::star;
 
 
-    //--------------------------------------------------------------------
+
     FormattedFieldBeautifier::FormattedFieldBeautifier(const OReportController& _aController)
         :m_rReportController(_aController)
         ,m_nTextColor(-1)
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 FormattedFieldBeautifier::getTextColor()
     {
         if (m_nTextColor == -1)
@@ -66,12 +66,12 @@ namespace rptui
         return m_nTextColor;
     }
 
-    //--------------------------------------------------------------------
+
     FormattedFieldBeautifier::~FormattedFieldBeautifier()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< uno::XInterface >& _rxComponent )
     {
         OUString sDataField;
@@ -114,7 +114,7 @@ namespace rptui
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void FormattedFieldBeautifier::setPlaceholderText( const uno::Reference< awt::XVclWindowPeer >& _xVclWindowPeer, const OUString& _rText )
     {
         OSL_ENSURE( _xVclWindowPeer.is(), "FormattedFieldBeautifier::setPlaceholderText: invalid peer!" );
@@ -133,7 +133,7 @@ namespace rptui
         _xVclWindowPeer->setProperty(PROPERTY_FONTDESCRIPTOR, uno::makeAny(aFontDescriptorStructure));
     }
 
-    // -----------------------------------------------------------------------------
+
     void FormattedFieldBeautifier::notifyPropertyChange( const beans::PropertyChangeEvent& _rEvent )
     {
         if  ( _rEvent.PropertyName != "DataField" )
@@ -143,19 +143,19 @@ namespace rptui
         setPlaceholderText( _rEvent.Source );
     }
 
-    // -----------------------------------------------------------------------------
+
     void FormattedFieldBeautifier::handle( const uno::Reference< uno::XInterface >& _rxElement )
     {
         setPlaceholderText( _rxElement );
     }
 
-    // -----------------------------------------------------------------------------
+
     void FormattedFieldBeautifier::notifyElementInserted( const uno::Reference< uno::XInterface >& _rxElement )
     {
         handle( _rxElement );
     }
 
-    // -----------------------------------------------------------------------------
+
     uno::Reference<awt::XVclWindowPeer> FormattedFieldBeautifier::getVclWindowPeer(const uno::Reference< report::XReportComponent >& _xComponent) throw(uno::RuntimeException)
     {
         uno::Reference<awt::XVclWindowPeer> xVclWindowPeer;
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 13f55b8886e8..472d1686911d 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -173,7 +173,7 @@ using namespace ::dbaui;
 using namespace ::comphelper;
 using namespace ::cppu;
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     // comparing two PropertyValue instances
@@ -217,7 +217,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
                                  ODesignView* _pView,
                                  uno::Reference< awt::XWindow>& _xWindow,
@@ -244,30 +244,30 @@ static void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
     if ( !_xWindow.is() )
         _xWindow = VCLUnoHelper::GetInterface(_pView);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL OReportController::getImplementationName() throw( RuntimeException )
 {
     return getImplementationName_Static();
 }
 
-//------------------------------------------------------------------------------
+
 OUString OReportController::getImplementationName_Static() throw( RuntimeException )
 {
     return OUString("com.sun.star.report.comp.ReportDesign");
 }
-//------------------------------------------------------------------------------
+
 Sequence< OUString> OReportController::getSupportedServiceNames_Static(void) throw( RuntimeException )
 {
     Sequence< OUString> aSupported(1);
     aSupported[0] = "com.sun.star.sdb.ReportDesign";
     return aSupported;
 }
-//-------------------------------------------------------------------------
+
 Sequence< OUString> SAL_CALL OReportController::getSupportedServiceNames() throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
-// -------------------------------------------------------------------------
+
 Reference< XInterface > OReportController::create(Reference< XComponentContext > const & xContext)
 {
     return *(new OReportController(xContext));
@@ -275,7 +275,7 @@ Reference< XInterface > OReportController::create(Reference< XComponentContext >
 
 #define PROPERTY_ID_ZOOMVALUE   1
 
-// -----------------------------------------------------------------------------
+
 OReportController::OReportController(Reference< XComponentContext > const & xContext)
     :OReportController_BASE(xContext)
     ,OPropertyStateContainer(OGenericUnoController_Base::rBHelper)
@@ -307,14 +307,14 @@ OReportController::OReportController(Reference< XComponentContext > const & xCon
                      &m_nZoomValue, ::getCppuType(static_cast< sal_Int16*>(0)));
 
 }
-// -----------------------------------------------------------------------------
+
 OReportController::~OReportController()
 {
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XTYPEPROVIDER2(OReportController,OReportController_BASE,OReportController_Listener)
 IMPLEMENT_FORWARD_XINTERFACE2(OReportController,OReportController_BASE,OReportController_Listener)
-// -----------------------------------------------------------------------------
+
 void OReportController::disposing()
 {
 
@@ -393,7 +393,7 @@ void OReportController::disposing()
         EndListening( *getDesignView() );
     clearView();
 }
-// -----------------------------------------------------------------------------
+
 FeatureState OReportController::GetState(sal_uInt16 _nId) const
 {
     FeatureState aReturn;
@@ -955,7 +955,7 @@ FeatureState OReportController::GetState(sal_uInt16 _nId) const
     return aReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     /** extracts a background color from a dispatched SID_BACKGROUND_COLOR call
@@ -979,7 +979,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs)
 {
     SolarMutexGuard aSolarGuard;
@@ -1645,13 +1645,13 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >
     }
     InvalidateFeature(_nId,Reference< XStatusListener >(),bForceBroadcast);
 }
-// -----------------------------------------------------------------------------
+
 short OReportController::saveModified()
 {
     return RET_NO;
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::impl_initialize( )
 {
     OReportController_BASE::impl_initialize();
@@ -1754,13 +1754,13 @@ void OReportController::impl_initialize( )
         DBG_UNHANDLED_EXCEPTION();
     }
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OReportController, OnOpenHelpAgent, void* ,/*_pMemfun*/)
 {
     doOpenHelpAgent();
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow* ,_pAddFieldDlg)
 {
     WaitObject aObj( getDesignView() );
@@ -1772,7 +1772,7 @@ IMPL_LINK( OReportController, OnCreateHdl, OAddFieldWindow* ,_pAddFieldDlg)
     }
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 
 void OReportController::doOpenHelpAgent()
 {
@@ -1787,7 +1787,7 @@ void OReportController::doOpenHelpAgent()
         getView()->PostUserEvent(LINK(this, OReportController, OnOpenHelpAgent));
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OReportController::Construct(Window* pParent)
 {
     ODesignView* pMyOwnView = new ODesignView( pParent, m_xContext, *this );
@@ -1804,7 +1804,7 @@ sal_Bool OReportController::Construct(Window* pParent)
     OReportController_BASE::Construct(pParent);
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( RuntimeException )
 {
     if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed )
@@ -1819,7 +1819,7 @@ sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( Runt
     // this suspend will be handled in the DBAccess interceptor implementation
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::describeSupportedFeatures()
 {
     DBSubComponentController::describeSupportedFeatures();
@@ -2082,7 +2082,7 @@ void OReportController::describeSupportedFeatures()
     implDescribeSupportedFeature( ".uno:CollapseSection",           SID_COLLAPSE_SECTION);
     implDescribeSupportedFeature( ".uno:ExpandSection",             SID_EXPAND_SECTION);
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::impl_onModifyChanged()
 {
     try
@@ -2096,7 +2096,7 @@ void OReportController::impl_onModifyChanged()
         DBG_UNHANDLED_EXCEPTION();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _xLayoutManager)
 {
     if ( _xLayoutManager.is() )
@@ -2118,7 +2118,7 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _bShow)
 {
     uno::Reference< report::XGroup> xGroup(_rEvent.Element,uno::UNO_QUERY);
@@ -2166,25 +2166,25 @@ void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 // ::container::XContainerListener
 void SAL_CALL OReportController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
 {
     notifyGroupSections(_rEvent,true);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
 {
     notifyGroupSections(_rEvent,false);
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getMutex() );
     OSL_FAIL("Not yet implemented!");
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -2280,14 +2280,14 @@ void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEven
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::disposing( const lang::EventObject& Source ) throw(uno::RuntimeException)
 {
     // simply disambiguate
     OReportController_BASE::disposing(Source);
 }
 
-// -----------------------------------------------------------------------------
+
 static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XGroups>& _xGroups
                           ,sal_Int32 _nGroupPos
                           ,::std::mem_fun_t<sal_Bool,OGroupHelper>&_pGroupMemberFunction)
@@ -2305,7 +2305,7 @@ static sal_uInt16 lcl_getNonVisbleGroupsBefore( const uno::Reference< report::XG
     }
     return nNonVisibleGroups;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGroup,const OUString& _sPropName,sal_Int32 _nGroupPos,bool _bShow)
 {
     ::std::mem_fun_t<sal_Bool,OGroupHelper> pMemFun = ::std::mem_fun(&OGroupHelper::getHeaderOn);
@@ -2348,25 +2348,25 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr
         }
     }
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(OReportController, OnClipboardChanged)
 {
     OnInvalidateClipboard();
     return 0;
 }
-//------------------------------------------------------------------------------
+
 void OReportController::OnInvalidateClipboard()
 {
     InvalidateFeature(SID_CUT);
     InvalidateFeature(SID_COPY);
     InvalidateFeature(SID_PASTE);
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::openPageDialog(const uno::Reference<report::XSection>& _xSection)
 {
     if ( !m_xReportDefinition.is() )
         return;
-    // ------------
+
     // UNO->ItemSet
     static SfxItemInfo aItemInfos[] =
     {
@@ -2444,7 +2444,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
                 : OString("PageDialog"));
             if (RET_OK == aDlg.Execute())
             {
-                // ------------
+
                 // ItemSet->UNO
                 // UNO-properties
                 const SfxItemSet* pSet = aDlg.GetOutputItemSet();
@@ -2512,7 +2512,7 @@ void OReportController::openPageDialog(const uno::Reference<report::XSection>& _
 
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XModel > & xModel) throw( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2529,7 +2529,7 @@ sal_Bool SAL_CALL OReportController::attachModel(const uno::Reference< frame::XM
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::openSortingAndGroupingDialog()
 {
     if ( !m_xReportDefinition.is() )
@@ -2545,13 +2545,13 @@ void OReportController::openSortingAndGroupingDialog()
     else if ( isUiVisible() )
         m_pGroupsFloater->Show(!m_pGroupsFloater->IsVisible());
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGroup >& _xGroup)
 {
     return rptui::getPositionInIndexAccess(m_xReportDefinition->getGroups().get(),_xGroup);
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent*, _pEvent )
 {
     if ( _pEvent && _pEvent->GetId() == VCLEVENT_WINDOW_CLOSE )
@@ -2562,7 +2562,7 @@ IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent*, _pEvent )
     }
     return 1L;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHint)
 {
     if (_rHint.ISA(DlgEdHint)
@@ -2581,7 +2581,7 @@ void OReportController::Notify(SfxBroadcaster & /* _rBc */, SfxHint const & _rHi
 
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun)
 {
     const OUString sUndoAction = ModuleRes(_nUndoStrId);
@@ -2590,7 +2590,7 @@ void OReportController::executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std
     InvalidateFeature( SID_SAVEDOC );
     InvalidateFeature( SID_UNDO );
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection)
 {
     const OUString sUndoAction = ModuleRes(_nUndoStrId);
@@ -2599,7 +2599,7 @@ void OReportController::alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _
     InvalidateFeature( SID_SAVEDOC );
     InvalidateFeature( SID_UNDO );
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::shrinkSectionBottom(uno::Reference<report::XSection> _xSection)
 {
     const sal_Int32 nElements = _xSection->getCount();
@@ -2694,7 +2694,7 @@ void OReportController::shrinkSection(sal_uInt16 _nUndoStrId, uno::Reference<rep
     InvalidateFeature( SID_UNDO );
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2760,7 +2760,7 @@ uno::Any SAL_CALL OReportController::getViewData(void) throw( uno::RuntimeExcept
     aViewData.put( "ZoomFactor", m_nZoomValue );
     return uno::makeAny( aViewData.getPropertyValues() );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( getMutex() );
@@ -2824,14 +2824,14 @@ void SAL_CALL OReportController::restoreViewData(const uno::Any& i_data) throw(
         DBG_UNHANDLED_EXCEPTION();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::updateFloater()
 {
        if ( m_pGroupsFloater && m_pGroupsFloater->IsVisible() )
         m_pGroupsFloater->UpdateData();
 }
 
-// -----------------------------------------------------------------------------
+
 Reference<XFrame> OReportController::getXFrame()
 {
     if ( !m_xFrameLoader.is() )
@@ -2844,7 +2844,7 @@ Reference<XFrame> OReportController::getXFrame()
     return xFrame;
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Reference<frame::XModel> OReportController::executeReport()
 {
     OSL_ENSURE(m_xReportDefinition.is(),"Where is my report?");
@@ -2960,12 +2960,12 @@ uno::Reference<frame::XModel> OReportController::executeReport()
     }
     return xModel;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< frame::XModel >  SAL_CALL OReportController::getModel(void) throw( uno::RuntimeException )
 {
     return m_xReportDefinition.get();
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< sdbc::XRowSet > OReportController::getRowSet()
 {
     OSL_PRECOND( m_xReportDefinition.is(), "OReportController::getRowSet: no report definition?!" );
@@ -3000,7 +3000,7 @@ uno::Reference< sdbc::XRowSet > OReportController::getRowSet()
 
     return m_xRowSet;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::insertGraphic()
 {
     const OUString sTitle(ModuleRes(RID_STR_IMPORT_GRAPHIC));
@@ -3033,12 +3033,12 @@ void OReportController::insertGraphic()
         DBG_UNHANDLED_EXCEPTION();
     }
 }
-// -----------------------------------------------------------------------------
+
 ::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() const
 {
     return m_aReportModel;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL OReportController::select( const Any& aSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( getMutex() );
@@ -3078,7 +3078,7 @@ void OReportController::insertGraphic()
     }
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 Any SAL_CALL OReportController::getSelection(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( getMutex() );
@@ -3091,17 +3091,17 @@ Any SAL_CALL OReportController::getSelection(  ) throw (RuntimeException)
     }
     return aRet;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException)
 {
     m_aSelectionListeners.addInterface( _Listener );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& _Listener ) throw (RuntimeException)
 {
     m_aSelectionListeners.removeInterface( _Listener );
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::createNewFunction(const uno::Any& _aValue)
 {
     uno::Reference< container::XIndexContainer> xFunctions(_aValue,uno::UNO_QUERY_THROW);
@@ -3111,13 +3111,13 @@ void OReportController::createNewFunction(const uno::Any& _aValue)
     // the call below will also create an undo action -> listener
     xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(xFunction));
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OReportController, OnExecuteReport, void* ,/*_pMemfun*/)
 {
     executeReport();
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,const uno::Reference< report::XSection>& _xSection,const OUString& _sFunction,sal_uInt16 _nObjectId)
 {
     SequenceAsHashMap aMap(_aArgs);
@@ -3232,7 +3232,7 @@ void OReportController::createControl(const Sequence< PropertyValue >& _aArgs,co
 
     correctOverlapping(pNewControl,pSectionWindow->getReportSection());
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
 {
     getDesignView()->unmarkAllObjects(NULL);
@@ -3260,7 +3260,7 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
         createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs)
 {
     getDesignView()->unmarkAllObjects(NULL);
@@ -3290,7 +3290,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
     createControl(_aArgs,bInPageHeader ? m_xReportDefinition->getPageHeader() : m_xReportDefinition->getPageFooter(),sFunction);
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
 {
     getDesignView()->unmarkAllObjects(NULL);
@@ -3606,7 +3606,7 @@ void OReportController::addPairControls(const Sequence< PropertyValue >& aArgs)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 OSectionView* OReportController::getCurrentSectionView() const
 {
     OSectionView* pSectionView = NULL;
@@ -3615,7 +3615,7 @@ OSectionView* OReportController::getCurrentSectionView() const
         pSectionView = &pSectionWindow->getReportSection().getSectionView();
     return pSectionView;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::changeZOrder(sal_Int32 _nId)
 {
     OSectionView* pSectionView = getCurrentSectionView();
@@ -3645,7 +3645,7 @@ void OReportController::changeZOrder(sal_Int32 _nId)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::listen(const bool _bAdd)
 {
     const OUString aProps [] = {    OUString(PROPERTY_REPORTHEADERON),OUString(PROPERTY_REPORTFOOTERON)
@@ -3749,7 +3749,7 @@ void OReportController::listen(const bool _bAdd)
         m_aReportModel->detachController();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::switchReportSection(const sal_Int16 _nId)
 {
     OSL_ENSURE(_nId == SID_REPORTHEADER_WITHOUT_UNDO || _nId == SID_REPORTFOOTER_WITHOUT_UNDO || _nId == SID_REPORTHEADERFOOTER ,"Illegal id given!");
@@ -3799,7 +3799,7 @@ void OReportController::switchReportSection(const sal_Int16 _nId)
         getView()->Resize();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::switchPageSection(const sal_Int16 _nId)
 {
     OSL_ENSURE(_nId == SID_PAGEHEADERFOOTER || _nId == SID_PAGEHEADER_WITHOUT_UNDO || _nId == SID_PAGEFOOTER_WITHOUT_UNDO ,"Illegal id given!");
@@ -3848,7 +3848,7 @@ void OReportController::switchPageSection(const sal_Int16 _nId)
         getView()->Resize();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::modifyGroup(const bool _bAppend, const Sequence< PropertyValue >& _aArgs)
 {
     if ( !m_xReportDefinition.is() )
@@ -3892,7 +3892,7 @@ void OReportController::modifyGroup(const bool _bAppend, const Sequence< Propert
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader, const Sequence< PropertyValue >& _aArgs)
 {
     if ( m_xReportDefinition.is() )
@@ -3922,7 +3922,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::collapseSection(const bool _bCollapse)
 {
     ::boost::shared_ptr<OSectionWindow> pSection = getDesignView()->getMarkedSection();
@@ -3931,7 +3931,7 @@ void OReportController::collapseSection(const bool _bCollapse)
         pSection->setCollapsed(_bCollapse);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::markSection(const bool _bNext)
 {
     ::boost::shared_ptr<OSectionWindow> pSection = getDesignView()->getMarkedSection();
@@ -3951,7 +3951,7 @@ void OReportController::markSection(const bool _bNext)
             select(uno::makeAny(pSection->getReportSection().getSection()));
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::createDefaultControl(const uno::Sequence< beans::PropertyValue>& _aArgs)
 {
     uno::Reference< report::XSection > xSection = getDesignView()->getCurrentSection();
@@ -3973,12 +3973,12 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< util::XNumberFormatter > OReportController::getReportNumberFormatter() const
 {
     return m_xFormatter;
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::checkChartEnabled()
 {
     if ( !m_bChartEnabledAsked )
@@ -4002,7 +4002,7 @@ void OReportController::checkChartEnabled()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 // css.frame.XTitle
 OUString SAL_CALL OReportController::getTitle()
@@ -4015,12 +4015,12 @@ OUString SAL_CALL OReportController::getTitle()
 
     return xTitle->getTitle ();
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const
 {
     _rDefault <<= sal_Int16(100);
 }
-// -----------------------------------------------------------------------------
+
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* OReportController::createArrayHelper( ) const
 {
@@ -4028,7 +4028,7 @@ void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any&
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
 }
-// -------------------------------------------------------------------------
+
 
 // cppu::OPropertySetHelper
 ::cppu::IPropertyArrayHelper& SAL_CALL OReportController::getInfoHelper()
@@ -4036,7 +4036,7 @@ void OReportController::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any&
     typedef ::comphelper::OPropertyArrayUsageHelper<OReportController_BASE> OReportController_PROP;
     return *OReportController_PROP::getArrayHelper();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL OReportController::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle,const Any& _aValue) throw (Exception)
 {
     if ( _nHandle == PROPERTY_ID_ZOOMVALUE )
@@ -4073,12 +4073,12 @@ OUString SAL_CALL OReportController::getMode(  ) throw (::com::sun::star::uno::R
     }
     return pIter != pEnd;
 }
-// -----------------------------------------------------------------------------
+
 bool OReportController::isUiVisible() const
 {
     return m_sMode != "remote";
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui::FeatureState& _rState) const
 {
     _rState.bEnabled = isEditable();
@@ -4114,7 +4114,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui:
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::impl_zoom_nothrow()
 {
     Fraction aZoom(m_nZoomValue,100);
@@ -4123,7 +4123,7 @@ void OReportController::impl_zoom_nothrow()
     InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(),sal_True);
     InvalidateFeature(SID_ATTR_ZOOMSLIDER,Reference< XStatusListener >(),sal_True);
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const uno::Reference< report::XReportControlFormat>& _xReportControlFormat) const
 {
     sal_Bool bRet = sal_False;
@@ -4154,7 +4154,7 @@ sal_Bool OReportController::isFormatCommandEnabled(sal_uInt16 _nCommand,const un
     }
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndoResId,const OUString& _sProperty,const uno::Any& _aValue,const Sequence< PropertyValue >& _aArgs)
 {
     ::std::vector< uno::Reference< uno::XInterface > > aSelection;
@@ -4174,14 +4174,14 @@ bool OReportController::impl_setPropertyAtControls_throw(const sal_uInt16 _nUndo
 
     return !aSelection.empty();
 }
-// -----------------------------------------------------------------------------
+
 void OReportController::impl_fillCustomShapeState_nothrow(const char* _pCustomShapeType,dbaui::FeatureState& _rState) const
 {
     _rState.bEnabled = isEditable();
     _rState.bChecked = getDesignView()->GetInsertObj() == OBJ_CUSTOMSHAPE && getDesignView()->GetInsertObjString().equalsAscii(_pCustomShapeType);
 }
 
-// -----------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OReportController::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const
 {
     if ( getDesignView() )
@@ -4195,7 +4195,7 @@ void OReportController::impl_fillCustomShapeState_nothrow(const char* _pCustomSh
 }
 
 
-// -----------------------------------------------------------------------------
+
 void OReportController::openZoomDialog()
 {
     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -4254,8 +4254,8 @@ void OReportController::openZoomDialog()
             delete pDefaults[i];
     }
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 // XVisualObject
 void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const awt::Size& _aSize ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException)
 {
@@ -4268,13 +4268,13 @@ void SAL_CALL OReportController::setVisualAreaSize( ::sal_Int64 _nAspect, const
             setModified( sal_True );
     m_nAspect = _nAspect;
 }
-// -----------------------------------------------------------------------------
+
 awt::Size SAL_CALL OReportController::getVisualAreaSize( ::sal_Int64 /*nAspect*/ ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( getMutex() );
     return m_aVisualAreaSize;
 }
-// -----------------------------------------------------------------------------
+
 embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepresentation( ::sal_Int64 _nAspect ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -4312,12 +4312,12 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres
     }
     return aResult;
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL OReportController::getMapUnit( ::sal_Int64 /*nAspect*/ ) throw (uno::Exception, uno::RuntimeException)
 {
     return embed::EmbedMapUnits::ONE_100TH_MM;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > OReportController::getColumns() const
 {
     if ( !m_xColumns.is() && m_xReportDefinition.is() && !m_xReportDefinition->getCommand().isEmpty() )
@@ -4326,7 +4326,7 @@ uno::Reference< container::XNameAccess > OReportController::getColumns() const
     }
     return m_xColumns;
 }
-// -----------------------------------------------------------------------------
+
 OUString OReportController::getColumnLabel_throw(const OUString& i_sColumnName) const
 {
     OUString sLabel;
@@ -4340,7 +4340,7 @@ OUString OReportController::getColumnLabel_throw(const OUString& i_sColumnName)
     return sLabel;
 }
 
-// -----------------------------------------------------------------------------
+
 SfxUndoManager& OReportController::getUndoManager() const
 {
     DBG_TESTSOLARMUTEX();
@@ -4355,13 +4355,13 @@ SfxUndoManager& OReportController::getUndoManager() const
     return *pUndoManager;
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::clearUndoManager() const
 {
     getUndoManager().Clear();
 }
 
-// -----------------------------------------------------------------------------
+
 void OReportController::addUndoAction( SfxUndoAction* i_pAction )
 {
     getUndoManager().AddUndoAction( i_pAction );
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index aaf12fb84ac0..dae05f1e80be 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -62,7 +62,7 @@ public:
     ~OXReportControllerObserverImpl();
 };
 
-// -----------------------------------------------------------------------------
+
 
     OXReportControllerObserverImpl::OXReportControllerObserverImpl(const OReportController& _rController)
             :m_rReportController(_rController)
@@ -75,9 +75,9 @@ public:
     {
     }
 
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
-    // -----------------------------------------------------------------------------
+
+
+
 
 
     OXReportControllerObserver::OXReportControllerObserver(const OReportController& _rController)
@@ -94,7 +94,7 @@ public:
         Application::RemoveEventListener(LINK( this, OXReportControllerObserver, SettingsChanged ) );
     }
 
-    // -----------------------------------------------------------------------------
+
     IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclWindowEvent*, _pEvt)
     {
         if ( _pEvt )
@@ -178,7 +178,7 @@ public:
         m_aFixedTextColor.notifyPropertyChange(_rEvent);
     }
 
-// -----------------------------------------------------------------------------
+
 void OXReportControllerObserver::Lock()
 {
     OSL_ENSURE(m_refCount,"Illegal call to dead object!");
@@ -192,7 +192,7 @@ void OXReportControllerObserver::UnLock()
 }
 sal_Bool OXReportControllerObserver::IsLocked() const { return m_pImpl->m_nLocks != 0; }
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::AddSection(const uno::Reference< report::XSection > & _xSection)
 {
     OEnvLock aLock(*this);
@@ -209,7 +209,7 @@ void OXReportControllerObserver::AddSection(const uno::Reference< report::XSecti
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::RemoveSection(const uno::Reference< report::XSection > & _xSection)
 {
     OEnvLock aLock(*this);
@@ -227,7 +227,7 @@ void OXReportControllerObserver::RemoveSection(const uno::Reference< report::XSe
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< uno::XInterface > & Element)
 {
     // listen at Container
@@ -254,7 +254,7 @@ void OXReportControllerObserver::TogglePropertyListening(const uno::Reference< u
 }
 
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::switchListening( const uno::Reference< container::XIndexAccess >& _rxContainer, bool _bStartListening ) SAL_THROW(())
 {
     OSL_PRECOND( _rxContainer.is(), "OXReportControllerObserver::switchListening: invalid container!" );
@@ -291,7 +291,7 @@ void OXReportControllerObserver::switchListening( const uno::Reference< containe
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::switchListening( const uno::Reference< uno::XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(())
 {
     OSL_PRECOND( _rxObject.is(), "OXReportControllerObserver::switchListening: how should I listen at a NULL object?" );
@@ -325,12 +325,12 @@ void OXReportControllerObserver::switchListening( const uno::Reference< uno::XIn
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXReportControllerObserver::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterface >& _rxElement )
 {
     m_aFormattedFieldBeautifier.notifyElementInserted(_rxElement);
@@ -344,7 +344,7 @@ void OXReportControllerObserver::AddElement(const uno::Reference< uno::XInterfac
     switchListening( _rxElement, true );
 }
 
-//------------------------------------------------------------------------------
+
 void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInterface >& _rxElement)
 {
     switchListening( _rxElement, false );
@@ -354,7 +354,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter
         switchListening( xContainer, false );
 }
 
-// -----------------------------------------------------------------------------
+
 ::std::vector< uno::Reference< container::XChild> >::const_iterator OXReportControllerObserver::getSection(const uno::Reference<container::XChild>& _xContainer) const
 {
     ::std::vector< uno::Reference< container::XChild> >::const_iterator aFind = m_pImpl->m_aSections.end();
@@ -371,7 +371,7 @@ void OXReportControllerObserver::RemoveElement(const uno::Reference< uno::XInter
     return aFind;
 }
 // XContainerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXReportControllerObserver::elementInserted(const container::ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -385,7 +385,7 @@ void SAL_CALL OXReportControllerObserver::elementInserted(const container::Conta
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXReportControllerObserver::elementReplaced(const container::ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -399,7 +399,7 @@ void SAL_CALL OXReportControllerObserver::elementReplaced(const container::Conta
     AddElement(xIface);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OXReportControllerObserver::elementRemoved(const container::ContainerEvent& evt) throw(uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx
index 9789afa75265..518f24ce9e72 100644
--- a/reportdesign/source/ui/report/ReportRuler.cxx
+++ b/reportdesign/source/ui/report/ReportRuler.cxx
@@ -30,22 +30,22 @@ OReportRuler::OReportRuler(Window* _pParent,OReportWindow* _pReportWindow,const
 
     Show();
 }
-//------------------------------------------------------------------------------
+
 OReportRuler::~OReportRuler()
 {
     delete m_pSection;
 }
-//------------------------------------------------------------------------------
+
 void OReportRuler::Resize()
 {
     m_pSection->SetPosSizePixel(Point(0,0),GetOutputSize());
 }
-//------------------------------------------------------------------------------
+
 void OReportRuler::SetGridVisible(sal_Bool _bVisible)
 {
     m_pSection->SetGridVisible( _bVisible );
 }
-//------------------------------------------------------------------------------
+
 //==============================================================================
 } // rptui
 //==============================================================================
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 905ba74f4a07..2339e9faed01 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -66,7 +66,7 @@ namespace rptui
 {
 // =============================================================================
 using namespace ::com::sun::star;
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServiceFactory> _rxFactory*/)
 {
@@ -74,7 +74,7 @@ sal_Int32 lcl_getOverlappedControlColor(/*const uno::Reference <lang::XMultiServ
     sal_Int32 nColor = aConfig.GetColorValue(CFG_REPORTDESIGNER, DBOVERLAPPEDCONTROL).getColor();
     return nColor;
 }
-//------------------------------------------------------------------------------
+
 OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< report::XSection >& _xSection)
 : Window(_pParent,WB_DIALOGCONTROL)
 , ::comphelper::OPropertyChangeListener(m_aMutex)
@@ -110,7 +110,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re
     m_pFunc.reset(new DlgEdFuncSelect( this ));
     m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor() );
 }
-//------------------------------------------------------------------------------
+
 OReportSection::~OReportSection()
 {
     m_pPage = NULL;
@@ -128,7 +128,7 @@ OReportSection::~OReportSection()
         m_pView = NULL;
     }
 }
-//------------------------------------------------------------------------------
+
 void OReportSection::Paint( const Rectangle& rRect )
 {
     Window::Paint(rRect);
@@ -164,12 +164,12 @@ void OReportSection::Paint( const Rectangle& rRect )
         --m_nPaintEntranceCount;
     }
 }
-//------------------------------------------------------------------------------
+
 void OReportSection::Resize()
 {
     Window::Resize();
 }
-//------------------------------------------------------------------------------
+
 void OReportSection::fill()
 {
     if ( !m_xSection.is() )
@@ -232,7 +232,7 @@ void OReportSection::fill()
     const Size aPageSize = m_pPage->GetSize();
     m_pView->SetWorkArea( Rectangle( Point( nLeftMargin, 0), Size(aPageSize.Width() - nLeftMargin - nRightMargin,aPageSize.Height()) ) );
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyCopiedObjects,bool _bForce)
 {
     OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!");
@@ -300,7 +300,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC
         }
     }
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::Delete()
 {
     if( !m_pView->AreObjectsMarked() )
@@ -309,7 +309,7 @@ void OReportSection::Delete()
     m_pView->BrkAction();
     m_pView->DeleteMarked();
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::SetMode( DlgEdMode eNewMode )
 {
     if ( eNewMode != m_eMode )
@@ -327,12 +327,12 @@ void OReportSection::SetMode( DlgEdMode eNewMode )
         m_eMode = eNewMode;
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects)
 {
     Copy(_rAllreadyCopiedObjects,false);
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedObjects,bool _bEraseAnddNoClone)
 {
     OSL_ENSURE(m_xSection.is(),"Why is the section here NULL!");
@@ -383,33 +383,33 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb
         pNewValue->Value <<= uno::Sequence< uno::Reference<report::XReportComponent> >(&(*aCopies.begin()),aCopies.size());
     }
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::MouseButtonDown( const MouseEvent& rMEvt )
 {
     m_pParent->getViewsWindow()->getView()->setMarked(m_pView,sal_True); // mark the section in which is clicked
     m_pFunc->MouseButtonDown( rMEvt );
     Window::MouseButtonDown(rMEvt);
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( !m_pFunc->MouseButtonUp( rMEvt ) )
         m_pParent->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_OBJECT_SELECT,uno::Sequence< beans::PropertyValue>());
 }
 
-//----------------------------------------------------------------------------
+
 
 void OReportSection::MouseMove( const MouseEvent& rMEvt )
 {
     m_pFunc->MouseMove( rMEvt );
 
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::SetGridVisible(sal_Bool _bVisible)
 {
     m_pView->SetGridVisible( _bVisible );
 }
-//------------------------------------------------------------------------------
+
 void OReportSection::SelectAll(const sal_uInt16 _nObjectType)
 {
     if ( m_pView )
@@ -466,7 +466,7 @@ void lcl_insertMenuItemImages(
         }
     }
 }
-//----------------------------------------------------------------------------
+
 void OReportSection::Command( const CommandEvent& _rCEvt )
 {
     Window::Command(_rCEvt);
@@ -499,7 +499,7 @@ void OReportSection::Command( const CommandEvent& _rCEvt )
         break;
     }
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
 {
     if ( m_xSection.is() )
@@ -600,18 +600,18 @@ void OReportSection::impl_adjustObjectSizePosition(sal_Int32 i_nPaperWidth,sal_I
         OSL_FAIL("Exception caught: OReportSection::impl_adjustObjectSizePosition()");
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OReportSection::handleKeyEvent(const KeyEvent& _rEvent)
 {
     return m_pFunc.get() ? m_pFunc->handleKeyEvent(_rEvent) : sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::deactivateOle()
 {
     if ( m_pFunc.get() )
         m_pFunc->deactivateOle(true);
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::createDefault(const OUString& _sType)
 {
     SdrObject* pObj = m_pView->GetCreateObj();
@@ -619,7 +619,7 @@ void OReportSection::createDefault(const OUString& _sType)
         return;
     createDefault(_sType,pObj);
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj)
 {
     sal_Bool bAttributesAppliedFromGallery = sal_False;
@@ -683,7 +683,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj)
         ((SdrObjCustomShape*)_pObj)->MergeDefaultAttributes( &_sType );
     }
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< report::XReportComponent > OReportSection::getCurrentControlModel() const
 {
     uno::Reference< report::XReportComponent > xModel;
@@ -702,7 +702,7 @@ uno::Reference< report::XReportComponent > OReportSection::getCurrentControlMode
     }
     return xModel;
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
 {
     if ( m_pView )
@@ -722,7 +722,7 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
 {
     OSL_TRACE("AcceptDrop::DropEvent.Action %i", _rEvt.mnAction);
@@ -772,7 +772,7 @@ sal_Int8 OReportSection::AcceptDrop( const AcceptDropEvent& _rEvt )
     return DND_ACTION_NONE;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
 {
     OSL_TRACE("ExecuteDrop::DropEvent.Action %i", _rEvt.mnAction);
@@ -847,17 +847,17 @@ sal_Int8 OReportSection::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     }
     return nDropOption;
 }
-// -----------------------------------------------------------------------------
+
 void OReportSection::stopScrollTimer()
 {
     m_pFunc->stopScrollTimer();
 }
-// -----------------------------------------------------------------------------
+
 bool OReportSection::isUiActive() const
 {
     return m_pFunc->isUiActive();
 }
-// -----------------------------------------------------------------------------
+
 // =============================================================================
 }
 // =============================================================================
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index edacb4d4b192..08d500985730 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -55,7 +55,7 @@ using namespace ::comphelper;
 //==================================================================
 // class OReportWindow
 //==================================================================
-//------------------------------------------------------------------------------
+
 OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
 : Window(_pParent,WB_DIALOGCONTROL)
 , ::comphelper::OPropertyChangeListener(m_aMutex)
@@ -83,41 +83,41 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView)
     ImplInitSettings();
     m_pReportListener = addStyleListener(_pView->getController().getReportDefinition(),this);
 }
-//------------------------------------------------------------------------------
+
 OReportWindow::~OReportWindow()
 {
     if ( m_pReportListener.is() )
         m_pReportListener->dispose();
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::initialize()
 {
     m_aViewsWindow.initialize();
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
 {
     m_aViewsWindow.SetInsertObj( eObj,_sShapeType);
 }
 
-//----------------------------------------------------------------------------
+
 OUString OReportWindow::GetInsertObjString() const
 {
     return m_aViewsWindow.GetInsertObjString();
 }
-//------------------------------------------------------------------------------
+
 void OReportWindow::SetMode( DlgEdMode eNewMode )
 {
     m_aViewsWindow.SetMode(eNewMode);
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::removeSection(sal_uInt16 _nPosition)
 {
     m_aViewsWindow.removeSection(_nPosition);
     m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
     m_aViewsWindow.Invalidate(INVALIDATE_TRANSPARENT);
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition)
 {
     if ( !_xSection.is() )
@@ -127,19 +127,19 @@ void OReportWindow::addSection(const uno::Reference< report::XSection >& _xSecti
 
     m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
 }
-//------------------------------------------------------------------------------
+
 void OReportWindow::toggleGrid(sal_Bool _bVisible)
 {
     m_aViewsWindow.toggleGrid(_bVisible);
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::showRuler(sal_Bool _bShow)
 {
     m_aHRuler.Show(_bShow);
 
     m_aViewsWindow.showRuler(_bShow);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const
 {
     Fraction aStartWidth(long(REPORT_STARTMARKER_WIDTH));
@@ -148,7 +148,7 @@ sal_Int32 OReportWindow::getMaxMarkerWidth(sal_Bool _bWithEnd) const
         aStartWidth += Fraction(long(REPORT_ENDMARKER_WIDTH));
     return sal_Int32((long)aStartWidth);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OReportWindow::GetTotalWidth() const
 {
     sal_Int32 nWidth = 0;
@@ -165,7 +165,7 @@ sal_Int32 OReportWindow::GetTotalWidth() const
     }
     return nWidth;
 }
-//------------------------------------------------------------------------------
+
 void OReportWindow::Resize()
 {
     Window::Resize();
@@ -202,17 +202,17 @@ void OReportWindow::Resize()
         m_aViewsWindow.SetPosSizePixel(aStartPoint,Size(aTotalOutputSize.Width(),nSectionsHeight));
     }
 }
-//------------------------------------------------------------------------------
+
 Point OReportWindow::getThumbPos() const
 {
     return m_pParent->getThumbPos();
 }
-//------------------------------------------------------------------------------
+
 void OReportWindow::ImplInitSettings()
 {
     SetBackground( );
 }
-//-----------------------------------------------------------------------------
+
 void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -224,12 +224,12 @@ void OReportWindow::DataChanged( const DataChangedEvent& rDCEvt )
         Invalidate();
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OReportWindow::GetTotalHeight() const
 {
     return m_aViewsWindow.getTotalHeight();
 }
-//------------------------------------------------------------------------------
+
 void OReportWindow::ScrollChildren(const Point& _aThumbPos)
 {
     MapMode aMap = m_aHRuler.GetMapMode();
@@ -243,136 +243,136 @@ void OReportWindow::ScrollChildren(const Point& _aThumbPos)
 
     m_aViewsWindow.scrollChildren(_aThumbPos);
 }
-//----------------------------------------------------------------------------
+
 sal_uInt16 OReportWindow::getSectionCount() const
 {
     return m_aViewsWindow.getSectionCount();
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::notifySizeChanged()
 {
     m_pParent->setTotalSize(GetTotalWidth(),GetTotalHeight());
 }
-//----------------------------------------------------------------------------
+
 sal_Bool OReportWindow::HasSelection() const
 {
     return m_aViewsWindow.HasSelection();
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::Delete()
 {
 
     m_aViewsWindow.Delete();
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::Copy()
 {
 
     m_aViewsWindow.Copy();
 }
-//----------------------------------------------------------------------------
+
 void OReportWindow::Paste()
 {
 
     m_aViewsWindow.Paste();
 }
-//----------------------------------------------------------------------------
+
 sal_Bool OReportWindow::IsPasteAllowed() const
 {
     return m_aViewsWindow.IsPasteAllowed();
 }
-//-----------------------------------------------------------------------------
+
 void OReportWindow::SelectAll(const sal_uInt16 _nObjectType)
 {
 
     m_aViewsWindow.SelectAll(_nObjectType);
 }
-//-----------------------------------------------------------------------------
+
 void OReportWindow::unmarkAllObjects(OSectionView* _pSectionView)
 {
 
     m_aViewsWindow.unmarkAllObjects(_pSectionView);
 }
-//-----------------------------------------------------------------------------
+
 void OReportWindow::showProperties(const uno::Reference< report::XSection>& _xReportComponent)
 {
     ::boost::shared_ptr<OSectionWindow> pSectionWindow = m_aViewsWindow.getSectionWindow( _xReportComponent );
     m_pView->UpdatePropertyBrowserDelayed(pSectionWindow->getReportSection().getSectionView());
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OReportWindow::handleKeyEvent(const KeyEvent& _rEvent)
 {
     return m_aViewsWindow.handleKeyEvent(_rEvent);
 }
-//------------------------------------------------------------------------
+
 void OReportWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
 {
     if ( _pSectionView )
         m_aViewsWindow.setMarked(_pSectionView,_bMark);
 }
-//------------------------------------------------------------------------
+
 void OReportWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
 {
 
     m_aViewsWindow.setMarked(_xSection,_bMark);
 }
-//------------------------------------------------------------------------
+
 void OReportWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark)
 {
 
     m_aViewsWindow.setMarked(_xShape,_bMark);
 }
-//-----------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OReportWindow::getMarkedSection(NearSectionAccess nsa) const
 {
     return  m_aViewsWindow.getMarkedSection(nsa);
 }
-//-----------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OReportWindow::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const
 {
     return  m_aViewsWindow.getSectionWindow(_xSection);
 }
-// -------------------------------------------------------------------------
+
 void OReportWindow::markSection(const sal_uInt16 _nPos)
 {
 
     m_aViewsWindow.markSection(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const
 {
 
     m_aViewsWindow.fillCollapsedSections(_rCollapsedPositions);
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections)
 {
 
     m_aViewsWindow.collapseSections(_aCollpasedSections);
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects)
 {
 
     m_aViewsWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects);
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::setGridSnap(sal_Bool bOn)
 {
 
     m_aViewsWindow.setGridSnap(bOn);
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::setDragStripes(sal_Bool bOn)
 {
     m_aViewsWindow.setDragStripes(bOn);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 OReportWindow::getMarkedObjectCount() const
 {
     return m_aViewsWindow.getMarkedObjectCount();
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::zoom(const Fraction& _aZoom)
 {
     m_aHRuler.SetZoom(_aZoom);
@@ -388,12 +388,12 @@ void OReportWindow::zoom(const Fraction& _aZoom)
 
     Invalidate(INVALIDATE_NOERASE | INVALIDATE_NOCHILDREN | INVALIDATE_TRANSPARENT);
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
 {
     m_aViewsWindow.fillControlModelSelection(_rSelection);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OReportWindow::impl_getRealPixelWidth() const
 {
     const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width;
@@ -401,7 +401,7 @@ sal_Int32 OReportWindow::impl_getRealPixelWidth() const
     const Size aPageSize = LogicToPixel(Size(nPaperWidth,0),aMap);
     return aPageSize.Width() + REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH + SECTION_OFFSET;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const
 {
     sal_uInt16 nZoom(100);
@@ -430,7 +430,7 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const
 
     return nZoom;
 }
-// -----------------------------------------------------------------------------
+
 void OReportWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
 {
     (void)_rEvent;
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index ecfcdfd2356d..48e6c7d7cf13 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -34,7 +34,7 @@ namespace rptui
 #define SCR_LINE_SIZE       10
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------------
+
 void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize,ScrollBar& _rScrollBar)
 {
     _rScrollBar.SetPosSizePixel(_aPos,_aSize);
@@ -42,7 +42,7 @@ void lcl_setScrollBar(sal_Int32 _nNewValue,const Point& _aPos,const Size& _aSize
     _rScrollBar.SetVisibleSize( _nNewValue );
 }
 
-// -----------------------------------------------------------------------------
+
 OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
     : OScrollWindowHelper_BASE( _pDesignView,WB_DIALOGCONTROL)
     ,OPropertyChangeListener(m_aMutex)
@@ -66,14 +66,14 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* _pDesignView)
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------------
+
 OScrollWindowHelper::~OScrollWindowHelper()
 {
     if ( m_pReportDefintionMultiPlexer.is() )
         m_pReportDefintionMultiPlexer->dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const
 {
     AllSettings aSettings( _rScrollBar.GetSettings() );
@@ -86,7 +86,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& _rScrollBar ) const
     _rScrollBar.SetLineSize( SCR_LINE_SIZE );
 }
 
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::initialize()
 {
     uno::Reference<report::XReportDefinition> xReportDefinition = m_pParent->getController().getReportDefinition();
@@ -94,7 +94,7 @@ void OScrollWindowHelper::initialize()
 
     m_aReportWindow.initialize();
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
 {
     m_aTotalPixelSize.Width() = _nWidth;
@@ -108,7 +108,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
 
     Resize();
 }
-//------------------------------------------------------------------------------
+
 Size OScrollWindowHelper::ResizeScrollBars()
 {
     // get the new output-size in pixel
@@ -174,7 +174,7 @@ Size OScrollWindowHelper::ResizeScrollBars()
 
     return aOutPixSz;
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::Resize()
 {
     OScrollWindowHelper_BASE::Resize();
@@ -182,140 +182,140 @@ void OScrollWindowHelper::Resize()
 
     m_aReportWindow.SetPosSizePixel(Point( 0, 0 ),aTotalOutputSize);
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK( OScrollWindowHelper, ScrollHdl, ScrollBar*, /*pScroll*/ )
 {
     m_aReportWindow.ScrollChildren( getThumbPos() );
     return 0;
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::addSection(const uno::Reference< report::XSection >& _xSection
                                    ,const OUString& _sColorEntry
                                    ,sal_uInt16 _nPosition)
 {
     m_aReportWindow.addSection(_xSection,_sColorEntry,_nPosition);
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::removeSection(sal_uInt16 _nPosition)
 {
     m_aReportWindow.removeSection(_nPosition);
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::toggleGrid(sal_Bool _bVisible)
 {
     m_aReportWindow.toggleGrid(_bVisible);
 }
-//------------------------------------------------------------------------------
+
 sal_uInt16 OScrollWindowHelper::getSectionCount() const
 {
     return m_aReportWindow.getSectionCount();
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
 {
     m_aReportWindow.SetInsertObj(eObj,_sShapeType);
 }
-//----------------------------------------------------------------------------
+
 OUString OScrollWindowHelper::GetInsertObjString() const
 {
     return m_aReportWindow.GetInsertObjString();
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::SetMode( DlgEdMode _eNewMode )
 {
     m_aReportWindow.SetMode(_eNewMode);
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OScrollWindowHelper::HasSelection() const
 {
     return m_aReportWindow.HasSelection();
 }
-//----------------------------------------------------------------------------
+
 void OScrollWindowHelper::Delete()
 {
     m_aReportWindow.Delete();
 }
-//----------------------------------------------------------------------------
+
 void OScrollWindowHelper::Copy()
 {
     m_aReportWindow.Copy();
 }
-//----------------------------------------------------------------------------
+
 void OScrollWindowHelper::Paste()
 {
     m_aReportWindow.Paste();
 }
-//----------------------------------------------------------------------------
+
 sal_Bool OScrollWindowHelper::IsPasteAllowed() const
 {
     return m_aReportWindow.IsPasteAllowed();
 }
-//-----------------------------------------------------------------------------
+
 void OScrollWindowHelper::SelectAll(const sal_uInt16 _nObjectType)
 {
     m_aReportWindow.SelectAll(_nObjectType);
 }
-//----------------------------------------------------------------------------
+
 void OScrollWindowHelper::unmarkAllObjects(OSectionView* _pSectionView)
 {
     m_aReportWindow.unmarkAllObjects(_pSectionView);
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OScrollWindowHelper::getMaxMarkerWidth(sal_Bool _bWithEnd) const
 {
     return m_aReportWindow.getMaxMarkerWidth(_bWithEnd);
 }
-//----------------------------------------------------------------------------
+
 void OScrollWindowHelper::showRuler(sal_Bool _bShow)
 {
     m_aReportWindow.showRuler(_bShow);
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OScrollWindowHelper::handleKeyEvent(const KeyEvent& _rEvent)
 {
     return m_aReportWindow.handleKeyEvent(_rEvent);
 }
-//------------------------------------------------------------------------
+
 void OScrollWindowHelper::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
 {
     m_aReportWindow.setMarked(_pSectionView,_bMark);
 }
-//------------------------------------------------------------------------
+
 void OScrollWindowHelper::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
 {
     m_aReportWindow.setMarked(_xSection,_bMark);
 }
-//------------------------------------------------------------------------
+
 void OScrollWindowHelper::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _xShape,sal_Bool _bMark)
 {
     m_aReportWindow.setMarked(_xShape,_bMark);
 }
-// -------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OScrollWindowHelper::getMarkedSection(NearSectionAccess nsa) const
 {
     return m_aReportWindow.getMarkedSection(nsa);
 }
-// -------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OScrollWindowHelper::getSectionWindow(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection) const
 {
     return  m_aReportWindow.getSectionWindow(_xSection);
 }
-// -------------------------------------------------------------------------
+
 void OScrollWindowHelper::markSection(const sal_uInt16 _nPos)
 {
     m_aReportWindow.markSection(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const
 {
     m_aReportWindow.fillCollapsedSections(_rCollapsedPositions);
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::collapseSections(const uno::Sequence< ::com::sun::star::beans::PropertyValue>& _aCollpasedSections)
 {
     m_aReportWindow.collapseSections(_aCollpasedSections);
 }
-//------------------------------------------------------------------------------
+
 bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
 {
     const CommandEvent* pCommandEvent = rNEvt.GetCommandEvent();
@@ -337,19 +337,19 @@ bool OScrollWindowHelper::Notify( NotifyEvent& rNEvt )
     }
     return OScrollWindowHelper_BASE::Notify(rNEvt);
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool bBoundRects)
 {
     m_aReportWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection, bBoundRects);
 }
-//------------------------------------------------------------------------------
+
 void OScrollWindowHelper::ImplInitSettings()
 {
     SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() ));
     SetFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetFaceColor() );
 }
-//-----------------------------------------------------------------------------
+
 void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -361,39 +361,39 @@ void OScrollWindowHelper::DataChanged( const DataChangedEvent& rDCEvt )
         Invalidate();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::_propertyChanged(const beans::PropertyChangeEvent& /*_rEvent*/) throw( uno::RuntimeException)
 {
     m_aReportWindow.notifySizeChanged();
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::setGridSnap(sal_Bool bOn)
 {
     m_aReportWindow.setGridSnap(bOn);
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::setDragStripes(sal_Bool bOn)
 {
     m_aReportWindow.setDragStripes(bOn);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 OScrollWindowHelper::getMarkedObjectCount() const
 {
     return m_aReportWindow.getMarkedObjectCount();
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::zoom(const Fraction& _aZoom)
 {
     m_aReportWindow.zoom(_aZoom);
     Resize();
     Invalidate(INVALIDATE_NOCHILDREN|INVALIDATE_TRANSPARENT);
 }
-// -----------------------------------------------------------------------------
+
 void OScrollWindowHelper::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
 {
     m_aReportWindow.fillControlModelSelection(_rSelection);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 OScrollWindowHelper::getZoomFactor(SvxZoomType _eType) const
 {
     return m_aReportWindow.getZoomFactor(_eType);
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index f792d4accc06..564c4072ef12 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -35,7 +35,7 @@ namespace rptui
     using namespace ::com::sun::star;
 TYPEINIT1( OSectionView, SdrView );
 
-//----------------------------------------------------------------------------
+
 OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, OReportWindow* pEditor )
     :SdrView( pModel, _pSectionWindow )
     ,m_pReportWindow( pEditor )
@@ -49,13 +49,13 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O
     SetQuickTextEditMode(sal_False);
 }
 
-//----------------------------------------------------------------------------
+
 
 OSectionView::~OSectionView()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 void OSectionView::MarkListHasChanged()
 {
@@ -69,7 +69,7 @@ void OSectionView::MarkListHasChanged()
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void OSectionView::MakeVisible( const Rectangle& rRect, Window& rWin )
 {
@@ -126,7 +126,7 @@ void OSectionView::MakeVisible( const Rectangle& rRect, Window& rWin )
         rWin.Invalidate(INVALIDATE_NOERASE);
     }
 }
-//------------------------------------------------------------------------------
+
 void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     SdrView::Notify(rBC,rHint);
@@ -142,7 +142,7 @@ void OSectionView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void OSectionView::ObjectRemovedInAliveMode( const SdrObject* _pObject )
 {
     const SdrMarkList& rMarkedList = GetMarkedObjectList();
@@ -161,7 +161,7 @@ void OSectionView::ObjectRemovedInAliveMode( const SdrObject* _pObject )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo )
 {
     if (AreObjectsMarked())
@@ -198,7 +198,7 @@ void OSectionView::SetMarkedToLayer( SdrLayerID _nLayerNo )
         MarkListHasChanged();
     }
 }
-// -----------------------------------------------------------------------------
+
 bool OSectionView::OnlyShapesMarked() const
 {
     const SdrMarkList& rMark = GetMarkedObjectList();
@@ -232,7 +232,7 @@ bool OSectionView::IsDragResize() const
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 short OSectionView::GetLayerIdOfMarkedObjects() const
 {
     short nRet = SHRT_MAX;
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx
index 87469429ab49..d0c752ab14fe 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -98,7 +98,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep
 
     _propertyChanged(aEvent);
 }
-// -----------------------------------------------------------------------------
+
 OSectionWindow::~OSectionWindow()
 {
     try
@@ -112,7 +112,7 @@ OSectionWindow::~OSectionWindow()
     {
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) throw( uno::RuntimeException)
 {
     SolarMutexGuard g;
@@ -156,7 +156,7 @@ void OSectionWindow::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OReportHelper> _pIsSectionOn)
 {
     OReportHelper aReportHelper(_xReport);
@@ -169,7 +169,7 @@ bool OSectionWindow::setReportSectionTitle(const uno::Reference< report::XReport
     }
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t<uno::Reference<report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool,OGroupHelper> _pIsSectionOn)
 {
     OGroupHelper aGroupHelper(_xGroup);
@@ -190,7 +190,7 @@ bool OSectionWindow::setGroupSectionTitle(const uno::Reference< report::XGroup>&
     }
     return bRet;
 }
-//------------------------------------------------------------------------------
+
 void OSectionWindow::ImplInitSettings()
 {
     static bool t = false;
@@ -202,7 +202,7 @@ void OSectionWindow::ImplInitSettings()
     }
     SetBackground( );
 }
-//-----------------------------------------------------------------------------
+
 void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -214,7 +214,7 @@ void OSectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
         Invalidate();
     }
 }
-//------------------------------------------------------------------------------
+
 void OSectionWindow::Resize()
 {
     Window::Resize();
@@ -265,7 +265,7 @@ void OSectionWindow::Resize()
         m_aEndMarker.SetPosSizePixel(aReportPos,Size(aEndWidth,aOutputSize.Height()));
     }
 }
-// -----------------------------------------------------------------------------
+
 void OSectionWindow::setCollapsed(sal_Bool _bCollapsed)
 {
     if ( m_aStartMarker.isCollapsed() != _bCollapsed )
@@ -273,18 +273,18 @@ void OSectionWindow::setCollapsed(sal_Bool _bCollapsed)
         m_aStartMarker.setCollapsed(_bCollapsed);
     }
 }
-//-----------------------------------------------------------------------------
+
 void OSectionWindow::showProperties()
 {
     m_pParent->getView()->showProperties( m_aReportSection.getSection().get() );
 }
-//-----------------------------------------------------------------------------
+
 void OSectionWindow::setMarked(sal_Bool _bMark)
 {
     m_aStartMarker.setMarked(_bMark);
     m_aEndMarker.setMarked(_bMark);
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
 {
     if ( _pMarker )
@@ -298,7 +298,7 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
     }
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 void OSectionWindow::zoom(const Fraction& _aZoom)
 {
     setZoomFactor(_aZoom,*this);
@@ -309,20 +309,20 @@ void OSectionWindow::zoom(const Fraction& _aZoom)
     setZoomFactor(_aZoom,m_aEndMarker);
     Invalidate();
 }
-//-----------------------------------------------------------------------------
+
 IMPL_LINK( OSectionWindow, StartSplitHdl, Splitter*,  )
 {
     const OUString sUndoAction( ModuleRes( RID_STR_UNDO_CHANGE_SIZE ) );
     getViewsWindow()->getView()->getReportView()->getController().getUndoManager().EnterListAction( sUndoAction, OUString() );
     return 0L;
 }
-//------------------------------------------------------------------------------
+
 IMPL_LINK( OSectionWindow, EndSplitHdl, Splitter*,  )
 {
     getViewsWindow()->getView()->getReportView()->getController().getUndoManager().LeaveListAction();
     return 0L;
 }
-//-----------------------------------------------------------------------------
+
 IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
 {
     if ( !getViewsWindow()->getView()->getReportView()->getController().isEditable() )
@@ -353,20 +353,20 @@ IMPL_LINK( OSectionWindow, SplitHdl, Splitter*, _pSplitter )
 
     return 0L;
 }
-// -----------------------------------------------------------------------------
+
 void lcl_scroll(Window& _rWindow,const Point& _aDelta)
 {
     _rWindow.Scroll(-_aDelta.X(),-_aDelta.Y());
     _rWindow.Invalidate(INVALIDATE_TRANSPARENT);
 }
-// -----------------------------------------------------------------------------
+
 void lcl_setOrigin(Window& _rWindow,long _nX, long _nY)
 {
     MapMode aMap = _rWindow.GetMapMode();
     aMap.SetOrigin( Point(- _nX, - _nY));
     _rWindow.SetMapMode( aMap );
 }
-//----------------------------------------------------------------------------
+
 void OSectionWindow::scrollChildren(long _nX)
 {
     const Point aDelta( _nX,0 );
diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx
index e13d0d984777..deec17b758ed 100644
--- a/reportdesign/source/ui/report/StartMarker.cxx
+++ b/reportdesign/source/ui/report/StartMarker.cxx
@@ -45,7 +45,7 @@ Image*  OStartMarker::s_pDefCollapsed       = NULL;
 Image*  OStartMarker::s_pDefExpanded        = NULL;
 oslInterlockedCount OStartMarker::s_nImageRefCount  = 0;
 
-// -----------------------------------------------------------------------------
+
 OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry)
 : OColorListener(_pParent,_sColorEntry)
 ,m_aVRuler(this,WB_VERT)
@@ -77,7 +77,7 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const OUString& _sColorEntry
     SetParentClipMode( PARENTCLIPMODE_NOCLIP );
     SetPaintTransparent( true );
 }
-// -----------------------------------------------------------------------------
+
 OStartMarker::~OStartMarker()
 {
     if ( osl_atomic_decrement(&s_nImageRefCount) == 0 )
@@ -86,14 +86,14 @@ OStartMarker::~OStartMarker()
         DELETEZ(s_pDefExpanded);
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 OStartMarker::getMinHeight() const
 {
     Fraction aExtraWidth(long(2*REPORT_EXTRA_SPACE));
     aExtraWidth *= GetMapMode().GetScaleX();
     return LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() + (long)aExtraWidth;
 }
-// -----------------------------------------------------------------------------
+
 void OStartMarker::Paint( const Rectangle& rRect )
 {
     (void)rRect;
@@ -142,7 +142,7 @@ void OStartMarker::Paint( const Rectangle& rRect )
         DrawPolyLine(Polygon(PixelToLogic(aRect)),LineInfo(LINE_SOLID,2 ));
     }
 }
-// -----------------------------------------------------------------------------
+
 void OStartMarker::setColor()
 {
     const Color aColor(m_nColor);
@@ -152,7 +152,7 @@ void OStartMarker::setColor()
     m_aText.SetTextColor(aTextColor);
     m_aText.SetLineColor(m_nColor);
 }
-// -----------------------------------------------------------------------
+
 void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( !rMEvt.IsLeft() )
@@ -177,13 +177,13 @@ void OStartMarker::MouseButtonUp( const MouseEvent& rMEvt )
 
     m_pParent->showProperties();
 }
-// -----------------------------------------------------------------------------
+
 void OStartMarker::changeImage()
 {
     Image* pImage = m_bCollapsed ? s_pDefCollapsed : s_pDefExpanded;
     m_aImage.SetImage(*pImage);
 }
-// -----------------------------------------------------------------------
+
 void OStartMarker::initDefaultNodeImages()
 {
     if ( !s_pDefCollapsed )
@@ -199,14 +199,14 @@ void OStartMarker::initDefaultNodeImages()
     m_aText.SetBackground();
     m_aText.SetMouseTransparent(true);
 }
-// -----------------------------------------------------------------------
+
 void OStartMarker::ImplInitSettings()
 {
     SetBackground( );
     SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
     setColor();
 }
-//------------------------------------------------------------------------------
+
 void OStartMarker::Resize()
 {
     const Size aOutputSize( GetOutputSizePixel() );
@@ -233,12 +233,12 @@ void OStartMarker::Resize()
     aPos.Y() += static_cast<sal_Int32>((LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() - aImageSize.Height()) * 0.5) ;
     m_aImage.SetPosSizePixel(aPos,aImageSize);
 }
-// -----------------------------------------------------------------------------
+
 void OStartMarker::setTitle(const OUString& _sTitle)
 {
     m_aText.SetText(_sTitle);
 }
-// -----------------------------------------------------------------------------
+
 void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
 {
     OColorListener::Notify(rBc, rHint);
@@ -250,13 +250,13 @@ void OStartMarker::Notify(SfxBroadcaster & rBc, SfxHint const & rHint)
         Invalidate(INVALIDATE_CHILDREN);
     }
 }
-//----------------------------------------------------------------------------
+
 void OStartMarker::showRuler(sal_Bool _bShow)
 {
     m_bShowRuler = _bShow;
     m_aVRuler.Show(!m_bCollapsed && m_bShowRuler);
 }
-//------------------------------------------------------------------------------
+
 void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
 {
     if( !m_aText.GetText().isEmpty())
@@ -275,14 +275,14 @@ void OStartMarker::RequestHelp( const HelpEvent& rHEvt )
             Help::ShowQuickHelp( this, aItemRect, m_aText.GetText() );
     }
 }
-// -----------------------------------------------------------------------------
+
 void OStartMarker::setCollapsed(sal_Bool _bCollapsed)
 {
     OColorListener::setCollapsed(_bCollapsed);
     showRuler(_bCollapsed);
     changeImage();
 }
-// -----------------------------------------------------------------------
+
 void OStartMarker::zoom(const Fraction& _aZoom)
 {
     setZoomFactor(_aZoom,*this);
@@ -291,7 +291,7 @@ void OStartMarker::zoom(const Fraction& _aZoom)
     Resize();
     Invalidate();
 }
-// -----------------------------------------------------------------------
+
 // =======================================================================
 }
 // =======================================================================
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index e0a4b8bc2a63..3e57fb04bc9b 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -56,7 +56,7 @@ namespace rptui
 
 using namespace ::com::sun::star;
 using namespace ::comphelper;
-// -----------------------------------------------------------------------------
+
 bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,SdrObject* _pObj,SdrView* _pView,sal_Int32 _nControlModification, bool _bBoundRects)
 {
     bool bMoveAllowed = _nXMov != 0 || _nYMov != 0;
@@ -168,7 +168,7 @@ bool lcl_getNewRectSize(const Rectangle& _aObjRect,long& _nXMov, long& _nYMov,Sd
     }
     return bMoveAllowed;
 }
-// -----------------------------------------------------------------------------
+
 
 OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
 : Window( _pReportWindow,WB_DIALOGCONTROL)
@@ -181,17 +181,17 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow)
     m_aColorConfig.AddListener(this);
     ImplInitSettings();
 }
-// -----------------------------------------------------------------------------
+
 OViewsWindow::~OViewsWindow()
 {
     m_aColorConfig.RemoveListener(this);
     m_aSections.clear();
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::initialize()
 {
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet)
 {
     const uno::Reference< report::XSection> xSection = _rSectionWindow.getReportSection().getSection();
@@ -213,7 +213,7 @@ void OViewsWindow::impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Poin
     _rStartPoint.Y() += aSectionSize.Height();
 }
 
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
 {
     bool bSet = false;
@@ -239,7 +239,7 @@ void OViewsWindow::resize(const OSectionWindow& _rSectionWindow)
     }
     m_pParent->notifySizeChanged();
 }
-//------------------------------------------------------------------------------
+
 void OViewsWindow::Resize()
 {
     Window::Resize();
@@ -256,7 +256,7 @@ void OViewsWindow::Resize()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::Paint( const Rectangle& rRect )
 {
     Window::Paint( rRect );
@@ -272,7 +272,7 @@ void OViewsWindow::Paint( const Rectangle& rRect )
     Wallpaper aWall( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor );
     DrawWallpaper(aRect,aWall);
 }
-//------------------------------------------------------------------------------
+
 void OViewsWindow::ImplInitSettings()
 {
     EnableChildTransparentMode( true );
@@ -280,7 +280,7 @@ void OViewsWindow::ImplInitSettings()
     SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
     SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );
 }
-//-----------------------------------------------------------------------------
+
 void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
     Window::DataChanged( rDCEvt );
@@ -292,7 +292,7 @@ void OViewsWindow::DataChanged( const DataChangedEvent& rDCEvt )
         Invalidate();
     }
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSection,const OUString& _sColorEntry,sal_uInt16 _nPosition)
 {
     ::boost::shared_ptr<OSectionWindow> pSectionWindow( new OSectionWindow(this,_xSection,_sColorEntry) );
@@ -300,7 +300,7 @@ void OViewsWindow::addSection(const uno::Reference< report::XSection >& _xSectio
     m_pParent->setMarked(&pSectionWindow->getReportSection().getSectionView(),m_aSections.size() == 1);
     Resize();
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::removeSection(sal_uInt16 _nPosition)
 {
     if ( _nPosition < m_aSections.size() )
@@ -314,7 +314,7 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition)
         Resize();
     }
 }
-//------------------------------------------------------------------------------
+
 void OViewsWindow::toggleGrid(sal_Bool _bVisible)
 {
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
@@ -322,7 +322,7 @@ void OViewsWindow::toggleGrid(sal_Bool _bVisible)
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::bind(&OReportSection::Window::Invalidate,_1,INVALIDATE_NOERASE),TReportPairHelper()));
 }
-//------------------------------------------------------------------------------
+
 sal_Int32 OViewsWindow::getTotalHeight() const
 {
     sal_Int32 nHeight = 0;
@@ -334,12 +334,12 @@ sal_Int32 OViewsWindow::getTotalHeight() const
     }
     return nHeight;
 }
-//----------------------------------------------------------------------------
+
 sal_uInt16 OViewsWindow::getSectionCount() const
 {
     return static_cast<sal_uInt16>(m_aSections.size());
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -349,19 +349,19 @@ void OViewsWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
 
     m_sShapeType = _sShapeType;
 }
-//----------------------------------------------------------------------------
+
 OUString OViewsWindow::GetInsertObjString() const
 {
     return m_sShapeType;
 }
 
-//------------------------------------------------------------------------------
+
 void OViewsWindow::SetMode( DlgEdMode eNewMode )
 {
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::bind(&OReportSection::SetMode,_1,eNewMode),TReportPairHelper()));
 }
-//----------------------------------------------------------------------------
+
 sal_Bool OViewsWindow::HasSelection() const
 {
     TSectionsMap::const_iterator aIter = m_aSections.begin();
@@ -370,7 +370,7 @@ sal_Bool OViewsWindow::HasSelection() const
         ;
     return aIter != aEnd;
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::Delete()
 {
     m_bInUnmark = sal_True;
@@ -378,7 +378,7 @@ void OViewsWindow::Delete()
         ::o3tl::compose1(::boost::mem_fn(&OReportSection::Delete),TReportPairHelper()));
     m_bInUnmark = sal_False;
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::Copy()
 {
     uno::Sequence< beans::NamedValue > aAllreadyCopiedObjects;
@@ -389,7 +389,7 @@ void OViewsWindow::Copy()
     uno::Reference< datatransfer::XTransferable> aEnsureDelete = pCopy;
     pCopy->CopyToClipboard(this);
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::Paste()
 {
     TransferableDataHelper aTransferData(TransferableDataHelper::CreateFromSystemClipboard(this));
@@ -404,7 +404,7 @@ void OViewsWindow::Paste()
             pMarkedSection->getReportSection().Paste(aCopies,true);
     }
 }
-// ---------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const uno::Reference< report::XSection>& _xSection) const
 {
     OSL_ENSURE(_xSection.is(),"Section is NULL!");
@@ -424,7 +424,7 @@ void OViewsWindow::Paste()
     return pSectionWindow;
 }
 
-//----------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OViewsWindow::getMarkedSection(NearSectionAccess nsa) const
 {
     ::boost::shared_ptr<OSectionWindow> pRet;
@@ -481,19 +481,19 @@ void OViewsWindow::Paste()
 
     return pRet;
 }
-// -------------------------------------------------------------------------
+
 void OViewsWindow::markSection(const sal_uInt16 _nPos)
 {
     if ( _nPos < m_aSections.size() )
         m_pParent->setMarked(m_aSections[_nPos]->getReportSection().getSection(),sal_True);
 }
-//----------------------------------------------------------------------------
+
 sal_Bool OViewsWindow::IsPasteAllowed() const
 {
     TransferableDataHelper aTransferData( TransferableDataHelper::CreateFromSystemClipboard( const_cast< OViewsWindow* >( this ) ) );
     return aTransferData.HasFormat(OReportExchange::getDescriptorFormatId());
 }
-//-----------------------------------------------------------------------------
+
 void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType)
 {
     m_bInUnmark = sal_True;
@@ -501,7 +501,7 @@ void OViewsWindow::SelectAll(const sal_uInt16 _nObjectType)
         ::o3tl::compose1(::boost::bind(::boost::mem_fn(&OReportSection::SelectAll),_1,_nObjectType),TReportPairHelper()));
     m_bInUnmark = sal_False;
 }
-//-----------------------------------------------------------------------------
+
 void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
 {
     if ( !m_bInUnmark )
@@ -520,13 +520,13 @@ void OViewsWindow::unmarkAllObjects(OSectionView* _pSectionView)
         m_bInUnmark = sal_False;
     }
 }
-// -----------------------------------------------------------------------
+
 void OViewsWindow::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32)
 {
     ImplInitSettings();
     Invalidate();
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() )
@@ -537,7 +537,7 @@ void OViewsWindow::MouseButtonDown( const MouseEvent& rMEvt )
     }
     Window::MouseButtonDown(rMEvt);
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::showRuler(sal_Bool _bShow)
 {
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
@@ -545,7 +545,7 @@ void OViewsWindow::showRuler(sal_Bool _bShow)
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::bind(&OStartMarker::Window::Invalidate, _1, sal_uInt16(INVALIDATE_NOERASE)), TStartMarkerHelper()));
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( rMEvt.IsLeft() )
@@ -568,7 +568,7 @@ void OViewsWindow::MouseButtonUp( const MouseEvent& rMEvt )
         }
     }
 }
-//------------------------------------------------------------------------------
+
 sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent)
 {
     sal_Bool bRet = sal_False;
@@ -583,7 +583,7 @@ sal_Bool OViewsWindow::handleKeyEvent(const KeyEvent& _rEvent)
     }
     return bRet;
 }
-//----------------------------------------------------------------------------
+
 OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _nPos)
 {
     TSectionsMap::iterator aRet = m_aSections.end();
@@ -591,14 +591,14 @@ OViewsWindow::TSectionsMap::iterator OViewsWindow::getIteratorAtPos(sal_uInt16 _
         aRet = m_aSections.begin() + _nPos;
     return aRet;
 }
-//------------------------------------------------------------------------
+
 void OViewsWindow::setMarked(OSectionView* _pSectionView,sal_Bool _bMark)
 {
     OSL_ENSURE(_pSectionView != NULL,"SectionView is NULL!");
     if ( _pSectionView )
         setMarked(_pSectionView->getReportSection()->getSection(),_bMark);
 }
-//------------------------------------------------------------------------
+
 void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -615,7 +615,7 @@ void OViewsWindow::setMarked(const uno::Reference< report::XSection>& _xSection,
         }
     }
 }
-//------------------------------------------------------------------------
+
 void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XReportComponent> >& _aShapes,sal_Bool _bMark)
 {
     bool bFirst = true;
@@ -643,7 +643,7 @@ void OViewsWindow::setMarked(const uno::Sequence< uno::Reference< report::XRepor
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles,  bool _bBoundRects)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -665,7 +665,7 @@ void OViewsWindow::collectRectangles(TRectangleMap& _rSortRectangles,  bool _bBo
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize)
 {
     bool bOnlyOnce = false;
@@ -731,7 +731,7 @@ void OViewsWindow::collectBoundResizeRect(const TRectangleMap& _rSortRectangles,
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlignAtSection, bool _bBoundRects)
 {
     if ( _nControlModification == ControlModification::NONE )
@@ -885,14 +885,14 @@ void OViewsWindow::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAli
         pView->AdjustMarkHdl();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::createDefault()
 {
     ::boost::shared_ptr<OSectionWindow> pMarkedSection = getMarkedSection();
     if ( pMarkedSection )
         pMarkedSection->getReportSection().createDefault(m_sShapeType);
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::setGridSnap(sal_Bool bOn)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -904,7 +904,7 @@ void OViewsWindow::setGridSnap(sal_Bool bOn)
         (*aIter)->getReportSection().Invalidate(nIn);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::setDragStripes(sal_Bool bOn)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -912,7 +912,7 @@ void OViewsWindow::setDragStripes(sal_Bool bOn)
     for (; aIter != aEnd ; ++aIter)
         (*aIter)->getReportSection().getSectionView().SetDragStripes(bOn);
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) const
 {
     TSectionsMap::const_iterator aIter = m_aSections.begin();
@@ -928,7 +928,7 @@ sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) cons
     }
     return nPosition;
 }
-// -----------------------------------------------------------------------------
+
 ::boost::shared_ptr<OSectionWindow> OViewsWindow::getSectionWindow(const sal_uInt16 _nPos) const
 {
     ::boost::shared_ptr<OSectionWindow> aReturn;
@@ -938,7 +938,7 @@ sal_uInt16 OViewsWindow::getPosition(const OSectionWindow* _pSectionWindow) cons
 
     return aReturn;
 }
-// -----------------------------------------------------------------------------
+
 namespace
 {
     enum SectionViewAction
@@ -983,13 +983,13 @@ namespace
         }
     };
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::BrkAction()
 {
     EndDragObj_removeInvisibleObjects();
     ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eBreakAction) );
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _aRect, const OSectionView& _rSection)
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -1022,13 +1022,13 @@ void OViewsWindow::BegDragObj_createInvisibleObjectAtPosition(const Rectangle& _
         aNewPos.Y() -= nSectionHeight;
     }
 }
-// -----------------------------------------------------------------------------
+
 bool OViewsWindow::isObjectInMyTempList(SdrObject *_pObj)
 {
     return ::std::find(m_aBegDragTempList.begin(),m_aBegDragTempList.end(),_pObj) != m_aBegDragTempList.end();
 }
 
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection)
 {
     OSL_TRACE("BegDragObj Clickpoint X:%d Y:%d", _aPnt.X(), _aPnt.Y() );
@@ -1126,12 +1126,12 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::ForceMarkedToAnotherPage()
 {
     ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction(eForceToAnotherPage ) );
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection)
 {
     bool bAdd = true;
@@ -1161,7 +1161,7 @@ void OViewsWindow::BegMarkObj(const Point& _aPnt,const OSectionView* _pSection)
         nLastSectionHeight = rReportSection.PixelToLogic(rReportSection.GetOutputSizePixel()).Height();
     }
 }
-// -----------------------------------------------------------------------------
+
 OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pSection,Point& _rPnt)
 {
     OSectionView* pSection = NULL;
@@ -1210,7 +1210,7 @@ OSectionView* OViewsWindow::getSectionRelativeToPosition(const OSectionView* _pS
 
     return pSection;
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::EndDragObj_removeInvisibleObjects()
 {
     TSectionsMap::iterator aIter = m_aSections.begin();
@@ -1222,7 +1222,7 @@ void OViewsWindow::EndDragObj_removeInvisibleObjects()
         rReportSection.getPage()->resetSpecialMode();
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView* _pSection,const Point& _aPnt)
 {
     const OUString sUndoAction = ModuleRes(RID_STR_UNDO_CHANGEPOSITION);
@@ -1327,12 +1327,12 @@ void OViewsWindow::EndDragObj(sal_Bool _bControlKeyPressed, const OSectionView*
     }
     m_aDragDelta = Point(SAL_MAX_INT32, SAL_MAX_INT32);
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::EndAction()
 {
     ::std::for_each( m_aSections.begin(), m_aSections.end(), ApplySectionViewAction() );
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bool _bMove, bool _bControlKeySet)
 {
     (void)_bMove;
@@ -1400,7 +1400,7 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
         aRealMousePos.Y() -= nSectionHeight;
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OViewsWindow::IsAction() const
 {
     sal_Bool bAction = sal_False;
@@ -1410,7 +1410,7 @@ sal_Bool OViewsWindow::IsAction() const
         bAction = (*aIter)->getReportSection().getSectionView().IsAction();
     return bAction;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OViewsWindow::IsDragObj() const
 {
     sal_Bool bAction = sal_False;
@@ -1420,7 +1420,7 @@ sal_Bool OViewsWindow::IsDragObj() const
         bAction = (*aIter)->getReportSection().getSectionView().IsAction();
     return bAction;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt32 OViewsWindow::getMarkedObjectCount() const
 {
     sal_uInt32 nCount = 0;
@@ -1430,7 +1430,7 @@ sal_uInt32 OViewsWindow::getMarkedObjectCount() const
         nCount += (*aIter)->getReportSection().getSectionView().GetMarkedObjectCount();
     return nCount;
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::handleKey(const KeyCode& _rCode)
 {
     const sal_uInt16 nCode = _rCode.GetCode();
@@ -1647,13 +1647,13 @@ void OViewsWindow::handleKey(const KeyCode& _rCode)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::stopScrollTimer()
 {
     ::std::for_each(m_aSections.begin(),m_aSections.end(),
         ::o3tl::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper()));
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedPositions) const
 {
     TSectionsMap::const_iterator aIter = m_aSections.begin();
@@ -1664,7 +1664,7 @@ void OViewsWindow::fillCollapsedSections(::std::vector<sal_uInt16>& _rCollapsedP
             _rCollapsedPositions.push_back(i);
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>& _aCollpasedSections)
 {
     const beans::PropertyValue* pIter = _aCollpasedSections.getConstArray();
@@ -1678,7 +1678,7 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>&
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::zoom(const Fraction& _aZoom)
 {
     const MapMode& aMapMode = GetMapMode();
@@ -1708,7 +1708,7 @@ void OViewsWindow::zoom(const Fraction& _aZoom)
     static sal_Int32 nIn = INVALIDATE_NOCHILDREN;
     Invalidate(aRect,nIn);
 }
-//----------------------------------------------------------------------------
+
 void OViewsWindow::scrollChildren(const Point& _aThumbPos)
 {
     const Point aPos(PixelToLogic(_aThumbPos));
@@ -1731,7 +1731,7 @@ void OViewsWindow::scrollChildren(const Point& _aThumbPos)
         (*aIter)->scrollChildren(aPos.X());
     }
 }
-// -----------------------------------------------------------------------------
+
 void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const
 {
     TSectionsMap::const_iterator aIter = m_aSections.begin();
diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx
index 48b334e9cbd5..6a5752f91645 100644
--- a/reportdesign/source/ui/report/dlgedclip.cxx
+++ b/reportdesign/source/ui/report/dlgedclip.cxx
@@ -30,12 +30,12 @@ using namespace ::com::sun::star;
 //============================================================================
 // OReportExchange
 //============================================================================
-//----------------------------------------------------------------------------
+
 OReportExchange::OReportExchange(const TSectionElements& _rCopyElements )
 : m_aCopyElements(_rCopyElements)
 {
 }
-//--------------------------------------------------------------------
+
 sal_uInt32 OReportExchange::getDescriptorFormatId()
 {
     static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -46,12 +46,12 @@ sal_uInt32 OReportExchange::getDescriptorFormatId()
     }
     return s_nFormat;
 }
-//--------------------------------------------------------------------
+
 void OReportExchange::AddSupportedFormats()
 {
     AddFormat(getDescriptorFormatId());
 }
-//--------------------------------------------------------------------
+
 sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor )
 {
     const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
@@ -59,12 +59,12 @@ sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor )
         SetAny( uno::Any(m_aCopyElements), _rFlavor )
         : sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor)
 {
     return IsFormatSupported(_rFlavor,getDescriptorFormatId());
 }
-// -----------------------------------------------------------------------------
+
 OReportExchange::TSectionElements OReportExchange::extractCopies(const TransferableDataHelper& _rData)
 {
     sal_Int32 nKnownFormatId = getDescriptorFormatId();
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx
index 8afad4a9ada3..a538ec0dcaa7 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -30,21 +30,21 @@ namespace rptui
 {
 using namespace ::com::sun::star;
 
-//----------------------------------------------------------------------------
+
 
 DlgEdFactory::DlgEdFactory()
 {
     SdrObjFactory::InsertMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
 
-//----------------------------------------------------------------------------
+
 
 DlgEdFactory::~DlgEdFactory()
 {
     SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
 {
@@ -98,7 +98,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
 
     return 0;
 }
-//----------------------------------------------------------------------------
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx
index ef5a8f670613..1af8f100afee 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -60,9 +60,9 @@
 namespace rptui
 {
 using namespace ::com::sun::star;
-//----------------------------------------------------------------------------
 
-//----------------------------------------------------------------------------
+
+
 
 IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *,  )
 {
@@ -70,7 +70,7 @@ IMPL_LINK( DlgEdFunc, ScrollTimeout, Timer *,  )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 void DlgEdFunc::ForceScroll( const Point& rPos )
 {
@@ -117,7 +117,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
     aScrollTimer.Start();
 }
 
-//----------------------------------------------------------------------------
+
 
 DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
 :m_pParent(_pParent),
@@ -133,12 +133,12 @@ DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
     aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
 }
 
-//----------------------------------------------------------------------------
+
 void DlgEdFunc::setOverlappedControlColor(sal_Int32 _nColor)
 {
     m_nOverlappedControlColor = _nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nColorTRGB)
 {
     sal_Int32 nBackColor = 0;
@@ -160,14 +160,14 @@ sal_Int32 lcl_setColorOfObject(uno::Reference< uno::XInterface > _xObj, long _nC
     }
     return nBackColor;
 }
-// -----------------------------------------------------------------------------
+
 DlgEdFunc::~DlgEdFunc()
 {
     unColorizeOverlappedObj();
     aScrollTimer.Stop();
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -227,7 +227,7 @@ sal_Bool DlgEdFunc::MouseButtonDown( const MouseEvent& rMEvt )
     return bHandled;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ )
 {
@@ -235,7 +235,7 @@ sal_Bool DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ )
     m_pParent->getSectionWindow()->getViewsWindow()->stopScrollTimer();
     return bHandled;
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt)
 {
     deactivateOle();
@@ -255,7 +255,7 @@ void DlgEdFunc::checkTwoCklicks(const MouseEvent& rMEvt)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::stopScrollTimer()
 {
     unColorizeOverlappedObj();
@@ -263,13 +263,13 @@ void DlgEdFunc::stopScrollTimer()
     if ( m_pParent->IsMouseCaptured() )
         m_pParent->ReleaseMouse();
 }
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFunc::MouseMove( const MouseEvent& /*rMEvt*/ )
 {
     return sal_False;
 }
-//------------------------------------------------------------------------------
+
 sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
 {
     sal_Bool bReturn = sal_False;
@@ -387,7 +387,7 @@ sal_Bool DlgEdFunc::handleKeyEvent(const KeyEvent& _rEvent)
 
     return bReturn;
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::activateOle(SdrObject* _pObj)
 {
     if ( _pObj )
@@ -429,7 +429,7 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::deactivateOle(bool _bSelect)
 {
     OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
@@ -459,7 +459,7 @@ void DlgEdFunc::deactivateOle(bool _bSelect)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj)
 {
     OObjectBase* pObj = dynamic_cast<OObjectBase*>(_pOverlappedObj);
@@ -483,7 +483,7 @@ void DlgEdFunc::colorizeOverlappedObject(SdrObject* _pOverlappedObj)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::unColorizeOverlappedObj()
 {
     // uncolorize an old object, if there is one
@@ -500,7 +500,7 @@ void DlgEdFunc::unColorizeOverlappedObj()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt)
 {
     SdrViewEvent aVEvt;
@@ -516,7 +516,7 @@ bool DlgEdFunc::isOverlapping(const MouseEvent& rMEvt)
 
     return bOverlapping;
 }
-// -----------------------------------------------------------------------------
+
 void DlgEdFunc::checkMovementAllowed(const MouseEvent& rMEvt)
 {
     if ( m_pParent->getSectionWindow()->getViewsWindow()->IsDragObj() )
@@ -556,7 +556,7 @@ void DlgEdFunc::checkMovementAllowed(const MouseEvent& rMEvt)
     else
         m_pParent->getSectionWindow()->getViewsWindow()->EndAction();
 }
-// -----------------------------------------------------------------------------
+
 bool DlgEdFunc::isOnlyCustomShapeMarked()
 {
     bool bReturn = true;
@@ -574,7 +574,7 @@ bool DlgEdFunc::isOnlyCustomShapeMarked()
     }
     return bReturn;
 }
-// -----------------------------------------------------------------------------
+
 bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
 {
     if (isOnlyCustomShapeMarked())
@@ -631,7 +631,7 @@ bool DlgEdFunc::isRectangleHit(const MouseEvent& rMEvt)
         bIsSetPoint = false;
     return bIsSetPoint;
 }
-// -----------------------------------------------------------------------------
+
 bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt)
 {
     bool bIsSetPoint = isRectangleHit(rMEvt);
@@ -649,7 +649,7 @@ bool DlgEdFunc::setMovementPointer(const MouseEvent& rMEvt)
     }
     return bIsSetPoint;
 }
-//----------------------------------------------------------------------------
+
 
 DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) :
     DlgEdFunc( _pParent )
@@ -657,14 +657,14 @@ DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) :
     m_rView.SetCreateMode( sal_True );
 }
 
-//----------------------------------------------------------------------------
+
 
 DlgEdFuncInsert::~DlgEdFuncInsert()
 {
     m_rView.SetEditMode( sal_True );
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -709,7 +709,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonDown( const MouseEvent& rMEvt )
     return sal_True;
 }
 
-//----------------------------------------------------------------------------
+
 sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
 {
     if ( DlgEdFunc::MouseButtonUp( rMEvt ) )
@@ -771,7 +771,7 @@ sal_Bool DlgEdFuncInsert::MouseButtonUp( const MouseEvent& rMEvt )
     return bReturn;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
 {
@@ -807,20 +807,20 @@ sal_Bool DlgEdFuncInsert::MouseMove( const MouseEvent& rMEvt )
     return sal_True;
 }
 
-//----------------------------------------------------------------------------
+
 
 DlgEdFuncSelect::DlgEdFuncSelect( OReportSection* _pParent ) :
     DlgEdFunc( _pParent )
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 DlgEdFuncSelect::~DlgEdFuncSelect()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -866,7 +866,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonDown( const MouseEvent& rMEvt )
     return sal_True;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -890,7 +890,7 @@ sal_Bool DlgEdFuncSelect::MouseButtonUp( const MouseEvent& rMEvt )
     return sal_True;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
 {
@@ -936,7 +936,7 @@ sal_Bool DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt )
     return sal_True;
 }
 
-//----------------------------------------------------------------------------
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 5c550a7a8294..c9591ae16477 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -67,8 +67,8 @@ using namespace beans;
 using namespace container;
 using namespace ::comphelper;
 
-//----------------------------------------------------------------------------
-//-----------------------------------------------------------------------
+
+
 namespace
 {
     static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext )
@@ -84,13 +84,13 @@ namespace
         return bEnabled;
     }
 }
-//-----------------------------------------------------------------------
+
 //============================================================================
 // PropBrw
 //============================================================================
 
 
-//----------------------------------------------------------------------------
+
 
 PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, ODesignView*  _pDesignView)
           :DockingWindow(pParent,WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE))
@@ -181,7 +181,7 @@ PropBrw::PropBrw(const Reference< XComponentContext >& _xORB, Window* pParent, O
     ::rptui::notifySystemWindow(pParent,this,::comphelper::mem_fun(&TaskPaneList::AddWindow));
 }
 
-//----------------------------------------------------------------------------
+
 
 PropBrw::~PropBrw()
 {
@@ -205,12 +205,12 @@ PropBrw::~PropBrw()
 
     ::rptui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
 }
-// -----------------------------------------------------------------------------
+
 void PropBrw::setCurrentPage(const OUString& _sLastActivePage)
 {
     m_sLastActivePage = _sLastActivePage;
 }
-//----------------------------------------------------------------------------
+
 
 void PropBrw::implDetachController()
 {
@@ -227,7 +227,7 @@ void PropBrw::implDetachController()
     m_xBrowserController.clear();
     m_xBrowserComponentWindow.clear();
 }
-//-----------------------------------------------------------------------
+
 OUString PropBrw::getCurrentPage() const
 {
     OUString sCurrentPage;
@@ -247,7 +247,7 @@ OUString PropBrw::getCurrentPage() const
     }
     return sCurrentPage;
 }
-//----------------------------------------------------------------------------
+
 
 bool PropBrw::Close()
 {
@@ -276,7 +276,7 @@ bool PropBrw::Close()
     return true;
 }
 
-//----------------------------------------------------------------------------
+
 
 uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const SdrMarkList& _rMarkList)
 {
@@ -308,7 +308,7 @@ uno::Sequence< Reference<uno::XInterface> > PropBrw::CreateCompPropSet(const Sdr
     Reference<uno::XInterface> *pSets = aSets.empty() ? NULL : &aSets[0];
     return uno::Sequence< Reference<uno::XInterface> >(pSets, aSets.size());
 }
-//----------------------------------------------------------------------------
+
 void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface> >& _aObjects )
 {
     if ( m_xBrowserController.is() )
@@ -326,7 +326,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference<uno::XInterface>
     SetText( GetHeadlineName(_aObjects) );
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterface> >& _aObjects )
 {
@@ -400,13 +400,13 @@ OUString PropBrw::GetHeadlineName( const uno::Sequence< Reference<uno::XInterfac
 
     return aName;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(OObjectBase* _pObj)
 {
     _pObj->initializeOle();
     return CreateComponentPair(_pObj->getAwtComponent(),_pObj->getReportComponent());
 }
-//----------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Reference< uno::XInterface>& _xFormComponent
                                                               ,const uno::Reference< uno::XInterface>& _xReportComponent)
 {
@@ -418,7 +418,7 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen
 
     return xNameCont.get();
 }
-// -----------------------------------------------------------------------------
+
 ::Size PropBrw::getMinimumSize() const
 {
     ::Size aSize;
@@ -433,7 +433,7 @@ uno::Reference< uno::XInterface> PropBrw::CreateComponentPair(const uno::Referen
     }
     return aSize;
 }
-//----------------------------------------------------------------------------
+
 void PropBrw::Resize()
 {
     Window::Resize();
@@ -466,7 +466,7 @@ void PropBrw::Resize()
             awt::PosSize::WIDTH | awt::PosSize::HEIGHT);
     }
 }
-//----------------------------------------------------------------------------
+
 void PropBrw::Update( OSectionView* pNewView )
 {
     try
@@ -539,7 +539,7 @@ void PropBrw::Update( OSectionView* pNewView )
         OSL_FAIL( "PropBrw::Update: Exception occurred!" );
     }
 }
-//----------------------------------------------------------------------------
+
 void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
 {
     if ( m_xLastSection != _xReportComponent )
@@ -562,20 +562,20 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent)
         }
     }
 }
-//-----------------------------------------------------------------------
+
 IMPL_LINK( PropBrw, OnAsyncGetFocus, void*,  )
 {
     if (m_xBrowserComponentWindow.is())
         m_xBrowserComponentWindow->setFocus();
     return 0L;
 }
-//----------------------------------------------------------------------------
+
 void PropBrw::LoseFocus()
 {
     DockingWindow::LoseFocus();
     m_pDesignView->getController().InvalidateAll();
 }
-//----------------------------------------------------------------------------
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index f056ce191771..5d2e5a0b752c 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -97,10 +97,10 @@ namespace /* private */
     class sum_of_string_lengths
     {
     public:
-        //--------------------------------
+
         sum_of_string_lengths() : sum_(0) {}
 
-        //--------------------------------
+
         void operator() (const rtl::OUString& string)
         {
             OSL_ASSERT(string.getLength());
@@ -110,7 +110,7 @@ namespace /* private */
                 sum_ += string.getLength() + 1;
         }
 
-        //--------------------------------
+
         operator size_t () const
         {
             return sum_;
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index d81c463220a1..1369421c2f9b 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -34,9 +34,9 @@ using ::rtl::OString;
 // This file contains cppunit tests for the
 // OString and OStringBuffer classes
 
-//------------------------------------------------------------------------
+
 // testing constructors
-//------------------------------------------------------------------------
+
 
 namespace rtl_OStringBuffer
 {
@@ -166,7 +166,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  makeStringAndClear : public CppUnit::TestFixture
     {
@@ -372,7 +372,7 @@ namespace rtl_OStringBuffer
     };
 
 
-// -----------------------------------------------------------------------------
+
 
     class  getLength : public CppUnit::TestFixture
     {
@@ -505,7 +505,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  getCapacity : public CppUnit::TestFixture
     {
@@ -689,7 +689,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( getCapacity_013 );
         CPPUNIT_TEST_SUITE_END();
     };
-// -----------------------------------------------------------------------------
+
 
     class  ensureCapacity : public CppUnit::TestFixture
     {
@@ -969,7 +969,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  setLength : public CppUnit::TestFixture
     {
@@ -1459,7 +1459,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  csuc : public CppUnit::TestFixture
     {
@@ -1505,7 +1505,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  getStr : public CppUnit::TestFixture
     {
@@ -1551,7 +1551,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  append_001 : public CppUnit::TestFixture
     {
@@ -1960,7 +1960,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 
     class  append_002 : public CppUnit::TestFixture
     {
@@ -2347,7 +2347,7 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-// -----------------------------------------------------------------------------
+
 
     class  append_003 : public CppUnit::TestFixture
     {
@@ -2733,7 +2733,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_003_024 );
         CPPUNIT_TEST_SUITE_END();
     };
-//-----------------------------------------------------------------------------
+
 
     class  append_004 : public CppUnit::TestFixture
     {
@@ -2967,9 +2967,9 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append(sal_Char c)
-//------------------------------------------------------------------------
+
     class  append_005 : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -5177,7 +5177,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 );
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int32 i, sal_Int16 radix=2 )
 // where i = large constants
 // testing the method append( sal_Int32 i, sal_Int16 radix=8 )
@@ -5188,7 +5188,7 @@ namespace rtl_OStringBuffer
 // where i = large constants
 // testing the method append( sal_Int32 i, sal_Int16 radix=36 )
 // where i = large constants
-//------------------------------------------------------------------------
+
     class  append_006_Int32_Bounderies : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -6188,7 +6188,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_049 ); CPPUNIT_TEST( append_050 );
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int32 i, sal_Int16 radix=2 )
 // for negative value
 // testing the method append( sal_Int32 i, sal_Int16 radix=8 )
@@ -6199,7 +6199,7 @@ namespace rtl_OStringBuffer
 // for negative value
 // testing the method append( sal_Int32 i, sal_Int16 radix=36 )
 // for negative value
-//------------------------------------------------------------------------
+
     class  append_006_Int32_Negative : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -8246,9 +8246,9 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 );
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int32 i, sal_Int16 radix ) where radix = -5
-//------------------------------------------------------------------------
+
     class  append_006_Int32_WrongRadix : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -8377,7 +8377,7 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
     class  append_006_Int32_defaultParam : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -8945,13 +8945,13 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int64 l, sal_Int16 radix=2 )
 // testing the method append( sal_Int64 l, sal_Int16 radix=8 )
 // testing the method append( sal_Int64 l, sal_Int16 radix=10 )
 // testing the method append( sal_Int64 l, sal_Int16 radix=16 )
 // testing the method append( sal_Int64 l, sal_Int16 radix=36 )
-//------------------------------------------------------------------------
+
     class  append_007_Int64 : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -10926,7 +10926,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 );
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int64 i, sal_Int16 radix=2 )
 // where i = large constants
 // testing the method append( sal_Int64 i, sal_Int16 radix=8 )
@@ -10937,7 +10937,7 @@ namespace rtl_OStringBuffer
 // where i = large constants
 // testing the method append( sal_Int64 i, sal_Int16 radix=36 )
 // where i = large constants
-//------------------------------------------------------------------------
+
     class  append_007_Int64_Bounderies : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -11937,7 +11937,7 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_049 ); CPPUNIT_TEST( append_050 );
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int64 i, sal_Int16 radix=2 )
 // for negative value
 // testing the method append( sal_Int64 i, sal_Int16 radix=8 )
@@ -11948,7 +11948,7 @@ namespace rtl_OStringBuffer
 // for negative value
 // testing the method append( sal_Int64 i, sal_Int16 radix=36 )
 // for negative value
-//------------------------------------------------------------------------
+
     class  append_007_Int64_Negative : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -13998,9 +13998,9 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 );
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( sal_Int64 i, sal_Int16 radix ) where radix = -5
-//------------------------------------------------------------------------
+
     class  append_007_Int64_WrongRadix : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -14127,7 +14127,7 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
     class  append_007_Int64_defaultParam : public CppUnit::TestFixture
     {
         OString* arrOUS[5];
@@ -14690,9 +14690,9 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( float f )
-//------------------------------------------------------------------------
+
     class checkfloat : public CppUnit::TestFixture
     {
     public:
@@ -14710,7 +14710,7 @@ namespace rtl_OStringBuffer
                 return false;
             }
     };
-// -----------------------------------------------------------------------------
+
     class  append_008_float : public checkfloat
     {
         OString* arrOUS[5];
@@ -15444,9 +15444,9 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( float f ) for negative value
-//------------------------------------------------------------------------
+
     class  append_008_Float_Negative : public checkfloat
     {
         OString* arrOUS[5];
@@ -16176,9 +16176,9 @@ namespace rtl_OStringBuffer
 #endif
         CPPUNIT_TEST_SUITE_END();
     };
-//------------------------------------------------------------------------
+
 // testing the method append( double d )
-//------------------------------------------------------------------------
+
 
     class checkdouble : public CppUnit::TestFixture
     {
@@ -16257,9 +16257,9 @@ namespace rtl_OStringBuffer
         CPPUNIT_TEST_SUITE_END();
     };
 
-//------------------------------------------------------------------------
+
 // testing the method append( double f ) for negative value
-//------------------------------------------------------------------------
+
     class  append_009_Double_Negative : public checkdouble
     {
         OString* arrOUS[5];
@@ -16320,7 +16320,7 @@ namespace rtl_OStringBuffer
     };
 } // namespace rtl_OStringBuffer
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::makeStringAndClear);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::getLength);
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 1b5cf71c7d0b..592935f16a6b 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -77,7 +77,7 @@ sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt )
     return ( dst );
 }
 
-//------------------------------------------------------------------------
+
 bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len )
 {
     const sal_Char* pBuf1 = str1;
@@ -92,7 +92,7 @@ bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len )
     }
     return( i == len );
 }
-//-----------------------------------------------------------------------
+
 bool cmpstr( const sal_Char* str1, const sal_Char* str2 )
 {
     const sal_Char* pBuf1 = str1;
@@ -110,7 +110,7 @@ bool cmpstr( const sal_Char* str1, const sal_Char* str2 )
         res = false;
     return (res);
 }
-//------------------------------------------------------------------------
+
 bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len )
 {
     const sal_Unicode* pBuf1 = str1;
@@ -126,7 +126,7 @@ bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len )
     return( i == len );
 }
 
-//-----------------------------------------------------------------------
+
 bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 )
 {
     const sal_Unicode* pBuf1 = str1;
diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx
index 470ffaf4dae4..48e04011e38a 100644
--- a/sal/qa/osl/condition/osl_Condition.cxx
+++ b/sal/qa/osl/condition/osl_Condition.cxx
@@ -18,9 +18,9 @@
  */
 
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <osl_Condition_Const.h>
 #include <stdlib.h>
 
@@ -28,9 +28,9 @@ using namespace osl;
 using namespace rtl;
 
 
-//------------------------------------------------------------------------
+
 // helper functions and classes
-//------------------------------------------------------------------------
+
 
 /** print Boolean value.
 */
@@ -93,9 +93,9 @@ protected:
 };
 
 
-//------------------------------------------------------------------------
+
 // test code start here
-//------------------------------------------------------------------------
+
 
 namespace osl_Condition
 {
@@ -339,18 +339,18 @@ namespace osl_Condition
     }; // class check
 
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::set);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::reset);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::wait);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::check);
-// -----------------------------------------------------------------------------
+
 
 } // namespace osl_Condition
 
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 48fab3d84afd..b5c5faaf05e8 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -47,9 +47,9 @@ using ::rtl::OUStringToOString;
 using ::rtl::OString;
 using ::rtl::OStringToOUString;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 /** detailed wrong message.
 */
@@ -638,18 +638,18 @@ inline ::rtl::OUString getCurrentPID( void );
 
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for FileBase class
-//------------------------------------------------------------------------
+
 namespace osl_FileBase
 {
 
-    //---------------------------------------------------------------------
+
     // testing the method
     // static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL,
     //                                      const ::rtl::OUString& ustrRelativeFileURL,
     //                                      ::rtl::OUString& ustrAbsoluteFileURL )
-    //---------------------------------------------------------------------
+
 
     class getAbsoluteFileURL:public CppUnit::TestFixture
     {
@@ -799,13 +799,13 @@ namespace osl_FileBase
         deleteTestDirectory( aUStrBase );
         deleteTestDirectory( aUStrUpBase );
     }
-    //---------------------------------------------------------------------
+
     // testing two methods:
     // static inline RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL,
     //                ::rtl::OUString& ustrSystemPath )
         // static RC getFileURLFromSystemPath( const ::rtl::OUString & ustrSystemPath,
         //                                ::rtl::OUString & ustrFileURL );
-    //---------------------------------------------------------------------
+
     class SystemPath_FileURL:public CppUnit::TestFixture
     {
         //::osl::FileBase aFileBase;
@@ -1193,12 +1193,12 @@ namespace osl_FileBase
 
 
 
-    //---------------------------------------------------------------------
+
     // testing the method
     // static inline RC searchFileURL(  const ::rtl::OUString& ustrFileName,
     //                                  const ::rtl::OUString& ustrSearchPath,
     //                                  ::rtl::OUString& ustrFileURL )
-    //---------------------------------------------------------------------
+
     class searchFileURL:public CppUnit::TestFixture
     {
         //::osl::FileBase aFileBase;
@@ -1293,10 +1293,10 @@ namespace osl_FileBase
     };// class searchFileURL
 
 
-    //---------------------------------------------------------------------
+
     // testing the method
     // static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL )
-    //---------------------------------------------------------------------
+
     class getTempDirURL:public CppUnit::TestFixture
     {
         //::osl::FileBase aFileBase;
@@ -1338,12 +1338,12 @@ namespace osl_FileBase
     };// class getTempDirURL
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  static inline RC createTempFile( ::rtl::OUString* pustrDirectoryURL,
     //                                   oslFileHandle* pHandle,
     //                                   ::rtl::OUString* pustrTempFileURL)
-    //---------------------------------------------------------------------
+
     class createTempFile:public CppUnit::TestFixture
     {
         //::osl::FileBase aFileBase;
@@ -1441,7 +1441,7 @@ namespace osl_FileBase
         CPPUNIT_TEST_SUITE_END();
     };// class createTempFile
 
-    // -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::SystemPath_FileURL, "osl_FileBase" );
   //        CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getFileURLFromSystemPath, "osl_FileBase" );
@@ -1451,16 +1451,16 @@ namespace osl_FileBase
 }// namespace osl_FileBase
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for VolumeInfo class
-//------------------------------------------------------------------------
+
 namespace osl_VolumeInfo
 {
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  VolumeInfo( sal_uInt32 nMask ): _nMask( nMask )
-    //---------------------------------------------------------------------
+
     class  ctors : public CppUnit::TestFixture
     {
         ::rtl::OUString aUStr;
@@ -1554,10 +1554,10 @@ namespace osl_VolumeInfo
     };// class ctors
 
 
-     //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool isValid( sal_uInt32 nMask ) const
-    //---------------------------------------------------------------------
+
     class  isValid : public CppUnit::TestFixture
     {
         ::osl::VolumeDevice aVolumeDevice;
@@ -1633,10 +1633,10 @@ namespace osl_VolumeInfo
         CPPUNIT_TEST_SUITE_END();
     };// class isValid
 
-     //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool getRemoteFlag() const
-    //---------------------------------------------------------------------
+
     class  getRemoteFlag : public CppUnit::TestFixture
     {
         ::osl::VolumeDevice aVolumeDevice;
@@ -1684,10 +1684,10 @@ namespace osl_VolumeInfo
         CPPUNIT_TEST_SUITE_END();
     };// class getRemoteFlag
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool getRemoveableFlag() const
-    //---------------------------------------------------------------------
+
     class  getRemoveableFlag : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -1725,10 +1725,10 @@ namespace osl_VolumeInfo
     };// class getRemoveableFlag
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool getCompactDiscFlag() const
-    //---------------------------------------------------------------------
+
     class  getCompactDiscFlag : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -1766,10 +1766,10 @@ namespace osl_VolumeInfo
     };// class getCompactDiscFlag
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool getFloppyDiskFlag() const
-    //---------------------------------------------------------------------
+
     class  getFloppyDiskFlag : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -1807,10 +1807,10 @@ namespace osl_VolumeInfo
     };// class getFloppyDiskFlag
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool getFixedDiskFlag() const
-    //---------------------------------------------------------------------
+
     class  getFixedDiskFlag : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -1847,10 +1847,10 @@ namespace osl_VolumeInfo
         CPPUNIT_TEST_SUITE_END();
     };// class getFixedDiskFlag
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool getRAMDiskFlag() const
-    //---------------------------------------------------------------------
+
     class  getRAMDiskFlag : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -1888,10 +1888,10 @@ namespace osl_VolumeInfo
     };// class getRAMDiskFlag
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt64 getTotalSpace() const
-    //---------------------------------------------------------------------
+
     class  getTotalSpace : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -1970,10 +1970,10 @@ namespace osl_VolumeInfo
         CPPUNIT_TEST_SUITE_END();
     };// class getTotalSpace
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt64 getFreeSpace() const
-    //---------------------------------------------------------------------
+
     class  getFreeSpace : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -2052,10 +2052,10 @@ namespace osl_VolumeInfo
         CPPUNIT_TEST_SUITE_END();
     };// class getFreeSpace
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt64 getUsedSpace() const
-    //---------------------------------------------------------------------
+
     class  getUsedSpace : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -2136,10 +2136,10 @@ namespace osl_VolumeInfo
     };// class getUsedSpace
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt32 getMaxNameLength() const
-    //---------------------------------------------------------------------
+
     class  getMaxNameLength : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -2196,10 +2196,10 @@ namespace osl_VolumeInfo
     };// class getMaxNameLength
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt32 getMaxPathLength() const
-    //---------------------------------------------------------------------
+
     class  getMaxPathLength : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC nError1;
@@ -2250,10 +2250,10 @@ namespace osl_VolumeInfo
     };// class getMaxPathLength
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline ::rtl::OUString getFileSystemName() const
-    //---------------------------------------------------------------------
+
     class  getFileSystemName : public CppUnit::TestFixture
     {
         ::rtl::OUString aUStr;
@@ -2311,10 +2311,10 @@ namespace osl_VolumeInfo
          CPPUNIT_TEST_SUITE_END();
     };// class getFileSystemName
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline VolumeDevice getDeviceHandle() const
-    //---------------------------------------------------------------------
+
     class  getDeviceHandle : public CppUnit::TestFixture
     {
         ::rtl::OUString aUStr;
@@ -2342,7 +2342,7 @@ namespace osl_VolumeInfo
     };// class getDeviceHandle
 
 
-    // -----------------------------------------------------------------------------
+
     /*CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::ctors, "osl_VolumeInfo" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::isValid, "osl_VolumeInfo" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::getRemoteFlag, "osl_VolumeInfo" );
@@ -2362,16 +2362,16 @@ namespace osl_VolumeInfo
 
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for VolumeDevice class
-//------------------------------------------------------------------------
+
 namespace osl_FileStatus
 {
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  FileStatus( sal_uInt32 nMask ): _nMask( nMask )
-    //---------------------------------------------------------------------
+
     class  ctors : public CppUnit::TestFixture
     {
         ::rtl::OUString         aUStr;
@@ -2440,10 +2440,10 @@ namespace osl_FileStatus
     };// class ctors
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool isValid( sal_uInt32 nMask ) const
-    //---------------------------------------------------------------------
+
     class  isValid : public CppUnit::TestFixture
     {
         ::rtl::OUString         aUStr;
@@ -2643,10 +2643,10 @@ namespace osl_FileStatus
     };// class ctors
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline Type getFileType() const
-    //---------------------------------------------------------------------
+
     class  getFileType : public CppUnit::TestFixture
     {
         ::rtl::OUString         aUStr;
@@ -2774,10 +2774,10 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getFileType
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt64 getAttributes() const
-    //---------------------------------------------------------------------
+
     class  getAttributes : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL, aTypeURL_Hid;
@@ -2904,10 +2904,10 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getAttributes
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline TimeValue getAccessTime() const
-    //---------------------------------------------------------------------
+
     class  getAccessTime : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL;
@@ -2960,10 +2960,10 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getAccessTime
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline TimeValue getModifyTime() const
-    //---------------------------------------------------------------------
+
     class  getModifyTime : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL;
@@ -3016,10 +3016,10 @@ namespace osl_FileStatus
     };// class getModifyTime
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_uInt64 getFileSize() const
-    //---------------------------------------------------------------------
+
     class  getFileSize : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL;
@@ -3082,10 +3082,10 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getFileSize
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline ::rtl::OUString getFileName() const
-    //---------------------------------------------------------------------
+
     class  getFileName : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL;
@@ -3127,10 +3127,10 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getFileName
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline ::rtl::OUString getFileURL() const
-    //---------------------------------------------------------------------
+
     class  getFileURL : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL;
@@ -3171,10 +3171,10 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getFileURL
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline ::rtl::OUString getLinkTargetURL() const
-    //---------------------------------------------------------------------
+
     class  getLinkTargetURL : public CppUnit::TestFixture
     {
         ::rtl::OUString         aTypeURL;
@@ -3243,7 +3243,7 @@ namespace osl_FileStatus
         CPPUNIT_TEST_SUITE_END();
     };// class getLinkTargetURL
 
-    // -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::ctors, "osl_FileStatus" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::isValid, "osl_FileStatus" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileType, "osl_FileStatus" );
@@ -3258,15 +3258,15 @@ namespace osl_FileStatus
 
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for File class
-//------------------------------------------------------------------------
+
 namespace osl_File
 {
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  File( const ::rtl::OUString& ustrFileURL )
-    //---------------------------------------------------------------------
+
     class  ctors : public CppUnit::TestFixture
     {
         // ::osl::FileBase::RC     nError1;
@@ -3318,10 +3318,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class ctors
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC open( sal_uInt32 uFlags )
-    //---------------------------------------------------------------------
+
     class  open : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2, nError3;
@@ -3443,10 +3443,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class open
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC close()
-    //---------------------------------------------------------------------
+
     class  close : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2, nError3;
@@ -3508,10 +3508,10 @@ namespace osl_File
     };// class close
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos )
-    //---------------------------------------------------------------------
+
     class  setPos : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1;
@@ -3613,10 +3613,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class setPos
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC getPos( sal_uInt64& uPos )
-    //---------------------------------------------------------------------
+
     class  getPos : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -3679,10 +3679,10 @@ namespace osl_File
     };// class getPos
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC isEndOfFile( sal_Bool *pIsEOF )
-    //---------------------------------------------------------------------
+
     class  isEndOfFile : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -3774,10 +3774,10 @@ namespace osl_File
     };// class isEndOfFile
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC setSize( sal_uInt64 uSize )
-    //---------------------------------------------------------------------
+
     class  setSize : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -3874,10 +3874,10 @@ namespace osl_File
     };// class setSize
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead )
-    //---------------------------------------------------------------------
+
     class  read : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -3963,10 +3963,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class read
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten)
-    //---------------------------------------------------------------------
+
     class  write : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -4023,10 +4023,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class write
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC readLine( ::rtl::ByteSequence& aSeq )
-    //---------------------------------------------------------------------
+
     class  readLine : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -4136,10 +4136,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class readLine
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
-    //---------------------------------------------------------------------
+
     class  copy : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1;
@@ -4271,10 +4271,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class copy
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL )
-    //---------------------------------------------------------------------
+
     class  move : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1, nError2;
@@ -4433,10 +4433,10 @@ namespace osl_File
     };// class move
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC remove( const ::rtl::OUString& ustrFileURL )
-    //---------------------------------------------------------------------
+
     class  remove : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1, nError2;
@@ -4519,10 +4519,10 @@ namespace osl_File
     };// class remove
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes )
-    //---------------------------------------------------------------------
+
     class  setAttributes : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC      nError1, nError2;
@@ -4611,14 +4611,14 @@ namespace osl_File
     };// class setAttributes
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC setTime(
     //         const ::rtl::OUString& ustrFileURL,
     //         const TimeValue& rCreationTime,
     //         const TimeValue& rLastAccessTime,
     //         const TimeValue& rLastWriteTime )
-    //---------------------------------------------------------------------
+
     class  setTime : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -4699,10 +4699,10 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class setTime
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC sync()
-    //---------------------------------------------------------------------
+
         class  sync : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -4761,7 +4761,7 @@ namespace osl_File
         CPPUNIT_TEST_SUITE_END();
     };// class setTime
 
-    // -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::ctors, "osl_File" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::open, "osl_File" );
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::close, "osl_File" );
@@ -4784,15 +4784,15 @@ namespace osl_File
 }// namespace osl_File
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for DirectoryItem class
-//------------------------------------------------------------------------
+
 namespace osl_DirectoryItem
 {
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  DirectoryItem(): _pData( NULL )
-    //---------------------------------------------------------------------
+
     class  ctors : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1;
@@ -4831,10 +4831,10 @@ namespace osl_DirectoryItem
         CPPUNIT_TEST_SUITE_END();
     };// class ctors
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData)
-    //---------------------------------------------------------------------
+
     class  copy_assin_Ctors : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1;
@@ -4894,10 +4894,10 @@ namespace osl_DirectoryItem
         CPPUNIT_TEST_SUITE_END();
     };// class copy_assin_Ctors
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool is()
-    //---------------------------------------------------------------------
+
     class  is : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1;
@@ -4943,10 +4943,10 @@ namespace osl_DirectoryItem
         CPPUNIT_TEST_SUITE_END();
     };// class is
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem )
-    //---------------------------------------------------------------------
+
     class  get : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5010,10 +5010,10 @@ namespace osl_DirectoryItem
         CPPUNIT_TEST_SUITE_END();
     };// class get
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC getFileStatus( FileStatus& rStatus )
-    //---------------------------------------------------------------------
+
     class  getFileStatus : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5099,15 +5099,15 @@ namespace osl_DirectoryItem
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" );
 }// namespace osl_DirectoryItem
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for Directory class
-//------------------------------------------------------------------------
+
 namespace osl_Directory
 {
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  Directory( const ::rtl::OUString& strPath ): _pData( 0 ), _aPath( strPath )
-    //---------------------------------------------------------------------
+
     class  ctors : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5169,10 +5169,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class ctors
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC open()
-    //---------------------------------------------------------------------
+
     class  open : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5268,10 +5268,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class open
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline sal_Bool isOpen() { return _pData != NULL; };
-    //---------------------------------------------------------------------
+
     class  isOpen : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5326,10 +5326,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class isOpen
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC close()
-    //---------------------------------------------------------------------
+
     class  close : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5383,10 +5383,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class close
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC reset()
-    //---------------------------------------------------------------------
+
     class  reset : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5499,10 +5499,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class reset
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 )
-    //---------------------------------------------------------------------
+
     class  getNextItem : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5670,10 +5670,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class getNextItem
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo )
-    //---------------------------------------------------------------------
+
     class  getVolumeInfo : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1;
@@ -5849,10 +5849,10 @@ namespace osl_Directory
     };// class getVolumeInfo
 
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC create( const ::rtl::OUString& ustrDirectoryURL )
-    //---------------------------------------------------------------------
+
     class  create : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -5928,10 +5928,10 @@ namespace osl_Directory
         CPPUNIT_TEST_SUITE_END();
     };// class create
 
-    //---------------------------------------------------------------------
+
     //  testing the method
     //  inline static RC remove( const ::rtl::OUString& ustrDirectoryURL )
-    //---------------------------------------------------------------------
+
     class  remove : public CppUnit::TestFixture
     {
         ::osl::FileBase::RC     nError1, nError2;
@@ -6249,7 +6249,7 @@ namespace osl_Directory
 
     }; // class createPath
 
-    // -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::ctors );
     CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::open );
     CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::isOpen );
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index d46a8c6fa5ca..172ff028d372 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -38,7 +38,7 @@
 namespace osl_test_file
 {
 
-// -----------------------------------------------------------------------------
+
 
 class oldtestfile : public CppUnit::TestFixture
 {
@@ -144,10 +144,10 @@ void oldtestfile::test_file_004()
 
 } // namespace osl_test_file
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile);
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 1ffb63cb5bd0..84e851e6bc30 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -18,9 +18,9 @@
  */
 
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <osl_Module_Const.h>
 
 using namespace osl;
@@ -28,9 +28,9 @@ using namespace osl;
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 using ::rtl::OString;
-//------------------------------------------------------------------------
+
 // helper functions and classes
-//------------------------------------------------------------------------
+
 
 /** print Boolean value.
 */
@@ -143,9 +143,9 @@ inline void deleteTestFile( const ::rtl::OUString filename )
 }
 
 
-//------------------------------------------------------------------------
+
 // test code start here
-//------------------------------------------------------------------------
+
 
 namespace osl_Module
 {
@@ -449,7 +449,7 @@ namespace osl_Module
         CPPUNIT_TEST_SUITE_END( );
     }; // class getFunctionSymbol
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getUrlFromAddress);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::load);
@@ -458,11 +458,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::is);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getSymbol);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::optr_oslModule);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getFunctionSymbol);
-// -----------------------------------------------------------------------------
+
 
 } // namespace osl_Module
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 1e26c62ae85e..096de9c9b8c9 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <sal/types.h>
 #include "cppunit/TestAssert.h"
 #include "cppunit/TestFixture.h"
@@ -30,9 +30,9 @@
 using namespace osl;
 using namespace rtl;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 /** print a UNI_CODE String.
 */
@@ -76,9 +76,9 @@ namespace ThreadHelper
 }
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for osl_Mutex class
-//------------------------------------------------------------------------
+
 
 
 /** mutually exclusive data
@@ -263,7 +263,7 @@ protected:
 };
 
 
-//--------------------------------------------------------------
+
 namespace osl_Mutex
 {
 
@@ -548,7 +548,7 @@ namespace osl_Mutex
         CPPUNIT_TEST_SUITE_END();
     }; // class getGlobalMutex
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::ctor, "osl_Mutex");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::acquire, "osl_Mutex");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::tryToAcquire, "osl_Mutex");
@@ -557,9 +557,9 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::getGlobalMutex, "osl_Mutex");
 } // namespace osl_Mutex
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for osl_Guard class
-//------------------------------------------------------------------------
+
 
 class GuardThread : public Thread
 {
@@ -636,14 +636,14 @@ namespace osl_Guard
         CPPUNIT_TEST_SUITE_END();
     }; // class ctor
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Guard::ctor, "osl_Guard");
 } // namespace osl_Guard
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for osl_ClearableGuard class
-//------------------------------------------------------------------------
+
 
 /** Thread for test ClearableGuard
  */
@@ -673,7 +673,7 @@ protected:
     }
 };
 
-// -----------------------------------------------------------------------------
+
 namespace osl_ClearableGuard
 {
 
@@ -777,15 +777,15 @@ namespace osl_ClearableGuard
         CPPUNIT_TEST_SUITE_END( );
     }; // class clear
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::ctor, "osl_ClearableGuard" );
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::clear, "osl_ClearableGuard" );
 } // namespace osl_ClearableGuard
 
 
-//------------------------------------------------------------------------
+
 // Beginning of the test cases for osl_ResettableGuard class
-//------------------------------------------------------------------------
+
 
 /** Thread for test ResettableGuard
  */
@@ -813,7 +813,7 @@ protected:
     }
 };
 
-// -----------------------------------------------------------------------------
+
 namespace osl_ResettableGuard
 {
     class ctor : public CppUnit::TestFixture
@@ -903,7 +903,7 @@ namespace osl_ResettableGuard
         CPPUNIT_TEST_SUITE_END();
     }; // class reset
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::ctor);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::reset);
 } // namespace osl_ResettableGuard
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 6e109b7a3c97..58cce66b1b52 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 
 #include <sal/types.h>
 #include "cppunit/TestAssert.h"
@@ -47,9 +47,9 @@ using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 using ::rtl::OString;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 /** print Boolean value.
  */
@@ -118,9 +118,9 @@ inline void printPipeError( ::osl::Pipe aPipe )
 
 
 
-//------------------------------------------------------------------------
+
 // pipe name and transfer contents
-//------------------------------------------------------------------------
+
 const rtl::OUString aTestPipeName("testpipe2");
 const rtl::OUString aTestPipe1("testpipe1");
 const rtl::OUString aTestString("Sun Microsystems");
@@ -128,16 +128,16 @@ const rtl::OUString aTestString("Sun Microsystems");
 const OString m_pTestString1("Sun Microsystems");
 const OString m_pTestString2("test pipe PASS/OK");
 
-//------------------------------------------------------------------------
+
 // test code start here
-//------------------------------------------------------------------------
+
 
 namespace osl_Pipe
 {
 
-//------------------------------------------------------------------------
+
 // most return value -1 denote a fail of operation.
-//------------------------------------------------------------------------
+
 #define OSL_PIPE_FAIL   -1
 
     /** testing the methods:
@@ -623,7 +623,7 @@ namespace osl_Pipe
     }; // class getHandle
 
 
-// -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::ctors);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::is);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::create);
@@ -633,7 +633,7 @@ namespace osl_Pipe
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::close);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getError);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getHandle);
-// -----------------------------------------------------------------------------
+
 
 } // namespace osl_Pipe
 
@@ -781,7 +781,7 @@ namespace osl_StreamPipe
         osl_waitThread(&nTV);
     }
     // test read/write & send/recv data to pipe
-    // -----------------------------------------------------------------------------
+
 
     class Pipe_DataSink_Thread : public Thread
     {
@@ -922,11 +922,11 @@ namespace osl_StreamPipe
         CPPUNIT_TEST_SUITE_END( );
     }; // class recv
 
-// -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::ctors);
 //CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::assign);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::recv);
-// -----------------------------------------------------------------------------
+
 
 } // namespace osl_StreamPipe
 
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index 756df0bf2adb..e13797b475cf 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -24,9 +24,9 @@
 #include <time.h>
 #endif
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <sal/types.h>
 
 #include <rtl/string.hxx>
@@ -50,7 +50,7 @@ using namespace osl;
 
 using ::rtl::OString;
 
-// -----------------------------------------------------------------------------
+
 // Small stopwatch
 class StopWatch {
     TimeValue t1,t2;                                // Start and stoptime
@@ -155,7 +155,7 @@ double StopWatch::getTenthSec() const
     return nValue ;
 }
 
-// -----------------------------------------------------------------------------
+
 template <class T>
 class ThreadSafeValue
 {
@@ -179,7 +179,7 @@ public:
     void release() {m_aMutex.release();}
 };
 
-// -----------------------------------------------------------------------------
+
 namespace ThreadHelper
 {
     void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
@@ -266,7 +266,7 @@ public:
 
 };
 
-// -----------------------------------------------------------------------------
+
 /** Thread which has a flag add 1 every second until 20
  */
 class OCountThread : public Thread
@@ -1867,7 +1867,7 @@ namespace osl_Thread
         CPPUNIT_TEST_SUITE_END();
     }; // class schedule
 
-// -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::create, "osl_Thread");
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::createSuspended, "osl_Thread");
     CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::suspend, "osl_Thread");
@@ -1885,7 +1885,7 @@ namespace osl_Thread
 } // namespace osl_Thread
 
 
-// -----------------------------------------------------------------------------
+
 // destroy function when the binding thread terminate
 void SAL_CALL destroyCallback(void * data)
 {
@@ -2185,7 +2185,7 @@ namespace osl_ThreadData
         CPPUNIT_TEST_SUITE_END();
     }; // class getData
 
-// -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::ctors);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::setData);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::getData);
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 5dcd55561884..36ecf045c65a 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -318,7 +318,7 @@ typedef string_container_t::iterator       string_container_iter_t;
 class exclude : public std::unary_function<std::string, bool>
 {
 public:
-    //------------------------------------------------
+
     exclude(const string_container_t& exclude_list)
     {
         string_container_const_iter_t iter     = exclude_list.begin();
@@ -327,7 +327,7 @@ public:
             exclude_list_.push_back(env_var_name(*iter));
     }
 
-    //------------------------------------------------
+
     bool operator() (const std::string& env_var) const
     {
         return (exclude_list_.end() !=
@@ -338,7 +338,7 @@ public:
     }
 
 private:
-    //-------------------------------------------------
+
     // extract the name from an environment variable
     // that is given in the form "NAME=VALUE"
     std::string env_var_name(const std::string& env_var) const
@@ -419,7 +419,7 @@ class Test_osl_executeProcess : public CppUnit::TestFixture
 
 public:
 
-    //------------------------------------------------
+
     // ctor
     Test_osl_executeProcess() :
         env_param_(OUString("-env")),
@@ -432,7 +432,7 @@ public:
         suExecutableFileURL += EXECUTABLE_NAME;
     }
 
-    //------------------------------------------------
+
     virtual void setUp()
     {
         temp_file_path_ = create_temp_file(temp_file_url_);
@@ -444,7 +444,7 @@ public:
         osl::File::remove(temp_file_url_);
     }
 
-    //------------------------------------------------
+
     OUString create_temp_file(OUString &temp_file_url)
     {
         FileBase::RC rc = FileBase::createTempFile(0, 0, &temp_file_url);
@@ -457,7 +457,7 @@ public:
         return temp_file_path;
     }
 
-   //------------------------------------------------
+
     void read_child_environment(string_container_t* env_container)
     {
         OString temp_file_name = OUStringToOString(OUString(
@@ -477,7 +477,7 @@ public:
         tidy_container(*env_container);
     }
 
-    //------------------------------------------------
+
     // environment of the child process that was
     // started. The child process writes his
     // environment into a file
@@ -493,7 +493,7 @@ public:
                 (std::equal(child_env.begin(), child_env.end(), parent_env.begin())));
     }
 
-    //------------------------------------------------
+
     // compare the equal environment parts and the
     // different part of the child environment
     bool compare_merged_environments(const string_container_t& different_env_vars)
@@ -563,7 +563,7 @@ public:
                 different_env_size_equals && different_env_content_equals);
     }
 
-    //------------------------------------------------
+
     // test that parent and child process have the
     // same environment when osl_executeProcess will
     // be called with out setting new environment
@@ -605,7 +605,7 @@ public:
         );
     }
 
-    //------------------------------------------------
+
     #define ENV1 "PAT=a:\\"
     #define ENV2 "PATHb=b:\\"
     #define ENV3 "Patha=c:\\"
diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx
index cbc488a39f02..68c8bd3f75e4 100644
--- a/sal/qa/osl/profile/osl_old_testprofile.cxx
+++ b/sal/qa/osl/profile/osl_old_testprofile.cxx
@@ -27,7 +27,7 @@
 #include <osl/profile.h>
 
 //==================================================================================================
-// -----------------------------------------------------------------------------
+
 namespace osl_Profile
 {
     class oldtests : public CppUnit::TestFixture
@@ -76,10 +76,10 @@ void oldtests::test_profile(void)
 
 } // namespace osl_Profile
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION( osl_Profile::oldtests );
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx
index 3e6ddf5261e5..54fb89c7d435 100644
--- a/sal/qa/osl/security/osl_Security.cxx
+++ b/sal/qa/osl/security/osl_Security.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------------------------
+
 // header file
-//------------------------------------------------------------------------
+
 #ifdef WNT
 #include <windows.h>
 #undef min
@@ -33,9 +33,9 @@ using namespace osl;
 using namespace rtl;
 
 
-//------------------------------------------------------------------------
+
 // helper functions and classes
-//------------------------------------------------------------------------
+
 
 /** print Boolean value.
 */
@@ -57,9 +57,9 @@ inline void printUString( const ::rtl::OUString & str )
 }
 
 
-//------------------------------------------------------------------------
+
 // test code start here
-//------------------------------------------------------------------------
+
 
 namespace osl_Security
 {
@@ -310,7 +310,7 @@ namespace osl_Security
         CPPUNIT_TEST_SUITE_END( );
     }; // class loginUserOnFileServer
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent);
@@ -321,7 +321,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::loginUserOnFileServer);
 
-// -----------------------------------------------------------------------------
+
 
 } // namespace osl_Security
 
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index 30390fd72ac8..5a70fdacf600 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -43,9 +43,9 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 
 #include <sal/types.h>
 #include <cppunit/TestFixture.h>
@@ -63,9 +63,9 @@ using ::rtl::OUString;
 #define IP_PORT_MYPORT4 8885
 #define IP_PORT_MYPORT3 8884
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 // just used to test socket::close() when accepting
 class AcceptorThread : public Thread
@@ -238,7 +238,7 @@ namespace osl_AcceptorSocket
     }; // class listen_accept
 
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::ctors);
 //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket");
@@ -246,7 +246,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::listen_accept);
 
 } // namespace osl_AcceptorSocket
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index 50f19b19d5af..1765b3d394a1 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -43,9 +43,9 @@
     inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const;
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 
 #include <sal/types.h>
 #include <cppunit/TestFixture.h>
@@ -62,9 +62,9 @@ using ::rtl::OUString;
 #define IP_PORT_FTP     21
 #define IP_PORT_MYPORT3 8884
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 class CloseSocketThread : public Thread
 {
@@ -242,14 +242,14 @@ namespace osl_ConnectorSocket
     }; // class connect
 
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::connect);
 
 } // namespace osl_ConnectorSocket
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 9bfe6234b596..b72a4d289449 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -60,9 +60,9 @@ using ::rtl::OUString;
 const char * pTestString1 = "test socket";
 const char * pTestString2 = " Passed#OK";
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 class CloseSocketThread : public Thread
 {
@@ -88,9 +88,9 @@ public:
     }
 };
 
-//------------------------------------------------------------------------
+
 // tests cases begins here
-//------------------------------------------------------------------------
+
 
 namespace osl_DatagramSocket
 {
@@ -293,14 +293,14 @@ public:
 
     }; // class sendTo_recvFrom
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom);
 
 } // namespace osl_DatagramSocket
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index 7f126f6ad24e..f1597a329e14 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -44,9 +44,9 @@
  */
 
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 
 #include <sal/types.h>
 #include <osl_Socket_Const_orig.h>
@@ -79,9 +79,9 @@ using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 using ::rtl::OString;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 /** compare two OUString.
 */
@@ -450,7 +450,7 @@ public:
     }
 };
 
-// -----------------------------------------------------------------------------
+
 // Helper functions, to create buffers, check buffers
 class ValueCheckProvider
 {
@@ -504,7 +504,7 @@ public:
 
 };
 
-// -----------------------------------------------------------------------------
+
 /** Client Socket Thread, served as a temp little client to communicate with server.
 */
 
@@ -647,7 +647,7 @@ public:
 
 };
 
-// -----------------------------------------------------------------------------
+
 // just used to test socket::close() when accepting
 class AcceptorThread : public Thread
 {
@@ -726,9 +726,9 @@ public:
     }
 };
 
-//------------------------------------------------------------------------
+
 // tests cases begins here
-//------------------------------------------------------------------------
+
 
 namespace osl_SocketAddr
 {
@@ -1468,7 +1468,7 @@ namespace osl_SocketAddr
 
     }; // class gettheServicePort
 
-// -----------------------------------------------------------------------------
+
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::ctors, "osl_SocketAddr");
@@ -2773,7 +2773,7 @@ namespace osl_Socket
     }; // class getHandle
 
 
-// -----------------------------------------------------------------------------
+
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::ctors, "osl_Socket");
@@ -3175,7 +3175,7 @@ protected:
         CPPUNIT_TEST_SUITE_END();
     }; // class isExceptionPending
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::ctors, "osl_StreamSocket");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::send_recv, "osl_StreamSocket");
@@ -3337,7 +3337,7 @@ namespace osl_ConnectorSocket
     }; // class connect
 
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::ctors, "osl_ConnectorSocket");
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_ConnectorSocket");
@@ -3467,7 +3467,7 @@ namespace osl_AcceptorSocket
     }; // class listen_accept
 
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::ctors, "osl_AcceptorSocket");
 //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket");
@@ -3677,7 +3677,7 @@ public:
 
     }; // class sendTo_recvFrom
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors);
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom);
@@ -3685,7 +3685,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom);
 } // namespace osl_DatagramSocket
 
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 86fdf91ec7ea..f8f005a5371e 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -67,9 +67,9 @@ using ::rtl::OUString;
 #define IP_PORT_MYPORT8 8896
 #define IP_PORT_MYPORT9 8897
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 // just used to test socket::close() when accepting
 class AcceptorThread : public Thread
@@ -1411,7 +1411,7 @@ namespace osl_Socket
     }; // class getHandle
 
 
-// -----------------------------------------------------------------------------
+
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::ctors);
@@ -1435,7 +1435,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getHandle);
 
 } // namespace osl_Socket
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index 50e6c16743fb..3a64cfc18551 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -850,7 +850,7 @@ namespace osl_SocketAddr
 
     }; // class getFamilyOfSocketAddr
 
-// -----------------------------------------------------------------------------
+
 
 
 CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::ctors);
@@ -870,7 +870,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr);
 
 } // namespace osl_SocketAddr
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx
index 83b556da1c78..21384786e83b 100644
--- a/sal/qa/osl/socket/osl_Socket_tests.cxx
+++ b/sal/qa/osl/socket/osl_Socket_tests.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <sal/types.h>
 #include <osl_Socket_Const.h>
 
@@ -27,13 +27,13 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #include <osl/socket.hxx>
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
 
-//------------------------------------------------------------------------
+
+
 // tests cases begins here
-//------------------------------------------------------------------------
+
 
 namespace osl_Socket
 {
@@ -59,7 +59,7 @@ namespace osl_Socket
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 42fb7e156e22..0d1e56d40547 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -62,9 +62,9 @@ using ::rtl::OString;
 const char * pTestString1 = "test socket";
 const char * pTestString2 = " Passed#OK";
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 // just used to test socket::close() when accepting
 class AcceptorThread : public Thread
@@ -256,7 +256,7 @@ public:
 
 };
 
-// -----------------------------------------------------------------------------
+
 // Helper functions, to create buffers, check buffers
 class ValueCheckProvider
 {
@@ -309,7 +309,7 @@ public:
 
 };
 
-// -----------------------------------------------------------------------------
+
 /** Client Socket Thread, served as a temp little client to communicate with server.
  */
 
@@ -487,7 +487,7 @@ public:
         }
 };
 
-// -----------------------------------------------------------------------------
+
 
 namespace osl_StreamSocket
 {
@@ -692,7 +692,7 @@ namespace osl_StreamSocket
         CPPUNIT_TEST_SUITE_END();
     }; // class send_recv
 
-// -----------------------------------------------------------------------------
+
 
     class SendClientThread : public Thread
     {
@@ -897,7 +897,7 @@ namespace osl_StreamSocket
         CPPUNIT_TEST_SUITE_END();
     }; // class isExceptionPending
 
-// -----------------------------------------------------------------------------
+
 /** Client Socket Thread, served as a temp little client to communicate with server.
  */
 
@@ -1017,7 +1017,7 @@ namespace osl_StreamSocket
 
     };
 
-    // -----------------------------------------------------------------------------
+
 
     class justtest : public CppUnit::TestFixture
     {
@@ -1075,7 +1075,7 @@ namespace osl_StreamSocket
                 aSocket.close();
             }
 
-        // -----------------------------------------------------------------------------
+
 
         void send_Connector(rtl::OString const& _sAddr, osl::Condition &/*_aCondition*/ )
             {
@@ -1178,7 +1178,7 @@ namespace osl_StreamSocket
                 send_Connector_2_margritte(sAddr);
             }
 
-        // -----------------------------------------------------------------------------
+
 
         void send_recv()
             {
@@ -1372,7 +1372,7 @@ namespace osl_StreamSocket
                 aSocket.close();
             }
 
-// -----------------------------------------------------------------------------
+
 
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::ctors);
     CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::send_recv);
@@ -1383,7 +1383,7 @@ namespace osl_StreamSocket
 
 } // namespace osl_StreamSocket
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx
index 217cc89afabc..3f822fa46d42 100644
--- a/sal/qa/osl/socket/sockethelper.cxx
+++ b/sal/qa/osl/socket/sockethelper.cxx
@@ -35,14 +35,14 @@
 #   define t_print printf
 #endif
 
-//------------------------------------------------------------------------
+
 // Ip version definition
-//------------------------------------------------------------------------
+
 #define IP_VER     4               /// currently only IPv4 is considered.
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 /** compare two OUString.
 */
diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx
index 6737fdcba39e..2bfa2f52355d 100644
--- a/sal/qa/rtl/alloc/rtl_alloc.cxx
+++ b/sal/qa/rtl/alloc/rtl_alloc.cxx
@@ -134,7 +134,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::TestZeroMemory);
 } // namespace rtl_alloc
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index f80777b9dc80..4e39fbdf7095 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -135,7 +135,7 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec)
 #endif
 }
 
-// -----------------------------------------------------------------------------
+
 
 namespace rtl_Bootstrap
 {
@@ -767,7 +767,7 @@ namespace rtl_Bootstrap
 
 } // namespace rtl_Bootstrap
 
-// -----------------------------------------------------------------------------
+
 
 static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString const& _sContent)
 {
@@ -800,7 +800,7 @@ static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString co
     OSL_ASSERT(t_fileExist(_suFileURL) == true);
 }
 
-// -----------------------------------------------------------------------------
+
 static void create_rtlrc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
@@ -823,7 +823,7 @@ static void create_rtlrc()
     removeAndCreateFile(aFileURL, sLines);
 }
 
-// -----------------------------------------------------------------------------
+
 static void create_testshl2rc()
 {
     rtl::OUString aFileURL(getExecutableDirectory());
@@ -862,7 +862,7 @@ static void create_testshl2rc()
         SAL_CONFIGFILE("rtl"));
 }
 
-// -----------------------------------------------------------------------------
+
 
 static void create_pseudorc()
 {
@@ -880,7 +880,7 @@ static void create_pseudorc()
     removeAndCreateFile(aFileURL, sLines);
 }
 
-// -----------------------------------------------------------------------------
+
 void create_bootstrap_processrc()
 {
     rtl::OUString aDirURL(getModulePath());
@@ -896,7 +896,7 @@ void create_bootstrap_processrc()
 
     removeAndCreateFile(aDirURL, sLines);
 }
-// -----------------------------------------------------------------------------
+
 
 void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc)
 {
diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx
index 18b1f5134577..3c1b51ca4065 100644
--- a/sal/qa/rtl/cipher/rtl_cipher.cxx
+++ b/sal/qa/rtl/cipher/rtl_cipher.cxx
@@ -27,7 +27,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/cipher.h>
 
-// -----------------------------------------------------------------------------
+
 namespace rtl_cipher
 {
 
@@ -103,7 +103,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 class createBF : public CppUnit::TestFixture
 {
 public:
@@ -151,7 +151,7 @@ public:
     CPPUNIT_TEST(createBF_004);
     CPPUNIT_TEST_SUITE_END();
 }; // class createBF
-// -----------------------------------------------------------------------------
+
 class decode : public CppUnit::TestFixture
 {
 public:
@@ -288,7 +288,7 @@ public:
     CPPUNIT_TEST(decode_002);
     CPPUNIT_TEST_SUITE_END();
 }; // class decode
-// -----------------------------------------------------------------------------
+
 class decodeBF : public CppUnit::TestFixture
 {
 public:
@@ -312,7 +312,7 @@ public:
     CPPUNIT_TEST(decodeBF_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class decodeBF
-// -----------------------------------------------------------------------------
+
 class destroy : public CppUnit::TestFixture
 {
 public:
@@ -339,7 +339,7 @@ public:
     CPPUNIT_TEST(destroy_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class destroy
-// -----------------------------------------------------------------------------
+
 class destroyBF : public CppUnit::TestFixture
 {
 public:
@@ -368,7 +368,7 @@ public:
     CPPUNIT_TEST(destroyBF_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class destroyBF
-// -----------------------------------------------------------------------------
+
 class encode : public CppUnit::TestFixture
 {
 public:
@@ -441,7 +441,7 @@ public:
     CPPUNIT_TEST(encode_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class encode
-// -----------------------------------------------------------------------------
+
 class encodeBF : public CppUnit::TestFixture
 {
 public:
@@ -465,7 +465,7 @@ public:
     CPPUNIT_TEST(encodeBF_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class encodeBF
-// -----------------------------------------------------------------------------
+
 class init : public CppUnit::TestFixture
 {
 public:
@@ -578,7 +578,7 @@ public:
     CPPUNIT_TEST(init_004);
     CPPUNIT_TEST_SUITE_END();
 }; // class init
-// -----------------------------------------------------------------------------
+
 class initBF : public CppUnit::TestFixture
 {
 public:
@@ -605,7 +605,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class initBF
 
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::create);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::createBF);
@@ -621,7 +621,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::initBF);
 } // namespace rtl_cipher
 
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx
index 3ac869cc4e3a..63e68d73c8c9 100644
--- a/sal/qa/rtl/crc32/rtl_crc32.cxx
+++ b/sal/qa/rtl/crc32/rtl_crc32.cxx
@@ -159,12 +159,12 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class test
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_CRC32::test);
 } // namespace rtl_CRC32
 
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx
index 3d4353fb2d19..b41929236603 100644
--- a/sal/qa/rtl/digest/rtl_digest.cxx
+++ b/sal/qa/rtl/digest/rtl_digest.cxx
@@ -62,7 +62,7 @@ rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg )
     return rtl::OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 namespace rtl_digest
 {
 
@@ -151,7 +151,7 @@ public:
 
 
 
-// -----------------------------------------------------------------------------
+
 
 class createMD5 : public CppUnit::TestFixture
 {
@@ -180,7 +180,7 @@ public:
 }; // class create
 
 
-// -----------------------------------------------------------------------------
+
 
 class createMD2 : public CppUnit::TestFixture
 {
@@ -208,7 +208,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 
 class createSHA : public CppUnit::TestFixture
 {
@@ -235,7 +235,7 @@ public:
     CPPUNIT_TEST(createSHA_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 
 class createSHA1 : public CppUnit::TestFixture
 {
@@ -262,7 +262,7 @@ public:
     CPPUNIT_TEST(createSHA1_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 
 class createHMAC_MD5 : public CppUnit::TestFixture
 {
@@ -289,7 +289,7 @@ public:
     CPPUNIT_TEST(createHMAC_MD5_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 
 class createHMAC_SHA1 : public CppUnit::TestFixture
 {
@@ -319,7 +319,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 
 class queryAlgorithm : public CppUnit::TestFixture
 {
@@ -413,7 +413,7 @@ public:
 }; // class create
 
 
-// -----------------------------------------------------------------------------
+
 class queryLength : public CppUnit::TestFixture
 {
 public:
@@ -513,7 +513,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 
 rtl::OString createHex(sal_uInt8 *_pMD5KeyBuffer, sal_uInt32 _nMD5KeyLen)
 {
@@ -531,7 +531,7 @@ rtl::OString createHex(sal_uInt8 *_pMD5KeyBuffer, sal_uInt32 _nMD5KeyLen)
 }
 
 
-// -----------------------------------------------------------------------------
+
 class init : public CppUnit::TestFixture
 {
 public:
@@ -564,7 +564,7 @@ public:
             rtl_digest_destroy( handle );
         }
 
-    // ------------------------------------
+
     void init_MD2()
         {
             rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD2 );
@@ -755,7 +755,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class init
 
-// ------------------------------------
+
 
 rtl::OString getMD5Sum(rtl::OString const& _aMsg )
 {
@@ -778,7 +778,7 @@ rtl::OString getMD5Sum(rtl::OString const& _aMsg )
     return aMD5Sum;
 }
 
-// -----------------------------------------------------------------------------
+
 
 class equalTests : public CppUnit::TestFixture
 {
@@ -792,7 +792,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     void equal_001()
         {
             rtl::OString aMsg1 = sSampleString;
@@ -804,7 +804,7 @@ public:
             CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aMsgMD5Sum1.getLength() == 32 && aMsgMD5Sum2.getLength() == 32 );
             CPPUNIT_ASSERT_MESSAGE("source is the same, dest must be also the same", aMsgMD5Sum1.equals(aMsgMD5Sum2) == sal_True);
         }
-    // ------------------------------------
+
     void equal_002()
         {
             rtl::OString aMsg1 = sSampleString;
@@ -828,7 +828,7 @@ public:
 }; // class create
 
 
-// -----------------------------------------------------------------------------
+
 class digest_MD2 : public CppUnit::TestFixture
 {
 public:
@@ -841,7 +841,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     void MD2_001()
         {
             rtl::OString  aMsg1 = sSampleString;
@@ -872,7 +872,7 @@ public:
     CPPUNIT_TEST( MD2_001 );
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 class digest_MD5 : public CppUnit::TestFixture
 {
 public:
@@ -884,7 +884,7 @@ public:
     void tearDown()
     {
     }
-    // ------------------------------------
+
     void MD5_001()
         {
             rtl::OString  aMsg1 = sSampleString;
@@ -916,7 +916,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 class digest_SHA : public CppUnit::TestFixture
 {
 public:
@@ -929,7 +929,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     void SHA_001()
         {
             rtl::OString  aMsg1 = sSampleString;
@@ -961,7 +961,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 class digest_SHA1 : public CppUnit::TestFixture
 {
 public:
@@ -974,7 +974,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     void SHA1_001()
         {
             rtl::OString  aMsg1 = sSampleString;
@@ -1004,7 +1004,7 @@ public:
     CPPUNIT_TEST( SHA1_001 );
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 class digest_HMAC_MD5 : public CppUnit::TestFixture
 {
 public:
@@ -1017,7 +1017,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     void HMAC_MD5_001()
         {
             rtl::OString  aMsg1 = sSampleString;
@@ -1051,7 +1051,7 @@ public:
     CPPUNIT_TEST( HMAC_MD5_001 );
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 class digest_HMAC_SHA1 : public CppUnit::TestFixture
 {
 public:
@@ -1064,7 +1064,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     void HMAC_SHA1_001()
         {
             rtl::OString  aMsg1 = sSampleString;
@@ -1099,7 +1099,7 @@ public:
     CPPUNIT_TEST( HMAC_SHA1_001 );
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 class digest_PBKDF2 : public CppUnit::TestFixture
 {
 public:
@@ -1112,7 +1112,7 @@ public:
     {
     }
 
-    // ------------------------------------
+
     rtl::OString /* key */ run_check_PBKDF2(rtl::OString const& _sPassword, bool _bClearSalt, sal_uInt32 _nCount)
         {
             sal_uInt32   nKeyLen = RTL_DIGEST_LENGTH_HMAC_SHA1;
@@ -1173,7 +1173,7 @@ public:
     CPPUNIT_TEST( PBKDF2_001 );
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 
 class update : public CppUnit::TestFixture
 {
@@ -1301,7 +1301,7 @@ public:
     CPPUNIT_TEST(updateHMAC_SHA1_000);
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 
 class get : public CppUnit::TestFixture
 {
@@ -1375,7 +1375,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class create
 
-// -----------------------------------------------------------------------------
+
 class destroy : public CppUnit::TestFixture
 {
 public:
@@ -1406,7 +1406,7 @@ public:
     CPPUNIT_TEST(destroy_001);
     CPPUNIT_TEST_SUITE_END();
 }; // class create
-// -----------------------------------------------------------------------------
+
 
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::create);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createMD2);
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index 462a549e7440..169c0d8ab337 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------------------------
+
 // include files
-//------------------------------------------------------------------------
+
 #include <sal/types.h>
 
 #include <osl/thread.hxx>
@@ -39,7 +39,7 @@
 #include <time.h>
 #endif
 
-// -----------------------------------------------------------------------------
+
 #define CONST_TEST_STRING "gregorian"
 
 namespace {
@@ -50,7 +50,7 @@ struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> {
 };
 }
 
-// -----------------------------------------------------------------------------
+
 namespace ThreadHelper
 {
     // typedef enum {
@@ -81,7 +81,7 @@ namespace ThreadHelper
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** Simple thread for testing Thread-create.
  * Just add 1 of value 0, and after running, result is 1.
@@ -142,7 +142,7 @@ public:
         }
 };
 
-// -----------------------------------------------------------------------------
+
 namespace rtl_DoubleLocking
 {
 
@@ -238,7 +238,7 @@ namespace rtl_DoubleLocking
         CPPUNIT_TEST(getValue_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class create
-// -----------------------------------------------------------------------------
+
     CPPUNIT_TEST_SUITE_REGISTRATION(rtl_DoubleLocking::getValue);
 } // namespace rtl_DoubleLocking
 
diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx
index 85941d9b9e3a..6c7127844f09 100644
--- a/sal/qa/rtl/locale/rtl_locale.cxx
+++ b/sal/qa/rtl/locale/rtl_locale.cxx
@@ -300,7 +300,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class equals
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getDefault);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::setDefault);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getLanguage);
@@ -311,7 +311,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::equals);
 } // namespace rtl_locale
 
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 0f0f311ba8f2..460d001be5fc 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -93,7 +93,7 @@ inline ::rtl::OUString getCurrentPID(  )
 }
 
 
-// -----------------------------------------------------------------------------
+
 /*
  * LLA:
  * check if logfile is create
@@ -196,10 +196,10 @@ namespace rtl_logfile
 
 } // namespace rtl_logfile
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION( rtl_logfile::logfile);
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 //~ do some clean up work after all test completed.
diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx
index 0ea73cdcbd43..e0fd0a26a40f 100644
--- a/sal/qa/rtl/ostring/rtl_OString2.cxx
+++ b/sal/qa/rtl/ostring/rtl_OString2.cxx
@@ -198,9 +198,9 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class valueOf
 
-// -----------------------------------------------------------------------------
+
 // - toDouble (tests)
-// -----------------------------------------------------------------------------
+
 class toDouble : public CppUnit::TestFixture
 {
 
@@ -351,9 +351,9 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class toDouble
 
-// -----------------------------------------------------------------------------
+
 // - getToken (tests)
-// -----------------------------------------------------------------------------
+
 class getToken : public CppUnit::TestFixture
 {
 
@@ -368,7 +368,7 @@ public:
         {
         }
 
-    // -----------------------------------------------------------------------------
+
 
     void getToken_000()
         {
@@ -463,10 +463,10 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class getToken
 
-// -----------------------------------------------------------------------------
+
 // testing the method replaceAt( sal_Int32 index, sal_Int32 count,
 // const OString& newStr )
-// -----------------------------------------------------------------------------
+
 
 // Developer note: Mindy Liu, 2004-04-23
 // stollen from sal/qa/rtl_strings/rtl_OString.cxx
@@ -494,7 +494,7 @@ public:
         sal_Bool bRes = ( expVal->compareTo(aStr1) == 0 );
         return bRes;
     }
-    // -----------------------------------------------------------------------------
+
 
    void replaceAt_001()
         {
@@ -543,7 +543,7 @@ public:
 }; // class replaceAt
 
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::valueOf);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::toDouble);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::getToken);
@@ -552,7 +552,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::replaceAt);
 } // namespace rtl_OString
 
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx
index 6bb2be638fb0..2f871da395ab 100644
--- a/sal/qa/rtl/ostring/rtl_str.cxx
+++ b/sal/qa/rtl/ostring/rtl_str.cxx
@@ -147,7 +147,7 @@ namespace rtl_str
     CPPUNIT_TEST_SUITE_END();
     }; // class compareIgnoreAsciiCase
 
-// -----------------------------------------------------------------------------
+
 
     class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture
     {
@@ -232,7 +232,7 @@ namespace rtl_str
 }; // class compare
 
 
-// -----------------------------------------------------------------------------
+
 
     class hashCode : public CppUnit::TestFixture
     {
@@ -286,7 +286,7 @@ namespace rtl_str
     }; // class compare
 
 
-// -----------------------------------------------------------------------------
+
 
     class indexOfChar : public CppUnit::TestFixture
     {
@@ -333,7 +333,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE_END();
     }; // class compare
 
-// -----------------------------------------------------------------------------
+
     class lastIndexOfChar : public CppUnit::TestFixture
     {
     public:
@@ -380,7 +380,7 @@ namespace rtl_str
     }; // class lastIndexOfChar
 
 
-// -----------------------------------------------------------------------------
+
 
     class indexOfStr : public CppUnit::TestFixture
     {
@@ -432,7 +432,7 @@ namespace rtl_str
         CPPUNIT_TEST(indexOfStr_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class compare
-// -----------------------------------------------------------------------------
+
 
 
     class lastIndexOfStr : public CppUnit::TestFixture
@@ -497,7 +497,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE_END();
     }; // class lastIndexOfStr
 
-// -----------------------------------------------------------------------------
+
 
     class replaceChar : public CppUnit::TestFixture
     {
@@ -533,7 +533,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE_END();
     }; // class replaceChar
 
-// -----------------------------------------------------------------------------
+
 
     class replaceChar_WithLength : public CppUnit::TestFixture
     {
@@ -575,7 +575,7 @@ namespace rtl_str
     }; // class replaceChar
 
 
-// -----------------------------------------------------------------------------
+
 
     class toAsciiLowerCase : public CppUnit::TestFixture
     {
@@ -647,7 +647,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE_END();
     }; // class replaceChar
 
-// -----------------------------------------------------------------------------
+
 
     class toAsciiUpperCase : public CppUnit::TestFixture
     {
@@ -720,7 +720,7 @@ namespace rtl_str
     }; // class replaceChar
 
 
-    // -----------------------------------------------------------------------------
+
 
     class trim_WithLength : public CppUnit::TestFixture
     {
@@ -822,7 +822,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE_END();
     };
 
-    // -----------------------------------------------------------------------------
+
 
     class valueOfChar : public CppUnit::TestFixture
     {
@@ -854,7 +854,7 @@ namespace rtl_str
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compare);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compareIgnoreAsciiCase);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::shortenedCompareIgnoreAsciiCase_WithLength);
@@ -878,7 +878,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::valueOfChar);
 
 } // namespace rtl_str
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx
index bdf50f0441e3..a8b2244217ad 100644
--- a/sal/qa/rtl/ostring/rtl_string.cxx
+++ b/sal/qa/rtl/ostring/rtl_string.cxx
@@ -60,7 +60,7 @@ namespace rtl_string
         CPPUNIT_TEST_SUITE_END();
     }; // class getLength
 
-// -----------------------------------------------------------------------------
+
 
     class newFromString : public CppUnit::TestFixture
     {
@@ -94,7 +94,7 @@ namespace rtl_string
         CPPUNIT_TEST_SUITE_END();
     }; // class newFromString
 
-    // -----------------------------------------------------------------------------
+
 
     class convertUStringToString : public CppUnit::TestFixture
     {
@@ -166,12 +166,12 @@ namespace rtl_string
 
 } // namespace rtl_string
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::getLength);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::newFromString);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::convertUStringToString);
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx
index 2654e3dc0f3e..7e6721160546 100644
--- a/sal/qa/rtl/oustring/rtl_OUString2.cxx
+++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx
@@ -237,9 +237,9 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class number
 
-//------------------------------------------------------------------------
+
 // testing the method toDouble()
-//------------------------------------------------------------------------
+
 template<class T>
 sal_Int16 SAL_CALL checkPrecisionSize()
 {
@@ -977,7 +977,7 @@ void convertToString::test() {
 }
 
 // - string construction & interning (tests)
-// -----------------------------------------------------------------------------
+
 class construction : public CppUnit::TestFixture
 {
 public:
diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx
index 07b3ba6f22c2..9235a910c7c4 100644
--- a/sal/qa/rtl/oustring/rtl_ustr.cxx
+++ b/sal/qa/rtl/oustring/rtl_ustr.cxx
@@ -161,7 +161,7 @@ namespace rtl_ustr
     CPPUNIT_TEST_SUITE_END();
     }; // class compareIgnoreAsciiCase
 
-// -----------------------------------------------------------------------------
+
 
     class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture
     {
@@ -246,7 +246,7 @@ namespace rtl_ustr
 }; // class compare
 
 
-// // -----------------------------------------------------------------------------
+//
 //
 //     class hashCode : public CppUnit::TestFixture
 //     {
@@ -301,7 +301,7 @@ namespace rtl_ustr
 //     }; // class compare
 //
 //
-// // -----------------------------------------------------------------------------
+//
 //
     class indexOfChar : public CppUnit::TestFixture
     {
@@ -348,7 +348,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class indexOfChar
 
-// // -----------------------------------------------------------------------------
+//
     class lastIndexOfChar : public CppUnit::TestFixture
     {
     public:
@@ -395,7 +395,7 @@ namespace rtl_ustr
     }; // class lastIndexOfChar
 
 
-// -----------------------------------------------------------------------------
+
 
     class indexOfStr : public CppUnit::TestFixture
     {
@@ -452,7 +452,7 @@ namespace rtl_ustr
         CPPUNIT_TEST(indexOfStr_002);
         CPPUNIT_TEST_SUITE_END();
     }; // class compare
-// -----------------------------------------------------------------------------
+
 
 
     class lastIndexOfStr : public CppUnit::TestFixture
@@ -517,7 +517,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class lastIndexOfStr
 
-// -----------------------------------------------------------------------------
+
 
     class replaceChar : public CppUnit::TestFixture
     {
@@ -556,7 +556,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class replaceChar
 
-// -----------------------------------------------------------------------------
+
 
     class replaceChar_WithLength : public CppUnit::TestFixture
     {
@@ -618,7 +618,7 @@ namespace rtl_ustr
     }; // class replaceChar
 
 
-// -----------------------------------------------------------------------------
+
 
     class toAsciiLowerCase : public CppUnit::TestFixture
     {
@@ -700,7 +700,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class replaceChar
 
-// -----------------------------------------------------------------------------
+
 
     class toAsciiUpperCase : public CppUnit::TestFixture
     {
@@ -778,7 +778,7 @@ namespace rtl_ustr
     }; // class replaceChar
 
 
-    // -----------------------------------------------------------------------------
+
 
     class trim_WithLength : public CppUnit::TestFixture
     {
@@ -887,7 +887,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     };
 
-    // -----------------------------------------------------------------------------
+
 
     class valueOfChar : public CppUnit::TestFixture
     {
@@ -1067,7 +1067,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class ascii_shortenedCompareIgnoreAsciiCase_WithLength
 
-// -----------------------------------------------------------------------------
+
 
     class ascii_compareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture
     {
@@ -1133,7 +1133,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class ascii_compareIgnoreAsciiCase_WithLength
 
-// -----------------------------------------------------------------------------
+
 
     class ascii_compare : public CppUnit::TestFixture
     {
@@ -1191,7 +1191,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class ascii_compare
 
-// -----------------------------------------------------------------------------
+
 
     class ascii_compareIgnoreAsciiCase : public CppUnit::TestFixture
     {
@@ -1377,7 +1377,7 @@ namespace rtl_ustr
         CPPUNIT_TEST_SUITE_END();
     }; // class ascii_compareIgnoreAsciiCase
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::compare);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::compareIgnoreAsciiCase);
 
@@ -1409,7 +1409,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsciiCase_
 
 } // namespace rtl_ustr
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx
index 93d0769830ad..f9606d4d778f 100644
--- a/sal/qa/rtl/random/rtl_random.cxx
+++ b/sal/qa/rtl/random/rtl_random.cxx
@@ -394,7 +394,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 }; // class getBytes
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::createPool);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::destroyPool);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::addBytes);
diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
index dd1e24490a19..f7917a7f2bc4 100644
--- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx
+++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx
@@ -467,7 +467,7 @@ namespace
         CPPUNIT_TEST_SUITE_END( );
     };
 
-    // -----------------------------------------------------------------------------
+
 
     class testBestUnix : public CppUnit::TestFixture
     {
diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx
index f91747326746..e8c4e764b72c 100644
--- a/sal/qa/rtl/uri/rtl_Uri.cxx
+++ b/sal/qa/rtl/uri/rtl_Uri.cxx
@@ -28,11 +28,11 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-// -----------------------------------------------------------------------------
+
 
 namespace Stringtest
 {
-    // -----------------------------------------------------------------------------
+
 
     class Convert : public CppUnit::TestFixture
     {
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index df41381ed549..dc3b60f159b1 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -204,7 +204,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createUuid);
 CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createNamedUuid);
 } // namespace rtl_Uuid
 
-// -----------------------------------------------------------------------------
+
 
 // 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/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index 915301943fe9..22069c9acbe7 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -228,7 +228,7 @@ namespace test_comtools
         CPPUNIT_TEST_SUITE_END();
     };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReference, "test_comtools");
 
 } // namespace rtl_OUString
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 43275c37d55c..e33df5e1d2ef 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -116,7 +116,7 @@ rtl::OUString recursivelyExpandMacros(
 
 }
 
-//----------------------------------------------------------------------------
+
 
 struct rtl_bootstrap_NameValue
 {
@@ -156,7 +156,7 @@ namespace {
         public rtl::Static< NameValueList, rtl_bootstrap_set_list > {};
 }
 
-//----------------------------------------------------------------------------
+
 
 static bool getFromCommandLineArgs(
     rtl::OUString const & key, rtl::OUString * value )
@@ -219,7 +219,7 @@ static bool getFromCommandLineArgs(
     return found;
 }
 
-//----------------------------------------------------------------------------
+
 
 extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl (
     rtl_uString ** ppFileURL) SAL_THROW_EXTERN_C();
@@ -229,7 +229,7 @@ inline void getExecutableFile_Impl (rtl_uString ** ppFileURL)
     osl_bootstrap_getExecutableFile_Impl (ppFileURL);
 }
 
-//----------------------------------------------------------------------------
+
 
 static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL)
 {
@@ -242,7 +242,7 @@ static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL)
     rtl_uString_newFromStr_WithLength(ppDirURL,fileName.getStr(),nDirEnd);
 }
 
-//----------------------------------------------------------------------------
+
 
 static OUString & getIniFileName_Impl()
 {
@@ -309,7 +309,7 @@ static OUString & getIniFileName_Impl()
     return *pStaticName;
 }
 
-//----------------------------------------------------------------------------
+
 // #111772#
 // ensure the given file url has no final slash
 
@@ -353,7 +353,7 @@ struct Bootstrap_Impl
         ExpandRequestLink const * requestStack) const;
 };
 
-//----------------------------------------------------------------------------
+
 
 Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
     : _nRefCount( 0 ),
@@ -420,7 +420,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName )
 #endif /* OSL_DEBUG_LEVEL > 1 */
 }
 
-//----------------------------------------------------------------------------
+
 
 Bootstrap_Impl::~Bootstrap_Impl()
 {
@@ -428,7 +428,7 @@ Bootstrap_Impl::~Bootstrap_Impl()
         rtl_bootstrap_args_close( _base_ini );
 }
 
-//----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -657,7 +657,7 @@ bootstrap_map::t * bootstrap_map::m_map = NULL;
 
 }
 
-//----------------------------------------------------------------------------
+
 
 rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
     rtl_uString * pIniName
@@ -713,7 +713,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open (
     return static_cast< rtlBootstrapHandle >( that );
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL rtl_bootstrap_args_close (
     rtlBootstrapHandle handle
@@ -750,7 +750,7 @@ void SAL_CALL rtl_bootstrap_args_close (
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL rtl_bootstrap_get_from_handle(
     rtlBootstrapHandle handle,
@@ -773,7 +773,7 @@ sal_Bool SAL_CALL rtl_bootstrap_get_from_handle(
     return found;
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL rtl_bootstrap_get_iniName_from_handle (
     rtlBootstrapHandle handle,
@@ -795,7 +795,7 @@ void SAL_CALL rtl_bootstrap_get_iniName_from_handle (
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL rtl_bootstrap_setIniFileName (
     rtl_uString * pName
@@ -806,7 +806,7 @@ void SAL_CALL rtl_bootstrap_setIniFileName (
     file = pName;
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL rtl_bootstrap_get (
     rtl_uString  * pName,
@@ -817,7 +817,7 @@ sal_Bool SAL_CALL rtl_bootstrap_get (
     return rtl_bootstrap_get_from_handle(0, pName, ppValue, pDefault);
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL rtl_bootstrap_set (
     rtl_uString * pName,
@@ -852,7 +852,7 @@ void SAL_CALL rtl_bootstrap_set (
     r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) );
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL rtl_bootstrap_expandMacros_from_handle (
     rtlBootstrapHandle handle,
@@ -868,7 +868,7 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle (
     rtl_uString_assign( macro, expanded.pData );
 }
 
-//----------------------------------------------------------------------------
+
 
 void SAL_CALL rtl_bootstrap_expandMacros(
     rtl_uString ** macro )
diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
index 317bc460273a..063cccdcf022 100644
--- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
+++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx
@@ -24,35 +24,35 @@
 #include <windows.h>
 #include <ole2.h>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 
 //============================================================================
 // OTWrapperDataObject
 //============================================================================
 
-//------------------------------------------------------------------------
+
 // ctor
-//------------------------------------------------------------------------
+
 
 CXTDataObject::CXTDataObject( LONG nRefCntInitVal ) :
     m_nRefCnt( nRefCntInitVal )
 {
 }
 
-//------------------------------------------------------------------------
+
 // dtor
-//------------------------------------------------------------------------
+
 
 CXTDataObject::~CXTDataObject( )
 {
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -75,18 +75,18 @@ STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CXTDataObject::AddRef( )
 {
     return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) );
 }
 
-//------------------------------------------------------------------------
+
 // IUnknown->Release
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CXTDataObject::Release( )
 {
@@ -103,10 +103,10 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
     return nRefCnt;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetData
 // warning: 'goto' ahead (to easy error handling without using exceptions)
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
 {
@@ -178,9 +178,9 @@ STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc )
 {
@@ -201,72 +201,72 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** p
     return hr;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->QueryGetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetDataHere
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->GetCanonicalFormatEtc
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->SetData
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->DUnadvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::DUnadvise( DWORD )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // IDataObject->EnumDAdvise
-//------------------------------------------------------------------------
+
 
 STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * )
 {
     return E_NOTIMPL;
 }
 
-//------------------------------------------------------------------------
+
 // for our convenience
-//------------------------------------------------------------------------
+
 
 CXTDataObject::operator IDataObject*( )
 {
@@ -279,9 +279,9 @@ CXTDataObject::operator IDataObject*( )
 //============================================================================
 
 
-//----------------------------------------------------------------------------
+
 // ctor
-//----------------------------------------------------------------------------
+
 
 CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) :
     m_nRefCnt( 0 ),
@@ -292,17 +292,17 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) :
     m_cfFormats[1] = CF_TEXT;
 }
 
-//----------------------------------------------------------------------------
+
 // dtor
-//----------------------------------------------------------------------------
+
 
 CEnumFormatEtc::~CEnumFormatEtc( )
 {
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->QueryInterface
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
 {
@@ -323,9 +323,9 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->AddRef
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
 {
@@ -334,9 +334,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( )
     return InterlockedIncrement( &m_nRefCnt );
 }
 
-//----------------------------------------------------------------------------
+
 // IUnknown->Release
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
 {
@@ -353,9 +353,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
     return nRefCnt;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Next
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched )
 {
@@ -397,9 +397,9 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Skip
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
 {
@@ -414,9 +414,9 @@ STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt )
     return hr;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Reset
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Reset( )
 {
@@ -424,9 +424,9 @@ STDMETHODIMP CEnumFormatEtc::Reset( )
     return S_OK;
 }
 
-//----------------------------------------------------------------------------
+
 // IEnumFORMATETC->Clone
-//----------------------------------------------------------------------------
+
 
 STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum )
 {
diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
index 030faaa9d98e..b359d48687ff 100644
--- a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
+++ b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx
@@ -67,9 +67,9 @@ HWND                g_hWnd;
 HANDLE              g_hEvent;
 BOOL                g_bEnd;
 
-//----------------------------------------------------
+
 // a thread function
-//----------------------------------------------------
+
 
 unsigned int _stdcall ThreadProc(LPVOID pParam)
 {
@@ -82,9 +82,9 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
     return 0;
 }
 
-//----------------------------------------------------
+
 // WinMain
-//----------------------------------------------------
+
 
 int APIENTRY WinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
@@ -142,7 +142,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 
 
 
-//----------------------------------------------------------------
+
 //  FUNCTION: MyRegisterClass()
 //
 //  PURPOSE: Registers the window class.
@@ -152,7 +152,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 //    needs to be compatible with Win32 systems prior to 'RegisterClassEx'
 //    function, which was added to Windows 95. If it important to call
 //    this function to allow the use of small icons in the correct proportions.
-//----------------------------------------------------------------
+
 
 ATOM MyRegisterClass( HINSTANCE hInstance )
 {
@@ -175,7 +175,7 @@ ATOM MyRegisterClass( HINSTANCE hInstance )
     return RegisterClassEx(&wcex);
 }
 
-//----------------------------------------------------------------
+
 //   FUNCTION: InitInstance(HANDLE, int)
 //
 //   PURPOSE: Saves instance access number and creates main window
@@ -183,7 +183,7 @@ ATOM MyRegisterClass( HINSTANCE hInstance )
 //   Comments:
 //        In this function, the instance access number is stored in a global variable
 //        and the main program window is displayed.
-//----------------------------------------------------------------
+
 
 BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
 {
@@ -203,7 +203,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
    return TRUE;
 }
 
-//----------------------------------------------------------------
+
 //  FUNCTION: WndProc(HWND, unsigned, WORD, LONG)
 //
 //  PURPOSE: Processes messages for the main window.
@@ -211,7 +211,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow )
 //  WM_COMMAND  - Handle application menu
 //  WM_PAINT    - Display main windows
 //  WM_DESTROY  - Output completion message and return
-//----------------------------------------------------------------
+
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -279,9 +279,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
    return 0;
 }
 
-//----------------------------------------------
+
 // copy data into the clipboard
-//----------------------------------------------
+
 
 void CopyClipboardData( HWND hWnd )
 {
@@ -293,9 +293,9 @@ void CopyClipboardData( HWND hWnd )
 #endif
 }
 
-//----------------------------------------------
+
 // flush the content into the clipboard
-//----------------------------------------------
+
 
 void FlushClipboard( )
 {
diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx
index 9db93203d006..f4cf9cd94ea2 100644
--- a/sal/workben/clipboardwben/testpaste/cbptest.cxx
+++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx
@@ -55,9 +55,9 @@ LPSTREAM            g_pStm    = NULL;
 char*               pTextBuff = NULL;
 DWORD               lData     = 0;
 
-//----------------------------------------------------
+
 // a thread function
-//----------------------------------------------------
+
 
 unsigned int _stdcall ThreadProc(LPVOID pParam)
 {
@@ -119,9 +119,9 @@ unsigned int _stdcall ThreadProc(LPVOID pParam)
     return 0;
 }
 
-//----------------------------------------------------
+
 // WinMain
-//----------------------------------------------------
+
 
 int APIENTRY WinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
@@ -348,9 +348,9 @@ void PasteClipboardData2(HWND hwndParent)
     }
 }
 
-//----------------------------------------------------
+
 // clipboard handling
-//----------------------------------------------------
+
 
 /*
 void PasteClipboardData(HWND hwndParent)
diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
index 663a083cc99d..e39a71e6405e 100644
--- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx
+++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx
@@ -65,9 +65,9 @@ void    CALLBACK OnClipboardContentChange( void );
 LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM );
 LRESULT CALLBACK About( HWND, UINT, WPARAM, LPARAM );
 
-//----------------------------------------------------
+
 // WinMain
-//----------------------------------------------------
+
 
 int APIENTRY WinMain(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx
index f4b1df974112..b4392a4136b1 100644
--- a/sal/workben/testfile.cxx
+++ b/sal/workben/testfile.cxx
@@ -78,9 +78,9 @@ void printFileName(const ::rtl::OUString& str)
     return;
 }
 
-//--------------------------------------------------
+
 // Initialization
-//--------------------------------------------------
+
 
 sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBreak )
 {
@@ -267,9 +267,9 @@ sal_Bool Initialize( void )
     return sal_True;
 }
 
-//--------------------------------------------------
+
 // Shutdown
-//--------------------------------------------------
+
 
 sal_Bool Shutdown( void )
 {
@@ -318,9 +318,9 @@ sal_Bool Shutdown( void )
     return fSuccess;
 }
 
-//--------------------------------------------------
+
 // helper functions
-//--------------------------------------------------
+
 
 // Show FileType
 void showFileType( FileStatus::Type aType )
@@ -440,9 +440,9 @@ TimeValue getSystemTime()
 }
 
 
-//--------------------------------------------------
+
 // DirectoryOpenAndCloseTest
-//--------------------------------------------------
+
 
 void DirectoryOpenAndCloseTest( void )
 {
@@ -453,9 +453,9 @@ void DirectoryOpenAndCloseTest( void )
     printf( "Directory-Open-And-Close-Test\n");
     printf( "--------------------------------------------\n\n");
 
-    //--------------------------------------------------
+
     // open an existing directory
-    //--------------------------------------------------
+
 
     pDir=new Directory( dir1 );
     printf( "Open an existing directory: ");
@@ -477,9 +477,9 @@ void DirectoryOpenAndCloseTest( void )
     delete pDir;
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // open a not existing directory
-    //--------------------------------------------------
+
 
     pDir=new Directory( dir_not_exist );
 
@@ -495,9 +495,9 @@ void DirectoryOpenAndCloseTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // open a directory with a wrong semantic
-    //--------------------------------------------------
+
     pDir=new Directory( dir_wrong_semantic );
 
     printf( "Open a directory with a wrong semantic: ");
@@ -511,9 +511,9 @@ void DirectoryOpenAndCloseTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // open an existing directory on a server
-    //--------------------------------------------------
+
 
     pDir=new Directory( dir_on_server );
 
@@ -531,9 +531,9 @@ void DirectoryOpenAndCloseTest( void )
     delete pDir;
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // open a not existing directory on a server
-    //--------------------------------------------------
+
 
     pDir=new Directory( dir_not_exist_on_server );
 
@@ -547,9 +547,9 @@ void DirectoryOpenAndCloseTest( void )
     delete pDir;
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Close a not existing directory
-    //--------------------------------------------------
+
 
     pDir=new Directory( dir_not_exist );
     printf( "Close a not existing directory: ");
@@ -564,9 +564,9 @@ void DirectoryOpenAndCloseTest( void )
 
 }
 
-//--------------------------------------------------
+
 // DirectoryCreateAndRemoveTest
-//--------------------------------------------------
+
 
 void DirectoryCreateAndRemoveTest( void )
 {
@@ -577,9 +577,9 @@ void DirectoryCreateAndRemoveTest( void )
     printf( "Directory-Create-And-Remove-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
-    //--------------------------------------------------
+
     // Create directory
-    //--------------------------------------------------
+
     printf( "Create a not existing directory: ");
     printFileName( dir_not_exist );
     printf( "\n" );
@@ -597,9 +597,9 @@ void DirectoryCreateAndRemoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Create a directory on a server
-    //--------------------------------------------------
+
 
     printf( "Create a not existing directory on a server: ");
     printFileName( dir_not_exist_on_server );
@@ -617,9 +617,9 @@ void DirectoryCreateAndRemoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Remove Directories
-    //--------------------------------------------------
+
 
     printf( "Remove the created directories: \n" );
 
@@ -636,9 +636,9 @@ void DirectoryCreateAndRemoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Remove a not existing directory
-    //--------------------------------------------------
+
 
     printf( "Remove a not existing directory: ");
     printFileName( dir_not_exist );
@@ -651,9 +651,9 @@ void DirectoryCreateAndRemoveTest( void )
     return;
 }
 
-//--------------------------------------------------
+
 // FileOpenAndCloseTest
-//--------------------------------------------------
+
 
 static void FileOpenAndCloseTest( void )
 {
@@ -671,41 +671,41 @@ static void FileOpenAndCloseTest( void )
     printFileName( file1 );
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // open an existing file (Read)
-    //--------------------------------------------------
+
 
     rc=pFile->open( osl_File_OpenFlag_Read );
     print_error( rtl::OString( "Open File (Read)" ), rc );
 
-    //--------------------------------------------------
+
     // close the file
-    //--------------------------------------------------
+
 
     rc=pFile->close();
     print_error( rtl::OString( "Close File" ), rc );
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // open an existing file (Write)
-    //--------------------------------------------------
+
 
     rc=pFile->open( osl_File_OpenFlag_Write );
     print_error( rtl::OString( "Open File (Write)" ), rc );
 
-    //--------------------------------------------------
+
     // close the file
-    //--------------------------------------------------
+
 
      rc=pFile->close();
     print_error( rtl::OString( "Close File" ), rc );
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // close the file a second time
-    //--------------------------------------------------
+
 
      rc=pFile->close();
     print_error( rtl::OString( "Close the file a second time" ), rc );
@@ -714,9 +714,9 @@ static void FileOpenAndCloseTest( void )
     PressKey();
 }
 
-//--------------------------------------------------
+
 // FileCreateAndRemoveTest
-//--------------------------------------------------
+
 
 void FileCreateAndRemoveTest()
 {
@@ -733,39 +733,39 @@ void FileCreateAndRemoveTest()
     printFileName( file_not_exist );
     printf( "\n" );
 
-    //----------------------------------------------------
+
     // open (create) a not existing file (Read and write)
-    //----------------------------------------------------
+
 
     rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
     print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc );
 
-    //----------------------------------------------------
+
     // close the file
-    //----------------------------------------------------
+
 
     rc=pFile->close();
     print_error( rtl::OString( "Close File" ), rc );
 
-    //----------------------------------------------------
+
     // remove the file
-    //----------------------------------------------------
+
 
     rc=pFile->remove( file_not_exist );
     print_error( rtl::OString(" Remove File" ), rc );
 
     printf( "\n" );
 
-    //----------------------------------------------------
+
     // remove the same file a second time
-    //----------------------------------------------------
+
     rc=pFile->remove( file_not_exist );
     print_error( rtl::OString( "Remove a not existing File" ), rc );
 
-    //----------------------------------------------------
+
     // remove an open file
-    //----------------------------------------------------
+
 
     pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
@@ -780,9 +780,9 @@ void FileCreateAndRemoveTest()
     return;
 }
 
-//--------------------------------------------------
+
 // FileWriteAndReadTest
-//--------------------------------------------------
+
 
 void FileWriteAndReadTest( void )
 {
@@ -806,9 +806,9 @@ void FileWriteAndReadTest( void )
     printFileName( file_not_exist );
     printf("\n");
 
-    //----------------------------------------------------
+
     // open (create) a not existing file (Read and write)
-    //----------------------------------------------------
+
 
     rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
 
@@ -816,9 +816,9 @@ void FileWriteAndReadTest( void )
 
     printf( "\n" );
 
-    //----------------------------------------------------
+
     // write a string to the file
-    //----------------------------------------------------
+
     rc=pFile->write( pWriteBuffer , nLen , uWritten );
     print_error( rtl::OString( "Write File" ), rc );
 
@@ -829,18 +829,18 @@ void FileWriteAndReadTest( void )
 
     printf( "\n" );
 
-    //----------------------------------------------------
+
     // move the filepointer to the beginning
-    //----------------------------------------------------
+
 
     rc=pFile->setPos( osl_Pos_Absolut , 0 );
     print_error( rtl::OString( "Set FilePointer to the beginning of the file" ), rc );
 
     printf( "\n" );
 
-    //----------------------------------------------------
+
     // read the string
-    //----------------------------------------------------
+
 
     pReadBuffer=(sal_Char*) rtl_allocateMemory( (sal_uInt32)(nLen+1)*sizeof(sal_Char) );
     memset( pReadBuffer, 0, (sal_uInt32)(nLen+1)*sizeof(sal_Char) );
@@ -873,9 +873,9 @@ void FileWriteAndReadTest( void )
 
 }
 
-//--------------------------------------------------
+
 // FileCopyMoveTest
-//--------------------------------------------------
+
 
 void FileCopyAndMoveTest( void )
 {
@@ -889,9 +889,9 @@ void FileCopyAndMoveTest( void )
     File    *pFile;
     rtl::OUString   destPath(dir2);
 
-    //--------------------------------------------------
+
     // FileCopyTest
-    //--------------------------------------------------
+
 
     destPath+=rtl::OUString("/");
     destPath+=file3;
@@ -922,9 +922,9 @@ void FileCopyAndMoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Copy a file to a not existing directory
-    //--------------------------------------------------
+
 
     destPath=rtl::OUString( dir_not_exist );
     destPath+=rtl::OUString("/");
@@ -940,9 +940,9 @@ void FileCopyAndMoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Copy a directory
-    //--------------------------------------------------
+
 
     printf( "Copy the directory: ");
     printFileName( dir1 );
@@ -955,9 +955,9 @@ void FileCopyAndMoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // FileMoveTest
-    //--------------------------------------------------
+
 
     destPath=rtl::OUString( dir2 );
     destPath+=rtl::OUString("/");
@@ -1004,9 +1004,9 @@ void FileCopyAndMoveTest( void )
     printf( "\n" );
 
 
-    //--------------------------------------------------
+
     // Move a file to a not existing directory
-    //--------------------------------------------------
+
 
     destPath=rtl::OUString( dir_not_exist );
     destPath+=rtl::OUString("/");
@@ -1024,9 +1024,9 @@ void FileCopyAndMoveTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // Move a directory
-    //--------------------------------------------------
+
 
     printf( "Move a directory: \n");
 
@@ -1050,9 +1050,9 @@ void FileCopyAndMoveTest( void )
     return;
 }
 
-//----------------------------------------------------
+
 // FileSizeTest
-//----------------------------------------------------
+
 
 void FileSizeTest( void )
 {
@@ -1077,9 +1077,9 @@ void FileSizeTest( void )
 
     if ( rc == FileBase::E_None )
     {
-        //----------------------------------------------------
+
         // Set Filesize to 5000
-        //----------------------------------------------------
+
 
         printf( "Set FileSize to 5000\n" );
         rc=aFile.setSize( 5000 );
@@ -1088,9 +1088,9 @@ void FileSizeTest( void )
         printf( "\n" );
         printf( "Verify:\n" );
 
-        //----------------------------------------------------
+
         // Check whether Filesize is set to 5000
-        //----------------------------------------------------
+
 
         rc=DirectoryItem::get( file_not_exist, aItem );
         print_error( rtl::OString( "Get DirectoryItem" ), rc );
@@ -1114,9 +1114,9 @@ void FileSizeTest( void )
 
         printf( "\n" );
 
-        //----------------------------------------------------
+
         // Set Filesize to -1
-        //----------------------------------------------------
+
 
         printf( "Set FileSize to -1\n" );
         rc=aFile.setSize( -1 );
@@ -1139,9 +1139,9 @@ void FileSizeTest( void )
 }
 
 
-//----------------------------------------------------
+
 // FilePointerTest
-//----------------------------------------------------
+
 
 void FilePointerTest( void )
 {
@@ -1166,9 +1166,9 @@ void FilePointerTest( void )
     if ( rc==FileBase::E_None )
     {
 
-        //----------------------------------------------------
+
         // get the position of the filepointer
-        //----------------------------------------------------
+
 
         rc =rFile.getPos( filepointer );
         print_error( rtl::OString( "GetPos" ), rc );
@@ -1176,9 +1176,9 @@ void FilePointerTest( void )
 
         printf( "\n" );
 
-        //----------------------------------------------------
+
         // set the filepointer at the end of a file
-        //----------------------------------------------------
+
 
         printf( "Set FileSize to 5000\n" );
         rFile.setSize( 5000 );
@@ -1218,9 +1218,9 @@ void FilePointerTest( void )
     return;
 }
 
-//--------------------------------------------------
+
 // FileAttributesTest
-//--------------------------------------------------
+
 
 void verifyFileAttributes( void )
 {
@@ -1408,9 +1408,9 @@ void FileAttributesTest( void )
 }
 #endif
 
-//--------------------------------------------------
+
 // FileTimeTest
-//--------------------------------------------------
+
 
 void FileTimeTest( void )
 {
@@ -1472,17 +1472,17 @@ void FileTimeTest( void )
     printf( "\nModifyTime \t : ");
     showTime( aModifyTime );
 
-    //--------------------------------------------------
+
     // setTime
-    //--------------------------------------------------
+
 
     printf( "\n" );
     rc=File::setTime( file1 , aCreationTime , aAccessTime , aModifyTime );
     print_error( rtl::OString( "SetTime" ), rc );
 
-    //--------------------------------------------------
+
     // Verify
-    //--------------------------------------------------
+
 
     FileStatus rStatus( osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime | osl_FileStatus_Mask_ModifyTime);
 
@@ -1499,9 +1499,9 @@ void FileTimeTest( void )
 
         if ( rc==FileBase::E_None )
         {
-            //--------------------------------------------------
+
             // GetCreationTime
-            //--------------------------------------------------
+
 
             aCreationTimeRead=rStatus.getCreationTime();
 #ifdef WNT
@@ -1513,9 +1513,9 @@ void FileTimeTest( void )
             showTime( aCreationTimeRead );
             printf( "\n" );
 #endif
-            //--------------------------------------------------
+
             // GetAccessTime
-            //--------------------------------------------------
+
 
             aAccessTimeRead=rStatus.getAccessTime();
 
@@ -1527,9 +1527,9 @@ void FileTimeTest( void )
             showTime( aAccessTimeRead );
             printf( "\n" );
 
-            //--------------------------------------------------
+
             // GetModifyTime
-            //--------------------------------------------------
+
 
             aModifyTimeRead=rStatus.getModifyTime();
 
@@ -1548,9 +1548,9 @@ void FileTimeTest( void )
 }
 
 
-//--------------------------------------------------
+
 // DirectoryItemTest
-//--------------------------------------------------
+
 
 void DirectoryItemTest( void )
 {
@@ -1564,9 +1564,9 @@ void DirectoryItemTest( void )
     printf( "Directory-Item-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
-    //--------------------------------------------------
+
     // get DirectoryItem from an existing directory
-    //--------------------------------------------------
+
 
     printf( "Get DirectoryItem from an existing Directory: ");
     printFileName( dir1 );
@@ -1589,9 +1589,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // get DirectoryItem from a not existing directory
-    //--------------------------------------------------
+
 
     printf( "Get DirectoryItem from a not existing Directory: ");
     printFileName( dir_not_exist );
@@ -1602,9 +1602,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // get DirectoryItem from an existing file
-    //--------------------------------------------------
+
 
     printf( "Get DirectoryItem from an existing File: ");
     printFileName( file1 );
@@ -1627,9 +1627,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // get DirectoryItem from a not existing file
-    //--------------------------------------------------
+
 
     printf( "Get DirectoryItem from a not existing File: ");
     printFileName( file_not_exist );
@@ -1640,9 +1640,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //----------------------------------------------------------
+
     // get DirectoryItem from a directory with a wrong semantic
-    //----------------------------------------------------------
+
 
     printf( "Get DirectoryItem from a Directory with a wrong semantic: ");
     printFileName( dir_not_exist );
@@ -1653,9 +1653,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //---------------------------------------------------
+
     // get DirectoryItem from a file-handle
-    //--------------------------------------------------
+
 
     pFile=new File( file1 );
 
@@ -1688,9 +1688,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //---------------------------------------------------
+
     // get DirectoryItem
-    //--------------------------------------------------
+
 
     printf( "Get DirectoryItem from an empty File-Handle\n" );
     rc=DirectoryItem::get( file1 , aItem );
@@ -1698,9 +1698,9 @@ void DirectoryItemTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // GetNextItem from a directory
-    //--------------------------------------------------
+
 
     pDir=new Directory( dir1 );
     printf( "Get next DirectoryItem from a directory: ");
@@ -1714,9 +1714,9 @@ void DirectoryItemTest( void )
 
     if ( pDir->isOpen() )
     {
-        //--------------------------------------------------
+
         // get all files from the directory
-        //--------------------------------------------------
+
 
         rtl::OUString   str;
         rtl::OUString   str1[2];
@@ -1743,9 +1743,9 @@ void DirectoryItemTest( void )
 
         printf( "\n" );
 
-        //--------------------------------------------------
+
         // Reset-Test
-        //--------------------------------------------------
+
 
         for (int i=0; i<2; i++)
         {
@@ -1774,9 +1774,9 @@ void DirectoryItemTest( void )
 
     printf( "\n");
 
-    //--------------------------------------------------
+
     // GetNextItem from a closed directory
-    //--------------------------------------------------
+
 
     printf( "Get next DirectoryItem from a closed directory: ");
     printFileName( dir1 );
@@ -1792,15 +1792,15 @@ void DirectoryItemTest( void )
     return;
 }
 
-//--------------------------------------------------
+
 // FileStatusTest (for different types)
-//--------------------------------------------------
+
 
 void FileStatusTest( FileStatus *pStatus )
 {
-    //--------------------------------------------------
+
     // GetFileType of the directory
-    //--------------------------------------------------
+
 
     FileStatus::Type    aType;
 
@@ -1808,9 +1808,9 @@ void FileStatusTest( FileStatus *pStatus )
     aType=pStatus->getFileType();
     showFileType( aType );
 
-    //--------------------------------------------------
+
     // GetAttributes
-    //--------------------------------------------------
+
 
     sal_uInt64          uAttributes;
 
@@ -1818,9 +1818,9 @@ void FileStatusTest( FileStatus *pStatus )
     uAttributes=pStatus->getAttributes();
     showAttributes( uAttributes );
 
-    //--------------------------------------------------
+
     // GetCreationTime
-    //--------------------------------------------------
+
 
     TimeValue   aCreationTime;
 
@@ -1830,9 +1830,9 @@ void FileStatusTest( FileStatus *pStatus )
     printf( "CreationTime: " );
     showTime( aCreationTime );
 
-    //--------------------------------------------------
+
     // GetAccessTime
-    //--------------------------------------------------
+
 
     TimeValue   aAccessTime;
 
@@ -1842,9 +1842,9 @@ void FileStatusTest( FileStatus *pStatus )
     printf( "AccessTime: " );
     showTime( aAccessTime );
 
-    //--------------------------------------------------
+
     // GetModifyTime
-    //--------------------------------------------------
+
 
     TimeValue   aModifyTime;
 
@@ -1854,9 +1854,9 @@ void FileStatusTest( FileStatus *pStatus )
     printf( "ModifyTime: " );
     showTime( aModifyTime );
 
-    //--------------------------------------------------
+
     // GetFileSize
-    //--------------------------------------------------
+
 
     sal_uInt64          FileSize;
 
@@ -1865,9 +1865,9 @@ void FileStatusTest( FileStatus *pStatus )
     FileSize=pStatus->getFileSize();
     printf( "FileSize: %" SAL_PRIuUINT64 "\n", FileSize);
 
-    //--------------------------------------------------
+
     // GetFileName
-    //--------------------------------------------------
+
 
     rtl::OUString           FileName;
 
@@ -1878,9 +1878,9 @@ void FileStatusTest( FileStatus *pStatus )
     printFileName( FileName );
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // GetFileURL
-    //--------------------------------------------------
+
 
     rtl::OUString           FileURL;
 
@@ -1891,9 +1891,9 @@ void FileStatusTest( FileStatus *pStatus )
     printFileName( FileURL );
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // GetLinkTargetURL
-    //--------------------------------------------------
+
 
     rtl::OUString           LinkTargetURL;
 
@@ -1907,9 +1907,9 @@ void FileStatusTest( FileStatus *pStatus )
     return;
 }
 
-//--------------------------------------------------
+
 // DirectoryFileStatusTest
-//--------------------------------------------------
+
 
 void DirectoryFileStatusTest( void )
 {
@@ -1946,9 +1946,9 @@ void DirectoryFileStatusTest( void )
     return;
 }
 
-//--------------------------------------------------
+
 // FileFileStatusTest
-//--------------------------------------------------
+
 
 void FileFileStatusTest( void )
 {
@@ -1985,9 +1985,9 @@ void FileFileStatusTest( void )
     return;
 }
 
-//--------------------------------------------------
+
 // VolumeFileStatusTest
-//--------------------------------------------------
+
 
 void VolumeFileStatusTest( void )
 {
@@ -2025,9 +2025,9 @@ void VolumeFileStatusTest( void )
 }
 
 
-//--------------------------------------------------
+
 // VolumeInfoTest
-//--------------------------------------------------
+
 
 void VolumeInfoTest( void )
 {
@@ -2048,67 +2048,67 @@ void VolumeInfoTest( void )
 
     printf( "\n" );
 
-    //--------------------------------------------------
+
     // getRemoteFlag
-    //--------------------------------------------------
+
 
     if ( rInfo.getRemoteFlag() )
         printf( "RemoteFlag: Yes\n" );
     else
         printf( "RemoteFlag: No\n" );
 
-    //--------------------------------------------------
+
     // getRemoveableFlag
-    //--------------------------------------------------
+
 
     if ( rInfo.getRemoveableFlag() )
         printf( "RemoveableFlag: Yes\n" );
     else
         printf( "RemoveableFlag: No\n" );
 
-    //--------------------------------------------------
+
     // getTotalSpace
-    //--------------------------------------------------
+
 
     sal_uInt64  TotalSpace;
     TotalSpace=rInfo.getTotalSpace();
     printf( "Total Space: %" SAL_PRIuUINT64 "\n",TotalSpace );
 
-    //--------------------------------------------------
+
     // getFreeSpace
-    //--------------------------------------------------
+
 
     sal_uInt64  FreeSpace;
     FreeSpace=rInfo.getFreeSpace();
     printf( "Free Space: %" SAL_PRIuUINT64 "\n",FreeSpace );
 
-    //--------------------------------------------------
+
     // getUsedSpace
-    //--------------------------------------------------
+
 
     sal_uInt64  UsedSpace;
     UsedSpace=rInfo.getUsedSpace();
     printf( "Used Space: %" SAL_PRIuUINT64 "\n",UsedSpace );
 
-    //--------------------------------------------------
+
     // getMaxNameLength
-    //--------------------------------------------------
+
 
     sal_uInt32  MaxNameLength;
     MaxNameLength=rInfo.getMaxNameLength();
     printf( "MaxNameLength: %" SAL_PRIuUINT32 "\n",MaxNameLength );
 
-    //--------------------------------------------------
+
     // getMaxPathLength
-    //--------------------------------------------------
+
 
     sal_uInt32  MaxPathLength;
     MaxPathLength=rInfo.getMaxPathLength();
     printf( "MaxPathLength: %" SAL_PRIuUINT32 "\n",MaxPathLength );
 
-    //--------------------------------------------------
+
     // getFileSystemName
-    //--------------------------------------------------
+
 
     rtl::OUString   FileSystemName;
     FileSystemName=rInfo.getFileSystemName();
@@ -2120,9 +2120,9 @@ void VolumeInfoTest( void )
     return;
 }
 
-//--------------------------------------------------
+
 // FileBaseTest
-//--------------------------------------------------
+
 
 void ConvertPathTest(rtl::OUString& strPath)
 {
@@ -2133,9 +2133,9 @@ void ConvertPathTest(rtl::OUString& strPath)
     rtl::OUString       strNormPathFromFileURL;
     rtl::OUString       strSystemPath;
 
-    //--------------------------------------------------
+
     // normalizePath
-    //--------------------------------------------------
+
 
     rc=FileBase::getFileURLFromSystemPath( strPath, strNormPath );
 
@@ -2148,9 +2148,9 @@ void ConvertPathTest(rtl::OUString& strPath)
     else
         printf( "normalizePath: Error \n" );
 
-    //--------------------------------------------------
+
     // getFileURLFromSystemPath
-    //--------------------------------------------------
+
 
     if ( !strNormPath.isEmpty() )
     {
@@ -2168,9 +2168,9 @@ void ConvertPathTest(rtl::OUString& strPath)
     else
         printf( "getFileURLFromSystemPath: not tested \n" );
 
-    //--------------------------------------------------
+
     // getNormalizedPathFromFileURL
-    //--------------------------------------------------
+
 
     if ( !strFileURL.isEmpty() )
     {
@@ -2189,9 +2189,9 @@ void ConvertPathTest(rtl::OUString& strPath)
         printf( "getNormalizedPathFromFileURL: not tested \n" );
 
 
-    //--------------------------------------------------
+
     // getSystemPathFromFileURL
-    //--------------------------------------------------
+
 
     if ( !strNormPath.isEmpty() )
     {
@@ -2209,9 +2209,9 @@ void ConvertPathTest(rtl::OUString& strPath)
     else
         printf( "getSystemPathFromFileURL: not tested \n" );
 
-    //--------------------------------------------------
+
     // Verify
-    //--------------------------------------------------
+
 
     if ( strNormPathFromFileURL == strNormPath )
         printf( "\nVerify: OK ! ( Normalized-Path == Normalized-Path-From-File-URL )\n" );
@@ -2227,9 +2227,9 @@ void FileBaseTest()
     printf( "FileBase-Test\n" );
     printf( "--------------------------------------------\n\n" );
 
-    //--------------------------------------------------
+
     // ConvertPath-Test (Local File)
-    //--------------------------------------------------
+
 
     printf( "- Local File: ");
     printFileName( file1 );
@@ -2237,9 +2237,9 @@ void FileBaseTest()
 
     ConvertPathTest(file1);
 
-    //--------------------------------------------------
+
     // ConvertPath-Test (File on a server)
-    //--------------------------------------------------
+
 
     printf( "\n- File on server: ");
     printFileName( file_on_server );
@@ -2252,9 +2252,9 @@ void FileBaseTest()
 }
 
 
-//--------------------------------------------------
+
 // AbsolutePathTest
-//--------------------------------------------------
+
 void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString strRelative)
 {
     FileBase::RC    rc;
@@ -2304,9 +2304,9 @@ void AbsolutePathTest(void)
 }
 
 
-//--------------------------------------------------
+
 // searchPathTest
-//--------------------------------------------------
+
 
 void SearchPathTest(void)
 {
@@ -2327,9 +2327,9 @@ void SearchPathTest(void)
     rc=FileBase::getSystemPathFromFileURL( strNormPath, strSystemPath );
     print_error( rtl::OString( "getSystemPathFromFileURL" ), rc );
 
-    //--------------------------------------------------
+
     // searchFileURL (with a normalized path)
-    //--------------------------------------------------
+
 
     if ( !strNormPath.isEmpty() )
     {
@@ -2351,9 +2351,9 @@ void SearchPathTest(void)
     else
         printf( "searchFileURL (with a normalized path): not tested\n" );
 
-    //--------------------------------------------------
+
     // searchFileURL (with a File-URL)
-    //--------------------------------------------------
+
 
     if ( !strFileURL.isEmpty() )
     {
@@ -2375,9 +2375,9 @@ void SearchPathTest(void)
     else
         printf( "searchFileURL (with a FileURL path): not tested\n" );
 
-    //--------------------------------------------------
+
     // searchFileURL (with a systempath)
-    //--------------------------------------------------
+
 
     if ( !strSystemPath.isEmpty() )
     {
@@ -2399,9 +2399,9 @@ void SearchPathTest(void)
     else
         printf( "searchFileURL (with a systempath): not tested\n" );
 
-    //--------------------------------------------------
+
     // searchFileURL (File and no searchpath)
-    //--------------------------------------------------
+
 
     printf( "\nsearchFileURL:  File (no searchpath) : ");
     printFileName( file3 );
@@ -2418,9 +2418,9 @@ void SearchPathTest(void)
     else
         printf( "searchFileURL:  File not found: OK ! \n" );
 
-    //--------------------------------------------------
+
     // searchFileURL (File and Path)
-    //--------------------------------------------------
+
 
     printf( "\nsearchFileURL:  File : ");
     printFileName( file3 );
@@ -2439,9 +2439,9 @@ void SearchPathTest(void)
     else
         printf( "searchFileURL:  File not found: Error\n" );
 
-    //------------------------------------------------------------
+
     // searchFileURL (File and searchpath with two entries)
-    //------------------------------------------------------------
+
 
     rtl::OUString       strSearchPath( dir_not_exist );
     strSearchPath+=rtl::OUString(";");
@@ -2464,9 +2464,9 @@ void SearchPathTest(void)
     else
         printf( "searchFileURL:  File not found: Error\n" );
 
-    //-------------------------------------------------------------------
+
     // searchFileURL (File and searchpath (with a wrong semantic))
-    //-------------------------------------------------------------------
+
 
     strSearchPath=rtl::OUString( dir_wrong_semantic );
 
@@ -2486,9 +2486,9 @@ void SearchPathTest(void)
     return;
 }
 
-//--------------------------------------------------
+
 // CanonicalNameTest
-//--------------------------------------------------
+
 
 void getCanonicalNameTest(rtl::OUString strPath)
 {
@@ -2531,9 +2531,9 @@ void CanonicalNameTest(void)
     return;
 }
 
-//--------------------------------------------------
+
 // print_error
-//--------------------------------------------------
+
 
 void print_error( const ::rtl::OString& str, FileBase::RC rc )
 {
@@ -2680,9 +2680,9 @@ void print_error( const ::rtl::OString& str, FileBase::RC rc )
     return;
 }
 
-//--------------------------------------------------
+
 // main
-//--------------------------------------------------
+
 #if defined WNT
         #define MAIN _cdecl main
 #else
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index da115859953a..9719335d7831 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -349,9 +349,9 @@ extern "C"
 }
 
 
-//---------------------------------------------
+
 // LocatorImpl
-//---------------------------------------------
+
 class LocatorImpl :
     public WeakImplHelper2< XLocator, com::sun::star::io::XSeekable >
     // should use a different interface for stream positions!
@@ -758,11 +758,11 @@ void SaxExpatParser_Impl::parse( )
     } // while
 }
 
-//------------------------------------------
+
 //
 // The C-Callbacks
 //
-//-----------------------------------------
+
 void SaxExpatParser_Impl::callbackStartElement( void *pvThis ,
                                                 const XML_Char *pwName ,
                                                 const XML_Char **awAttributes )
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 6e0f2e94019b..6c5feceb2adc 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -343,11 +343,11 @@ void XMLFile2UTFConverter::initializeDecoding()
 }
 
 
-//----------------------------------------------
+
 //
 // Text2UnicodeConverter
 //
-//----------------------------------------------
+
 Text2UnicodeConverter::Text2UnicodeConverter( const OString &sEncoding )
 {
     rtl_TextEncoding encoding = rtl_getTextEncodingFromMimeCharset( sEncoding.getStr() );
@@ -449,11 +449,11 @@ Sequence<sal_Unicode> Text2UnicodeConverter::convert( const Sequence<sal_Int8> &
 
 
 
-//----------------------------------------------
+
 //
 // Unicode2TextConverter
 //
-//----------------------------------------------
+
 Unicode2TextConverter::Unicode2TextConverter( rtl_TextEncoding encoding )
 {
     init( encoding );
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 067b13a60e07..ba63596ca5ff 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -350,7 +350,7 @@ sal_Int32 SAL_CALL FastLocatorImpl::getColumnNumber(void) throw (RuntimeExceptio
     return XML_GetCurrentColumnNumber( mpParser->getEntity().mpParser );
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber(void) throw (RuntimeException)
 {
@@ -358,14 +358,14 @@ sal_Int32 SAL_CALL FastLocatorImpl::getLineNumber(void) throw (RuntimeException)
     return XML_GetCurrentLineNumber( mpParser->getEntity().mpParser );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL FastLocatorImpl::getPublicId(void) throw (RuntimeException)
 {
     checkDispose();
     return mpParser->getEntity().maStructSource.sPublicId;
 }
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL FastLocatorImpl::getSystemId(void) throw (RuntimeException)
 {
@@ -373,7 +373,7 @@ OUString SAL_CALL FastLocatorImpl::getSystemId(void) throw (RuntimeException)
     return mpParser->getEntity().maStructSource.sSystemId;
 }
 
-// --------------------------------------------------------------------
+
 
 ParserData::ParserData()
     : mpTokenHandler( NULL )
@@ -382,7 +382,7 @@ ParserData::ParserData()
 ParserData::~ParserData()
 {}
 
-// --------------------------------------------------------------------
+
 
 Entity::Entity(const ParserData& rData)
     : ParserData(rData)
@@ -632,7 +632,7 @@ FastSaxParserImpl::FastSaxParserImpl( FastSaxParser* pFront ) :
     mxDocumentLocator.set( new FastLocatorImpl( this ) );
 }
 
-// --------------------------------------------------------------------
+
 
 FastSaxParserImpl::~FastSaxParserImpl()
 {
@@ -640,7 +640,7 @@ FastSaxParserImpl::~FastSaxParserImpl()
         mxDocumentLocator->dispose();
 }
 
-// --------------------------------------------------------------------
+
 
 void FastSaxParserImpl::DefineNamespace( const OString& rPrefix, const sal_Char* pNamespaceURL )
 {
@@ -658,7 +658,7 @@ void FastSaxParserImpl::DefineNamespace( const OString& rPrefix, const sal_Char*
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 FastSaxParserImpl::GetToken( const sal_Char* pToken, sal_Int32 nLen /* = 0 */ )
 {
@@ -667,7 +667,7 @@ sal_Int32 FastSaxParserImpl::GetToken( const sal_Char* pToken, sal_Int32 nLen /*
                                             pToken, nLen );
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const sal_Char*pPrefix, int nPrefixLen, const sal_Char* pName, int nNameLen ) throw (SAXException)
 {
@@ -699,7 +699,7 @@ sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const sal_Char*pPrefix, int nPr
     return FastToken::DONTKNOW;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 FastSaxParserImpl::GetNamespaceToken( const OUString& rNamespaceURL )
 {
@@ -710,7 +710,7 @@ sal_Int32 FastSaxParserImpl::GetNamespaceToken( const OUString& rNamespaceURL )
         return FastToken::DONTKNOW;
 }
 
-// --------------------------------------------------------------------
+
 
 OUString FastSaxParserImpl::GetNamespaceURL( const OString& rPrefix ) throw (SAXException)
 {
@@ -746,7 +746,7 @@ OUString FastSaxParserImpl::GetNamespaceURL( const sal_Char*pPrefix, int nPrefix
     throw SAXException(); // prefix that has no defined namespace url
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 FastSaxParserImpl::GetTokenWithContextNamespace( sal_Int32 nNamespaceToken, const sal_Char* pName, int nNameLen )
 {
@@ -760,7 +760,7 @@ sal_Int32 FastSaxParserImpl::GetTokenWithContextNamespace( sal_Int32 nNamespaceT
     return FastToken::DONTKNOW;
 }
 
-// --------------------------------------------------------------------
+
 
 void FastSaxParserImpl::splitName( const XML_Char *pwName, const XML_Char *&rpPrefix, sal_Int32 &rPrefixLen, const XML_Char *&rpName, sal_Int32 &rNameLen )
 {
@@ -1086,11 +1086,11 @@ void FastSaxParserImpl::parse()
         produce( DONE );
 }
 
-//------------------------------------------
+
 //
 // The C-Callbacks
 //
-//-----------------------------------------
+
 
 void FastSaxParserImpl::callbackStartElement( const XML_Char* pwName, const XML_Char** awAttributes )
 {
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 4d7be76653a7..eb89b67019fb 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------
+
 // testcomponent - Loads a service and its testcomponent from dlls performs a test.
 // Expands the dll-names depending on the actual environment.
 // Example : testcomponent com.sun.star.io.Pipe stm
@@ -103,9 +103,9 @@ public:
     sal_Int32 nPos;
 };
 
-//-------------------------------
+
 // Helper : create an input stream from a file
-//------------------------------
+
 Reference< XInputStream > createStreamFromFile(
     const char *pcFile )
 {
@@ -126,10 +126,10 @@ Reference< XInputStream > createStreamFromFile(
     return r;
 }
 
-//-----------------------------------------
+
 // The document handler, which is needed for the saxparser
 // The Documenthandler for reading sax
-//-----------------------------------------
+
 class TestDocumentHandler :
     public WeakImplHelper3< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
 {
@@ -247,10 +247,10 @@ public:
     int m_iCharCount;
 };
 
-//--------------------------------------
+
 // helper implementation for writing
 // implements an XAttributeList
-//-------------------------------------
+
 struct AttributeListImpl_impl;
 class AttributeListImpl : public WeakImplHelper1< XAttributeList >
 {
@@ -397,13 +397,13 @@ void AttributeListImpl::clear()
 }
 
 
-//--------------------------------------
+
 // helper function for writing
 // ensures that linebreaks are inserted
 // when writing a long text.
 // Note: this implementation may be a bit slow,
 // but it shows, how the SAX-Writer handles the allowLineBreak calls.
-//--------------------------------------
+
 void writeParagraphHelper(
     const  Reference< XExtendedDocumentHandler > &r ,
     const OUString & s)
@@ -427,10 +427,10 @@ void writeParagraphHelper(
 }
 
 
-//---------------------------------
+
 // helper implementation for SAX-Writer
 // writes data to a file
-//--------------------------------
+
 class OFileWriter :
         public WeakImplHelper1< XOutputStream >
 {
@@ -528,10 +528,10 @@ int main (int argc, char **argv)
     }
 
 
-    //--------------------------------
+
     // parser demo
     // read xml from a file and count elements
-    //--------------------------------
+
     Reference< XInterface > x = xSMgr->createInstance(
         OUString("com.sun.star.xml.sax.Parser") );
     if( x.is() )
@@ -570,9 +570,9 @@ int main (int argc, char **argv)
     }
 
 
-    //----------------------
+
     // The SAX-Writer demo
-    //----------------------
+
     x= xSMgr->createInstance("com.sun.star.xml.sax.Writer");
     if( x.is() )
     {
diff --git a/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index 0413af256c85..a0ca81fa3b0e 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-//------------------------------------------------------
+
 // testcomponent - Loads a service and its testcomponent from dlls performs a test.
 // Expands the dll-names depending on the actual environment.
 // Example : testcomponent com.sun.star.io.Pipe stm
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 05acecc69530..580e2a3971ad 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -906,9 +906,9 @@ void Test::testFormulaRefUpdate()
     // Clear all and start over.
     clearRange(m_pDoc, ScRange(0,0,0,10,10,0));
 
-    // ------------------------------------------
+
     // Test range updates
-    // ------------------------------------------
+
 
     // Fill B2:C3 with values.
     m_pDoc->SetValue(ScAddress(1,1,0), 1);
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index bcfdb477f059..0ad67fca8261 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -48,7 +48,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-//------------------------------------------------------------------------
+
 using ::editeng::SvxBorderLine;
 
 ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) :
@@ -63,7 +63,7 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) :
     pData[0].pPattern = pDocument->GetDefPattern(); // no put
 }
 
-//------------------------------------------------------------------------
+
 
 ScAttrArray::~ScAttrArray()
 {
@@ -78,7 +78,7 @@ ScAttrArray::~ScAttrArray()
     delete[] pData;
 }
 
-//------------------------------------------------------------------------
+
 #if OSL_DEBUG_LEVEL > 1
 void ScAttrArray::TestData() const
 {
@@ -107,7 +107,7 @@ void ScAttrArray::TestData() const
 }
 #endif
 
-//------------------------------------------------------------------------
+
 
 void ScAttrArray::Reset( const ScPatternAttr* pPattern )
 {
@@ -179,7 +179,7 @@ bool ScAttrArray::Concat(SCSIZE nPos)
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const
 {
@@ -342,7 +342,7 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 n
 
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool )
 {
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index d6d3b4f125bc..d47a519b47da 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -41,7 +41,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 TYPEINIT1(ScMergeAttr,          SfxPoolItem);
 TYPEINIT1_AUTOFACTORY(ScProtectionAttr,     SfxPoolItem);
@@ -53,7 +53,7 @@ TYPEINIT1(ScDoubleItem,         SfxPoolItem);
 TYPEINIT1(ScPageScaleToItem,    SfxPoolItem);
 TYPEINIT1(ScCondFormatItem,    SfxPoolItem);
 
-//------------------------------------------------------------------------
+
 
 //
 //      General Help Function
@@ -92,9 +92,9 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB
 //      Item - Implementierungen
 //
 
-//------------------------------------------------------------------------
+
 // Merge
-//------------------------------------------------------------------------
+
 
 ScMergeAttr::ScMergeAttr():
     SfxPoolItem(ATTR_MERGE),
@@ -102,7 +102,7 @@ ScMergeAttr::ScMergeAttr():
     nRowMerge(0)
 {}
 
-//------------------------------------------------------------------------
+
 
 ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow):
     SfxPoolItem(ATTR_MERGE),
@@ -110,7 +110,7 @@ ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow):
     nRowMerge(nRow)
 {}
 
-//------------------------------------------------------------------------
+
 
 ScMergeAttr::ScMergeAttr(const ScMergeAttr& rItem):
     SfxPoolItem(ATTR_MERGE)
@@ -123,7 +123,7 @@ ScMergeAttr::~ScMergeAttr()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScMergeAttr::GetValueText() const
 {
@@ -135,7 +135,7 @@ OUString ScMergeAttr::GetValueText() const
     return aRet;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const
 {
@@ -145,14 +145,14 @@ bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const
              && (nRowMerge == ((ScMergeAttr&)rItem).nRowMerge);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const
 {
     return new ScMergeAttr(*this);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const
 {
@@ -163,16 +163,16 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con
     return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow));
 }
 
-//------------------------------------------------------------------------
+
 // MergeFlag
-//------------------------------------------------------------------------
+
 
 ScMergeFlagAttr::ScMergeFlagAttr():
     SfxInt16Item(ATTR_MERGE_FLAG, 0)
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScMergeFlagAttr::ScMergeFlagAttr(sal_Int16 nFlags):
     SfxInt16Item(ATTR_MERGE_FLAG, nFlags)
@@ -193,9 +193,9 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const
     return (GetValue() & SC_MF_BUTTON_POPUP) != 0;
 }
 
-//------------------------------------------------------------------------
+
 // Protection
-//------------------------------------------------------------------------
+
 
 ScProtectionAttr::ScProtectionAttr():
     SfxPoolItem(ATTR_PROTECTION),
@@ -206,7 +206,7 @@ ScProtectionAttr::ScProtectionAttr():
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula,
                                     bool bHCell, bool bHPrint):
@@ -218,7 +218,7 @@ ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem):
     SfxPoolItem(ATTR_PROTECTION)
@@ -233,7 +233,7 @@ ScProtectionAttr::~ScProtectionAttr()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
@@ -305,7 +305,7 @@ bool ScProtectionAttr::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScProtectionAttr::GetValueText() const
 {
@@ -325,7 +325,7 @@ OUString ScProtectionAttr::GetValueText() const
     return aValue;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation ScProtectionAttr::GetPresentation
     (
@@ -374,7 +374,7 @@ SfxItemPresentation ScProtectionAttr::GetPresentation
     return ePres;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const
 {
@@ -386,14 +386,14 @@ bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const
              && (bHidePrint == ((ScProtectionAttr&)rItem).bHidePrint);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const
 {
     return new ScProtectionAttr(*this);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) const
 {
@@ -410,7 +410,7 @@ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) c
     return new ScProtectionAttr(bProtect,bHFormula,bHCell,bHPrint);
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScProtectionAttr::SetProtection( bool bProtect)
 {
@@ -418,7 +418,7 @@ bool ScProtectionAttr::SetProtection( bool bProtect)
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScProtectionAttr::SetHideFormula( bool bHFormula)
 {
@@ -426,7 +426,7 @@ bool ScProtectionAttr::SetHideFormula( bool bHFormula)
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScProtectionAttr::SetHideCell( bool bHCell)
 {
@@ -434,7 +434,7 @@ bool ScProtectionAttr::SetHideCell( bool bHCell)
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScProtectionAttr::SetHidePrint( bool bHPrint)
 {
@@ -442,9 +442,9 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 //      ScRangeItem - Tabellenbereich
-// -----------------------------------------------------------------------
+
 
 bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -453,14 +453,14 @@ bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const
     return ( aRange == ( (ScRangeItem&)rAttr ).aRange );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const
 {
     return new ScRangeItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation ScRangeItem::GetPresentation
     (
@@ -495,9 +495,9 @@ SfxItemPresentation ScRangeItem::GetPresentation
     return ePres;
 }
 
-// -----------------------------------------------------------------------
+
 //      ScTableListItem - List from Tables (-numbers)
-// -----------------------------------------------------------------------
+
 
 ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
     :   SfxPoolItem ( rCpy.Which() ),
@@ -514,7 +514,7 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy )
         pTabArr = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 ScTableListItem::~ScTableListItem()
@@ -522,7 +522,7 @@ ScTableListItem::~ScTableListItem()
     delete [] pTabArr;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy )
 {
@@ -542,7 +542,7 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -566,14 +566,14 @@ bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const
     return bEqual;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const
 {
     return new ScTableListItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation ScTableListItem::GetPresentation
     (
@@ -618,9 +618,9 @@ SfxItemPresentation ScTableListItem::GetPresentation
 }
 
 
-// -----------------------------------------------------------------------
+
 //      ScPageHFItem - Dates from the Head and Foot lines
-// -----------------------------------------------------------------------
+
 
 ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
     :   SfxPoolItem ( nWhichP ),
@@ -630,7 +630,7 @@ ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem )
     :   SfxPoolItem ( rItem ),
@@ -646,7 +646,7 @@ ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem )
         pRightArea = rItem.pRightArea->Clone();
 }
 
-//------------------------------------------------------------------------
+
 
 ScPageHFItem::~ScPageHFItem()
 {
@@ -655,7 +655,7 @@ ScPageHFItem::~ScPageHFItem()
     delete pRightArea;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScPageHFItem::QueryValue( uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const
 {
@@ -715,14 +715,14 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScPageHFItem::GetValueText() const
 {
     return OUString("ScPageHFItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -735,14 +735,14 @@ bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const
            && ScGlobal::EETextObjEqual(pRightArea,  r.pRightArea);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const
 {
     return new ScPageHFItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_SetSpace( OUString& rStr, const ESelection& rSel )
 {
@@ -885,7 +885,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
     return pItem;
 }
 
-//------------------------------------------------------------------------
+
 
 
 void ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
@@ -894,7 +894,7 @@ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew )
     pLeftArea = rNew.Clone();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPageHFItem::SetCenterArea( const EditTextObject& rNew )
 {
@@ -902,7 +902,7 @@ void ScPageHFItem::SetCenterArea( const EditTextObject& rNew )
     pCenterArea = rNew.Clone();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPageHFItem::SetRightArea( const EditTextObject& rNew )
 {
@@ -922,29 +922,29 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea )
     }
 }
 
-//-----------------------------------------------------------------------
+
 //  ScViewObjectModeItem - Display Mode of View Objects
-//-----------------------------------------------------------------------
+
 
 ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP )
     : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP, ScVObjMode eMode )
     : SfxEnumItem( nWhichP, sal::static_int_cast<sal_uInt16>(eMode) )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScViewObjectModeItem::~ScViewObjectModeItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation ScViewObjectModeItem::GetPresentation
 (
@@ -994,7 +994,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
     return ePres;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const
 {
@@ -1003,28 +1003,28 @@ OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const
     return ScGlobal::GetRscString( STR_VOBJ_MODE_SHOW + (nVal % 2));
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScViewObjectModeItem::GetValueCount() const
 {
     return 2;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const
 {
     return new ScViewObjectModeItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScViewObjectModeItem::GetVersion( sal_uInt16 /* nFileVersion */ ) const
 {
     return 1;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScViewObjectModeItem::Create(
                                     SvStream&   rStream,
@@ -1047,9 +1047,9 @@ SfxPoolItem* ScViewObjectModeItem::Create(
     }
 }
 
-// -----------------------------------------------------------------------
+
 //      double
-// -----------------------------------------------------------------------
+
 
 ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal )
     :   SfxPoolItem ( nWhichP ),
@@ -1057,7 +1057,7 @@ ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem )
     :   SfxPoolItem ( rItem )
@@ -1065,14 +1065,14 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem )
         nValue = rItem.nValue;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScDoubleItem::GetValueText() const
 {
     return OUString("ScDoubleItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -1081,14 +1081,14 @@ bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const
     return nValue == _rItem.nValue;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScDoubleItem::Clone( SfxItemPool* ) const
 {
     return new ScDoubleItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const
 {
@@ -1100,7 +1100,7 @@ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) co
     return pItem;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDoubleItem::~ScDoubleItem()
 {
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 45c2d6ddc70d..203ed3ea3e35 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -67,12 +67,12 @@
 
 #include <boost/scoped_ptr.hpp>
 
-// -----------------------------------------------------------------------
+
 
 // factor from font size to optimal cell height (text width)
 #define SC_ROT_BREAK_FACTOR     6
 
-// -----------------------------------------------------------------------
+
 
 inline bool IsAmbiguousScript( sal_uInt8 nScript )
 {
@@ -82,13 +82,13 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript )
              nScript != SCRIPTTYPE_COMPLEX );
 }
 
-// -----------------------------------------------------------------------------------------
+
 
 //
 //  Data operations
 //
 
-// -----------------------------------------------------------------------------------------
+
 
 
 long ScColumn::GetNeededSize(
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 5974b8f27603..d70b43f9d96d 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -43,7 +43,7 @@
 #include "svl/sharedstring.hxx"
 
 using namespace formula;
-//------------------------------------------------------------------------
+
 
 ScFormatEntry::ScFormatEntry(ScDocument* pDoc):
     mpDoc(pDoc)
@@ -1541,7 +1541,7 @@ void ScConditionEntry::endRendering()
     mpCache.reset();
 }
 
-//------------------------------------------------------------------------
+
 
 ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper,
                                         const OUString& rExpr1, const OUString& rExpr2,
@@ -1597,7 +1597,7 @@ ScFormatEntry* ScCondFormatEntry::Clone( ScDocument* pDoc ) const
     return new ScCondFormatEntry( pDoc, *this );
 }
 
-//------------------------------------------------------------------------
+
 
 ScCondDateFormatEntry::ScCondDateFormatEntry( ScDocument* pDoc )
     : ScFormatEntry( pDoc )
@@ -1787,7 +1787,7 @@ void ScCondDateFormatEntry::endRendering()
     mpCache.reset();
 }
 
-//------------------------------------------------------------------------
+
 
 ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument) :
     pDoc( pDocument ),
@@ -2091,7 +2091,7 @@ void ScConditionalFormat::endRendering()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList)
 {
diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx
index d97847d16800..d89e3592ad45 100644
--- a/sc/source/core/data/dbdocutl.cxx
+++ b/sc/source/core/data/dbdocutl.cxx
@@ -30,14 +30,14 @@
 
 using namespace ::com::sun::star;
 
-// ----------------------------------------------------------------------------
+
 
 ScDatabaseDocUtil::StrData::StrData() :
     mbSimpleText(true), mnStrLength(0)
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab,
                                 const uno::Reference<sdbc::XRow>& xRow, long nRowPos,
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f33ff41e2f90..35eb8d572405 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -350,7 +350,7 @@ bool ScDBQueryDataIterator::IsQueryValid(
     return rDoc.maTabs[nTab]->ValidQuery(nRow, rParam, pCell);
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) :
     DataAccess(pParent),
@@ -536,7 +536,7 @@ void ScDBQueryDataIterator::DataAccessInternal::setPos(size_t nPos)
     nRow = nPos;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) :
     DataAccess(pParent),
@@ -765,7 +765,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM
     return false;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDBQueryDataIterator::Value::Value() :
     mnError(0), mbIsNumber(true)
@@ -773,7 +773,7 @@ ScDBQueryDataIterator::Value::Value() :
     ::rtl::math::setNan(&mfValue);
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) :
     mpParam (pParam)
@@ -1054,7 +1054,7 @@ bool ScCellIterator::next()
     return getCurrent();
 }
 
-//-------------------------------------------------------------------------------
+
 
 ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable,
              const ScQueryParam& rParam, bool bMod ) :
@@ -1922,7 +1922,7 @@ bool ScQueryCellIterator::BinarySearch()
 }
 
 
-//-------------------------------------------------------------------------------
+
 
 ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable,
                                     SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) :
@@ -2155,7 +2155,7 @@ void ScHorizontalCellIterator::SkipInvalid()
         mbMore = false;
 }
 
-//------------------------------------------------------------------------
+
 
 ScHorizontalValueIterator::ScHorizontalValueIterator( ScDocument* pDocument,
         const ScRange& rRange, bool bSTotal, bool bTextZero ) :
@@ -2277,7 +2277,7 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr )
     return bFound;
 }
 
-//-------------------------------------------------------------------------------
+
 
 ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable,
                             SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) :
@@ -2422,7 +2422,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo
     }
 }
 
-//-------------------------------------------------------------------------------
+
 
 inline bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 )
 {
@@ -2526,7 +2526,7 @@ const ScRefCellValue& ScUsedAreaIterator::GetCell() const
     return maFoundCell;
 }
 
-//-------------------------------------------------------------------------------
+
 
 ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable,
                                     SCCOL nCol1, SCROW nRow1,
@@ -2659,7 +2659,7 @@ void ScDocRowHeightUpdater::updateAll()
     }
 }
 
-//-------------------------------------------------------------------------------
+
 
 ScAttrRectIterator::ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable,
                                     SCCOL nCol1, SCROW nRow1,
diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx
index 1990b2db7dc1..e614bac560fe 100644
--- a/sc/source/core/data/docpool.cxx
+++ b/sc/source/core/data/docpool.cxx
@@ -186,7 +186,7 @@ static SfxItemInfo const  aItemInfos[] =
     { SID_SCGRIDSHOW,               SFX_ITEM_POOLABLE }
 };
 
-// -----------------------------------------------------------------------
+
 
 ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool)
 
@@ -597,7 +597,7 @@ void ScDocumentPool::DeleteVersionMaps()
     pVersionMap1 = 0;
 }
 
-// ----------------------------------------------------------------------------------------
+
 //
 //  Fuer die Pattern-Attribute (SetItems) kann der sal_uInt16 RefCount leicht ueberlaufen
 //  (z.B. 600 ganze Zeilen abwechselnd formatieren).
@@ -654,7 +654,7 @@ void ScDocumentPool::CheckRef( const SfxPoolItem& rItem )
     }
 }
 
-// ----------------------------------------------------------------------------------------
+
 
 void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle )
 {
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 1087b3f25c93..bfd0d29fa0ba 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -48,7 +48,7 @@
 
 using namespace formula;
 
-// -----------------------------------------------------------------------
+
 /** (Goal Seek) Find a value of x that is a root of f(x)
 
     This function is used internally for the goal seek operation.  It uses the
@@ -892,7 +892,7 @@ void ScDocument::DeleteConditionalFormat(sal_uLong nOldIndex, SCTAB nTab)
         maTabs[nTab]->DeleteConditionalFormat(nOldIndex);
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocument::HasDetectiveOperations() const
 {
@@ -919,11 +919,11 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew)
     pDetOpList = pNew;
 }
 
-//------------------------------------------------------------------------
+
 //
 //      Vergleich von Dokumenten
 //
-//------------------------------------------------------------------------
+
 
 //  Pfriemel-Faktoren
 #define SC_DOCCOMP_MAXDIFF  256
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index b769c4d68487..293e1af90532 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -47,7 +47,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc,
             OUString& rRanges, chart::ChartDataRowSource& rDataRowSource,
diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index b9b8d5f4dbe9..3de5b0727127 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star;
 //  put functions here that need exceptions!
 //
 
-// -----------------------------------------------------------------------
+
 
 const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator()
 {
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index ac3f3cf2ed69..0faa829969d4 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -47,7 +47,7 @@ extern const ScFormulaCell* pLastFormulaTreeTop;    // cellform.cxx Err527 WorkA
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 void ScDocument::StartListeningArea( const ScRange& rRange,
         SvtListener* pListener
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 1c750ce9d419..e5cf04e52120 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -109,7 +109,7 @@ void ScDocument::ImplCreateOptions()
     pViewOptions = new ScViewOptions();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::ImplDeleteOptions()
 {
@@ -118,7 +118,7 @@ void ScDocument::ImplDeleteOptions()
     delete pExtDocOptions;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist)
 {
@@ -150,7 +150,7 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist)
     return pPrinter;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::SetPrinter( SfxPrinter* pNewPrinter )
 {
@@ -172,7 +172,7 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter )
     InvalidateTextWidth(NULL, NULL, false);     // in both cases
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::SetPrintOptions()
 {
@@ -196,7 +196,7 @@ void ScDocument::SetPrintOptions()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 VirtualDevice* ScDocument::GetVirtualDevice_100th_mm()
 {
@@ -226,7 +226,7 @@ OutputDevice* ScDocument::GetRefDevice()
     return pRefDevice;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
                                    const SfxItemSet&  rChanges )
@@ -309,7 +309,7 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet,
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc )
 {
@@ -318,7 +318,7 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc )
     xPoolHelper->GetStylePool()->CopyStdStylesFrom( pSrcDoc->xPoolHelper->GetStylePool() );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::InvalidateTextWidth( const OUString& rStyleName )
 {
@@ -328,7 +328,7 @@ void ScDocument::InvalidateTextWidth( const OUString& rStyleName )
             InvalidateTextWidth( i );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::InvalidateTextWidth( SCTAB nTab )
 {
@@ -337,7 +337,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab )
     InvalidateTextWidth( &aAdrFrom, &aAdrTo, false );
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab )
 {
@@ -354,7 +354,7 @@ bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab
     return bInUse;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocument::RemovePageStyleInUse( const OUString& rStyle )
 {
@@ -386,7 +386,7 @@ bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNe
     return bWasInUse;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const
 {
@@ -485,7 +485,7 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress
     }
 }
 
-//------------------------------------------------------------------------
+
 
 #define CALCMAX                 1000    // Berechnungen
 #define ABORT_EVENTS            (VCL_INPUT_ANY & ~VCL_INPUT_TIMER & ~VCL_INPUT_OTHER)
@@ -963,7 +963,7 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, size_t nDdePos
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem,
         sal_uInt8 nMode, size_t& rnDdePos )
@@ -1040,7 +1040,7 @@ bool ScDocument::SetDdeLinkResultMatrix( size_t nDdePos, ScMatrixRef pResults )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocument::HasAreaLinks() const
 {
@@ -1163,7 +1163,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode,
     }
 }
 
-//------------------------------------------------------------------------
+
 
 // TimerDelays etc.
 void ScDocument::KeyInput( const KeyEvent& )
@@ -1184,7 +1184,7 @@ bool ScDocument::CheckMacroWarn()
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxBindings* ScDocument::GetViewBindings()
 {
@@ -1213,7 +1213,7 @@ ScDrawLayer* ScDocument::GetDrawLayer()
     return pDrawLayer;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType )
 {
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 1953f7d3c5ed..9ceb12b03490 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -58,7 +58,7 @@
 
 using namespace ::com::sun::star;
 #include <stdio.h>
-// -----------------------------------------------------------------------
+
 
 
 SfxBroadcaster* ScDocument::GetDrawBroadcaster()
diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx
index 3f51268c91ff..7f2025d89597 100644
--- a/sc/source/core/data/dpdimsave.cxx
+++ b/sc/source/core/data/dpdimsave.cxx
@@ -596,7 +596,7 @@ struct ScDPSaveGroupSourceNameFunc
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 ScDPDimensionSaveData::ScDPDimensionSaveData()
 {
diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx
index a5e969461cdc..68e8ce2a9b27 100644
--- a/sc/source/core/data/dpfilteredcache.cxx
+++ b/sc/source/core/data/dpfilteredcache.cxx
@@ -102,7 +102,7 @@ size_t ScDPFilteredCache::GroupFilter::getMatchItemCount() const
     return maItems.size();
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDPFilteredCache::Criterion::Criterion() :
     mnFieldIndex(-1),
@@ -110,7 +110,7 @@ ScDPFilteredCache::Criterion::Criterion() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDPFilteredCache::ScDPFilteredCache(const ScDPCache& rCache) :
     maShowByFilter(0, MAXROW+1, false), maShowByPage(0, MAXROW+1, true), mrCache(rCache)
diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 361a74febc13..cca401505376 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -126,7 +126,7 @@ private:
     ScDPNumGroupInfo maNumInfo;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScDPGroupDateFilter::ScDPGroupDateFilter(
     const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo) :
@@ -350,7 +350,7 @@ void ScDPGroupItem::FillGroupFilter( ScDPFilteredCache::GroupFilter& rFilter ) c
         rFilter.addMatchItem(*itr);
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPGroupDimension::ScDPGroupDimension( long nSource, const OUString& rNewName ) :
     nSourceDim( nSource ),
@@ -447,7 +447,7 @@ bool ScDPGroupDimension::IsDateDimension() const
     return mbDateDimension;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {}
 
diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx
index bc9949f8fcfe..bf2c1654d34c 100644
--- a/sc/source/core/data/dpobject.cxx
+++ b/sc/source/core/data/dpobject.cxx
@@ -100,7 +100,7 @@ using ::com::sun::star::beans::XPropertySet;
 #define SC_DBPROP_COMMAND           "Command"
 #define SC_DBPROP_COMMANDTYPE       "CommandType"
 
-// -----------------------------------------------------------------------
+
 
 #define SCDPSOURCE_SERVICE  "com.sun.star.sheet.DataPilotSource"
 
@@ -2471,7 +2471,7 @@ bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference<
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 //  convert old pivot tables into new datapilot tables
 
 namespace {
@@ -2658,7 +2658,7 @@ bool ScDPObject::IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags )
     return bAllowed;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ScDPObject::HasRegisteredSources()
 {
diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index cb43eccd54db..adff9b10e6d8 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -324,7 +324,7 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab,
     pDoc->ApplyFrameAreaTab( ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ), &aBox, &aBoxInfo );
 }
 
-// -----------------------------------------------------------------------
+
 
 void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount,
                             const uno::Reference<sheet::XDataPilotMemberResults>& xLevRes,
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 27405bc00960..9d3157cd207a 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -160,7 +160,7 @@ void ScDatabaseDPData::ReloadCacheTable()
     CreateCacheTable();
 }
 
-// -----------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 5230632c9d83..b544387e4006 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -39,7 +39,7 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Sequence;
 using ::std::vector;
 
-// -----------------------------------------------------------------------
+
 
 ScSheetDPData::ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc, const ScDPCache& rCache) :
     ScDPTableData(pD),
diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx
index 494c492c1f1a..bfe57793df20 100644
--- a/sc/source/core/data/dptabdat.cxx
+++ b/sc/source/core/data/dptabdat.cxx
@@ -38,7 +38,7 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
 using ::std::vector;
 
-// ---------------------------------------------------------------------------
+
 
 ScDPTableData::CalcInfo::CalcInfo() :
     pInitState( NULL ),
@@ -48,7 +48,7 @@ ScDPTableData::CalcInfo::CalcInfo() :
 {
 }
 
-// ---------------------------------------------------------------------------
+
 
 ScDPTableData::ScDPTableData(ScDocument* pDoc) :
     mpDoc(pDoc)
@@ -251,7 +251,7 @@ void ScDPTableData::GetItemData(const ScDPFilteredCache& rCacheTable, sal_Int32
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long ScDPTableData::GetMembersCount( long nDim )
 {
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index a1d299bfeec1..76af9eda863c 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -385,7 +385,7 @@ void ScDPRunningTotalState::RemoveRowIndex()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) :
     nBasePos( nBase ),
@@ -393,7 +393,7 @@ ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScDPAggData::Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState )
 {
@@ -682,7 +682,7 @@ void ScDPAggData::Dump(int nIndent) const
 }
 #endif
 
-// -----------------------------------------------------------------------
+
 
 ScDPRowTotals::ScDPRowTotals() :
     bIsInColRoot( false )
@@ -725,7 +725,7 @@ ScDPAggData* ScDPRowTotals::GetGrandTotal( long nMeasure )
     return lcl_GetChildTotal( &aGrandTotal, nMeasure );
 }
 
-// -----------------------------------------------------------------------
+
 
 static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo )
 {
@@ -755,7 +755,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo )
     return eRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPResultData::ScDPResultData( ScDPSource& rSrc ) :
     mrSource(rSrc),
@@ -950,7 +950,7 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi
     return maDimMembers[nDim];
 }
 
-// -----------------------------------------------------------------------
+
 
 
 ScDPResultMember::ScDPResultMember(
@@ -1836,7 +1836,7 @@ void ScDPResultMember::FillVisibilityData(ScDPResultVisibilityData& rData) const
         pChildDimension->FillVisibilityData(rData);
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPDataMember::ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ) :
     pResultData( pData ),
@@ -2688,7 +2688,7 @@ void ScDPDataMember::Dump(int nIndent) const
 }
 #endif
 
-// -----------------------------------------------------------------------
+
 
 //  Helper class to select the members to include in
 //  ScDPResultDimension::InitFrom or LateInitFrom if groups are used
@@ -2768,7 +2768,7 @@ bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember )
     return bInclude;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPResultDimension::ScDPResultDimension( const ScDPResultData* pData ) :
     pResultData( pData ),
@@ -3559,7 +3559,7 @@ void ScDPResultDimension::FillVisibilityData(ScDPResultVisibilityData& rData) co
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPDataDimension::ScDPDataDimension( const ScDPResultData* pData ) :
     pResultData( pData ),
@@ -3914,7 +3914,7 @@ ScDPDataMember* ScDPDataDimension::GetMember(long n)
     return maMembers[n];
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDPResultVisibilityData::ScDPResultVisibilityData(
  ScDPSource* pSource) :
@@ -4105,7 +4105,7 @@ ResultMembers::~ResultMembers()
     for ( DimMemberHash::const_iterator iter = maMemberHash.begin(); iter != maMemberHash.end(); ++iter )
         delete iter->second;
 }
-// -----------------------------------------------------------------------
+
 LateInitParams::LateInitParams(
     const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, bool bRow, bool bInitChild, bool bAllChildren ) :
     mppDim( ppDim ),
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index 979e7fa0293c..8b8075ece756 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -69,11 +69,11 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo;
 
-// -----------------------------------------------------------------------
+
 
 #define SC_MINCOUNT_LIMIT   1000000
 
-// -----------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScDPSource,      "ScDPSource",      "com.sun.star.sheet.DataPilotSource" )
 SC_SIMPLE_SERVICE_INFO( ScDPDimensions,  "ScDPDimensions",  "com.sun.star.sheet.DataPilotSourceDimensions" )
@@ -85,12 +85,12 @@ SC_SIMPLE_SERVICE_INFO( ScDPLevel,       "ScDPLevel",       "com.sun.star.sheet.
 SC_SIMPLE_SERVICE_INFO( ScDPMembers,     "ScDPMembers",     "com.sun.star.sheet.DataPilotSourceMembers" )
 SC_SIMPLE_SERVICE_INFO( ScDPMember,      "ScDPMember",      "com.sun.star.sheet.DataPilotSourceMember" )
 
-// -----------------------------------------------------------------------
+
 
 // property maps for PropertySetInfo
 //  DataDescription / NumberFormat are internal
 
-// -----------------------------------------------------------------------
+
 
 //! move to a header?
 static sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny )
@@ -105,7 +105,7 @@ static void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue )
     rAny.setValue( &bValue, getBooleanCppuType() );
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPSource::ScDPSource( ScDPTableData* pD ) :
     pData( pD ),
@@ -970,7 +970,7 @@ void ScDPSource::CreateRes_Impl()
 
     pColResRoot->CheckShowEmpty();
     pRowResRoot->CheckShowEmpty();
-    // ----------------------------------------------------------------
+
     //  With all data processed, calculate the final results:
 
     //  UpdateDataResults calculates all original results from the collected values,
@@ -1223,7 +1223,7 @@ void ScDPSource::DumpResults() const
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource )
 
-// -----------------------------------------------------------------------
+
 
 ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) :
     pSource( pSrc ),
@@ -1352,7 +1352,7 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const
     return NULL;    //! exception?
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) :
     pSource( pSrc ),
@@ -1727,7 +1727,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPDimension )
 
-// -----------------------------------------------------------------------
+
 
 ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) :
     pSource( pSrc ),
@@ -1835,7 +1835,7 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const
     return NULL;    //! exception?
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) :
     pSource( pSrc ),
@@ -1896,7 +1896,7 @@ void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno
     OSL_FAIL("not implemented");        //! exception?
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) :
     pSource( pSrc ),
@@ -2015,7 +2015,7 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const
     return NULL;    //! exception?
 }
 
-// -----------------------------------------------------------------------
+
 
 class ScDPGlobalMembersOrder
 {
@@ -2046,7 +2046,7 @@ sal_Bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex
     return bAscending ? (nCompare < 0) : (nCompare > 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) :
     pSource( pSrc ),
@@ -2320,7 +2320,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName )
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPLevel )
 
-// -----------------------------------------------------------------------
+
 
 ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) :
     pSource( pSrc ),
@@ -2593,7 +2593,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const
     return NULL;    //! exception?
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDPMember::ScDPMember(
     ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex) :
diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx
index 64c8c7704e76..fc0feca48f17 100644
--- a/sc/source/core/data/drawpage.cxx
+++ b/sc/source/core/data/drawpage.cxx
@@ -26,7 +26,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) :
     FmFormPage(rNewModel, bMasterPage)
@@ -34,13 +34,13 @@ ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) :
     SetSize( Size( LONG_MAX, LONG_MAX ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 ScDrawPage::~ScDrawPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ScDrawPage::createUnoPage()
 {
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index eff38fa156f7..b7d654a54825 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -95,7 +95,7 @@ SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL;
 
 sal_Bool bDrawIsInUndo = false;         //! Member
 
-// -----------------------------------------------------------------------
+
 
 ScUndoObjData::ScUndoObjData( SdrObject* pObjP, const ScAddress& rOS, const ScAddress& rOE,
                                                const ScAddress& rNS, const ScAddress& rNE ) :
@@ -133,7 +133,7 @@ void ScUndoObjData::Redo()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) :
     nTab( nTabNo )
@@ -153,7 +153,7 @@ ScTabSizeChangedHint::~ScTabSizeChangedHint()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 #define MAXMM   10000000
 
@@ -187,7 +187,7 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect )
     ReverseTwipsToMM( rRect.Bottom() );
 }
 
-// -----------------------------------------------------------------------
+
 
 
 ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) :
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 225c0cec5769..f9dd04db2568 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -678,7 +678,7 @@ void ScDocument::FillInfo(
 
     if(pCondFormList)
         pCondFormList->endRendering();
-    //-------------------------------------------------------------------------
+
     //  bedingte Formatierung auswerten
     ::boost::ptr_vector<ScPatternAttr> aAltPatterns;
     // favour preview over condition
@@ -741,7 +741,7 @@ void ScDocument::FillInfo(
     }
 
     //  bedingte Formatierung Ende
-    //-------------------------------------------------------------------------
+
 
                 //
                 //      Daten von zusammengefassten Zellen anpassen
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 5323fa647370..0cc761ce34db 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -80,7 +80,7 @@
 #include "random.hxx"
 #include "editutil.hxx"
 
-// -----------------------------------------------------------------------
+
 
 
 ScDocShellRef*  ScGlobal::pDrawClipDocShellRef = NULL;
@@ -156,7 +156,7 @@ bool ScGlobal::HasAttrChanged( const SfxItemSet&  rNewAttrs,
     const SfxItemState  eNewState   = rNewAttrs.GetItemState( nWhich );
     const SfxItemState  eOldState   = rOldAttrs.GetItemState( nWhich );
 
-    //----------------------------------------------------------
+
 
     if ( eNewState == eOldState )
     {
@@ -221,7 +221,7 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter()
 }
 
 
-//------------------------------------------------------------------------
+
 
 bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged,
                                      const SfxItemSet& rNewAttrs,
@@ -685,7 +685,7 @@ void ScGlobal::Clear()
     DELETEZ(pEmptyOUString);
 }
 
-//------------------------------------------------------------------------
+
 
 rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet )
 {
@@ -710,7 +710,7 @@ rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet )
     else return osl_getThreadTextEncoding();
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal )
 {
@@ -735,7 +735,7 @@ OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal )
     return OUString::createFromAscii(pChar);
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScGlobal::HasStarCalcFunctionList()
 {
@@ -750,7 +750,7 @@ ScFunctionList* ScGlobal::GetStarCalcFunctionList()
     return pStarCalcFunctionList;
 }
 
-//------------------------------------------------------------------------
+
 
 ScFunctionMgr* ScGlobal::GetStarCalcFunctionMgr()
 {
@@ -768,7 +768,7 @@ void ScGlobal::ResetFunctionList()
     DELETEZ( pStarCalcFunctionList );
 }
 
-//------------------------------------------------------------------------
+
 
 ScUnitConverter* ScGlobal::GetUnitConverter()
 {
@@ -779,7 +779,7 @@ ScUnitConverter* ScGlobal::GetUnitConverter()
 }
 
 
-//------------------------------------------------------------------------
+
 
 const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr,
             sal_Unicode c )
@@ -795,7 +795,7 @@ const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr,
     return NULL;
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString ScGlobal::addToken(const OUString& rTokenList, const OUString& rToken,
     sal_Unicode cSep, sal_Int32 nSepCount, bool bForceSep)
@@ -888,7 +888,7 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
                                const EditTextObject* pObj2 )
@@ -970,7 +970,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget )
                                     0L );
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScGlobal::IsSystemRTL()
 {
@@ -1082,7 +1082,7 @@ sal_uInt16 ScGlobal::GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhic
     return nWhich;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter )
 {
@@ -1108,11 +1108,11 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter )
 }
 
 
-//--------------------------------------------------------------------
 
 
 
-//------------------------------------------------------------------------
+
+
 
 utl::TransliterationWrapper* ScGlobal::GetpTransliteration()
 {
diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx
index 324b1c0d2be1..b19f1bebb4ba 100644
--- a/sc/source/core/data/global2.cxx
+++ b/sc/source/core/data/global2.cxx
@@ -38,9 +38,9 @@
 
 using ::std::vector;
 
-// -----------------------------------------------------------------------
 
-//------------------------------------------------------------------------
+
+
 // struct ScImportParam:
 
 ScImportParam::ScImportParam() :
@@ -105,7 +105,7 @@ bool ScImportParam::operator==( const ScImportParam& rOther ) const
     //! nQuerySh und pConnection sind gleich ?
 }
 
-//------------------------------------------------------------------------
+
 // struct ScConsolidateParam:
 
 ScConsolidateParam::ScConsolidateParam() :
@@ -114,7 +114,7 @@ ScConsolidateParam::ScConsolidateParam() :
     Clear();
 }
 
-//------------------------------------------------------------------------
+
 
 ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) :
         nCol(r.nCol),nRow(r.nRow),nTab(r.nTab),
@@ -131,14 +131,14 @@ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) :
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScConsolidateParam::~ScConsolidateParam()
 {
     ClearDataAreas();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScConsolidateParam::ClearDataAreas()
 {
@@ -152,7 +152,7 @@ void ScConsolidateParam::ClearDataAreas()
     nDataAreaCount = 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScConsolidateParam::Clear()
 {
@@ -165,7 +165,7 @@ void ScConsolidateParam::Clear()
     eFunction                           = SUBTOTAL_FUNC_SUM;
 }
 
-//------------------------------------------------------------------------
+
 
 ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r )
 {
@@ -181,7 +181,7 @@ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
 {
@@ -206,7 +206,7 @@ bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const
     return bEqual;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount )
 {
@@ -220,7 +220,7 @@ void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount )
     }
 }
 
-//------------------------------------------------------------------------
+
 // struct ScSolveParam
 
 ScSolveParam::ScSolveParam()
@@ -228,7 +228,7 @@ ScSolveParam::ScSolveParam()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScSolveParam::ScSolveParam( const ScSolveParam& r )
     :   aRefFormulaCell ( r.aRefFormulaCell ),
@@ -239,7 +239,7 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell,
                             const ScAddress& rVariableCell,
@@ -250,14 +250,14 @@ ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScSolveParam::~ScSolveParam()
 {
     delete pStrTargetVal;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r )
 {
@@ -271,7 +271,7 @@ ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSolveParam::operator==( const ScSolveParam& r ) const
 {
@@ -291,7 +291,7 @@ bool ScSolveParam::operator==( const ScSolveParam& r ) const
     return bEqual;
 }
 
-//------------------------------------------------------------------------
+
 // struct ScTabOpParam
 
 ScTabOpParam::ScTabOpParam() : meMode(Column) {}
@@ -305,7 +305,7 @@ ScTabOpParam::ScTabOpParam( const ScTabOpParam& r )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell,
                             const ScRefAddress& rFormulaEnd,
@@ -320,7 +320,7 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r )
 {
@@ -332,7 +332,7 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScTabOpParam::operator==( const ScTabOpParam& r ) const
 {
diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx
index 71ee12087aeb..40d977df360d 100644
--- a/sc/source/core/data/markarr.cxx
+++ b/sc/source/core/data/markarr.cxx
@@ -23,7 +23,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-//------------------------------------------------------------------------
+
 
 ScMarkArray::ScMarkArray() :
     nCount( 0 ),
@@ -33,14 +33,14 @@ ScMarkArray::ScMarkArray() :
     // special case "no marks" with pData = NULL
 }
 
-//------------------------------------------------------------------------
+
 
 ScMarkArray::~ScMarkArray()
 {
     delete[] pData;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScMarkArray::Reset( bool bMarked )
 {
@@ -55,7 +55,7 @@ void ScMarkArray::Reset( bool bMarked )
     pData[0].bMarked = bMarked;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const
 {
@@ -103,7 +103,7 @@ bool ScMarkArray::GetMark( SCROW nRow ) const
 
 }
 
-//------------------------------------------------------------------------
+
 
 void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked )
 {
diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx
index 39ef79213a5f..0ca8ebc7ee82 100644
--- a/sc/source/core/data/markdata.cxx
+++ b/sc/source/core/data/markdata.cxx
@@ -27,7 +27,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-//------------------------------------------------------------------------
+
 
 ScMarkData::ScMarkData() :
     maTabMarked(),
diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx
index 941e5293d218..80ba6fea82bb 100644
--- a/sc/source/core/data/olinetab.cxx
+++ b/sc/source/core/data/olinetab.cxx
@@ -25,7 +25,7 @@
 #include "address.hxx"
 #include "table.hxx"
 
-//------------------------------------------------------------------------
+
 
 ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) :
     nStart  ( nNewStart ),
@@ -104,7 +104,7 @@ void ScOutlineEntry::SetVisible( bool bNewVisible )
     bVisible = bNewVisible;
 }
 
-//------------------------------------------------------------------------
+
 
 ScOutlineCollection::ScOutlineCollection() {}
 
@@ -159,7 +159,7 @@ ScOutlineCollection::iterator ScOutlineCollection::FindStart(SCCOLROW nMinStart)
     return maEntries.lower_bound(nMinStart);
 }
 
-//------------------------------------------------------------------------
+
 
 ScOutlineArray::ScOutlineArray() :
     nDepth(0) {}
@@ -793,7 +793,7 @@ void ScOutlineArray::RemoveAll()
     nDepth = 0;
 }
 
-//------------------------------------------------------------------------
+
 
 ScOutlineTable::ScOutlineTable()
 {
@@ -835,7 +835,7 @@ bool ScOutlineTable::DeleteRow( SCROW nStartRow, SCSIZE nSize )
     return aRowOutline.DeleteSpace( nStartRow, nSize );
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray ) :
         pArray( pOutlineArray ),
diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx
index 96a02adb16fc..606aefd2a0dd 100644
--- a/sc/source/core/data/pagepar.cxx
+++ b/sc/source/core/data/pagepar.cxx
@@ -30,13 +30,13 @@ ScPageTableParam::ScPageTableParam()
     Reset();
 }
 
-//------------------------------------------------------------------------
+
 
 ScPageTableParam::~ScPageTableParam()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPageTableParam::Reset()
 {
@@ -50,7 +50,7 @@ void ScPageTableParam::Reset()
     nFirstPageNo = 1;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScPageTableParam::operator==( const ScPageTableParam& r ) const
 {
@@ -65,13 +65,13 @@ ScPageAreaParam::ScPageAreaParam()
     Reset();
 }
 
-//------------------------------------------------------------------------
+
 
 ScPageAreaParam::~ScPageAreaParam()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPageAreaParam::Reset()
 {
@@ -82,7 +82,7 @@ void ScPageAreaParam::Reset()
     memset( &aRepeatCol, 0, sizeof(ScRange) );
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScPageAreaParam::operator==( const ScPageAreaParam& r ) const
 {
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index bf3d179ae5f1..88ab4affac69 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -65,12 +65,12 @@
 
 ScDocument* ScPatternAttr::pDoc = NULL;
 
-// -----------------------------------------------------------------------
+
 
 using sc::HMMToTwips;
 using sc::TwipsToHMM;
 
-// -----------------------------------------------------------------------
+
 
 ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName )
     :   SfxSetItem  ( ATTR_PATTERN, pItemSet ),
@@ -934,7 +934,7 @@ static SfxStyleSheetBase* lcl_CopyStyleToPool
         return NULL;
     }
 
-    //--------------------------------------------------------
+
 
     const OUString       aStrSrcStyle = pSrcStyle->GetName();
     const SfxStyleFamily eFamily      = pSrcStyle->GetFamily();
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx
index 74d5cbe274fe..e2aa81063d8b 100644
--- a/sc/source/core/data/poolhelp.cxx
+++ b/sc/source/core/data/poolhelp.cxx
@@ -25,7 +25,7 @@
 #include "docpool.hxx"
 #include "stlpool.hxx"
 
-// -----------------------------------------------------------------------
+
 
 ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc )
 :pFormTable(NULL)
@@ -120,7 +120,7 @@ void ScPoolHelper::SourceDocumentGone()
         pFormTable->SetColorLink( Link() );
 }
 
-// -----------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 6a980d1413b1..798eb8962469 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -80,7 +80,7 @@ public:
     static void         SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet& rItemSet );
 };
 
-// ----------------------------------------------------------------------------
+
 
 void ScCaptionUtil::SetCaptionLayer( SdrCaptionObj& rCaption, bool bShown )
 {
@@ -206,7 +206,7 @@ private:
     bool                mbNegPage;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bShown, bool bTailFront ) :
     mrDoc( rDoc ),
@@ -416,7 +416,7 @@ public:
     explicit            ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, SdrCaptionObj& rCaption, bool bShown );
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScNoteCaptionCreator::ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, ScNoteData& rNoteData ) :
     ScCaptionCreator( rDoc, rPos )  // use helper c'tor that does not create the caption yet
@@ -475,7 +475,7 @@ struct ScCaptionInitData
     explicit            ScCaptionInitData();
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScCaptionInitData::ScCaptionInitData() :
     mbDefaultPosSize( true )
diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx
index 3af5c64beb2a..2d768e8449de 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -247,7 +247,7 @@ public:
     }
 };
 
-// ----------------------------------------------------------------------------
+
 
 class ScFlatBoolSegmentsImpl : public ScFlatSegmentsImpl<bool>
 {
@@ -304,7 +304,7 @@ SCROW ScFlatBoolRowSegments::ForwardIterator::getLastPos() const
     return mnLastPos;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) :
     mrSegs(rSegs)
@@ -335,7 +335,7 @@ bool ScFlatBoolRowSegments::RangeIterator::getNext(RangeData& rRange)
     return true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScFlatBoolRowSegments::ScFlatBoolRowSegments() :
     mpImpl(new ScFlatBoolSegmentsImpl(static_cast<SCCOLROW>(MAXROW)))
@@ -486,7 +486,7 @@ SCROW ScFlatUInt16RowSegments::ForwardIterator::getLastPos() const
     return mnLastPos;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScFlatUInt16RowSegments::ScFlatUInt16RowSegments(sal_uInt16 nDefault) :
     mpImpl(new ScFlatUInt16SegmentsImpl(static_cast<SCCOLROW>(MAXROW), nDefault))
diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx
index 231f3a2cf9a7..ca382f575f0a 100644
--- a/sc/source/core/data/sheetevents.cxx
+++ b/sc/source/core/data/sheetevents.cxx
@@ -19,7 +19,7 @@
 
 #include "sheetevents.hxx"
 #include <com/sun/star/script/vba/VBAEventId.hpp>
-// -----------------------------------------------------------------------
+
 
 OUString ScSheetEvents::GetEventName(sal_Int32 nEvent)
 {
@@ -71,7 +71,7 @@ sal_Int32 ScSheetEvents::GetVbaDocumentEventId(sal_Int32 nEvent)
     return (nSheetEventId != NO_EVENT) ? (nSheetEventId + USERDEFINED_START) : NO_EVENT;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScSheetEvents::ScSheetEvents() :
     mpScriptNames(NULL)
diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx
index d416f32ed0db..d0efd196b958 100644
--- a/sc/source/core/data/sortparam.cxx
+++ b/sc/source/core/data/sortparam.cxx
@@ -24,14 +24,14 @@
 #include "subtotalparam.hxx"
 
 
-//------------------------------------------------------------------------
+
 
 ScSortParam::ScSortParam()
 {
     Clear();
 }
 
-//------------------------------------------------------------------------
+
 
 ScSortParam::ScSortParam( const ScSortParam& r ) :
         nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex),
@@ -47,7 +47,7 @@ ScSortParam::ScSortParam( const ScSortParam& r ) :
 
 ScSortParam::~ScSortParam() {}
 
-//------------------------------------------------------------------------
+
 
 void ScSortParam::Clear()
 {
@@ -71,7 +71,7 @@ void ScSortParam::Clear()
     maKeyState.assign( DEFSORT, aKeyState );
 }
 
-//------------------------------------------------------------------------
+
 
 ScSortParam& ScSortParam::operator=( const ScSortParam& r )
 {
@@ -98,7 +98,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSortParam::operator==( const ScSortParam& rOther ) const
 {
@@ -154,7 +154,7 @@ bool ScSortParam::operator==( const ScSortParam& rOther ) const
     return bEqual;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) :
         nCol1(rSub.nCol1),nRow1(rSub.nRow1),nCol2(rSub.nCol2),nRow2(rSub.nRow2),nUserIndex(rSub.nUserIndex),
@@ -199,7 +199,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld )
         }
 }
 
-//------------------------------------------------------------------------
+
 
 ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) :
         nCol1(nCol),nRow1(rParam.nRow1),nCol2(nCol),nRow2(rParam.nRow2),nUserIndex(0),
@@ -225,7 +225,7 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) :
         maKeyState.push_back( aKeyState );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScSortParam::MoveToDest()
 {
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 9d4a4262b31e..dcd04fa0ebb9 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -66,20 +66,20 @@ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool&    rPoolP,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScStyleSheetPool::~ScStyleSheetPool()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScStyleSheetPool::SetDocument( ScDocument* pDocument )
 {
     pDoc = pDocument;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName,
                                            SfxStyleFamily eFam, sal_uInt16 mask)
@@ -106,7 +106,7 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName,
     return SfxStyleSheetPool::Make(rName, eFam, mask);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString&   rName,
                                              SfxStyleFamily  eFamily,
@@ -119,7 +119,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString&   rName,
     return pSheet;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
 {
@@ -127,7 +127,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle )
     return new ScStyleSheet( (const ScStyleSheet&) rStyle );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
 {
@@ -141,7 +141,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
                                       const OUString& rName, SfxStyleFamily eFamily )
@@ -197,11 +197,11 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool,
     }
 }
 
-//------------------------------------------------------------------------
+
 //
 //                      Standard-Vorlagen
 //
-//------------------------------------------------------------------------
+
 
 #define SCSTR(id)   ScGlobal::GetRscString(id)
 
@@ -218,7 +218,7 @@ void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool )
     CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT),       SFX_STYLE_FAMILY_PAGE );
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId )
 {
@@ -264,9 +264,9 @@ void ScStyleSheetPool::CreateStandardStyles()
     // Zellformatvorlagen:
     //==========================================================
 
-    //------------
+
     // 1. Standard
-    //------------
+
     pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD );
     pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD );
 
@@ -296,9 +296,9 @@ void ScStyleSheetPool::CreateStandardStyles()
 //    if ( eCtl == LANGUAGE_THAI )
 //        pSet->Put( SvxFontHeightItem( 300, 100, ATTR_CTL_FONT_HEIGHT ) );   // 15 pt
 
-    //------------
+
     // 2. Ergebnis
-    //------------
+
 
     pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ),
                                     SFX_STYLE_FAMILY_PARA,
@@ -310,9 +310,9 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
     pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) );
 
-    //-------------
+
     // 3. Ergebnis1
-    //-------------
+
 
     pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ),
                                     SFX_STYLE_FAMILY_PARA,
@@ -321,9 +321,9 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) );
     pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 );
 
-    //----------------
+
     // 4. Ueberschrift
-    //----------------
+
 
     pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ),
                                     SFX_STYLE_FAMILY_PARA,
@@ -337,9 +337,9 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) );
     pSet->Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) );
 
-    //-----------------
+
     // 5. Ueberschrift1
-    //-----------------
+
 
     pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ),
                                     SFX_STYLE_FAMILY_PARA,
@@ -354,9 +354,9 @@ void ScStyleSheetPool::CreateStandardStyles()
     // Seitenformat-Vorlagen:
     //==========================================================
 
-    //------------
+
     // 1. Standard
-    //------------
+
 
     pSheet = (ScStyleSheet*) &Make( aStrStandard,
                                     SFX_STYLE_FAMILY_PAGE,
@@ -371,10 +371,10 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
     DELETEZ( pHFSetItem );
 
-    //----------------------------------------
+
     // Kopfzeile:
     // [leer][\TABELLE\][leer]
-    //----------------------------------------
+
     pEdEngine->SetText(EMPTY_OUSTRING);
     pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() );
     pTxtObj = pEdEngine->CreateTextObject();
@@ -384,10 +384,10 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( *pHeaderItem );
     DELETEZ( pTxtObj );
 
-    //----------------------------------------
+
     // Fusszeile:
     // [leer][Seite \SEITE\][leer]
-    //----------------------------------------
+
     aStr = SCSTR( STR_PAGE ) + " ";
     pEdEngine->SetText( aStr );
     nStrLen = aStr.getLength();
@@ -399,9 +399,9 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( *pFooterItem );
     DELETEZ( pTxtObj );
 
-    //----------
+
     // 2. Report
-    //----------
+
 
     pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ),
                                     SFX_STYLE_FAMILY_PAGE,
@@ -433,10 +433,10 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET );
     DELETEZ( pHFSetItem );
 
-    //----------------------------------------
+
     // Kopfzeile:
     // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\]
-    //----------------------------------------
+
     aStr = " ()";
     pEdEngine->SetText( aStr );
     pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) );
@@ -455,10 +455,10 @@ void ScStyleSheetPool::CreateStandardStyles()
     DELETEZ( pTxtObj );
     pSet->Put( *pHeaderItem );
 
-    //----------------------------------------
+
     // Fusszeile:
     // [leer][Seite: \SEITE\ / \SEITEN\][leer]
-    //----------------------------------------
+
     aStr = SCSTR( STR_PAGE ) + " ";
     nStrLen = aStr.getLength();
     aStr += " / ";
@@ -473,14 +473,14 @@ void ScStyleSheetPool::CreateStandardStyles()
     pSet->Put( *pFooterItem );
     DELETEZ( pTxtObj );
 
-    //----------------------------------------------------
+
     DELETEZ( pEmptyTxtObj );
     DELETEZ( pHeaderItem );
     DELETEZ( pFooterItem );
     DELETEZ( pEdEngine );
 }
 
-//------------------------------------------------------------------------
+
 
 
 ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFamily eFam )
diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx
index 04322d84824b..ef19a93c0891 100644
--- a/sc/source/core/data/stlsheet.cxx
+++ b/sc/source/core/data/stlsheet.cxx
@@ -41,7 +41,7 @@
 
 #include "globstr.hrc"
 #include "sc.hrc"
-//------------------------------------------------------------------------
+
 
 TYPEINIT1(ScStyleSheet, SfxStyleSheet);
 
@@ -60,7 +60,7 @@ ScStyleSheet::ScStyleSheet( const OUString&     rName,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle )
     : SfxStyleSheet ( rStyle )
@@ -68,20 +68,20 @@ ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScStyleSheet::~ScStyleSheet()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScStyleSheet::HasFollowSupport() const
 {
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScStyleSheet::HasParentSupport () const
 {
@@ -100,7 +100,7 @@ bool ScStyleSheet::HasParentSupport () const
     return bHasParentSupport;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScStyleSheet::SetParent( const OUString& rParentName )
 {
@@ -135,7 +135,7 @@ bool ScStyleSheet::SetParent( const OUString& rParentName )
     return bResult;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemSet& ScStyleSheet::GetItemSet()
 {
@@ -252,7 +252,7 @@ SfxItemSet& ScStyleSheet::GetItemSet()
     return *pSet;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScStyleSheet::IsUsed() const
 {
@@ -271,7 +271,7 @@ bool ScStyleSheet::IsUsed() const
         return true;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
@@ -280,7 +280,7 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint )
             GetItemSet().SetParent( NULL );
 }
 
-//------------------------------------------------------------------------
+
 
 //  schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern,
 //  obwohl der fuer den Benutzer sichtbare Name uebersetzt ist:
diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx
index b449ba2db353..a93d341f072f 100644
--- a/sc/source/core/data/subtotalparam.cxx
+++ b/sc/source/core/data/subtotalparam.cxx
@@ -22,7 +22,7 @@ ScSubTotalParam::ScSubTotalParam()
     Clear();
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) :
         nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex),
@@ -56,7 +56,7 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) :
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScSubTotalParam::Clear()
 {
@@ -81,7 +81,7 @@ void ScSubTotalParam::Clear()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r )
 {
@@ -130,7 +130,7 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
 {
@@ -172,7 +172,7 @@ bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const
     return bEqual;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScSubTotalParam::SetSubTotals( sal_uInt16 nGroup,
                                     const SCCOL* ptrSubTotals,
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 45180cff6014..552292dee0e3 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -219,7 +219,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj,
 
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName,
                     bool bColInfo, bool bRowInfo ) :
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index e3545f7ac768..4cb85abc355f 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -149,7 +149,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
          }
     }
 
-    //--------------------------------------------------------------------------
+
 
     long nPageSizeX = aPageSizeTwips.Width();
     long nPageSizeY = aPageSizeTwips.Height();
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index e1a650d1220a..c544beccd61a 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -33,7 +33,7 @@
 #include "postit.hxx"
 #include "stringutil.hxx"
 
-//--------------------------------------------------------------------------
+
 
 
 using ::com::sun::star::util::SearchOptions;
diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx
index d4226fd01f2e..9b26930e7c72 100644
--- a/sc/source/core/data/userdat.cxx
+++ b/sc/source/core/data/userdat.cxx
@@ -21,7 +21,7 @@
 #include "drwlayer.hxx"
 #include "rechead.hxx"
 
-// -----------------------------------------------------------------------
+
 
 ScDrawObjFactory::ScDrawObjFactory()
 {
@@ -52,7 +52,7 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFac
 }
 IMPL_LINK_INLINE_END( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory )
 
-//------------------------------------------------------------------------
+
 
 ScDrawObjData::ScDrawObjData() :
     SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ),
@@ -67,7 +67,7 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const
     return new ScDrawObjData( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 ScIMapInfo::ScIMapInfo() :
     SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA, 0 )
@@ -95,7 +95,7 @@ SdrObjUserData* ScIMapInfo::Clone( SdrObject* ) const
     return new ScIMapInfo( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 ScMacroInfo::ScMacroInfo() :
     SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA, 0 )
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 7ca9589e1c2f..68d407fde46f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -605,7 +605,7 @@ rtl_uString* ScStringTokenIterator::Next()
     return (mbSkipEmpty && maCurString.isValid() && maCurString.isEmpty()) ? Next() : maCurString.getData();
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Returns the number format of the passed cell, or the standard format. */
 sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos )
@@ -618,7 +618,7 @@ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 bool ScValidationData::HasSelectionList() const
 {
@@ -839,7 +839,7 @@ bool ScValidationData::FillSelectionList(std::vector<ScTypedStrData>& rStrColl,
     return bOk;
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool ScValidationData::IsEqualToTokenArray( ScRefCellValue& rCell, const ScAddress& rPos, const ScTokenArray& rTokArr ) const
 {
diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx
index 349afdfc3048..c06f55cdbc0b 100644
--- a/sc/source/core/opencl/op_math.cxx
+++ b/sc/source/core/opencl/op_math.cxx
@@ -348,7 +348,7 @@ void OpCombina::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    arg0 = trunc(arg0);\n";
     ss << "    arg1 = trunc(arg1);\n";
     ss << "    if(arg0 >= arg1 && arg0 > 0 && arg1 > 0)\n";
-    ss << "        tem = bik(arg0+arg1-1,arg1);\n"; 
+    ss << "        tem = bik(arg0+arg1-1,arg1);\n";
     ss << "    else if(arg0 == 0 && arg1 == 0)\n";
     ss << "        tem = 0;\n";
     ss << "    else if(arg0 > 0 && arg1 == 0)\n";
@@ -1409,14 +1409,14 @@ void OpArcCotHyp::GenSlidingWindowFunction(std::stringstream &ss,
                 <const formula::SingleVectorRefToken *>(tmpCur);
             ss << "    arg0 = ";
             ss << vSubArguments[0]->GenSlidingWindowDeclRef();
-            ss << ";\n";   
+            ss << ";\n";
 #ifdef ISNAN
             ss << "    if(isNan(";
             ss << vSubArguments[0]->GenSlidingWindowDeclRef();
             ss << ")||(gid0>=";
             ss << tmpCurDVR->GetArrayLength();
             ss << "))\n";
-            ss << "    { arg0 = 0.0f; }\n"; 
+            ss << "    { arg0 = 0.0f; }\n";
 #endif
         }
         else if(tmpCur->GetType() == formula::svDouble)
@@ -2994,12 +2994,12 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss,
         if(paraOneWidth > 1)
         {
             throw Unhandled();
-        } 
+        }
     }
 
     if(vSubArguments[paraOneWidth]->GetFormulaToken()->GetType() ==
      formula::svDoubleVectorRef)
- 
+
     {
         FormulaToken *tmpCur1 = vSubArguments[1]->GetFormulaToken();
         const formula::DoubleVectorRefToken*pCurDVR1= static_cast<const
@@ -3108,7 +3108,7 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss,
         ss << "            count+=1.0;\n";
         ss << "        }\n";
     }
-  
+
     ss << "    if(count!=0)\n";
     ss << "        tmp=tmp/count;\n";
     ss << "    else\n";
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 205d61f68e06..114ffb84f0a7 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -81,9 +81,9 @@ using ::std::auto_ptr;
 
 //-----------------------------static data -----------------
 
-//-------------------------------------------------------------------------
+
 // Funktionen fuer den Zugriff auf das Document
-//-------------------------------------------------------------------------
+
 
 
 void ScInterpreter::ReplaceCell( ScAddress& rPos )
@@ -847,9 +847,9 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
 }
 
 
-//-----------------------------------------------------------------------------
+
 // Stack operations
-//-----------------------------------------------------------------------------
+
 
 
 // Also releases a TempToken if appropriate.
@@ -3690,7 +3690,7 @@ void ScInterpreter::ScTTT()
     PushError(errNoValue);
 }
 
-// -------------------------------------------------------------------------
+
 
 
 ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc,
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 769b88686f41..463fd06e29a4 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -746,7 +746,7 @@ ScRefList* ScToken::GetRefList()
 }
 // ==========================================================================
 // real implementations of virtual functions
-// --------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index dc6eae07b07d..a6b2cf24de9f 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -286,7 +286,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab )
         nPrevFlags = nFlags;
     }
 
-    // ------------------------------------------------------------------------
+
 
     mbDirty = false;
 }
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index dbdf92c6d745..9aeddf908b80 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -420,7 +420,7 @@ void ImportExcel8::LoadDocumentProperties()
     }
 }
 
-//___________________________________________________________________
+
 // autofilter
 
 void ImportExcel8::FilterMode( void )
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 977d638cf482..a2a246e4f7b1 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -567,7 +567,7 @@ XclExpFiltermode::XclExpFiltermode() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol ) :
     XclExpUInt16Record( EXC_ID_AUTOFILTERINFO, static_cast< sal_uInt16 >( nScCol ) ),
@@ -575,7 +575,7 @@ XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nS
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ExcFilterCondition::ExcFilterCondition() :
         nType( EXC_AFTYPE_NOTUSED ),
@@ -673,7 +673,7 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ) :
     XclExpRecord( EXC_ID_AUTOFILTER, 24 ),
@@ -896,7 +896,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_filterColumn );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
     XclExpRoot( rRoot ),
@@ -1068,7 +1068,7 @@ bool ExcAutoFilterRecs::HasFilterMode() const
     return pFilterMode != NULL;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpFilterManager::XclExpFilterManager( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot )
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index a8f0fe63fea7..c030be9a28c7 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -137,7 +137,7 @@ FltError ImportExcel::Read( void )
 
         switch( eAkt )
         {
-            // ----------------------------------------------------------------
+
             case Z_BiffNull:    // ------------------------------- Z_BiffNull -
             {
                 switch( nOpcode )
@@ -203,7 +203,7 @@ FltError ImportExcel::Read( void )
                 }
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff2:       // ---------------------------------- Z_Biff2 -
             {
                 switch( nOpcode )
@@ -262,7 +262,7 @@ FltError ImportExcel::Read( void )
                 }
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff3:       // ---------------------------------- Z_Biff3 -
             {
                 switch( nOpcode )
@@ -333,7 +333,7 @@ FltError ImportExcel::Read( void )
                 }
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff4:       // ---------------------------------- Z_Biff4 -
             {
                 switch( nOpcode )
@@ -408,7 +408,7 @@ FltError ImportExcel::Read( void )
                 }
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff4W:      // --------------------------------- Z_Biff4W -
             {
                 switch( nOpcode )
@@ -453,7 +453,7 @@ FltError ImportExcel::Read( void )
 
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff4T:       // --------------------------------- Z_Biff4T -
             {
                 switch( nOpcode )
@@ -519,7 +519,7 @@ FltError ImportExcel::Read( void )
 
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff4E:      // --------------------------------- Z_Biff4E -
             {
                 switch( nOpcode )
@@ -593,7 +593,7 @@ FltError ImportExcel::Read( void )
 
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff5TPre:   // ------------------------------- Z_Biff5Pre -
             {
                 if( nOpcode == 0x0809 )
@@ -634,7 +634,7 @@ FltError ImportExcel::Read( void )
                 }
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff5T:       // --------------------------------- Z_Biff5T -
             {
                 switch( nOpcode )
@@ -689,7 +689,7 @@ FltError ImportExcel::Read( void )
 
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Biff5E:      // --------------------------------- Z_Biff5E -
             {
                 switch( nOpcode )
@@ -736,7 +736,7 @@ FltError ImportExcel::Read( void )
 
             }
                 break;
-            // ----------------------------------------------------------------
+
             case Z_Ende:        // ----------------------------------- Z_Ende -
                 OSL_FAIL( "*ImportExcel::Read(): Not possible state!" );
                 break;
@@ -767,7 +767,7 @@ FltError ImportExcel::Read( void )
 }
 
 
-//___________________________________________________________________
+
 
 FltError ImportExcel8::Read( void )
 {
@@ -956,7 +956,7 @@ FltError ImportExcel8::Read( void )
 
         if( !bInUserView ) switch( eAkt )
         {
-            // ----------------------------------------------------------------
+
             // before workbook globals: wait for initial workbook globals BOF
             case EXC_STATE_BEFORE_GLOBALS:
             {
@@ -982,7 +982,7 @@ FltError ImportExcel8::Read( void )
             }
             break;
 
-            // ----------------------------------------------------------------
+
             // prefetch for workbook globals
             case EXC_STATE_GLOBALS_PRE:
             {
@@ -1023,7 +1023,7 @@ FltError ImportExcel8::Read( void )
             }
             break;
 
-            // ----------------------------------------------------------------
+
             // workbook globals
             case EXC_STATE_GLOBALS:
             {
@@ -1083,7 +1083,7 @@ FltError ImportExcel8::Read( void )
             }
             break;
 
-            // ----------------------------------------------------------------
+
             // prefetch for worksheet
             case EXC_STATE_SHEET_PRE:
             {
@@ -1149,7 +1149,7 @@ FltError ImportExcel8::Read( void )
             }
             break;
 
-            // ----------------------------------------------------------------
+
             // worksheet
             case EXC_STATE_SHEET:
             {
@@ -1240,7 +1240,7 @@ FltError ImportExcel8::Read( void )
             }
             break;
 
-            // ----------------------------------------------------------------
+
             default:;
         }
     }
@@ -1321,6 +1321,6 @@ FltError ImportExcel8::Read( void )
     return eLastErr;
 }
 
-//___________________________________________________________________
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx
index 1dbd49c9adfe..9443c0e1269b 100644
--- a/sc/source/filter/excel/tokstack.cxx
+++ b/sc/source/filter/excel/tokstack.cxx
@@ -46,7 +46,7 @@ TokenStack::~TokenStack()
 
 
 
-//------------------------------------------------------------------------
+
 
 // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1!
 // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt
diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx
index f68bf67ec112..cfec247c9098 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -249,7 +249,7 @@ struct XclExpChRootData : public XclChRootData
     void                FinalizeFutureRecBlock( XclExpStream& rStrm );
 };
 
-// ----------------------------------------------------------------------------
+
 
 void XclExpChRootData::RegisterFutureRecBlock( const XclChFrBlock& rFrBlock )
 {
@@ -297,7 +297,7 @@ void XclExpChRootData::FinalizeFutureRecBlock( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChRoot::XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ) :
     XclExpRoot( rRoot ),
@@ -427,7 +427,7 @@ void XclExpChRoot::FinalizeFutureRecBlock( XclExpStream& rStrm )
     mxChData->FinalizeFutureRecBlock( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChGroupBase::XclExpChGroupBase( const XclExpChRoot& rRoot,
         sal_uInt16 nFrType, sal_uInt16 nRecId, sal_Size nRecSize ) :
@@ -473,7 +473,7 @@ void XclExpChGroupBase::SetFutureRecordContext( sal_uInt16 nFrContext, sal_uInt1
     maFrBlock.mnValue2  = nFrValue2;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChFutureRecordBase::XclExpChFutureRecordBase( const XclExpChRoot& rRoot,
         XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize ) :
@@ -502,7 +502,7 @@ void XclExpChFramePos::WriteBody( XclExpStream& rStrm )
     rStrm << maData.mnTLMode << maData.mnBRMode << maData.maRect;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChLineFormat::XclExpChLineFormat( const XclExpChRoot& rRoot ) :
     XclExpRecord( EXC_ID_CHLINEFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 12 : 10 ),
@@ -585,7 +585,7 @@ XclExpChLineFormatRef lclCreateLineFormat( const XclExpChRoot& rRoot,
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChAreaFormat::XclExpChAreaFormat( const XclExpChRoot& rRoot ) :
     XclExpRecord( EXC_ID_CHAREAFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 16 : 12 ),
@@ -663,7 +663,7 @@ void XclExpChAreaFormat::WriteBody( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChEscherFormat::XclExpChEscherFormat( const XclExpChRoot& rRoot ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_UNKNOWN, EXC_ID_CHESCHERFORMAT ),
@@ -739,7 +739,7 @@ void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm )
     rStrm.CopyFromStream( aMemStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChFrameBase::XclExpChFrameBase()
 {
@@ -801,7 +801,7 @@ void XclExpChFrameBase::WriteFrameRecords( XclExpStream& rStrm )
     lclSaveRecord( rStrm, mxEscherFmt );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChFrame::XclExpChFrame( const XclExpChRoot& rRoot, XclChObjectType eObjType ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_FRAME, EXC_ID_CHFRAME, 4 ),
@@ -896,7 +896,7 @@ void lclAddDoubleRefData(
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChSourceLink::XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ) :
     XclExpRecord( EXC_ID_CHSOURCELINK ),
@@ -1113,7 +1113,7 @@ XclExpChFont::XclExpChFont( sal_uInt16 nFontIdx ) :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChObjectLink::XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ) :
     XclExpRecord( EXC_ID_CHOBJECTLINK, 6 )
@@ -1127,7 +1127,7 @@ void XclExpChObjectLink::WriteBody( XclExpStream& rStrm )
     rStrm << maData.mnTarget << maData.maPointPos.mnSeriesIdx << maData.maPointPos.mnPointIdx;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChFrLabelProps::XclExpChFrLabelProps( const XclExpChRoot& rRoot ) :
     XclExpChFutureRecordBase( rRoot, EXC_FUTUREREC_UNUSEDREF, EXC_ID_CHFRLABELPROPS, 4 )
@@ -1156,7 +1156,7 @@ void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm )
     rStrm << maData.mnFlags << aXclSep;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChFontBase::~XclExpChFontBase()
 {
@@ -1183,7 +1183,7 @@ void XclExpChFontBase::ConvertRotationBase(
     SetRotation( nRotation );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChText::XclExpChText( const XclExpChRoot& rRoot ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TEXT, EXC_ID_CHTEXT, (rRoot.GetBiff() == EXC_BIFF8) ? 32 : 26 ),
@@ -1438,7 +1438,7 @@ void XclExpChText::WriteBody( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1532,7 +1532,7 @@ void XclExpChMarkerFormat::WriteBody( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChPieFormat::XclExpChPieFormat() :
     XclExpUInt16Record( EXC_ID_CHPIEFORMAT, 0 )
@@ -1546,7 +1546,7 @@ void XclExpChPieFormat::Convert( const ScfPropertySet& rPropSet )
         SetValue( limit_cast< sal_uInt16 >( fApiDist * 100.0, 0, 100 ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCh3dDataFormat::XclExpCh3dDataFormat() :
     XclExpRecord( EXC_ID_CH3DDATAFORMAT, 2 )
@@ -1588,14 +1588,14 @@ void XclExpCh3dDataFormat::WriteBody( XclExpStream& rStrm )
     rStrm << maData.mnBase << maData.mnTop;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChAttachedLabel::XclExpChAttachedLabel( sal_uInt16 nFlags ) :
     XclExpUInt16Record( EXC_ID_CHATTACHEDLABEL, nFlags )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChDataFormat::XclExpChDataFormat( const XclExpChRoot& rRoot,
         const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ) :
@@ -1678,7 +1678,7 @@ void XclExpChDataFormat::WriteBody( XclExpStream& rStrm )
             << maData.mnFlags;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChSerTrendLine::XclExpChSerTrendLine( const XclExpChRoot& rRoot ) :
     XclExpRecord( EXC_ID_CHSERTRENDLINE, 28 ),
@@ -1773,7 +1773,7 @@ void XclExpChSerTrendLine::WriteBody( XclExpStream& rStrm )
             << maData.mfForecastBack;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChSerErrorBar::XclExpChSerErrorBar( const XclExpChRoot& rRoot, sal_uInt8 nBarType ) :
     XclExpRecord( EXC_ID_CHSERERRORBAR, 14 ),
@@ -1853,7 +1853,7 @@ void XclExpChSerErrorBar::WriteBody( XclExpStream& rStrm )
             << maData.mnValueCount;
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -2268,7 +2268,7 @@ void XclExpChType::WriteBody( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChChart3d::XclExpChChart3d() :
     XclExpRecord( EXC_ID_CHCHART3D, 14 )
@@ -2323,7 +2323,7 @@ void XclExpChChart3d::WriteBody( XclExpStream& rStrm )
             << maData.mnFlags;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChLegend::XclExpChLegend( const XclExpChRoot& rRoot ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_LEGEND, EXC_ID_CHLEGEND, 20 )
@@ -2422,7 +2422,7 @@ void XclExpChLegend::WriteBody( XclExpStream& rStrm )
     rStrm << maData.maRect << maData.mnDockMode << maData.mnSpacing << maData.mnFlags;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChDropBar::XclExpChDropBar( const XclExpChRoot& rRoot, XclChObjectType eObjType ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_DROPBAR, EXC_ID_CHDROPBAR, 2 ),
@@ -2449,7 +2449,7 @@ void XclExpChDropBar::WriteBody( XclExpStream& rStrm )
     rStrm << mnBarDist;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChTypeGroup::XclExpChTypeGroup( const XclExpChRoot& rRoot, sal_uInt16 nGroupIdx ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TYPEGROUP, EXC_ID_CHTYPEGROUP, 20 ),
@@ -2776,7 +2776,7 @@ void XclExpChLabelRange::WriteBody( XclExpStream& rStrm )
     rStrm << maLabelData.mnCross << maLabelData.mnLabelFreq << maLabelData.mnTickFreq << maLabelData.mnFlags;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) :
     XclExpRecord( EXC_ID_CHVALUERANGE, 42 ),
@@ -2852,7 +2852,7 @@ void XclExpChValueRange::WriteBody( XclExpStream& rStrm )
             << maData.mnFlags;
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -2942,7 +2942,7 @@ void XclExpChTick::WriteBody( XclExpStream& rStrm )
         rStrm << GetPalette().GetColorIndex( mnTextColorId ) << maData.mnRotation;
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -3122,7 +3122,7 @@ void XclExpChAxis::WriteBody( XclExpStream& rStrm )
     rStrm.WriteZeroBytes( 16 );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChAxesSet::XclExpChAxesSet( const XclExpChRoot& rRoot, sal_uInt16 nAxesSetId ) :
     XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_AXESSET, EXC_ID_CHAXESSET, 18 )
@@ -3494,7 +3494,7 @@ void XclExpChChart::WriteBody( XclExpStream& rStrm )
      rStrm << maRect;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChartDrawing::XclExpChartDrawing( const XclExpRoot& rRoot,
         const Reference< XModel >& rxModel, const Size& rChartSize ) :
@@ -3530,7 +3530,7 @@ void XclExpChartDrawing::Save( XclExpStream& rStrm )
         mxObjRecs->Save( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, const Rectangle& rChartRect ) :
     XclExpSubStream( EXC_BOF_CHART ),
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 327ef0ef8265..718ba0a40e49 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -77,7 +77,7 @@ struct XclExpHashEntrySWO
                             { return *rLeft.mpString < *rRight.mpString; }
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Implementation of the SST export.
     @descr  Stores all passed strings in a hash table and prevents repeated
@@ -105,7 +105,7 @@ private:
     sal_uInt32          mnSize;         /// Size of the SST (count of unique strings).
 };
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt32 EXC_SST_HASHTABLE_SIZE = 2048;
 
@@ -229,7 +229,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
     rStrm.PopStream();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpSst::XclExpSst() :
     mxImpl( new XclExpSstImpl )
@@ -602,7 +602,7 @@ private:
     bool                mbPattUsed;         /// true = Pattern attribute used.
 };
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ) :
     XclExpRoot( rRoot ),
@@ -960,7 +960,7 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_cfRule );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCF::XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority = 0 ) :
     XclExpRecord( EXC_ID_CF ),
@@ -1131,7 +1131,7 @@ void XclExpColScaleCol::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_color );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat& rCondFormat, XclExtLstRef xExtLst, sal_Int32& rIndex ) :
     XclExpRecord( EXC_ID_CONDFMT ),
@@ -1204,7 +1204,7 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_conditionalFormatting );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ):
     XclExpRecord(),
@@ -1389,7 +1389,7 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_cfRule );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ) :
     XclExpRoot( rRoot )
@@ -1474,7 +1474,7 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) :
     XclExpRecord( EXC_ID_DV ),
@@ -1693,7 +1693,7 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm )
     rWorksheet->endElement( XML_dataValidation );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDval::XclExpDval( const XclExpRoot& rRoot ) :
     XclExpRecord( EXC_ID_DVAL, 18 ),
@@ -1904,7 +1904,7 @@ void XclExpWebQuery::Save( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot )
 {
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 67ac32542453..24e54b31cdea 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -245,7 +245,7 @@ void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit )
     OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDffSheetAnchor::XclExpDffSheetAnchor( const XclExpRoot& rRoot ) :
     XclExpDffAnchorBase( rRoot ),
@@ -267,7 +267,7 @@ void XclExpDffSheetAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUnit e
     maAnchor.SetRect( GetRoot(), mnScTab, rRect, eMapUnit );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDffEmbeddedAnchor::XclExpDffEmbeddedAnchor( const XclExpRoot& rRoot,
         const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) :
@@ -288,7 +288,7 @@ void XclExpDffEmbeddedAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUni
     maAnchor.SetRect( maPageSize, mnScaleX, mnScaleY, rRect, eMapUnit, true );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ) :
     XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_SIZELOCKED )
@@ -296,7 +296,7 @@ XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectang
     maAnchor.SetRect( rRoot, rRoot.GetCurrScTab(), rRect, MAP_100TH_MM );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDffDropDownAnchor::XclExpDffDropDownAnchor( const XclExpRoot& rRoot, const ScAddress& rScPos ) :
     XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_POSLOCKED )
@@ -323,7 +323,7 @@ void XclExpMsoDrawingBase::WriteBody( XclExpStream& rStrm )
     rStrm.CopyFromStream( mrEscherEx.GetStream(), mrEscherEx.GetDffFragmentSize( mnFragmentKey ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) :
     XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWINGGROUP )
@@ -355,7 +355,7 @@ XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) :
     mrEscherEx.UpdateDffFragmentEnd();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpMsoDrawing::XclExpMsoDrawing( XclEscherEx& rEscherEx ) :
     XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWING )
@@ -504,7 +504,7 @@ void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nS
     rStrm.EndRecord();
 }
 
-// ----------------------------------------------------------------------------
+
 
 //delete for exporting OCX
 //#if EXC_EXP_OCX_CTRL
@@ -1042,7 +1042,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm )
 
 //#endif
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) :
     XclObj( rObjMgr, EXC_OBJTYPE_CHART ),
@@ -1637,7 +1637,7 @@ void XclExpObjectManager::InitStream( bool bTempFile )
     mxDffStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpEmbeddedObjectManager::XclExpEmbeddedObjectManager(
         const XclExpObjectManager& rParent, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) :
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index 706ea3f7f4d0..a01f3dbfa156 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -63,7 +63,7 @@ struct XclExpScToken
     inline OpCode       GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); }
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Effective token class conversion types. */
 enum XclExpClassConv
@@ -73,7 +73,7 @@ enum XclExpClassConv
     EXC_CLASSCONV_ARR           /// Convert VAL tokens to ARR class (REF remains uncahnged).
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Token class conversion and position of a token in the token array. */
 struct XclExpTokenConvInfo
@@ -103,7 +103,7 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon
 typedef boost::shared_ptr< XclExpOperandList > XclExpOperandListRef;
 typedef ::std::vector< XclExpOperandListRef > XclExpOperandListVector;
 
-// ----------------------------------------------------------------------------
+
 
 /** Encapsulates all data needed for a call to an external function (macro, add-in). */
 struct XclExpExtFuncData
@@ -123,7 +123,7 @@ void XclExpExtFuncData::Set( const OUString& rFuncName, bool bVBasic, bool bHidd
     mbHidden = bHidden;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Encapsulates all data needed to process an entire function. */
 class XclExpFuncData
@@ -261,7 +261,7 @@ static const XclExpCompConfig spConfigTable[] =
     { EXC_FMLATYPE_LISTVAL, EXC_CLASSTYPE_NAME,  true,  false, false, false }
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Working data of the formula compiler. Used to push onto a stack for recursive calls. */
 struct XclExpCompData
@@ -300,7 +300,7 @@ XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) :
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 /** Implementation class of the export formula compiler. */
 class XclExpFmlaCompImpl : protected XclExpRoot, protected XclTokenArrayHelper
@@ -325,7 +325,7 @@ public:
     bool IsRef2D( const ScSingleRefData& rRefData, bool bCheck3DFlag ) const;
     bool IsRef2D( const ScComplexRefData& rRefData, bool bCheck3DFlag ) const;
 
-    // ------------------------------------------------------------------------
+
 private:
     const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const;
     inline sal_uInt16   GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); }
@@ -461,7 +461,7 @@ private:
     void                AppendExt( double fData );
     void                AppendExt( const OUString& rString );
 
-    // ------------------------------------------------------------------------
+
 private:
     typedef ::std::map< XclFormulaType, XclExpCompConfig >  XclExpCompConfigMap;
     typedef boost::shared_ptr< XclExpCompData >             XclExpCompDataRef;
@@ -480,7 +480,7 @@ private:
     const sal_uInt32    mnMaxRowMask;   /// Mask to delete invalid bits in row fields.
 };
 
-// ----------------------------------------------------------------------------
+
 
 XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
@@ -2595,7 +2595,7 @@ void lclPutRangeToTokenArray( ScTokenArray& rScTokArr, const ScRange& rScRange,
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpFormulaCompiler::XclExpFormulaCompiler( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx
index f94e81689ff8..113d98c5c4ea 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -149,7 +149,7 @@ inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpAddressConverter::XclExpAddressConverter( const XclExpRoot& rRoot ) :
     XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetXclMaxPos() )
@@ -286,7 +286,7 @@ OUString lclGetUrlRepresentation( const SvxURLField& rUrlField )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpHyperlinkHelper::XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos ) :
     XclExpRoot( rRoot ),
@@ -333,7 +333,7 @@ XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord()
     return XclExpHyperlinkRef();
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -526,7 +526,7 @@ XclExpStringRef lclCreateFormattedString(
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpStringRef XclExpStringHelper::CreateString(
         const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen )
@@ -962,7 +962,7 @@ OUString lclEncodeDosUrl(
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName )
 {
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 7f451c0d7762..23b59771bb6d 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -68,7 +68,7 @@ private:
     sal_uInt16          mnFlags;        /// Flags for record export.
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Represents an EXTERNNAME record for an add-in function name. */
 class XclExpExtNameAddIn : public XclExpExtNameBase
@@ -81,7 +81,7 @@ private:
     virtual void        WriteAddData( XclExpStream& rStrm );
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Represents an EXTERNNAME record for a DDE link. */
 class XclExpExtNameDde : public XclExpExtNameBase
@@ -99,7 +99,7 @@ private:
     XclExpCachedMatRef  mxMatrix;       /// Cached results of the DDE link.
 };
 
-// ----------------------------------------------------------------------------
+
 
 class XclExpSupbook;
 
@@ -183,7 +183,7 @@ private:
     SCROW               mnScRow;    /// Row index of the external cells.
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Represents the record XCT which is the header record of a CRN record list.
  */
@@ -367,7 +367,7 @@ inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight )
         (rLeft.mnLastSBTab  == rRight.mnLastSBTab);
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Contains a list of all SUPBOOK records and index arrays of external sheets. */
 class XclExpSupbookBuffer : public XclExpRecordBase, protected XclExpRoot
@@ -500,7 +500,7 @@ protected:
     explicit            XclExpLinkManagerImpl( const XclExpRoot& rRoot );
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Implementation of the link manager for BIFF5/BIFF7. */
 class XclExpLinkManagerImpl5 : public XclExpLinkManagerImpl
@@ -570,7 +570,7 @@ private:
     XclExpCodeMap       maCodeMap;          /// Maps special external codes to EXTERNSHEET records.
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Implementation of the link manager for BIFF8. */
 class XclExpLinkManagerImpl8 : public XclExpLinkManagerImpl
@@ -636,7 +636,7 @@ const sal_uInt8 EXC_TABBUF_VISIBLE  = 0x10;     /// Sheet is visible.
 const sal_uInt8 EXC_TABBUF_SELECTED = 0x20;     /// Sheet is selected.
 const sal_uInt8 EXC_TABBUF_MIRRORED = 0x40;     /// Sheet is mirrored (right-to-left).
 
-// ----------------------------------------------------------------------------
+
 
 XclExpTabInfo::XclExpTabInfo( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
@@ -896,7 +896,7 @@ void XclExpExtNameBase::WriteAddData( XclExpStream& /*rStrm*/ )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpExtNameAddIn::XclExpExtNameAddIn( const XclExpRoot& rRoot, const OUString& rName ) :
     XclExpExtNameBase( rRoot, rName )
@@ -910,7 +910,7 @@ void XclExpExtNameAddIn::WriteAddData( XclExpStream& rStrm )
     rStrm << sal_uInt16( 2 ) << EXC_TOKID_ERR << EXC_ERR_REF;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpExtNameDde::XclExpExtNameDde( const XclExpRoot& rRoot,
         const OUString& rName, sal_uInt16 nFlags, const ScMatrix* pResults ) :
@@ -929,7 +929,7 @@ void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm )
         mxMatrix->Save( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpExtName::XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook,
         const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) :
@@ -1918,7 +1918,7 @@ XclExpLinkManagerImpl::XclExpLinkManagerImpl( const XclExpRoot& rRoot ) :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpLinkManagerImpl5::XclExpLinkManagerImpl5( const XclExpRoot& rRoot ) :
     XclExpLinkManagerImpl( rRoot )
@@ -2103,7 +2103,7 @@ XclExpLinkManagerImpl5::XclExpExtSheetRef XclExpLinkManagerImpl5::FindInternal(
     return xExtSheet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpLinkManagerImpl8::XclExpLinkManagerImpl8( const XclExpRoot& rRoot ) :
     XclExpLinkManagerImpl( rRoot ),
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index b645d5851722..3e6734eda5b2 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -109,7 +109,7 @@ private:
     sal_uInt16          mnXclTab;       /// The 1-based Excel sheet index for local names.
 };
 
-// ----------------------------------------------------------------------------
+
 
 class ScRangeData;
 class ScDBData;
@@ -349,7 +349,7 @@ void XclExpName::WriteBody( XclExpStream& rStrm )
         mxTokArr->WriteArray( rStrm );  // token array without size
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpNameManagerImpl::XclExpNameManagerImpl( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
@@ -675,7 +675,7 @@ void XclExpNameManagerImpl::CreateUserNames()
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpNameManager::XclExpNameManager( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx
index ec4187f4497b..12ff6be5759d 100644
--- a/sc/source/filter/excel/xepage.cxx
+++ b/sc/source/filter/excel/xepage.cxx
@@ -411,7 +411,7 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm )
         XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot )
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index a0a00d600a7b..1993828edff4 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -92,7 +92,7 @@ static const sal_uInt16 spnPCItemFlags[] =
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpPCItem::XclExpPCItem( const OUString& rText ) :
     XclExpRecord( (!rText.isEmpty()) ? EXC_ID_SXSTRING : EXC_ID_SXEMPTY, 0 ),
@@ -133,7 +133,7 @@ XclExpPCItem::XclExpPCItem( bool bValue ) :
     SetBool( bValue );
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool XclExpPCItem::EqualsText( const OUString& rText ) const
 {
@@ -155,7 +155,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const
     return GetBool() && (*GetBool() == bValue);
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclExpPCItem::WriteBody( XclExpStream& rStrm )
 {
@@ -917,7 +917,7 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const
 
 namespace {
 
-// ----------------------------------------------------------------------------
+
 
 /** Returns a display string for a data field containing the field name and aggregation function. */
 OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFunc )
@@ -947,7 +947,7 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu
     return( aCaption );
 }
 
-// ----------------------------------------------------------------------------
+
 
 } // namespace
 
@@ -1836,7 +1836,7 @@ void XclExpPivotRecWrapper::SaveXml( XclExpXmlStream& rStrm )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpPivotTableManager::XclExpPivotTableManager( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx
index a305afcb7b2a..62b475c5ca81 100644
--- a/sc/source/filter/excel/xerecord.cxx
+++ b/sc/source/filter/excel/xerecord.cxx
@@ -36,7 +36,7 @@ void XclExpRecordBase::SaveXml( XclExpXmlStream& /*rStrm*/ )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDelegatingRecord::XclExpDelegatingRecord( XclExpRecordBase* pRecord ) :
     mpRecord( pRecord )
@@ -55,7 +55,7 @@ void XclExpDelegatingRecord::SaveXml( XclExpXmlStream& rStrm )
         mpRecord->SaveXml( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXmlElementRecord::XclExpXmlElementRecord(sal_Int32 const nElement)
     : mnElement( nElement )
@@ -66,7 +66,7 @@ XclExpXmlElementRecord::~XclExpXmlElementRecord()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXmlStartElementRecord::XclExpXmlStartElementRecord(sal_Int32 const nElement)
     : XclExpXmlElementRecord(nElement)
@@ -85,7 +85,7 @@ void XclExpXmlStartElementRecord::SaveXml( XclExpXmlStream& rStrm )
     rStream->startElement( mnElement, FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXmlEndElementRecord::XclExpXmlEndElementRecord( sal_Int32 nElement )
     : XclExpXmlElementRecord( nElement )
@@ -101,7 +101,7 @@ void XclExpXmlEndElementRecord::SaveXml( XclExpXmlStream& rStrm )
     rStrm.GetCurrentStream()->endElement( mnElement );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXmlStartSingleElementRecord::XclExpXmlStartSingleElementRecord(
             sal_Int32 const nElement)
@@ -119,7 +119,7 @@ void XclExpXmlStartSingleElementRecord::SaveXml( XclExpXmlStream& rStrm )
     rStream->write( "<" )->writeId( mnElement );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXmlEndSingleElementRecord::XclExpXmlEndSingleElementRecord()
 {
@@ -134,7 +134,7 @@ void XclExpXmlEndSingleElementRecord::SaveXml( XclExpXmlStream& rStrm )
     rStrm.GetCurrentStream()->write( "/>" );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpRecord::XclExpRecord( sal_uInt16 nRecId, sal_Size nRecSize ) :
     mnRecSize( nRecSize ),
@@ -164,7 +164,7 @@ void XclExpRecord::Save( XclExpStream& rStrm )
     rStrm.EndRecord();
 }
 
-// ----------------------------------------------------------------------------
+
 
 template<>
 void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm )
@@ -176,7 +176,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm )
         FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclExpBoolRecord::WriteBody( XclExpStream& rStrm )
 {
@@ -194,7 +194,7 @@ void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm )
             FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, sal_Size nRecSize ) :
     XclExpRecord( nRecId )
diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx
index a1b4d05fbc70..5708cc337f48 100644
--- a/sc/source/filter/excel/xeroot.cxx
+++ b/sc/source/filter/excel/xeroot.cxx
@@ -63,7 +63,7 @@ XclExpRootData::~XclExpRootData()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) :
     XclRoot( rExpRootData ),
diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx
index 9eec03edc219..80bfeb90d204 100644
--- a/sc/source/filter/excel/xestring.cxx
+++ b/sc/source/filter/excel/xestring.cxx
@@ -438,7 +438,7 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool XclExpString::IsWriteFlags() const
 {
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index c75322850d47..086577958f66 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -177,7 +177,7 @@ void XclListColor::Merge( const XclListColor& rColor )
     AddWeighting( nWeight2 );
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Data for each inserted original color, represented by a color ID. */
 struct XclColorIdData
@@ -224,7 +224,7 @@ typedef ::std::vector< XclNearest > XclNearestVec;
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 class XclExpPaletteImpl
 {
@@ -318,7 +318,7 @@ private:
     sal_uInt32          mnLastIdx;          /// Last insertion index for search opt.
 };
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt32 EXC_PAL_INDEXBASE          = 0xFFFF0000;
 const sal_uInt32 EXC_PAL_MAXRAWSIZE         = 1024;
@@ -762,7 +762,7 @@ sal_Int32 XclExpPaletteImpl::GetNearPaletteColors(
     return nDist1;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpPalette::XclExpPalette( const XclExpRoot& rRoot ) :
     XclDefaultPalette( rRoot ),
@@ -939,7 +939,7 @@ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rI
     return bUsed;
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -962,7 +962,7 @@ sal_uInt32 lclCalcHash( const XclFontData& rFontData )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpFont::XclExpFont( const XclExpRoot& rRoot,
         const XclFontData& rFontData, XclExpColorType eColorType ) :
@@ -1022,7 +1022,7 @@ void XclExpFont::WriteBody( XclExpStream& rStrm )
             << aFontName;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpBlindFont::XclExpBlindFont( const XclExpRoot& rRoot ) :
     XclExpFont( rRoot, XclFontData(), EXC_COLOR_CELLTEXT )
@@ -1205,7 +1205,7 @@ struct XclExpNumFmtPred
                             { return rFormat.mnScNumFmt == mnScNumFmt; }
 };
 
-// ----------------------------------------------------------------------------
+
 
 void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm )
 {
@@ -1216,7 +1216,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm )
             FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
@@ -1383,7 +1383,7 @@ void XclExpCellProt::SaveXml( XclExpXmlStream& rStrm ) const
             FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool XclExpCellAlign::FillFromItemSet(
         const SfxItemSet& rItemSet, bool bForceLineBreak, XclBiff eBiff, bool bStyle )
@@ -1541,7 +1541,7 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const
             FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1595,7 +1595,7 @@ void lclGetBorderLine(
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCellBorder::XclExpCellBorder() :
     mnLeftColorId(   XclExpPalette::GetColorIdFromIndex( mnLeftColor ) ),
@@ -1772,7 +1772,7 @@ void XclExpCellBorder::SaveXml( XclExpXmlStream& rStrm ) const
     rStyleSheet->endElement( XML_border );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpCellArea::XclExpCellArea() :
     mnForeColorId( XclExpPalette::GetColorIdFromIndex( mnForeColor ) ),
@@ -1902,7 +1902,7 @@ void XclExpColor::SaveXml( XclExpXmlStream& rStrm ) const
     rStyleSheet->endElement( XML_fill );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXFId::XclExpXFId() :
     mnXFId( XclExpXFBuffer::GetDefCellXFId() ),
@@ -1921,7 +1921,7 @@ void XclExpXFId::ConvertXFIndex( const XclExpRoot& rRoot )
     mnXFIndex = rRoot.GetXFBuffer().GetXFIndex( mnXFId );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXF::XclExpXF(
         const XclExpRoot& rRoot, const ScPatternAttr& rPattern, sal_Int16 nScript,
@@ -2137,7 +2137,7 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm )
     rStyleSheet->endElement( XML_xf );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) :
     XclExpXF( rRoot, bCellXF )
@@ -2156,7 +2156,7 @@ void XclExpDefaultXF::SetNumFmt( sal_uInt16 nXclNumFmt )
     mbFmtUsed = true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const OUString& rStyleName ) :
     XclExpRecord( EXC_ID_STYLE, 4 ),
@@ -2243,7 +2243,7 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm )
     // OOXTODO: XML_extLst
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -2260,7 +2260,7 @@ bool lclIsBuiltInStyle( const OUString& rStyleName )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() :
     mnStyleId( EXC_STYLE_USERDEF ),
@@ -2270,7 +2270,7 @@ XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Predicate for search algorithm. */
 struct XclExpBorderPred
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 89a778b41229..eaf2586f3d6c 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -130,7 +130,7 @@ void XclExpArray::WriteBody( XclExpStream& rStrm )
     rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpArrayBuffer::XclExpArrayBuffer( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot )
@@ -199,7 +199,7 @@ void XclExpShrfmla::WriteBody( XclExpStream& rStrm )
     rStrm << sal_uInt8( 0 ) << mnUsedCount << *mxTokArr;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpShrfmlaBuffer::XclExpShrfmlaBuffer( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot )
@@ -439,7 +439,7 @@ void XclExpTableop::WriteBody( XclExpStream& rStrm )
         rStrm << mnColInpXclRow << mnColInpXclCol << sal_uInt32( 0 );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpTableopBuffer::XclExpTableopBuffer( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot )
@@ -613,7 +613,7 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm )
     WriteContents( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell )
 
@@ -659,7 +659,7 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm )
     rStrm << mfValue;
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
 
@@ -809,7 +809,7 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell )
 
@@ -1249,7 +1249,7 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes
     // The Save() function will skip all XF indexes equal to EXC_XF_NOTFOUND.
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell )
 
@@ -1299,7 +1299,7 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress
             FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell )
 
@@ -1408,7 +1408,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpGuts::XclExpGuts( const XclExpRoot& rRoot ) :
     XclExpRecord( EXC_ID_GUTS, 8 ),
@@ -1444,7 +1444,7 @@ void XclExpGuts::WriteBody( XclExpStream& rStrm )
     rStrm << mnRowWidth << mnColWidth << mnRowLevels << mnColLevels;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDimensions::XclExpDimensions( const XclExpRoot& rRoot ) :
     mnFirstUsedXclRow( 0 ),
@@ -1514,7 +1514,7 @@ double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDefcolwidth::XclExpDefcolwidth( const XclExpRoot& rRoot ) :
     XclExpUInt16Record( EXC_ID_DEFCOLWIDTH, EXC_DEFCOLWIDTH_DEF ),
@@ -1535,7 +1535,7 @@ void XclExpDefcolwidth::SetDefWidth( sal_uInt16 nXclColWidth )
     SetValue( limit_cast< sal_uInt16 >( fNewColWidth / 256.0 + 0.5 ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot,
         SCCOL nScCol, SCROW nLastScRow, XclExpColOutlineBuffer& rOutlineBfr ) :
@@ -1627,7 +1627,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm )
             FSEND );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpColinfoBuffer::XclExpColinfoBuffer( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
@@ -1745,7 +1745,7 @@ bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& r
         ((rLeft.mnHeight == rRight.mnHeight) && (rLeft.mnFlags < rRight.mnFlags));
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpDefrowheight::XclExpDefrowheight() :
     XclExpRecord( EXC_ID3_DEFROWHEIGHT, 4 )
@@ -1763,7 +1763,7 @@ void XclExpDefrowheight::WriteBody( XclExpStream& rStrm )
     rStrm << maDefData.mnFlags << maDefData.mnHeight;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt32 nXclRow,
         XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty ) :
@@ -2060,7 +2060,7 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpRowBuffer::XclExpRowBuffer( const XclExpRoot& rRoot ) :
     XclExpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx
index 1c35f72f952b..ea466796d6bc 100644
--- a/sc/source/filter/excel/xeview.cxx
+++ b/sc/source/filter/excel/xeview.cxx
@@ -131,7 +131,7 @@ void XclExpWindow2::WriteBody( XclExpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpScl::XclExpScl( sal_uInt16 nZoom ) :
     XclExpRecord( EXC_ID_SCL, 4 ),
@@ -157,7 +157,7 @@ void XclExpScl::WriteBody( XclExpStream& rStrm )
     rStrm << mnNum << mnDenom;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpPane::XclExpPane( const XclTabViewData& rData ) :
     XclExpRecord( EXC_ID_PANE, 10 ),
@@ -203,7 +203,7 @@ void XclExpPane::WriteBody( XclExpStream& rStrm )
         rStrm << sal_uInt8( 0 );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpSelection::XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ) :
     XclExpRecord( EXC_ID_SELECTION, 15 ),
@@ -246,7 +246,7 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm )
     maSelData.maXclSelection.Write( rStrm, false );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) :
     XclExpRecord( EXC_ID_SHEETEXT, 18 ),
@@ -288,7 +288,7 @@ sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ) :
     XclExpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index 34c53434a588..314c9259910e 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -207,7 +207,7 @@ struct XclImpChRootData : public XclChRootData
     inline explicit     XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {}
 };
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) :
     XclImpRoot( rRoot ),
@@ -377,7 +377,7 @@ void XclImpChRoot::ConvertPieRotation( ScfPropertySet& rPropSet, sal_uInt16 nAng
     rPropSet.SetProperty( EXC_CHPROP_STARTINGANGLE, nApiRot );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChGroupBase::~XclImpChGroupBase()
 {
@@ -441,7 +441,7 @@ void XclImpChFramePos::ReadChFramePos( XclImpStream& rStrm )
     maData.maRect.mnHeight = rStrm.ReadInt16(); rStrm.Ignore( 2 );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpChLineFormat::ReadChLineFormat( XclImpStream& rStrm )
 {
@@ -473,7 +473,7 @@ void XclImpChLineFormat::Convert( const XclImpChRoot& rRoot,
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpChAreaFormat::ReadChAreaFormat( XclImpStream& rStrm )
 {
@@ -508,7 +508,7 @@ void XclImpChAreaFormat::Convert( const XclImpChRoot& rRoot,
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChEscherFormat::XclImpChEscherFormat( const XclImpRoot& rRoot ) :
     mnDffFillType( mso_fillSolid )
@@ -548,7 +548,7 @@ void XclImpChEscherFormat::Convert( const XclImpChRoot& rRoot,
     rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : 0, mnDffFillType, rFmtInfo.mePropMode );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChFrameBase::XclImpChFrameBase( const XclChFormatInfo& rFmtInfo )
 {
@@ -625,7 +625,7 @@ void XclImpChFrameBase::ConvertFrameBase( const XclImpChRoot& rRoot,
     ConvertAreaBase( rRoot, rPropSet, eObjType, nFormatIdx, bUsePicFmt );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChFrame::XclImpChFrame( const XclImpChRoot& rRoot, XclChObjectType eObjType ) :
     XclImpChFrameBase( rRoot.GetFormatInfo( eObjType ) ),
@@ -723,7 +723,7 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence(
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChSourceLink::XclImpChSourceLink( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -920,7 +920,7 @@ void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfProper
     rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChFont::XclImpChFont() :
     mnFontIdx( EXC_FONT_NOTFOUND )
@@ -932,7 +932,7 @@ void XclImpChFont::ReadChFont( XclImpStream& rStrm )
     rStrm >> mnFontIdx;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChText::XclImpChText( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -1306,7 +1306,7 @@ void XclImpChMarkerFormat::ConvertColor( const XclImpChRoot& rRoot,
     rPropSet.SetColorProperty( EXC_CHPROP_COLOR, aLineColor );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChPieFormat::XclImpChPieFormat() :
     mnPieDist( 0 )
@@ -1324,7 +1324,7 @@ void XclImpChPieFormat::Convert( ScfPropertySet& rPropSet ) const
     rPropSet.SetProperty( EXC_CHPROP_OFFSET, fApiDist );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChSeriesFormat::XclImpChSeriesFormat() :
     mnFlags( 0 )
@@ -1336,7 +1336,7 @@ void XclImpChSeriesFormat::ReadChSeriesFormat( XclImpStream& rStrm )
     rStrm >> mnFlags;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpCh3dDataFormat::ReadCh3dDataFormat( XclImpStream& rStrm )
 {
@@ -1352,7 +1352,7 @@ void XclImpCh3dDataFormat::Convert( ScfPropertySet& rPropSet ) const
     rPropSet.SetProperty( EXC_CHPROP_GEOMETRY3D, nApiType );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChAttachedLabel::XclImpChAttachedLabel( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot ),
@@ -1379,7 +1379,7 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( const XclImpChText* pPar
     return xLabel;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChDataFormat::XclImpChDataFormat( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -1593,7 +1593,7 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt )
         mxLabel = mxAttLabel->CreateDataLabel( pDefText );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChSerTrendLine::XclImpChSerTrendLine( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -1681,7 +1681,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons
     return xRegCurve;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChSerErrorBar::XclImpChSerErrorBar( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -1782,7 +1782,7 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer
     return xErrorBar;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChSeries::XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ) :
     XclImpChRoot( rRoot ),
@@ -2399,7 +2399,7 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi
     return xChartType;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpChChart3d::ReadChChart3d( XclImpStream& rStrm )
 {
@@ -2480,7 +2480,7 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con
     rPropSet.SetProperty( EXC_CHPROP_D3DSCENELIGHTDIR2, cssd::Direction3D( 0.2, 0.4, 1.0 ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChLegend::XclImpChLegend( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -2619,7 +2619,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const
     return xLegend;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChDropBar::XclImpChDropBar( sal_uInt16 nDropBar ) :
     mnDropBar( nDropBar ),
@@ -2643,7 +2643,7 @@ void XclImpChDropBar::Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropS
     ConvertFrameBase( rRoot, rPropSet, eObjType );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChTypeGroup::XclImpChTypeGroup( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot ),
@@ -3058,7 +3058,7 @@ void XclImpChLabelRange::ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3d
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChValueRange::XclImpChValueRange( const XclImpChRoot& rRoot ) :
     XclImpChRoot( rRoot )
@@ -3135,7 +3135,7 @@ void XclImpChValueRange::ConvertAxisPosition( ScfPropertySet& rPropSet ) const
     rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos );
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -3215,7 +3215,7 @@ void XclImpChTick::Convert( ScfPropertySet& rPropSet ) const
     rPropSet.SetProperty( EXC_CHPROP_MARKPOSITION, cssc::ChartAxisMarkPosition_AT_AXIS );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChAxis::XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType ) :
     XclImpChRoot( rRoot ),
@@ -3490,7 +3490,7 @@ void XclImpChAxis::CreateWallFrame()
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChAxesSet::XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ) :
     XclImpChRoot( rRoot )
@@ -4190,7 +4190,7 @@ Reference< XDiagram > XclImpChChart::CreateDiagram() const
     return xDiagram;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChartDrawing::XclImpChartDrawing( const XclImpRoot& rRoot, bool bOwnTab ) :
     XclImpDrawing( rRoot, bOwnTab ), // sheet charts may contain OLE objects
@@ -4252,7 +4252,7 @@ void XclImpChartDrawing::OnObjectInserted( const XclImpDrawObjBase& )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChart::XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ) :
     XclImpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 552dc2626427..ea32ced60b1f 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -213,7 +213,7 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpHyperlink::ReadHlink( XclImpStream& rStrm )
 {
@@ -651,7 +651,7 @@ void XclImpCondFormat::Apply()
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpCondFormatManager::XclImpCondFormatManager( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
@@ -963,7 +963,7 @@ void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpWebQueryBuffer::XclImpWebQueryBuffer( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
@@ -1109,7 +1109,7 @@ XclImpDecrypterRef lclReadFilepass8( XclImpStream& rStrm )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm )
 {
@@ -1201,7 +1201,7 @@ XclImpSheetProtectBuffer::Sheet::Sheet() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpSheetProtectBuffer::Sheet::Sheet(const Sheet& r) :
     mbProtected(r.mbProtected),
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 63ad0de6446d..10d87b3ebe14 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -961,7 +961,7 @@ void XclImpDrawObjBase::ImplReadObj8( XclImpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpDrawObjVector::InsertGrouped( XclImpDrawObjRef xDrawObj )
 {
@@ -980,7 +980,7 @@ sal_Size XclImpDrawObjVector::GetProgressSize() const
     return nProgressSize;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) :
     XclImpDrawObjBase( rRoot )
@@ -988,7 +988,7 @@ XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) :
     SetProcessSdrObj( false );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpGroupObj::XclImpGroupObj( const XclImpRoot& rRoot ) :
     XclImpDrawObjBase( rRoot ),
@@ -1046,7 +1046,7 @@ SdrObject* XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R
     return xSdrObj.release();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) :
     XclImpDrawObjBase( rRoot ),
@@ -1175,7 +1175,7 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
     return xSdrObj.release();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpRectObj::XclImpRectObj( const XclImpRoot& rRoot ) :
     XclImpDrawObjBase( rRoot ),
@@ -1223,7 +1223,7 @@ SdrObject* XclImpRectObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
     return xSdrObj.release();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpOvalObj::XclImpOvalObj( const XclImpRoot& rRoot ) :
     XclImpRectObj( rRoot )
@@ -1238,7 +1238,7 @@ SdrObject* XclImpOvalObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re
     return xSdrObj.release();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpArcObj::XclImpArcObj( const XclImpRoot& rRoot ) :
     XclImpDrawObjBase( rRoot ),
@@ -1310,7 +1310,7 @@ SdrObject* XclImpArcObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rec
     return xSdrObj.release();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpPolygonObj::XclImpPolygonObj( const XclImpRoot& rRoot ) :
     XclImpRectObj( rRoot ),
@@ -1389,7 +1389,7 @@ SdrObject* XclImpPolygonObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const
     return xSdrObj.release();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpObjTextData::ReadByteString( XclImpStream& rStrm )
 {
@@ -1410,7 +1410,7 @@ void XclImpObjTextData::ReadFormats( XclImpStream& rStrm )
         rStrm.Ignore( maData.mnFormatSize );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpTextObj::XclImpTextObj( const XclImpRoot& rRoot ) :
     XclImpRectObj( rRoot )
@@ -1613,7 +1613,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
     XclImpRectObj::DoPreProcessSdrObj( rDffConv, rSdrObj );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpChartObj::XclImpChartObj( const XclImpRoot& rRoot, bool bOwnTab ) :
     XclImpRectObj( rRoot ),
@@ -1797,7 +1797,7 @@ void XclImpChartObj::FinalizeTabChart()
     SetAnchor( aAnchor );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpNoteObj::XclImpNoteObj( const XclImpRoot& rRoot ) :
     XclImpTextObj( rRoot ),
@@ -1833,7 +1833,7 @@ void XclImpNoteObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject&
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpControlHelper::XclImpControlHelper( const XclImpRoot& rRoot, XclCtrlBindMode eBindMode ) :
     mrRoot( rRoot ),
@@ -2011,7 +2011,7 @@ void XclImpControlHelper::ReadRangeList( ScRangeList& rScRanges, XclImpStream& r
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpTbxObjBase::XclImpTbxObjBase( const XclImpRoot& rRoot ) :
     XclImpTextObj( rRoot ),
@@ -2107,7 +2107,7 @@ void XclImpTbxObjBase::DoPreProcessSdrObj( XclImpDffConverter& /*rDffConv*/, Sdr
     ProcessControl( *this );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpButtonObj::XclImpButtonObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot )
@@ -2171,7 +2171,7 @@ XclTbxEventType XclImpButtonObj::DoGetEventType() const
     return EXC_TBX_EVENT_ACTION;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpCheckBoxObj::XclImpCheckBoxObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot ),
@@ -2260,7 +2260,7 @@ XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const
     return EXC_TBX_EVENT_ACTION;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpOptionButtonObj::XclImpOptionButtonObj( const XclImpRoot& rRoot ) :
     XclImpCheckBoxObj( rRoot ),
@@ -2351,7 +2351,7 @@ XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const
     return EXC_TBX_EVENT_ACTION;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpLabelObj::XclImpLabelObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot )
@@ -2382,7 +2382,7 @@ XclTbxEventType XclImpLabelObj::DoGetEventType() const
     return EXC_TBX_EVENT_MOUSE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpGroupBoxObj::XclImpGroupBoxObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot ),
@@ -2431,7 +2431,7 @@ XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const
     return EXC_TBX_EVENT_MOUSE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpDialogObj::XclImpDialogObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot )
@@ -2455,7 +2455,7 @@ XclTbxEventType XclImpDialogObj::DoGetEventType() const
     return EXC_TBX_EVENT_MOUSE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpEditObj::XclImpEditObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot ),
@@ -2529,7 +2529,7 @@ XclTbxEventType XclImpEditObj::DoGetEventType() const
     return EXC_TBX_EVENT_TEXT;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpTbxObjScrollableBase::XclImpTbxObjScrollableBase( const XclImpRoot& rRoot ) :
     XclImpTbxObjBase( rRoot ),
@@ -2565,7 +2565,7 @@ void XclImpTbxObjScrollableBase::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpSpinButtonObj::XclImpSpinButtonObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjScrollableBase( rRoot )
@@ -2604,7 +2604,7 @@ XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const
     return EXC_TBX_EVENT_VALUE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpScrollBarObj::XclImpScrollBarObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjScrollableBase( rRoot )
@@ -2646,7 +2646,7 @@ XclTbxEventType XclImpScrollBarObj::DoGetEventType() const
     return EXC_TBX_EVENT_VALUE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpTbxObjListBase::XclImpTbxObjListBase( const XclImpRoot& rRoot ) :
     XclImpTbxObjScrollableBase( rRoot ),
@@ -2678,7 +2678,7 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const
         GetFontBuffer().WriteDefaultCtrlFontProperties( rPropSet );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpListBoxObj::XclImpListBoxObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjListBase( rRoot )
@@ -2765,7 +2765,7 @@ XclTbxEventType XclImpListBoxObj::DoGetEventType() const
     return EXC_TBX_EVENT_CHANGE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpDropDownObj::XclImpDropDownObj( const XclImpRoot& rRoot ) :
     XclImpTbxObjListBase( rRoot ),
@@ -2861,7 +2861,7 @@ XclTbxEventType XclImpDropDownObj::DoGetEventType() const
     return (GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX) ? EXC_TBX_EVENT_TEXT : EXC_TBX_EVENT_CHANGE;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpPictureObj::XclImpPictureObj( const XclImpRoot& rRoot ) :
     XclImpRectObj( rRoot ),
@@ -3235,7 +3235,7 @@ void XclImpSolverContainer::UpdateConnection( sal_uInt32 nDffShapeId, SdrObject*
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpSimpleDffConverter::XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
     SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 24, 0 ),
@@ -3268,7 +3268,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData(
     mbHasCtrlForm( false )
 {
 }
-// ----------------------------------------------------------------------------
+
 
 XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) :
     XclImpSimpleDffConverter( rRoot, rDffStrm ),
@@ -4100,7 +4100,7 @@ void XclImpDrawing::ReadTxo( XclImpStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpSheetDrawing::XclImpSheetDrawing( const XclImpRoot& rRoot, SCTAB nScTab ) :
     XclImpDrawing( rRoot, true ),
diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx
index 894aedce8177..867f27de9561 100644
--- a/sc/source/filter/excel/xiformula.cxx
+++ b/sc/source/filter/excel/xiformula.cxx
@@ -38,13 +38,13 @@ public:
 
     const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr );
 
-    // ------------------------------------------------------------------------
+
 private:
     XclFunctionProvider maFuncProv;     /// Excel function data provider.
     const XclBiff       meBiff;         /// Cached BIFF version to save GetBiff() calls.
 };
 
-// ----------------------------------------------------------------------------
+
 
 XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot ),
@@ -89,7 +89,7 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula(
     return pArray;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpFormulaCompiler::XclImpFormulaCompiler( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index d101a9ddf02e..d708f7c4e86b 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -51,7 +51,7 @@ inline void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nX
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclImpAddressConverter::XclImpAddressConverter( const XclImpRoot& rRoot ) :
     XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetScMaxPos() )
@@ -263,7 +263,7 @@ XclImpHFConverter::XclImpHFPortionInfo::XclImpHFPortionInfo() :
     maSel.nStartPos = maSel.nEndPos = 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpHFConverter::XclImpHFConverter( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot ),
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index a33da234a82a..4f62ad14c83d 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -157,7 +157,7 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti )
     return rStrm >> rXti.mnSupbook >> rXti.mnSBTabFirst >> rXti.mnSBTabLast;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Implementation of the link manager. */
 class XclImpLinkManagerImpl : protected XclImpRoot
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 58575e581325..6f8094365dd3 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -267,7 +267,7 @@ void XclImpName::InsertName(const ScTokenArray* pArray)
         mpScData = pData;               // cache for later use
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx
index 561121c7e846..086dba9cb61b 100644
--- a/sc/source/filter/excel/xipage.cxx
+++ b/sc/source/filter/excel/xipage.cxx
@@ -170,7 +170,7 @@ void XclImpPageSettings::SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait
     mbValidPaper = true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx
index 2ea0ed44d0dc..01a7d545f27b 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1356,7 +1356,7 @@ void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm )
     rStrm >> maPTViewEx9Info;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpPivotTable::Convert()
 {
@@ -1628,7 +1628,7 @@ void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm )
         maPTables.back()->ReadSxViewEx9( rStrm );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm )
 {
diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx
index 5e7f6ee8e704..187509b07714 100644
--- a/sc/source/filter/excel/xiroot.cxx
+++ b/sc/source/filter/excel/xiroot.cxx
@@ -52,7 +52,7 @@ XclImpRootData::~XclImpRootData()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) :
     XclRoot( rImpRootData ),
diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx
index bc57e556d623..6bb02077fb17 100644
--- a/sc/source/filter/excel/xistream.cxx
+++ b/sc/source/filter/excel/xistream.cxx
@@ -106,7 +106,7 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte
     return nRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) :
     mnKey( nKey ),
@@ -197,7 +197,7 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal
     return nRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ],
         sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) :
@@ -513,7 +513,7 @@ void XclImpStream::EnableDecryption( bool bEnable )
     mbUseDecr = bEnable && HasValidDecrypter();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpStream::PushPosition()
 {
@@ -605,7 +605,7 @@ sal_uInt16 XclImpStream::PeekRecId( sal_Size nPos )
     return nRecId;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpStream& XclImpStream::operator>>( sal_Int8& rnValue )
 {
@@ -873,7 +873,7 @@ void XclImpStream::Ignore( sal_Size nBytes )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Size XclImpStream::ReadUniStringExtHeader(
         bool& rb16Bit, bool& rbRich, bool& rbFareast,
@@ -896,7 +896,7 @@ sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags )
     return ReadUniStringExtHeader( rb16Bit, bRich, bFareast, nCrun, nExtInf, nFlags );
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit )
 {
@@ -1009,7 +1009,7 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars )
     IgnoreUniString( nChars, ReaduInt8() );
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars )
 {
diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index d44057514670..e25838cfc86d 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -27,7 +27,7 @@
 /** All allowed flags for import. */
 const XclStrFlags nAllowedFlags = EXC_STR_8BITLENGTH | EXC_STR_SMARTFLAGS | EXC_STR_SEPARATEFORMATS;
 
-// ----------------------------------------------------------------------------
+
 
 XclImpString::XclImpString()
 {
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index c569ce83f05a..324f33e80f93 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -482,7 +482,7 @@ void XclImpFont::GuessScriptType()
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot ),
@@ -719,7 +719,7 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags )
 {
@@ -794,7 +794,7 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo
     ScfTools::PutItem( rItemSet, SvxFrameDirectionItem( GetScFrameDir(), ATTR_WRITINGDIR ), bSkipPoolDefs );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpCellBorder::XclImpCellBorder()
 {
@@ -960,7 +960,7 @@ void XclImpCellBorder::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette&
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpCellArea::XclImpCellArea()
 {
@@ -1048,7 +1048,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 XclImpXF::XclImpXF( const XclImpRoot& rRoot ) :
     XclXFBase( true ),      // default is cell XF
@@ -1401,7 +1401,7 @@ void XclImpXF::SetUsedFlags( sal_uInt8 nUsedFlags )
     mbAreaUsed   = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_AREA ));
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpStyle::XclImpStyle( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot ),
@@ -1495,7 +1495,7 @@ void XclImpStyle::CreateUserStyle( const OUString& rFinalName )
         CreateStyleSheet();
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpXFBuffer::XclImpXFBuffer( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
@@ -1660,7 +1660,7 @@ bool XclImpXFRange::Expand( const XclImpXFRange& rNextRange )
     return false;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex )
 {
@@ -1672,7 +1672,7 @@ void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex )
     maIndexList.push_back( new XclImpXFRange( 0, MAXROW, rXFIndex ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex )
 {
@@ -1824,7 +1824,7 @@ void XclImpXFRangeColumn::TryConcatPrev( sal_uLong nIndex )
         maIndexList.erase( maIndexList.begin() + nIndex );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclImpXFRangeBuffer::XclImpXFRangeBuffer( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx
index 57f028e4bc5e..282c0d9d10e7 100644
--- a/sc/source/filter/excel/xiview.cxx
+++ b/sc/source/filter/excel/xiview.cxx
@@ -83,7 +83,7 @@ long lclGetScZoom( sal_uInt16 nXclZoom, sal_uInt16 nDefZoom )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclImpTabViewSettings::XclImpTabViewSettings( const XclImpRoot& rRoot ) :
     XclImpRoot( rRoot )
diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx
index ffc06a095c42..19e32972a97b 100644
--- a/sc/source/filter/excel/xladdress.cxx
+++ b/sc/source/filter/excel/xladdress.cxx
@@ -42,7 +42,7 @@ void XclAddress::Write( XclExpStream& rStrm, bool bCol16Bit ) const
         rStrm << static_cast< sal_uInt8 >( mnCol );
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool XclRange::Contains( const XclAddress& rPos ) const
 {
@@ -73,7 +73,7 @@ void XclRange::Write( XclExpStream& rStrm, bool bCol16Bit ) const
         rStrm << static_cast< sal_uInt8 >( maFirst.mnCol ) << static_cast< sal_uInt8 >( maLast.mnCol );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclRange XclRangeList::GetEnclosingRange() const
 {
diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx
index 0f238a7cf873..dbfedce07f6f 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -71,7 +71,7 @@ XclChRectangle::XclChRectangle() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChDataPointPos::XclChDataPointPos( sal_uInt16 nSeriesIdx, sal_uInt16 nPointIdx ) :
     mnSeriesIdx( nSeriesIdx ),
@@ -85,7 +85,7 @@ bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR )
         ((rL.mnSeriesIdx == rR.mnSeriesIdx) && (rL.mnPointIdx < rR.mnPointIdx));
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChFrBlock::XclChFrBlock( sal_uInt16 nType ) :
     mnType( nType ),
@@ -103,7 +103,7 @@ XclChFramePos::XclChFramePos() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChLineFormat::XclChLineFormat() :
     maColor( COL_BLACK ),
@@ -113,7 +113,7 @@ XclChLineFormat::XclChLineFormat() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChAreaFormat::XclChAreaFormat() :
     maPattColor( COL_WHITE ),
@@ -123,7 +123,7 @@ XclChAreaFormat::XclChAreaFormat() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChEscherFormat::XclChEscherFormat()
 {
@@ -133,7 +133,7 @@ XclChEscherFormat::~XclChEscherFormat()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChPicFormat::XclChPicFormat() :
     mnBmpMode( EXC_CHPICFORMAT_NONE ),
@@ -142,7 +142,7 @@ XclChPicFormat::XclChPicFormat() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChFrame::XclChFrame() :
     mnFormat( EXC_CHFRAME_STANDARD ),
@@ -167,14 +167,14 @@ XclChObjectLink::XclChObjectLink() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChFrLabelProps::XclChFrLabelProps() :
     mnFlags( 0 )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChText::XclChText() :
     maTextColor( COL_BLACK ),
@@ -198,7 +198,7 @@ XclChMarkerFormat::XclChMarkerFormat() :
 {
 };
 
-// ----------------------------------------------------------------------------
+
 
 XclCh3dDataFormat::XclCh3dDataFormat() :
     mnBase( EXC_CH3DDATAFORMAT_RECT ),
@@ -206,7 +206,7 @@ XclCh3dDataFormat::XclCh3dDataFormat() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChDataFormat::XclChDataFormat() :
     mnFormatIdx( EXC_CHDATAFORMAT_DEFAULT ),
@@ -214,7 +214,7 @@ XclChDataFormat::XclChDataFormat() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChSerTrendLine::XclChSerTrendLine() :
     mfForecastFor( 0.0 ),
@@ -231,7 +231,7 @@ XclChSerTrendLine::XclChSerTrendLine() :
     pDouble->w32_parts.msw = pDouble->w32_parts.lsw = 0xFFFFFFFF;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChSerErrorBar::XclChSerErrorBar() :
     mfValue( 0.0 ),
@@ -242,7 +242,7 @@ XclChSerErrorBar::XclChSerErrorBar() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChSeries::XclChSeries() :
     mnCategType( EXC_CHSERIES_NUMERIC ),
@@ -267,7 +267,7 @@ XclChType::XclChType() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChChart3d::XclChChart3d() :
     mnRotation( 20 ),
@@ -280,7 +280,7 @@ XclChChart3d::XclChChart3d() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChLegend::XclChLegend() :
     mnDockMode( EXC_CHLEGEND_RIGHT ),
@@ -290,7 +290,7 @@ XclChLegend::XclChLegend() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChTypeGroup::XclChTypeGroup() :
     mnFlags( 0 ),
@@ -298,7 +298,7 @@ XclChTypeGroup::XclChTypeGroup() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChProperties::XclChProperties() :
     mnFlags( 0 ),
@@ -316,7 +316,7 @@ XclChLabelRange::XclChLabelRange() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChDateRange::XclChDateRange() :
     mnMinDate( 0 ),
@@ -334,7 +334,7 @@ XclChDateRange::XclChDateRange() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChValueRange::XclChValueRange() :
     mfMin( 0.0 ),
@@ -348,7 +348,7 @@ XclChValueRange::XclChValueRange() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChTick::XclChTick() :
     maTextColor( COL_BLACK ),
@@ -361,7 +361,7 @@ XclChTick::XclChTick() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChAxis::XclChAxis() :
     mnType( EXC_CHAXIS_NONE )
@@ -380,7 +380,7 @@ sal_Int32 XclChAxis::GetApiAxisDimension() const
     return nApiAxisDim;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChAxesSet::XclChAxesSet() :
     mnAxesSetId( EXC_CHAXESSET_PRIMARY )
@@ -492,7 +492,7 @@ static const XclChFormatInfo spFmtInfos[] =
 
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChFormatInfoProvider::XclChFormatInfoProvider()
 {
@@ -561,7 +561,7 @@ void XclChExtTypeInfo::Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool
     mbSpline = bSpline;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclChTypeInfoProvider::XclChTypeInfoProvider()
 {
@@ -694,7 +694,7 @@ const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "Fill
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclChPropSetHelper::XclChPropSetHelper() :
     maLineHlpCommon( sppcLineNamesCommon ),
@@ -1273,7 +1273,7 @@ EXC_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclChRootData::XclChRootData() :
     mxTypeInfoProv( new XclChTypeInfoProvider ),
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 56fbb5587169..ce0ec44064ae 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -134,7 +134,7 @@ sal_uInt16 lclGetEmbeddedScale( long nPageSize, sal_Int32 nPageScale, long nPos,
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclObjAnchor::XclObjAnchor() :
     mnLX( 0 ),
@@ -206,7 +206,7 @@ void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32
         Set( 0, 0, 0, 0 );
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclObjLineData::XclObjLineData() :
     mnColorIdx( EXC_OBJ_LINE_AUTOCOLOR ),
@@ -225,7 +225,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData )
         >> rLineData.mnAuto;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclObjFillData::XclObjFillData() :
     mnBackColorIdx( EXC_OBJ_LINE_AUTOCOLOR ),
@@ -244,7 +244,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData )
         >> rFillData.mnAuto;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclObjTextData::XclObjTextData() :
     mnTextLen( 0 ),
diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx
index 4895721f96f7..967c96b83dbf 100644
--- a/sc/source/filter/excel/xlformula.cxx
+++ b/sc/source/filter/excel/xlformula.cxx
@@ -582,7 +582,7 @@ static const XclFunctionInfo saFuncTable_OOoLO[] =
 
 #undef EXC_FUNCENTRY_OOO
 
-// ----------------------------------------------------------------------------
+
 
 XclFunctionProvider::XclFunctionProvider( const XclRoot& rRoot )
 {
@@ -747,7 +747,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr
     return rStrm;
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclTokenArrayIterator::XclTokenArrayIterator() :
     mppScTokenBeg( 0 ),
diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx
index 29d78d8ff5cb..82935f4c2804 100644
--- a/sc/source/filter/excel/xlpivot.cxx
+++ b/sc/source/filter/excel/xlpivot.cxx
@@ -109,7 +109,7 @@ void XclPCItem::SetBool( bool bValue )
     mbValue = bValue;
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool XclPCItem::IsEqual( const XclPCItem& rItem ) const
 {
@@ -413,7 +413,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam
     return rStrm;
 }
 
-// ----------------------------------------------------------------------------
+
 
 const OUString* XclPTVisNameInfo::GetVisName() const
 {
diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx
index 18668912eba1..0b363995463e 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -75,7 +75,7 @@ XclDebugObjCounter::~XclDebugObjCounter()
 }
 #endif
 
-// ----------------------------------------------------------------------------
+
 
 XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium,
         SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) :
@@ -160,7 +160,7 @@ XclRootData::~XclRootData()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclRoot::XclRoot( XclRootData& rRootData ) :
     mrData( rRootData )
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 8439347af6d7..e3657b7c060b 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -85,7 +85,7 @@ static const ColorData spnDefColorTable8[] =
 #undef EXC_PALETTE_EGA_COLORS_LIGHT
 #undef EXC_PALETTE_EGA_COLORS_DARK
 
-// ----------------------------------------------------------------------------
+
 
 XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) :
     mpnColorTable( 0 ),
@@ -169,7 +169,7 @@ namespace AwtFontFamily    = Awt::FontFamily;
 namespace AwtFontUnderline = Awt::FontUnderline;
 namespace AwtFontStrikeout = Awt::FontStrikeout;
 
-// ----------------------------------------------------------------------------
+
 
 XclFontData::XclFontData()
 {
@@ -517,7 +517,7 @@ void XclFontData::SetApiStrikeout( sal_Int16 nApiStrikeout )
         (nApiStrikeout != AwtFontStrikeout::DONTKNOW);
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool operator==( const XclFontData& rLeft, const XclFontData& rRight )
 {
@@ -536,7 +536,7 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight )
         (rLeft.maName      == rRight.maName);
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -614,7 +614,7 @@ void lclWriteChartFont( ScfPropertySet& rPropSet,
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 XclFontPropSetHelper::XclFontPropSetHelper() :
     maHlpChCommon( sppcPropNamesChCommon ),
@@ -766,7 +766,7 @@ ScfPropSetHelper& XclFontPropSetHelper::GetChartHelper( sal_Int16 nScript )
 
 namespace {
 
-// ----------------------------------------------------------------------------
+
 
 /** Special number format index describing a reused format. */
 const NfIndexTableOffset PRV_NF_INDEX_REUSE = NF_INDEX_TABLE_ENTRIES;
@@ -778,7 +778,7 @@ const LanguageType PRV_LANGUAGE_FRENCH_PRIM = LANGUAGE_FRENCH & LANGUAGE_MASK_PR
 /** Parent language identifier for Asian languages. */
 const LanguageType PRV_LANGUAGE_ASIAN_PRIM = LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY;
 
-// ----------------------------------------------------------------------------
+
 
 /** Stores the number format used in Calc for an Excel built-in number format. */
 struct XclBuiltInFormat
@@ -789,7 +789,7 @@ struct XclBuiltInFormat
     sal_uInt16          mnXclReuseFmt;  /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE.
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Defines a literal Excel built-in number format. */
 #define EXC_NUMFMT_STRING( nXclNumFmt, pcUtf8 ) \
@@ -807,7 +807,7 @@ struct XclBuiltInFormat
 #define EXC_NUMFMT_ENDTABLE() \
     { EXC_FORMAT_NOTFOUND, 0, NF_NUMBER_STANDARD, 0 }
 
-// ----------------------------------------------------------------------------
+
 
 // Currency unit characters
 #define UTF8_BAHT       "\340\270\277"
@@ -837,7 +837,7 @@ struct XclBuiltInFormat
 #define UTF8_KO_MIN     "\353\266\204"
 #define UTF8_KO_SEC     "\354\264\210"
 
-// ----------------------------------------------------------------------------
+
 
 /** Default number format table. Last parent of all other tables, used for unknown languages. */
 static const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] =
@@ -1410,14 +1410,14 @@ static const XclBuiltInFormat spBuiltInFormats_THAI[] =
     EXC_NUMFMT_ENDTABLE()
 };
 
-// ----------------------------------------------------------------------------
+
 
 #undef EXC_NUMFMT_ENDTABLE
 #undef EXC_NUMFMT_REUSE
 #undef EXC_NUMFMT_OFFSET
 #undef EXC_NUMFMT_STRING
 
-// ----------------------------------------------------------------------------
+
 
 /** Specifies a number format table for a specific language. */
 struct XclBuiltInFormatTable
@@ -1471,7 +1471,7 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] =
     {   LANGUAGE_THAI,                  LANGUAGE_DONTKNOW,          spBuiltInFormats_THAI                   }
 };
 
-// ----------------------------------------------------------------------------
+
 
 } // namespace
 
@@ -1570,7 +1570,7 @@ bool operator==( const XclCellProt& rLeft, const XclCellProt& rRight )
     return (rLeft.mbLocked == rRight.mbLocked) && (rLeft.mbHidden == rRight.mbHidden);
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclCellAlign::XclCellAlign() :
     mnHorAlign( EXC_XF_HOR_GENERAL ),
@@ -1689,7 +1689,7 @@ bool operator==( const XclCellAlign& rLeft, const XclCellAlign& rRight )
         (rLeft.mbLineBreak == rRight.mbLineBreak) && (rLeft.mbShrink   == rRight.mbShrink);
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclCellBorder::XclCellBorder() :
     mnLeftColor( 0 ),
@@ -1718,7 +1718,7 @@ bool operator==( const XclCellBorder& rLeft, const XclCellBorder& rRight )
         (rLeft.mbDiagTLtoBR == rRight.mbDiagTLtoBR) && (rLeft.mbDiagBLtoTR  == rRight.mbDiagBLtoTR);
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclCellArea::XclCellArea() :
     mnForeColor( EXC_COLOR_WINDOWTEXT ),
@@ -1739,7 +1739,7 @@ bool operator==( const XclCellArea& rLeft, const XclCellArea& rRight )
         (rLeft.mnPattern == rRight.mnPattern);
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclXFBase::XclXFBase( bool bCellXF ) :
     mnParent( bCellXF ? EXC_XF_DEFAULTSTYLE : EXC_XF_STYLEPARENT ),
diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx
index a69c766928e5..6cb3c3e697f5 100644
--- a/sc/source/filter/excel/xlview.cxx
+++ b/sc/source/filter/excel/xlview.cxx
@@ -35,7 +35,7 @@ XclDocViewData::XclDocViewData() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 XclTabViewData::XclTabViewData() :
     maFirstXclPos( ScAddress::UNINITIALIZED ),
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index f9e4af0e1c83..01faa7c2dd8c 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -349,7 +349,7 @@ void ScHTMLExport::WriteHeader()
             sIndent, eDestEnc, &aNonConvertibleChars );
         OUT_LF();
 
-        //----------------------------------------------------------
+
         if (!xDocProps->getPrintedBy().isEmpty())
         {
             OUT_COMMENT( GLOBSTR( STR_DOC_INFO ) );
@@ -358,7 +358,7 @@ void ScHTMLExport::WriteHeader()
                 xDocProps->getPrintDate(), *ScGlobal::pLocaleData );
             OUT_COMMENT( aStrOut );
         }
-        //----------------------------------------------------------
+
     }
     OUT_LF();
 
@@ -762,7 +762,7 @@ void ScHTMLExport::WriteTables()
             }
         }
 
-        // -------------------
+
 
         // <TBODY> // Re-enable only when THEAD and TFOOT are exported
         // IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody );
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index 93c6e1e43c02..d0e69151c9f3 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -40,7 +40,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab,
         SCCOL nStartCol, SCROW nStartRow,   SCCOL nEndCol, SCROW nEndRow )
diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx
index 99544ba02368..496f57ba17b8 100644
--- a/sc/source/filter/html/htmlimp.cxx
+++ b/sc/source/filter/html/htmlimp.cxx
@@ -43,7 +43,7 @@
 #include "tokenarray.hxx"
 
 
-//------------------------------------------------------------------------
+
 
 FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc,
         ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, SvNumberFormatter* pFormatter,
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 2a9fceafe010..d50f35dba36b 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -1878,7 +1878,7 @@ private:
                             { if( pTable ) mpCurrTable = pTable; }
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScHTMLTableMap::ScHTMLTableMap( ScHTMLTable& rParentTable ) :
     mrParentTable(rParentTable),
@@ -1919,7 +1919,7 @@ ScHTMLTable* ScHTMLTableMap::CreateTable( const ImportInfo& rInfo, bool bPreForm
     return pTable;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Simplified forward iterator for convenience.
 
@@ -1964,7 +1964,7 @@ ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) :
     ++mrnUnusedId;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bool bPreFormText ) :
     mpParentTable( &rParentTable ),
@@ -2423,7 +2423,7 @@ SvNumberFormatter* ScHTMLTable::GetFormatTable()
     return mpParser->GetDoc().GetFormatTable();
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool ScHTMLTable::IsEmptyCell() const
 {
@@ -2715,7 +2715,7 @@ void ScHTMLTable::CalcNeededDocSize(
     SetDocSize( eOrient, nCellPos, nRealDocSize );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void ScHTMLTable::FillEmptyCells()
 {
@@ -3279,7 +3279,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString&) {}
 
 #endif
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo )
 {
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index 4892489e1541..dc0dcbaadc46 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -84,7 +84,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
     for( nLauf = 0 ; nLauf < nAnz ; nLauf++ )
         aStack >> eParam[ nLauf ];
 
-    // Spezialfaelle...
+    // special cases...
     switch( eOc )
     {
         case ocIndex:
@@ -118,7 +118,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
         case ocFind:
         case ocHLookup:
         case ocVLookup:
-        {// letzten Parameter ++
+        {// last parameter ++
             IncToken( eParam[ 0 ] );
         }
             break;
@@ -131,20 +131,18 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
             break;
         case ocZins:
         {
-            // neue Anzahl = 4!
+            // new quantity = 4!
             OSL_ENSURE( nAnz == 3,
                 "*LotusToSc::DoFunc(): ZINS() hat 3 Parameter!" );
             nAnz = 4;
             eParam[ 3 ] = eParam[ 0 ];  // 3. -> 1.
             eParam[ 0 ] = eParam[ 2 ];  // 1. -> 4.
             NegToken( eParam[ 1 ] );    // 2. -> -2. (+ 2. -> 3.)
-            eParam[ 2 ] = n0Token;      //    -> 2. als Default
+            eParam[ 2 ] = n0Token;      //    -> 2. as Default
         }
             break;
         default:;
     }
-    // ................
-
 
     if( !bAddIn )
         aPool << eOc;
@@ -153,7 +151,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
 
     if( nAnz > 0 )
     {
-            // ACHTUNG: 0 ist der letzte Parameter, nAnz-1 der erste
+            // ATTENTION: 0 is the last parameter, nAnz-1 the first one
 
         sal_Int16 nLast = nAnz - 1;
 
@@ -198,8 +196,6 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
 
     aPool << ocClose;
 
-    // ................
-
     aPool >> aStack;
 
     if( bNeg )
@@ -522,7 +518,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest,
                 break;
             case FT_NOP:
                 break;
-            // ------------------------------------------ fuer > WK3 -
+            // for > WK3
             case FT_Cref:
                 Read( nRelBits );
                 ReadSRD( rR, nRelBits );
@@ -688,7 +684,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
         FT_FuncFix1,        //   39 Sinus
         FT_FuncFix1,        //   40 Cosinus
         FT_FuncFix1,        //   41 Tangens
-        FT_FuncFix2,        //   42 Arcus-Tangens 2 (4.Quadrant)   <----- richtig? -
+        FT_FuncFix2,        //   42 Arcus-Tangens 2 (4.Quadrant) <- correct?
         FT_FuncFix1,        //   43 Arcus-Tangens (2.Quadrant)
         FT_FuncFix1,        //   44 Arcus-Sinus
         FT_FuncFix1,        //   45 Arcus-Cosinus
@@ -744,7 +740,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
         FT_FuncFix3,        //   95 ?
         FT_FuncFix3,        //   96 ?
         FT_FuncFix3,        //   97 ?
-        FT_FuncFix3,        //   98 Index()                         <- richtig? -
+        FT_FuncFix3,        //   98 Index() <- correct?
         FT_FuncFix1,        //   99 Cols()
         FT_FuncFix1,        //  100 Rows()
         FT_FuncFix2,        //  101 Repeat()
@@ -758,7 +754,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex )
         FT_FuncFix1,        //  109 Trim()
         FT_FuncFix1,        //  110 Clean()
         FT_FuncFix1,        //  111 F()
-        FT_FuncFix1,        //  112 Wert() (oder W()?)
+        FT_FuncFix1,        //  112 Wert() (or W()?)
         FT_FuncFix2,        //  113 Exact()
         FT_NotImpl,         //  114 Call()
         FT_FuncFix1,        //  115 @@()
@@ -1203,16 +1199,16 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
         FT_Op,              //   23 Groesser-gleich
         FT_Op,              //   24 Kleiner
         FT_Op,              //   25 Groesser
-        FT_Op,              //   26 And (logisch)
-        FT_Op,              //   27 Or (logisch)
-        FT_FuncFix1,        //   28 Not (logisch)
-        FT_NOP,             //   29 unaeres Plus
+        FT_Op,              //   26 And (logical)
+        FT_Op,              //   27 Or (logical)
+        FT_FuncFix1,        //   28 Not (logical)
+        FT_NOP,             //   29 unary plus
         FT_Op,              //   30 Concatenation
         FT_FuncFix0,        //   31 Not applicable
         FT_FuncFix0,        //   32 Error
-        FT_FuncFix1,        //   33 Betrag ABS()
-        FT_FuncFix1,        //   34 Ganzzahl INT()
-        FT_FuncFix1,        //   35 Quadratwurzel
+        FT_FuncFix1,        //   33 Absolute value ABS()
+        FT_FuncFix1,        //   34 Integer INT()
+        FT_FuncFix1,        //   35 Square root
         FT_FuncFix1,        //   36 Zehnerlogarithmus
         FT_FuncFix1,        //   37 Natuerlicher Logarithmus
         FT_FuncFix0,        //   38 PI
@@ -1225,7 +1221,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
         FT_FuncFix1,        //   45 Arcus-Cosinus
         FT_FuncFix1,        //   46 Exponentialfunktion
         FT_FuncFix2,        //   47 Modulo
-        FT_FuncVar,         //   48 Auswahl
+        FT_FuncVar,         //   48 Selection
         FT_FuncFix1,        //   49 Is not applicable?
         FT_FuncFix1,        //   50 Is Error?
         FT_FuncFix0,        //   51 FALSE
@@ -1268,81 +1264,81 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
         FT_FuncVar,         //   88 Std()
         FT_FuncFix2,        //   89 Irr()
         FT_FuncFix3,        //   90 Hlookup()
-        FT_FuncVar,         //   91 Dsum                 <-------- neu! -
-        FT_FuncVar,         //   92 Davg                 <-------- neu! -
-        FT_FuncVar,         //   93 Dcnt                 <-------- neu! -
-        FT_FuncVar,         //   94 Dmin                 <-------- neu! -
-        FT_FuncVar,         //   95 Dmax                 <-------- neu! -
-        FT_FuncVar,         //   96 Dvar                 <-------- neu! -
-        FT_FuncVar,         //   97 Dstd                 <-------- neu! -
-        FT_FuncVar,         //   98 Index()              <-------- change! -
-        FT_FuncFix1,        //   99 Cols()               <-------- neu! -
-        FT_FuncFix1,        //  100 Rows()               <-------- neu! -
-        FT_FuncFix2,        //  101 Repeat()             <-------- neu! -
-        FT_FuncFix1,        //  102 Upper()              <-------- neu! -
-        FT_FuncFix1,        //  103 Lower()              <-------- neu! -
-        FT_FuncFix2,        //  104 Left()               <-------- neu! -
-        FT_FuncFix2,        //  105 Right()              <-------- neu! -
-        FT_FuncFix4,        //  106 Replace()            <-------- neu! -
-        FT_FuncFix1,        //  107 Proper()             <-------- neu! -
-        FT_FuncFix2,        //  108 Cell()               <-------- neu! -
-        FT_FuncFix1,        //  109 Trim()               <-------- neu! -
-        FT_FuncFix1,        //  110 Clean()              <-------- neu! -
-        FT_FuncFix1,        //  111 S()                  <--------- change in Bez. -
-        FT_FuncFix1,        //  112 N()                  <--------- change in Bez. -
-        FT_FuncFix2,        //  113 Exact()              <-------- neu! -
-        FT_NotImpl,         //  114 App                  <--------- change in Bez. -
-        FT_FuncFix1,        //  115 @@()                 <-------- neu! -
-        FT_FuncFix3,        //  116 Rate()               <-------- neu! -
-        FT_FuncFix3,        //  117 Term()               <--------- change in Anz.
-        FT_FuncFix3,        //  118 Cterm()              <--------- change in Anz.
-        FT_FuncFix3,        //  119 Sln()                <-------- neu! -
-        FT_FuncFix4,        //  120 Syd()                <-------- neu! -
-        FT_FuncFix4,        //  121 Ddb()                <-------- neu! -
-        FT_Splfunc,         //  122 Splfunc              <-------- neu! -
-        FT_FuncFix1,        //  123 Sheets               <-------- neu! -
-        FT_FuncFix1,        //  124 Info                 <-------- neu! -
-        FT_FuncVar,         //  125 Sumproduct           <-------- neu! -
-        FT_FuncFix1,        //  126 Isrange              <-------- neu! -
-        FT_FuncVar,         //  127 Dget                 <-------- neu! -
-        FT_FuncVar,         //  128 Dquery               <-------- neu! -
-        FT_FuncFix4,        //  129 Coord                <-------- neu! -
-        FT_NOP,             //  130 Reserved (internal)  <-------- neu! -
-        FT_FuncFix0,        //  131 Today                <-------- neu! -
-        FT_FuncVar,         //  132 Vdb                  <-------- neu! -
-        FT_FuncVar,         //  133 Dvars                <-------- neu! -
-        FT_FuncVar,         //  134 Dstds                <-------- neu! -
-        FT_FuncVar,         //  135 Vars                 <-------- neu! -
-        FT_FuncVar,         //  136 Stds                 <-------- neu! -
-        FT_FuncFix2,        //  137 D360                 <-------- neu! -
-        FT_NOP,             //  138 Reserved (internal)  <-------- neu! -
-        FT_FuncFix0,        //  139 Isapp                <-------- neu! - Anzahl ? -
-        FT_FuncVar,         //  140 Isaaf                <-------- neu! - Anzahl ? -
-        FT_FuncFix1,        //  141 Weekday              <-------- neu! -
-        FT_FuncFix3,        //  142 Datedif              <-------- neu! -
-        FT_FuncVar,         //  143 Rank                 <-------- neu! -
-        FT_FuncFix2,        //  144 Numberstring         <-------- neu! -
-        FT_FuncFix1,        //  145 Datestring           <-------- neu! -
-        FT_FuncFix1,        //  146 Decimal              <-------- neu! -
-        FT_FuncFix1,        //  147 Hex                  <-------- neu! -
-        FT_FuncFix4,        //  148 Db                   <-------- neu! -
-        FT_FuncFix4,        //  149 Pmti                 <-------- neu! -
-        FT_FuncFix4,        //  150 Spi                  <-------- neu! -
-        FT_FuncFix1,        //  151 Fullp                <-------- neu! -
-        FT_FuncFix1,        //  152 Halfp                <-------- neu! -
-        FT_FuncVar,         //  153 Pureavg              <-------- neu! -
-        FT_FuncVar,         //  154 Purecount            <-------- neu! -
-        FT_FuncVar,         //  155 Puremax              <-------- neu! -
-        FT_FuncVar,         //  156 Puremin              <-------- neu! -
-        FT_FuncVar,         //  157 Purestd              <-------- neu! -
-        FT_FuncVar,         //  158 Purevar              <-------- neu! -
-        FT_FuncVar,         //  159 Purestds             <-------- neu! -
-        FT_FuncVar,         //  160 Purevars             <-------- neu! -
-        FT_FuncFix3,        //  161 Pmt2                 <-------- neu! -
-        FT_FuncFix3,        //  162 Pv2                  <-------- neu! -
-        FT_FuncFix3,        //  163 Fv2                  <-------- neu! -
-        FT_FuncFix3,        //  164 Term2                <-------- neu! -
-        FT_NotImpl,         //  165 ---                  <-------- neu! - Anzahl ? -
+        FT_FuncVar,         //   91 Dsum                 <- new
+        FT_FuncVar,         //   92 Davg                 <- new
+        FT_FuncVar,         //   93 Dcnt                 <- new
+        FT_FuncVar,         //   94 Dmin                 <- new
+        FT_FuncVar,         //   95 Dmax                 <- new
+        FT_FuncVar,         //   96 Dvar                 <- new
+        FT_FuncVar,         //   97 Dstd                 <- new
+        FT_FuncVar,         //   98 Index()              <- change!
+        FT_FuncFix1,        //   99 Cols()               <- new
+        FT_FuncFix1,        //  100 Rows()               <- new
+        FT_FuncFix2,        //  101 Repeat()             <- new
+        FT_FuncFix1,        //  102 Upper()              <- new
+        FT_FuncFix1,        //  103 Lower()              <- new
+        FT_FuncFix2,        //  104 Left()               <- new
+        FT_FuncFix2,        //  105 Right()              <- new
+        FT_FuncFix4,        //  106 Replace()            <- new
+        FT_FuncFix1,        //  107 Proper()             <- new
+        FT_FuncFix2,        //  108 Cell()               <- new
+        FT_FuncFix1,        //  109 Trim()               <- new
+        FT_FuncFix1,        //  110 Clean()              <- new
+        FT_FuncFix1,        //  111 S()                  <- change in Bez.
+        FT_FuncFix1,        //  112 N()                  <- change in Bez.
+        FT_FuncFix2,        //  113 Exact()              <- new
+        FT_NotImpl,         //  114 App                  <- change in Bez.
+        FT_FuncFix1,        //  115 @@()                 <- new
+        FT_FuncFix3,        //  116 Rate()               <- new
+        FT_FuncFix3,        //  117 Term()               <- change in Anz.
+        FT_FuncFix3,        //  118 Cterm()              <- change in Anz.
+        FT_FuncFix3,        //  119 Sln()                <- new
+        FT_FuncFix4,        //  120 Syd()                <- new
+        FT_FuncFix4,        //  121 Ddb()                <- new
+        FT_Splfunc,         //  122 Splfunc              <- new
+        FT_FuncFix1,        //  123 Sheets               <- new
+        FT_FuncFix1,        //  124 Info                 <- new
+        FT_FuncVar,         //  125 Sumproduct           <- new
+        FT_FuncFix1,        //  126 Isrange              <- new
+        FT_FuncVar,         //  127 Dget                 <- new
+        FT_FuncVar,         //  128 Dquery               <- new
+        FT_FuncFix4,        //  129 Coord                <- new
+        FT_NOP,             //  130 Reserved (internal)  <- new
+        FT_FuncFix0,        //  131 Today                <- new
+        FT_FuncVar,         //  132 Vdb                  <- new
+        FT_FuncVar,         //  133 Dvars                <- new
+        FT_FuncVar,         //  134 Dstds                <- new
+        FT_FuncVar,         //  135 Vars                 <- new
+        FT_FuncVar,         //  136 Stds                 <- new
+        FT_FuncFix2,        //  137 D360                 <- new
+        FT_NOP,             //  138 Reserved (internal)  <- new
+        FT_FuncFix0,        //  139 Isapp                <- new quantity ?
+        FT_FuncVar,         //  140 Isaaf                <- new quantity ?
+        FT_FuncFix1,        //  141 Weekday              <- new
+        FT_FuncFix3,        //  142 Datedif              <- new
+        FT_FuncVar,         //  143 Rank                 <- new
+        FT_FuncFix2,        //  144 Numberstring         <- new
+        FT_FuncFix1,        //  145 Datestring           <- new
+        FT_FuncFix1,        //  146 Decimal              <- new
+        FT_FuncFix1,        //  147 Hex                  <- new
+        FT_FuncFix4,        //  148 Db                   <- new
+        FT_FuncFix4,        //  149 Pmti                 <- new
+        FT_FuncFix4,        //  150 Spi                  <- new
+        FT_FuncFix1,        //  151 Fullp                <- new
+        FT_FuncFix1,        //  152 Halfp                <- new
+        FT_FuncVar,         //  153 Pureavg              <- new
+        FT_FuncVar,         //  154 Purecount            <- new
+        FT_FuncVar,         //  155 Puremax              <- new
+        FT_FuncVar,         //  156 Puremin              <- new
+        FT_FuncVar,         //  157 Purestd              <- new
+        FT_FuncVar,         //  158 Purevar              <- new
+        FT_FuncVar,         //  159 Purestds             <- new
+        FT_FuncVar,         //  160 Purevars             <- new
+        FT_FuncFix3,        //  161 Pmt2                 <- new
+        FT_FuncFix3,        //  162 Pv2                  <- new
+        FT_FuncFix3,        //  163 Fv2                  <- new
+        FT_FuncFix3,        //  164 Term2                <- new
+        FT_NotImpl,         //  165--                    <- new quantity ?
         FT_FuncFix2,        //  166 D360 (US-Version)
         FT_NotImpl,         //  167
         FT_NotImpl,         //  168
@@ -1363,7 +1359,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
         FT_NotImpl,         //  183
         FT_NotImpl,         //  184
         FT_NotImpl,         //  185
-        FT_FuncVar,         //  186 Solver               <-------- neu! -
+        FT_FuncVar,         //  186 Solver               <- new
         FT_NotImpl,         //  187
         FT_NotImpl,         //  188
         FT_NotImpl,         //  189
@@ -1441,7 +1437,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex )
 DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
 {
     static const DefTokenId pToken[ 256 ] =
-    {                       // Code Bezeichnung
+    {                       // Code Description
         ocPush,             //    0 8-Byte-IEEE-Long-Numbers
         ocPush,             //    1 Variable
         ocPush,             //    2 Bereich
@@ -1462,8 +1458,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
         ocMul,              //   17 Multiplikation
         ocDiv,              //   18 Division
         ocPow,              //   19 Potenzierung
-        ocEqual,            //   20 Gleichheit
-        ocNotEqual,         //   21 Ungleich
+        ocEqual,            //   20 Equality
+        ocNotEqual,         //   21 Inequality
         ocLessEqual,        //   22 Kleiner-gleich
         ocGreaterEqual,     //   23 Groesser-gleich
         ocLess,             //   24 Kleiner
@@ -1480,7 +1476,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
         ocSqrt,             //   35 Quadratwurzel
         ocLog10,            //   36 Zehnerlogarithmus
         ocLn,               //   37 Natuerlicher Logarithmus
-        ocPi,               //   38 PI
+        ocPi,               //   38 Pi
         ocSin,              //   39 Sinus
         ocCos,              //   40 Cosinus
         ocTan,              //   41 Tangens
@@ -1490,7 +1486,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
         ocArcCos,           //   45 Arcus-Cosinus
         ocExp,              //   46 Exponentialfunktion
         ocMod,              //   47 Modulo
-        ocChose,            //   48 Auswahl
+        ocChose,            //   48 Selection
         ocIsNA,             //   49 Is not available?
         ocIsError,          //   50 Is Error?
         ocFalse,            //   51 FALSE
@@ -1501,17 +1497,17 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
         ocRMZ,              //   56 Payment
         ocBW,               //   57 Present Value
         ocZW,               //   58 Future Value
-        ocIf,               //   59 If ... then ... else ...
+        ocIf,               //   59 If... then... else...
         ocGetDay,           //   60 Tag des Monats
-        ocGetMonth,         //   61 Monat
-        ocGetYear,          //   62 Jahr
-        ocRound,            //   63 Runden
-        ocGetTime,          //   64 Zeit
-        ocGetHour,          //   65 Stunde
+        ocGetMonth,         //   61 Month
+        ocGetYear,          //   62 Year
+        ocRound,            //   63 Round
+        ocGetTime,          //   64 Time
+        ocGetHour,          //   65 Hour
         ocGetMin,           //   66 Minute
-        ocGetSec,           //   67 Sekunde
-        ocIsValue,          //   68 Ist Zahl?
-        ocIsString,         //   69 Ist Text?
+        ocGetSec,           //   67 Second
+        ocIsValue,          //   68 Is number?
+        ocIsString,         //   69 Is text?
         ocLen,              //   70 Len()
         ocValue,            //   71 Val()
         ocFixed,            //   72 String()    ocFixed ersatzweise + Spezialfall
@@ -1607,7 +1603,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex )
         ocNoName,           //  162 Pv2
         ocNoName,           //  163 Fv2
         ocNoName,           //  164 Term2
-        ocNoName,           //  165 ---                  <-------- neu! - Anzahl ? -
+        ocNoName,           //  165--                  <- new quantity ?
         ocGetDiffDate360,   //  166 D360 (US-Version, ersatzweise wie ander D360-Funktion)
         ocNoName,           //  167
         ocNoName,           //  168
@@ -1714,7 +1710,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
         NULL,                       //    1 Variable
         NULL,                       //    2 Bereich
         NULL,                       //    3 return
-        NULL,                       //    4 Klammer
+        NULL,                       //    4 Bracket
         NULL,                       //    5 2-Byte-Integer
         NULL,                       //    6 ASCII-String
         NULL,                       //    7 Named range reference
@@ -1864,7 +1860,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
         NULL,                       //  151 Fullp
         NULL,                       //  152 Halfp
         "PURMITTELWERT",            //  153 Pureavg
-        "PURANZAHL",                //  154 Purecount
+        "PURquantity",                //  154 Purecount
         "PURMAX",                   //  155 Puremax
         "PURMIN",                   //  156 Puremin
         "PURSTDABW",                //  157 Purestd
@@ -1875,7 +1871,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n )
         NULL,                       //  162 Pv2
         NULL,                       //  163 Fv2
         NULL,                       //  164 Term2
-        NULL,                       //  165 ---                  <-------- neu! - Anzahl ? -
+        NULL,                       //  165--                  <- new quantity ?
         NULL,                       //  166 D360 (US-Version, ersatzweise wie ander D360-Funktion)
         NULL,                       //  167
         NULL,                       //  168
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index db31966a7ba2..4538ba078b88 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -69,7 +69,7 @@ FltError ImportLotus::Read()
 
         switch( eAkt )
         {
-            // -----------------------------------------------------------
+
             case S_START:                                           // S_START
             if( nOp )
             {
@@ -99,10 +99,10 @@ FltError ImportLotus::Read()
                 }
             }
             break;
-            // -----------------------------------------------------------
+
             case S_WK1:                                             // S_WK1
             break;
-            // -----------------------------------------------------------
+
             case S_WK3:                                             // S_WK3
             case S_WK4:                                             // S_WK4
             switch( nOp )
@@ -180,10 +180,10 @@ FltError ImportLotus::Read()
             }
 
             break;
-            // -----------------------------------------------------------
+
             case S_FM3:                                             // S_FM3
             break;
-            // -----------------------------------------------------------
+
             case S_END:                                             // S_END
             break;
         }
diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx
index eb6621a0100e..2514ede2c917 100644
--- a/sc/source/filter/lotus/lotus.cxx
+++ b/sc/source/filter/lotus/lotus.cxx
@@ -27,7 +27,7 @@
 #include "filtopt.hxx"
 #include "ftools.hxx"
 
-//------------------------------------------------------------------------
+
 
 extern FltError ScImportLotus123old( SvStream&, ScDocument*, rtl_TextEncoding eSrc );
         // alter Krempel in filter.cxx!
diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx
index 59028bacd59d..cac8530468b3 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -163,7 +163,7 @@ AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) :
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool AddressConverter::parseOoxAddress2d(
         sal_Int32& ornColumn, sal_Int32& ornRow,
@@ -309,7 +309,7 @@ bool AddressConverter::parseOoxRange2d(
     return false;
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool AddressConverter::checkCol( sal_Int32 nCol, bool bTrackOverflow )
 {
@@ -335,7 +335,7 @@ bool AddressConverter::checkTab( sal_Int16 nSheet, bool bTrackOverflow )
     return bValid;
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool AddressConverter::checkCellAddress( const CellAddress& rAddress, bool bTrackOverflow )
 {
@@ -418,7 +418,7 @@ CellAddress AddressConverter::createValidCellAddress(
     return aAddress;
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool AddressConverter::checkCellRange( const CellRangeAddress& rRange, bool bAllowOverflow, bool bTrackOverflow )
 {
@@ -477,7 +477,7 @@ bool AddressConverter::convertToCellRange( CellRangeAddress& orRange,
     return validateCellRange( orRange, bAllowOverflow, bTrackOverflow );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AddressConverter::validateCellRangeList( ApiCellRangeList& orRanges, bool bTrackOverflow )
 {
diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 3b98ba7a591e..12193a0a5200 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -59,7 +59,7 @@ const sal_uInt8 BIFF_FILTER_DATATYPE_BOOLEAN        = 8;
 const sal_uInt8 BIFF_FILTER_DATATYPE_EMPTY          = 12;
 const sal_uInt8 BIFF_FILTER_DATATYPE_NOTEMPTY       = 14;
 
-// ----------------------------------------------------------------------------
+
 
 bool lclGetApiOperatorFromToken( sal_Int32& rnApiOperator, sal_Int32 nToken )
 {
@@ -381,7 +381,7 @@ void FilterCriterionModel::readBiffData( SequenceInputStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 CustomFilter::CustomFilter( const WorkbookHelper& rHelper ) :
     FilterSettingsBase( rHelper ),
diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx
index 51e9fce72d76..9e44c140e4c8 100644
--- a/sc/source/filter/oox/biffcodec.cxx
+++ b/sc/source/filter/oox/biffcodec.cxx
@@ -148,7 +148,7 @@ sal_Int32 lclGetRcfOffset( sal_Int64 nStreamPos )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) :
     BiffDecoderBase(),  // must be called to prevent compiler warning
@@ -231,7 +231,7 @@ void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper )
diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx
index e9489d7a320d..7a4218e18c4a 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -92,7 +92,7 @@ CommentModel::CommentModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 Comment::Comment( const WorksheetHelper& rHelper ) :
     WorksheetHelper( rHelper )
diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx
index d14ff5dc465d..a3c17e0dd3a2 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -120,7 +120,7 @@ const sal_uInt16 BIFF12_CFRULE_ABOVEAVERAGE         = 0x0004;
 const sal_uInt16 BIFF12_CFRULE_BOTTOM               = 0x0008;
 const sal_uInt16 BIFF12_CFRULE_PERCENT              = 0x0010;
 
-// ----------------------------------------------------------------------------
+
 
 template< typename Type >
 void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& rPropName, const Type& rValue )
@@ -130,7 +130,7 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString&
     orProps.back().Value <<= rValue;
 }
 
-//------------------------------------------------------------------------------
+
 
 void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs )
 {
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx
index 9f81107d342a..631a333cbf72 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -84,7 +84,7 @@ WebPrModel::WebPrModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ConnectionModel::ConnectionModel() :
     mnId( -1 ),
@@ -110,7 +110,7 @@ WebPrModel& ConnectionModel::createWebPr()
     return *mxWebPr;
 }
 
-// ----------------------------------------------------------------------------
+
 
 Connection::Connection( const WorkbookHelper& rHelper, sal_Int32 nConnId ) :
     WorkbookHelper( rHelper )
diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx
index 94203a852c7f..ef142cfaa2eb 100644
--- a/sc/source/filter/oox/defnamesbuffer.cxx
+++ b/sc/source/filter/oox/defnamesbuffer.cxx
@@ -63,7 +63,7 @@ const sal_uInt16 BIFF_REFFLAG_ROW1REL       = 0x0002;
 const sal_uInt16 BIFF_REFFLAG_COL2REL       = 0x0004;
 const sal_uInt16 BIFF_REFFLAG_ROW2REL       = 0x0008;
 
-// ----------------------------------------------------------------------------
+
 
 const sal_Char* const spcOoxPrefix = "_xlnm.";
 
diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx
index bbfd7537ccfa..0661e32a3dbe 100644
--- a/sc/source/filter/oox/drawingbase.cxx
+++ b/sc/source/filter/oox/drawingbase.cxx
@@ -63,7 +63,7 @@ CellAnchorModel::CellAnchorModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 AnchorClientDataModel::AnchorClientDataModel() :
     mbLocksWithSheet( true ),
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index a3ca08f9425b..890a6ff0d9c1 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -320,7 +320,7 @@ private:
     sal_Int32           mnRow;
 };
 
-// ----------------------------------------------------------------------------
+
 
 VmlFindNoteFunc::VmlFindNoteFunc( const CellAddress& rPos ) :
     mnCol( rPos.Column ),
diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx
index 819270548c47..7e61c72131c0 100644
--- a/sc/source/filter/oox/excelfilter.cxx
+++ b/sc/source/filter/oox/excelfilter.cxx
@@ -64,7 +64,7 @@ Reference< XInterface > ExcelFilter_create(
     return static_cast< ::cppu::OWeakObject* >( new ExcelFilter( rxContext ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) :
     XmlFilterBase( rxContext ),
diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx
index 406781bf4ebd..df1a8cb6a065 100644
--- a/sc/source/filter/oox/excelhandlers.cxx
+++ b/sc/source/filter/oox/excelhandlers.cxx
@@ -56,7 +56,7 @@ BiffContextHandler::~BiffContextHandler()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) :
     WorksheetHelper( rHelper )
@@ -95,7 +95,7 @@ BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelpe
         getCodecHelper().cloneDecoder( getInputStream() );
 }
 
-// ----------------------------------------------------------------------------
+
 
 } // namespace xls
 } // namespace oox
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index c454ae89682d..e4e5d00b9732 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -640,7 +640,7 @@ void RefSheetsModel::readBiff12Data( SequenceInputStream& rStrm )
     rStrm >> mnExtRefId >> mnTabId1 >> mnTabId2;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ExternalLinkBuffer::ExternalLinkBuffer( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 0fd11295274a..c66dfc4160ba 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -119,7 +119,7 @@ void BinSingleRef2d::readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffs
     setBiff8Data( nCol, nRow, bRelativeAsOffset );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void BinComplexRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset )
 {
@@ -912,7 +912,7 @@ static const FunctionData saFuncTableOOoLO[] =
     // Other functions.
     { "ORG.OPENOFFICE.CONVERT",     "ORG.OPENOFFICE.CONVERT",   NOID,   NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW }
 };
-// ----------------------------------------------------------------------------
+
 
 const sal_Unicode API_TOKEN_OPEN            = '(';
 const sal_Unicode API_TOKEN_CLOSE           = ')';
@@ -988,7 +988,7 @@ private:
                             sal_uInt8 nMaxParam, bool bImportFilter, FilterType eFilter );
 };
 
-// ----------------------------------------------------------------------------
+
 
 FunctionProviderImpl::FunctionProviderImpl( FilterType eFilter, BiffType eBiff, bool bImportFilter,
         bool bCallerKnowsAboutMacroExport )
@@ -1101,7 +1101,7 @@ void FunctionProviderImpl::initFuncs( const FunctionData* pBeg, const FunctionDa
             initFunc( *pIt, nMaxParam );
 }
 
-// ----------------------------------------------------------------------------
+
 
 FunctionProvider::FunctionProvider( FilterType eFilter, BiffType eBiff, bool bImportFilter,
         bool bCallerKnowsAboutMacroExport ) :
@@ -1185,7 +1185,7 @@ private:
     bool                initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, const ApiTokenMap& rExtFuncTokenMap, const FunctionInfoVector& rFuncInfos );
 };
 
-// ----------------------------------------------------------------------------
+
 
 OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos,
         const Reference< XMultiServiceFactory >& rxModelFactory )
@@ -1440,7 +1440,7 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c
     return bIsValid;
 }
 
-// ----------------------------------------------------------------------------
+
 
 OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxModelFactory,
         FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) :
@@ -1580,7 +1580,7 @@ TokenToRangeListState lclProcessClose( sal_Int32& ornParenLevel )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) :
     OpCodeProvider( rHelper.getBaseFilter().getModelFactory(), rHelper.getFilterType(), rHelper.getBiff(), rHelper.getBaseFilter().isImportFilter() ),
@@ -1589,7 +1589,7 @@ FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString FormulaProcessorBase::generateAddress2dString( const CellAddress& rAddress, bool bAbsolute )
 {
@@ -1611,7 +1611,7 @@ OUString FormulaProcessorBase::generateAddress2dString( const BinAddress& rAddre
     return aBuffer.makeStringAndClear();
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString FormulaProcessorBase::generateApiString( const OUString& rString )
 {
@@ -1649,7 +1649,7 @@ OUString FormulaProcessorBase::generateApiArray( const Matrix< Any >& rMatrix )
     return aBuffer.makeStringAndClear();
 }
 
-// ----------------------------------------------------------------------------
+
 
 Any FormulaProcessorBase::extractReference( const ApiTokenSequence& rTokens ) const
 {
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index f6f2948e9042..25c0a260ae4d 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -573,7 +573,7 @@ private:
     WhiteSpaceVec       maClosingSpaces;            /// List of whitespaces before closing parenthesis.
 };
 
-// ----------------------------------------------------------------------------
+
 
 FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) :
     FormulaFinalizer( rParent ),
@@ -1290,7 +1290,7 @@ private:
     bool                mbNeedExtRefs;      /// True = parser needs initialization of external reference info.
 };
 
-// ----------------------------------------------------------------------------
+
 
 OoxFormulaParserImpl::OoxFormulaParserImpl( const FormulaParser& rParent ) :
     FormulaParserImpl( rParent ),
@@ -1842,7 +1842,7 @@ bool lclIsValidNlrRange( const BiffNlr& rNlr, const BinRange& rRange, bool bRow
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 class BiffFormulaParserImpl : public FormulaParserImpl
 {
@@ -1919,7 +1919,7 @@ private:
     bool                pushBiffFunction( sal_uInt16 nFuncId );
     bool                pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nParamCount );
 
-    // ------------------------------------------------------------------------
+
 private:
     typedef bool (BiffFormulaParserImpl::*ImportTokenFunc)( BiffInputStream& );
     typedef bool (BiffFormulaParserImpl::*ImportRefTokenFunc)( BiffInputStream&, bool, bool );
@@ -1947,7 +1947,7 @@ private:
     sal_uInt16          mnRefIdSize;                /// Size of unused data following a reference identifier.
 };
 
-// ----------------------------------------------------------------------------
+
 
 BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) :
     FormulaParserImpl( rParent ),
@@ -2764,7 +2764,7 @@ bool lclExtractRefId( sal_Int32& rnRefId, OUString& rRemainder, const OUString&
 
 }
 
-// ----------------------------------------------------------------------------
+
 
 FormulaParser::FormulaParser( const WorkbookHelper& rHelper ) :
     FormulaProcessorBase( rHelper )
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 84f44a220d45..8ec1cf59590b 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -435,7 +435,7 @@ struct BuiltinFormat
 #define UTF8_KO_MIN         "\353\266\204"
 #define UTF8_KO_SEC         "\354\264\210"
 
-// ----------------------------------------------------------------------------
+
 
 /** Default number format table. Last parent of all other tables, used for unknown locales. */
 static const BuiltinFormat spBuiltinFormats_BASE[] =
@@ -533,7 +533,7 @@ static const BuiltinFormat spBuiltinFormats_BASE[] =
     NUMFMT_ENDTABLE()
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Arabic, U.A.E. */
 static const BuiltinFormat spBuiltinFormats_ar_AE[] =
@@ -1634,7 +1634,7 @@ static const BuiltinFormat spBuiltinFormats_zh_TW[] =
     NUMFMT_ENDTABLE()
 };
 
-// ----------------------------------------------------------------------------
+
 
 /** Specifies a built-in number format table for a specific locale. */
 struct BuiltinFormatTable
@@ -1802,14 +1802,14 @@ NumFmtModel::NumFmtModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiNumFmtData::ApiNumFmtData() :
     mnIndex( 0 )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1861,7 +1861,7 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts,
     return nIndex;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Functor for converting an XML number format to an API number format index. */
 class NumberFormatFinalizer
@@ -1893,7 +1893,7 @@ NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) :
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 NumberFormat::NumberFormat( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper )
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index fac24f25416b..7f7a7ddb1a92 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -51,7 +51,7 @@ private:
     ApiParserWrapper    maApiParser;
 };
 
-// ----------------------------------------------------------------------------
+
 
 OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) :
     FormulaFinalizer( OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ),
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 90dc156b0fa7..d474de7d3eea 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -342,7 +342,7 @@ enum HFPortionId
     HF_COUNT
 };
 
-// ----------------------------------------------------------------------------
+
 
 struct HFPortionInfo
 {
@@ -441,7 +441,7 @@ private:
     FontModel           maFontModel;            /// Font attributes of current text range.
 };
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -468,7 +468,7 @@ static const sal_Char* const sppcItalicNames[] =
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
@@ -881,7 +881,7 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion )
 
 // ============================================================================
 
-// ----------------------------------------------------------------------------
+
 
 PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_Int32 nRightPropId ) :
     mnLeftPropId( nLeftPropId ),
@@ -894,7 +894,7 @@ PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_In
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PageSettingsConverter::PageSettingsConverter( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index 8b3c15559ab2..c09abc4ae584 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -102,7 +102,7 @@ const sal_uInt8 BIFF12_PCDEFINITION_SUPPORTDRILL    = 0x08;
 const sal_uInt8 BIFF12_PCDWBSOURCE_HASRELID         = 0x01;
 const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET         = 0x02;
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt16 BIFF_PC_NOSTRING                   = 0xFFFF;
 
@@ -127,7 +127,7 @@ const sal_uInt16 BIFF_PCDEFINITION_OPTIMIZEMEMORY   = 0x0008;
 const sal_uInt16 BIFF_PCDEFINITION_BACKGROUNDQUERY  = 0x0010;
 const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH    = 0x0020;
 
-// ----------------------------------------------------------------------------
+
 
 /** Adjusts the weird date format read from binary streams.
 
@@ -305,7 +305,7 @@ OUString PivotCacheItem::getName() const
     return OUString();
 }
 
-// ----------------------------------------------------------------------------
+
 
 PivotCacheItemList::PivotCacheItemList( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper )
@@ -439,7 +439,7 @@ PCFieldModel::PCFieldModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PCSharedItemsModel::PCSharedItemsModel() :
     mbHasSemiMixed( true ),
@@ -455,7 +455,7 @@ PCSharedItemsModel::PCSharedItemsModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PCFieldGroupModel::PCFieldGroupModel() :
     mfStartValue( 0.0 ),
@@ -478,7 +478,7 @@ void PCFieldGroupModel::setBiffGroupBy( sal_uInt8 nGroupBy )
     mnGroupBy = STATIC_ARRAY_SELECT( spnGroupBy, nGroupBy, XML_range );
 }
 
-// ----------------------------------------------------------------------------
+
 
 PivotCacheField::PivotCacheField( const WorkbookHelper& rHelper, bool bIsDatabaseField ) :
     WorkbookHelper( rHelper ),
@@ -1053,7 +1053,7 @@ PCDefinitionModel::PCDefinitionModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PCSourceModel::PCSourceModel() :
     mnSourceType( XML_TOKEN_INVALID ),
@@ -1061,14 +1061,14 @@ PCSourceModel::PCSourceModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PCWorksheetSourceModel::PCWorksheetSourceModel()
 {
     maRange.StartColumn = maRange.StartRow = maRange.EndColumn = maRange.EndRow = -1;
 }
 
-// ----------------------------------------------------------------------------
+
 
 PivotCache::PivotCache( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx
index 4ae3e1adeb3d..0b1bee51db88 100644
--- a/sc/source/filter/oox/pivotcachefragment.cxx
+++ b/sc/source/filter/oox/pivotcachefragment.cxx
@@ -340,7 +340,7 @@ bool lclSeekToPCDField( BiffInputStream& rStrm )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 BiffPivotCacheFragment::BiffPivotCacheFragment(
         const WorkbookHelper& rHelper, const OUString& rStrmName, PivotCache& rPivotCache ) :
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index c0e73ba00bac..0579cd322180 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -70,7 +70,7 @@ const sal_Int32 OOX_PT_DATALAYOUTFIELD              = -2;           /// Placehol
 const sal_Int32 OOX_PT_PREVIOUS_ITEM                = 0x001000FC;   /// Calculation of data item result is based on previous item.
 const sal_Int32 OOX_PT_NEXT_ITEM                    = 0x001000FD;   /// Calculation of data item result is based on next item.
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt32 BIFF12_PTFIELD_DATAFIELD           = 0x00000008;
 const sal_uInt32 BIFF12_PTFIELD_DEFAULT             = 0x00000100;
@@ -176,7 +176,7 @@ void PTFieldItemModel::setBiffType( sal_uInt16 nType )
     mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_data );
 }
 
-// ----------------------------------------------------------------------------
+
 
 PTFieldModel::PTFieldModel() :
     mnAxis( XML_TOKEN_INVALID ),
@@ -224,7 +224,7 @@ void PTFieldModel::setBiffAxis( sal_uInt8 nAxis )
     mnAxis = STATIC_ARRAY_SELECT( spnAxisIds, nAxis, XML_TOKEN_INVALID );
 }
 
-// ----------------------------------------------------------------------------
+
 
 PTPageFieldModel::PTPageFieldModel() :
     mnField( -1 ),
@@ -232,7 +232,7 @@ PTPageFieldModel::PTPageFieldModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PTDataFieldModel::PTDataFieldModel() :
     mnField( -1 ),
@@ -256,7 +256,7 @@ void PTDataFieldModel::setBiffShowDataAs( sal_Int32 nShowDataAs )
     mnShowDataAs = STATIC_ARRAY_SELECT( spnShowDataAs, nShowDataAs, XML_TOKEN_INVALID );
 }
 
-// ----------------------------------------------------------------------------
+
 
 PivotTableField::PivotTableField( PivotTable& rPivotTable, sal_Int32 nFieldIndex ) :
     WorkbookHelper( rPivotTable ),
@@ -762,7 +762,7 @@ PTFilterModel::PTFilterModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PivotTableFilter::PivotTableFilter( const PivotTable& rPivotTable ) :
     WorkbookHelper( rPivotTable ),
@@ -902,7 +902,7 @@ PTDefinitionModel::PTDefinitionModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PTLocationModel::PTLocationModel() :
     mnFirstHeaderRow( 0 ),
@@ -913,7 +913,7 @@ PTLocationModel::PTLocationModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 PivotTable::PivotTable( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx
index d4d489b6e79a..feaecbbaa25c 100644
--- a/sc/source/filter/oox/querytablebuffer.cxx
+++ b/sc/source/filter/oox/querytablebuffer.cxx
@@ -64,7 +64,7 @@ const sal_uInt32 BIFF12_QUERYTABLE_APPLYBORDER      = 0x00020000;
 const sal_uInt32 BIFF12_QUERYTABLE_APPLYFILL        = 0x00040000;
 const sal_uInt32 BIFF12_QUERYTABLE_APPLYPROTECTION  = 0x00080000;
 
-// ----------------------------------------------------------------------------
+
 
 void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTableName )
 {
@@ -152,7 +152,7 @@ QueryTableModel::QueryTableModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 QueryTable::QueryTable( const WorksheetHelper& rHelper ) :
     WorksheetHelper( rHelper )
diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx
index 98c47f12aa2d..5a73c08f5d19 100644
--- a/sc/source/filter/oox/richstring.cxx
+++ b/sc/source/filter/oox/richstring.cxx
@@ -157,7 +157,7 @@ void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, con
         pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT);
 }
 
-// ----------------------------------------------------------------------------
+
 
 void FontPortionModel::read( SequenceInputStream& rStrm )
 {
@@ -165,7 +165,7 @@ void FontPortionModel::read( SequenceInputStream& rStrm )
     mnFontId = rStrm.readuInt16();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void FontPortionModelList::appendPortion( const FontPortionModel& rPortion )
 {
@@ -213,7 +213,7 @@ void PhoneticDataModel::setBiffData( sal_Int32 nType, sal_Int32 nAlignment )
     mnAlignment = STATIC_ARRAY_SELECT( spnAlignments, nAlignment, XML_left );
 }
 
-// ----------------------------------------------------------------------------
+
 
 PhoneticSettings::PhoneticSettings( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper )
@@ -270,7 +270,7 @@ void RichStringPhonetic::setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd )
     mnBaseEnd = nBaseEnd;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void PhoneticPortionModel::read( SequenceInputStream& rStrm )
 {
@@ -279,7 +279,7 @@ void PhoneticPortionModel::read( SequenceInputStream& rStrm )
     mnBaseLen = rStrm.readuInt16();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void PhoneticPortionModelList::appendPortion( const PhoneticPortionModel& rPortion )
 {
diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx
index cbe5672d154b..ed8801e4108a 100644
--- a/sc/source/filter/oox/scenariobuffer.cxx
+++ b/sc/source/filter/oox/scenariobuffer.cxx
@@ -50,7 +50,7 @@ ScenarioCellModel::ScenarioCellModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScenarioModel::ScenarioModel() :
     mbLocked( false ),
@@ -58,7 +58,7 @@ ScenarioModel::ScenarioModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet ) :
     WorkbookHelper( rHelper ),
@@ -166,7 +166,7 @@ SheetScenariosModel::SheetScenariosModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 SheetScenarios::SheetScenarios( const WorkbookHelper& rHelper, sal_Int16 nSheet ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index 70787add172f..b4839b2c96dc 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -77,7 +77,7 @@ CellModel::CellModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 CellFormulaModel::CellFormulaModel() :
     mnFormulaType( XML_TOKEN_INVALID ),
@@ -101,7 +101,7 @@ bool CellFormulaModel::isValidSharedRef( const CellAddress& rCellAddr )
         (maFormulaRef.StartRow <= rCellAddr.Row) && (rCellAddr.Row <= maFormulaRef.EndRow);
 }
 
-// ----------------------------------------------------------------------------
+
 
 DataTableModel::DataTableModel() :
     mb2dTable( false ),
@@ -551,7 +551,7 @@ bool SheetDataBuffer::MergedRange::tryExpand( const CellAddress& rAddress, sal_I
     return false;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SheetDataBuffer::setCellFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens )
 {
diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx
index cd0a43e5c347..13bc1f8be438 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -206,7 +206,7 @@ const sal_uInt8 BIFF_FONTUNDERL_DOUBLE      = 2;
 const sal_uInt8 BIFF_FONTUNDERL_SINGLE_ACC  = 33;
 const sal_uInt8 BIFF_FONTUNDERL_DOUBLE_ACC  = 34;
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm )
 {
@@ -397,7 +397,7 @@ static const sal_Int32 spnDefColors8[] =
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 ColorPalette::ColorPalette( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper )
@@ -491,7 +491,7 @@ void lclSetFontName( ApiScriptFontName& rFontName, const FontDescriptor& rFontDe
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 FontModel::FontModel() :
     mnScheme( XML_none ),
@@ -543,7 +543,7 @@ void FontModel::setBiffEscapement( sal_uInt16 nEscapement )
     mnEscapement = STATIC_ARRAY_SELECT( spnEscapes, nEscapement, XML_baseline );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) :
     mbNameUsed( bAllUsed ),
@@ -560,7 +560,7 @@ ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiScriptFontName::ApiScriptFontName() :
     mnFamily( ::com::sun::star::awt::FontFamily::DONTKNOW ),
@@ -568,7 +568,7 @@ ApiScriptFontName::ApiScriptFontName() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiFontData::ApiFontData() :
     maDesc(
@@ -1146,7 +1146,7 @@ void AlignmentModel::setBiffVerAlign( sal_uInt8 nVerAlign )
     mnVerAlign = STATIC_ARRAY_SELECT( spnVerAligns, nVerAlign, XML_bottom );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiAlignmentData::ApiAlignmentData() :
     meHorJustify( ::com::sun::star::table::CellHoriJustify_STANDARD ),
@@ -1399,7 +1399,7 @@ ProtectionModel::ProtectionModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiProtectionData::ApiProtectionData() :
     maCellProt( sal_True, sal_False, sal_False, sal_False )
@@ -1478,7 +1478,7 @@ void BorderLineModel::setBiffStyle( sal_Int32 nLineStyle )
     mnStyle = STATIC_ARRAY_SELECT( spnStyleIds, nLineStyle, XML_none );
 }
 
-// ----------------------------------------------------------------------------
+
 
 BorderModel::BorderModel( bool bDxf ) :
     maLeft( bDxf ),
@@ -1491,7 +1491,7 @@ BorderModel::BorderModel( bool bDxf ) :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiBorderData::ApiBorderData() :
     mbBorderUsed( false ),
@@ -1548,7 +1548,7 @@ inline void lclSetBorderLineWidth( BorderLine& rBorderLine,
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 Border::Border( const WorkbookHelper& rHelper, bool bDxf ) :
     WorkbookHelper( rHelper ),
@@ -1780,7 +1780,7 @@ void PatternFillModel::setBiffPattern( sal_Int32 nPattern )
     mnPattern = STATIC_ARRAY_SELECT( spnPatternIds, nPattern, XML_none );
 }
 
-// ----------------------------------------------------------------------------
+
 
 GradientFillModel::GradientFillModel() :
     mnType( XML_linear ),
@@ -1817,7 +1817,7 @@ void GradientFillModel::readGradientStop( SequenceInputStream& rStrm, bool bDxf
         maColors[ fPosition ] = aColor;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ApiSolidFillData::ApiSolidFillData() :
     mnColor( API_RGB_TRANSPARENT ),
@@ -1853,7 +1853,7 @@ sal_Int32 lclGetMixedColor( sal_Int32 nPattColor, sal_Int32 nFillColor, sal_Int3
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 Fill::Fill( const WorkbookHelper& rHelper, bool bDxf ) :
     WorkbookHelper( rHelper ),
@@ -2578,7 +2578,7 @@ OUString lclCreateStyleName( const CellStyleModel& rModel )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 CellStyleModel::CellStyleModel() :
     mnXfId( -1 ),
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 775458758d27..6428a627cd2f 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -50,7 +50,7 @@ const double MM100_PER_POINT        = MM100_PER_INCH / 72.0;
 const double MM100_PER_TWIP         = MM100_PER_POINT / 20.0;
 const double MM100_PER_EMU          = 1.0 / 360.0;
 
-// ----------------------------------------------------------------------------
+
 
 /** Returns true, if the passed year is a leap year. */
 inline bool lclIsLeapYear( sal_Int32 nYear )
@@ -93,7 +93,7 @@ sal_Int32 lclGetDays( const util::Date& rDate )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index 9d1fba171b46..62e5d437aec0 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -98,7 +98,7 @@ const sal_Int16 API_SPLITPANE_TOPRIGHT              = 1;        /// Top-right pa
 const sal_Int16 API_SPLITPANE_BOTTOMLEFT            = 2;        /// Bottom-left, bottom, left, or single pane.
 const sal_Int16 API_SPLITPANE_BOTTOMRIGHT           = 3;        /// Bottom-right, or right pane.
 
-// ----------------------------------------------------------------------------
+
 
 /** Returns the OOXML pane identifier from the passed BIFF pane id. */
 sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId )
@@ -116,7 +116,7 @@ PaneSelectionModel::PaneSelectionModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 SheetViewModel::SheetViewModel() :
     mnWorkbookViewId( 0 ),
@@ -184,7 +184,7 @@ PaneSelectionModel& SheetViewModel::createPaneSelection( sal_Int32 nPaneId )
     return *rxPaneSel;
 }
 
-// ----------------------------------------------------------------------------
+
 
 SheetViewSettings::SheetViewSettings( const WorksheetHelper& rHelper ) :
     WorksheetHelper( rHelper )
@@ -478,7 +478,7 @@ WorkbookViewModel::WorkbookViewModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ViewSettings::ViewSettings( const WorkbookHelper& rHelper ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx
index 32c8bd62cc19..8b5b2f93c52b 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -318,7 +318,7 @@ private:
     boost::scoped_ptr<ScDocumentImport> mxDocImport;
 };
 
-// ----------------------------------------------------------------------------
+
 
 WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) :
     mrBaseFilter( rFilter ),
diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx
index 0a560d1db56d..fb80cd6aea84 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -132,7 +132,7 @@ bool ColumnModel::isMergeable( const ColumnModel& rModel ) const
         (mbCollapsed            == rModel.mbCollapsed);
 }
 
-// ----------------------------------------------------------------------------
+
 
 RowModel::RowModel() :
     mnRow( -1 ),
@@ -167,7 +167,7 @@ bool RowModel::isMergeable( const RowModel& rModel ) const
         (mbCollapsed    == rModel.mbCollapsed);
 }
 
-// ----------------------------------------------------------------------------
+
 
 PageBreakModel::PageBreakModel() :
     mnColRow( 0 ),
@@ -175,13 +175,13 @@ PageBreakModel::PageBreakModel() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 HyperlinkModel::HyperlinkModel()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ValidationModel::ValidationModel() :
     mnType( XML_none ),
@@ -430,7 +430,7 @@ private:
     bool                mbHasDefWidth;      /// True = default column width is set from defaultColWidth attribute.
 };
 
-// ----------------------------------------------------------------------------
+
 
 WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) :
     WorkbookHelper( rHelper ),
diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx
index 864cf8b997f6..8e8240214031 100644
--- a/sc/source/filter/rtf/expbase.cxx
+++ b/sc/source/filter/rtf/expbase.cxx
@@ -22,7 +22,7 @@
 #include "editutil.hxx"
 
 
-//------------------------------------------------------------------
+
 
 ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP,
                 const ScRange& rRangeP )
diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx
index 65cb1d1158fd..a46410591b11 100644
--- a/sc/source/filter/starcalc/collect.cxx
+++ b/sc/source/filter/starcalc/collect.cxx
@@ -24,15 +24,15 @@
 #define MAXCOLLECTIONSIZE       16384
 #define MAXDELTA                1024
 
-// -----------------------------------------------------------------------
+
 
 ScDataObject::~ScDataObject()
 {
 }
 
-//------------------------------------------------------------------------
+
 // Collection
-//------------------------------------------------------------------------
+
 
 static void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount )
 {
@@ -71,17 +71,17 @@ ScCollection::ScCollection(const ScCollection& rCollection)
     *this = rCollection;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCollection::~ScCollection()
 {
     lcl_DeleteScDataObjects( pItems, nCount );
 }
 
-//------------------------------------------------------------------------
+
 sal_uInt16 ScCollection::GetCount() const { return nCount; }
 
-//------------------------------------------------------------------------
+
 
 bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject)
 {
@@ -106,14 +106,14 @@ bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject)
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScCollection::Insert(ScDataObject* pScDataObject)
 {
     return AtInsert(nCount, pScDataObject);
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataObject* ScCollection::At(sal_uInt16 nIndex) const
 {
@@ -123,7 +123,7 @@ ScDataObject* ScCollection::At(sal_uInt16 nIndex) const
         return NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScCollection::IndexOf(ScDataObject* pScDataObject) const
 {
@@ -135,7 +135,7 @@ sal_uInt16 ScCollection::IndexOf(ScDataObject* pScDataObject) const
     return nIndex;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCollection& ScCollection::operator=( const ScCollection& r )
 {
@@ -155,7 +155,7 @@ ScCollection& ScCollection::operator=( const ScCollection& r )
     return *this;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataObject*   ScCollection::Clone() const
 {
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 2fd9bd6ce399..870d80aaca81 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -400,9 +400,9 @@ template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStrea
     return nError;
 }
 
-//--------------------------------------------
+
 // Font
-//--------------------------------------------
+
 
 Sc10FontData::Sc10FontData(SvStream& rStream)
 {
@@ -440,9 +440,9 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) :
   }
 }
 
-//--------------------------------------------
+
 // Benannte-Bereiche
-//--------------------------------------------
+
 
 Sc10NameData::Sc10NameData(SvStream& rStream)
 {
@@ -484,9 +484,9 @@ Sc10NameCollection::Sc10NameCollection(SvStream& rStream) :
   }
 }
 
-//--------------------------------------------
+
 // Vorlagen
-//--------------------------------------------
+
 
 Sc10PatternData::Sc10PatternData(SvStream& rStream)
 {
@@ -528,9 +528,9 @@ Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) :
   }
 }
 
-//--------------------------------------------
+
 // Datenbank
-//--------------------------------------------
+
 
 Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream)
 {
@@ -896,9 +896,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
         pSet->Put(SfxBoolItem( ATTR_PAGE_HORCENTER, pPage->HorCenter ));
         pSet->Put(SfxBoolItem( ATTR_PAGE_VERCENTER, pPage->VerCenter ));
 
-        //----------------
+
         // Area-Parameter:
-        //----------------
+
         {
             ScRange* pRepeatRow = NULL;
             ScRange* pRepeatCol = NULL;
@@ -925,9 +925,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc )
             delete pRepeatCol;
         }
 
-        //-----------------
+
         // Table-Parameter:
-        //-----------------
+
         pSet->Put( SfxBoolItem( ATTR_PAGE_NOTES,   pPage->PrintNote ) );
         pSet->Put( SfxBoolItem( ATTR_PAGE_GRID,    pPage->PrintGrid ) );
         pSet->Put( SfxBoolItem( ATTR_PAGE_HEADERS, pPage->PrintColRow ) );
@@ -952,9 +952,9 @@ ScDataObject* Sc10PageData::Clone() const
 }
 
 
-//--------------------------------------------
+
 // Import
-//--------------------------------------------
+
 
 
 Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) :
@@ -1447,7 +1447,7 @@ void Sc10Import::LoadTables()
             nLen = sizeof(TabName) - 1;
         TabName[nLen] = 0;
 
-        //----------------------------------------------------------
+
         rStream.ReadUInt16( Display );
 
         if ( Tab == (sal_Int16)nShowTab )
@@ -1478,7 +1478,7 @@ void Sc10Import::LoadTables()
             aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW,  eObjMode );
         }
 
-        //--------------------------------------------------------------------
+
         rStream.ReadUChar( Visible );
 
         nError = rStream.GetError();
@@ -2420,7 +2420,7 @@ void Sc10Import::LoadObjects()
   }
 }
 
-//-----------------------------------------------------------------------------------------------
+
 
 FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument )
 {
diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
index 12e1ae97f0db..f4e4ff338590 100644
--- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx
@@ -19,7 +19,7 @@
 
 
 
-//___________________________________________________________________
+
 
 #include <stdio.h>
 #include <sot/storage.hxx>
@@ -57,7 +57,7 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime )
     return OString( sBuf );
 }
 
-//___________________________________________________________________
+
 // local functions
 
 static void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime )
@@ -98,7 +98,7 @@ static inline void lcl_WriteGUID( XclExpStream& rStrm, const sal_uInt8* pGUID )
     rStrm.SetSliceSize( 0 );
 }
 
-//___________________________________________________________________
+
 
 XclExpUserBView::XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ) :
     sUsername( rUsername )
@@ -133,7 +133,7 @@ sal_Size XclExpUserBView::GetLen() const
     return 50 + ((sUsername.Len() > 0) ? sUsername.GetSize() : 0);
 }
 
-//___________________________________________________________________
+
 
 XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack )
 {
@@ -161,7 +161,7 @@ void XclExpUserBViewList::Save( XclExpStream& rStrm )
         (*iter)->Save( rStrm );
 }
 
-//___________________________________________________________________
+
 
 XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ) :
     nCurrTab( nTab )
@@ -197,7 +197,7 @@ sal_Size XclExpUsersViewBegin::GetLen() const
     return 64;
 }
 
-//___________________________________________________________________
+
 
 void XclExpUsersViewEnd::SaveCont( XclExpStream& rStrm )
 {
@@ -214,7 +214,7 @@ sal_Size XclExpUsersViewEnd::GetLen() const
     return 2;
 }
 
-//___________________________________________________________________
+
 
 void XclExpChTr0x0191::SaveCont( XclExpStream& rStrm )
 {
@@ -231,7 +231,7 @@ sal_Size XclExpChTr0x0191::GetLen() const
     return 2;
 }
 
-//___________________________________________________________________
+
 
 void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm )
 {
@@ -249,7 +249,7 @@ sal_Size XclExpChTr0x0198::GetLen() const
     return 4;
 }
 
-//___________________________________________________________________
+
 
 void XclExpChTr0x0192::SaveCont( XclExpStream& rStrm )
 {
@@ -267,7 +267,7 @@ sal_Size XclExpChTr0x0192::GetLen() const
     return 512;
 }
 
-//___________________________________________________________________
+
 
 void XclExpChTr0x0197::SaveCont( XclExpStream& rStrm )
 {
@@ -284,7 +284,7 @@ sal_Size XclExpChTr0x0197::GetLen() const
     return 2;
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrEmpty::~XclExpChTrEmpty()
 {
@@ -300,7 +300,7 @@ sal_Size XclExpChTrEmpty::GetLen() const
     return 0;
 }
 
-//___________________________________________________________________
+
 
 XclExpChTr0x0195::~XclExpChTr0x0195()
 {
@@ -321,7 +321,7 @@ sal_Size XclExpChTr0x0195::GetLen() const
     return 162;
 }
 
-//___________________________________________________________________
+
 
 XclExpChTr0x0194::~XclExpChTr0x0194()
 {
@@ -345,7 +345,7 @@ sal_Size XclExpChTr0x0194::GetLen() const
     return 162;
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrHeader::~XclExpChTrHeader()
 {
@@ -394,7 +394,7 @@ void XclExpChTrHeader::SaveXml( XclExpXmlStream& rRevisionHeadersStrm )
     pHeaders->write( ">" );
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrInfo::~XclExpChTrInfo()
 {
@@ -451,7 +451,7 @@ void XclExpChTrInfo::SaveXml( XclExpXmlStream& rRevisionHeadersStrm )
     rRevisionHeadersStrm.PushStream( pRevisionLog );
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrTabIdBuffer::XclExpChTrTabIdBuffer( sal_uInt16 nCount ) :
     nBufSize( nCount ),
@@ -523,7 +523,7 @@ void XclExpChTrTabIdBuffer::Remove()
     nLastId--;
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrTabId::XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders )
     : nTabCount( rBuffer.GetBufferCount() )
@@ -590,7 +590,7 @@ void XclExpChTrTabId::SaveXml( XclExpXmlStream& rRevisionLogStrm )
     rRevisionLogStrm.PushStream( pRevisionLog );
 }
 
-//___________________________________________________________________
+
 
 // ! does not copy additional actions
 XclExpChTrAction::XclExpChTrAction( const XclExpChTrAction& rCopy ) :
@@ -694,7 +694,7 @@ sal_Size XclExpChTrAction::GetLen() const
     return GetHeaderByteCount() + GetActionByteCount();
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrData::XclExpChTrData() :
     pString( NULL ),
@@ -770,7 +770,7 @@ void XclExpChTrData::Write( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rT
     }
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrCellContent::XclExpChTrCellContent(
         const ScChangeActionContent& rAction,
@@ -1034,7 +1034,7 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& rRevisionLogStrm )
     pStream->endElement( XML_rcc );
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrInsert::XclExpChTrInsert(
         const ScChangeAction& rAction,
@@ -1142,7 +1142,7 @@ void XclExpChTrInsert::SaveXml( XclExpXmlStream& rRevisionLogStrm )
     pStream->endElement( XML_rrc );
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrInsertTab::XclExpChTrInsertTab(
         const ScChangeAction& rAction,
@@ -1192,7 +1192,7 @@ void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm )
             FSEND );
 }
 
-//___________________________________________________________________
+
 
 XclExpChTrMoveRange::XclExpChTrMoveRange(
         const ScChangeActionMove& rAction,
@@ -1271,7 +1271,7 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm )
     pStream->endElement( XML_rm );
 }
 
-//___________________________________________________________________
+
 
 XclExpChTr0x014A::XclExpChTr0x014A( const XclExpChTrInsert& rAction ) :
     XclExpChTrInsert( rAction )
@@ -1319,7 +1319,7 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm )
     pStream->endElement( XML_rfmt );
 }
 
-//___________________________________________________________________
+
 
 class ExcXmlRecord : public ExcRecord
 {
diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
index 4137aa86e20a..808f74cd6ea7 100644
--- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx
+++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx
@@ -30,7 +30,7 @@
 #include "externalrefmgr.hxx"
 #include "document.hxx"
 
-//___________________________________________________________________
+
 // class XclImpChangeTrack
 
 XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ) :
@@ -497,7 +497,7 @@ void XclImpChangeTrack::Apply()
     }
 }
 
-//___________________________________________________________________
+
 // class XclImpChTrFmlConverter
 
 XclImpChTrFmlConverter::~XclImpChTrFmlConverter()
diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
index c85644748435..fda87c52b59a 100644
--- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
+++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx
@@ -32,7 +32,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 9696efc91968..510b8dbe0e2a 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -20,7 +20,7 @@
 
 
 
-//___________________________________________________________________
+
 #include "XMLCellRangeSourceContext.hxx"
 
 #include <sax/tools/converter.hxx>
@@ -31,7 +31,7 @@
 using namespace ::com::sun::star;
 
 
-//___________________________________________________________________
+
 
 ScMyImpCellRangeSource::ScMyImpCellRangeSource() :
     nColumns( 0 ),
@@ -41,7 +41,7 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() :
 }
 
 
-//___________________________________________________________________
+
 
 ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext(
         ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx
index 245e2cbdc2eb..a6b7b66f0c68 100644
--- a/sc/source/filter/xml/XMLConsolidationContext.cxx
+++ b/sc/source/filter/xml/XMLConsolidationContext.cxx
@@ -20,7 +20,7 @@
 
 
 
-//___________________________________________________________________
+
 #include "XMLConsolidationContext.hxx"
 #include "document.hxx"
 #include "rangeutl.hxx"
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
 using namespace xmloff::token;
 
 
-//___________________________________________________________________
+
 
 ScXMLConsolidationContext::ScXMLConsolidationContext(
         ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx
index 4d8b7dbad014..b208c219be56 100644
--- a/sc/source/filter/xml/XMLConverter.cxx
+++ b/sc/source/filter/xml/XMLConverter.cxx
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
 using namespace xmloff::token;
 
 
-//___________________________________________________________________
+
 
 ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel )
 {
@@ -47,7 +47,7 @@ ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xMode
 }
 
 
-//___________________________________________________________________
+
 sheet::GeneralFunction ScXMLConverter::GetFunctionFromString( const OUString& sFunction )
 {
     if( IsXMLToken(sFunction, XML_SUM ) )
@@ -105,7 +105,7 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct
 }
 
 
-//___________________________________________________________________
+
 
 void ScXMLConverter::GetStringFromFunction(
         OUString& rString,
@@ -164,7 +164,7 @@ void ScXMLConverter::GetStringFromFunction(
 }
 
 
-//___________________________________________________________________
+
 
 sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString(
     const OUString& rString )
@@ -181,7 +181,7 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString(
 }
 
 
-//___________________________________________________________________
+
 
 void ScXMLConverter::GetStringFromOrientation(
     OUString& rString,
@@ -215,7 +215,7 @@ void ScXMLConverter::GetStringFromOrientation(
 }
 
 
-//___________________________________________________________________
+
 
 ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rString )
 {
@@ -246,7 +246,7 @@ bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUSt
 }
 
 
-//___________________________________________________________________
+
 
 void ScXMLConverter::GetStringFromDetObjType(
         OUString& rString,
@@ -301,7 +301,7 @@ void ScXMLConverter::GetStringFromDetOpType(
 }
 
 
-//___________________________________________________________________
+
 
 void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula)
 {
@@ -335,7 +335,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula)
 }
 
 
-//_____________________________________________________________________
+
 
 void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate)
 {
@@ -560,7 +560,7 @@ bool lclSkipEmptyParentheses( const sal_Unicode*& rpcString, const sal_Unicode*
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 void ScXMLConditionHelper::parseCondition(
         ScXMLConditionParseResult& rParseResult, const OUString& rAttribute, sal_Int32 nStartIndex )
diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx
index dbfe45d27f9c..4d69a920596f 100644
--- a/sc/source/filter/xml/XMLDDELinksContext.cxx
+++ b/sc/source/filter/xml/XMLDDELinksContext.cxx
@@ -31,7 +31,7 @@ using namespace com::sun::star;
 using namespace xmloff::token;
 
 
-//------------------------------------------------------------------
+
 
 ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx
index 5e88e781fbb1..fd7e78eea2a2 100644
--- a/sc/source/filter/xml/XMLDetectiveContext.cxx
+++ b/sc/source/filter/xml/XMLDetectiveContext.cxx
@@ -20,7 +20,7 @@
 
 
 
-//___________________________________________________________________
+
 #include "XMLDetectiveContext.hxx"
 
 #include <sax/tools/converter.hxx>
@@ -37,7 +37,7 @@ using namespace ::com::sun::star;
 using namespace xmloff::token;
 
 
-//___________________________________________________________________
+
 
 ScMyImpDetectiveObj::ScMyImpDetectiveObj() :
     aSourceRange(),
@@ -46,7 +46,7 @@ ScMyImpDetectiveObj::ScMyImpDetectiveObj() :
 {
 }
 
-//___________________________________________________________________
+
 
 bool ScMyImpDetectiveOp::operator<(const ScMyImpDetectiveOp& rDetOp) const
 {
@@ -69,7 +69,7 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp )
 }
 
 
-//___________________________________________________________________
+
 
 ScXMLDetectiveContext::ScXMLDetectiveContext(
         ScXMLImport& rImport,
@@ -113,7 +113,7 @@ void ScXMLDetectiveContext::EndElement()
 }
 
 
-//___________________________________________________________________
+
 
 ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext(
         ScXMLImport& rImport,
@@ -194,7 +194,7 @@ void ScXMLDetectiveHighlightedContext::EndElement()
 }
 
 
-//___________________________________________________________________
+
 
 ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext(
         ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx
index 9bbd5ee97ff4..ad4d08a228b1 100644
--- a/sc/source/filter/xml/XMLEmptyContext.cxx
+++ b/sc/source/filter/xml/XMLEmptyContext.cxx
@@ -20,7 +20,7 @@
 #include "XMLEmptyContext.hxx"
 #include "xmlimprt.hxx"
 
-//------------------------------------------------------------------
+
 
 ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx
index 3b5d5cf76556..31b82b694636 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx
@@ -234,7 +234,7 @@ void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport&
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport)
     :
diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx
index aa5a9bd3f742..382347ac47b2 100644
--- a/sc/source/filter/xml/XMLTableShapesContext.cxx
+++ b/sc/source/filter/xml/XMLTableShapesContext.cxx
@@ -25,7 +25,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx
index 988d7335566d..0131c53455d3 100644
--- a/sc/source/filter/xml/XMLTableSourceContext.cxx
+++ b/sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -31,7 +31,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index a369c9ae4d1a..c0ef84be5c25 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -40,7 +40,7 @@ using namespace com::sun::star;
 using namespace xmloff::token;
 
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLChangeInfoContext : public SvXMLImportContext
 {
@@ -69,7 +69,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLBigRangeContext : public SvXMLImportContext
 {
@@ -93,7 +93,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLCellContentDeletionContext : public SvXMLImportContext
 {
@@ -132,7 +132,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLDependenceContext : public SvXMLImportContext
 {
@@ -156,7 +156,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLDependingsContext : public SvXMLImportContext
 {
@@ -180,7 +180,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLChangeDeletionContext : public SvXMLImportContext
 {
@@ -204,7 +204,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLDeletionsContext : public SvXMLImportContext
 {
@@ -228,7 +228,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLChangeCellContext;
 
@@ -264,7 +264,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLChangeCellContext : public SvXMLImportContext
 {
@@ -307,7 +307,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLPreviousContext : public SvXMLImportContext
 {
@@ -343,7 +343,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLContentChangeContext : public SvXMLImportContext
 {
@@ -367,7 +367,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLInsertionContext : public SvXMLImportContext
 {
@@ -390,7 +390,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLInsertionCutOffContext : public SvXMLImportContext
 {
@@ -413,7 +413,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLMovementCutOffContext : public SvXMLImportContext
 {
@@ -436,7 +436,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLCutOffsContext : public SvXMLImportContext
 {
@@ -459,7 +459,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLDeletionContext : public SvXMLImportContext
 {
@@ -482,7 +482,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLMovementContext : public SvXMLImportContext
 {
@@ -507,7 +507,7 @@ public:
     virtual void EndElement();
 };
 
-//-----------------------------------------------------------------------------
+
 
 class ScXMLRejectionContext : public SvXMLImportContext
 {
@@ -530,7 +530,7 @@ public:
     virtual void EndElement();
 };
 
-//------------------------------------------------------------------
+
 
 ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport,
                                               sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx
index afeab260b730..deee3871f8b3 100644
--- a/sc/source/filter/xml/sheetdata.cxx
+++ b/sc/source/filter/xml/sheetdata.cxx
@@ -24,7 +24,7 @@
 
 #include "sheetdata.hxx"
 
-// -----------------------------------------------------------------------
+
 
 ScSheetSaveData::ScSheetSaveData() :
     mnStartTab( -1 ),
diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx
index de6eb7003fcd..51843bcd74e0 100644
--- a/sc/source/filter/xml/xmlannoi.cxx
+++ b/sc/source/filter/xml/xmlannoi.cxx
@@ -30,7 +30,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLAnnotationData::ScXMLAnnotationData() :
     mbUseShapePos( false ),
@@ -42,7 +42,7 @@ ScXMLAnnotationData::~ScXMLAnnotationData()
 {
 }
 
-//------------------------------------------------------------------
+
 
 ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx
index 2496a94cecfc..e592ed5d3104 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -56,7 +56,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport,
                                               sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx
index 8fec336fde17..dc80fa338f26 100644
--- a/sc/source/filter/xml/xmlcoli.cxx
+++ b/sc/source/filter/xml/xmlcoli.cxx
@@ -40,7 +40,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 8e3c496226e1..3c73191d6312 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -29,7 +29,7 @@
 
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 45181098b5b7..15b2cfb3c131 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -168,7 +168,7 @@ public:
     virtual void EndElement();
 };
 
-//------------------------------------------------------------------
+
 
 ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index a0b68b08975b..f9763333bbd0 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -53,7 +53,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::xml::sax::XAttributeList;
 
 
-//------------------------------------------------------------------
+
 
 ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx
index 9478b0ca73a5..ab7e2a642d54 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -59,7 +59,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index fa4c4407cf88..4be07a04f5d6 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -184,7 +184,7 @@ using ::std::vector;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::UNO_QUERY;
 
-//----------------------------------------------------------------------------
+
 
 namespace
 {
@@ -238,7 +238,7 @@ OUString lcl_GetFormattedString( ScDocument* pDoc, const ScAddress& rPos )
 
 } // anonymous namespace
 
-//----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw()
 {
@@ -418,7 +418,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInsta
 {
     return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Settings_getImplementationName(), EXPORT_SETTINGS|EXPORT_OASIS);
 }
-//----------------------------------------------------------------------------
+
 
 class ScXMLShapeExport : public XMLShapeExport
 {
@@ -445,7 +445,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 sal_Int16 ScXMLExport::GetFieldUnit()
 {
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 6314b85cd199..d24082ad9315 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -227,7 +227,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap()
     return *pTableRowCellAttrTokenMap;
 }
 
-//----------------------------------------------------------------------------
+
 
 
 
@@ -2245,7 +2245,7 @@ ScXMLImport::~ScXMLImport() throw()
     delete pDetectiveOpArray;
 }
 
-// ---------------------------------------------------------------------
+
 
 SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName,
                                                         const uno::Reference<xml::sax::XAttributeList>& xAttrList)
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index 412e96106a4b..33cb0f7bd22f 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -19,7 +19,7 @@
 
 
 
-//___________________________________________________________________
+
 #include "xmllabri.hxx"
 #include <xmloff/nmspmap.hxx>
 #include <xmloff/xmltoken.hxx>
@@ -29,7 +29,7 @@ using namespace ::com::sun::star;
 using namespace xmloff::token;
 
 
-//___________________________________________________________________
+
 
 ScXMLLabelRangesContext::ScXMLLabelRangesContext(
         ScXMLImport& rImport,
@@ -71,7 +71,7 @@ void ScXMLLabelRangesContext::EndElement()
 }
 
 
-//___________________________________________________________________
+
 
 ScXMLLabelRangeContext::ScXMLLabelRangeContext(
         ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 13d6d2d598ed..b936d4dfa3c3 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -30,7 +30,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 ScXMLNamedExpressionsContext::GlobalInserter::GlobalInserter(ScXMLImport& rImport) : mrImport(rImport) {}
 
diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index 548eafc08c36..7f966cc8c610 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -45,7 +45,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx
index c18f13b90459..684b45dc1d62 100644
--- a/sc/source/filter/xml/xmlsceni.cxx
+++ b/sc/source/filter/xml/xmlsceni.cxx
@@ -35,7 +35,7 @@ using namespace com::sun::star;
 using namespace xmloff::token;
 
 
-//------------------------------------------------------------------
+
 
 ScXMLTableScenarioContext::ScXMLTableScenarioContext(
         ScXMLImport& rImport,
diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx
index 7792ec09fa9a..c111cf4776f4 100644
--- a/sc/source/filter/xml/xmlsorti.cxx
+++ b/sc/source/filter/xml/xmlsorti.cxx
@@ -35,7 +35,7 @@
 using namespace com::sun::star;
 using namespace xmloff::token;
 
-//------------------------------------------------------------------
+
 
 ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 753177e46858..7daa392e9ca7 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -646,7 +646,7 @@ sal_Int32 XMLTableStyleContext::GetNumberFormat()
     return nNumberFormat;
 }
 
-// ----------------------------------------------------------------------------
+
 
 SvXMLStyleContext *XMLTableStylesContext::CreateStyleStyleChildContext(
         sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -929,7 +929,7 @@ sal_Int32 XMLTableStylesContext::GetIndex(const sal_Int16 nContextID)
         return -1;
 }
 
-// ---------------------------------------------------------------------------
+
 TYPEINIT1( ScXMLMasterStylesContext, SvXMLStylesContext );
 
 bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const
@@ -1057,7 +1057,7 @@ void ScMasterPageContext::Finish( bool bOverwrite )
         ClearContent(OUString(SC_UNO_PAGE_RIGHTHDRCON));
 }
 
-// ---------------------------------------------------------------------------
+
 
 ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx,
             const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList,
diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx
index fc23c226cde1..a933a1ee22c1 100644
--- a/sc/source/filter/xml/xmltabi.cxx
+++ b/sc/source/filter/xml/xmltabi.cxx
@@ -135,7 +135,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() :
 {
 }
 
-//------------------------------------------------------------------
+
 
 ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport,
                                       sal_uInt16 nPrfx,
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index fcc7b53ce656..5b3528b6ed9f 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -74,7 +74,7 @@
 using namespace com::sun::star;
 
 
-// -----------------------------------------------------------------------
+
 
 ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) :
     rDoc(rD),
@@ -367,7 +367,7 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode& nError)
             }
         }
 
-        // -------------------------------------
+
 
         uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator());
         if (xStatusIndicator.is())
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx
index 458169a95a6e..1b72fe1220af 100644
--- a/sc/source/ui/Accessibility/AccessibilityHints.cxx
+++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx
@@ -21,13 +21,13 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(ScAccWinFocusLostHint, SfxHint);
 
-// -----------------------------------------------------------------------
+
 //      ScAccWinFocusLostHint - the current window lost its focus (to another application, view or document)
-// -----------------------------------------------------------------------
+
 
 ScAccWinFocusLostHint::ScAccWinFocusLostHint(
         const uno::Reference< uno::XInterface >& xOld )
@@ -40,13 +40,13 @@ ScAccWinFocusLostHint::~ScAccWinFocusLostHint()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(ScAccWinFocusGotHint, SfxHint);
 
-// -----------------------------------------------------------------------
+
 //      ScAccWinFocusGotHint - the window got the focus (from another application, view or document)
-// -----------------------------------------------------------------------
+
 
 ScAccWinFocusGotHint::ScAccWinFocusGotHint(
         const uno::Reference< uno::XInterface >& xNew )
@@ -58,13 +58,13 @@ ScAccWinFocusGotHint::ScAccWinFocusGotHint(
 ScAccWinFocusGotHint::~ScAccWinFocusGotHint()
 {
 }
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(ScAccGridWinFocusLostHint, SfxHint);
 
-// -----------------------------------------------------------------------
+
 //      ScAccGridWinFocusLostHint - the current grid window lost its focus (to another application, view or document)
-// -----------------------------------------------------------------------
+
 
 ScAccGridWinFocusLostHint::ScAccGridWinFocusLostHint(ScSplitPos eOld,
         const uno::Reference< uno::XInterface >& xOld )
@@ -78,13 +78,13 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(ScAccGridWinFocusGotHint, SfxHint);
 
-// -----------------------------------------------------------------------
+
 //      ScAccGridWinFocusGotHint - the grid window got the focus (from another application, view or document)
-// -----------------------------------------------------------------------
+
 
 ScAccGridWinFocusGotHint::ScAccGridWinFocusGotHint(ScSplitPos eNew,
         const uno::Reference< uno::XInterface >& xNew )
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 106954ca3f88..0435444f6d48 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -64,7 +64,7 @@ using ::com::sun::star::beans::PropertyValue;
 using namespace ::com::sun::star::accessibility;
 
 
-// ----------------------------------------------------------------------------
+
 
 const sal_uInt16 nRulerRole         = AccessibleRole::TEXT;
 const sal_uInt16 nGridRole          = AccessibleRole::TABLE;
@@ -341,7 +341,7 @@ static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font&
 
 
 
-// ----------------------------------------------------------------------------
+
 
 DBG_NAME( ScAccessibleCsvRuler )
 
@@ -887,7 +887,7 @@ static inline sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn )
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 DBG_NAME( ScAccessibleCsvGrid )
 
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index e52000678343..92c20abb5e2a 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -803,9 +803,9 @@ Rectangle ScAccessibleDataPilotButton::GetBoundingBox(void) const
         return Rectangle();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 sal_Int32 ScAccessibleDataPilotButton::getAccessibleActionCount( ) throw (uno::RuntimeException)
 {
     return 1;
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index ea6ee790f4da..2eb67e2f6e47 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -442,12 +442,12 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor)
     return nColor;
 }
 //=====  XAccessibleSelection  ============================================
-//--------------------------------------------------------------------------------
+
 void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 )
 throw ( IndexOutOfBoundsException, RuntimeException )
 {
 }
-//----------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex )
 throw ( IndexOutOfBoundsException,
        RuntimeException )
@@ -470,17 +470,17 @@ throw ( IndexOutOfBoundsException,
     }
     return sal_False;
 }
-//---------------------------------------------------------------------
+
 void SAL_CALL ScAccessibleEditObject::clearAccessibleSelection(  )
 throw ( RuntimeException )
 {
 }
-//-------------------------------------------------------------------------
+
 void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren(  )
 throw ( RuntimeException )
 {
 }
-//----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount()
 throw ( RuntimeException )
 {
@@ -490,7 +490,7 @@ throw ( RuntimeException )
         if( isAccessibleChildSelected(i) ) nCount++;
     return nCount;
 }
-//--------------------------------------------------------------------------------------
+
 uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 throw ( IndexOutOfBoundsException, RuntimeException)
 {
diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx
index 6c33149afebf..15364d81c102 100644
--- a/sc/source/ui/app/client.cxx
+++ b/sc/source/ui/app/client.cxx
@@ -38,7 +38,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) :
     SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ),
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index b46272f3bf76..61eb6db1113e 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -74,15 +74,15 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 #define SCDRAWTRANS_TYPE_EMBOBJ         1
 #define SCDRAWTRANS_TYPE_DRAWMODEL      2
 #define SCDRAWTRANS_TYPE_DOCUMENT       3
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell,
                                         const TransferableObjectDescriptor& rDesc ) :
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c5be05bfb2da..026a5ba053ba 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2460,7 +2460,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode )
     bInOwnChange = false;
 }
 
-//----------------------------------------------------------------------------------------
+
 
 //  lcl_IsNumber - true, wenn nur Ziffern (dann keine Autokorrektur)
 
@@ -3811,10 +3811,10 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine )
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 // Methoden fuer FunktionsAutopiloten:
 // InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr
-//------------------------------------------------------------------------
+
 
 void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
 {
@@ -3822,7 +3822,7 @@ void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
     rEnd = nFormSelEnd;
 }
 
-//------------------------------------------------------------------------
+
 
 EditView* ScInputHandler::GetFuncEditView()
 {
@@ -3850,7 +3850,7 @@ EditView* ScInputHandler::GetFuncEditView()
     return pView;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd )
 {
@@ -3872,7 +3872,7 @@ void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd )
     bModified = true;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInputHandler::InputReplaceSelection( const OUString& rStr )
 {
@@ -3936,7 +3936,7 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy )
     :   pEditData   ( NULL )
@@ -3944,14 +3944,14 @@ ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy )
     *this = rCpy;
 }
 
-//------------------------------------------------------------------------
+
 
 ScInputHdlState::~ScInputHdlState()
 {
     delete pEditData;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScInputHdlState::operator==( const ScInputHdlState& r ) const
 {
@@ -3962,7 +3962,7 @@ bool ScInputHdlState::operator==( const ScInputHdlState& r ) const
              && ScGlobal::EETextObjEqual( pEditData, r.pEditData ) );
 }
 
-//------------------------------------------------------------------------
+
 
 ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r )
 {
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 02cb95cc5d87..e9d3923fc205 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -2062,7 +2062,7 @@ void ScTextWnd::RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextDat
         maAccTextDatas.erase( aIt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index 5733b14523c0..473e62bad48e 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -24,7 +24,7 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 ScLinkTransferObj::ScLinkTransferObj()
 {
diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx
index c4efedbf50cc..aa2e77b5bdfd 100644
--- a/sc/source/ui/app/msgpool.cxx
+++ b/sc/source/ui/app/msgpool.cxx
@@ -24,7 +24,7 @@
 #include "docpool.hxx"
 #include "msgpool.hxx"
 
-//------------------------------------------------------------------------
+
 
 static SfxItemInfo const aMsgItemInfos[] =
 {
@@ -40,7 +40,7 @@ static SfxItemInfo const aMsgItemInfos[] =
     { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE }    // SCITEM_PRINTWARN
 };
 
-//------------------------------------------------------------------------
+
 
 ScMessagePool::ScMessagePool()
     :   SfxItemPool         ( OUString("ScMessagePool"),
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index bf495d8a1ab7..63a68c9f7f98 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -116,17 +116,17 @@
 #include "dwfunctr.hxx"
 #include "acredlin.hxx"
 
-//------------------------------------------------------------------
 
 
-//------------------------------------------------------------------
+
+
 
 ScResId::ScResId( sal_uInt16 nId ) :
     ResId( nId, *SC_MOD()->GetResMgr() )
 {
 }
 
-//------------------------------------------------------------------
+
 
 void ScDLL::Init()
 {
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 01ebacbbb545..97b5e889b3cf 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -119,7 +119,7 @@
 
 static sal_uInt16 nIdleCount = 0;
 
-//------------------------------------------------------------------
+
 
 SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) )
 {
@@ -128,7 +128,7 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) )
     SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) );     // nur ID wichtig
 }
 
-//------------------------------------------------------------------
+
 
 ScModule::ScModule( SfxObjectFactory* pFact ) :
     SfxModule( SfxApplication::CreateResManager( "sc" ), false, pFact, NULL ),
@@ -208,7 +208,7 @@ ScModule::~ScModule()
     DeleteCfg();            // wurde mal aus Exit() gerufen
 }
 
-//------------------------------------------------------------------
+
 void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 )
 {
     if ( p == pColorConfig || p == pAccessOptions )
@@ -335,7 +335,7 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScModule::DeleteCfg()
 {
@@ -370,11 +370,11 @@ void ScModule::DeleteCfg()
     }
 }
 
-//------------------------------------------------------------------
+
 //
 //      von der Applikation verschoben:
 //
-//------------------------------------------------------------------
+
 
 void ScModule::Execute( SfxRequest& rReq )
 {
@@ -644,7 +644,7 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet )
 }
 
 
-//------------------------------------------------------------------
+
 
 void ScModule::ResetDragObject()
 {
@@ -713,14 +713,14 @@ ScDocument* ScModule::GetClipDoc()
     return NULL;
 }
 
-//------------------------------------------------------------------
+
 
 void ScModule::SetSelectionTransfer( ScSelectionTransferObj* pNew )
 {
     pSelTransfer = pNew;
 }
 
-//------------------------------------------------------------------
+
 
 void ScModule::InitFormEditData()
 {
@@ -732,7 +732,7 @@ void ScModule::ClearFormEditData()
     DELETEZ( pFormEditData );
 }
 
-//------------------------------------------------------------------
+
 
 void ScModule::SetViewOptions( const ScViewOptions& rOpt )
 {
@@ -972,11 +972,11 @@ sal_uInt16 ScModule::GetOptDigitLanguage()
                                                              LANGUAGE_SYSTEM;
 }
 
-//------------------------------------------------------------------
+
 //
 //                          Optionen
 //
-//------------------------------------------------------------------
+
 
 //
 //      ModifyOptions - Items aus Calc-Options-Dialog
@@ -997,7 +997,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
         GetInputOptions();
     OSL_ENSURE( pInputCfg, "InputOptions not initialised :-(" );
 
-    //--------------------------------------------------------------
+
 
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
     SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL;
@@ -1014,7 +1014,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     bool bSaveInputOptions = false;
     bool bCompileErrorCells = false;
 
-    //--------------------------------------------------------------------------
+
 
     //  SFX_APP()->SetOptions( rOptSet );
 
@@ -1320,7 +1320,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
         SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) );
     }
 
-    //----------------------------------------------------------
+
 
     if ( bSaveAppOptions )
         pAppCfg->OptionsChanged();
@@ -1416,11 +1416,11 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet )
     }
 }
 
-//------------------------------------------------------------------
+
 //
 //                      Input-Handler
 //
-//------------------------------------------------------------------
+
 
 ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef )
 {
@@ -1527,7 +1527,7 @@ ScInputHandler* ScModule::GetRefInputHdl()
     return pRefInputHandler;
 }
 
-//------------------------------------------------------------------------
+
 //  Olk's Krempel:
 
 void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd )
@@ -1601,11 +1601,11 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, bool bMatrix )
     }
 }
 
-//------------------------------------------------------------------
+
 //
 //                  Referenz - Dialoge
 //
-//------------------------------------------------------------------
+
 
 void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm )
 {
@@ -1909,11 +1909,11 @@ void ScModule::EndReference()
     }
 }
 
-//------------------------------------------------------------------
+
 //
 //                  Idle / Online-Spelling
 //
-//------------------------------------------------------------------
+
 
 void ScModule::AnythingChanged()
 {
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 160deb25727e..1cc6ba8725e9 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -39,7 +39,7 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 static sal_Bool lcl_IsURLButton( SdrObject* pObject )
 {
@@ -334,14 +334,14 @@ void ScSelectionTransferObj::CreateDrawData()
             const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList();
             ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle );
 
-            //---------------------------------------------------------
+
             ScDocShellRef aDragShellRef;
             if (bAnyOle)
             {
                 aDragShellRef = new ScDocShell;     // ohne Ref lebt die DocShell nicht !!!
                 aDragShellRef->DoInitNew(NULL);
             }
-            //---------------------------------------------------------
+
 
             ScDrawLayer::SetGlobalDrawPersist(aDragShellRef);
             SdrModel* pModel = pDrawView->GetMarkedObjModel();
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index 9f48db9ca9e2..6fa8fa7f2cfd 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -66,14 +66,14 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 #define SCTRANS_TYPE_IMPEX          1
 #define SCTRANS_TYPE_EDIT_RTF       2
 #define SCTRANS_TYPE_EDIT_BIN       3
 #define SCTRANS_TYPE_EMBOBJ         4
 
-// -----------------------------------------------------------------------
+
 
 void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol )
 {
@@ -115,7 +115,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr
     ScPrintFunc::DrawToDev( pDoc, pDev, nPrintFactor, aBound, &aViewData, bMetaFile );
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ) :
     pDoc( pClipDoc ),
diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx
index 9ff6be39fa1a..449b281c5e44 100644
--- a/sc/source/ui/app/uiitems.cxx
+++ b/sc/source/ui/app/uiitems.cxx
@@ -41,9 +41,9 @@ TYPEINIT1(ScTablesHint,         SfxHint);
 TYPEINIT1(ScEditViewHint,       SfxHint);
 TYPEINIT1(ScIndexHint,          SfxHint);
 
-// -----------------------------------------------------------------------
+
 //      ScInputStatusItem - Status-Update fuer Eingabezeile
-// -----------------------------------------------------------------------
+
 
 ScInputStatusItem::ScInputStatusItem(
     sal_uInt16 nWhichP, const ScAddress& rCurPos, const ScAddress& rStartPos,
@@ -109,9 +109,9 @@ const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges
 //  ScPaintHint ist nach schints.cxx verschoben
 //
 
-// -----------------------------------------------------------------------
+
 //  ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht
-// -----------------------------------------------------------------------
+
 
 ScTablesHint::ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2) :
     nId( nNewId ),
@@ -125,9 +125,9 @@ ScTablesHint::~ScTablesHint()
 }
 
 
-// -----------------------------------------------------------------------
+
 //  ScIndexHint
-// -----------------------------------------------------------------------
+
 
 ScIndexHint::ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx) :
     nId( nNewId ),
@@ -140,9 +140,9 @@ ScIndexHint::~ScIndexHint()
 }
 
 
-// -----------------------------------------------------------------------
+
 //      ScEditViewHint - neue EditView fuer Cursorposition anlegen
-// -----------------------------------------------------------------------
+
 
 ScEditViewHint::ScEditViewHint( ScEditEngineDefaulter* pEngine, const ScAddress& rCurPos ) :
     pEditEngine( pEngine ),
@@ -154,9 +154,9 @@ ScEditViewHint::~ScEditViewHint()
 {
 }
 
-// -----------------------------------------------------------------------
+
 //      ScSortItem - Daten fuer den Sortierdialog
-// -----------------------------------------------------------------------
+
 
 ScSortItem::ScSortItem( sal_uInt16              nWhichP,
                         ScViewData*         ptrViewData,
@@ -167,7 +167,7 @@ ScSortItem::ScSortItem( sal_uInt16              nWhichP,
     if ( pSortData ) theSortData = *pSortData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSortItem::ScSortItem( sal_uInt16              nWhichP,
                         const ScSortParam*  pSortData ) :
@@ -177,7 +177,7 @@ ScSortItem::ScSortItem( sal_uInt16              nWhichP,
     if ( pSortData ) theSortData = *pSortData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSortItem::ScSortItem( const ScSortItem& rItem ) :
         SfxPoolItem ( rItem ),
@@ -190,14 +190,14 @@ ScSortItem::~ScSortItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScSortItem::GetValueText() const
 {
     return OUString("SortItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSortItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -209,14 +209,14 @@ bool ScSortItem::operator==( const SfxPoolItem& rItem ) const
             && (theSortData == rOther.theSortData) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const
 {
     return new ScSortItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const
 {
@@ -225,9 +225,9 @@ bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMembe
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 //      ScQueryItem - Daten fuer den Filterdialog
-// -----------------------------------------------------------------------
+
 
 ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
                           ScViewData*           ptrViewData,
@@ -243,7 +243,7 @@ ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
         mpQueryData.reset(new ScQueryParam);
 }
 
-//------------------------------------------------------------------------
+
 
 ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
                           const ScQueryParam*   pQueryData ) :
@@ -258,7 +258,7 @@ ScQueryItem::ScQueryItem( sal_uInt16                nWhichP,
         mpQueryData.reset(new ScQueryParam);
 }
 
-//------------------------------------------------------------------------
+
 
 ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) :
         SfxPoolItem ( rItem ),
@@ -273,7 +273,7 @@ ScQueryItem::~ScQueryItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScQueryItem::SetAdvancedQuerySource(const ScRange* pSource)
 {
@@ -297,14 +297,14 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const
     return bIsAdvanced;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScQueryItem::GetValueText() const
 {
     return OUString("QueryItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -318,16 +318,16 @@ bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const
             && (*mpQueryData == *rQueryItem.mpQueryData) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const
 {
     return new ScQueryItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 //      ScSubTotalItem - Daten fuer den Zwischenergebnisdialog
-// -----------------------------------------------------------------------
+
 
 ScSubTotalItem::ScSubTotalItem( sal_uInt16                  nWhichP,
                                 ScViewData*             ptrViewData,
@@ -338,7 +338,7 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16                  nWhichP,
     if ( pSubTotalData ) theSubTotalData = *pSubTotalData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalItem::ScSubTotalItem( sal_uInt16                  nWhichP,
                                 const ScSubTotalParam*  pSubTotalData ) :
@@ -348,7 +348,7 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16                  nWhichP,
     if ( pSubTotalData ) theSubTotalData = *pSubTotalData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) :
         SfxPoolItem     ( rItem ),
@@ -361,14 +361,14 @@ ScSubTotalItem::~ScSubTotalItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScSubTotalItem::GetValueText() const
 {
     return OUString("SubTotalItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -380,14 +380,14 @@ bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const
             && (theSubTotalData == rSTItem.theSubTotalData) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const
 {
     return new ScSubTotalItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const
 {
@@ -396,9 +396,9 @@ bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nM
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 //      ScUserListItem - Transporter fuer den Benutzerlisten-TabPage
-// -----------------------------------------------------------------------
+
 
 ScUserListItem::ScUserListItem( sal_uInt16 nWhichP )
     :   SfxPoolItem ( nWhichP ),
@@ -406,7 +406,7 @@ ScUserListItem::ScUserListItem( sal_uInt16 nWhichP )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScUserListItem::ScUserListItem( const ScUserListItem& rItem )
     :   SfxPoolItem ( rItem )
@@ -422,14 +422,14 @@ ScUserListItem::~ScUserListItem()
     delete pUserList;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScUserListItem::GetValueText() const
 {
     return OUString("ScUserListItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -447,14 +447,14 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const
 }
 
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const
 {
     return new ScUserListItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScUserListItem::SetUserList( const ScUserList& rUserList )
 {
@@ -462,9 +462,9 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList )
     pUserList = new ScUserList( rUserList );
 }
 
-// -----------------------------------------------------------------------
+
 //      ScConsolidateItem - Daten fuer den Konsolidieren-Dialog
-// -----------------------------------------------------------------------
+
 
 ScConsolidateItem::ScConsolidateItem(
                             sal_uInt16                      nWhichP,
@@ -474,7 +474,7 @@ ScConsolidateItem::ScConsolidateItem(
     if ( pConsolidateData ) theConsData = *pConsolidateData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) :
         SfxPoolItem ( rItem ),
@@ -482,20 +482,20 @@ ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScConsolidateItem::~ScConsolidateItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScConsolidateItem::GetValueText() const
 {
     return OUString("ScConsolidateItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -506,7 +506,7 @@ bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const
     return ( theConsData == rCItem.theConsData);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const
 {
@@ -514,9 +514,9 @@ SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const
 }
 
 
-// -----------------------------------------------------------------------
+
 //      ScPivotItem - Daten fuer den Pivot-Dialog
-// -----------------------------------------------------------------------
+
 
 ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData,
                              const ScRange* pRange, bool bNew ) :
@@ -531,7 +531,7 @@ ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData,
     bNewSheet = bNew;
 }
 
-//------------------------------------------------------------------------
+
 
 ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) :
         SfxPoolItem ( rItem ),
@@ -542,21 +542,21 @@ ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) :
     pSaveData = new ScDPSaveData(*rItem.pSaveData);
 }
 
-//------------------------------------------------------------------------
+
 
 ScPivotItem::~ScPivotItem()
 {
     delete pSaveData;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScPivotItem::GetValueText() const
 {
     return OUString("ScPivotItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -569,7 +569,7 @@ bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const
              bNewSheet  == rPItem.bNewSheet );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const
 {
@@ -577,9 +577,9 @@ SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const
 }
 
 
-// -----------------------------------------------------------------------
+
 //      ScSolveItem - Daten fuer den Solver-Dialog
-// -----------------------------------------------------------------------
+
 
 ScSolveItem::ScSolveItem( sal_uInt16                nWhichP,
                           const ScSolveParam*   pSolveData )
@@ -588,7 +588,7 @@ ScSolveItem::ScSolveItem( sal_uInt16                nWhichP,
     if ( pSolveData ) theSolveData = *pSolveData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSolveItem::ScSolveItem( const ScSolveItem& rItem )
     :   SfxPoolItem     ( rItem ),
@@ -596,20 +596,20 @@ ScSolveItem::ScSolveItem( const ScSolveItem& rItem )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScSolveItem::~ScSolveItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScSolveItem::GetValueText() const
 {
     return OUString("ScSolveItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -620,16 +620,16 @@ bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const
     return ( theSolveData == rPItem.theSolveData );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const
 {
     return new ScSolveItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 //      ScTabOpItem - Daten fuer den TabOp-Dialog
-// -----------------------------------------------------------------------
+
 
 ScTabOpItem::ScTabOpItem( sal_uInt16                nWhichP,
                           const ScTabOpParam*   pTabOpData )
@@ -638,7 +638,7 @@ ScTabOpItem::ScTabOpItem( sal_uInt16                nWhichP,
     if ( pTabOpData ) theTabOpData = *pTabOpData;
 }
 
-//------------------------------------------------------------------------
+
 
 ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem )
     :   SfxPoolItem     ( rItem ),
@@ -646,20 +646,20 @@ ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScTabOpItem::~ScTabOpItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScTabOpItem::GetValueText() const
 {
     return OUString("ScTabOpItem");
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -670,7 +670,7 @@ bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const
     return ( theTabOpData == rPItem.theTabOpData );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* ScTabOpItem::Clone( SfxItemPool * ) const
 {
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index fcd0da3eaf62..ca79984636cb 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -69,13 +69,13 @@ ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* p
     AddTabPage( "cellprotection" ,  ScTabPageProtection::Create,    0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 ScAttrDlg::~ScAttrDlg()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 {
@@ -97,7 +97,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScAttrDlg, OkHandler)
 {
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index b4f30e43f069..88090598be77 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -68,14 +68,14 @@ sal_uInt16* ScTabPageProtection::GetRanges()
     return pProtectionRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new ScTabPageProtection( pParent, rAttrSet ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
 {
@@ -120,7 +120,7 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
     UpdateButtons();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
 {
@@ -144,7 +144,7 @@ sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
             bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem );
     }
 
-    //--------------------------------------------------
+
 
     if ( bAttrsChanged )
         rCoreAttrs.Put( aProtAttr );
@@ -154,7 +154,7 @@ sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
     return bAttrsChanged;
 }
 
-//------------------------------------------------------------------------
+
 
 int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -164,7 +164,7 @@ int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
     return LEAVE_PAGE;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox )
 {
@@ -195,7 +195,7 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScTabPageProtection::UpdateButtons()
 {
diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx
index dde551d844ab..5bba027c5f8b 100644
--- a/sc/source/ui/cctrl/cbuttonw.cxx
+++ b/sc/source/ui/cctrl/cbuttonw.cxx
@@ -35,20 +35,20 @@ ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice )
     SetOptSizePixel();
 }
 
-// -------------------------------------------------------------------------
+
 
 ScDDComboBoxButton::~ScDDComboBoxButton()
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 void ScDDComboBoxButton::SetOutputDevice( OutputDevice* pOutputDevice )
 {
     pOut = pOutputDevice;
 }
 
-// -------------------------------------------------------------------------
+
 
 void ScDDComboBoxButton::SetOptSizePixel()
 {
@@ -57,7 +57,7 @@ void ScDDComboBoxButton::SetOptSizePixel()
     aBtnSize.Width() = pOut->GetSettings().GetStyleSettings().GetScrollBarSize();
 }
 
-// -------------------------------------------------------------------------
+
 
 void ScDDComboBoxButton::Draw( const Point& rAt,
                                const Size&  rSize,
@@ -116,7 +116,7 @@ void ScDDComboBoxButton::Draw( const Point& rAt,
         pOut->SetFillColor();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect,
                                        bool             bState )
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 0ae9ba297c28..9e017bc5cd26 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -48,7 +48,7 @@ ScMenuFloatingWindow::MenuItemData::MenuItemData() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) :
     mpSubMenu(NULL),
@@ -72,7 +72,7 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl)
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999;
 
@@ -872,7 +872,7 @@ ScCheckListMenuWindow::Member::Member() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScCheckListMenuWindow::CancelButton::CancelButton(ScCheckListMenuWindow* pParent) :
     ::CancelButton(pParent), mpParent(pParent) {}
@@ -883,7 +883,7 @@ void ScCheckListMenuWindow::CancelButton::Click()
     ::CancelButton::Click();
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) :
     ScMenuFloatingWindow(pParent, pDoc),
diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx
index 9d30eb3c495f..e6fb1dcce058 100644
--- a/sc/source/ui/cctrl/popmenu.cxx
+++ b/sc/source/ui/cctrl/popmenu.cxx
@@ -19,7 +19,7 @@
 
 #include "popmenu.hxx"
 
-//------------------------------------------------------------------
+
 
 void ScPopupMenu::Select()
 {
diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx
index 94bb5a67111a..f6d1f9047ff6 100644
--- a/sc/source/ui/cctrl/tbinsert.cxx
+++ b/sc/source/ui/cctrl/tbinsert.cxx
@@ -34,15 +34,15 @@
 #include "scresid.hxx"
 #include "sc.hrc"
 
-// -----------------------------------------------------------------------
+
 
 SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item);
 
-//------------------------------------------------------------------
+
 //
 //  ToolBox - Controller
 //
-//------------------------------------------------------------------
+
 
 ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx  ) :
         SfxToolBoxControl( nSlotId, nId, rTbx ),
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index ce5753ca96e5..8d5a26212f7f 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -39,11 +39,11 @@
 // class ScZoomSliderControl ---------------------------------------
 //========================================================================
 
-// -----------------------------------------------------------------------
+
 
 SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem );
 
-// -----------------------------------------------------------------------
+
 
 ScZoomSliderControl::ScZoomSliderControl(
     sal_uInt16     nSlotId,
@@ -54,14 +54,14 @@ ScZoomSliderControl::ScZoomSliderControl(
     rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScZoomSliderControl::~ScZoomSliderControl()
 {
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState,
                                        const SfxPoolItem* pState )
@@ -89,7 +89,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* ScZoomSliderControl::CreateItemWindow( Window *pParent )
 {
@@ -101,7 +101,7 @@ Window* ScZoomSliderControl::CreateItemWindow( Window *pParent )
     return  pSlider;
 }
 
-// -----------------------------------------------------------------------
+
 
 struct ScZoomSliderWnd::ScZoomSliderWnd_Impl
 {
@@ -134,7 +134,7 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl
         }
 };
 
-// -----------------------------------------------------------------------
+
 
 const long nButtonWidth     = 10;
 const long nButtonHeight    = 10;
@@ -148,7 +148,7 @@ const long nSnappingEpsilon = 5; // snapping epsilon in pixels
 const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two adjacent snapping points
 
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
 {
@@ -209,7 +209,7 @@ sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
 {
@@ -237,7 +237,7 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
     return nRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
@@ -255,14 +255,14 @@ ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::
     SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 ScZoomSliderWnd::~ScZoomSliderWnd()
 {
     delete mpImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -320,7 +320,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt )
     mpImpl->mbOmitPaint = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt )
 {
@@ -362,7 +362,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem )
 {
@@ -414,14 +414,14 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem )
        Paint(aRect);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScZoomSliderWnd::Paint( const Rectangle& rRect )
 {
     DoPaint( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ )
 {
@@ -519,6 +519,6 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx
index 3e659f42489d..4f12df30bcab 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -380,9 +380,9 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl )
     return 0;
 }
 
-//---------------------------------------------------
+
 //ScCondFormatDlg
-//---------------------------------------------------
+
 
 ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc,
     const ScConditionalFormat* pFormat, const ScRangeList& rRange,
diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx
index ae7b198b116e..2f9fdc6daf37 100644
--- a/sc/source/ui/dbgui/csvsplits.cxx
+++ b/sc/source/ui/dbgui/csvsplits.cxx
@@ -65,7 +65,7 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const
 {
@@ -94,7 +94,7 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const
 {
diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx
index f3eaad9067e1..09af5929ba41 100644
--- a/sc/source/ui/dbgui/dapidata.cxx
+++ b/sc/source/ui/dbgui/dapidata.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include <vcl/waitobj.hxx>
 #include <comphelper/processfactory.hxx>
@@ -44,7 +44,7 @@ using namespace com::sun::star;
 #include "miscuno.hxx"
 #include "dpsdbtab.hxx"
 
-//-------------------------------------------------------------------------
+
 
 
 //  entries in the "type" ListBox
@@ -52,7 +52,7 @@ using namespace com::sun::star;
 #define DP_TYPELIST_QUERY   1
 #define DP_TYPELIST_SQLNAT  3
 
-//-------------------------------------------------------------------------
+
 
 ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) :
     ModalDialog(pParent, "SelectDataSourceDialog",
diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx
index 495ea0df0829..63a07ffd13e1 100644
--- a/sc/source/ui/dbgui/dapitype.cxx
+++ b/sc/source/ui/dbgui/dapitype.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "dapitype.hxx"
 #include "scresid.hxx"
@@ -31,7 +31,7 @@
 
 using namespace com::sun::star;
 
-//-------------------------------------------------------------------------
+
 
 ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal)
     : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" )
@@ -101,7 +101,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent,
                                 const uno::Sequence<OUString>& rServices ) :
diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx
index 715a6b9e310a..019cfe2e2d39 100644
--- a/sc/source/ui/dbgui/dbnamdlg.cxx
+++ b/sc/source/ui/dbgui/dbnamdlg.cxx
@@ -37,7 +37,7 @@
                         | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE
 #define ABS_DREF3D      ABS_DREF | SCA_TAB_3D
 
-//----------------------------------------------------------------------------
+
 
 class DBSaveData;
 
@@ -78,7 +78,7 @@ private:
 
 
 
-//----------------------------------------------------------------------------
+
 
 void DBSaveData::Save()
 {
@@ -92,7 +92,7 @@ void DBSaveData::Save()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void DBSaveData::Restore()
 {
@@ -112,7 +112,7 @@ void DBSaveData::Restore()
 //============================================================================
 //  class ScDbNameDlg
 
-//----------------------------------------------------------------------------
+
 
 ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     ScViewData* ptrViewData)
@@ -164,7 +164,7 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScDbNameDlg::~ScDbNameDlg()
 {
@@ -172,7 +172,7 @@ ScDbNameDlg::~ScDbNameDlg()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScDbNameDlg::Init()
 {
@@ -272,7 +272,7 @@ void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData )
     m_pFTOperations->SetText(aBuf.makeStringAndClear());
 }
 
-//----------------------------------------------------------------------------
+
 // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
 //  neue Selektion im Referenz-Fenster angezeigt wird.
 
@@ -295,14 +295,14 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScDbNameDlg::Close()
 {
     return DoClose( ScDbNameDlgWrapper::GetChildWindowId() );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDbNameDlg::SetActive()
 {
@@ -315,7 +315,7 @@ void ScDbNameDlg::SetActive()
     RefInputDone();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDbNameDlg::UpdateNames()
 {
@@ -324,7 +324,7 @@ void ScDbNameDlg::UpdateNames()
     const DBsType& rDBs = aLocalDbCol.getNamedDBs();
 
     m_pEdName->SetUpdateMode( false );
-    //-----------------------------------------------------------
+
     m_pEdName->Clear();
     m_pEdAssign->SetText( EMPTY_OUSTRING );
 
@@ -340,12 +340,12 @@ void ScDbNameDlg::UpdateNames()
         m_pBtnAdd->Disable();
         m_pBtnRemove->Disable();
     }
-    //-----------------------------------------------------------
+
     m_pEdName->SetUpdateMode( true );
     m_pEdName->Invalidate();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDbNameDlg::UpdateDBData( const OUString& rStrName )
 {
@@ -379,7 +379,7 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName )
     m_pOptions->Enable();
 }
 
-//------------------------------------------------------------------------
+
 
 
 bool ScDbNameDlg::IsRefInputMode() const
@@ -387,7 +387,7 @@ bool ScDbNameDlg::IsRefInputMode() const
     return bRefInputMode;
 }
 
-//------------------------------------------------------------------------
+
 // Handler:
 // ========
 
@@ -406,7 +406,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl)
 {
@@ -415,7 +415,7 @@ IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl)
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl)
 {
@@ -564,7 +564,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl)
 {
@@ -630,7 +630,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl)
 {
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 252803b600e3..e94e2c50fc95 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -115,7 +115,7 @@ IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton )
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDPNumGroupEditHelper::ScDPNumGroupEditHelper(
         RadioButton& rRbAuto, RadioButton& rRbMan, ScDoubleField& rEdValue ) :
@@ -134,7 +134,7 @@ void ScDPNumGroupEditHelper::ImplSetValue( double fValue )
     mrEdValue.SetValue( fValue );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScDPDateGroupEditHelper::ScDPDateGroupEditHelper(
         RadioButton& rRbAuto, RadioButton& rRbMan, DateField& rEdValue, const Date& rNullDate ) :
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 9564ef4418f4..65fd7a6cc826 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -1230,7 +1230,7 @@ ScDPRowFieldControl::~ScDPRowFieldControl()
 {
 }
 
-//-------------------------------------------------------------------
+
 
 Point ScDPRowFieldControl::GetFieldPosition(size_t nIndex)
 {
@@ -1358,7 +1358,7 @@ size_t ScDPRowFieldControl::GetDisplayPosition(size_t nIndex) const
     return INVALID_INDEX;
 }
 
-//-------------------------------------------------------------------
+
 
 OUString ScDPRowFieldControl::GetDescription() const
 {
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index 982bcdcd69f6..ce067fb1c9cc 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -161,7 +161,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScFilterDlg::~ScFilterDlg()
 {
@@ -174,7 +174,7 @@ ScFilterDlg::~ScFilterDlg()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 {
@@ -389,7 +389,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScFilterDlg::Close()
 {
@@ -400,7 +400,7 @@ bool ScFilterDlg::Close()
 }
 
 
-//----------------------------------------------------------------------------
+
 // Mouse-selected cell area becomes the new selection and is shown in the
 // reference text box
 
@@ -416,7 +416,7 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScFilterDlg::SetActive()
 {
@@ -432,7 +432,7 @@ void ScFilterDlg::SetActive()
     RefInputDone();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScFilterDlg::FillFieldLists()
 {
@@ -611,7 +611,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScFilterDlg::ClearValueList( size_t nList )
 {
@@ -626,7 +626,7 @@ void ScFilterDlg::ClearValueList( size_t nList )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 size_t ScFilterDlg::GetFieldSelPos( SCCOL nField )
 {
@@ -636,7 +636,7 @@ size_t ScFilterDlg::GetFieldSelPos( SCCOL nField )
         return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 ScQueryItem* ScFilterDlg::GetOutputItem()
 {
@@ -682,7 +682,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScFilterDlg::IsRefInputMode() const
 {
@@ -690,7 +690,7 @@ bool ScFilterDlg::IsRefInputMode() const
 }
 
 
-//----------------------------------------------------------------------------
+
 // Handler:
 // ========
 
@@ -731,7 +731,7 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl)
 {
@@ -747,7 +747,7 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl)
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer )
 {
@@ -763,7 +763,7 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
 {
@@ -1020,7 +1020,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 {
@@ -1061,7 +1061,7 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
 {
@@ -1147,7 +1147,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl)
 {
     SliderMoved();
diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx
index 6af9cfe5e391..58d540974438 100644
--- a/sc/source/ui/dbgui/foptmgr.cxx
+++ b/sc/source/ui/dbgui/foptmgr.cxx
@@ -29,9 +29,9 @@
 
 #include "foptmgr.hxx"
 
-//----------------------------------------------------------------------------
+
 // ScFilterOptionsMgr (.ui's option helper)
-//----------------------------------------------------------------------------
+
 
 ScFilterOptionsMgr::ScFilterOptionsMgr(
                                 ScViewData*         ptrViewData,
@@ -69,7 +69,7 @@ ScFilterOptionsMgr::ScFilterOptionsMgr(
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScFilterOptionsMgr::~ScFilterOptionsMgr()
 {
@@ -81,7 +81,7 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScFilterOptionsMgr::Init()
 {
@@ -171,7 +171,7 @@ void ScFilterOptionsMgr::Init()
             pFtDbArea->SetText( OUString() );
         }
 
-        //------------------------------------------------------
+
         // Kopierposition:
 
         if ( !rQueryData.bInplace )
@@ -204,7 +204,7 @@ void ScFilterOptionsMgr::Init()
         pEdCopyArea->SetText( EMPTY_OUSTRING );
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
 {
@@ -219,10 +219,10 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const
     return ( SCA_VALID == (nResult & SCA_VALID) );
 }
 
-//----------------------------------------------------------------------------
+
 // Handler:
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
 {
@@ -241,7 +241,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
 {
@@ -276,7 +276,7 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox )
 {
diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx
index 5c2124c79a1f..778d018f6899 100644
--- a/sc/source/ui/dbgui/imoptdlg.cxx
+++ b/sc/source/ui/dbgui/imoptdlg.cxx
@@ -26,7 +26,7 @@
 
 static const sal_Char pStrFix[] = "FIX";
 
-//------------------------------------------------------------------------
+
 //  Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste)
 //  darum ab Version 336 Komma stattdessen
 
@@ -76,7 +76,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScImportOptions::BuildString() const
 {
@@ -98,7 +98,7 @@ OUString ScImportOptions::BuildString() const
     return aResult;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc )
 {
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index a71c97a7d130..4d1b0100643f 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -100,7 +100,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window*             pParent,
     FreeResource();
 }
 
-//------------------------------------------------------------------------
+
 
 ScPivotFilterDlg::~ScPivotFilterDlg()
 {
@@ -111,7 +111,7 @@ ScPivotFilterDlg::~ScPivotFilterDlg()
         delete pOutItem;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
 {
@@ -265,7 +265,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPivotFilterDlg::FillFieldLists()
 {
@@ -302,7 +302,7 @@ void ScPivotFilterDlg::FillFieldLists()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
 {
@@ -348,7 +348,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList )
 {
@@ -362,7 +362,7 @@ void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
 {
@@ -372,7 +372,7 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField )
         return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
 {
@@ -447,9 +447,9 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem()
     return *pOutItem;
 }
 
-//------------------------------------------------------------------------
+
 // Handler:
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
 {
@@ -542,7 +542,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
 {
@@ -567,7 +567,7 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd )
 {
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index a6c7f7b051f7..04948dd5768b 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -493,7 +493,7 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa
     mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn )
 {
diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx
index 8c389ab4428d..09dbf93b7efd 100644
--- a/sc/source/ui/dbgui/scendlg.cxx
+++ b/sc/source/ui/dbgui/scendlg.cxx
@@ -113,7 +113,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool
         m_pCbProtect->Enable(false);
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNewScenarioDlg::GetScenarioData( OUString& rName, OUString& rComment,
                                         Color& rColor, sal_uInt16& rFlags ) const
@@ -151,7 +151,7 @@ void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& r
     m_pCbProtect->Check    ( (nFlags & SC_SCENARIO_PROTECT)     != 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl)
 {
@@ -177,7 +177,7 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl)
     //! beim Editieren testen, ob eine andere Tabelle den Namen hat!
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScNewScenarioDlg, EnableHdl, CheckBox *, pBox )
 {
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index bc319b98050d..f36e9b1aed4a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -233,7 +233,7 @@ static void save_Separators(
     aItem.PutProperties(aNames, aValues);
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
                                     SvStream* pInStream, ScImportAsciiCall eCall ) :
@@ -463,7 +463,7 @@ ScImportAsciiDlg::~ScImportAsciiDlg()
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText )
 {
@@ -630,7 +630,7 @@ void ScImportAsciiDlg::UpdateVertical()
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton )
 {
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 1deb7dbb62e5..f2d250b292f2 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -57,7 +57,7 @@ private:
     sal_Int32          nIter;
 };
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const
 {
@@ -81,7 +81,7 @@ sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const
     return nCode;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const
 {
@@ -249,7 +249,7 @@ ScImportOptionsDlg::ScImportOptionsDlg(
         SetText( *pStrTitle );
 }
 
-//------------------------------------------------------------------------
+
 
 ScImportOptionsDlg::~ScImportOptionsDlg()
 {
@@ -257,7 +257,7 @@ ScImportOptionsDlg::~ScImportOptionsDlg()
     delete pTextSepTab;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const
 {
@@ -274,7 +274,7 @@ void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const
     }
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
 {
@@ -302,7 +302,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const
     return nCode;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox )
 {
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 6f2b983b3f91..a17354739c4e 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -45,7 +45,7 @@
 //============================================================================
 //  class ScSpecialFilterDialog
 
-//----------------------------------------------------------------------------
+
 
 ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
                                         const SfxItemSet&   rArgSet )
@@ -101,7 +101,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScSpecialFilterDlg::~ScSpecialFilterDlg()
 {
@@ -122,7 +122,7 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
 {
@@ -204,7 +204,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScSpecialFilterDlg::Close()
 {
@@ -215,7 +215,7 @@ bool ScSpecialFilterDlg::Close()
 }
 
 
-//----------------------------------------------------------------------------
+
 // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
 // neue Selektion im Referenz-Edit angezeigt wird.
 
@@ -239,7 +239,7 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScSpecialFilterDlg::SetActive()
 {
@@ -264,7 +264,7 @@ void ScSpecialFilterDlg::SetActive()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam,
                                                 const ScRange& rSource )
@@ -277,7 +277,7 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScSpecialFilterDlg::IsRefInputMode() const
 {
@@ -285,7 +285,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const
 }
 
 
-//----------------------------------------------------------------------------
+
 // Handler:
 // ========
 
@@ -406,7 +406,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer )
 {
@@ -437,7 +437,7 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
 {
@@ -456,7 +456,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd )
 {
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 8302b4f42925..436bd96c6213 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -34,7 +34,7 @@ void ScSortKeyItem::DisableField()
     m_pFrame->Disable();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScSortKeyItem::EnableField()
 {
@@ -56,14 +56,14 @@ ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyIt
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ScSortKeyWindow::~ScSortKeyWindow()
 {
     mrSortKeyItems.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
 {
@@ -77,7 +77,7 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
     mrSortKeyItems.push_back(pSortKeyItem);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScSortKeyWindow::DoScroll(sal_Int32 nNewPos)
 {
@@ -126,7 +126,7 @@ void ScSortKeyCtrl::setScrollRange()
     checkAutoVScroll();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar )
 {
@@ -136,7 +136,7 @@ IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem )
 {
diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx
index fd6545136a76..ba77cba95248 100644
--- a/sc/source/ui/dbgui/subtdlg.cxx
+++ b/sc/source/ui/dbgui/subtdlg.cxx
@@ -42,7 +42,7 @@ ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet)
     m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn )
 {
diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx
index 796386ba0887..f6c4e75c712e 100644
--- a/sc/source/ui/dbgui/textimportoptions.cxx
+++ b/sc/source/ui/dbgui/textimportoptions.cxx
@@ -20,7 +20,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------------
+
 
 #include "textimportoptions.hxx"
 #include "vcl/svapp.hxx"
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 14ca4e67af40..61b54eb870b5 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -48,7 +48,7 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 /*
  * Since the settings on the second Tab Page (Options) effects
@@ -116,13 +116,13 @@ void ScTabPageSortFields::SetPosPixel(const Point& rAllocPos)
     maSortKeyCtrl.setScrollRange();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTabPageSortFields::~ScTabPageSortFields()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortFields::Init()
 {
@@ -144,7 +144,7 @@ void ScTabPageSortFields::Init()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTabPageSortFields::Create( Window*    pParent,
                                          const SfxItemSet&  rArgSet )
@@ -152,7 +152,7 @@ SfxTabPage* ScTabPageSortFields::Create( Window*    pParent,
     return ( new ScTabPageSortFields( pParent, rArgSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
 {
@@ -236,7 +236,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
         SetLastSortKey( nSortKeyCount );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
 {
@@ -302,7 +302,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 // for data exchange without dialogue detour:
 void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
@@ -328,7 +328,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -347,7 +347,7 @@ int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
     return SfxTabPage::LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
 {
@@ -417,7 +417,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
 {
@@ -455,9 +455,9 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem )
     maSortKeyItems[nItem].m_pLbSort->SelectEntryPos( 0 );
 }
 
-// -----------------------------------------------------------------------
+
 // Handler:
-//---------
+
 
 IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
 {
@@ -542,7 +542,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window*             pParent,
     m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText());
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTabPageSortOptions::~ScTabPageSortOptions()
 {
@@ -555,7 +555,7 @@ ScTabPageSortOptions::~ScTabPageSortOptions()
     delete pColWrap;        //! not if from document
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortOptions::Init()
 {
@@ -640,7 +640,7 @@ void ScTabPageSortOptions::Init()
     m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTabPageSortOptions::Create(
                                             Window*             pParent,
@@ -649,7 +649,7 @@ SfxTabPage* ScTabPageSortOptions::Create(
     return ( new ScTabPageSortOptions( pParent, rArgSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
 {
@@ -718,7 +718,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
 {
@@ -767,7 +767,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 // for data exchange without dialogue detour:
 void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
@@ -793,7 +793,7 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -847,7 +847,7 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
     return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortOptions::FillUserSortListBox()
 {
@@ -863,7 +863,7 @@ void ScTabPageSortOptions::FillUserSortListBox()
     }
 }
 
-// -----------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox )
@@ -895,7 +895,7 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
 {
@@ -912,7 +912,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
 {
@@ -927,7 +927,7 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
 {
@@ -957,7 +957,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl)
 {
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 7f777a920b87..3f74086ecbff 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -65,7 +65,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent,
     Init ();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTpSubTotalGroup::~ScTpSubTotalGroup()
 {
@@ -85,7 +85,7 @@ ScTpSubTotalGroup::~ScTpSubTotalGroup()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpSubTotalGroup::Init()
 {
@@ -106,7 +106,7 @@ void ScTpSubTotalGroup::Init()
     FillListBoxes();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ScTpSubTotalGroup::DoReset( sal_uInt16             nGroupNo,
                                  const SfxItemSet&  rArgSet  )
@@ -120,7 +120,7 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16             nGroupNo,
     else
         nGroupIdx = nGroupNo-1;
 
-    //----------------------------------------------------------
+
 
     // first we have to clear the listboxes...
     for ( sal_uInt16 nLbEntry = 0; nLbEntry < mpLbColumns->GetEntryCount(); ++nLbEntry )
@@ -168,7 +168,7 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16             nGroupNo,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16       nGroupNo,
                                        SfxItemSet&  rArgSet  )
@@ -191,7 +191,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16       nGroupNo,
     else
         nGroupIdx = nGroupNo-1;
 
-    //----------------------------------------------------------
+
 
     ScSubTotalParam theSubTotalData;            // auslesen, wenn schon teilweise gefuellt
     SfxTabDialog* pDlg = GetTabDialog();
@@ -252,7 +252,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16       nGroupNo,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpSubTotalGroup::FillListBoxes()
 {
@@ -290,7 +290,7 @@ void ScTpSubTotalGroup::FillListBoxes()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
 {
@@ -309,7 +309,7 @@ sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
     return nFieldPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos )
 {
@@ -333,7 +333,7 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc )
 {
@@ -357,9 +357,9 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc )
     }
 }
 
-// -----------------------------------------------------------------------
+
 // Handler:
-//---------
+
 
 IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
 {
@@ -387,7 +387,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb )
 {
@@ -411,19 +411,19 @@ SfxTabPage* ScTpSubTotalGroup1::Create( Window*         pParent,
                                                  const SfxItemSet&  rArgSet )
     { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTpSubTotalGroup2::Create( Window*          pParent,
                                        const SfxItemSet&    rArgSet )
     { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTpSubTotalGroup3::Create( Window*          pParent,
                                        const SfxItemSet&    rArgSet )
     { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); }
 
-// -----------------------------------------------------------------------
+
 
 ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) :
     ScTpSubTotalGroup( pParent, rArgSet )
@@ -437,7 +437,7 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS
     ScTpSubTotalGroup( pParent, rArgSet )
 {}
 
-// -----------------------------------------------------------------------
+
 
 
 #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet ))
@@ -446,7 +446,7 @@ void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); }
 void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); }
 #undef RESET
 
-// -----------------------------------------------------------------------
+
 
 #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet ))
 sal_Bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); }
@@ -483,13 +483,13 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window*               pParent,
     Init();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTpSubTotalOptions::~ScTpSubTotalOptions()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpSubTotalOptions::Init()
 {
@@ -507,7 +507,7 @@ void ScTpSubTotalOptions::Init()
     FillUserSortListBox();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTpSubTotalOptions::Create( Window*                 pParent,
                                           const SfxItemSet&     rArgSet )
@@ -515,7 +515,7 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window*                 pParent,
     return ( new ScTpSubTotalOptions( pParent, rArgSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
 {
@@ -542,7 +542,7 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
     CheckHdl( pBtnSort );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
 {
@@ -572,7 +572,7 @@ sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpSubTotalOptions::FillUserSortListBox()
 {
@@ -587,7 +587,7 @@ void ScTpSubTotalOptions::FillUserSortListBox()
     }
 }
 
-// -----------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 386f942afda3..b07a1c9a716d 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -301,7 +301,7 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) :
     SfxTabPage( pParent, ScResId( TP_VALIDATION_VALUES ), rArgSet ),
@@ -611,7 +611,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd )
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl)
 {
@@ -693,27 +693,27 @@ ScTPValidationHelp::ScTPValidationHelp( Window*         pParent,
     Init();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTPValidationHelp::~ScTPValidationHelp()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTPValidationHelp::Init()
 {
     pTsbHelp->EnableTriState( false );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* ScTPValidationHelp::GetRanges()
 {
     return pValueRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
                                          const SfxItemSet&  rArgSet )
@@ -721,7 +721,7 @@ SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
     return ( new ScTPValidationHelp( pParent, rArgSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
 {
@@ -743,7 +743,7 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
         pEdInputHelp->SetText( EMPTY_OUSTRING );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
 {
@@ -776,13 +776,13 @@ ScTPValidationError::ScTPValidationError( Window*           pParent,
     Init();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTPValidationError::~ScTPValidationError()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTPValidationError::Init()
 {
@@ -795,14 +795,14 @@ void ScTPValidationError::Init()
     SelectActionHdl( NULL );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* ScTPValidationError::GetRanges()
 {
     return pValueRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTPValidationError::Create( Window*    pParent,
                                          const SfxItemSet&  rArgSet )
@@ -810,7 +810,7 @@ SfxTabPage* ScTPValidationError::Create( Window*    pParent,
     return ( new ScTPValidationError( pParent, rArgSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
 {
@@ -839,7 +839,7 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
     SelectActionHdl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
 {
@@ -851,7 +851,7 @@ sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl)
 {
@@ -865,7 +865,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl)
 {
diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index c3def988b08b..bfda73213579 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -56,7 +56,7 @@ struct AreaLink_Impl
 
 TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink);
 
-//------------------------------------------------------------------------
+
 
 ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
                         const OUString& rFilter, const OUString& rOpt,
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index e5ed5d433360..19c1ed176ff2 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -53,7 +53,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, bool /* bApi */ )
 {
@@ -239,7 +239,7 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData )
     return bDone;
 }
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab )
 {
@@ -423,7 +423,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo
     return bDone;
 }
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
                             bool bRecord, bool bPaint, bool bApi )
@@ -666,7 +666,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam,
     return true;
 }
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
                         const ScRange* pAdvSource, bool bRecord, bool bApi )
@@ -1007,7 +1007,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
     return true;
 }
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam,
                                 const ScSortParam* pForceNewSort, bool bRecord, bool bApi )
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 2e7adec708c9..41c045096300 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -100,7 +100,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram
     }
 }
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
                                 const uno::Sequence<beans::PropertyValue>& aArgs )
@@ -117,7 +117,7 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos,
     return true;
 }
 
-// -----------------------------------------------------------------
+
 
 bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         const svx::ODataAccessDescriptor* pDescriptor, bool bRecord, bool bAddrInsert )
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 4ffdebbaea84..c9254a2829e1 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -120,7 +120,7 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 //  Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight)
 
@@ -135,7 +135,7 @@ static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint )
 {
@@ -168,7 +168,7 @@ bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint )
 }
 
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
 {
@@ -564,7 +564,7 @@ void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<S
     lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, false);
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags,
                                     bool bRecord, bool bApi )
@@ -691,7 +691,7 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags,
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
                                     bool bRecord, bool bApi )
@@ -747,7 +747,7 @@ bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType,
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, bool bApi )
 {
@@ -1198,7 +1198,7 @@ bool ScDocFunc::SetCellText(
     return bSet;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
 {
@@ -1219,7 +1219,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool bApi )
 {
@@ -1250,7 +1250,7 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, bool bApi )
 {
@@ -1312,7 +1312,7 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c
     return bDone;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern,
                                     bool bRecord, bool bApi )
@@ -2893,7 +2893,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
     return true;
 }
 
-//------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, OUString& sCodeName )
 {
     uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY);
@@ -3363,7 +3363,7 @@ bool ScDocFunc::SetTabBgColor(
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 
 //! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!!
 //! Probleme:
@@ -3685,7 +3685,7 @@ bool ScDocFunc::RemovePageBreak( bool bColumn, const ScAddress& rPos,
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect )
 {
@@ -3849,7 +3849,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, bool bApi )
 {
@@ -4068,7 +4068,7 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark,
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
         const ScTokenArray* pTokenArray, const OUString& rString, bool bApi, bool bEnglish,
@@ -4157,7 +4157,7 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
                             const ScTabOpParam& rParam, bool bRecord, bool bApi )
@@ -4218,7 +4218,7 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark,
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 
 inline ScDirection DirFromFillDir( FillDir eDir )
 {
@@ -4673,7 +4673,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::MergeCells( const ScCellMergeOption& rOption, bool bContents, bool bRecord, bool bApi )
 {
@@ -4864,7 +4864,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, bool bRecord )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, SCTAB nTab )
 {
@@ -4943,7 +4943,7 @@ void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName>
     SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED));
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocFunc::CreateOneName( ScRangeName& rList,
                                 SCCOL nPosX, SCROW nPosY, SCTAB nTab,
@@ -5099,7 +5099,7 @@ bool ScDocFunc::CreateNames( const ScRange& rRange, sal_uInt16 nFlags, bool bApi
     return bDone;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi )
 {
@@ -5211,7 +5211,7 @@ bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi )
     return bDone;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, bool bApi )
 {
@@ -5257,7 +5257,7 @@ bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter,
                                 const OUString& rOptions, const OUString& rSource,
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index e3a9f4f5dac0..b42162c3a72e 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -165,7 +165,7 @@ static const sal_Char pFilterHtml[]     = "HTML (StarCalc)";
 static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery";
 static const sal_Char pFilterRtf[]      = "Rich Text Format (StarCalc)";
 
-//----------------------------------------------------------------------
+
 
 #define ScDocShell
 #include "scslots.hxx"
@@ -180,7 +180,7 @@ SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SFXOBJECTSHELL
 
 TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: No TypeInfo?
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::FillClass( SvGlobalName* pClassName,
                                         sal_uInt32* pFormat,
@@ -210,7 +210,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName,
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::DoEnterHandler()
 {
@@ -220,7 +220,7 @@ void ScDocShell::DoEnterHandler()
             SC_MOD()->InputEnterHandler();
 }
 
-//------------------------------------------------------------------
+
 
 SCTAB ScDocShell::GetSaveTab()
 {
@@ -2674,7 +2674,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) :
     // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew
 }
 
-//------------------------------------------------------------------
+
 
 ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
     SfxObjectShell( i_nSfxCreationFlags ),
@@ -2723,7 +2723,7 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
     // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew
 }
 
-//------------------------------------------------------------------
+
 
 ScDocShell::~ScDocShell()
 {
@@ -2761,7 +2761,7 @@ ScDocShell::~ScDocShell()
 #endif
 }
 
-//------------------------------------------------------------------
+
 
 ::svl::IUndoManager* ScDocShell::GetUndoManager()
 {
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 60ba753e5ce0..6428c22ed57e 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -32,7 +32,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
 {
@@ -62,7 +62,7 @@ sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
     return bRet;
 }
 
-//------------------------------------------------------------------
+
 
 bool ScDocShell::IsEmpty() const
 {
@@ -75,7 +75,7 @@ void ScDocShell::SetEmpty(bool bSet)
     bIsEmpty = bSet;
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::InitItems()
 {
@@ -145,7 +145,7 @@ void ScDocShell::InitItems()
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::ResetDrawObjectShell()
 {
@@ -154,7 +154,7 @@ void ScDocShell::ResetDrawObjectShell()
         pDrawLayer->SetObjectShell( NULL );
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::Activate()
 {
@@ -165,7 +165,7 @@ void ScDocShell::Deactivate()
 {
 }
 
-//------------------------------------------------------------------
+
 
 
 ScDrawLayer* ScDocShell::MakeDrawLayer()
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 4bbcb5fa9827..23ce64cc8085 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -62,7 +62,7 @@
 #include "globstr.hrc"
 #include "markdata.hxx"
 
-//------------------------------------------------------------------
+
 
 //
 //          Redraw - Benachrichtigungen
@@ -216,7 +216,7 @@ void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW n
     UpdatePaintExt( rExtFlags, ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ) );
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::LockPaint_Impl(bool bDoc)
 {
@@ -337,7 +337,7 @@ void ScDocShell::UnlockDocument()
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::SetInplace( bool bInplace )
 {
@@ -403,7 +403,7 @@ double ScDocShell::GetOutputFactor() const
     return nPrtToScreenFactor;
 }
 
-//---------------------------------------------------------------------
+
 
 void ScDocShell::InitOptions(bool bForLoading)      // called from InitNew and Load
 {
@@ -439,7 +439,7 @@ void ScDocShell::InitOptions(bool bForLoading)      // called from InitNew and L
     aDocument.SetLanguage( (LanguageType) nDefLang, (LanguageType) nCjkLang, (LanguageType) nCtlLang );
 }
 
-//---------------------------------------------------------------------
+
 
 Printer* ScDocShell::GetDocumentPrinter()       // fuer OLE
 {
@@ -568,7 +568,7 @@ sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlag
     return 0;
 }
 
-//---------------------------------------------------------------------
+
 
 ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos )
 {
@@ -668,7 +668,7 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pP
     delete pDlg;
 }
 
-//---------------------------------------------------------------------
+
 
 void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
 {
@@ -731,11 +731,11 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc )
     SetDocumentModified();
 }
 
-//---------------------------------------------------------------------
+
 //
 //              Merge (Aenderungen zusammenfuehren)
 //
-//---------------------------------------------------------------------
+
 
 static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec )
 {
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index eea84048a862..275f3af860c0 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -98,7 +98,7 @@ using namespace ::com::sun::star;
 #include "sheetevents.hxx"
 #include <documentlinkmgr.hxx>
 
-//------------------------------------------------------------------
+
 
 #define IS_SHARE_HEADER(set) \
     ((SfxBoolItem&) \
@@ -114,7 +114,7 @@ using namespace ::com::sun::star;
 #define SC_PREVIEW_SIZE_Y   12400
 
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::Execute( SfxRequest& rReq )
 {
@@ -1114,7 +1114,7 @@ void ScDocShell::Execute( SfxRequest& rReq )
 }
 
 
-//------------------------------------------------------------------
+
 
 void UpdateAcceptChangesDialog()
 {
@@ -1129,7 +1129,7 @@ void UpdateAcceptChangesDialog()
     }
 }
 
-//------------------------------------------------------------------
+
 
 bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected )
 {
@@ -1195,7 +1195,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQuer
 }
 
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::DoRecalc( bool bApi )
 {
@@ -1272,7 +1272,7 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ )
     PostPaintGridAll();
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle )
 {
@@ -1297,7 +1297,7 @@ void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle )
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint )
 {
@@ -2063,7 +2063,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet,
 
     OSL_ENSURE( pStyleSet, "PageStyle-Set not found! :-(" );
 
-    //--------------------------------------------------------------------
+
 
     const SvxSetItem*   pSetItem = NULL;
     const SfxItemSet*   pSet     = NULL;
@@ -2198,7 +2198,7 @@ bool ScDocShell::DdeSetData( const OUString& rItem,
     return pObj;
 }
 
-//------------------------------------------------------------------
+
 
 ScViewData* ScDocShell::GetViewData()
 {
@@ -2207,7 +2207,7 @@ ScViewData* ScDocShell::GetViewData()
     return pViewSh ? pViewSh->GetViewData() : NULL;
 }
 
-//------------------------------------------------------------------
+
 
 SCTAB ScDocShell::GetCurTab()
 {
@@ -2248,7 +2248,7 @@ SfxBindings* ScDocShell::GetViewBindings()
         return NULL;
 }
 
-//------------------------------------------------------------------
+
 
 ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo )      // static
 {
@@ -2271,7 +2271,7 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo )      // static
     return pFound;
 }
 
-//------------------------------------------------------------------
+
 
 IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg )
 {
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 388c5bfb4a8d..e901ddb416ed 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -61,7 +61,7 @@ using com::sun::star::uno::UNO_QUERY;
 using ::std::auto_ptr;
 using ::std::vector;
 
-// ---------------------------------------------------------------------------
+
 
 //
 //  former viewfunc/dbfunc methods
diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx
index 1165489fe6a4..73fc57356d4d 100644
--- a/sc/source/ui/docshell/docsh6.cxx
+++ b/sc/source/ui/docshell/docsh6.cxx
@@ -65,7 +65,7 @@ struct ScStylePair
 
 // STATIC DATA -----------------------------------------------------------
 
-//----------------------------------------------------------------------
+
 
 //
 //  Ole
diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx
index fee0a2dff5fb..2c21ac0b9206 100644
--- a/sc/source/ui/docshell/docsh7.cxx
+++ b/sc/source/ui/docshell/docsh7.cxx
@@ -19,7 +19,7 @@
 
 #include "docsh.hxx"
 
-//------------------------------------------------------------------
+
 
 void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ )
 {
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 916fc7b3f0fd..44dcbed876b9 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -79,7 +79,7 @@
 using namespace com::sun::star;
 using ::std::vector;
 
-// -----------------------------------------------------------------------
+
 
 #define SC_SERVICE_ROWSET           "com.sun.star.sdb.RowSet"
 
@@ -152,7 +152,7 @@ namespace
 
 #endif // !DISABLE_DBCONNECTIVITY
 
-// -----------------------------------------------------------------------
+
 // MoveFile/KillFile/IsDocument: similar to SfxContentHelper
 
 bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj )
@@ -239,7 +239,7 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 #ifndef DISABLE_DBCONNECTIVITY
 
diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx
index 2664e9e2ae34..2a575aa02611 100644
--- a/sc/source/ui/docshell/editable.cxx
+++ b/sc/source/ui/docshell/editable.cxx
@@ -67,7 +67,7 @@ ScEditableTester::ScEditableTester( ScViewFunc* pView ) :
     TestView( pView );
 }
 
-//------------------------------------------------------------------
+
 
 void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab,
                         SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow )
@@ -134,7 +134,7 @@ void ScEditableTester::TestView( ScViewFunc* pView )
     }
 }
 
-//------------------------------------------------------------------
+
 
 sal_uInt16 ScEditableTester::GetMessageId() const
 {
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 7d77afbfa693..2f3363a2d4d9 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -472,21 +472,21 @@ ScExternalRefCache::TokenRef ScExternalRefCache::Table::getEmptyOrNullToken(
     return TokenRef();
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScExternalRefCache::TableName::TableName(const OUString& rUpper, const OUString& rReal) :
     maUpperName(rUpper), maRealName(rReal)
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScExternalRefCache::CellFormat::CellFormat() :
     mbIsSet(false), mnType(NUMBERFORMAT_ALL), mnIndex(0)
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScExternalRefCache::ScExternalRefCache() {}
 
@@ -1584,7 +1584,7 @@ ScExternalRefManager::LinkListener::~LinkListener()
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScExternalRefManager::ApiGuard::ApiGuard(ScDocument* pDoc) :
     mpMgr(pDoc->GetExternalRefManager()),
@@ -1600,7 +1600,7 @@ ScExternalRefManager::ApiGuard::~ApiGuard()
     mpMgr->mbUserInteractionEnabled = mbOldInteractionEnabled;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void ScExternalRefManager::getAllCachedTableNames(sal_uInt16 nFileId, vector<OUString>& rTabNames) const
 {
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 187637d7ffd5..034b61fe14a2 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -43,7 +43,7 @@ static void lcl_InvalidateOutliner( SfxBindings* pBindings )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 //! PaintWidthHeight zur DocShell verschieben?
 
@@ -78,7 +78,7 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab,
     rDocShell.PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts );
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi )
 {
@@ -265,7 +265,7 @@ bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, bool bRecord )
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord )
 {
@@ -331,7 +331,7 @@ bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel,
                                     bool bRecord, bool bPaint )
@@ -426,7 +426,7 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, bool bRecord )
 {
@@ -624,7 +624,7 @@ bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, bool bRecord )
     return bDone;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry,
                                     bool bRecord, bool bPaint )
diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx
index b3a4f9cd5ec0..9db2dfe7a594 100644
--- a/sc/source/ui/docshell/pntlock.cxx
+++ b/sc/source/ui/docshell/pntlock.cxx
@@ -19,7 +19,7 @@
 
 #include "pntlock.hxx"
 
-//------------------------------------------------------------------------
+
 
 ScPaintLockData::ScPaintLockData() :
     nLevel( 0 ),
diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx
index e2195572c57a..9cedad40c772 100644
--- a/sc/source/ui/docshell/servobj.cxx
+++ b/sc/source/ui/docshell/servobj.cxx
@@ -29,7 +29,7 @@
 
 using namespace formula;
 
-// -----------------------------------------------------------------------
+
 
 static bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const OUString& rName )
 {
diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx
index 9607fbec4e2b..3b73fc9e41d2 100644
--- a/sc/source/ui/docshell/sizedev.cxx
+++ b/sc/source/ui/docshell/sizedev.cxx
@@ -25,7 +25,7 @@
 #include "scmod.hxx"
 #include "inputopt.hxx"
 
-//------------------------------------------------------------------
+
 
 ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh )
 {
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 768c9a9d6492..c67fada503dd 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -56,7 +56,7 @@ struct TableLink_Impl
 
 TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink);
 
-//------------------------------------------------------------------------
+
 
 ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile,
                             const OUString& rFilter, const OUString& rOpt,
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index c407e1932b9e..93ab7847d891 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -38,7 +38,7 @@ SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet )
     return new ScDocStatPage( pParent, rSet );
 }
 
-//------------------------------------------------------------------------
+
 
 ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
     :   SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", rSet )
@@ -62,20 +62,20 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
 
 }
 
-//------------------------------------------------------------------------
+
 
 ScDocStatPage::~ScDocStatPage()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ )
 {
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ )
 {
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index c8d11f50b0a1..cc27e2e81713 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -59,7 +59,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-//------------------------------------------------------------------
+
 
 TYPEINIT1( ScDrawShell, SfxShell );
 
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 166802ab7cb1..fa2126e5bbcc 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -56,7 +56,7 @@ sal_uInt16 ScGetFontWorkId();       // in drtxtob
 using namespace com::sun::star;
 
 
-//------------------------------------------------------------------
+
 
 ScDrawShell::ScDrawShell( ScViewData* pData ) :
     SfxShell(pData->GetViewShell()),
diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx
index bbd925492a39..85f481984244 100644
--- a/sc/source/ui/drawfunc/drawsh4.cxx
+++ b/sc/source/ui/drawfunc/drawsh4.cxx
@@ -32,7 +32,7 @@
 #include "sc.hrc"
 
 
-//------------------------------------------------------------------
+
 
 void ScDrawShell::GetFormTextState(SfxItemSet& rSet)
 {
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 13dff40c40c0..4193e80977aa 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -60,7 +60,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 void ScDrawShell::GetHLinkState( SfxItemSet& rSet )             //  Hyperlink
 {
@@ -242,7 +242,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq )
 
 sal_uInt16 ScGetFontWorkId();
 
-//------------------------------------------------------------------
+
 
 //
 //          Funktionen auf Drawing-Objekten
@@ -649,7 +649,7 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog )
     return 1;   // name is valid
 }
 
-//------------------------------------------------------------------
+
 
 void ScDrawShell::ExecFormText(SfxRequest& rReq)
 {
@@ -667,7 +667,7 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq)
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq )
 {
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 225258ae157d..907f42b7e93f 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -38,7 +38,7 @@
 #include "scresid.hxx"
 
 #include "scabstdlg.hxx"
-//------------------------------------------------------------------------
+
 
 bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs,
                                                 SfxItemSet& rOutSet , sal_uInt16 nSlot)
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 25e8f3bc270a..24b6d15ce46b 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -45,7 +45,7 @@
 #include "drwtrans.hxx"
 #include "drwlayer.hxx"
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScGetFontWorkId()
 {
diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx
index 20bd744234ed..369aa8cc9393 100644
--- a/sc/source/ui/drawfunc/fuconcustomshape.cxx
+++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx
@@ -36,7 +36,7 @@
 
 #include <math.h>
 
-//------------------------------------------------------------------------
+
 
 FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq )
     : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq )
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 222e4679ab8e..4b8bfcbd6a7f 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -32,7 +32,7 @@
 
 #include "scresid.hxx"
 
-//------------------------------------------------------------------------
+
 
 
 /*************************************************************************
diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx
index fa6d53bdd60f..407b39a0bd75 100644
--- a/sc/source/ui/drawfunc/fuconstr.cxx
+++ b/sc/source/ui/drawfunc/fuconstr.cxx
@@ -37,7 +37,7 @@
 //! fusel,fuconstr,futext - zusammenfassen!
 #define SC_MAXDRAGMOVE  3
 
-//------------------------------------------------------------------------
+
 
 /*************************************************************************
 |*
diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index 61cd7882623d..ab88c9df3ff5 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -45,7 +45,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage )
 {
@@ -92,7 +92,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r
         rPos.X() = -rPos.X() - rSize.Width();       // back to real position
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_InsertGraphic( const Graphic& rGraphic,
                         const OUString& rFileName, const OUString& rFilterName, sal_Bool bAsLink, sal_Bool bApi,
@@ -180,7 +180,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
         pObj->SetGraphicLink( rFileName, ""/*TODO?*/, rFilterName );
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi,
                       ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView,
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index d6ccb244a91b..6de0e8ab62e8 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
-//------------------------------------------------------------------------
+
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sot/exchange.hxx>
@@ -439,7 +439,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
 
     if( SvtModuleOptions().IsChart() )
     {
-        // ----------------------------------------
+
         // BM/IHA --
 
         // get range
@@ -487,7 +487,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView*
                 pViewSh->GetViewData()->GetView()->Unmark();
         }
 
-        // ----------------------------------------
+
         // adapted old code
         pView->UnmarkAll();
 
diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx
index 0e600076857a..e620d98b1b07 100644
--- a/sc/source/ui/drawfunc/fumark.cxx
+++ b/sc/source/ui/drawfunc/fumark.cxx
@@ -31,7 +31,7 @@
 #include "drawview.hxx"
 #include "markdata.hxx"
 
-//------------------------------------------------------------------
+
 
 /*************************************************************************
 |*
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 3116a15449dc..bbd74536f293 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -48,7 +48,7 @@
 #include "docuno.hxx"
 #include "docsh.hxx"
 
-// -----------------------------------------------------------------------
+
 
 //  Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten
 //! fusel,fuconstr,futext - zusammenfassen!
@@ -56,7 +56,7 @@
 // Min necessary mouse motion for normal dragging
 #define SC_MINDRAGMOVE 2
 
-// -----------------------------------------------------------------------
+
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index 7d3ac3b547ff..b8de82e13cd2 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -37,7 +37,7 @@
 #include "drawview.hxx"
 #include <svx/sdrhittesthelper.hxx>
 
-// -----------------------------------------------------------------------
+
 
 inline long Diff( const Point& rP1, const Point& rP2 )
 {
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 76a3c7c3fdb5..6374d536d8b9 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -46,7 +46,7 @@
 //! fusel,fuconstr,futext - zusammenfassen!
 #define SC_MAXDRAGMOVE  3
 
-//------------------------------------------------------------------
+
 
 static void lcl_InvalidateAttribs( SfxBindings& rBindings )
 {
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 55bf00d1ca8b..e043ec1a8374 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -24,7 +24,7 @@
 #include "futext.hxx"
 #include "tabvwsh.hxx"
 
-//------------------------------------------------------------------------
+
 
 SdrOutliner* FuText::MakeOutliner()
 {
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index af833dabdea0..29112e429ff4 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -44,12 +44,12 @@
 #include "drawview.hxx"
 #include "undocell.hxx"
 
-// ------------------------------------------------------------------------------------
+
 //  Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden,
 //  damit die Aenderungen ins Dokument uebernommen werden!
 //  (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte)
 //  bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx).
-// ------------------------------------------------------------------------------------
+
 
 void FuText::StopEditMode(bool /*bTextDirection*/)
 {
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 1aa9df2b6603..ef0928e7ee4c 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -40,7 +40,7 @@
 #include "dwfunctr.hrc"
 #include "dwfunctr.hxx"
 
-// -----------------------------------------------------------------------
+
 
 SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX )
 
@@ -801,7 +801,7 @@ void ScFunctionDockWin::UpdateFunctionList()
     }
 
 
-    //------------------------------------------------------
+
     pAllFuncList->SetUpdateMode( true );
 
     if ( pAllFuncList->GetEntryCount() > 0 )
@@ -1099,7 +1099,7 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const
 {
diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx
index 679e31f7f7c5..8b4853566f96 100644
--- a/sc/source/ui/formdlg/formdata.cxx
+++ b/sc/source/ui/formdlg/formdata.cxx
@@ -34,7 +34,7 @@ ScFormEditData::ScFormEditData( const ScFormEditData& r )  : formula::FormEditDa
 {
     *this = r;
 }
-// -----------------------------------------------------------------------------
+
 void ScFormEditData::SaveValues()
 {
     ScFormEditData* pTemp = new ScFormEditData(*this);
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index f509e2db1e3c..38b9f5bfe45d 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -197,7 +197,7 @@ void ScFormulaDlg::notifyChange()
     if ( pInputHdl )
         pInputHdl->NotifyChange( NULL );
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaDlg::fill()
 {
     ScModule* pScMod = SC_MOD();
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index e43741fb89af..8ed0dce25906 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -371,7 +371,7 @@ void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScPrivatSplit::StateChanged( StateChangedType nType )
 {
@@ -395,7 +395,7 @@ void ScPrivatSplit::StateChanged( StateChangedType nType )
     Control::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 49f3da52b960..547cb9ea8b0e 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -54,7 +54,7 @@
 
 //============================================================================
 //  class ScRedlinData
-//----------------------------------------------------------------------------
+
 ScRedlinData::ScRedlinData()
     :RedlinData()
 {
@@ -81,7 +81,7 @@ ScRedlinData::~ScRedlinData()
 
 //============================================================================
 //  class ScAcceptChgDlg
-//----------------------------------------------------------------------------
+
 ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     ScViewData* ptrViewData)
     : SfxModelessDialog(pB, pCW, pParent,
@@ -1827,7 +1827,7 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const
 {
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 2dcb9cf10f3e..7d874cce6690 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -64,7 +64,7 @@ ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi
     ScInputOptions aInputOption=SC_MOD()->GetInputOptions();
     bEnableColorRef=aInputOption.GetRangeFinder();
 }
-// -----------------------------------------------------------------------------
+
 ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
 {
     if (bAccInserted)
@@ -79,7 +79,7 @@ ScFormulaReferenceHelper::~ScFormulaReferenceHelper()
     if ( pInputHdl )
         pInputHdl->ResetDelayTimer();   // stop the timer for disabling the input line
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::enableInput( bool bEnable )
 {
     TypeId aType(TYPE(ScDocShell));
@@ -115,7 +115,7 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable )
         pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
     }
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::ShowSimpleReference(const OUString& rStr)
 {
     if( bEnableColorRef )
@@ -144,7 +144,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference(const OUString& rStr)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc )
 {
     bool bError = false;
@@ -175,7 +175,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUStr
 
     return !bError;
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr)
 {
     if( bEnableColorRef)
@@ -231,7 +231,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode )
 {
     ScViewData* pViewData=ScDocShell::GetViewData();
@@ -252,7 +252,7 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode )
         bHighlightRef=false;
     }
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::ShowReference(const OUString& rStr)
 {
     if( bEnableColorRef )
@@ -276,7 +276,7 @@ void ScFormulaReferenceHelper::ShowReference(const OUString& rStr)
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton )
 {
     if( !pRefEdit && pEdit )
@@ -309,7 +309,7 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::R
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::Init()
 {
     ScViewData* pViewData=ScDocShell::GetViewData();    //! use pScViewShell?
@@ -328,7 +328,7 @@ void ScFormulaReferenceHelper::Init()
         nRefTab = nTab;
     }
 }
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel )
 {
     if ( !pSelAccel )
@@ -443,7 +443,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton )
 {
     if (!pRefEdit)
@@ -589,7 +589,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton )
 {
     if( pEdit )
@@ -609,7 +609,7 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 bool ScFormulaReferenceHelper::DoClose( sal_uInt16 nId )
 {
     SfxApplication* pSfxApp = SFX_APP();
@@ -672,7 +672,7 @@ void ScFormulaReferenceHelper::SetDispatcherLock( bool bLock )
     //  that view's dispatcher is locked when trying to create the dialog
     //  for that view (ScTabViewShell::CreateRefDialog)
 }
-// -----------------------------------------------------------------------------
+
 void ScFormulaReferenceHelper::ViewShellChanged()
 {
     enableInput( false );
@@ -715,7 +715,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren)
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 
 
@@ -750,7 +750,7 @@ static void lcl_InvalidateWindows()
         pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType);
     }
 }
-//----------------------------------------------------------------------------
+
 
 static void lcl_HideAllReferences()
 {
@@ -766,7 +766,7 @@ static void lcl_HideAllReferences()
 //============================================================================
 //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker
 //  class ScRefHandler
-//----------------------------------------------------------------------------
+
 
 ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ):
         m_rWindow( rWindow ),
@@ -833,7 +833,7 @@ bool ScRefHandler::EnterRefMode()
     return m_bInRefMode = true;
 }
 
-//----------------------------------------------------------------------------
+
 
 ScRefHandler::~ScRefHandler()
 {
@@ -860,7 +860,7 @@ bool ScRefHandler::LeaveRefMode()
     return true;
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScRefHandler::SwitchToDocument()
 {
@@ -890,7 +890,7 @@ void ScRefHandler::SwitchToDocument()
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const   // pDocSh may be 0
 {
@@ -903,14 +903,14 @@ bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const   // pDocSh may be
     return ( aDocName.isEmpty() || aDocName == aCmpName );
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScRefHandler::IsRefInputMode() const
 {
     return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScRefHandler::DoClose( sal_uInt16 nId )
 {
@@ -923,21 +923,21 @@ void ScRefHandler::SetDispatcherLock( bool bLock )
     m_aHelper.SetDispatcherLock( bLock );
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScRefHandler::ViewShellChanged()
 {
     m_aHelper.ViewShellChanged();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScRefHandler::AddRefEntry()
 {
     //  wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScRefHandler::IsTableLocked() const
 {
@@ -946,12 +946,12 @@ bool ScRefHandler::IsTableLocked() const
     return false;
 }
 
-//----------------------------------------------------------------------------
+
 //
 //  RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld
 //  (per Button oder Bewegung)
 //
-//----------------------------------------------------------------------------
+
 
 void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton )
 {
@@ -1005,33 +1005,33 @@ IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl)
     }
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc )
 {
     return m_aHelper.ParseWithNames( rRanges, rStr, pDoc );
 }
-// -----------------------------------------------------------------------------
+
 void ScRefHandler::HideReference( bool bDoneRefMode )
 {
     m_aHelper.HideReference( bDoneRefMode );
 }
-// -----------------------------------------------------------------------------
+
 void ScRefHandler::ShowReference(const OUString& rStr)
 {
     m_aHelper.ShowReference(rStr);
 }
-// -----------------------------------------------------------------------------
+
 void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton )
 {
     m_aHelper.ReleaseFocus( pEdit,pButton );
 }
-//----------------------------------------------------------------------------
+
 void ScRefHandler::RefInputDone( bool bForced )
 {
     m_aHelper.RefInputDone( bForced );
 }
 
-//-------------------------------------------------------------------------------
+
 
 ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID,
     const OUString& rUIXMLDescription)
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 9dec29a779c6..1d3bc2874a0c 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -81,14 +81,14 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume
     Init();
 }
 
-//------------------------------------------------------------------------
+
 
 ScAutoFmtPreview::~ScAutoFmtPreview()
 {
     delete pNumFmt;
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_SetFontProperties(
         Font& rFont,
@@ -152,7 +152,7 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va
     }
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const
 {
@@ -179,15 +179,15 @@ const SvxLineItem& ScAutoFmtPreview::GetDiagItem( size_t nCol, size_t nRow, bool
     return *static_cast< const SvxLineItem* >( pCurData->GetItem( GetFormatIndex( nCol, nRow ), bTLBR ? ATTR_BORDER_TLBR : ATTR_BORDER_BLTR ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
 {
     if ( pCurData )
     {
-        //------------------------
+
         // Ausgabe des Zelltextes:
-        //------------------------
+
 
         OUString  cellString;
         sal_Bool    bNumFormat  = pCurData->GetIncludeValueFormat();
@@ -253,9 +253,9 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
             SvxHorJustifyItem    aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY );
             SvxCellHorJustify      eJustification;
 
-            //-------------
+
             // Ausrichtung:
-            //-------------
+
             eJustification  = mbRTL ? SVX_HOR_JUSTIFY_RIGHT : bJustify ?
                 (SvxCellHorJustify)(((const SvxHorJustifyItem*)pCurData->GetItem( nFmtIndex, ATTR_HOR_JUSTIFY ))->GetValue()) :
                 SVX_HOR_JUSTIFY_STANDARD;
@@ -306,14 +306,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
                                   - aStrSize.Width()
                                   - FRAME_OFFSET );
 
-            //-----------------------------
+
             // vertikal (immer zentrieren):
-            //-----------------------------
+
             aPos.Y() += (mnRowHeight - (sal_uInt16)aStrSize.Height()) / 2;
 
-            //-----------
+
             // horizontal
-            //-----------
+
             if ( eJustification != SVX_HOR_JUSTIFY_STANDARD )
             {
                 sal_uInt16 nHorPos = (sal_uInt16)
@@ -340,9 +340,9 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
             }
             else
             {
-                //---------------------
+
                 // Standardausrichtung:
-                //---------------------
+
                 if ( (nCol == 0) || (nRow == 0) )
                 {
                     // Text-Label links oder Summe linksbuendig
@@ -355,16 +355,16 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow )
                 }
             }
 
-            //-------------------------------
+
             aScriptedText.DrawText( aPos );
-            //-------------------------------
+
         }
     }
 }
 
 #undef FRAME_OFFSET
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::DrawStrings()
 {
@@ -373,7 +373,7 @@ void ScAutoFmtPreview::DrawStrings()
             DrawString( nCol, nRow );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::DrawBackground()
 {
@@ -396,7 +396,7 @@ void ScAutoFmtPreview::DrawBackground()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::PaintCells()
 {
@@ -415,7 +415,7 @@ void ScAutoFmtPreview::PaintCells()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::Init()
 {
@@ -436,7 +436,7 @@ void ScAutoFmtPreview::Init()
     mbRTL = pDoc->IsLayoutRTL( nCurrentTab );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP )
 {
@@ -452,7 +452,7 @@ void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP )
     aPrvSize.Height() = maArray.GetHeight() + 4;
 }
 
-//------------------------------------------------------------------------
+
 
 inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::SvxBorderLine* pBorder )
 {
@@ -488,7 +488,7 @@ void ScAutoFmtPreview::CalcLineMap()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
 {
@@ -508,7 +508,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData )
     DoPaint( Rectangle( Point(0,0), GetSizePixel() ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
 {
@@ -540,7 +540,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ )
     aVD.SetDrawMode( nOldDrawMode );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFmtPreview::Paint( const Rectangle& rRect )
 {
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx
index e0c53ea02492..8d7eecbe01cd 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -478,7 +478,7 @@ void ScColRowNameRangesDlg::SetActive()
 void ScColRowNameRangesDlg::UpdateNames()
 {
     pLbRange->SetUpdateMode( false );
-    //-----------------------------------------------------------
+
     pLbRange->Clear();
     aRangeMap.clear();
     pEdAssign->SetText( EMPTY_OUSTRING );
@@ -590,7 +590,7 @@ void ScColRowNameRangesDlg::UpdateNames()
         }
         delete [] ppSortArray;
     }
-    //-----------------------------------------------------------
+
     pLbRange->SetUpdateMode( true );
     pLbRange->Invalidate();
 }
@@ -666,7 +666,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const
     return (pEdActive != NULL);
 }
 
-//------------------------------------------------------------------------
+
 // Handler:
 // ========
 
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index 62fcaafa7187..94ea4e734932 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -9,7 +9,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------
+
 
 #include "datafdlg.hxx"
 #include "scresid.hxx"
diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx
index f93a040b153a..0f5cc7dce2a2 100644
--- a/sc/source/ui/miscdlgs/delcldlg.cxx
+++ b/sc/source/ui/miscdlgs/delcldlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "delcldlg.hxx"
 #include "scresid.hxx"
@@ -65,7 +65,7 @@ ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove)
     }
 }
 
-//------------------------------------------------------------------------
+
 
 DelCellCmd ScDeleteCellDlg::GetDelCellCmd() const
 {
diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx
index cb9d15d7fb85..deb5e2d58a2b 100644
--- a/sc/source/ui/miscdlgs/delcodlg.cxx
+++ b/sc/source/ui/miscdlgs/delcodlg.cxx
@@ -19,7 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------
+
 
 #include "delcodlg.hxx"
 #include "scresid.hxx"
@@ -33,7 +33,7 @@ sal_uInt16 ScDeleteContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING
                                                  IDF_NOTE     | IDF_FORMULA |
                                                  IDF_VALUE);
 
-//-----------------------------------------------------------------------
+
 
 ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
                                           sal_uInt16  nCheckDefaults ) :
@@ -78,7 +78,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent,
     aBtnDelAll->SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const
 {
@@ -106,7 +106,7 @@ sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const
                 : ScDeleteContentsDlg::nPreviousChecks );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked )
 {
@@ -135,7 +135,7 @@ void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDeleteContentsDlg::DisableObjects()
 {
@@ -144,7 +144,7 @@ void ScDeleteContentsDlg::DisableObjects()
     aBtnDelObjects->Disable();
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl)
 {
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index 1e28222655f5..409498d92996 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//----------------------------------------------------------------------------
+
 
 #include <svl/zforlist.hxx>
 #include <vcl/msgbox.hxx>
@@ -42,7 +42,7 @@
 //============================================================================
 // class ScFillSeriesDlg
 
-//----------------------------------------------------------------------------
+
 
 ScFillSeriesDlg::ScFillSeriesDlg( Window*       pParent,
                                   ScDocument&   rDocument,
@@ -88,13 +88,13 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window*       pParent,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScFillSeriesDlg::~ScFillSeriesDlg()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag)
 {
@@ -111,7 +111,7 @@ void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag)
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
 {
@@ -200,7 +200,7 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScFillSeriesDlg::CheckStartVal()
 {
@@ -221,7 +221,7 @@ bool ScFillSeriesDlg::CheckStartVal()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScFillSeriesDlg::CheckIncrementVal()
 {
@@ -232,7 +232,7 @@ bool ScFillSeriesDlg::CheckIncrementVal()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScFillSeriesDlg::CheckEndVal()
 {
@@ -253,9 +253,9 @@ bool ScFillSeriesDlg::CheckEndVal()
 }
 
 
-//----------------------------------------------------------------------------
+
 // Handler:
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn )
 {
@@ -294,7 +294,7 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl)
 {
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index acaecbf58a6d..f5689f338bdf 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "groupdlg.hxx"
 #include "scresid.hxx"
@@ -50,14 +50,14 @@ ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows)
     m_pBtnRows->GrabFocus();
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScGroupDlg::GetColsChecked() const
 {
     return m_pBtnCols->IsChecked();
 }
 
-//------------------------------------------------------------------------
+
 
 ScGroupDlg::~ScGroupDlg()
 {
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index aa915d4d1a15..58b32da9dd70 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -39,7 +39,7 @@
 //============================================================================
 //  class ScHighlightChgDlg
 
-//----------------------------------------------------------------------------
+
 ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
                       ScViewData*       ptrViewData)
     : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog",
@@ -133,7 +133,7 @@ void ScHighlightChgDlg::Init()
     HighlightHandle(m_pHighlightBox);
 }
 
-//----------------------------------------------------------------------------
+
 // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
 // neue Selektion im Referenz-Edit angezeigt wird.
 
@@ -149,7 +149,7 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
     }
 }
 
-//----------------------------------------------------------------------------
+
 bool ScHighlightChgDlg::Close()
 {
     return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() );
diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx
index 0d522c80224f..ac7760f6bf2c 100644
--- a/sc/source/ui/miscdlgs/inscldlg.cxx
+++ b/sc/source/ui/miscdlgs/inscldlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "inscldlg.hxx"
 #include "scresid.hxx"
@@ -66,7 +66,7 @@ ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) :
     }
 }
 
-//------------------------------------------------------------------------
+
 
 InsCellCmd ScInsertCellDlg::GetInsCellCmd() const
 {
diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx
index 5213cad3f49a..3c979b539e74 100644
--- a/sc/source/ui/miscdlgs/inscodlg.cxx
+++ b/sc/source/ui/miscdlgs/inscodlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "inscodlg.hxx"
 #include "scresid.hxx"
@@ -37,7 +37,7 @@ sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
 sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0;
 sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;   // enum InsCellCmd
 
-//-----------------------------------------------------------------------
+
 
 ScInsertContentsDlg::ScInsertContentsDlg( Window*       pParent,
                                           sal_uInt16        nCheckDefaults,
@@ -124,7 +124,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window*       pParent,
 
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const
 {
@@ -152,7 +152,7 @@ sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const
                 : ScInsertContentsDlg::nPreviousChecks );
 }
 
-//------------------------------------------------------------------------
+
 
 InsCellCmd ScInsertContentsDlg::GetMoveMode()
 {
@@ -164,7 +164,7 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode()
     return INS_NONE;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInsertContentsDlg::DisableChecks( bool bInsAllChecked )
 {
@@ -285,7 +285,7 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable )
 }
 
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl)
 {
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 86367d7c49b5..ade61782d536 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include <sfx2/app.hxx>
 #include <sfx2/docfile.hxx>
@@ -71,7 +71,7 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT
     Init_Impl( bFromFile );
 }
 
-//------------------------------------------------------------------------
+
 
 ScInsertTableDlg::~ScInsertTableDlg()
 {
@@ -80,7 +80,7 @@ ScInsertTableDlg::~ScInsertTableDlg()
     delete pDocInserter;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInsertTableDlg::Init_Impl( bool bFromFile )
 {
@@ -130,7 +130,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 short ScInsertTableDlg::Execute()
 {
@@ -146,7 +146,7 @@ short ScInsertTableDlg::Execute()
     return nRet;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInsertTableDlg::SetNewTable_Impl()
 {
@@ -167,7 +167,7 @@ void ScInsertTableDlg::SetNewTable_Impl()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInsertTableDlg::SetFromTo_Impl()
 {
@@ -184,7 +184,7 @@ void ScInsertTableDlg::SetFromTo_Impl()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
 {
@@ -209,7 +209,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc )
         m_pLbTables->SelectEntryPos(0);
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
 {
@@ -232,7 +232,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN )
     return pStr;
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
 {
@@ -251,9 +251,9 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN )
 }
 
 
-//------------------------------------------------------------------------
+
 // Handler:
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl)
 {
@@ -277,7 +277,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl)
 {
     if ( m_pBtnNew->IsChecked() )
@@ -289,7 +289,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl)
 {
@@ -301,7 +301,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl)
 {
@@ -309,7 +309,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScInsertTableDlg::DoEnable_Impl()
 {
diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx
index 2ed54313ccaf..71bb8561f00a 100644
--- a/sc/source/ui/miscdlgs/lbseldlg.cxx
+++ b/sc/source/ui/miscdlgs/lbseldlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include <vcl/msgbox.hxx>
 
@@ -48,14 +48,14 @@ ScSelEntryDlg::ScSelEntryDlg(Window*  pParent, const std::vector<OUString> &rEnt
         m_pLb->SelectEntryPos( 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScSelEntryDlg::GetSelectEntry() const
 {
     return m_pLb->GetSelectEntry();
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl)
 {
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 0dcf2b283767..99bcb8ced250 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "mtrindlg.hxx"
 #include "scresid.hxx"
@@ -66,7 +66,7 @@ ScMetricInputDlg::ScMetricInputDlg( Window*         pParent,
     m_pBtnDefVal->Check( nCurrentValue == nDefaultValue );
 }
 
-//------------------------------------------------------------------------
+
 
 long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const
 {
@@ -92,7 +92,7 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const
     return sal::static_int_cast<long>( m_pEdValue->Denormalize( m_pEdValue->GetValue( eUnit ) ) );
 }
 
-//------------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl)
@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl)
 {
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 32c75cee5fe0..9e7bda9667ed 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include <vcl/msgbox.hxx>
 
@@ -70,13 +70,13 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault)
     Init();
 }
 
-//------------------------------------------------------------------------
+
 
 ScMoveTableDlg::~ScMoveTableDlg()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument;  }
 
@@ -214,7 +214,7 @@ bool ScMoveTableDlg::IsCurrentDocSelected() const
     return pLbDoc->GetSelectEntryPos() == mnCurrentDocPos;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScMoveTableDlg::Init()
 {
@@ -230,7 +230,7 @@ void ScMoveTableDlg::Init()
     SelHdl( pLbDoc );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScMoveTableDlg::InitDocListBox()
 {
@@ -271,7 +271,7 @@ void ScMoveTableDlg::InitDocListBox()
     pLbDoc->SelectEntryPos( nSelPos );
 }
 
-//------------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn )
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index df8fb341c65d..a8f50292ccca 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -65,7 +65,7 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds )
     m_pFtTime->SetText( aNew );
 }
 
-//----------------------------------------------------------------------------
+
 
 ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUString& rErrorText )
     : ModalDialog(pParent, "NoSolutionDialog", "modules/scalc/ui/nosolutiondialog.ui")
@@ -74,7 +74,7 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUStr
     m_pFtErrorText->SetText(rErrorText);
 }
 
-//----------------------------------------------------------------------------
+
 
 ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString& rSolution )
     : ModalDialog(pParent, "SolverSuccessDialog", "modules/scalc/ui/solversuccessdialog.ui")
@@ -97,7 +97,7 @@ IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel )
     : formula::RefEdit( pParent, pLabel )
@@ -132,7 +132,7 @@ void ScCursorRefEdit::KeyInput( const KeyEvent& rKEvt )
         formula::RefEdit::KeyInput( rKEvt );
 }
 
-//----------------------------------------------------------------------------
+
 
 ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue,
                              const OUString& rTarget, const OUString& rVariable,
@@ -153,7 +153,7 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM
 
 //============================================================================
 //  class ScOptSolverDlg
-//----------------------------------------------------------------------------
+
 
 ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
                           ScDocShell* pDocSh, ScAddress aCursorPos )
@@ -275,13 +275,13 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP
     Init( aCursorPos );
 }
 
-//----------------------------------------------------------------------------
+
 
 ScOptSolverDlg::~ScOptSolverDlg()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
 {
@@ -390,7 +390,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos)
     mpEdActive = m_pEdObjectiveCell;
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScOptSolverDlg::ReadConditions()
 {
@@ -449,14 +449,14 @@ void ScOptSolverDlg::EnableButtons()
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScOptSolverDlg::Close()
 {
     return DoClose( ScOptSolverDlgWrapper::GetChildWindowId() );
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScOptSolverDlg::SetActive()
 {
@@ -473,7 +473,7 @@ void ScOptSolverDlg::SetActive()
     RefInputDone();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
@@ -526,14 +526,14 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScOptSolverDlg::IsRefInputMode() const
 {
     return mpEdActive != NULL;
 }
 
-//----------------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn )
@@ -581,7 +581,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl )
 {
@@ -612,7 +612,7 @@ IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl)
 {
@@ -620,7 +620,7 @@ IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl)
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn )
 {
@@ -650,7 +650,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl)
 {
@@ -751,7 +751,7 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit*, pEdit )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus )
 {
@@ -764,7 +764,7 @@ void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAllowRange )
 {
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index 04650ada93e9..c738ba3a8593 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -25,7 +25,7 @@
 #include "tabvwsh.hxx"
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-//------------------------------------------------------------------------
+
 
 ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet,
                     ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext)
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index 489317c7fd69..4b1d4fa7f3c2 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "scitems.hxx"
 #include <svx/algitem.hxx>
@@ -99,14 +99,14 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window*                   pParent,
     FreeResource();
 }
 
-//------------------------------------------------------------------------
+
 
 ScAutoFormatDlg::~ScAutoFormatDlg()
 {
     delete pWndPreview;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFormatDlg::Init()
 {
@@ -155,7 +155,7 @@ void ScAutoFormatDlg::Init()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAutoFormatDlg::UpdateChecks()
 {
@@ -169,9 +169,9 @@ void ScAutoFormatDlg::UpdateChecks()
     aBtnAdjust   .Check( pData->GetIncludeWidthHeight() );
 }
 
-//------------------------------------------------------------------------
+
 // Handler:
-//---------
+
 
 IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn )
 {
@@ -185,7 +185,7 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl)
 {
@@ -197,7 +197,7 @@ IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl)
 }
 IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl)
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
 {
@@ -228,7 +228,7 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl)
 {
@@ -302,7 +302,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl)
 {
@@ -427,7 +427,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl)
 {
@@ -451,7 +451,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString ScAutoFormatDlg::GetCurrFormatName()
 {
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index 247b50dee34d..7a1f93d39f13 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include <vcl/msgbox.hxx>
 
@@ -45,7 +45,7 @@ ScShowTabDlg::ScShowTabDlg(Window* pParent)
     m_pLb->SetDoubleClickHdl( LINK( this, ScShowTabDlg, DblClkHdl ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScShowTabDlg::SetDescription(
         const OUString& rTitle, const OUString& rFixedText,
@@ -64,7 +64,7 @@ void ScShowTabDlg::Insert( const OUString& rString, bool bSelected )
         m_pLb->SelectEntryPos( m_pLb->GetEntryCount() - 1 );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 ScShowTabDlg::GetSelectEntryCount() const
 {
@@ -81,7 +81,7 @@ sal_uInt16 ScShowTabDlg::GetSelectEntryPos(sal_uInt16 nPos) const
     return m_pLb->GetSelectEntryPos(nPos);
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(ScShowTabDlg, DblClkHdl)
 {
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index f44668da4134..e9ab70bb22cc 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -61,26 +61,26 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa
     SetDispatcherLock( true ); // Modal-Modus einschalten
 }
 
-//----------------------------------------------------------------------------
+
 ScSimpleRefDlg::~ScSimpleRefDlg()
 {
     SetDispatcherLock( false ); // Modal-Modus einschalten
 }
 
-//----------------------------------------------------------------------------
+
 void ScSimpleRefDlg::FillInfo(SfxChildWinInfo& rWinInfo) const
 {
     ScAnyRefDlg::FillInfo(rWinInfo);
     rWinInfo.bVisible=bAutoReOpen;
 }
 
-//----------------------------------------------------------------------------
+
 void ScSimpleRefDlg::SetRefString(const OUString &rStr)
 {
     m_pEdAssign->SetText(rStr);
 }
 
-//----------------------------------------------------------------------------
+
 void ScSimpleRefDlg::Init()
 {
     m_pBtnOk->SetClickHdl      ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) );
@@ -88,7 +88,7 @@ void ScSimpleRefDlg::Init()
     bCloseFlag=false;
 }
 
-//----------------------------------------------------------------------------
+
 // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
 //  neue Selektion im Referenz-Fenster angezeigt wird.
 void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
@@ -126,14 +126,14 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 }
 
 
-//----------------------------------------------------------------------------
+
 bool ScSimpleRefDlg::Close()
 {
     CancelBtnHdl(m_pBtnCancel);
     return true;
 }
 
-//------------------------------------------------------------------------
+
 void ScSimpleRefDlg::SetActive()
 {
     m_pEdAssign->GrabFocus();
@@ -144,7 +144,7 @@ void ScSimpleRefDlg::SetActive()
 
     RefInputDone();
 }
-//------------------------------------------------------------------------
+
 bool ScSimpleRefDlg::IsRefInputMode() const
 {
     return true;
@@ -193,7 +193,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced)
     if ( (bForced || bCloseOnButtonUp) && bCloseFlag )
         OkBtnHdl(m_pBtnOk);
 }
-//------------------------------------------------------------------------
+
 // Handler:
 // ========
 IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl)
@@ -207,7 +207,7 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl)
 {
     bAutoReOpen=false;
@@ -221,6 +221,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl)
 
 
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 6e9acc0dd917..76ed6391f3ce 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -55,7 +55,7 @@ struct ScSolverOptionsEntry
     }
 };
 
-//------------------------------------------------------------------
+
 
 class ScSolverOptionsString : public SvLBoxString
 {
@@ -106,7 +106,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const
     rDev.SetFont( aOldFont );
 }
 
-//------------------------------------------------------------------
+
 
 ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent,
                         const uno::Sequence<OUString>& rImplNames,
@@ -392,7 +392,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl)
     return 0;
 }
 
-//------------------------------------------------------------------
+
 
 ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent)
     : ModalDialog( pParent, "IntegerDialog",
@@ -422,7 +422,7 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const
     return (sal_Int32) nValue;
 }
 
-//------------------------------------------------------------------
+
 
 ScSolverValueDialog::ScSolverValueDialog( Window * pParent )
     : ModalDialog( pParent, "DoubleDialog",
diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx
index 57dddbe7b751..a8f401d4b210 100644
--- a/sc/source/ui/miscdlgs/solverutil.cxx
+++ b/sc/source/ui/miscdlgs/solverutil.cxx
@@ -33,7 +33,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 #define SCSOLVER_SERVICE "com.sun.star.sheet.Solver"
 
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 6762b599a028..7999bd8b2c09 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -74,13 +74,13 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     Init();
 }
 
-//----------------------------------------------------------------------------
+
 
 ScSolverDlg::~ScSolverDlg()
 {
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScSolverDlg::Init()
 {
@@ -107,14 +107,14 @@ void ScSolverDlg::Init()
     pEdActive = m_pEdFormulaCell;
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScSolverDlg::Close()
 {
     return DoClose( ScSolverDlgWrapper::GetChildWindowId() );
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScSolverDlg::SetActive()
 {
@@ -131,7 +131,7 @@ void ScSolverDlg::SetActive()
     RefInputDone();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
@@ -155,7 +155,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScSolverDlg::RaiseError( ScSolverErr eError )
 {
@@ -183,14 +183,14 @@ void ScSolverDlg::RaiseError( ScSolverErr eError )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScSolverDlg::IsRefInputMode() const
 {
     return pEdActive != NULL;
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal )
 {
@@ -200,7 +200,7 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal )
     return pDoc->GetFormatTable()->IsNumberFormat( rStrVal, n1, n2 );
 }
 
-//----------------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
@@ -261,7 +261,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl )
 {
@@ -281,7 +281,7 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl)
 {
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index e19317a9bf37..26000471746e 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -20,7 +20,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------
+
 
 #include "tabbgcolordlg.hxx"
 #include "scresid.hxx"
@@ -65,7 +65,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle,
     m_pBtnOk->SetClickHdl( HDL(TabBgColorOKHdl_Impl) );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const
 {
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index 67c08135fdd6..5c74f8e76b4f 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -33,7 +33,7 @@
 
 //============================================================================
 //  class ScTabOpDlg
-//----------------------------------------------------------------------------
+
 
 ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
                         ScDocument*         pDocument,
@@ -77,14 +77,14 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     Init();
 }
 
-//----------------------------------------------------------------------------
+
 
 ScTabOpDlg::~ScTabOpDlg()
 {
     Hide();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScTabOpDlg::Init()
 {
@@ -114,14 +114,14 @@ void ScTabOpDlg::Init()
     //SFX_APPWINDOW->Enable();
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScTabOpDlg::Close()
 {
     return DoClose( ScTabOpDlgWrapper::GetChildWindowId() );
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScTabOpDlg::SetActive()
 {
@@ -137,7 +137,7 @@ void ScTabOpDlg::SetActive()
     RefInputDone();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
@@ -174,7 +174,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScTabOpDlg::RaiseError( ScTabOpErr eError )
 {
@@ -223,7 +223,7 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError )
     pEd->GrabFocus();
 }
 
-//----------------------------------------------------------------------------
+
 
 static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab,
                 ScRefAddress& rStart, ScRefAddress& rEnd )
@@ -240,7 +240,7 @@ static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCur
     return bRet;
 }
 
-//----------------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
@@ -323,7 +323,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl )
 {
@@ -342,7 +342,7 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl )
     return 0;
 }
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl)
 {
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 3b19249be091..27f505a9ac7e 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -30,7 +30,7 @@
 #include "sc.hrc"
 #include <svl/intitem.hxx>
 #include <svx/flagsdef.hxx>
-// -----------------------------------------------------------------------
+
 
 ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
                     const SfxObjectShell* pDocShell )
@@ -45,7 +45,7 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr,
     AddTabPage("position", RID_SVXPAGE_CHAR_POSITION);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
@@ -65,7 +65,7 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr)
     : SfxTabDialog(pParent, "ParagraphDialog",
@@ -82,7 +82,7 @@ ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr)
     m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index 166e8123897f..606e4d113c11 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -58,7 +58,7 @@ void ScCbWarningBox::DisableDialog()
 }
 
 
-// ----------------------------------------------------------------------------
+
 
 ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) :
     ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true )
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index e29eff38e977..0bae7989c7b5 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "namepast.hxx"
 #include "scresid.hxx"
@@ -76,7 +76,7 @@ ScNamePasteDlg::~ScNamePasteDlg()
     delete mpTable;
 }
 
-//------------------------------------------------------------------
+
 
 IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton )
 {
@@ -101,7 +101,7 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton )
     return 0;
 }
 
-//------------------------------------------------------------------
+
 
 std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const
 {
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 9297aae5f350..a3be41e53ba7 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -28,7 +28,7 @@
 // STATIC DATA -----------------------------------------------------------
 
 
-//------------------------------------------------------------------------
+
 
 ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16          nIdP,
                                                       ScNavigatorDlg& rDlg,
@@ -38,7 +38,7 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16          nIdP,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */,
                                                           const SfxPoolItem* pItem )
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 0e8319242828..f0e8c493b77a 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -64,7 +64,7 @@ static const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength
 
 #define SCNAV_MAXROW        (MAXROWCOUNT)
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::ReleaseFocus()
 {
@@ -91,13 +91,13 @@ ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId )
     SetMaxTextLen( SCNAV_COLDIGITS );   // 1...256...18278 or A...IV...ZZZ
 }
 
-//------------------------------------------------------------------------
+
 
 ColumnEdit::~ColumnEdit()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 bool ColumnEdit::Notify( NotifyEvent& rNEvt )
 {
@@ -129,7 +129,7 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::LoseFocus()
 {
@@ -137,7 +137,7 @@ void ColumnEdit::LoseFocus()
 }
 
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::Up()
 {
@@ -149,7 +149,7 @@ void ColumnEdit::Up()
         nCol--;
 }
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::Down()
 {
@@ -157,7 +157,7 @@ void ColumnEdit::Down()
         SetCol( nCol-1 );
 }
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::First()
 {
@@ -165,7 +165,7 @@ void ColumnEdit::First()
     SetText(OUString('A'));
 }
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::Last()
 {
@@ -175,7 +175,7 @@ void ColumnEdit::Last()
 }
 
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::EvalText()
 {
@@ -197,7 +197,7 @@ void ColumnEdit::EvalText()
     nKeyGroup = KEYGROUP_ALPHA;
 }
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::ExecuteCol()
 {
@@ -209,7 +209,7 @@ void ColumnEdit::ExecuteCol()
         rDlg.SetCurrentCell( nCol-1, nRow-1 );
 }
 
-//------------------------------------------------------------------------
+
 
 void ColumnEdit::SetCol( SCCOL nColNo )
 {
@@ -228,7 +228,7 @@ void ColumnEdit::SetCol( SCCOL nColNo )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 SCCOL ColumnEdit::AlphaToNum( OUString& rStr )
 {
@@ -253,7 +253,7 @@ SCCOL ColumnEdit::AlphaToNum( OUString& rStr )
     return nColumn;
 }
 
-//------------------------------------------------------------------------
+
 
 SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr )
 {
@@ -267,7 +267,7 @@ SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr )
     return nColumn;
 }
 
-//------------------------------------------------------------------------
+
 
 SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr )
 {
@@ -293,13 +293,13 @@ RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId )
     SetLast( SCNAV_MAXROW);
 }
 
-//------------------------------------------------------------------------
+
 
 RowEdit::~RowEdit()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 bool RowEdit::Notify( NotifyEvent& rNEvt )
 {
@@ -320,13 +320,13 @@ bool RowEdit::Notify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-//------------------------------------------------------------------------
+
 
 void RowEdit::LoseFocus()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void RowEdit::ExecuteRow()
 {
@@ -347,13 +347,13 @@ ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId )
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScDocListBox::~ScDocListBox()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScDocListBox::Select()
 {
@@ -378,13 +378,13 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId )
     SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY );
 }
 
-//------------------------------------------------------------------------
+
 
 CommandToolBox::~CommandToolBox()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void CommandToolBox::Select( sal_uInt16 nSelId )
 {
@@ -436,13 +436,13 @@ void CommandToolBox::Select()
     Select( GetCurItemId() );
 }
 
-//------------------------------------------------------------------------
+
 
 void CommandToolBox::Click()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl)
 {
@@ -470,7 +470,7 @@ IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl)
     return 1;
 }
 
-//------------------------------------------------------------------------
+
 
 void CommandToolBox::UpdateButtons()
 {
@@ -686,12 +686,12 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
     ppBoundItems = new ScNavigatorControllerItem* [CTRL_ITEMS];
 
     rBindings.ENTERREGISTRATIONS();
-    //-----------------------------
+
     REGISTER_SLOT( 0, SID_CURRENTCELL       );
     REGISTER_SLOT( 1, SID_CURRENTTAB        );
     REGISTER_SLOT( 2, SID_CURRENTDOC        );
     REGISTER_SLOT( 3, SID_SELECT_SCENARIO   );
-    //-----------------------------
+
     rBindings.LEAVEREGISTRATIONS();
 
     StartListening( *(SFX_APP()) );
@@ -745,7 +745,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win
     aLbEntries.SetNavigatorDlgFlag(true);
 }
 
-//------------------------------------------------------------------------
+
 
 ScNavigatorDlg::~ScNavigatorDlg()
 {
@@ -762,7 +762,7 @@ ScNavigatorDlg::~ScNavigatorDlg()
     EndListening( rBindings );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::Resizing( Size& rNewSize )  // Size = Outputsize?
 {
@@ -818,14 +818,14 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt )
     Window::DataChanged( rDCEvt );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::Resize()
 {
     DoResize();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::DoResize()
 {
@@ -884,7 +884,7 @@ void ScNavigatorDlg::DoResize()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
@@ -957,7 +957,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer )
 {
@@ -968,7 +968,7 @@ IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
 {
@@ -979,7 +979,7 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
     rCfg.SetDragMode(nDropMode);
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::CursorPosChanged()
 {
@@ -989,7 +989,7 @@ void ScNavigatorDlg::CursorPosChanged()
 //  if ( GetAreaAtCursor( aStrAreaName ) )
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
 {
@@ -1025,7 +1025,7 @@ void ScNavigatorDlg::SetCurrentCellStr( const OUString rName )
                               &aNameItem, 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo )
 {
@@ -1058,7 +1058,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::SetCurrentObject( const OUString rName )
 {
@@ -1068,7 +1068,7 @@ void ScNavigatorDlg::SetCurrentObject( const OUString rName )
                               &aNameItem, 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName )        // aktivieren
 {
@@ -1078,14 +1078,14 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName )        // aktivie
                               &aDocItem, 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 ScTabViewShell* ScNavigatorDlg::GetTabViewShell() const
 {
     return PTR_CAST( ScTabViewShell, SfxViewShell::Current() );
 }
 
-//------------------------------------------------------------------------
+
 
 ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings()
 {
@@ -1098,7 +1098,7 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings()
     return pViewSh ? pViewSh->GetNavigatorSettings() : NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScNavigatorDlg::GetViewData()
 {
@@ -1108,7 +1108,7 @@ bool ScNavigatorDlg::GetViewData()
     return ( pViewData != NULL );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol )
 {
@@ -1121,7 +1121,7 @@ void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol )
     CheckDataArea();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::UpdateRow( const SCROW* pRow )
 {
@@ -1134,7 +1134,7 @@ void ScNavigatorDlg::UpdateRow( const SCROW* pRow )
     CheckDataArea();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::UpdateTable( const SCTAB* pTab )
 {
@@ -1146,7 +1146,7 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab )
     CheckDataArea();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::UpdateAll()
 {
@@ -1169,7 +1169,7 @@ void ScNavigatorDlg::UpdateAll()
     aContentTimer.Stop();       // dann nicht nochmal
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize )
 {
@@ -1211,7 +1211,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize )
         UnmarkDataArea();
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize )
 {
@@ -1259,7 +1259,7 @@ void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize )
 {
@@ -1308,11 +1308,11 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize )
 }
 
 
-//------------------------------------------------------------------------
+
 //
 //      Dokumente fuer Dropdown-Listbox
 //
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::GetDocNames( const OUString* pManualSel )
 {
@@ -1361,7 +1361,7 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel )
     aLbDocuments.SelectEntry( aSelEntry );
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::MarkDataArea()
 {
@@ -1383,7 +1383,7 @@ void ScNavigatorDlg::MarkDataArea()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::UnmarkDataArea()
 {
@@ -1396,7 +1396,7 @@ void ScNavigatorDlg::UnmarkDataArea()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::CheckDataArea()
 {
@@ -1414,7 +1414,7 @@ void ScNavigatorDlg::CheckDataArea()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::StartOfDataArea()
 {
@@ -1434,7 +1434,7 @@ void ScNavigatorDlg::StartOfDataArea()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScNavigatorDlg::EndOfDataArea()
 {
@@ -1454,7 +1454,7 @@ void ScNavigatorDlg::EndOfDataArea()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 SfxChildAlignment ScNavigatorDlg::CheckAlignment(
                             SfxChildAlignment eActAlign, SfxChildAlignment eAlign )
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index d97aeeee4da9..eb88a4b375a9 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -228,7 +228,7 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ScScenarioWindow::~ScScenarioWindow()
 {
@@ -244,7 +244,7 @@ void ScScenarioWindow::Paint( const Rectangle& rRect )
     Window::Paint( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScScenarioWindow::NotifyState( const SfxPoolItem* pState )
 {
@@ -273,7 +273,7 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScScenarioWindow::SetSizePixel( const Size& rNewSize )
 {
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 9fcfee9f4e1e..43cb3082ef6d 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include <svx/dlgutil.hxx>
 #include <svx/drawitem.hxx>
@@ -44,7 +44,7 @@
 
 #include "opredlin.hxx"
 
-//------------------------------------------------------------------
+
 
 ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent,
                                                     const SfxItemSet& rSet )
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index a51f2a26275d..2b9dcbae11e0 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -19,7 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------
+
 
 #include "scitems.hxx"
 #include <vcl/msgbox.hxx>
@@ -69,7 +69,7 @@ ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs)
     SetExchangeSupport();
 }
 
-//-----------------------------------------------------------------------
+
 
 ScTpCalcOptions::~ScTpCalcOptions()
 {
@@ -77,7 +77,7 @@ ScTpCalcOptions::~ScTpCalcOptions()
     delete pLocalOptions;
 }
 
-//-----------------------------------------------------------------------
+
 
 void ScTpCalcOptions::Init()
 {
@@ -88,14 +88,14 @@ void ScTpCalcOptions::Init()
     m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
 }
 
-//-----------------------------------------------------------------------
+
 
 SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new ScTpCalcOptions( pParent, rAttrSet ) );
 }
 
-//-----------------------------------------------------------------------
+
 
 void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 {
@@ -146,7 +146,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
 }
 
 
-//-----------------------------------------------------------------------
+
 
 sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
@@ -173,7 +173,7 @@ sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs )
         return false;
 }
 
-//------------------------------------------------------------------------
+
 
 int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -201,7 +201,7 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP )
     return nReturn;
 }
 
-//-----------------------------------------------------------------------
+
 // Handler:
 
 IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn )
@@ -222,7 +222,7 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn )
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn )
 {
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 084060ba1313..ad198d008bd0 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -19,7 +19,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------
+
 
 #include <scmod.hxx>
 #include <svl/eitem.hxx>
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index a07018403e0d..dc78e8ed7292 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -29,7 +29,7 @@
 #include "sc.hrc"
 #include "optdlg.hrc"
 
-// -----------------------------------------------------------------------
+
 
 ScTpPrintOptions::ScTpPrintOptions( Window*           pParent,
                                     const SfxItemSet& rCoreAttrs )
@@ -60,7 +60,7 @@ int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
 {
@@ -92,7 +92,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
     m_pForceBreaksCB->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs )
 {
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 43ad77cfac04..731073f88ca8 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -89,7 +89,7 @@ ScTpUserLists::ScTpUserLists( Window*               pParent,
     Reset(rCoreAttrs);
 }
 
-// -----------------------------------------------------------------------
+
 
 ScTpUserLists::~ScTpUserLists()
 {
@@ -97,7 +97,7 @@ ScTpUserLists::~ScTpUserLists()
     delete pRangeUtil;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::Init()
 {
@@ -146,14 +146,14 @@ void ScTpUserLists::Init()
 
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new ScTpUserLists( pParent, rAttrSet ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
 {
@@ -205,7 +205,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
 {
@@ -246,7 +246,7 @@ sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
     return bDataModified;
 }
 
-// -----------------------------------------------------------------------
+
 
 int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -256,7 +256,7 @@ int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ScTpUserLists::UpdateUserListBox()
 {
@@ -264,7 +264,7 @@ sal_uInt16 ScTpUserLists::UpdateUserListBox()
 
     if ( !pUserLists ) return 0;
 
-    //----------------------------------------------------------
+
 
     size_t nCount = pUserLists->size();
     OUString  aEntry;
@@ -279,13 +279,13 @@ sal_uInt16 ScTpUserLists::UpdateUserListBox()
     return nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::UpdateEntries( size_t nList )
 {
     if ( !pUserLists ) return;
 
-    //----------------------------------------------------------
+
 
     if ( nList < pUserLists->size() )
     {
@@ -308,7 +308,7 @@ void ScTpUserLists::UpdateEntries( size_t nList )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::MakeListStr( OUString& rListStr )
 {
@@ -346,7 +346,7 @@ void ScTpUserLists::MakeListStr( OUString& rListStr )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::AddNewList( const OUString& rEntriesStr )
 {
@@ -360,14 +360,14 @@ void ScTpUserLists::AddNewList( const OUString& rEntriesStr )
     pUserLists->push_back(new ScUserListData(theEntriesStr));
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
                                       const ScRefAddress& rEndPos )
 {
     if ( bCopyDone ) return;
 
-    //----------------------------------------------------------
+
 
     SCTAB   nTab            = rStartPos.Tab();
     SCCOL   nStartCol       = rStartPos.Col();
@@ -446,20 +446,20 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos,
         }
     }
 
-    //----------------------------------------------------------
+
 
     bCopyDone = true;
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::ModifyList( sal_uInt16          nSelList,
                                 const OUString&   rEntriesStr )
 {
     if ( !pUserLists ) return;
 
-    //----------------------------------------------------------
+
 
     OUString theEntriesStr( rEntriesStr );
 
@@ -468,7 +468,7 @@ void ScTpUserLists::ModifyList( sal_uInt16          nSelList,
     (*pUserLists)[nSelList]->SetString( theEntriesStr );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScTpUserLists::RemoveList( size_t nList )
 {
@@ -480,9 +480,9 @@ void ScTpUserLists::RemoveList( size_t nList )
     }
 }
 
-//-----------------------------------------------------------------------
+
 // Handler:
-//---------
+
 
 IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
 {
@@ -507,7 +507,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
 {
@@ -528,7 +528,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
             mpBtnAdd->Disable();
             mpBtnModify->Disable();
             mpBtnRemove->Disable();
-            //-----------------------------
+
             if ( mpBtnCopy->IsEnabled() )
             {
                 mpBtnCopy->Disable();
@@ -557,7 +557,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
             }
             mpBtnAdd->Disable();
             mpBtnModify->Disable();
-            //-----------------------------
+
             if ( pViewData && !bCopyDone )
             {
                 mpBtnCopy->Enable();
@@ -692,7 +692,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
         if ( bCopyDone )
             return 0;
 
-        //-----------------------------------------------------------
+
 
         ScRefAddress theStartPos;
         ScRefAddress theEndPos;
@@ -744,14 +744,14 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd )
 {
     if ( pEd != mpEdEntries )
         return 0;
 
-    //-----------------------------------------------------------
+
 
     if ( mpBtnCopy->IsEnabled() )
     {
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 568daece00af..7dd0b96b5807 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "scitems.hxx"
 #include "tpview.hxx"
@@ -309,7 +309,7 @@ void ScTpContentOptions::InitGridOpt()
         if ( !pColorList.is() )
             return;
 
-        //------------------------------------------------------
+
 
         pColorLB->SetUpdateMode( false );
 
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx
index cfe2ed3c0534..278dfef35328 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -94,7 +94,7 @@ static void printAddressFlags(sal_uInt16 nFlag)
 //============================================================================
 //  class ScPrintAreasDlg
 
-//----------------------------------------------------------------------------
+
 
 ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent )
     : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui")
@@ -145,7 +145,7 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window*
 }
 
 
-//----------------------------------------------------------------------------
+
 
 ScPrintAreasDlg::~ScPrintAreasDlg()
 {
@@ -161,7 +161,7 @@ ScPrintAreasDlg::~ScPrintAreasDlg()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScPrintAreasDlg::Close()
 {
@@ -169,7 +169,7 @@ bool ScPrintAreasDlg::Close()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScPrintAreasDlg::IsTableLocked() const
 {
@@ -180,7 +180,7 @@ bool ScPrintAreasDlg::IsTableLocked() const
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ )
 {
@@ -214,7 +214,7 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScPrintAreasDlg::AddRefEntry()
 {
@@ -233,7 +233,7 @@ void ScPrintAreasDlg::AddRefEntry()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScPrintAreasDlg::Deactivate()
 {
@@ -241,7 +241,7 @@ void ScPrintAreasDlg::Deactivate()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScPrintAreasDlg::SetActive()
 {
@@ -262,7 +262,7 @@ void ScPrintAreasDlg::SetActive()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScPrintAreasDlg::Impl_Reset()
 {
@@ -287,9 +287,9 @@ void ScPrintAreasDlg::Impl_Reset()
 
     Impl_FillLists();
 
-    //-------------------------
+
     // Druckbereich
-    //-------------------------
+
     aStrRange = "";
     OUString aOne;
     const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention();
@@ -308,15 +308,15 @@ void ScPrintAreasDlg::Impl_Reset()
     }
     pEdPrintArea->SetText( aStrRange );
 
-    //-------------------------------
+
     // Wiederholungszeile
-    //-------------------------------
+
     lcl_GetRepeatRangeString(pRepeatRowRange, pDoc, true, aStrRange);
     pEdRepeatRow->SetText( aStrRange );
 
-    //--------------------------------
+
     // Wiederholungsspalte
-    //--------------------------------
+
     lcl_GetRepeatRangeString(pRepeatColRange, pDoc, false, aStrRange);
     pEdRepeatCol->SetText( aStrRange );
 
@@ -332,7 +332,7 @@ void ScPrintAreasDlg::Impl_Reset()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
 {
@@ -353,7 +353,7 @@ bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScPrintAreasDlg::Impl_CheckRefStrings()
 {
@@ -418,13 +418,13 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScPrintAreasDlg::Impl_FillLists()
 {
-    //------------------------------------------------------
+
     // Selektion holen und String in PrintArea-ListBox merken
-    //------------------------------------------------------
+
     ScRange  aRange;
     OUString aStrRange;
     sal_Bool bSimple = sal_True;
@@ -445,9 +445,9 @@ void ScPrintAreasDlg::Impl_FillLists()
 
     pLbPrintArea->SetEntryData( SC_AREASDLG_PR_SELECT, new OUString( aStrRange ) );
 
-    //------------------------------------------------------
+
     // Ranges holen und in ListBoxen merken
-    //------------------------------------------------------
+
     ScRangeName* pRangeNames = pDoc->GetRangeName();
 
     if (!pRangeNames || pRangeNames->empty())
@@ -493,9 +493,9 @@ void ScPrintAreasDlg::Impl_FillLists()
 }
 
 
-//----------------------------------------------------------------------------
+
 // Handler:
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
 {
@@ -509,9 +509,9 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
             SfxStringItem   aRepeatRow( FN_PARAM_2, aStr );
             SfxStringItem   aRepeatCol( FN_PARAM_3, aStr );
 
-            //-------------------------
+
             // Druckbereich veraendert?
-            //-------------------------
+
 
             // first try the list box, if "Entite sheet" is selected
             bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE);
@@ -524,14 +524,14 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
                 bDataChanged |= Impl_GetItem( pEdPrintArea, aPrintArea );
             }
 
-            //-------------------------------
+
             // Wiederholungszeile veraendert?
-            //-------------------------------
+
             bDataChanged |= Impl_GetItem( pEdRepeatRow, aRepeatRow );
 
-            //--------------------------------
+
             // Wiederholungsspalte veraendert?
-            //--------------------------------
+
             bDataChanged |= Impl_GetItem( pEdRepeatCol, aRepeatCol );
 
             if ( bDataChanged )
@@ -553,7 +553,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr )
 {
@@ -580,7 +580,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb )
 {
@@ -619,7 +619,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd )
 {
@@ -671,7 +671,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd )
 //============================================================================
 // globale Funktionen:
 
-// ----------------------------------------------------------------------------
+
 
 // TODO: It might make sense to move these functions to address.?xx. -kohei
 
@@ -854,7 +854,7 @@ static bool lcl_CheckRepeatString( const OUString& rStr, ScDocument* pDoc, bool
     return true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, OUString& rStr )
 {
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index ce777e84d7f1..9e04835ba7a7 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "scitems.hxx"
 #include <svl/eitem.hxx>
@@ -32,7 +32,7 @@
 #include "globstr.hrc"
 #include "scresid.hxx"
 #include "scuitphfedit.hxx"
-//------------------------------------------------------------------
+
 
 //  macros from docsh4.cxx
 //! use SIDs?
@@ -201,7 +201,7 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame*     pFrameP,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage )
 {
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 33ddc5bbeb1e..05480042bbcc 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -20,7 +20,7 @@
 
 #undef SC_DLLIMPLEMENTATION
 
-//------------------------------------------------------------------
+
 
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
@@ -156,7 +156,7 @@ IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 ScHFEditPage::~ScHFEditPage()
 {
@@ -206,7 +206,7 @@ sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 #define SET_CMD(i,id) \
     aCmd  = aDel;                           \
@@ -214,7 +214,7 @@ sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet )
     aCmd += aDel;                           \
     aCmdArr[i] = aCmd;
 
-// -----------------------------------------------------------------------
+
 
 void ScHFEditPage::FillCmdArr()
 {
@@ -759,9 +759,9 @@ void ScHFEditPage::ClearTextAreas()
     m_pWndRight->Invalidate();
 }
 
-//-----------------------------------------------------------------------
+
 // Handler:
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox*, pList )
 {
@@ -857,7 +857,7 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet&
                     true )
     {}
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
     { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); };
@@ -873,7 +873,7 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r
                     true )
     {}
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
     { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); };
@@ -889,7 +889,7 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet&
                     false )
     {}
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
     { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); };
@@ -905,7 +905,7 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r
                     false )
     {}
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
     { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); };
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 46dfeaac3a03..3b566e527545 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #define _TPHF_CXX
 #include "scitems.hxx"
@@ -86,13 +86,13 @@ ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId )
         m_pBtnEdit->SetHelpId( HID_SC_FOOTER_EDIT );
 }
 
-//------------------------------------------------------------------
+
 
 ScHFPage::~ScHFPage()
 {
 }
 
-//------------------------------------------------------------------
+
 
 void ScHFPage::Reset( const SfxItemSet& rSet )
 {
@@ -100,7 +100,7 @@ void ScHFPage::Reset( const SfxItemSet& rSet )
     TurnOnHdl( 0 );
 }
 
-//------------------------------------------------------------------
+
 
 sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet )
 {
@@ -120,7 +120,7 @@ sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet )
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 
 void ScHFPage::ActivatePage( const SfxItemSet& rSet )
 {
@@ -138,7 +138,7 @@ void ScHFPage::ActivatePage( const SfxItemSet& rSet )
     SvxHFPage::ActivatePage( rSet );
 }
 
-//------------------------------------------------------------------
+
 
 int ScHFPage::DeactivatePage( SfxItemSet* pSetP )
 {
@@ -149,7 +149,7 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP )
     return LEAVE_PAGE;
 }
 
-//------------------------------------------------------------------
+
 
 void ScHFPage::ActivatePage()
 {
@@ -159,9 +159,9 @@ void ScHFPage::DeactivatePage()
 {
 }
 
-//------------------------------------------------------------------
+
 // Handler:
-//------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScHFPage, TurnOnHdl)
 {
@@ -176,7 +176,7 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl)
 }
 
 
-//------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScHFPage, BtnHdl)
 {
@@ -273,14 +273,14 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet )
 {
 }
 
-//------------------------------------------------------------------
+
 
 SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
 {
     return ( new ScHeaderPage( pParent, rCoreSet ) );
 }
 
-//------------------------------------------------------------------
+
 
 sal_uInt16* ScHeaderPage::GetRanges()
 {
@@ -296,14 +296,14 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet )
 {
 }
 
-//------------------------------------------------------------------
+
 
 SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
 {
     return ( new ScFooterPage( pParent, rCoreSet ) );
 }
 
-//------------------------------------------------------------------
+
 
 sal_uInt16* ScFooterPage::GetRanges()
 {
diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx
index dc0b9d03d531..8456893d21ee 100644
--- a/sc/source/ui/pagedlg/tphfedit.cxx
+++ b/sc/source/ui/pagedlg/tphfedit.cxx
@@ -121,7 +121,7 @@ void ScEditWindow::Resize()
     Control::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 ScEditWindow::~ScEditWindow()
 {
@@ -141,7 +141,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScEditWindow(Window *pParen
     return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::SetNumType(SvxNumType eNumType)
 {
@@ -149,7 +149,7 @@ void ScEditWindow::SetNumType(SvxNumType eNumType)
     pEdEngine->UpdateFields();
 }
 
-// -----------------------------------------------------------------------
+
 
 EditTextObject* ScEditWindow::CreateTextObject()
 {
@@ -164,7 +164,7 @@ EditTextObject* ScEditWindow::CreateTextObject()
     return pEdEngine->CreateTextObject();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::SetFont( const ScPatternAttr& rPattern )
 {
@@ -180,21 +180,21 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern )
     pEdEngine->SetDefaults( pSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::SetText( const EditTextObject& rTextObject )
 {
     pEdEngine->SetText( rTextObject );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::InsertField( const SvxFieldItem& rFld )
 {
     pEdView->InsertField( rFld );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::SetCharAttriutes()
 {
@@ -233,7 +233,7 @@ void ScEditWindow::SetCharAttriutes()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::Paint( const Rectangle& rRect )
 {
@@ -252,14 +252,14 @@ void ScEditWindow::Paint( const Rectangle& rRect )
         pEdView->ShowCursor(true,true);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::MouseMove( const MouseEvent& rMEvt )
 {
     pEdView->MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -269,14 +269,14 @@ void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt )
     pEdView->MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
     pEdView->MouseButtonUp( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::KeyInput( const KeyEvent& rKEvt )
 {
@@ -299,14 +299,14 @@ void ScEditWindow::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::Command( const CommandEvent& rCEvt )
 {
     pEdView->Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScEditWindow::GetFocus()
 {
@@ -333,7 +333,7 @@ void ScEditWindow::LoseFocus()
         pAcc = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScEditWindow::CreateAccessible()
 {
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 1b738d354207..cfaa6b14a2f6 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -22,7 +22,7 @@
 
 
 
-//------------------------------------------------------------------
+
 
 #include "scitems.hxx"
 #include <svx/numinf.hxx>
@@ -130,7 +130,7 @@ ScStyleDlg::ScStyleDlg( Window*             pParent,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 {
@@ -182,7 +182,7 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 const SfxItemSet* ScStyleDlg::GetRefreshedSet()
 {
diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx
index 13aaaf95df50..4409ab9ba93d 100644
--- a/sc/source/ui/undo/areasave.cxx
+++ b/sc/source/ui/undo/areasave.cxx
@@ -24,7 +24,7 @@
 #include "document.hxx"
 #include <documentlinkmgr.hxx>
 
-// -----------------------------------------------------------------------
+
 
 ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) :
     aFileName   ( rSource.GetFile() ),
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 96040f7f081e..d8ff8df96b4b 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -44,7 +44,7 @@
 #include "refundo.hxx"
 #include "markdata.hxx"
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(ScUndoDoOutline,          ScSimpleUndo);
 TYPEINIT1(ScUndoMakeOutline,        ScSimpleUndo);
diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx
index d55cde4a08d3..ae5b177673b4 100644
--- a/sc/source/ui/undo/undostyl.cxx
+++ b/sc/source/ui/undo/undostyl.cxx
@@ -29,12 +29,12 @@
 #include "inputhdl.hxx"
 #include "globstr.hrc"
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo);
 TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo);
 
-// -----------------------------------------------------------------------
+
 //
 //      modify style (cell or page style)
 //
@@ -86,7 +86,7 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource )
         *this = ScStyleSaveData();      // empty
 }
 
-// -----------------------------------------------------------------------
+
 
 ScUndoModifyStyle::ScUndoModifyStyle( ScDocShell* pDocSh, SfxStyleFamily eFam,
                     const ScStyleSaveData& rOld, const ScStyleSaveData& rNew ) :
@@ -230,7 +230,7 @@ bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const
     return false;       // no repeat possible
 }
 
-// -----------------------------------------------------------------------
+
 //
 //      apply page style
 //
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index 9ebcb601e9c2..f68cae8554d5 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -32,7 +32,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 ScAddressConversionObj::ScAddressConversionObj(ScDocShell* pDocSh, bool _bIsRange) :
     pDocShell( pDocSh ),
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 5d5c998ab76a..2e0a87b9a443 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -60,12 +60,12 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 //  ein AutoFormat hat immer 16 Eintraege
 #define SC_AF_FIELD_COUNT 16
 
-//------------------------------------------------------------------------
+
 
 //  AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs
 
@@ -143,7 +143,7 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap()
     return aAutoFieldMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 #define SCAUTOFORMATSOBJ_SERVICE    "com.sun.star.sheet.TableAutoFormats"
 
@@ -151,7 +151,7 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.s
 SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" )
 SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE )
 
-//------------------------------------------------------------------------
+
 
 static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex )
 {
@@ -170,7 +170,7 @@ static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUStrin
     return false;       // is nich
 }
 
-//------------------------------------------------------------------------
+
 
 ScAutoFormatsObj::ScAutoFormatsObj()
 {
@@ -391,7 +391,7 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName )
         *ScGlobal::GetOrCreateAutoFormat(), aString, nDummy );
 }
 
-//------------------------------------------------------------------------
+
 
 ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) :
     aPropSet( lcl_GetAutoFormatMap() ),
@@ -656,7 +656,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyNa
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatObj )
 
-//------------------------------------------------------------------------
+
 
 ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField) :
     aPropSet( lcl_GetAutoFieldMap() ),
@@ -853,7 +853,7 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPrope
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatFieldObj )
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index bb4fb89a5c91..827e64bc8211 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -42,7 +42,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 // Calc document
 extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw();
@@ -118,7 +118,7 @@ extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw
 extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance(
             const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception );
 
-//------------------------------------------------------------------------
+
 
 //  Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden
 //! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!!
@@ -133,7 +133,7 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea
 //  Anzahl der PropertyValues in einer Function-Description
 #define SC_FUNCDESC_PROPCOUNT   5
 
-//------------------------------------------------------------------------
+
 
 //  alles ohne Which-ID, Map nur fuer PropertySetInfo
 
@@ -164,7 +164,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap()
     return aSettingsPropertyMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 #define SCFUNCTIONLISTOBJ_SERVICE       "com.sun.star.sheet.FunctionDescriptions"
 #define SCRECENTFUNCTIONSOBJ_SERVICE    "com.sun.star.sheet.RecentFunctions"
@@ -174,7 +174,7 @@ SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOB
 SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE )
 SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE )
 
-//------------------------------------------------------------------------
+
 
 extern "C" {
 
@@ -383,7 +383,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory(
 
 }   // extern C
 
-//------------------------------------------------------------------------
+
 
 ScSpreadsheetSettings::ScSpreadsheetSettings() :
     aPropSet( lcl_GetSettingsPropertyMap() )
@@ -660,7 +660,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettings )
 
-//------------------------------------------------------------------------
+
 
 ScRecentFunctionsObj::ScRecentFunctionsObj()
 {
@@ -741,7 +741,7 @@ sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::Runt
     return LRU_MAX;
 }
 
-//------------------------------------------------------------------------
+
 
 ScFunctionListObj::ScFunctionListObj()
 {
@@ -988,7 +988,7 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx
index 4867a63bdae9..47d32d3ee420 100644
--- a/sc/source/ui/unoobj/celllistsource.cxx
+++ b/sc/source/ui/unoobj/celllistsource.cxx
@@ -48,7 +48,7 @@ namespace calc
     //= OCellListSource
     //=====================================================================
     DBG_NAME( OCellListSource )
-    //---------------------------------------------------------------------
+
 #ifdef DBG_UTIL
     const char* OCellListSource::checkConsistency_static( const void* _pThis )
     {
@@ -65,7 +65,7 @@ namespace calc
     }
 #endif
 
-    //---------------------------------------------------------------------
+
     OCellListSource::OCellListSource( const Reference< XSpreadsheetDocument >& _rxDocument )
         :OCellListSource_Base( m_aMutex )
         ,OCellListSource_PBase( OCellListSource_Base::rBHelper )
@@ -88,7 +88,7 @@ namespace calc
         );
     }
 
-    //---------------------------------------------------------------------
+
     OCellListSource::~OCellListSource( )
     {
         if ( !OCellListSource_Base::rBHelper.bDisposed )
@@ -100,13 +100,13 @@ namespace calc
         DBG_DTOR( OCellListSource, checkConsistency_static );
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OCellListSource, OCellListSource_Base, OCellListSource_PBase )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellListSource, OCellListSource_Base, OCellListSource_PBase )
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -126,20 +126,20 @@ namespace calc
         // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.)
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo(  ) throw(RuntimeException)
     {
         DBG_CHKTHIS( OCellListSource, checkConsistency_static );
         return createPropertySetInfo( getInfoHelper() ) ;
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL OCellListSource::getInfoHelper()
     {
         return *OCellListSource_PABase::getArrayHelper();
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OCellListSource::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -147,7 +147,7 @@ namespace calc
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         DBG_CHKTHIS( OCellListSource, checkConsistency_static );
@@ -158,7 +158,7 @@ namespace calc
         _rValue <<= getRangeAddress( );
     }
 
-    //--------------------------------------------------------------------
+
     void OCellListSource::checkDisposed( ) const SAL_THROW( ( DisposedException ) )
     {
         if ( OCellListSource_Base::rBHelper.bInDispose || OCellListSource_Base::rBHelper.bDisposed )
@@ -202,7 +202,7 @@ namespace calc
         return aAddress;
     }
 
-    //--------------------------------------------------------------------
+
     OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow )
     {
         OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" );
@@ -216,7 +216,7 @@ namespace calc
         return sText;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OCellListSource::getListEntryCount(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -228,7 +228,7 @@ namespace calc
         return aAddress.EndRow - aAddress.StartRow + 1;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -242,7 +242,7 @@ namespace calc
         return getCellTextContent_noCheck( 0, _nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -260,7 +260,7 @@ namespace calc
         return aAllEntries;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -274,7 +274,7 @@ namespace calc
         m_aListEntryListeners.addInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -288,7 +288,7 @@ namespace calc
         m_aListEntryListeners.removeInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException)
     {
         DBG_CHKTHIS( OCellListSource, checkConsistency_static );
@@ -296,7 +296,7 @@ namespace calc
         notifyModified();
     }
 
-    //--------------------------------------------------------------------
+
     void OCellListSource::notifyModified()
     {
         EventObject aEvent;
@@ -321,7 +321,7 @@ namespace calc
 
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException)
     {
         DBG_CHKTHIS( OCellListSource, checkConsistency_static );
@@ -334,7 +334,7 @@ namespace calc
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
     {
         if ( m_bInitialized )
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9abcc28e92e6..ebbd4449cfc6 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -131,7 +131,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 class ScNamedEntry
 {
@@ -146,7 +146,7 @@ public:
     const ScRange&  GetRange() const    { return aRange; }
 };
 
-//------------------------------------------------------------------------
+
 
 //  The names in the maps must be sorted according to strcmp!
 //! Instead of Which-ID 0 use special IDs and do not compare via names!
@@ -856,12 +856,12 @@ static const SvxItemPropertySet* lcl_GetEditPropertySet()
     return &aEditPropertySet;
 }
 
-//------------------------------------------------------------------------
+
 
 using sc::HMMToTwips;
 using sc::TwipsToHMM;
 
-//------------------------------------------------------------------------
+
 
 #define SCCHARPROPERTIES_SERVICE    "com.sun.star.style.CharacterProperties"
 #define SCPARAPROPERTIES_SERVICE    "com.sun.star.style.ParagraphProperties"
@@ -883,7 +883,7 @@ SC_SIMPLE_SERVICE_INFO( ScCellsObj, "ScCellsObj", "com.sun.star.sheet.Cells" )
 SC_SIMPLE_SERVICE_INFO( ScTableColumnObj, "ScTableColumnObj", "com.sun.star.table.TableColumn" )
 SC_SIMPLE_SERVICE_INFO( ScTableRowObj, "ScTableRowObj", "com.sun.star.table.TableRow" )
 
-//------------------------------------------------------------------------
+
 
 //! ScLinkListener in anderes File verschieben !!!
 
@@ -896,7 +896,7 @@ void ScLinkListener::Notify( SvtBroadcaster&, const SfxHint& rHint )
     aLink.Call( (SfxHint*)&rHint );
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSource )
 {
@@ -1051,7 +1051,7 @@ void ScHelperFunctions::AssignTableBorder2ToAny( uno::Any& rAny,
     rAny <<= aBorder;
 }
 
-//------------------------------------------------------------------------
+
 
 //! lcl_ApplyBorder nach docfunc verschieben!
 
@@ -1403,7 +1403,7 @@ static OUString lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPos, sal
     return aVal;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) :
     pPropSet(lcl_GetCellsPropertySet()),
@@ -1807,7 +1807,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId()
     return theScCellRangesBaseImplementationId::get().getSeq();
 }
 
-// ---
+
 
 void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart )
 {
@@ -4146,7 +4146,7 @@ ScCellRangesBase* ScCellRangesBase::getImplementation( const uno::Reference<uno:
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 typedef boost::ptr_vector<ScNamedEntry> ScNamedEntryArr_Impl;
 
@@ -4782,7 +4782,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) :
     ScCellRangesBase( pDocSh, rR ),
@@ -6062,7 +6062,7 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames()
     return aRet;
 }
 
-//------------------------------------------------------------------------
+
 
 const SvxItemPropertySet* ScCellObj::GetEditPropertySet()
 {
@@ -6874,7 +6874,7 @@ sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException)
     return nRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableSheetObj::ScTableSheetObj( ScDocShell* pDocSh, SCTAB nTab ) :
     ScCellRangeObj( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ),
@@ -8728,7 +8728,7 @@ ScTableSheetObj* ScTableSheetObj::getImplementation( const uno::Reference<uno::X
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableColumnObj::ScTableColumnObj( ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab ) :
     ScCellRangeObj( pDocSh, ScRange(nCol,0,nTab, nCol,MAXROW,nTab) ),
@@ -8937,7 +8937,7 @@ const SfxItemPropertyMap& ScTableColumnObj::GetItemPropertyMap()
     return pColPropSet->getPropertyMap();
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableRowObj::ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab) :
     ScCellRangeObj( pDocSh, ScRange(0,nRow,nTab, MAXCOL,nRow,nTab) ),
@@ -9093,7 +9093,7 @@ const SfxItemPropertyMap& ScTableRowObj::GetItemPropertyMap()
     return pRowPropSet->getPropertyMap();
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellsObj::ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR) :
     pDocShell( pDocSh ),
@@ -9154,7 +9154,7 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException)
     return bHas;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR) :
     pDocShell( pDocSh ),
@@ -9286,7 +9286,7 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme
     throw container::NoSuchElementException();      // no more elements
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellFormatsObj::ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) :
     pDocShell( pDocSh ),
@@ -9408,7 +9408,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumera
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellFormatsEnumeration::ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rRange) :
     pDocShell( pDocSh ),
@@ -9516,7 +9516,7 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuc
     return uno::makeAny(uno::Reference<table::XCellRange> (NextObject_Impl()));
 }
 
-//------------------------------------------------------------------------
+
 
 ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) :
     pDocShell( pDocSh ),
@@ -9786,7 +9786,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createE
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell* pDocSh, const ScMyRangeLists& rRangeLists) :
     aRangeLists(rRangeLists),
diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx
index 2236bac9cd14..1118ca6b30c0 100644
--- a/sc/source/ui/unoobj/cellvaluebinding.cxx
+++ b/sc/source/ui/unoobj/cellvaluebinding.cxx
@@ -52,7 +52,7 @@ namespace calc
     //= OCellValueBinding
     //=====================================================================
     DBG_NAME( OCellValueBinding )
-    //---------------------------------------------------------------------
+
 #ifdef DBG_UTIL
     const char* OCellValueBinding::checkConsistency_static( const void* _pThis )
     {
@@ -72,7 +72,7 @@ namespace calc
     }
 #endif
 
-    //---------------------------------------------------------------------
+
     OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, bool _bListPos )
         :OCellValueBinding_Base( m_aMutex )
         ,OCellValueBinding_PBase( OCellValueBinding_Base::rBHelper )
@@ -97,7 +97,7 @@ namespace calc
         // which probably maps to the cell being locked
     }
 
-    //---------------------------------------------------------------------
+
     OCellValueBinding::~OCellValueBinding( )
     {
         if ( !OCellValueBinding_Base::rBHelper.bDisposed )
@@ -109,13 +109,13 @@ namespace calc
         DBG_DTOR( OCellValueBinding, checkConsistency_static );
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase )
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::disposing()
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -132,20 +132,20 @@ namespace calc
         // for the cell)
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo(  ) throw(RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
         return createPropertySetInfo( getInfoHelper() ) ;
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL OCellValueBinding::getInfoHelper()
     {
         return *OCellValueBinding_PABase::getArrayHelper();
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OCellValueBinding::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -153,7 +153,7 @@ namespace calc
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -167,7 +167,7 @@ namespace calc
             _rValue <<= xCellAddress->getCellAddress( );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes(  ) throw (RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -199,7 +199,7 @@ namespace calc
         return aTypes;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -217,7 +217,7 @@ namespace calc
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -304,7 +304,7 @@ namespace calc
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -388,7 +388,7 @@ namespace calc
                 // above
         }
     }
-    //--------------------------------------------------------------------
+
     void OCellValueBinding::setBooleanFormat()
     {
         // set boolean number format if not already set
@@ -435,7 +435,7 @@ namespace calc
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OCellValueBinding::checkDisposed( ) const SAL_THROW( ( DisposedException ) )
     {
         if ( OCellValueBinding_Base::rBHelper.bInDispose || OCellValueBinding_Base::rBHelper.bDisposed )
@@ -443,7 +443,7 @@ namespace calc
             // TODO: is it worth having an error message here?
     }
 
-    //--------------------------------------------------------------------
+
     void OCellValueBinding::checkInitialized() SAL_THROW( ( RuntimeException ) )
     {
         if ( !m_bInitialized )
@@ -451,7 +451,7 @@ namespace calc
             // TODO: error message
     }
 
-    //--------------------------------------------------------------------
+
     void OCellValueBinding::checkValueType( const Type& _rType ) const SAL_THROW( ( IncompatibleTypesException ) )
     {
         OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this );
@@ -497,14 +497,14 @@ namespace calc
            m_aModifyListeners.addInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException)
     {
        if ( _rxListener.is() )
            m_aModifyListeners.removeInterface( _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void OCellValueBinding::notifyModified()
     {
         EventObject aEvent;
@@ -528,7 +528,7 @@ namespace calc
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -536,7 +536,7 @@ namespace calc
         notifyModified();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException)
     {
         DBG_CHKTHIS( OCellValueBinding, checkConsistency_static );
@@ -550,7 +550,7 @@ namespace calc
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
     {
         if ( m_bInitialized )
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 05121150e8ee..795cfdfc06ba 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -433,7 +433,7 @@ vector<ScTokenRef>* Chart2PositionMap::getDataRowRanges(SCROW nRow) const
     return maData.getRowRanges( nRow);
 }
 
-// ----------------------------------------------------------------------------
+
 
 /**
  * Designed to be a drop-in replacement for ScChartPositioner, in order to
@@ -1092,7 +1092,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
-//----------------------------------------------------
+
 /**
  * Check the current list of reference tokens, and add the upper left
  * corner of the minimum range that encloses all ranges if certain
@@ -2970,7 +2970,7 @@ IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint )
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScChart2DataSequence::ExternalRefListener::ExternalRefListener(
     ScChart2DataSequence& rParent, ScDocument* pDoc) :
@@ -3022,7 +3022,7 @@ const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListene
     return maFileIds;
 }
 
-// ----------------------------------------------------------------------------
+
 
 uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData()
     throw (uno::RuntimeException, std::exception)
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index cbd44d8cba64..20c06141b059 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -49,12 +49,12 @@ using namespace com::sun::star;
 
 #define PROP_HANDLE_RELATED_CELLRANGES  1
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScChartObj, "ScChartObj", "com.sun.star.table.TableChart" )
 SC_SIMPLE_SERVICE_INFO( ScChartsObj, "ScChartsObj", "com.sun.star.table.TableCharts" )
 
-//------------------------------------------------------------------------
+
 
 static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName )
 {
@@ -90,7 +90,7 @@ static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OU
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 ScChartsObj::ScChartsObj(ScDocShell* pDocSh, SCTAB nT) :
     pDocShell( pDocSh ),
@@ -443,7 +443,7 @@ sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName )
     return ( lcl_FindChartObj( pDocShell, nTab, aName ) != NULL );
 }
 
-//------------------------------------------------------------------------
+
 
 ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN)
     :ScChartObj_Base( m_aMutex )
@@ -795,7 +795,7 @@ uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw
     return createPropertySetInfo( getInfoHelper() ) ;
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 938bdf81d7db..70f8d03e2d24 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -81,7 +81,7 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap()
     return aConfigPropertyMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDocumentConfiguration::ScDocumentConfiguration(ScDocShell* pDocSh)
     : pDocShell(pDocSh) ,
diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx
index 013ed0646acf..ea9c55144c07 100644
--- a/sc/source/ui/unoobj/convuno.cxx
+++ b/sc/source/ui/unoobj/convuno.cxx
@@ -24,7 +24,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 //  everything is static...
 
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 5985b6df2d2b..d9e21c0b04e4 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -34,12 +34,12 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 #define SCSHEETCELLCURSOR_SERVICE   "com.sun.star.sheet.SheetCellCursor"
 #define SCCELLCURSOR_SERVICE        "com.sun.star.table.CellCursor"
 
-//------------------------------------------------------------------------
+
 
 ScCellCursorObj::ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR) :
     ScCellRangeObj( pDocSh, rR )
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 4f793bc3b22c..2e33485d3326 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -110,7 +110,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap()
     return aDataPilotDescriptorBaseMap_Impl;
 }
 
-// ----------------------------------------------------------------------------
+
 
 const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap()
 {
@@ -138,7 +138,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap()
     return aDataPilotFieldMap_Impl;
 }
 
-// ----------------------------------------------------------------------------
+
 
 const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap()
 {
@@ -152,7 +152,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap()
     return aDataPilotItemMap_Impl;
 }
 
-// ----------------------------------------------------------------------------
+
 
 inline bool lclCheckValidDouble( double fValue, sal_Bool bAuto )
 {
@@ -185,12 +185,12 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupsObj, "ScDataPilotFieldGroupsObj",
 SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupObj, "ScDataPilotFieldGroupObj", "com.sun.star.sheet.DataPilotFieldGroup" )
 SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupItemObj, "ScDataPilotFieldGroupItemObj", "com.sun.star.sheet.DataPilotFieldGroupItem" )
 
-//------------------------------------------------------------------------
+
 
 // name that is used in the API for the data layout field
 #define SC_DATALAYOUT_NAME  "Data"
 
-//------------------------------------------------------------------------
+
 
 GeneralFunction ScDataPilotConversion::FirstFunc( sal_uInt16 nBits )
 {
@@ -244,7 +244,7 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const
     rInfo.Step          = rGroupInfo.mfStep;
 }
 
-//------------------------------------------------------------------------
+
 
 static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName )
 {
@@ -296,7 +296,7 @@ static sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier
     return -1;  // none
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataPilotTablesObj::ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT) :
     pDocShell( pDocSh ),
@@ -593,7 +593,7 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataPilotDescriptorBase::ScDataPilotDescriptorBase(ScDocShell* pDocSh) :
     maPropSet( lcl_GetDataPilotDescriptorBaseMap() ),
@@ -1103,7 +1103,7 @@ ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation(
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) :
     ScDataPilotDescriptorBase( pDocSh ),
@@ -1170,7 +1170,7 @@ Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId()
     return theScDataPilotTableObjImplementationId::get().getSeq();
 }
 
-// ---
+
 ScDPObject* ScDataPilotTableObj::GetDPObject() const
 {
     return lcl_GetDPObject(GetDocShell(), nTab, aName);
@@ -1822,7 +1822,7 @@ sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName )
     return GetObjectByName_Impl(aName) != NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataPilotFieldObj::ScDataPilotFieldObj(
         ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) :
@@ -2865,7 +2865,7 @@ bool lclExtractGroupMembers( ScFieldGroupMembers& rMembers, const Any& rElement
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj( const ScFieldGroups& rGroups ) :
     maGroups( rGroups )
@@ -3058,7 +3058,7 @@ OUString lclExtractMember( const Any& rElement )
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj( ScDataPilotFieldGroupsObj& rParent, const OUString& rGroupName ) :
     mrParent( rParent ),
@@ -3361,7 +3361,7 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException)
     return ( getCount() != 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataPilotItemObj::ScDataPilotItemObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId, sal_Int32 nIndex ) :
     ScDataPilotChildObjBase( rParent, rFieldId ),
@@ -3543,7 +3543,7 @@ void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener(
 {
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 18a93361cc72..81388051b7cf 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -61,7 +61,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 //  alles ohne Which-ID, Map nur fuer PropertySetInfo
 
@@ -128,7 +128,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap()
 }
 
 
-//------------------------------------------------------------------------
+
 
 
 SC_SIMPLE_SERVICE_INFO( ScConsolidationDescriptor, "ScConsolidationDescriptor", "com.sun.star.sheet.ConsolidationDescriptor" )
@@ -162,7 +162,7 @@ sheet::GeneralFunction  ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e
     return eGeneral;
 }
 
-//------------------------------------------------------------------------
+
 
 //  ScImportDescriptor: alles static
 
@@ -270,7 +270,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ
     }
 }
 
-//------------------------------------------------------------------------
+
 
 //  ScSortDescriptor: alles static
 
@@ -467,7 +467,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ) :
     xRef( pDesc ),          // Objekt festhalten
@@ -558,7 +558,7 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns(
     rParent.PutData(aParam);
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalDescriptorBase::ScSubTotalDescriptorBase() :
     aPropSet( lcl_GetSubTotalPropertyMap() )
@@ -813,7 +813,7 @@ ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation(
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSubTotalDescriptor::ScSubTotalDescriptor()
 {
@@ -838,7 +838,7 @@ void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew )
     aStoredParam = rNew;            // von aussen gesetzt
 }
 
-//------------------------------------------------------------------------
+
 
 ScRangeSubTotalDescriptor::ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar) :
     pParent(pPar)
@@ -865,7 +865,7 @@ void ScRangeSubTotalDescriptor::PutData( const ScSubTotalParam& rParam )
         pParent->SetSubTotalParam( rParam );
 }
 
-//------------------------------------------------------------------------
+
 
 ScConsolidationDescriptor::ScConsolidationDescriptor()
 {
@@ -1557,7 +1557,7 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFilterDescriptorBase )
 
-//------------------------------------------------------------------------
+
 
 ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pDocShell)
     :
@@ -1584,7 +1584,7 @@ void ScFilterDescriptor::SetParam( const ScQueryParam& rNew )
     aStoredParam = rNew;            // von aussen gesetzt
 }
 
-//------------------------------------------------------------------------
+
 
 ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocShell, ScDatabaseRangeObj* pPar) :
     ScFilterDescriptorBase(pDocShell),
@@ -1612,7 +1612,7 @@ void ScRangeFilterDescriptor::PutData( const ScQueryParam& rParam )
         pParent->SetQueryParam( rParam );
 }
 
-//------------------------------------------------------------------------
+
 
 ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pDocShell, ScDataPilotDescriptorBase* pPar) :
     ScFilterDescriptorBase(pDocShell),
@@ -1655,7 +1655,7 @@ void ScDataPilotFilterDescriptor::PutData( const ScQueryParam& rParam )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const OUString& rNm) :
     pDocShell( pDocSh ),
@@ -2226,7 +2226,7 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames()
     return aRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDatabaseRangesObj::ScDatabaseRangesObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -2424,7 +2424,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 ScUnnamedDatabaseRangesObj::ScUnnamedDatabaseRangesObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -2510,7 +2510,7 @@ sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab )
         return false;
 }
 
-//------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index 78337ff679bc..386bbbde0300 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -38,7 +38,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap()
 {
@@ -73,11 +73,11 @@ using sc::HMMToTwips;
 using sc::TwipsToHMM;
 using sc::TwipsToEvenHMM;
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScDocDefaultsObj, "ScDocDefaultsObj", "com.sun.star.sheet.Defaults" )
 
-//------------------------------------------------------------------------
+
 
 ScDocDefaultsObj::ScDocDefaultsObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh ),
diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index 496a3d581f4e..7d2ba674cf1f 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -34,12 +34,12 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns"; //data into text
 static const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSource";
 
-//------------------------------------------------------------------------
+
 
 static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell )
 {
@@ -54,7 +54,7 @@ static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxVie
     return uno::Reference<view::XSelectionSupplier>();
 }
 
-//------------------------------------------------------------------------
+
 
 
 ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pViewSh) :
@@ -194,7 +194,7 @@ void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject&
     m_xIntercepted = NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDispatch::ScDispatch(ScTabViewShell* pViewSh) :
     pViewShell( pViewSh ),
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index dcdd27036ea0..b58b3e6f3c8b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -192,7 +192,7 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap()
 using sc::HMMToTwips;
 using sc::TwipsToHMM;
 
-//------------------------------------------------------------------------
+
 
 #define SCMODELOBJ_SERVICE          "com.sun.star.sheet.SpreadsheetDocument"
 #define SCDOCSETTINGS_SERVICE       "com.sun.star.sheet.SpreadsheetDocumentSettings"
@@ -206,7 +206,7 @@ SC_SIMPLE_SERVICE_INFO( ScTableColumnsObj, "ScTableColumnsObj", "com.sun.star.ta
 SC_SIMPLE_SERVICE_INFO( ScTableRowsObj, "ScTableRowsObj", "com.sun.star.table.TableRows" )
 SC_SIMPLE_SERVICE_INFO( ScTableSheetsObj, "ScTableSheetsObj", "com.sun.star.sheet.Spreadsheets" )
 
-//------------------------------------------------------------------------
+
 
 class ScPrintUIOptions : public vcl::PrinterOptionsHelper
 {
@@ -2384,7 +2384,7 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms()
 }
 
 
-//------------------------------------------------------------------------
+
 
 ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -2496,7 +2496,7 @@ sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException)
     return ( getCount() != 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableSheetsObj::ScTableSheetsObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -2903,7 +2903,7 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableColumnsObj::ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC) :
     pDocShell( pDocSh ),
@@ -3173,7 +3173,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aProperty
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableColumnsObj )
 
-//------------------------------------------------------------------------
+
 
 ScTableRowsObj::ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER) :
     pDocShell( pDocSh ),
@@ -3461,7 +3461,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyNam
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj )
 
-//------------------------------------------------------------------------
+
 
 ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj()
 {
@@ -3508,7 +3508,7 @@ uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /*
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettingsObj )
 
-//------------------------------------------------------------------------
+
 
 ScAnnotationsObj::ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT) :
     pDocShell( pDocSh ),
@@ -3640,7 +3640,7 @@ sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException)
     return ( getCount() != 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 ScScenariosObj::ScScenariosObj(ScDocShell* pDocSh, SCTAB nT) :
     pDocShell( pDocSh ),
diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx
index 12de924bea6f..a6f5ed09359d 100644
--- a/sc/source/ui/unoobj/drdefuno.cxx
+++ b/sc/source/ui/unoobj/drdefuno.cxx
@@ -23,7 +23,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) :
     SvxUnoDrawPool( NULL ),
diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx
index a84b71788d74..de0f08766d09 100644
--- a/sc/source/ui/unoobj/editsrc.cxx
+++ b/sc/source/ui/unoobj/editsrc.cxx
@@ -66,7 +66,7 @@ void ScHeaderFooterEditSource::UpdateData()
     mrTextData.UpdateData();
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellEditSource::ScCellEditSource(ScDocShell* pDocSh, const ScAddress& rP) :
     pCellTextData(new ScCellTextData(pDocSh, rP)) {}
@@ -106,7 +106,7 @@ ScEditEngineDefaulter* ScCellEditSource::GetEditEngine()
     return pCellTextData->GetEditEngine();
 }
 
-//------------------------------------------------------------------------
+
 
 ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP) :
     pDocShell( pDocSh ),
@@ -216,7 +216,7 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) :
     pForwarder( pForw )
@@ -245,7 +245,7 @@ void ScSimpleEditSource::UpdateData()
     //  nothing
 }
 
-//------------------------------------------------------------------------
+
 
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData )
diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx
index 5d2b140eb850..665cef1d2b22 100644
--- a/sc/source/ui/unoobj/eventuno.cxx
+++ b/sc/source/ui/unoobj/eventuno.cxx
@@ -27,11 +27,11 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScSheetEventsObj, "ScSheetEventsObj", "com.sun.star.document.Events" )
 
-//------------------------------------------------------------------------
+
 
 ScSheetEventsObj::ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT) :
     mpDocShell( pDocSh ),
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index 125520ecac14..e227a5c6a969 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -149,7 +149,7 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue )
 SC_SIMPLE_SERVICE_INFO( ScCellFieldsObj, "ScCellFieldsObj", "com.sun.star.text.TextFields" )
 SC_SIMPLE_SERVICE_INFO( ScHeaderFieldsObj, "ScHeaderFieldsObj", "com.sun.star.text.TextFields" )
 
-//------------------------------------------------------------------------
+
 
 //  ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen...
 
@@ -281,7 +281,7 @@ SvxFieldData* ScUnoEditEngine::FindByPos(sal_Int32 nPar, sal_Int32 nPos, sal_Int
     return pFound;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellFieldsObj::ScCellFieldsObj(
     const uno::Reference<text::XTextRange>& xContent,
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index ef9e51752615..e5e6a7deeb83 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star;
 using namespace rtl;
 using namespace com::sun::star::uno;
 
-//------------------------------------------------------------------------
+
 
 #define SCFILTEROPTIONSOBJ_SERVICE      "com.sun.star.ui.dialogs.FilterOptionsDialog"
 #define SCFILTEROPTIONSOBJ_IMPLNAME     "com.sun.star.comp.Calc.FilterOptionsDialog"
@@ -63,7 +63,7 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE
 #define DBF_SEP_PATH_IMPORT         "Office.Calc/Dialogs/DBFImport"
 #define DBF_SEP_PATH_EXPORT         "Office.Calc/Dialogs/DBFExport"
 
-//------------------------------------------------------------------------
+
 
 static void load_CharSet( rtl_TextEncoding &nCharSet, bool bExport )
 {
@@ -109,7 +109,7 @@ static void save_CharSet( rtl_TextEncoding nCharSet, bool bExport )
     aItem.PutProperties(aNames, aValues);
 }
 
-//------------------------------------------------------------------------
+
 
 ScFilterOptionsObj::ScFilterOptionsObj() :
     bExport( false )
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 425a72fdf465..ac0c45785549 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -40,7 +40,7 @@
 using namespace ::com::sun::star;
 using namespace ::formula;
 
-//------------------------------------------------------------------------
+
 
 //  Map nur fuer PropertySetInfo
 
@@ -63,13 +63,13 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap()
     return aValidatePropertyMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScTableConditionalEntry, "ScTableConditionalEntry", "com.sun.star.sheet.TableConditionalEntry" )
 SC_SIMPLE_SERVICE_INFO( ScTableConditionalFormat, "ScTableConditionalFormat", "com.sun.star.sheet.TableConditionalFormat" )
 SC_SIMPLE_SERVICE_INFO( ScTableValidationObj, "ScTableValidationObj", "com.sun.star.sheet.TableValidation" )
 
-//------------------------------------------------------------------------
+
 
 static sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode )
 {
@@ -138,7 +138,7 @@ static ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOp
     return eMode;
 }
 
-//------------------------------------------------------------------------
+
 
 ScCondFormatEntryItem::ScCondFormatEntryItem() :
     meGrammar1( FormulaGrammar::GRAM_UNSPECIFIED ),
@@ -147,7 +147,7 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableConditionalFormat::ScTableConditionalFormat(
         ScDocument* pDoc, sal_uLong nKey, SCTAB nTab, FormulaGrammar::Grammar eGrammar)
@@ -511,7 +511,7 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation(
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem& aItem) :
     aData( aItem )
@@ -616,7 +616,7 @@ void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName
     aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SFX_STYLE_FAMILY_PARA );
 }
 
-//------------------------------------------------------------------------
+
 
 ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey,
                                             const formula::FormulaGrammar::Grammar eGrammar) :
@@ -1041,7 +1041,7 @@ ScTableValidationObj* ScTableValidationObj::getImplementation(
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx
index 242816de80fc..031ccdf7f3b3 100644
--- a/sc/source/ui/unoobj/forbiuno.cxx
+++ b/sc/source/ui/unoobj/forbiuno.cxx
@@ -24,7 +24,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 static rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh )
 {
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 5002b712d43b..db56e8196dda 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -48,7 +48,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 //  registered as implementation for service FunctionAccess,
 //  also supports service SpreadsheetDocumentSettings (to set null date etc.)
@@ -56,7 +56,7 @@ using namespace com::sun::star;
 #define SCFUNCTIONACCESS_SERVICE    "com.sun.star.sheet.FunctionAccess"
 #define SCDOCSETTINGS_SERVICE       "com.sun.star.sheet.SpreadsheetDocumentSettings"
 
-//------------------------------------------------------------------------
+
 
 // helper to use cached document if not in use, temporary document otherwise
 
@@ -75,7 +75,7 @@ public:
     ScDocument*     GetDocument();
 };
 
-//------------------------------------------------------------------------
+
 
 ScDocument* ScTempDocSource::CreateDocument()
 {
@@ -114,7 +114,7 @@ ScDocument* ScTempDocSource::GetDocument()
         return rCache.GetDocument();
 }
 
-//------------------------------------------------------------------------
+
 
 ScTempDocCache::ScTempDocCache() :
     pDoc( NULL ),
@@ -141,7 +141,7 @@ void ScTempDocCache::Clear()
     pDoc = NULL;
 }
 
-//------------------------------------------------------------------------
+
 
 //  copy results from one document into another
 //! merge this with ScAreaLink::Refresh
@@ -183,7 +183,7 @@ static sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange,
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 ScFunctionAccess::ScFunctionAccess() :
     pOptions( NULL ),
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 1eb1529ada05..02cd924ff3a3 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -49,7 +49,7 @@ using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::uno::RuntimeException;
 using ::std::vector;
 
-//------------------------------------------------------------------------
+
 
 //  fuer Sheet- und Area-Links benutzt:
 static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap()
@@ -66,7 +66,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap()
     return aSheetLinkMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScAreaLinkObj, "ScAreaLinkObj", "com.sun.star.sheet.CellAreaLink" )
 SC_SIMPLE_SERVICE_INFO( ScAreaLinksObj, "ScAreaLinksObj", "com.sun.star.sheet.CellAreaLinks" )
@@ -75,7 +75,7 @@ SC_SIMPLE_SERVICE_INFO( ScDDELinksObj, "ScDDELinksObj", "com.sun.star.sheet.DDEL
 SC_SIMPLE_SERVICE_INFO( ScSheetLinkObj, "ScSheetLinkObj", "com.sun.star.sheet.SheetLink" )
 SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.SheetLinks" )
 
-//------------------------------------------------------------------------
+
 
 ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) :
     aPropSet( lcl_GetSheetLinkMap() ),
@@ -375,7 +375,7 @@ void ScSheetLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay)
     ModifyRefreshDelay_Impl( nRefreshDelay );
 }
 
-//------------------------------------------------------------------------
+
 
 ScSheetLinksObj::ScSheetLinksObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -581,7 +581,7 @@ uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::R
     return aSeq;
 }
 
-//------------------------------------------------------------------------
+
 
 static ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, size_t nPos )
 {
@@ -921,7 +921,7 @@ void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestAr
     Modify_Impl( NULL, NULL, NULL, NULL, &aDestArea );
 }
 
-//------------------------------------------------------------------------
+
 
 ScAreaLinksObj::ScAreaLinksObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -1045,7 +1045,7 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException)
     return ( getCount() != 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA,
                             const OUString& rT, const OUString& rI) :
@@ -1255,7 +1255,7 @@ void ScDDELinkObj::Refreshed_Impl()
         aRefreshListeners[n]->refreshed( aEvent );
 }
 
-//------------------------------------------------------------------------
+
 
 ScDDELinksObj::ScDDELinksObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx
index 34dfdc7d108f..359307ad2139 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -23,7 +23,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 ScUnoListenerCalls::ScUnoListenerCalls()
 {
diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx
index ae5cc965be49..37131a51da25 100644
--- a/sc/source/ui/unoobj/miscuno.cxx
+++ b/sc/source/ui/unoobj/miscuno.cxx
@@ -26,11 +26,11 @@ using namespace com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unknown" )
 
-//------------------------------------------------------------------------
+
 
 uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny )
 {
@@ -185,7 +185,7 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue(
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd,
                                        const OUString& rServiceName) :
@@ -245,9 +245,9 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa
     return aRet;
 }
 
-//------------------------------------------------------------------------
 
-//------------------------------------------------------------------------
+
+
 
 ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference<
                                             com::sun::star::container::XNameAccess>& rNameObj ) :
@@ -297,7 +297,7 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements(  ) throw(::com::sun::star::u
     return getCount() > 0;
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx
index 0454aed72fb5..645f98b8b49f 100644
--- a/sc/source/ui/unoobj/nameuno.cxx
+++ b/sc/source/ui/unoobj/nameuno.cxx
@@ -46,7 +46,7 @@ using ::com::sun::star::uno::Any;
 
 #include "scui_def.hxx"
 
-//------------------------------------------------------------------------
+
 
 static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap()
 {
@@ -71,7 +71,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap()
     return aNamedRangesMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 #define SCNAMEDRANGEOBJ_SERVICE     "com.sun.star.sheet.NamedRange"
 
@@ -468,7 +468,7 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId()
     return theScNamedRangeObjUnoTunnelId::get().getSeq();
 }
 
-//------------------------------------------------------------------------
+
 
 ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) :
     mbModifyAndBroadcast(true),
@@ -823,7 +823,7 @@ sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException)
     return nLockCount;
 }
 
-//------------------------------------------------------------------------
+
 
 ScGlobalNamedRangesObj::ScGlobalNamedRangesObj(ScDocShell* pDocSh)
     : ScNamedRangesObj(pDocSh)
@@ -876,7 +876,7 @@ SCTAB ScGlobalNamedRangesObj::GetTab_Impl()
     return -1;
 }
 
-//------------------------------------------------------------------------
+
 
 ScLocalNamedRangesObj::ScLocalNamedRangesObj( ScDocShell* pDocSh, uno::Reference<container::XNamed> xSheet )
     : ScNamedRangesObj(pDocSh),
@@ -939,7 +939,7 @@ SCTAB ScLocalNamedRangesObj::GetTab_Impl()
     return nTab;
 }
 
-//------------------------------------------------------------------------
+
 
 ScLabelRangeObj::ScLabelRangeObj(ScDocShell* pDocSh, bool bCol, const ScRange& rR) :
     pDocShell( pDocSh ),
@@ -1060,7 +1060,7 @@ void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aData
     Modify_Impl( NULL, &aDataRange );
 }
 
-//------------------------------------------------------------------------
+
 
 ScLabelRangesObj::ScLabelRangesObj(ScDocShell* pDocSh, bool bCol) :
     pDocShell( pDocSh ),
@@ -1224,7 +1224,7 @@ sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException)
     return ( getCount() != 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx
index 1ef66163a81c..6f2b6de75975 100644
--- a/sc/source/ui/unoobj/notesuno.cxx
+++ b/sc/source/ui/unoobj/notesuno.cxx
@@ -38,7 +38,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 static const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
 {
@@ -54,12 +54,12 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet()
     return &aAnnotationPropertySet_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScAnnotationObj, "ScAnnotationObj", "com.sun.star.sheet.CellAnnotation" )
 //SC_SIMPLE_SERVICE_INFO( ScAnnotationShapeObj, "ScAnnotationShapeObj", "com.sun.star.sheet.CellAnnotationShape" )
 
-//------------------------------------------------------------------------
+
 
 ScAnnotationObj::ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos) :
     pDocShell( pDocSh ),
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index 68056df7d17d..5961baa70583 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -28,7 +28,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap()
 {
     static const SfxItemPropertyMapEntry aMap[] =
@@ -179,7 +179,7 @@ uno::Any ScDocOptionsHelper::getPropertyValue(
     return aRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDocOptionsObj::ScDocOptionsObj( const ScDocOptions& rOpt ) :
     ScModelObj( NULL ),
diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx
index 1b16b550646e..5c21fb42ec6e 100644
--- a/sc/source/ui/unoobj/pageuno.cxx
+++ b/sc/source/ui/unoobj/pageuno.cxx
@@ -24,7 +24,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 ScPageObj::ScPageObj( SdrPage* pPage ) :
     SvxFmDrawPage( pPage )
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 9ca7b2f82e37..eca963eac7f3 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -245,7 +245,7 @@ public:
     }
 };
 
-//------------------------------------------------------------------------
+
 //
 struct ProvNamesId_Type
 {
@@ -377,7 +377,7 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] =
 
 
 
-//------------------------------------------------------------------------
+
 
 //  alles static
 
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index cf1de02f53d0..8da14f7914f2 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -48,7 +48,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 typedef std::map<OUString, uno::Sequence< sal_Int8 > *> ScShapeImplementationIdMap;
 
@@ -88,7 +88,7 @@ ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCr
         return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 namespace
 {
@@ -99,7 +99,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 
 ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
       pShapePropertySet(NULL),
diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx
index d5e11823c7a7..efe360964627 100644
--- a/sc/source/ui/unoobj/srchuno.cxx
+++ b/sc/source/ui/unoobj/srchuno.cxx
@@ -34,7 +34,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 //! SearchWords sucht in ganzen Zellen - umbenennen ???
 
@@ -61,12 +61,12 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap()
     return aSearchPropertyMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 #define SCSEARCHDESCRIPTOR_SERVICE      "com.sun.star.util.SearchDescriptor"
 #define SCREPLACEDESCRIPTOR_SERVICE     "com.sun.star.util.ReplaceDescriptor"
 
-//------------------------------------------------------------------------
+
 
 ScCellSearchObj::ScCellSearchObj() :
     aPropSet(lcl_GetSearchPropertyMap())
@@ -248,7 +248,7 @@ ScCellSearchObj* ScCellSearchObj::getImplementation(
 }
 
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index c6404248073e..5d981ab43208 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -68,7 +68,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 static const SfxItemPropertySet* lcl_GetCellStyleSet()
 {
@@ -368,7 +368,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
 }
 
 
-//------------------------------------------------------------------------
+
 
 //  Index-Access auf die Style-Typen: 0 = Cell, 1 = Page
 
@@ -379,12 +379,12 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap()
 
 static const sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE };
 
-//------------------------------------------------------------------------
+
 
 using sc::HMMToTwips;
 using sc::TwipsToHMM;
 
-//------------------------------------------------------------------------
+
 
 #define SCSTYLE_SERVICE         "com.sun.star.style.Style"
 #define SCCELLSTYLE_SERVICE     "com.sun.star.style.CellStyle"
@@ -393,11 +393,11 @@ using sc::TwipsToHMM;
 SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" )
 SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" )
 
-//------------------------------------------------------------------------
+
 
 #define SC_PAPERBIN_DEFAULTNAME     "[From printer settings]"
 
-//------------------------------------------------------------------------
+
 
 static bool lcl_AnyTabProtected( ScDocument& rDoc )
 {
@@ -408,7 +408,7 @@ static bool lcl_AnyTabProtected( ScDocument& rDoc )
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 ScStyleFamiliesObj::ScStyleFamiliesObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -598,7 +598,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO
     return aSequence;
 }
 
-//------------------------------------------------------------------------
+
 
 ScStyleFamilyObj::ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam) :
     pDocShell( pDocSh ),
@@ -939,7 +939,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c
     OSL_FAIL( "###unexpected!" );
 }
 
-//------------------------------------------------------------------------
+
 
 //  Default-ctor wird fuer die Reflection gebraucht
 
@@ -2012,7 +2012,7 @@ uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
     return aRet;
 }
 
-//------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 535a51f9ccb4..317672dd9127 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -39,7 +39,7 @@
 
 using  namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] =
 {
@@ -59,7 +59,7 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap()
     return aLinkTargetMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 // service for ScLinkTargetTypeObj is not defined
 //  must not support document::LinkTarget because the target type cannot be used as a target
@@ -68,7 +68,7 @@ SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypesObj, "ScLinkTargetTypesObj", "com.sun.s
 SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypeObj,  "ScLinkTargetTypeObj",  "com.sun.star.document.LinkTargetSupplier" )
 SC_SIMPLE_SERVICE_INFO( ScLinkTargetsObj,     "ScLinkTargetsObj",     "com.sun.star.document.LinkTargets" )
 
-//------------------------------------------------------------------------
+
 
 ScLinkTargetTypesObj::ScLinkTargetTypesObj(ScDocShell* pDocSh) :
     pDocShell( pDocSh )
@@ -137,7 +137,7 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeExc
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) :
     pDocShell( pDocSh ),
@@ -249,7 +249,7 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& Property
 
 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScLinkTargetTypeObj )
 
-//------------------------------------------------------------------------
+
 
 ScLinkTargetsObj::ScLinkTargetsObj( const uno::Reference< container::XNameAccess > & rColl ) :
     xCollection( rColl )
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 3ea1258d396f..380809a2898d 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -49,7 +49,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
 {
@@ -87,12 +87,12 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet()
     return &aHdFtPropertySet_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 SC_SIMPLE_SERVICE_INFO( ScHeaderFooterContentObj, "ScHeaderFooterContentObj", "com.sun.star.sheet.HeaderFooterContent" )
 SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv.one.Text.Text" )
 
-//------------------------------------------------------------------------
+
 
 ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft,
                                                     const EditTextObject* pCenter,
@@ -181,7 +181,7 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation(
 }
 
 
-//------------------------------------------------------------------------
+
 
 ScHeaderFooterTextData::ScHeaderFooterTextData(
     ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) :
@@ -266,7 +266,7 @@ const EditTextObject* ScHeaderFooterTextData::GetTextObject() const
     return mpTextObj;
 }
 
-//------------------------------------------------------------------------
+
 
 ScHeaderFooterTextObj::ScHeaderFooterTextObj(
     ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) :
@@ -578,7 +578,7 @@ sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeExcepti
     return mxUnoText->hasElements();
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellTextCursor::ScCellTextCursor(const ScCellTextCursor& rOther) :
     SvxUnoTextCursor( rOther ),
@@ -674,7 +674,7 @@ ScCellTextCursor* ScCellTextCursor::getImplementation( const uno::Reference<uno:
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScHeaderFooterTextCursor::ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther) :
     SvxUnoTextCursor( rOther ),
@@ -771,7 +771,7 @@ ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation(
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScDrawTextCursor::ScDrawTextCursor(const ScDrawTextCursor& rOther) :
     SvxUnoTextCursor( rOther ),
@@ -866,7 +866,7 @@ ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno:
     return pRet;
 }
 
-//------------------------------------------------------------------------
+
 
 ScSimpleEditSourceHelper::ScSimpleEditSourceHelper()
 {
@@ -911,7 +911,7 @@ EditTextObject* ScEditEngineTextObj::CreateTextObject()
     return GetEditEngine()->CreateTextObject();
 }
 
-//------------------------------------------------------------------------
+
 
 ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) :
     pDocShell( pDocSh ),
diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx
index 139fb4e57fc8..aa78b4124473 100644
--- a/sc/source/ui/unoobj/unoreflist.cxx
+++ b/sc/source/ui/unoobj/unoreflist.cxx
@@ -20,7 +20,7 @@
 #include "unoreflist.hxx"
 #include "document.hxx"
 
-//------------------------------------------------------------------------
+
 
 ScUnoRefList::ScUnoRefList()
 {
@@ -46,7 +46,7 @@ void ScUnoRefList::Undo( ScDocument* pDoc )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 TYPEINIT1(ScUnoRefUndoHint, SfxHint);
 
diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx
index f54eba652565..86f4dd6ce43c 100644
--- a/sc/source/ui/unoobj/viewuno.cxx
+++ b/sc/source/ui/unoobj/viewuno.cxx
@@ -74,7 +74,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 //! Clipping-Markierungen
 
@@ -117,14 +117,14 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap()
     return aViewOptPropertyMap_Impl;
 }
 
-//------------------------------------------------------------------------
+
 
 #define SCTABVIEWOBJ_SERVICE        "com.sun.star.sheet.SpreadsheetView"
 #define SCVIEWSETTINGS_SERVICE      "com.sun.star.sheet.SpreadsheetViewSettings"
 
 SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" )
 
-//------------------------------------------------------------------------
+
 
 ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP) :
     pViewShell( pViewSh ),
@@ -424,7 +424,7 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const
     return aVisArea;
 }
 
-//------------------------------------------------------------------------
+
 
 ScViewPaneObj::ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP) :
     ScViewPaneBase( pViewSh, nP )
@@ -456,7 +456,7 @@ void SAL_CALL ScViewPaneObj::release() throw()
     OWeakObject::release();
 }
 
-//------------------------------------------------------------------------
+
 
 //  Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht
 
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 868f48633c7e..a8fc770bcb6b 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -937,7 +937,7 @@ ScVbaApplication::getPathSeparator() throw (uno::RuntimeException)
     return OUString( (sal_Unicode) SAL_PATHDELIMITER );
 }
 
-// ----------------------------------------------------------------------------
+
 // Helpers for Intersect and Union
 
 namespace {
@@ -1113,7 +1113,7 @@ uno::Reference< excel::XRange > lclCreateVbaRange(
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect(
         const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2,
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index f22a6c029d9f..7f3cc718a85a 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -180,7 +180,7 @@ private:
     bool                mbDisposed;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScVbaEventListener::ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ) :
     mrVbaEvents( rVbaEvents ),
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
index 52f27ffce710..b9423a611c90 100644
--- a/sc/source/ui/vba/vbahyperlinks.cxx
+++ b/sc/source/ui/vba/vbahyperlinks.cxx
@@ -45,7 +45,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan
     return true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 /** Functor to decide whether the anchors of two Hyperlink objects are equal. */
 struct EqualAnchorFunctor
@@ -130,7 +130,7 @@ private:
     HyperlinkVector     maHlinks;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException)
 {
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 0decef12d3dc..57259716ef22 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1275,7 +1275,7 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const
     return new ScVbaRange( xFixThisParent, xContext, xRanges );
 }
 
-// ----------------------------------------------------------------------------
+
 
 namespace {
 
@@ -1381,7 +1381,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 css::uno::Reference< excel::XRange >
 ScVbaRange::getRangeObjectForName(
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
index c2244873e84b..24be47bb2fa7 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -134,7 +134,7 @@ private:
     ShapeVector maShapes;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScVbaObjectContainer::ScVbaObjectContainer(
         const uno::Reference< XHelperInterface >& rxParent,
@@ -251,7 +251,7 @@ private:
     ScVbaObjectContainerRef mxContainer;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScVbaObjectEnumeration::ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ) :
     SimpleEnumerationBase( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ),
@@ -371,7 +371,7 @@ protected:
     sal_Int16 mnComponentType;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScVbaControlContainer::ScVbaControlContainer(
         const uno::Reference< XHelperInterface >& rxParent,
@@ -473,7 +473,7 @@ protected:
     virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScVbaButtonContainer::ScVbaButtonContainer(
         const uno::Reference< XHelperInterface >& rxParent,
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 9a4bbc3cc9a1..193bdfed4b41 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -31,12 +31,12 @@
 #include "sc.hrc"
 #include "document.hxx"
 
-//------------------------------------------------------------------------
+
 
 #define ScAuditingShell
 #include "scslots.hxx"
 
-//------------------------------------------------------------------------
+
 
 TYPEINIT1( ScAuditingShell, SfxShell );
 
@@ -46,7 +46,7 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL))
 }
 
 
-//------------------------------------------------------------------------
+
 
 ScAuditingShell::ScAuditingShell(ScViewData* pData) :
     SfxShell(pData->GetViewShell()),
@@ -65,13 +65,13 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) :
     SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Auditing));
 }
 
-//------------------------------------------------------------------------
+
 
 ScAuditingShell::~ScAuditingShell()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAuditingShell::Execute( SfxRequest& rReq )
 {
@@ -132,7 +132,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScAuditingShell::GetState( SfxItemSet& rSet )
 {
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 6b5dfe57a3be..dfea35039125 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -57,7 +57,7 @@
 #include "clipparam.hxx"
 #include "markdata.hxx"
 
-//------------------------------------------------------------------
+
 
 #define ScCellShell
 #define CellMovement
@@ -102,7 +102,7 @@ ScCellShell::~ScCellShell()
     delete pImpl;
 }
 
-//------------------------------------------------------------------
+
 
 void ScCellShell::GetBlockState( SfxItemSet& rSet )
 {
@@ -1046,7 +1046,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
     } // while ( nWitch )
 }
 
-//------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index e4cc9bc8c8ff..780c08e69f0d 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -94,7 +94,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 
-//------------------------------------------------------------------
+
 void ScCellShell::ExecuteEdit( SfxRequest& rReq )
 {
     ScModule*           pScMod      = SC_MOD();
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 0553dde76833..5ee73670f36b 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -54,7 +54,7 @@ using sc::HMMToTwips;
 using sc::TwipsToHMM;
 using sc::TwipsToEvenHMM;
 
-//------------------------------------------------------------------
+
 
 void ScCellShell::Execute( SfxRequest& rReq )
 {
@@ -322,9 +322,9 @@ void ScCellShell::Execute( SfxRequest& rReq )
             {
                 if ( pReqArgs != NULL )
                 {
-                    //----------------------------------
+
                     // set cell attribute without dialog:
-                    //----------------------------------
+
                     SfxItemSet*     pEmptySet =
                                         new SfxItemSet( *pReqArgs->GetPool(),
                                                         ATTR_PATTERN_START,
@@ -523,7 +523,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
             }
             break;
 
-        //----------------------------------------------------------------
+
 
         case FID_ROW_HEIGHT:
             {
@@ -714,7 +714,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
             rReq.Done();
             break;
 
-        //----------------------------------------------------------------
+
 
 
         case SID_CELL_FORMAT_RESET:
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index 7142f812cdda..ec6bd68e6f6f 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -25,7 +25,7 @@
 #include "drwlayer.hxx"
 #include "document.hxx"
 
-// -----------------------------------------------------------------------
+
 
 using namespace com::sun::star;
 
diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx
index 296f9b7bdf2f..8e630933731e 100644
--- a/sc/source/ui/view/drawattr.cxx
+++ b/sc/source/ui/view/drawattr.cxx
@@ -20,14 +20,14 @@
 #include "drawattr.hxx"
 #include "global.hxx"
 
-//------------------------------------------------------------------------
+
 
 OUString SvxDrawToolItem::GetValueText() const
 {
     return GetValueText(GetValue());
 }
 
-//------------------------------------------------------------------------
+
 
 OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
 {
@@ -50,14 +50,14 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const
     return OUString::createFromAscii( p );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxDrawToolItem::Clone( SfxItemPool * ) const
 {
     return new SvxDrawToolItem(*this);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const
 {
diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx
index 2a0291ffb9df..dec25bc19cfe 100644
--- a/sc/source/ui/view/drawvie2.cxx
+++ b/sc/source/ui/view/drawvie2.cxx
@@ -21,7 +21,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 
 // UpdateBrowser in MarkListHasChanged gerufen
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 94ccd3e33e80..3973d09622fc 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -54,7 +54,7 @@ using namespace com::sun::star;
 
 Point aDragStartDiff;
 
-// -----------------------------------------------------------------------
+
 
 void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle )
 {
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 89d227e6dfd1..92c3c4a5cc67 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -58,11 +58,11 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 #define SC_HANDLESIZE_BIG       9
 
-// -----------------------------------------------------------------------
+
 
 void ScDrawView::Construct()
 {
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 22293589bccf..243c3498b07c 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -150,7 +150,7 @@ ScFormatShell::~ScFormatShell()
 {
 }
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::GetStyleState( SfxItemSet& rSet )
 {
@@ -246,7 +246,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet )
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 {
@@ -257,7 +257,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
         return;
     }
 
-    //--------------------------------------------------------------------
+
     SfxBindings&        rBindings   = pViewData->GetBindings();
     const SfxItemSet*   pArgs       = rReq.GetArgs();
     const sal_uInt16        nSlotId     = rReq.GetSlot();
@@ -1252,7 +1252,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq )
 }
 
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::ExecuteAlignment( SfxRequest& rReq )
 {
@@ -1604,7 +1604,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq )
 
 }
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
 {
@@ -2149,7 +2149,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
     Invalidate(SID_ATTR_ALIGN_STACKED);
 }
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 {
@@ -2173,11 +2173,11 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
     SfxItemState eState;
 //  const SfxPoolItem* pItem;
 
-    //--------------------------------------------------------------------
+
     // eigene Kontrolle ueber RadioButton-Funktionalitaet:
-    //--------------------------------------------------------------------
+
     // Unterstreichung
-    //------------------------
+
 
     eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true );
     if ( eState == SFX_ITEM_DONTCARE )
@@ -2203,9 +2203,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
         rSet.Put( SfxBoolItem( nId, true ) );
     }
 
-    //------------------------
+
     // horizontale Ausrichtung
-    //------------------------
+
 
     const SvxHorJustifyItem* pHorJustify = NULL;
     const SvxVerJustifyItem* pVerJustify = NULL;
@@ -2276,9 +2276,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
         bJustifyStd = false;
     }
 
-    //------------------------
+
     // vertikale Ausrichtung
-    //------------------------
+
 
     nWhich = 0;
     aBoolItem.SetValue( true );
@@ -2340,7 +2340,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet )
 }
 
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::GetBorderState( SfxItemSet& rSet )
 {
@@ -2356,7 +2356,7 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet )
         rSet.Put( aInfoItem );
 }
 
-//------------------------------------------------------------------
+
 
 void ScFormatShell::GetAlignState( SfxItemSet& rSet )
 {
diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx
index 71244d20f04c..20d85945bc8d 100644
--- a/sc/source/ui/view/gridmerg.cxx
+++ b/sc/source/ui/view/gridmerg.cxx
@@ -21,7 +21,7 @@
 
 #include "gridmerg.hxx"
 
-//------------------------------------------------------------------
+
 
 ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY ) :
     pDev( pOutDev ),
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 3449885204ca..4ff4264c3ab9 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -237,7 +237,7 @@ public:
     bool            HasDates() const        { return mbListHasDates; }
 };
 
-//-------------------------------------------------------------------
+
 
 //  ListBox in einem FloatingWindow (pParent)
 ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid,
@@ -280,7 +280,7 @@ void ScFilterListBox::LoseFocus()
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -433,7 +433,7 @@ static bool lcl_GetHyperlinkCell(
     return bFound;
 }
 
-// ---------------------------------------------------------------------------
+
 //  WB_DIALOGCONTROL noetig fuer UNO-Controls
 ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos )
 :           Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ),
@@ -3409,7 +3409,7 @@ void ScGridWindow::UpdateInputContext()
     SetInputContext( aContext );
 }
 
-//--------------------------------------------------------
+
 
                                 // sensitiver Bereich (Pixel)
 #define SCROLL_SENSITIVE 20
@@ -3498,12 +3498,12 @@ static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const Sc
     return ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab );
 }
 
-//--------------------------------------------------------
+
 
 extern bool bPasteIsDrop;       // viewfun4 -> move to header
 extern bool bPasteIsMove;       // viewfun7 -> move to header
 
-//--------------------------------------------------------
+
 
 sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt )
 {
@@ -4477,7 +4477,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return nRet;
 }
 
-//--------------------------------------------------------
+
 
 void ScGridWindow::PasteSelection( const Point& rPosPixel )
 {
@@ -4550,7 +4550,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel )
     }
 }
 
-//--------------------------------------------------------
+
 
 void ScGridWindow::UpdateEditViewPos()
 {
@@ -4771,7 +4771,7 @@ void ScGridWindow::LoseFocus()
 
 Point ScGridWindow::GetMousePosPixel() const  { return aCurMousePos; }
 
-//------------------------------------------------------------------------
+
 
 bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner,
                                 sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY)
@@ -5154,7 +5154,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp )
         pViewData->GetView()->ResetTimer();
 }
 
-//------------------------------------------------------------------------
+
 
 bool ScGridWindow::GetEditUrl( const Point& rPos,
                                OUString* pName, OUString* pUrl, OUString* pTarget )
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx
index 3bdbdce67af8..359cf3ae376d 100644
--- a/sc/source/ui/view/gridwin2.cxx
+++ b/sc/source/ui/view/gridwin2.cxx
@@ -57,7 +57,7 @@ using ::boost::unordered_map;
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const
 {
@@ -240,7 +240,7 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent&
     }
 }
 
-// -----------------------------------------------------------------------
+
 //
 //  Data Pilot interaction
 //
@@ -627,7 +627,7 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt )
     SetPointer( Pointer( POINTER_ARROW ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect )
 {
@@ -656,7 +656,7 @@ void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect )
     UpdateDragRectOverlay();
 }
 
-// -----------------------------------------------------------------------
+
 
 //  Page-Break-Modus
 
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index b9a400dce490..8a646ff8e0c7 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -43,7 +43,7 @@
 #include "userdat.hxx"
 #include "unitconv.hxx"
 #include <svx/svdpage.hxx>
-// -----------------------------------------------------------------------
+
 
 bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt)
 {
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 42ddaf6544ba..5a0d7854822a 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -65,7 +65,7 @@
 // #i74769#
 #include <svx/sdrpaintwindow.hxx>
 
-//------------------------------------------------------------------------
+
 
 static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible )
 {
@@ -252,7 +252,7 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S
     }
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData,
                         const std::vector<ScHighlightEntry>& rHighlightRanges )
@@ -272,7 +272,7 @@ static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData,
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScGridWindow::DoInvertRect( const Rectangle& rPixel )
 {
@@ -288,7 +288,7 @@ void ScGridWindow::DoInvertRect( const Rectangle& rPixel )
     UpdateHeaderOverlay();      // uses aInvertRect
 }
 
-//------------------------------------------------------------------------
+
 
 void ScGridWindow::PrePaint()
 {
@@ -306,7 +306,7 @@ void ScGridWindow::PrePaint()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScGridWindow::Paint( const Rectangle& rRect )
 {
@@ -480,7 +480,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod
                                         nPPTX, nPPTY, false, bFormulaMode,
                                         &pViewData->GetMarkData() );
 
-    //--------------------------------------------------------------------
+
 
     Fraction aZoomX = pViewData->GetZoomX();
     Fraction aZoomY = pViewData->GetZoomY();
@@ -1525,7 +1525,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects )
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx
index f039502a6c30..ca2c578f144e 100644
--- a/sc/source/ui/view/gridwin5.cxx
+++ b/sc/source/ui/view/gridwin5.cxx
@@ -53,7 +53,7 @@
 #include "postit.hxx"
 #include "global.hxx"
 #include "globstr.hrc"
-// -----------------------------------------------------------------------
+
 
 bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
 {
@@ -240,7 +240,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard )
     return bDone;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScGridWindow::RequestHelp(const HelpEvent& rHEvt)
 {
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 9ce482b73659..16039fb5b57a 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -934,9 +934,9 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt )
         Window::RequestHelp(rHEvt);
 }
 
-// -----------------------------------------------------------------------
+
 //                  Dummys fuer virtuelle Methoden
-// -----------------------------------------------------------------------
+
 
 SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) const
 {
diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx
index acd397707abd..ec0a02fb5f0d 100644
--- a/sc/source/ui/view/invmerge.cxx
+++ b/sc/source/ui/view/invmerge.cxx
@@ -21,7 +21,7 @@
 
 #include "invmerge.hxx"
 
-//------------------------------------------------------------------
+
 
 ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) :
     pRects( pRectangles )
diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx
index 624df51021de..20c503a19b18 100644
--- a/sc/source/ui/view/notemark.cxx
+++ b/sc/source/ui/view/notemark.cxx
@@ -35,7 +35,7 @@
 #define SC_NOTEMARK_TIME    800
 #define SC_NOTEMARK_SHORT   70
 
-// -----------------------------------------------------------------------
+
 
 ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal,
                             ScDocument* pD, ScAddress aPos, const OUString& rUser,
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 4417e9467e42..b79e5b7129ee 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -28,7 +28,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 void ActivateOlk( ScViewData* /* pViewData */ )
 {
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 1a934bbab2c5..fa9bffc26ae8 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -81,7 +81,7 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7;
 // STATIC DATA -----------------------------------------------------------
 
 
-// -----------------------------------------------------------------------
+
 
 class ScDrawStringsVars
 {
diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx
index c0e81d3113dd..2b70ae011759 100644
--- a/sc/source/ui/view/pfuncache.cxx
+++ b/sc/source/ui/view/pfuncache.cxx
@@ -25,7 +25,7 @@
 #include "markdata.hxx"
 #include "prevloc.hxx"
 
-//------------------------------------------------------------------------
+
 
 ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark,
                                     const ScPrintSelectionStatus& rStatus ) :
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index e5b2c33f6e25..79c0759e0bad 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -31,12 +31,12 @@
 #include "document.hxx"
 #include "sc.hrc"
 
-//------------------------------------------------------------------------
+
 
 #define ScPageBreakShell
 #include "scslots.hxx"
 
-//------------------------------------------------------------------------
+
 
 TYPEINIT1( ScPageBreakShell, SfxShell );
 
@@ -46,7 +46,7 @@ SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL))
 }
 
 
-//------------------------------------------------------------------------
+
 ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
     SfxShell(pViewSh)
 {
@@ -62,7 +62,7 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) :
     SetName(OUString("PageBreak"));
 }
 
-//------------------------------------------------------------------------
+
 ScPageBreakShell::~ScPageBreakShell()
 {
 }
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 798b7b1c6450..0d08c9f6e817 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -74,7 +74,7 @@
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 #define ScPreviewShell
 #include "scslots.hxx"
@@ -94,7 +94,7 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" )
     SFX_VIEW_REGISTRATION(ScDocShell);
 }
 
-//------------------------------------------------------------------
+
 
 void ScPreviewShell::Construct( Window* pParent )
 {
@@ -205,7 +205,7 @@ void ScPreviewShell::InitStartTable(SCTAB nTab)
     pPreview->SetPageNo( pPreview->GetFirstPage(nTab) );
 }
 
-//------------------------------------------------------------------
+
 
 OUString ScPreviewShell::GetDescription() const
 {
@@ -568,7 +568,7 @@ void ScPreviewShell::Deactivate(sal_Bool bMDI)
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void ScPreviewShell::Execute( SfxRequest& rReq )
 {
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index b63fe5368d5c..f223eeb3061c 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -28,7 +28,7 @@
 
 // STATIC DATA -----------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index b32cb95b7628..fe44102e1cb5 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -79,7 +79,7 @@
 #define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue()
 #define GET_SHOW(set,which)   ( VOBJ_MODE_SHOW == ScVObjMode( ((const ScViewObjectModeItem&)(set)->Get((which))).GetValue()) )
 
-//------------------------------------------------------------------------
+
 
 ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r)
 {
@@ -161,7 +161,7 @@ size_t ScPageRowEntry::CountVisible() const
         return nPagesX;
 }
 
-//------------------------------------------------------------------------
+
 
 static long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine)
 {
@@ -846,9 +846,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
     }
     lcl_FillHFParam( aFtr, pFooterSet );
 
-    //------------------------------------------------------
+
     // Compile Table-/Area-Params from single Items
-    //------------------------------------------------------
+
     // TabPage "Table"
 
     const SfxUInt16Item*     pScaleItem          = NULL;
@@ -926,9 +926,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions )
 
     aTableParam.bForceBreaks = pOptions && pOptions->GetForceBreaks();
 
-    //------------------------------------------------------
+
     // TabPage "Parts":
-    //------------------------------------------------------
+
 
     //! walk throuch all PrintAreas of the table !!!
     const ScRange*  pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 );
@@ -2555,7 +2555,7 @@ void ScPrintFunc::InitModes()               // set MapModes from  nZoom etc.
     aTwipMode = MapMode( MAP_TWIP, aTwipsOfs, aHorFract, aZoomFract );
 }
 
-//--------------------------------------------------------------------
+
 
 void ScPrintFunc::ApplyPrintSettings()
 {
@@ -2595,7 +2595,7 @@ void ScPrintFunc::ApplyPrintSettings()
     }
 }
 
-//--------------------------------------------------------------------
+
 //  rPageRanges   = range for all tables
 //  nStartPage    = rPageRanges starts at nStartPage
 //  nDisplayStart = continuous number for displaying the page number
@@ -2611,7 +2611,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
     if ( pPrinter && bDoPrint )
         ApplyPrintSettings();
 
-    //--------------------------------------------------------------------
+
 
     InitModes();
     if ( pLocationData )
@@ -2622,7 +2622,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges,
 
     MakeTableString();
 
-    //--------------------------------------------------------------------
+
 
     long nPageNo = 0;
     long nPrinted = 0;
diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx
index 5364c13131d8..e2e804696956 100644
--- a/sc/source/ui/view/reffact.cxx
+++ b/sc/source/ui/view/reffact.cxx
@@ -31,7 +31,7 @@
 #include "scmod.hxx"
 #include "validate.hxx"
 
-// -----------------------------------------------------------------------
+
 
 SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME )
 SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME )
@@ -125,9 +125,9 @@ IMPL_CHILD_CTOR( ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA )
 
 IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION )
 
-//-------------------------------------------------------------------------
+
 // ScSimpleRefDlgWrapper
-//-------------------------------------------------------------------------
+
 
 static bool         bScSimpleRefFlag;
 static long         nScSimpleRefHeight;
@@ -243,9 +243,9 @@ void ScSimpleRefDlgWrapper::StartRefInput()
 
 
 
-//-------------------------------------------------------------------------
+
 // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell
-//-------------------------------------------------------------------------
+
 
 ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper(   Window* pParentP,
                                             sal_uInt16 nId,
@@ -279,9 +279,9 @@ void ScAcceptChgDlgWrapper::ReInitDlg()
     }
 }
 
-//-------------------------------------------------------------------------
+
 // ScHighlightChgDlgWrapper
-//-------------------------------------------------------------------------
+
 
 IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW )
 
diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx
index 800f5236a6fb..3753396d825f 100644
--- a/sc/source/ui/view/scextopt.cxx
+++ b/sc/source/ui/view/scextopt.cxx
@@ -80,7 +80,7 @@ private:
     ScExtTabSettingsMap maMap;
 };
 
-// ----------------------------------------------------------------------------
+
 
 ScExtTabSettingsCont::ScExtTabSettingsCont()
 {
@@ -143,7 +143,7 @@ ScExtDocOptionsImpl::ScExtDocOptionsImpl() :
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScExtDocOptions::ScExtDocOptions() :
     mxImpl( new ScExtDocOptionsImpl )
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 1b4b8ad38388..f12bb5ec847f 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star;
 static Point aSwitchPos;                //! Member
 static bool bDidSwitch = false;
 
-// -----------------------------------------------------------------------
+
 
 // View (Gridwin / keyboard)
 ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) :
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 8ac4636722b2..cd8fd0b55c64 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -375,7 +375,7 @@ ScConversionParam::ScConversionParam( ScConversionType eConvType,
         mnOptions = i18n::TextConversionOption::CHARACTER_BY_CHARACTER;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ScTextConversionEngine::ScTextConversionEngine(
         SfxItemPool* pEnginePoolP, ScViewData& rViewData,
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index bee68c7afe1b..8cac82a491db 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -94,7 +94,7 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex )
 
 using namespace com::sun::star;
 
-// -----------------------------------------------------------------------
+
 
 //
 // ---  Public-Funktionen
@@ -772,7 +772,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
 
         // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY )
 
-        //-------------------------------------------------------------------------------
+
         //  falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen
         //  wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs
 
@@ -839,7 +839,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
                 }
             }
         }
-        //-------------------------------------------------------------------------------
+
 
         SCsCOL nNewDeltaX = nDeltaX;
         SCsROW nNewDeltaY = nDeltaY;
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 6eee7b5ba3a4..04fdf7e8d389 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -533,7 +533,7 @@ void ScTabView::DigitLanguageChanged()
             pGridWin[i]->SetDigitLanguage( eNewLang );
 }
 
-//---------------------------------------------------------------
+
 
 void ScTabView::ScrollToObject( SdrObject* pDrawObj )
 {
@@ -620,7 +620,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect )
     }
 }
 
-//---------------------------------------------------------------
+
 
 void ScTabView::SetBrushDocument( ScDocument* pNew, bool bLock )
 {
diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx
index 50cb51ffbcff..fca644ab010d 100644
--- a/sc/source/ui/view/tabvwsh2.cxx
+++ b/sc/source/ui/view/tabvwsh2.cxx
@@ -49,7 +49,7 @@
 #include <svx/svdpage.hxx>
 #include <fuconcustomshape.hxx>
 
-// -----------------------------------------------------------------------
+
 
 SdrView* ScTabViewShell::GetDrawView() const
 {
diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx
index bd7ef6fe2fa6..a6f201accb5f 100644
--- a/sc/source/ui/view/tabvwsh3.cxx
+++ b/sc/source/ui/view/tabvwsh3.cxx
@@ -70,7 +70,7 @@
 
 using ::std::auto_ptr;
 
-//------------------------------------------------------------------
+
 
 /** Try to parse the given range using Calc-style syntax first, then
     Excel-style if that fails. */
@@ -766,7 +766,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq )
             }
             break;
 
-        //----------------------------------------------------------------
+
 
         case FID_TAB_SELECTALL:
             SelectAllTables();
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index e9da7c7719c3..978500e4bc27 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -101,7 +101,7 @@ sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC;
 sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0;
 sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM;
 
-// -----------------------------------------------------------------------
+
 
 void ScTabViewShell::Activate(sal_Bool bMDI)
 {
@@ -310,7 +310,7 @@ bool ScTabViewShell::PrepareClose(sal_Bool bUI)
     return SfxViewShell::PrepareClose(bUI);
 }
 
-//------------------------------------------------------------------
+
 
 //  Zoom fuer In-Place berechnen
 //  aus Verhaeltnis von VisArea und Fenstergroesse des GridWin
@@ -451,7 +451,7 @@ void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const
     rRect.SetSize( pWin->LogicToPixel( aLogicRect.GetSize() ) );
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::Move()
 {
@@ -464,7 +464,7 @@ void ScTabViewShell::Move()
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ShowCursor(bool /* bOn */)
 {
@@ -478,7 +478,7 @@ void ScTabViewShell::ShowCursor(bool /* bOn */)
 */
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::WriteUserData(OUString& rData, bool /* bBrowse */)
 {
@@ -570,7 +570,7 @@ void ScTabViewShell::DoReadUserData( const OUString& rData )
     //! if ViewData has more tables than document, remove tables in ViewData
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::UpdateDrawShell()
 {
@@ -1052,14 +1052,14 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr )
     }
 }
 
-//------------------------------------------------------------------
+
 
 ScTabViewShell* ScTabViewShell::GetActiveViewShell()
 {
     return PTR_CAST(ScTabViewShell,Current());
 }
 
-//------------------------------------------------------------------
+
 
 SfxPrinter* ScTabViewShell::GetPrinter( sal_Bool bCreate )
 {
@@ -1093,7 +1093,7 @@ void ScTabViewShell::StopEditShell()
         SetEditShell(NULL, false );
 }
 
-//------------------------------------------------------------------
+
 
 // close handler to ensure function of dialog:
 
@@ -1201,7 +1201,7 @@ void ScTabViewShell::StopSimpleRefDialog()
     }
 }
 
-//------------------------------------------------------------------
+
 
 bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt)
 {
@@ -1466,7 +1466,7 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
     return TabKeyInput( rKeyEvent );
 }
 
-//------------------------------------------------------------------
+
 
 #define __INIT_ScTabViewShell \
     eCurOST(OST_NONE),          \
@@ -1516,7 +1516,7 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent )
     mbInSwitch(false)
 
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode )
 {
@@ -1716,10 +1716,10 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode )
     SetBorderPixel( aBorder );
 }
 
-//------------------------------------------------------------------
 
 
-//------------------------------------------------------------------
+
+
 
 ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
                                 SfxViewShell* pOldSh ) :
@@ -1773,7 +1773,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
 
 #undef __INIT_ScTabViewShell
 
-//------------------------------------------------------------------
+
 
 ScTabViewShell::~ScTabViewShell()
 {
@@ -1817,7 +1817,7 @@ ScTabViewShell::~ScTabViewShell()
     DELETEZ(pAccessibilityBroadcaster);
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj )
 {
@@ -1828,7 +1828,7 @@ void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj )
         pDialogDPObject = NULL;
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
 {
@@ -1856,7 +1856,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData )
     //  eNumType kennt der Dialog selber
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest )
 {
@@ -1882,7 +1882,7 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings()
 }
 
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecTbx( SfxRequest& rReq )
 {
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index ae8205817c30..d8357a03fdba 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -306,13 +306,13 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     SfxViewShell::Notify( rBC, rHint );
 }
 
-//------------------------------------------------------------------
+
 
 SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData )
 {
-    //------------------------------
+
     // NumberInfo-Item konstruieren:
-    //------------------------------
+
     SvxNumberValueType  eValType        = SVX_VALUE_TYPE_UNDEFINED;
     double              nCellValue      = 0;
     OUString aCellString;
@@ -379,7 +379,7 @@ SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewD
         pDoc->GetFormatTable(), static_cast<const sal_uInt16>(SID_ATTR_NUMBERFORMAT_INFO));
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::UpdateNumberFormatter(
                         const SvxNumberInfoItem& rInfoItem )
diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx
index c60115eb7dc0..6674445d28b3 100644
--- a/sc/source/ui/view/tabvwsh8.cxx
+++ b/sc/source/ui/view/tabvwsh8.cxx
@@ -24,7 +24,7 @@
 #include "document.hxx"
 
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine )
 {
@@ -42,7 +42,7 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine
     }
 }
 
-//------------------------------------------------------------------
+
 
 sal_Bool ScTabViewShell::HasSelection( sal_Bool bText ) const
 {
@@ -70,7 +70,7 @@ sal_Bool ScTabViewShell::HasSelection( sal_Bool bText ) const
     return bHas;
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient )
 {
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index 5f2f415b12c2..72a38f273161 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -45,7 +45,7 @@ SvxIMapDlg*     ScGetIMapDlg();
 const void*     ScIMapDlgGetObj( SvxIMapDlg* pDlg );
 const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg );
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
 {
@@ -72,7 +72,7 @@ void ScTabViewShell::GetChildWinState( SfxItemSet& rSet )
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecGallery( SfxRequest& rReq )
 {
@@ -106,14 +106,14 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ )
 {
 }
 
-//------------------------------------------------------------------
+
 
 ScInputHandler* ScTabViewShell::GetInputHandler() const
 {
     return pInputHandler;
 }
 
-//------------------------------------------------------------------
+
 
 OUString ScTabViewShell::GetDescription() const
 {
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index a9d2767bf4a6..57abb07c31a5 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -466,7 +466,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
     } // while ( nWitch )
 }
 
-//------------------------------------------------------------------
+
 void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName)
 {
     ScDocument*             pDoc    = GetViewData()->GetDocument();
@@ -553,7 +553,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName
     }
 }
 
-//------------------------------------------------------------------
+
 
 bool ScTabViewShell::IsRefInputMode() const
 {
@@ -600,7 +600,7 @@ bool ScTabViewShell::IsRefInputMode() const
     return false;
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecuteInputDirect()
 {
@@ -614,7 +614,7 @@ void ScTabViewShell::ExecuteInputDirect()
     }
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bStopEditing /* = sal_True */ )
 {
@@ -714,7 +714,7 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust )
         pHdl->UpdateCellAdjust( eJust );
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecuteSave( SfxRequest& rReq )
 {
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 86f8c66d222d..8a8c5df576dd 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -487,7 +487,7 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet)
 }
 
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecuteUndo(SfxRequest& rReq)
 {
diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx
index afdd056de325..03430eae901c 100644
--- a/sc/source/ui/view/tabvwshc.cxx
+++ b/sc/source/ui/view/tabvwshc.cxx
@@ -73,7 +73,7 @@
 
 #include <config_orcus.h>
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew )
 {
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 49c9d8a98c0b..c593bf695d73 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -118,7 +118,7 @@ OUString ScTabViewShell::GetSelectionText( bool bWholeWord )
     return aStrSelection;
 }
 
-//------------------------------------------------------------------------
+
 
 void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget,
                                 sal_uInt16 nMode )
@@ -153,7 +153,7 @@ void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, con
     }
 }
 
-//------------------------------------------------------------------------
+
 
 static void lcl_SelectFieldAfterInsert( EditView& rView )
 {
@@ -350,7 +350,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 
 
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 059fdce5b63d..17b7e17a7d6b 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -781,7 +781,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
         }
     }
 
-    //------------------------------------------------------------------
+
 
     void ScTabViewShell::GetStateTable( SfxItemSet& rSet )
     {
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index e256e55c40ca..85f335e005b4 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -36,7 +36,7 @@ using namespace com::sun::star;
 #include "globstr.hrc"
 #include <avmedia/mediawindow.hxx>
 
-//------------------------------------------------------------------------
+
 
 void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rURL,
                                         const OUString& rTarget,
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index f99c60617fc6..4be04c6e49ee 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -40,7 +40,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ )
 {
@@ -53,7 +53,7 @@ void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ )
     //  SID_RANGE_REGION (CurrentRegion) - removed (old Basic)
 }
 
-//------------------------------------------------------------------
+
 
 void ScTabViewShell::ExecuteObject( SfxRequest& rReq )
 {
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 2364c1bf8aa1..0ddaecf34901 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -101,7 +101,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName );
 // STATIC DATA ---------------------------------------------------------------
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData )
 {
@@ -163,7 +163,7 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint )
 {
@@ -203,7 +203,7 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 enum ScAutoSum
 {
@@ -236,7 +236,7 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 #define SC_AUTOSUM_MAXCOUNT     20
 
@@ -271,7 +271,7 @@ static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow
 
 #undef SC_AUTOSUM_MAXCOUNT
 
-//----------------------------------------------------------------------------
+
 
 static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow,
                                    SCTAB nTab, SCCOLROW& nExtend, SCROW nMinRow )
@@ -290,7 +290,7 @@ static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& n
     return false;
 }
 
-//----------------------------------------------------------------------------
+
 
 static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow,
                                 SCTAB nTab, SCCOLROW& nExtend, SCROW nMinCol )
@@ -309,7 +309,7 @@ static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow
     return false;
 }
 
-//----------------------------------------------------------------------------
+
 
 static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange )
 {
@@ -353,7 +353,7 @@ static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeL
     return true;
 }
 
-//----------------------------------------------------------------------------
+
 
 static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange )
 {
@@ -397,7 +397,7 @@ static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList
     return true;
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
 {
@@ -503,7 +503,7 @@ bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList )
     return false;
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr)
 {
@@ -511,7 +511,7 @@ void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, con
     EnterBlock( aFormula, NULL );
 }
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue )
 {
@@ -712,7 +712,7 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor
     return true;
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr )
 {
@@ -757,7 +757,7 @@ OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSub
     return aBuf.makeStringAndClear();
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pData )
 {
@@ -846,7 +846,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat
 }
 
 
-//----------------------------------------------------------------------------
+
 //  manual page break
 
 void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* pPos,
@@ -867,7 +867,7 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos,
                                     bool bSetModified )
@@ -886,7 +886,7 @@ void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* p
         UpdatePageBreakData( true );    // for PageBreak-Mode
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::RemoveManualBreaks()
 {
@@ -912,7 +912,7 @@ void ScViewFunc::RemoveManualBreaks()
     pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages)
 {
@@ -929,7 +929,7 @@ void ScViewFunc::AdjustPrintZoom()
     GetViewData()->GetDocShell()->AdjustPrintZoom( aRange );
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint,
                                 const OUString* pRepCol, const OUString* pRepRow,
@@ -1041,7 +1041,7 @@ void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint,
     pDocSh->SetDocumentModified();
 }
 
-//----------------------------------------------------------------------------
+
 //  Merge cells
 
 bool ScViewFunc::TestMergeCells()           // pre-test (for menu)
@@ -1059,7 +1059,7 @@ bool ScViewFunc::TestMergeCells()           // pre-test (for menu)
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter )
 {
@@ -1156,7 +1156,7 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::TestRemoveMerge()
 {
@@ -1172,7 +1172,7 @@ bool ScViewFunc::TestRemoveMerge()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange)
 {
@@ -1248,7 +1248,7 @@ bool ScViewFunc::RemoveMerge( bool bRecord )
     return true;        //! bOk ??
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::FillSimple( FillDir eDir, bool bRecord )
 {
@@ -1268,7 +1268,7 @@ void ScViewFunc::FillSimple( FillDir eDir, bool bRecord )
         ErrorMessage(STR_NOMULTISELECT);
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
                              double fStart, double fStep, double fMax, bool bRecord )
@@ -1293,7 +1293,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd,
         ErrorMessage(STR_NOMULTISELECT);
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
                             SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord )
@@ -1338,7 +1338,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow,
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink )
 {
@@ -1407,7 +1407,7 @@ void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmp
     pDocSh->PostDataChanged();
 }
 
-//----------------------------------------------------------------------------
+
 
 /** Downward fill of selected cell(s) by double-clicking cross-hair cursor
 
@@ -1482,7 +1482,7 @@ void ScViewFunc::FillCrossDblClick()
     }
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::TransliterateText( sal_Int32 nType )
 {
@@ -1503,7 +1503,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType )
     }
 }
 
-//----------------------------------------------------------------------------
+
 //  AutoFormat
 
 ScAutoFormatData* ScViewFunc::CreateAutoFormatData()
@@ -1528,7 +1528,7 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord )
 {
@@ -1547,7 +1547,7 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord )
 }
 
 
-//----------------------------------------------------------------------------
+
 //  Suchen & Ersetzen
 
 bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
@@ -1765,7 +1765,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
 }
 
 
-//----------------------------------------------------------------------------
+
 //  Zielwertsuche
 
 void ScViewFunc::Solve( const ScSolveParam& rParam )
@@ -1841,7 +1841,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam )
 }
 
 
-//----------------------------------------------------------------------------
+
 //  multi operation
 
 void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord )
@@ -1858,7 +1858,7 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment,
                                     const Color& rColor, sal_uInt16 nFlags )
@@ -1881,7 +1881,7 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::ExtendScenario()
 {
@@ -1902,7 +1902,7 @@ void ScViewFunc::ExtendScenario()
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::UseScenario( const OUString& rName )
 {
@@ -1915,7 +1915,7 @@ void ScViewFunc::UseScenario( const OUString& rName )
 }
 
 
-//----------------------------------------------------------------------------
+
 //  Insert table
 
 bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord )
@@ -1929,7 +1929,7 @@ bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord )
     return bSuccess;
 }
 
-//----------------------------------------------------------------------------
+
 //  Insert tables
 
 bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab,
@@ -1980,7 +1980,7 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord )
 {
@@ -2014,7 +2014,7 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord )
 {
@@ -2206,7 +2206,7 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab )
 {
@@ -2222,7 +2222,7 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab )
 {
@@ -2244,7 +2244,7 @@ bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfo
     return bSuccess;
 }
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::InsertAreaLink( const OUString& rFile,
                                     const OUString& rFilter, const OUString& rOptions,
@@ -2260,7 +2260,7 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile,
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::InsertTableLink( const OUString& rFile,
                                     const OUString& rFilter, const OUString& rOptions,
@@ -2296,7 +2296,7 @@ void ScViewFunc::InsertTableLink( const OUString& rFile,
 }
 
 
-//----------------------------------------------------------------------------
+
 //  Copy/link tables from another document
 
 void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
@@ -2420,7 +2420,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
 }
 
 
-//----------------------------------------------------------------------------
+
 //  Move/Copy table to another document
 
 void ScViewFunc::MoveTable(
@@ -2776,7 +2776,7 @@ void ScViewFunc::MoveTable(
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::ShowTable( const std::vector<OUString>& rNames )
 {
@@ -2816,7 +2816,7 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::HideTable( const ScMarkData& rMark )
 {
@@ -2867,7 +2867,7 @@ void ScViewFunc::HideTable( const ScMarkData& rMark )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont )
 {
@@ -2904,7 +2904,7 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont )
 }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::UpdateLineAttrs( SvxBorderLine&       rLine,
                                   const SvxBorderLine* pDestLine,
@@ -2943,7 +2943,7 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine&       rLine,
     }
 
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
                                          bool bColorOnly )
@@ -2987,7 +2987,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
                                             ATTR_PATTERN_START,
                                             ATTR_PATTERN_END );
 
-            //------------------------------------------------------------
+
             const SvxBorderLine*    pBoxLine = NULL;
             SvxBorderLine           aLine;
 
@@ -3060,7 +3060,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine,
 
 #undef SET_LINE_ATTRIBUTES
 
-//----------------------------------------------------------------------------
+
 
 void ScViewFunc::SetValidation( const ScValidationData& rNew )
 {
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index ae40407029e2..e83551516ee1 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -75,7 +75,7 @@ using namespace com::sun::star;
 
 //  GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx
 
-//----------------------------------------------------------------------------
+
 //      C U T
 
 void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects )
@@ -151,7 +151,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects )
 }
 
 
-//----------------------------------------------------------------------------
+
 //      C O P Y
 
 bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, bool bCut, bool bApi, bool bIncludeObjects, bool bStopEdit )
@@ -436,7 +436,7 @@ ScTransferObj* ScViewFunc::CopyToTransferable()
     return NULL;
 }
 
-//----------------------------------------------------------------------------
+
 //      P A S T E
 
 void ScViewFunc::PasteDraw()
@@ -689,7 +689,7 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi )
 }
 
 
-//----------------------------------------------------------------------------
+
 //      P A S T E
 
 bool ScViewFunc::PasteOnDrawObjectLinked(
@@ -1748,7 +1748,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark
 }
 
 
-//----------------------------------------------------------------------------
+
 //      D R A G   A N D   D R O P
 //
 //  innerhalb des Dokuments
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 9a7910b453c7..ea3595717fe4 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -25,7 +25,7 @@
 #include <svx/unomodel.hxx>
 #include <unotools/streamwrap.hxx>
 
-//------------------------------------------------------------------
+
 
 #include <svx/fmmodel.hxx>
 #include <svx/svdetc.hxx>
@@ -72,7 +72,7 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------
+
 
 bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
                     const uno::Reference<datatransfer::XTransferable>& rxTransferable,
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 1404d5b2cf39..88640ee3a6d1 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -102,7 +102,7 @@ ScViewFunc::~ScViewFunc()
 {
 }
 
-//------------------------------------------------------------------------------------
+
 
 void ScViewFunc::StartFormatArea()
 {
@@ -226,7 +226,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab,
         aFormatSource.Set( nCol, nRow, nTab );      // then set a new source
 }
 
-//------------------------------------------------------------------------------------
+
 
 //      additional routines
 
@@ -1325,7 +1325,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord
     }
 
     if ( !pStyleSheet) return;
-    // -------------------------------------------------------------------
+
 
     ScViewData* pViewData   = GetViewData();
     ScDocShell* pDocSh      = pViewData->GetDocShell();
@@ -1417,7 +1417,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord
 void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet )
 {
     if ( !pStyleSheet) return;
-    // -------------------------------------------------------------------
+
 
     ScViewData* pViewData   = GetViewData();
     ScDocument* pDoc        = pViewData->GetDocument();
@@ -1444,7 +1444,7 @@ void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet )
 void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet )
 {
     if ( !pStyleSheet) return;
-    // -------------------------------------------------------------------
+
 
     ScViewData* pViewData   = GetViewData();
     ScDocument* pDoc        = pViewData->GetDocument();
diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx
index cd981c29338c..e9a63b0d4338 100644
--- a/sc/source/ui/view/waitoff.cxx
+++ b/sc/source/ui/view/waitoff.cxx
@@ -21,7 +21,7 @@
 
 #include "waitoff.hxx"
 
-//------------------------------------------------------------------------
+
 
 ScWaitCursorOff::ScWaitCursorOff( Window* pWinP )
         :
diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx
index e1ac9979d1bd..97a153e8f634 100644
--- a/sc/workben/addin.cxx
+++ b/sc/workben/addin.cxx
@@ -99,7 +99,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
 
 }   // extern C
 
-//------------------------------------------------------------------------
+
 
 ScTestAddIn::ScTestAddIn()
 {
diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx
index c11d74b6d106..13ce3abee4d4 100644
--- a/sc/workben/result.cxx
+++ b/sc/workben/result.cxx
@@ -27,11 +27,11 @@
 
 using namespace com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 SV_IMPL_PTRARR( XResultListenerArr_Impl, XResultListenerPtr );
 
-//------------------------------------------------------------------------
+
 
 ScAddInResult::ScAddInResult(const String& rStr) :
     aArg( rStr ),
@@ -111,7 +111,7 @@ void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno::
     release();
 }
 
-//------------------------------------------------------------------------
+
 
 
 
diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx
index 2ec6a2fcbee1..327f6bfc2756 100644
--- a/sc/workben/test.cxx
+++ b/sc/workben/test.cxx
@@ -84,7 +84,7 @@ public:
         DECL_LINK(ViewHdl, PushButton*);
 };
 
-//-----------------------------------------------------------------------
+
 
 class ScTestListener : public XSelectionChangeListener, public UsrObject
 {
@@ -106,13 +106,13 @@ public:
     virtual void            selectionChanged(const EventObject& aEvent);
 };
 
-//-----------------------------------------------------------------------
+
 
 static long nBla = 0;
 
 static XCellRef xGlobalCell;
 
-//-----------------------------------------------------------------------
+
 
 ScTestListener::ScTestListener(FixedText* pF) :
     pFixedText( pF )
@@ -165,7 +165,7 @@ void ScTestListener::selectionChanged(const EventObject& aEvent)
 }
 
 
-//-----------------------------------------------------------------------
+
 
 extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam )
 {
@@ -246,7 +246,7 @@ MyWindow::MyWindow( Window *pParent ) :
     aViewButton.Show();
 }
 
-//-----------------------------------------------------------------------
+
 
 XSpreadsheetDocumentRef lcl_GetDocument()
 {
@@ -290,7 +290,7 @@ XInterfaceRef lcl_GetView()
     return xView;
 }
 
-//-----------------------------------------------------------------------
+
 
 void lcl_OutputNames( const XInterfaceRef& xSource,     // XNameAccess
                         const XSpreadsheetDocumentRef& xDoc,
@@ -324,7 +324,7 @@ void lcl_OutputNames( const XInterfaceRef& xSource,     // XNameAccess
     }
 }
 
-//-----------------------------------------------------------------------
+
 
 void lcl_SetText( const XTextRef& xText )
 {
@@ -353,7 +353,7 @@ void lcl_SetText( const XTextRef& xText )
         xProp->setPropertyValue(L"Bold", UsrAny((sal_Bool)true));
 }
 
-//-----------------------------------------------------------------------
+
 
 void lcl_DoCount()
 {
@@ -1634,7 +1634,7 @@ IMPL_LINK_NOARG(MyWindow, CountHdl)
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MyWindow, TextHdl)
 {
@@ -1683,7 +1683,7 @@ IMPL_LINK_NOARG(MyWindow, TextHdl)
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MyWindow, BlaHdl)
 {
@@ -1757,7 +1757,7 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl)
 }
 
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MyWindow, TabHdl)
 {
@@ -1830,7 +1830,7 @@ IMPL_LINK_NOARG(MyWindow, TabHdl)
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 void lcl_FillCells(XCellCollectionRef xColl)
 {
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index 0c91ab8a5ba2..6e8643a4b1cd 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1262,11 +1262,11 @@ double GetZw( double fZins, double fZzr, double fRmz, double fBw, sal_Int32 nF )
 }
 
 
-//-----------------------------------------------------------------------------
+
 // financial functions COUP***
 
 
-//-------
+
 // COUPPCD: find last coupon date before settlement (can be equal to settlement)
 static void lcl_GetCouppcd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
     throw( lang::IllegalArgumentException )
@@ -1291,7 +1291,7 @@ double GetCouppcd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
 }
 
 
-//-------
+
 // COUPNCD: find first coupon date after settlement (is never equal to settlement)
 static void lcl_GetCoupncd( ScaDate& rDate, const ScaDate& rSettle, const ScaDate& rMat, sal_Int32 nFreq )
     throw( lang::IllegalArgumentException )
@@ -1316,7 +1316,7 @@ double GetCoupncd( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_I
 }
 
 
-//-------
+
 // COUPDAYBS: get day count: coupon date before settlement <-> settlement
 double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
     throw( uno::RuntimeException, lang::IllegalArgumentException )
@@ -1331,7 +1331,7 @@ double GetCoupdaybs( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal
 }
 
 
-//-------
+
 // COUPDAYSNC: get day count: settlement <-> coupon date after settlement
 double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
     throw( uno::RuntimeException, lang::IllegalArgumentException )
@@ -1350,7 +1350,7 @@ double GetCoupdaysnc( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sa
 }
 
 
-//-------
+
 // COUPDAYS: get day count: coupon date before settlement <-> coupon date after settlement
 double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
     throw( uno::RuntimeException, lang::IllegalArgumentException )
@@ -1370,7 +1370,7 @@ double GetCoupdays( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_
 }
 
 
-//-------
+
 // COUPNUM: get count of coupon dates
 double GetCoupnum( sal_Int32 nNullDate, sal_Int32 nSettle, sal_Int32 nMat, sal_Int32 nFreq, sal_Int32 nBase )
     throw( uno::RuntimeException, lang::IllegalArgumentException )
@@ -1608,7 +1608,7 @@ void SortedIndividualInt32List::InsertHolidayList(
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void ScaDoubleList::Append(
         const uno::Sequence< uno::Sequence< double > >& rValueSeq ) throw( uno::RuntimeException, lang::IllegalArgumentException )
@@ -1698,7 +1698,7 @@ sal_Bool ScaDoubleList::CheckInsert( double ) const throw( uno::RuntimeException
 
 
 
-//-----------------------------------------------------------------------------
+
 
 sal_Bool ScaDoubleListGT0::CheckInsert( double fValue ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
@@ -1709,7 +1709,7 @@ sal_Bool ScaDoubleListGT0::CheckInsert( double fValue ) const throw( uno::Runtim
 
 
 
-//-----------------------------------------------------------------------------
+
 
 sal_Bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
@@ -1720,7 +1720,7 @@ sal_Bool ScaDoubleListGE0::CheckInsert( double fValue ) const throw( uno::Runtim
 
 
 
-//-----------------------------------------------------------------------------
+
 
 Complex::Complex( const OUString& rStr ) throw( uno::RuntimeException, lang::IllegalArgumentException )
 {
@@ -2673,7 +2673,7 @@ double ConvertDataList::Convert( double fVal, const OUString& rFrom, const OUStr
 
 
 
-//-----------------------------------------------------------------------------
+
 
 ScaDate::ScaDate() :
     nOrigDay( 1 ),
@@ -2872,7 +2872,7 @@ sal_Bool ScaDate::operator<( const ScaDate& rCmp ) const
 
 
 
-//-----------------------------------------------------------------------------
+
 
 ScaAnyConverter::ScaAnyConverter( const uno::Reference< uno::XComponentContext >& xContext ) :
     bHasValidFormat( sal_False )
@@ -3009,7 +3009,7 @@ sal_Int32 ScaAnyConverter::getInt32(
 
 
 
-//-----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scaddins/source/analysis/bessel.cxx b/scaddins/source/analysis/bessel.cxx
index b3b05926b5d4..9aa720e77a07 100644
--- a/scaddins/source/analysis/bessel.cxx
+++ b/scaddins/source/analysis/bessel.cxx
@@ -57,7 +57,7 @@ const double f_2_DIV_PI = 2.0 / f_PI;
     alpha_k=1 for k=N and alpha_k=0 otherwise
 */
 
-// ----------------------------------------------------------------------------
+
 
 double BesselJ( double x, sal_Int32 N ) throw (IllegalArgumentException, NoConvergenceException)
 
@@ -171,7 +171,7 @@ double BesselJ( double x, sal_Int32 N ) throw (IllegalArgumentException, NoConve
     No asymptotic approximation used, see issue 43040.
  */
 
-// ----------------------------------------------------------------------------
+
 
 double BesselI( double x, sal_Int32 n ) throw( IllegalArgumentException, NoConvergenceException )
 {
diff --git a/scaddins/source/analysis/financial.cxx b/scaddins/source/analysis/financial.cxx
index 0378222b24b1..d518667a3dba 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -519,7 +519,7 @@ static double lcl_sca_XirrResult_Deriv1( const ScaDoubleList& rValues, const Sca
 #undef D_
 
 
-// ----------------------------------------------------------------------------
+
 // XIRR calculation
 
 double SAL_CALL AnalysisAddIn::getXirr(
diff --git a/scaddins/source/pricing/black_scholes.cxx b/scaddins/source/pricing/black_scholes.cxx
index 8086938cb547..cf5087cf6a3b 100644
--- a/scaddins/source/pricing/black_scholes.cxx
+++ b/scaddins/source/pricing/black_scholes.cxx
@@ -85,7 +85,7 @@ namespace bs {
 
 
 // helper functions
-// ----------------
+
 inline double sqr(double x) {
     return x*x;
 }
@@ -540,9 +540,9 @@ double vanilla_trunc(double S, double vol, double rd, double rf,
 } // namespace internal
 
 
-// ---------------------------------------------------------------------
+
 // path dependent options
-// ---------------------------------------------------------------------
+
 
 namespace internal {
 
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 982efec183d2..e5c1d0c376d5 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -83,7 +83,7 @@ using namespace com::sun::star;
 #define STR_EPSILONLEVEL  "EpsilonLevel"
 #define STR_LIMITBBDEPTH  "LimitBBDepth"
 
-// -----------------------------------------------------------------------
+
 //  Resources from tools are used for translated strings
 
 static ResMgr* pSolverResMgr = NULL;
@@ -96,7 +96,7 @@ static OUString lcl_GetResourceString( sal_uInt32 nId )
     return ResId(nId, *pSolverResMgr).toString();
 }
 
-// -----------------------------------------------------------------------
+
 
 namespace
 {
@@ -110,7 +110,7 @@ namespace
     };
 }
 
-// -----------------------------------------------------------------------
+
 
 // hash map for the coefficients of a dependent cell (objective or constraint)
 // The size of each vector is the number of columns (variable cells) plus one, first entry is initial value.
@@ -138,7 +138,7 @@ struct ScSolverCellEqual
 
 typedef boost::unordered_map< table::CellAddress, std::vector<double>, ScSolverCellHash, ScSolverCellEqual > ScSolverCellHashMap;
 
-// -----------------------------------------------------------------------
+
 
 static uno::Reference<table::XCell> lcl_GetCell( const uno::Reference<sheet::XSpreadsheetDocument>& xDoc,
                                           const table::CellAddress& rPos )
@@ -160,7 +160,7 @@ static double lcl_GetValue( const uno::Reference<sheet::XSpreadsheetDocument>& x
     return lcl_GetCell( xDoc, rPos )->getValue();
 }
 
-// -------------------------------------------------------------------------
+
 
 SolverComponent::SolverComponent( const uno::Reference<uno::XComponentContext>& /* rSMgr */ ) :
     OPropertyContainer( GetBroadcastHelper() ),
diff --git a/scripting/source/basprov/baslibnode.cxx b/scripting/source/basprov/baslibnode.cxx
index 783c53ecc0d0..92010fb993f6 100644
--- a/scripting/source/basprov/baslibnode.cxx
+++ b/scripting/source/basprov/baslibnode.cxx
@@ -58,15 +58,15 @@ namespace basprov
         }
     }
 
-    // -----------------------------------------------------------------------------
+
 
     BasicLibraryNodeImpl::~BasicLibraryNodeImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     // XBrowseNode
-    // -----------------------------------------------------------------------------
+
 
     OUString BasicLibraryNodeImpl::getName(  ) throw (RuntimeException)
     {
@@ -75,7 +75,7 @@ namespace basprov
         return m_sLibName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< Reference< browse::XBrowseNode > > BasicLibraryNodeImpl::getChildNodes(  ) throw (RuntimeException)
     {
@@ -109,7 +109,7 @@ namespace basprov
         return aChildNodes;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicLibraryNodeImpl::hasChildNodes(  ) throw (RuntimeException)
     {
@@ -122,7 +122,7 @@ namespace basprov
         return bReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 BasicLibraryNodeImpl::getType(  ) throw (RuntimeException)
     {
@@ -131,7 +131,7 @@ namespace basprov
         return browse::BrowseNodeTypes::CONTAINER;
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace basprov
diff --git a/scripting/source/basprov/basmethnode.cxx b/scripting/source/basprov/basmethnode.cxx
index 40f46cefea81..1837e6a5b4cb 100644
--- a/scripting/source/basprov/basmethnode.cxx
+++ b/scripting/source/basprov/basmethnode.cxx
@@ -95,27 +95,27 @@ namespace basprov
         registerProperty( BASPROV_PROPERTY_EDITABLE, BASPROV_PROPERTY_ID_EDITABLE, BASPROV_DEFAULT_ATTRIBS(), &m_bEditable, ::getCppuType( &m_bEditable ) );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     BasicMethodNodeImpl::~BasicMethodNodeImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInterface
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XINTERFACE2( BasicMethodNodeImpl, BasicMethodNodeImpl_BASE, OPropertyContainer )
 
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicMethodNodeImpl, BasicMethodNodeImpl_BASE, OPropertyContainer )
 
-    // -----------------------------------------------------------------------------
+
     // XBrowseNode
-    // -----------------------------------------------------------------------------
+
 
     OUString BasicMethodNodeImpl::getName(  ) throw (RuntimeException)
     {
@@ -128,7 +128,7 @@ namespace basprov
         return sMethodName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< Reference< browse::XBrowseNode > > BasicMethodNodeImpl::getChildNodes(  ) throw (RuntimeException)
     {
@@ -137,7 +137,7 @@ namespace basprov
         return Sequence< Reference< browse::XBrowseNode > >();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicMethodNodeImpl::hasChildNodes(  ) throw (RuntimeException)
     {
@@ -146,7 +146,7 @@ namespace basprov
         return sal_False;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 BasicMethodNodeImpl::getType(  ) throw (RuntimeException)
     {
@@ -155,18 +155,18 @@ namespace basprov
         return browse::BrowseNodeTypes::SCRIPT;
     }
 
-    // -----------------------------------------------------------------------------
+
     // OPropertySetHelper
-    // -----------------------------------------------------------------------------
+
 
     ::cppu::IPropertyArrayHelper& BasicMethodNodeImpl::getInfoHelper(  )
     {
         return *getArrayHelper();
     }
 
-    // -----------------------------------------------------------------------------
+
     // OPropertyArrayUsageHelper
-    // -----------------------------------------------------------------------------
+
 
     ::cppu::IPropertyArrayHelper* BasicMethodNodeImpl::createArrayHelper(  ) const
     {
@@ -175,9 +175,9 @@ namespace basprov
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
 
-    // -----------------------------------------------------------------------------
+
     // XPropertySet
-    // -----------------------------------------------------------------------------
+
 
     Reference< XPropertySetInfo > BasicMethodNodeImpl::getPropertySetInfo(  ) throw (RuntimeException)
     {
@@ -185,16 +185,16 @@ namespace basprov
         return xInfo;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInvocation
-    // -----------------------------------------------------------------------------
+
 
     Reference< XIntrospectionAccess > BasicMethodNodeImpl::getIntrospection(  ) throw (RuntimeException)
     {
         return Reference< XIntrospectionAccess >();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Any BasicMethodNodeImpl::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams,
         Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
@@ -283,7 +283,7 @@ namespace basprov
         return Any();
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void BasicMethodNodeImpl::setValue( const OUString& aPropertyName, const Any& aValue )
         throw (UnknownPropertyException, script::CannotConvertException,
@@ -297,7 +297,7 @@ namespace basprov
             Reference< XInterface >() );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Any BasicMethodNodeImpl::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
@@ -308,7 +308,7 @@ namespace basprov
             Reference< XInterface >() );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicMethodNodeImpl::hasMethod( const OUString& aName ) throw (RuntimeException)
     {
@@ -319,7 +319,7 @@ namespace basprov
         return bReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicMethodNodeImpl::hasProperty( const OUString& aName ) throw (RuntimeException)
     {
@@ -328,7 +328,7 @@ namespace basprov
         return sal_False;
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace basprov
diff --git a/scripting/source/basprov/basmodnode.cxx b/scripting/source/basprov/basmodnode.cxx
index 13981b5c6e20..3a94833ab26a 100644
--- a/scripting/source/basprov/basmodnode.cxx
+++ b/scripting/source/basprov/basmodnode.cxx
@@ -52,15 +52,15 @@ namespace basprov
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     BasicModuleNodeImpl::~BasicModuleNodeImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     // XBrowseNode
-    // -----------------------------------------------------------------------------
+
 
     OUString BasicModuleNodeImpl::getName(  ) throw (RuntimeException)
     {
@@ -73,7 +73,7 @@ namespace basprov
         return sModuleName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< Reference< browse::XBrowseNode > > BasicModuleNodeImpl::getChildNodes(  ) throw (RuntimeException)
     {
@@ -110,7 +110,7 @@ namespace basprov
         return aChildNodes;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicModuleNodeImpl::hasChildNodes(  ) throw (RuntimeException)
     {
@@ -127,7 +127,7 @@ namespace basprov
         return bReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 BasicModuleNodeImpl::getType(  ) throw (RuntimeException)
     {
@@ -136,7 +136,7 @@ namespace basprov
         return browse::BrowseNodeTypes::CONTAINER;
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace basprov
diff --git a/scripting/source/basprov/basprov.cxx b/scripting/source/basprov/basprov.cxx
index 5622ba566f5b..f7f4bd9320a8 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -82,7 +82,7 @@ namespace basprov
         return *pImplName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     static Sequence< OUString > getSupportedServiceNames_BasicProviderImpl()
     {
@@ -118,13 +118,13 @@ namespace basprov
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     BasicProviderImpl::~BasicProviderImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     bool BasicProviderImpl::isLibraryShared( const Reference< script::XLibraryContainer >& rxLibContainer, const OUString& rLibName )
     {
@@ -197,9 +197,9 @@ namespace basprov
         return getSupportedServiceNames_BasicProviderImpl();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInitialization
-    // -----------------------------------------------------------------------------
+
 
     void BasicProviderImpl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
     {
@@ -288,10 +288,10 @@ namespace basprov
             m_xLibContainerApp = Reference< script::XLibraryContainer >( SFX_APP()->GetBasicContainer(), UNO_QUERY );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     // XScriptProvider
-    // -----------------------------------------------------------------------------
+
 
     Reference < provider::XScript > BasicProviderImpl::getScript( const OUString& scriptURI )
         throw ( provider::ScriptFrameworkErrorException, RuntimeException)
@@ -413,9 +413,9 @@ namespace basprov
         return xScript;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XBrowseNode
-    // -----------------------------------------------------------------------------
+
 
     OUString BasicProviderImpl::getName(  ) throw (RuntimeException)
     {
@@ -426,7 +426,7 @@ namespace basprov
         return OUString("Basic");
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Sequence< Reference< browse::XBrowseNode > > BasicProviderImpl::getChildNodes(  ) throw (RuntimeException)
     {
@@ -484,7 +484,7 @@ namespace basprov
         return aChildNodes;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Bool BasicProviderImpl::hasChildNodes(  ) throw (RuntimeException)
     {
@@ -506,7 +506,7 @@ namespace basprov
         return bReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     sal_Int16 BasicProviderImpl::getType(  ) throw (RuntimeException)
     {
@@ -526,7 +526,7 @@ namespace basprov
         return static_cast< lang::XTypeProvider * >( new BasicProviderImpl( xContext ) );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     static struct ::cppu::ImplementationEntry s_component_entries [] =
     {
@@ -538,7 +538,7 @@ namespace basprov
         { 0, 0, 0, 0, 0, 0 }
     };
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace basprov
diff --git a/scripting/source/basprov/basscript.cxx b/scripting/source/basprov/basscript.cxx
index 5a85b303fba7..482a64e81e87 100644
--- a/scripting/source/basprov/basscript.cxx
+++ b/scripting/source/basprov/basscript.cxx
@@ -57,7 +57,7 @@ namespace basprov
     // BasicScriptImpl
     // =============================================================================
 
-    // -----------------------------------------------------------------------------
+
 
     BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod )
         : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
@@ -70,7 +70,7 @@ namespace basprov
         registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     BasicScriptImpl::BasicScriptImpl( const OUString& funcName, SbMethodRef xMethod,
         BasicManager& documentBasicManager, const Reference< XScriptInvocationContext >& documentScriptContext ) : ::scripting_helper::OBroadcastHelperHolder( m_aMutex )
@@ -84,16 +84,16 @@ namespace basprov
         registerProperty( BASSCRIPT_PROPERTY_CALLER, BASSCRIPT_PROPERTY_ID_CALLER, BASSCRIPT_DEFAULT_ATTRIBS(), &m_caller, ::getCppuType( &m_caller ) );
     }
 
-    // -----------------------------------------------------------------------------
+
     BasicScriptImpl::~BasicScriptImpl()
     {
         if ( m_documentBasicManager )
             EndListening( *m_documentBasicManager );
     }
 
-    // -----------------------------------------------------------------------------
+
     // SfxListener
-    // -----------------------------------------------------------------------------
+
     void BasicScriptImpl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     {
         if ( &rBC != m_documentBasicManager )
@@ -110,30 +110,30 @@ namespace basprov
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInterface
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XINTERFACE2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
 
-    // -----------------------------------------------------------------------------
+
     // XTypeProvider
-    // -----------------------------------------------------------------------------
+
 
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( BasicScriptImpl, BasicScriptImpl_BASE, OPropertyContainer )
 
-    // -----------------------------------------------------------------------------
+
     // OPropertySetHelper
-    // -----------------------------------------------------------------------------
+
 
     ::cppu::IPropertyArrayHelper& BasicScriptImpl::getInfoHelper(  )
     {
         return *getArrayHelper();
     }
 
-    // -----------------------------------------------------------------------------
+
     // OPropertyArrayUsageHelper
-    // -----------------------------------------------------------------------------
+
 
     ::cppu::IPropertyArrayHelper* BasicScriptImpl::createArrayHelper(  ) const
     {
@@ -142,9 +142,9 @@ namespace basprov
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
 
-    // -----------------------------------------------------------------------------
+
     // XPropertySet
-    // -----------------------------------------------------------------------------
+
 
     Reference< XPropertySetInfo > BasicScriptImpl::getPropertySetInfo(  ) throw (RuntimeException)
     {
@@ -152,9 +152,9 @@ namespace basprov
         return xInfo;
     }
 
-    // -----------------------------------------------------------------------------
+
     // XScript
-    // -----------------------------------------------------------------------------
+
 
     Any BasicScriptImpl::invoke( const Sequence< Any >& aParams, Sequence< sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam )
         throw ( provider::ScriptFrameworkErrorException, reflection::InvocationTargetException, uno::RuntimeException)
@@ -289,7 +289,7 @@ namespace basprov
         return aReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace basprov
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index 9fc11f39ddb4..741e2450b743 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -181,13 +181,13 @@ namespace dlgprov
             listernersForTypes[ OUString("VBAInterop") ] = new DialogVBAScriptListenerImpl( rxContext, rxControl, rxModel, sDialogLibName );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     DialogEventsAttacherImpl::~DialogEventsAttacherImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     Reference< script::XScriptListener >
     DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey ) throw ( RuntimeException )
     {
@@ -210,7 +210,7 @@ namespace dlgprov
         return xEventsSupplier;
     }
 
-    // -----------------------------------------------------------------------------
+
     void SAL_CALL DialogEventsAttacherImpl::attachEventsToControl( const Reference< XControl>& xControl, const Reference< XScriptEventsSupplier >& xEventsSupplier, const Any& Helper )
     {
         if ( xEventsSupplier.is() )
@@ -322,9 +322,9 @@ namespace dlgprov
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XScriptEventsAttacher
-    // -----------------------------------------------------------------------------
+
 
     void SAL_CALL DialogEventsAttacherImpl::attachEvents( const Sequence< Reference< XInterface > >& Objects,
         const com::sun::star::uno::Reference<com::sun::star::script::XScriptListener>&,
@@ -383,13 +383,13 @@ namespace dlgprov
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     DialogAllListenerImpl::~DialogAllListenerImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void DialogAllListenerImpl::firing_impl( const AllEventObject& Event, Any* pRet )
     {
@@ -411,17 +411,17 @@ namespace dlgprov
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XEventListener
-    // -----------------------------------------------------------------------------
+
 
     void DialogAllListenerImpl::disposing(const EventObject& ) throw ( RuntimeException )
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     // XAllListener
-    // -----------------------------------------------------------------------------
+
 
     void DialogAllListenerImpl::firing( const AllEventObject& Event ) throw ( RuntimeException )
     {
@@ -430,7 +430,7 @@ namespace dlgprov
         firing_impl( Event, NULL );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Any DialogAllListenerImpl::approveFiring( const AllEventObject& Event )
         throw ( reflection::InvocationTargetException, RuntimeException )
@@ -461,13 +461,13 @@ namespace dlgprov
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     DialogScriptListenerImpl::~DialogScriptListenerImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     void DialogSFScriptListenerImpl::firing_impl( const ScriptEvent& aScriptEvent, Any* pRet )
     {
         try
@@ -651,17 +651,17 @@ namespace dlgprov
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XEventListener
-    // -----------------------------------------------------------------------------
+
 
     void DialogScriptListenerImpl::disposing(const EventObject& ) throw ( RuntimeException )
     {
     }
 
-    // -----------------------------------------------------------------------------
+
     // XScriptListener
-    // -----------------------------------------------------------------------------
+
 
     void DialogScriptListenerImpl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException )
     {
@@ -670,7 +670,7 @@ namespace dlgprov
         firing_impl( aScriptEvent, NULL );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Any DialogScriptListenerImpl::approveFiring( const ScriptEvent& aScriptEvent )
         throw ( reflection::InvocationTargetException, RuntimeException )
@@ -682,7 +682,7 @@ namespace dlgprov
         return aReturn;
     }
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace dlgprov
diff --git a/scripting/source/dlgprov/dlgprov.cxx b/scripting/source/dlgprov/dlgprov.cxx
index 97bc9c3c54b5..94cce4377276 100644
--- a/scripting/source/dlgprov/dlgprov.cxx
+++ b/scripting/source/dlgprov/dlgprov.cxx
@@ -179,7 +179,7 @@ static OUString aResourceResolverPropName("ResourceResolver");
         return *pImplName;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     static Sequence< OUString > getSupportedServiceNames_DialogProviderImpl()
     {
@@ -230,13 +230,13 @@ static OUString aResourceResolverPropName("ResourceResolver");
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     DialogProviderImpl::~DialogProviderImpl()
     {
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< resource::XStringResourceManager > getStringResourceFromDialogLibrary
         ( Reference< container::XNameContainer > xDialogLib )
@@ -472,7 +472,7 @@ static OUString aResourceResolverPropName("ResourceResolver");
         return xCtrlModel;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     Reference< XUnoControlDialog > DialogProviderImpl::createDialogControl
         ( const Reference< XControlModel >& rxDialogModel, const Reference< XWindowPeer >& xParent )
@@ -517,7 +517,7 @@ static OUString aResourceResolverPropName("ResourceResolver");
         return xDialogControl;
     }
 
-    // -----------------------------------------------------------------------------
+
 
     void DialogProviderImpl::attachControlEvents(
         const Reference< XControl >& rxControl,
@@ -584,9 +584,9 @@ static OUString aResourceResolverPropName("ResourceResolver");
     }
 
 
-    // -----------------------------------------------------------------------------
+
     // XServiceInfo
-    // -----------------------------------------------------------------------------
+
 
     OUString DialogProviderImpl::getImplementationName(  ) throw (RuntimeException)
     {
@@ -603,9 +603,9 @@ static OUString aResourceResolverPropName("ResourceResolver");
         return getSupportedServiceNames_DialogProviderImpl();
     }
 
-    // -----------------------------------------------------------------------------
+
     // XInitialization
-    // -----------------------------------------------------------------------------
+
 
     void DialogProviderImpl::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
     {
@@ -645,9 +645,9 @@ static OUString aResourceResolverPropName("ResourceResolver");
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     // XDialogProvider
-    // -----------------------------------------------------------------------------
+
 
     static OUString aDecorationPropName("Decoration");
     static OUString aTitlePropName("Title");
@@ -800,7 +800,7 @@ static OUString aResourceResolverPropName("ResourceResolver");
         return static_cast< lang::XTypeProvider * >( new DialogProviderImpl( xContext ) );
     }
 
-    // -----------------------------------------------------------------------------
+
 
     static struct ::cppu::ImplementationEntry s_component_entries [] =
     {
@@ -809,7 +809,7 @@ static OUString aResourceResolverPropName("ResourceResolver");
         { 0, 0, 0, 0, 0, 0 }
     };
 
-    // -----------------------------------------------------------------------------
+
 
 //.........................................................................
 }   // namespace dlgprov
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 79326b5149c3..7aa42630ce4f 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -198,9 +198,9 @@ public:
         }
     }
 
-    // -------------------------------------------------------------------------
+
     // XBrowseNode
-    // -------------------------------------------------------------------------
+
 
     virtual OUString SAL_CALL getName()
         throw ( RuntimeException )
diff --git a/scripting/source/provider/ScriptingContext.cxx b/scripting/source/provider/ScriptingContext.cxx
index f1f7762d7f73..1884c572b1e0 100644
--- a/scripting/source/provider/ScriptingContext.cxx
+++ b/scripting/source/provider/ScriptingContext.cxx
@@ -63,18 +63,18 @@ ScriptingContext::~ScriptingContext()
 {
     OSL_TRACE( "< ScriptingContext dtor called >" );
 }
-// -----------------------------------------------------------------------------
+
 // OPropertySetHelper
-// -----------------------------------------------------------------------------
+
 
 ::cppu::IPropertyArrayHelper& ScriptingContext::getInfoHelper(  )
 {
     return *getArrayHelper();
 }
 
-// -----------------------------------------------------------------------------
+
 // OPropertyArrayUsageHelper
-// -----------------------------------------------------------------------------
+
 
 ::cppu::IPropertyArrayHelper* ScriptingContext::createArrayHelper(  ) const
 {
@@ -82,9 +82,9 @@ ScriptingContext::~ScriptingContext()
     describeProperties( aProps );
     return new ::cppu::OPropertyArrayHelper( aProps );
 }
-// -----------------------------------------------------------------------------
+
 // XPropertySet
-// -----------------------------------------------------------------------------
+
 
 Reference< beans::XPropertySetInfo > ScriptingContext::getPropertySetInfo(  ) throw (RuntimeException)
 {
@@ -92,7 +92,7 @@ Reference< beans::XPropertySetInfo > ScriptingContext::getPropertySetInfo(  ) th
     return xInfo;
 }
 // -----------------------------------------------------------------------------// XTypeProvider
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( ScriptingContext )
 
 css::uno::Sequence< css::uno::Type > SAL_CALL ScriptingContext::getTypes(  ) throw (css::uno::RuntimeException)
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 4930a8ae7b74..ef8ad4965a92 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -767,15 +767,15 @@ StringResourcePersistenceImpl::StringResourcePersistenceImpl( const Reference< X
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 StringResourcePersistenceImpl::~StringResourcePersistenceImpl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString StringResourcePersistenceImpl::getImplementationName(  )
     throw (RuntimeException)
@@ -783,7 +783,7 @@ OUString StringResourcePersistenceImpl::getImplementationName(  )
     return OUString( "com.sun.star.comp.scripting.StringResourceWithLocation");
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServiceName )
     throw (RuntimeException)
@@ -791,7 +791,7 @@ sal_Bool StringResourcePersistenceImpl::supportsService( const OUString& rServic
     return StringResourceImpl::supportsService( rServiceName );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames(  )
     throw (RuntimeException)
@@ -799,9 +799,9 @@ Sequence< OUString > StringResourcePersistenceImpl::getSupportedServiceNames(  )
     return StringResourceImpl::getSupportedServiceNames();
 }
 
-// -----------------------------------------------------------------------------
+
 // XInitialization base functionality for derived classes
-// -----------------------------------------------------------------------------
+
 
 static OUString aNameBaseDefaultStr("strings");
 
@@ -847,7 +847,7 @@ void StringResourcePersistenceImpl::implInitializeCommonParameters
     implSetCurrentLocale( aCurrentLocale, FindClosestMatch, bUseDefaultIfNoMatch );
 }
 
-// -----------------------------------------------------------------------------
+
 // Forwarding calls to base class
 
 // XModifyBroadcaster
@@ -963,7 +963,7 @@ sal_Int32 StringResourcePersistenceImpl::getUniqueNumericId(  )
     return StringResourceImpl::getUniqueNumericId();
 }
 
-// -----------------------------------------------------------------------------
+
 // XStringResourcePersistence
 
 void StringResourcePersistenceImpl::store()
@@ -1246,7 +1246,7 @@ void StringResourcePersistenceImpl::implStoreAtLocation
 }
 
 
-// -----------------------------------------------------------------------------
+
 // BinaryOutput, helper class for exportBinary
 
 class BinaryOutput
@@ -1462,7 +1462,7 @@ void StringResourcePersistenceImpl::implWriteLocaleBinary
     implWritePropertiesFile( pLocaleItem, xOutputStream, m_aComment );
 }
 
-// -----------------------------------------------------------------------------
+
 // BinaryOutput, helper class for exportBinary
 
 class BinaryInput
@@ -2287,7 +2287,7 @@ static Reference< XInterface > SAL_CALL create_StringResourceWithStorageImpl(
     return static_cast< ::cppu::OWeakObject * >( new StringResourceWithStorageImpl( xContext ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 StringResourceWithStorageImpl::StringResourceWithStorageImpl( const Reference< XComponentContext >& rxContext )
     : StringResourceWithStorageImpl_BASE( rxContext )
@@ -2295,15 +2295,15 @@ StringResourceWithStorageImpl::StringResourceWithStorageImpl( const Reference< X
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 StringResourceWithStorageImpl::~StringResourceWithStorageImpl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString StringResourceWithStorageImpl::getImplementationName(  ) throw (RuntimeException)
 {
@@ -2320,9 +2320,9 @@ Sequence< OUString > StringResourceWithStorageImpl::getSupportedServiceNames(  )
     return getSupportedServiceNames_StringResourceWithStorageImpl();
 }
 
-// -----------------------------------------------------------------------------
+
 // XInitialization
-// -----------------------------------------------------------------------------
+
 
 void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArguments )
     throw (Exception, RuntimeException)
@@ -2349,7 +2349,7 @@ void StringResourceWithStorageImpl::initialize( const Sequence< Any >& aArgument
     implInitializeCommonParameters( aArguments );
 }
 
-// -----------------------------------------------------------------------------
+
 // Forwarding calls to base class
 
 // XModifyBroadcaster
@@ -2516,7 +2516,7 @@ void StringResourceWithStorageImpl::importBinary( const Sequence< ::sal_Int8 >&
     StringResourcePersistenceImpl::importBinary( Data );
 }
 
-// -----------------------------------------------------------------------------
+
 // XStringResourceWithStorage
 
 void StringResourceWithStorageImpl::storeAsStorage( const Reference< XStorage >& Storage )
@@ -2614,7 +2614,7 @@ static Reference< XInterface > SAL_CALL create_StringResourceWithLocationImpl(
     return static_cast< ::cppu::OWeakObject * >( new StringResourceWithLocationImpl( xContext ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 StringResourceWithLocationImpl::StringResourceWithLocationImpl( const Reference< XComponentContext >& rxContext )
     : StringResourceWithLocationImpl_BASE( rxContext )
@@ -2622,15 +2622,15 @@ StringResourceWithLocationImpl::StringResourceWithLocationImpl( const Reference<
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 StringResourceWithLocationImpl::~StringResourceWithLocationImpl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString StringResourceWithLocationImpl::getImplementationName(  ) throw (RuntimeException)
 {
@@ -2647,9 +2647,9 @@ Sequence< OUString > StringResourceWithLocationImpl::getSupportedServiceNames(
     return getSupportedServiceNames_StringResourceWithLocationImpl();
 }
 
-// -----------------------------------------------------------------------------
+
 // XInitialization
-// -----------------------------------------------------------------------------
+
 
 void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArguments )
     throw (Exception, RuntimeException)
@@ -2692,7 +2692,7 @@ void StringResourceWithLocationImpl::initialize( const Sequence< Any >& aArgumen
     implInitializeCommonParameters( aArguments );
 }
 
-// -----------------------------------------------------------------------------
+
 // Forwarding calls to base class
 
 // XModifyBroadcaster
@@ -2861,7 +2861,7 @@ void StringResourceWithLocationImpl::importBinary( const Sequence< ::sal_Int8 >&
     StringResourcePersistenceImpl::importBinary( Data );
 }
 
-// -----------------------------------------------------------------------------
+
 // XStringResourceWithLocation
 
 // XStringResourceWithLocation
diff --git a/scripting/source/vbaevents/service.cxx b/scripting/source/vbaevents/service.cxx
index 07a7f19277fd..9baec6f24a60 100644
--- a/scripting/source/vbaevents/service.cxx
+++ b/scripting/source/vbaevents/service.cxx
@@ -37,7 +37,7 @@ namespace evtlstner
         Reference< XComponentContext > const & xContext )
         SAL_THROW(());
 
-    // -----------------------------------------------------------------------------
+
 
     OUString SAL_CALL getImplementationName();
 
@@ -57,7 +57,7 @@ namespace ooevtdescgen
         Reference< XComponentContext > const & xContext )
         SAL_THROW(());
 
-    // -----------------------------------------------------------------------------
+
 
     OUString SAL_CALL getImplementationName();
 
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 0d32e356471a..fc22835f3e0d 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -153,7 +153,7 @@ CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Refer
     setNode( xNode );
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
 {
@@ -278,7 +278,7 @@ void CustomAnimationEffect::setNode( const ::com::sun::star::uno::Reference< ::c
     checkForText();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_Int16 nIterateType )
 {
@@ -374,13 +374,13 @@ sal_Int32 CustomAnimationEffect::getNumberOfSubitems( const Any& aTarget, sal_In
     return nSubItems;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffect::~CustomAnimationEffect()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr CustomAnimationEffect::clone() const
 {
@@ -391,7 +391,7 @@ CustomAnimationEffectPtr CustomAnimationEffect::clone() const
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode >& xNode )
 {
@@ -419,7 +419,7 @@ sal_Int32 CustomAnimationEffect::get_node_type( const Reference< XAnimationNode
     return nNodeType;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setPresetClass( sal_Int16 nPresetClass )
 {
@@ -503,7 +503,7 @@ void CustomAnimationEffect::setNodeType( sal_Int16 nNodeType )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId )
 {
@@ -543,7 +543,7 @@ void CustomAnimationEffect::setGroupId( sal_Int32 nGroupId )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** checks if the text for this effect has changed and updates internal flags.
     returns true if something changed.
@@ -645,7 +645,7 @@ bool CustomAnimationEffect::calculateIterateDuration()
     return bChange;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget )
 {
@@ -700,7 +700,7 @@ void CustomAnimationEffect::setTarget( const ::com::sun::star::uno::Any& rTarget
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem )
 {
@@ -737,7 +737,7 @@ void CustomAnimationEffect::setTargetSubItem( sal_Int16 nSubItem )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setDuration( double fDuration )
 {
@@ -789,7 +789,7 @@ void CustomAnimationEffect::setDuration( double fDuration )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setBegin( double fBegin )
 {
@@ -804,7 +804,7 @@ void CustomAnimationEffect::setBegin( double fBegin )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setAcceleration( double fAcceleration )
 {
@@ -818,7 +818,7 @@ void CustomAnimationEffect::setAcceleration( double fAcceleration )
         OSL_FAIL( "sd::CustomAnimationEffect::setAcceleration(), exception caught!" );
     }
 }
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setDecelerate( double fDecelerate )
 {
@@ -833,7 +833,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse )
 {
@@ -848,7 +848,7 @@ void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
 {
@@ -885,7 +885,7 @@ void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference<
         setIterateInterval( fIterateInterval );
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XShape > CustomAnimationEffect::getTargetShape() const
 {
@@ -901,7 +901,7 @@ Reference< XShape > CustomAnimationEffect::getTargetShape() const
     return xShape;
 }
 
-// --------------------------------------------------------------------
+
 
 Any CustomAnimationEffect::getRepeatCount() const
 {
@@ -916,7 +916,7 @@ Any CustomAnimationEffect::getRepeatCount() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any CustomAnimationEffect::getEnd() const
 {
@@ -931,7 +931,7 @@ Any CustomAnimationEffect::getEnd() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int16 CustomAnimationEffect::getFill() const
 {
@@ -941,7 +941,7 @@ sal_Int16 CustomAnimationEffect::getFill() const
         return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount )
 {
@@ -954,7 +954,7 @@ void CustomAnimationEffect::setRepeatCount( const Any& rRepeatCount )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setEnd( const Any& rEnd )
 {
@@ -962,7 +962,7 @@ void CustomAnimationEffect::setEnd( const Any& rEnd )
         mxNode->setEnd( rEnd );
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setFill( sal_Int16 nFill )
 {
@@ -970,7 +970,7 @@ void CustomAnimationEffect::setFill( sal_Int16 nFill )
         mxNode->setFill( nFill );
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const throw (Exception)
 {
@@ -1025,7 +1025,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
     return xAnimate;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType )
 {
@@ -1116,7 +1116,7 @@ void CustomAnimationEffect::setIterateType( sal_Int16 nIterateType )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setIterateInterval( double fIterateInterval )
 {
@@ -1135,7 +1135,7 @@ void CustomAnimationEffect::setIterateInterval( double fIterateInterval )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 OUString CustomAnimationEffect::getPath() const
 {
@@ -1163,7 +1163,7 @@ OUString CustomAnimationEffect::getPath() const
     return aPath;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setPath( const OUString& rPath )
 {
@@ -1189,7 +1189,7 @@ void CustomAnimationEffect::setPath( const OUString& rPath )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue )
 {
@@ -1240,7 +1240,7 @@ Any CustomAnimationEffect::getProperty( sal_Int32 nNodeType, const OUString& rAt
     return aProperty;
 }
 
-// --------------------------------------------------------------------
+
 
 bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rAttributeName, EValue eValue, const Any& rValue )
 {
@@ -1317,14 +1317,14 @@ bool CustomAnimationEffect::setProperty( sal_Int32 nNodeType, const OUString& rA
     return bChanged;
 }
 
-// --------------------------------------------------------------------
+
 
 static bool implIsColorAttribute( const OUString& rAttributeName )
 {
     return rAttributeName == "FillColor" || rAttributeName == "LineColor" || rAttributeName == "CharColor";
 }
 
-// --------------------------------------------------------------------
+
 
 Any CustomAnimationEffect::getColor( sal_Int32 nIndex )
 {
@@ -1373,7 +1373,7 @@ Any CustomAnimationEffect::getColor( sal_Int32 nIndex )
     return aColor;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
 {
@@ -1426,7 +1426,7 @@ void CustomAnimationEffect::setColor( sal_Int32 nIndex, const Any& rColor )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType, EValue eValue )
 {
@@ -1474,7 +1474,7 @@ Any CustomAnimationEffect::getTransformationProperty( sal_Int32 nTransformType,
     return aProperty;
 }
 
-// --------------------------------------------------------------------
+
 
 bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType, EValue eValue, const Any& rValue )
 {
@@ -1547,7 +1547,7 @@ bool CustomAnimationEffect::setTransformationProperty( sal_Int32 nTransformType,
     return bChanged;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSource, double fVolume /* = 1.0 */ )
 {
@@ -1567,7 +1567,7 @@ void CustomAnimationEffect::createAudio( const ::com::sun::star::uno::Any& rSour
     }
 }
 
-// --------------------------------------------------------------------
+
 
 static Reference< XCommand > findCommandNode( const Reference< XAnimationNode >& xRootNode )
 {
@@ -1623,7 +1623,7 @@ void CustomAnimationEffect::removeAudio()
 
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animations::XAudio >& xAudio )
 {
@@ -1642,7 +1642,7 @@ void CustomAnimationEffect::setAudio( const Reference< ::com::sun::star::animati
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::setStopAudio()
 {
@@ -1667,14 +1667,14 @@ void CustomAnimationEffect::setStopAudio()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool CustomAnimationEffect::getStopAudio() const
 {
     return mnCommand == EffectCommands::STOPAUDIO;
 }
 
-// --------------------------------------------------------------------
+
 
 SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath()
 {
@@ -1683,7 +1683,7 @@ SdrPathObj* CustomAnimationEffect::createSdrPathObjFromPath()
     return pPathObj;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj )
 {
@@ -1709,7 +1709,7 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj )
     rPathObj.SetPathPoly( xPolyPoly );
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj )
 {
@@ -1754,7 +1754,7 @@ EffectSequenceHelper::EffectSequenceHelper()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XTimeContainer >& xSequenceRoot )
 : mxSequenceRoot( xSequenceRoot ), mnSequenceType( EffectNodeType::DEFAULT )
@@ -1763,14 +1763,14 @@ EffectSequenceHelper::EffectSequenceHelper( const ::com::sun::star::uno::Referen
     create( xNode );
 }
 
-// --------------------------------------------------------------------
+
 
 EffectSequenceHelper::~EffectSequenceHelper()
 {
     reset();
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::reset()
 {
@@ -1790,7 +1790,7 @@ Reference< XAnimationNode > EffectSequenceHelper::getRootNode()
     return xRoot;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect )
 {
@@ -1799,7 +1799,7 @@ void EffectSequenceHelper::append( const CustomAnimationEffectPtr& pEffect )
     rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPresetPtr& pPreset, const Any& rTarget, double fDuration /* = -1.0 */ )
 {
@@ -1872,7 +1872,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathObj, const Any& rTarget, double fDuration /* = -1.0 */ )
 {
@@ -1921,7 +1921,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const SdrPathObj& rPathOb
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, const OUString& rPresetSubType, double fDuration /* = -1.0 */ )
 {
@@ -1943,7 +1943,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pPreset, double fDuration /* = -1.0 */ )
 {
@@ -1951,7 +1951,7 @@ void EffectSequenceHelper::replace( const CustomAnimationEffectPtr& pEffect, con
     replace( pEffect, pPreset, strEmpty, fDuration );
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect )
 {
@@ -1964,14 +1964,14 @@ void EffectSequenceHelper::remove( const CustomAnimationEffectPtr& pEffect )
     rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::rebuild()
 {
     implRebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::implRebuild()
 {
@@ -2097,21 +2097,21 @@ void EffectSequenceHelper::implRebuild()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 stl_CustomAnimationEffect_search_node_predict::stl_CustomAnimationEffect_search_node_predict( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xSearchNode )
 : mxSearchNode( xSearchNode )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 bool stl_CustomAnimationEffect_search_node_predict::operator()( CustomAnimationEffectPtr pEffect ) const
 {
     return pEffect->getNode() == mxSearchNode;
 }
 
-// --------------------------------------------------------------------
+
 
 static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Reference< XTimeContainer >& xCurrent, Reference< XTimeContainer >& xNext )
  throw(Exception)
@@ -2133,7 +2133,7 @@ static bool implFindNextContainer( Reference< XTimeContainer >& xParent, Referen
     return xNext.is();
 }
 
-// --------------------------------------------------------------------
+
 
 void stl_process_after_effect_node_func(AfterEffectNode& rNode)
 {
@@ -2246,14 +2246,14 @@ void stl_process_after_effect_node_func(AfterEffectNode& rNode)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 EffectSequence::iterator EffectSequenceHelper::find( const CustomAnimationEffectPtr& pEffect )
 {
     return std::find( maEffects.begin(), maEffects.end(), pEffect );
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const
 {
@@ -2272,7 +2272,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::findEffect( const ::com::sun::sta
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const
 {
@@ -2288,7 +2288,7 @@ sal_Int32 EffectSequenceHelper::getOffsetFromEffect( const CustomAnimationEffect
     return -1;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nOffset ) const
 {
@@ -2303,7 +2303,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::getEffectFromOffset( sal_Int32 nO
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape )
 {
@@ -2327,7 +2327,7 @@ bool EffectSequenceHelper::disposeShape( const Reference< XShape >& xShape )
     return bChanges;
 }
 
-// --------------------------------------------------------------------
+
 
 bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape )
 {
@@ -2342,7 +2342,7 @@ bool EffectSequenceHelper::hasEffect( const com::sun::star::uno::Reference< com:
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTarget )
 {
@@ -2364,7 +2364,7 @@ void EffectSequenceHelper::insertTextRange( const com::sun::star::uno::Any& aTar
         rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTarget )
 {
@@ -2418,7 +2418,7 @@ void EffectSequenceHelper::disposeTextRange( const com::sun::star::uno::Any& aTa
         rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& rTarget, sal_Int32 nGroupId )
 :   maTarget( rTarget ),
@@ -2427,7 +2427,7 @@ CustomAnimationTextGroup::CustomAnimationTextGroup( const Reference< XShape >& r
     reset();
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationTextGroup::reset()
 {
@@ -2445,7 +2445,7 @@ void CustomAnimationTextGroup::reset()
     maEffects.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect )
 {
@@ -2495,7 +2495,7 @@ void CustomAnimationTextGroup::addEffect( CustomAnimationEffectPtr& pEffect )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 class TextGroupMapImpl : public std::map< sal_Int32, CustomAnimationTextGroup* >
 {
@@ -2503,7 +2503,7 @@ public:
     CustomAnimationTextGroup* findGroup( sal_Int32 nGroupId );
 };
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId )
 {
@@ -2516,7 +2516,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::findGroup( sal_Int32 nGroupId
     return aPtr;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::updateTextGroups()
 {
@@ -2545,7 +2545,7 @@ void EffectSequenceHelper::updateTextGroups()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse )
 {
@@ -2604,7 +2604,7 @@ CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimati
     return pTextGroup;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextGroupPtr pTextGroup, CustomAnimationEffectPtr pEffect, bool bUsed )
 {
@@ -2699,7 +2699,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGroup, sal_Int32 nTextGrouping )
 {
@@ -2781,7 +2781,7 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm )
 {
@@ -2855,7 +2855,7 @@ void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGrou
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTextGroup, double fTextGroupingAuto )
 {
@@ -2899,7 +2899,7 @@ void EffectSequenceHelper::setTextGroupingAuto( CustomAnimationTextGroupPtr pTex
     notify_listeners();
 }
 
-// --------------------------------------------------------------------
+
 
 struct ImplStlTextGroupSortHelper
 {
@@ -2909,7 +2909,7 @@ struct ImplStlTextGroupSortHelper
     sal_Int32 getTargetParagraph( const CustomAnimationEffectPtr& p1 );
 };
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationEffectPtr& p1 )
 {
@@ -2926,7 +2926,7 @@ sal_Int32 ImplStlTextGroupSortHelper::getTargetParagraph( const CustomAnimationE
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1, const CustomAnimationEffectPtr& p2 )
 {
@@ -2940,7 +2940,7 @@ bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1,
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bTextReverse )
 {
@@ -2976,7 +2976,7 @@ void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGrou
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::addListener( ISequenceListener* pListener )
 {
@@ -2984,14 +2984,14 @@ void EffectSequenceHelper::addListener( ISequenceListener* pListener )
         maListeners.push_back( pListener );
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::removeListener( ISequenceListener* pListener )
 {
     maListeners.remove( pListener );
 }
 
-// --------------------------------------------------------------------
+
 
 struct stl_notify_listeners_func : public std::unary_function<ISequenceListener*, void>
 {
@@ -2999,7 +2999,7 @@ struct stl_notify_listeners_func : public std::unary_function<ISequenceListener*
     void operator()(ISequenceListener* pListener) { pListener->notify_change(); }
 };
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::notify_listeners()
 {
@@ -3007,7 +3007,7 @@ void EffectSequenceHelper::notify_listeners()
     std::for_each( maListeners.begin(), maListeners.end(), aFunc );
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
 {
@@ -3029,7 +3029,7 @@ void EffectSequenceHelper::create( const ::com::sun::star::uno::Reference< ::com
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode >& xNode )
 {
@@ -3052,7 +3052,7 @@ void EffectSequenceHelper::createEffectsequence( const Reference< XAnimationNode
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNode )
 {
@@ -3098,7 +3098,7 @@ void EffectSequenceHelper::createEffects( const Reference< XAnimationNode >& xNo
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::processAfterEffect( const Reference< XAnimationNode >& xNode )
 {
@@ -3198,7 +3198,7 @@ MainSequence::MainSequence()
     init();
 }
 
-// --------------------------------------------------------------------
+
 
 MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
 : mxTimingRootNode( xNode, UNO_QUERY )
@@ -3210,14 +3210,14 @@ MainSequence::MainSequence( const ::com::sun::star::uno::Reference< ::com::sun::
     init();
 }
 
-// --------------------------------------------------------------------
+
 
 MainSequence::~MainSequence()
 {
     reset();
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::init()
 {
@@ -3231,7 +3231,7 @@ void MainSequence::init()
     createMainSequence();
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xTimingRootNode )
 {
@@ -3242,7 +3242,7 @@ void MainSequence::reset( const ::com::sun::star::uno::Reference< ::com::sun::st
     createMainSequence();
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootNode()
 {
@@ -3258,7 +3258,7 @@ Reference< ::com::sun::star::animations::XAnimationNode > MainSequence::getRootN
     return EffectSequenceHelper::getRootNode();
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::createMainSequence()
 {
@@ -3320,7 +3320,7 @@ void MainSequence::createMainSequence()
     DBG_ASSERT( mxSequenceRoot.is(), "sd::MainSequence::create(), found no main sequence!" );
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::reset()
 {
@@ -3343,7 +3343,7 @@ void MainSequence::reset()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape )
 {
@@ -3368,7 +3368,7 @@ InteractiveSequencePtr MainSequence::createInteractiveSequence( const ::com::sun
     return pIS;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) const
 {
@@ -3385,7 +3385,7 @@ CustomAnimationEffectPtr MainSequence::findEffect( const ::com::sun::star::uno::
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEffect ) const
 {
@@ -3409,7 +3409,7 @@ sal_Int32 MainSequence::getOffsetFromEffect( const CustomAnimationEffectPtr& pEf
     return -1;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset ) const
 {
@@ -3433,7 +3433,7 @@ CustomAnimationEffectPtr MainSequence::getEffectFromOffset( sal_Int32 nOffset )
     return pEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 bool MainSequence::disposeShape( const Reference< XShape >& xShape )
 {
@@ -3451,7 +3451,7 @@ bool MainSequence::disposeShape( const Reference< XShape >& xShape )
     return bChanges;
 }
 
-// --------------------------------------------------------------------
+
 
 bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape )
 {
@@ -3471,7 +3471,7 @@ bool MainSequence::hasEffect( const com::sun::star::uno::Reference< com::sun::st
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget )
 {
@@ -3483,7 +3483,7 @@ void MainSequence::insertTextRange( const com::sun::star::uno::Any& aTarget )
         (*aIter)->insertTextRange( aTarget );
     }
 }
-// --------------------------------------------------------------------
+
 
 void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget )
 {
@@ -3496,7 +3496,7 @@ void MainSequence::disposeTextRange( const com::sun::star::uno::Any& aTarget )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** callback from the sd::View when an object just left text edit mode */
 void MainSequence::onTextChanged( const Reference< XShape >& xShape )
@@ -3510,7 +3510,7 @@ void MainSequence::onTextChanged( const Reference< XShape >& xShape )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape )
 {
@@ -3527,21 +3527,21 @@ void EffectSequenceHelper::onTextChanged( const Reference< XShape >& xShape )
         EffectSequenceHelper::implRebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::rebuild()
 {
     startRebuildTimer();
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::lockRebuilds()
 {
     mnRebuildLockGuard++;
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::unlockRebuilds()
 {
@@ -3556,7 +3556,7 @@ void MainSequence::unlockRebuilds()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::implRebuild()
 {
@@ -3596,14 +3596,14 @@ void MainSequence::implRebuild()
     mbRebuilding = false;
 }
 
-// --------------------------------------------------------------------
+
 
 void MainSequence::notify_change()
 {
     notify_listeners();
 }
 
-// --------------------------------------------------------------------
+
 
 bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTriggerShape )
 {
@@ -3648,7 +3648,7 @@ bool MainSequence::setTrigger( const CustomAnimationEffectPtr& pEffect, const ::
 
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MainSequence, onTimerHdl)
 {
@@ -3665,7 +3665,7 @@ IMPL_LINK_NOARG(MainSequence, onTimerHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 /** starts a timer that recreates the internal structure from the API core after 1 second */
 void MainSequence::startRecreateTimer()
@@ -3677,7 +3677,7 @@ void MainSequence::startRecreateTimer()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** starts a timer that rebuilds the API core from the internal structure after 1 second */
 void MainSequence::startRebuildTimer()
@@ -3716,7 +3716,7 @@ InteractiveSequence::InteractiveSequence( const Reference< XTimeContainer >& xSe
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void InteractiveSequence::rebuild()
 {
@@ -3728,7 +3728,7 @@ void InteractiveSequence::implRebuild()
     EffectSequenceHelper::implRebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 MainSequenceRebuildGuard::MainSequenceRebuildGuard( const MainSequencePtr& pMainSequence )
 : mpMainSequence( pMainSequence )
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index b919a54519d1..951a6dd05402 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -532,7 +532,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff
     }
 }
 
-// --------------------------------------------------------------------
+
 
 AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape )
 {
@@ -577,7 +577,7 @@ AnimationEffect EffectMigration::GetAnimationEffect( SvxShape* pShape )
 }
 
 
-// --------------------------------------------------------------------
+
 
 void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect eEffect )
 {
@@ -718,7 +718,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
     }
 }
 
-// --------------------------------------------------------------------
+
 
 AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape )
 {
@@ -751,7 +751,7 @@ AnimationEffect EffectMigration::GetTextAnimationEffect( SvxShape* pShape )
     return eEffect;
 }
 
-// --------------------------------------------------------------------
+
 
 bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString* pPresetSubType, AnimationEffect& rEffect )
 {
@@ -781,7 +781,7 @@ bool EffectMigration::ConvertPreset( const OUString& rPresetId, const OUString*
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OUString& rPresetId, OUString& rPresetSubType )
 {
@@ -800,7 +800,7 @@ bool EffectMigration::ConvertAnimationEffect( const AnimationEffect& rEffect, OU
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed )
 {
@@ -814,7 +814,7 @@ double EffectMigration::ConvertAnimationSpeed( AnimationSpeed eSpeed )
     }
     return fDuration;
 }
-// --------------------------------------------------------------------
+
 
 void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed )
 {
@@ -851,7 +851,7 @@ void EffectMigration::SetAnimationSpeed( SvxShape* pShape, AnimationSpeed eSpeed
         pMainSequence->rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape )
 {
@@ -880,7 +880,7 @@ AnimationSpeed EffectMigration::GetAnimationSpeed( SvxShape* pShape )
     return ConvertDuration( fDuration );
 }
 
-// --------------------------------------------------------------------
+
 
 AnimationSpeed EffectMigration::ConvertDuration( double fDuration )
 {
@@ -896,7 +896,7 @@ AnimationSpeed EffectMigration::ConvertDuration( double fDuration )
     return eSpeed;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor )
 {
@@ -932,7 +932,7 @@ void EffectMigration::SetDimColor( SvxShape* pShape, sal_Int32 nColor )
         pMainSequence->rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape )
 {
@@ -964,7 +964,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape )
     return nColor;
 }
 
-// --------------------------------------------------------------------
+
 
 
 void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
@@ -1004,7 +1004,7 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
         pMainSequence->rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
 {
@@ -1036,7 +1036,7 @@ sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
 {
@@ -1078,7 +1078,7 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
         pMainSequence->rebuild();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape )
 {
@@ -1110,7 +1110,7 @@ sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape )
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos )
 {
@@ -1201,7 +1201,7 @@ void EffectMigration::SetPresentationOrder( SvxShape* pShape, sal_Int32 nNewPos
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** Returns the position of the given SdrObject in the Presentation order.
  *  This function returns -1 if the SdrObject is not in the Presentation order
@@ -1242,7 +1242,7 @@ sal_Int32 EffectMigration::GetPresentationOrder( SvxShape* pShape )
     return nFound;
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInfo )
 {
@@ -1282,7 +1282,7 @@ void EffectMigration::UpdateSoundEffect( SvxShape* pShape, SdAnimationInfo* pInf
     }
 }
 
-// --------------------------------------------------------------------
+
 
 OUString EffectMigration::GetSoundFile( SvxShape* pShape )
 {
@@ -1315,14 +1315,14 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape )
     return aSoundFile;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool EffectMigration::GetSoundOn( SvxShape* pShape )
 {
     return !GetSoundFile( pShape ).isEmpty();
 }
 
-// --------------------------------------------------------------------
+
 
 void EffectMigration::SetAnimationPath( SvxShape* pShape, SdrPathObj* pPathObj )
 {
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 1e17fadb4e49..64d9d1407ec0 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1686,7 +1686,7 @@ SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, sal_uLong nObjNum)
     return FmFormPage::ReplaceObject(pNewObj, nObjNum);
 }
 
-// -------------------------------------------------------------------------
+
 
 // called after a shape is removed or replaced from this slide
 
diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx
index 507f25545ce2..7e698975a7d0 100644
--- a/sd/source/core/stlfamily.cxx
+++ b/sd/source/core/stlfamily.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::beans;
 
-// ----------------------------------------------------------
+
 
 typedef std::map< OUString, rtl::Reference< SdStyleSheet > > PresStyleMap;
 
@@ -88,7 +88,7 @@ PresStyleMap& SdStyleFamilyImpl::getStyleSheets()
     return maStyleSheets;
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, SfxStyleFamily nFamily )
 : mnFamily( nFamily )
@@ -97,7 +97,7 @@ SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool,
 {
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool, const SdPage* pMasterPage )
 : mnFamily( SD_STYLE_FAMILY_MASTERPAGE )
@@ -108,7 +108,7 @@ SdStyleFamily::SdStyleFamily( const rtl::Reference< SfxStyleSheetPool >& xPool,
     mpImpl->mxPool = xPool;
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleFamily::~SdStyleFamily()
 {
@@ -116,7 +116,7 @@ SdStyleFamily::~SdStyleFamily()
     delete mpImpl;
 }
 
-// ----------------------------------------------------------
+
 
 void SdStyleFamily::throwIfDisposed() const throw(RuntimeException)
 {
@@ -124,7 +124,7 @@ void SdStyleFamily::throwIfDisposed() const throw(RuntimeException)
         throw DisposedException();
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(IllegalArgumentException)
 {
@@ -137,7 +137,7 @@ SdStyleSheet* SdStyleFamily::GetValidNewSheet( const Any& rElement ) throw(Illeg
     return pStyle;
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleSheet* SdStyleFamily::GetSheetByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException )
 {
@@ -212,15 +212,15 @@ OUString SAL_CALL SdStyleFamily::getName() throw (RuntimeException)
     }
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::setName( const OUString& ) throw (RuntimeException)
 {
 }
 
-// ----------------------------------------------------------
+
 // XNameAccess
-// ----------------------------------------------------------
+
 
 Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -229,7 +229,7 @@ Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchEleme
     return Any( Reference< XStyle >( static_cast<SfxUnoStyleSheet*>(GetSheetByName( rName )) ) );
 }
 
-// ----------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeException)
 {
@@ -269,7 +269,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce
     }
 }
 
-// ----------------------------------------------------------
+
 
 sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException)
 {
@@ -299,16 +299,16 @@ sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(Runtim
     return sal_False;
 }
 
-// ----------------------------------------------------------
+
 // XElementAccess
-// ----------------------------------------------------------
+
 
 Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException)
 {
     return cppu::UnoType<XStyle>::get();
 }
 
-// ----------------------------------------------------------
+
 
 sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException)
 {
@@ -333,9 +333,9 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException)
     return sal_False;
 }
 
-// ----------------------------------------------------------
+
 // XIndexAccess
-// ----------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException)
 {
@@ -361,7 +361,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException)
     return nCount;
 }
 
-// ----------------------------------------------------------
+
 
 Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
@@ -401,9 +401,9 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds
     throw IndexOutOfBoundsException();
 }
 
-// ----------------------------------------------------------
+
 // XNameContainer
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
 {
@@ -421,7 +421,7 @@ void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rEl
     mxPool->Insert( pStyle );
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -436,9 +436,9 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE
     mxPool->Remove( pStyle );
 }
 
-// ----------------------------------------------------------
+
 // XNameReplace
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -452,9 +452,9 @@ void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aE
     mxPool->Insert( pNewStyle );
 }
 
-// ----------------------------------------------------------
+
 // XSingleServiceFactory
-// ----------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception, RuntimeException)
 {
@@ -471,16 +471,16 @@ Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception
     }
 }
 
-// ----------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SdStyleFamily::createInstanceWithArguments( const Sequence< Any >&  ) throw(Exception, RuntimeException)
 {
     return createInstance();
 }
 
-// ----------------------------------------------------------
+
 // XComponent
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::dispose(  ) throw (RuntimeException)
 {
@@ -494,21 +494,21 @@ void SAL_CALL SdStyleFamily::dispose(  ) throw (RuntimeException)
     }
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::addEventListener( const Reference< XEventListener >&  ) throw (RuntimeException)
 {
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL SdStyleFamily::removeEventListener( const Reference< XEventListener >&  ) throw (RuntimeException)
 {
 }
 
-// ----------------------------------------------------------
+
 // XPropertySet
-// ----------------------------------------------------------
+
 
 Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeException)
 {
@@ -516,14 +516,14 @@ Reference<XPropertySetInfo> SdStyleFamily::getPropertySetInfo() throw (RuntimeEx
     return Reference<XPropertySetInfo>();
 }
 
-// ----------------------------------------------------------
+
 
 void SdStyleFamily::setPropertyValue( const OUString& , const Any&  ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -545,28 +545,28 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno
     }
 }
 
-// ----------------------------------------------------------
+
 
 void SdStyleFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 void SdStyleFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 void SdStyleFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 void SdStyleFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 52107528eaa5..c42c02aaf6c9 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -99,7 +99,7 @@ SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, OUString aStyleName)
 
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pDocument)
 :   SdStyleSheetPoolBase( _rPool )
@@ -127,28 +127,28 @@ SdStyleSheetPool::SdStyleSheetPool(SfxItemPool const& _rPool, SdDrawDocument* pD
     }
 }
 
-// ----------------------------------------------------------
+
 
 SdStyleSheetPool::~SdStyleSheetPool()
 {
     DBG_ASSERT( mpDoc == NULL, "sd::SdStyleSheetPool::~SdStyleSheetPool(), dispose me first!" );
 }
 
-// ----------------------------------------------------------
+
 
 SfxStyleSheetBase* SdStyleSheetPool::Create(const OUString& rName, SfxStyleFamily eFamily, sal_uInt16 _nMask )
 {
     return new SdStyleSheet(rName, *this, eFamily, _nMask);
 }
 
-// ----------------------------------------------------------
+
 
 SfxStyleSheetBase* SdStyleSheetPool::Create(const SdStyleSheet& rStyle)
 {
     return new SdStyleSheet( rStyle );
 }
 
-// ----------------------------------------------------------
+
 
 SfxStyleSheetBase* SdStyleSheetPool::GetTitleSheet(const OUString& rLayoutName)
 {
@@ -1000,9 +1000,9 @@ void SdStyleSheetPool::UpdateStdNames()
     for ( size_t i = 0, n = aEraseList.size(); i < n; ++i )
         Remove( aEraseList[ i ] );
 }
-// --------------------------------------------------------------------
+
 // Set new SvxNumBulletItem for the respective style sheet
-// --------------------------------------------------------------------
+
 
 void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
                                          Font& rBulletFont )
@@ -1162,7 +1162,7 @@ Font SdStyleSheetPool::GetBulletFont() const
     return aBulletFont;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdStyleSheetPool::AddStyleFamily( const SdPage* pPage )
 {
@@ -1170,7 +1170,7 @@ void SdStyleSheetPool::AddStyleFamily( const SdPage* pPage )
     maStyleFamilyMap[pPage] = new SdStyleFamily( xPool, pPage );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage )
 {
@@ -1190,7 +1190,7 @@ void SdStyleSheetPool::RemoveStyleFamily( const SdPage* pPage )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdStyleSheetPool::throwIfDisposed() throw(::com::sun::star::uno::RuntimeException)
 {
@@ -1238,7 +1238,7 @@ Any SAL_CALL SdStyleSheetPool::getByName( const OUString& aName ) throw(NoSuchEl
     throw NoSuchElementException();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeException)
 {
@@ -1259,7 +1259,7 @@ Sequence< OUString > SAL_CALL SdStyleSheetPool::getElementNames() throw(RuntimeE
     return aNames;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(RuntimeException)
 {
@@ -1283,9 +1283,9 @@ sal_Bool SAL_CALL SdStyleSheetPool::hasByName( const OUString& aName ) throw(Run
     return sal_False;
 }
 
-// --------------------------------------------------------------------
+
 // XElementAccess
-// --------------------------------------------------------------------
+
 
 Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException)
 {
@@ -1294,16 +1294,16 @@ Type SAL_CALL SdStyleSheetPool::getElementType() throw(RuntimeException)
     return cppu::UnoType<XNameAccess>::get();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SdStyleSheetPool::hasElements() throw(RuntimeException)
 {
     return sal_True;
 }
 
-// --------------------------------------------------------------------
+
 // XIndexAccess
-// --------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException)
 {
@@ -1312,7 +1312,7 @@ sal_Int32 SAL_CALL SdStyleSheetPool::getCount() throw(RuntimeException)
     return maStyleFamilyMap.size() + 3;
 }
 
-// --------------------------------------------------------------------
+
 
 Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
@@ -1341,9 +1341,9 @@ Any SAL_CALL SdStyleSheetPool::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou
     }
 }
 
-// --------------------------------------------------------------------
+
 // XComponent
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException)
 {
@@ -1376,19 +1376,19 @@ void SAL_CALL SdStyleSheetPool::dispose() throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheetPool::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheetPool::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
 {
@@ -1410,7 +1410,7 @@ SdStyleSheetVector SdStyleSheetPool::CreateChildList( SdStyleSheet* pSheet )
     return aResult;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheetPool::acquire (void) throw ()
 {
@@ -1422,6 +1422,6 @@ void SAL_CALL SdStyleSheetPool::release (void) throw ()
     SdStyleSheetPoolBase::release();
 }
 
-// --------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 059d3d128016..4cef76e32069 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -606,35 +606,35 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingIte
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdStyleSheet::HasFollowSupport() const
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdStyleSheet::HasParentSupport() const
 {
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdStyleSheet::HasClearParentSupport() const
 {
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdStyleSheet::SetName( const OUString& rName )
 {
     return SfxStyleSheet::SetName( rName );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
 {
@@ -691,7 +691,7 @@ void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily )
 {
@@ -706,7 +706,7 @@ OUString SdStyleSheet::GetFamilyString( SfxStyleFamily eFamily )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdStyleSheet::throwIfDisposed() throw (RuntimeException)
 {
@@ -714,7 +714,7 @@ void SdStyleSheet::throwIfDisposed() throw (RuntimeException)
         throw DisposedException();
 }
 
-// --------------------------------------------------------------------
+
 
 SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool, SfxStyleFamily eFamily )
 {
@@ -730,9 +730,9 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool,
     return new SdStyleSheet(aName, rPool, eFamily, SFXSTYLEBIT_USERDEF);
 }
 
-// --------------------------------------------------------------------
+
 // XInterface
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::release(  ) throw ()
 {
@@ -756,9 +756,9 @@ void SAL_CALL SdStyleSheet::release(  ) throw ()
     }
 }
 
-// --------------------------------------------------------------------
+
 // XComponent
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::dispose(  ) throw (RuntimeException)
 {
@@ -800,14 +800,14 @@ void SAL_CALL SdStyleSheet::dispose(  ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdStyleSheet::disposing()
 {
     mxPool.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
 {
@@ -824,16 +824,16 @@ void SAL_CALL SdStyleSheet::addEventListener( const Reference< XEventListener >&
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::removeEventListener( const Reference< XEventListener >& xListener  ) throw (RuntimeException)
 {
     mrBHelper.removeListener( ::getCppuType( &xListener ), xListener );
 }
 
-//------------------------------------------------------------------------
+
 // XModifyBroadcaster
-//------------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
@@ -852,14 +852,14 @@ void SAL_CALL SdStyleSheet::addModifyListener( const Reference< XModifyListener
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
     mrBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
 }
 
-//------------------------------------------------------------------------
+
 
 void SdStyleSheet::notifyModifyListener()
 {
@@ -911,7 +911,7 @@ OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException)
     return GetApiName();
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::setName( const OUString& rName  ) throw(RuntimeException)
 {
@@ -925,9 +925,9 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName  ) throw(RuntimeExcep
     }
 }
 
-// --------------------------------------------------------------------
+
 // XStyle
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException)
 {
@@ -936,7 +936,7 @@ sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException)
     return IsUserDefined() ? sal_True : sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException)
 {
@@ -945,7 +945,7 @@ sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException)
     return IsUsed() ? sal_True : sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException)
 {
@@ -961,7 +961,7 @@ OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException)
     return OUString();
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName  ) throw(NoSuchElementException, RuntimeException)
 {
@@ -994,9 +994,9 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName  ) throw
     }
 }
 
-// --------------------------------------------------------------------
+
 // XPropertySet
-// --------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeException)
 {
@@ -1007,7 +1007,7 @@ Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeEx
     return xInfo;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
@@ -1095,7 +1095,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1192,16 +1192,16 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {}
 void SAL_CALL SdStyleSheet::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {}
 void SAL_CALL SdStyleSheet::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {}
 void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) {}
 
-// --------------------------------------------------------------------
+
 // XPropertyState
-// --------------------------------------------------------------------
+
 
 PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
@@ -1280,7 +1280,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
@@ -1300,7 +1300,7 @@ Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequen
     return aPropertyStateSequence;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
@@ -1326,7 +1326,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName )
     Broadcast(SfxSimpleHint(SFX_HINT_DATACHANGED));
 }
 
-// --------------------------------------------------------------------
+
 
 Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1360,7 +1360,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t
     return aRet;
 }
 
-// --------------------------------------------------------------------
+
 
 /** this is used because our property map is not sorted yet */
 const SfxItemPropertySimpleEntry* SdStyleSheet::getPropertyMapEntry( const OUString& rPropertyName ) const throw()
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index 66ad69902c9f..7eeec67546ec 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -52,7 +52,7 @@ UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject )
     }
 }
 
-//---------------------------------------------------------------------
+
 
 UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl()
 {
@@ -61,7 +61,7 @@ UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl()
     delete mpUndoUsercall;
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoRemovePresObjectImpl::Undo()
 {
@@ -73,7 +73,7 @@ void UndoRemovePresObjectImpl::Undo()
         mpUndoAnimation->Undo();
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoRemovePresObjectImpl::Redo()
 {
@@ -94,7 +94,7 @@ UndoRemoveObject::UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoRemoveObject::Undo()
 {
@@ -106,7 +106,7 @@ void UndoRemoveObject::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoRemoveObject::Redo()
 {
@@ -127,7 +127,7 @@ UndoDeleteObject::UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoDeleteObject::Undo()
 {
@@ -139,7 +139,7 @@ void UndoDeleteObject::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoDeleteObject::Redo()
 {
@@ -160,7 +160,7 @@ UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObje
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoReplaceObject::Undo()
 {
@@ -172,7 +172,7 @@ void UndoReplaceObject::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoReplaceObject::Redo()
 {
@@ -203,14 +203,14 @@ UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText )
     }
 }
 
-//---------------------------------------------------------------------
+
 
 UndoObjectSetText::~UndoObjectSetText()
 {
     delete mpUndoAnimation;
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoObjectSetText::Undo()
 {
@@ -224,7 +224,7 @@ void UndoObjectSetText::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoObjectSetText::Redo()
 {
@@ -249,7 +249,7 @@ UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject)
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoObjectUserCall::Undo()
 {
@@ -261,7 +261,7 @@ void UndoObjectUserCall::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoObjectUserCall::Redo()
 {
@@ -288,7 +288,7 @@ UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject)
         meOldKind = static_cast< SdPage* >( mxPage.get() )->GetPresObjKind( &rObject );
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoObjectPresentationKind::Undo()
 {
@@ -303,7 +303,7 @@ void UndoObjectPresentationKind::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoObjectPresentationKind::Redo()
 {
@@ -324,14 +324,14 @@ UndoAutoLayoutPosAndSize::UndoAutoLayoutPosAndSize( SdPage& rPage )
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoAutoLayoutPosAndSize::Undo()
 {
     // do nothing
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoAutoLayoutPosAndSize::Redo()
 {
@@ -349,7 +349,7 @@ UndoGeoObject::UndoGeoObject( SdrObject& rNewObj )
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoGeoObject::Undo()
 {
@@ -368,7 +368,7 @@ void UndoGeoObject::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoGeoObject::Redo()
 {
@@ -387,7 +387,7 @@ void UndoGeoObject::Redo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -398,7 +398,7 @@ UndoAttrObject::UndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSav
 {
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoAttrObject::Undo()
 {
@@ -417,7 +417,7 @@ void UndoAttrObject::Undo()
     }
 }
 
-//---------------------------------------------------------------------
+
 
 void UndoAttrObject::Redo()
 {
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index be8b0e9ba4eb..852755704b82 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -164,7 +164,7 @@ void PPTWriter::exportPPTPost( )
     mbStatus = sal_True;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStream& rBinaryTagData10Atom );
 
@@ -358,7 +358,7 @@ void PPTWriter::ImplWriteSlide( sal_uInt32 nPageNum, sal_uInt32 nMasterNum, sal_
     mpPptEscherEx->CloseContainer();    // EPP_Slide
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > aXBackgroundPropSet )
 {
@@ -446,7 +446,7 @@ void PPTWriter::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertyS
     mpPptEscherEx->CloseContainer();    // EPP_MainMaster
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 PPTWriter::~PPTWriter()
 {
@@ -467,7 +467,7 @@ PPTWriter::~PPTWriter()
         mXStatusIndicator->end();
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriter::ImplCreateCurrentUserStream()
 {
@@ -499,7 +499,7 @@ sal_Bool PPTWriter::ImplCreateCurrentUserStream()
     return sal_True;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation()
 {
@@ -552,7 +552,7 @@ sal_Bool PPTWriter::ImplCreateDocumentSummaryInformation()
     return sal_True;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sal_uInt32 nInstance, sal_uInt32 nSlideId )
 {
@@ -567,7 +567,7 @@ void PPTWriter::ImplWriteExtParaHeader( SvMemoryStream& rSt, sal_uInt32 nRef, sa
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet )
 {
@@ -593,7 +593,7 @@ void PPTWriter::ImplCreateHeaderFooterStrings( SvStream& rStrm, ::com::sun::star
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPagePropSet )
 {
@@ -677,7 +677,7 @@ void PPTWriter::ImplCreateHeaderFooters( ::com::sun::star::uno::Reference< ::com
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriter::ImplCreateDocument()
 {
@@ -943,7 +943,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
     return sal_True;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
 {
@@ -1026,7 +1026,7 @@ sal_Bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm )
     return sal_True;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriter::ImplCreateMainNotes()
 {
@@ -1068,7 +1068,7 @@ sal_Bool PPTWriter::ImplCreateMainNotes()
     return sal_True;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 static OUString getInitials( const OUString& rName )
 {
@@ -1155,7 +1155,7 @@ void ImplExportComments( uno::Reference< drawing::XDrawPage > xPage, SvMemoryStr
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplWriteNotes( sal_uInt32 nPageNum )
 {
@@ -1281,7 +1281,7 @@ void PPTWriter::ImplWriteVBA()
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplWriteOLE( )
 {
@@ -1361,7 +1361,7 @@ void PPTWriter::ImplWriteOLE( )
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 // write PersistantTable and UserEditAtom
 
 sal_Bool PPTWriter::ImplWriteAtomEnding()
@@ -1472,9 +1472,9 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
     return sal_True;
 }
 
-// ---------------------
+
 // - exported function -
-// ---------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ExportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData, SvStorageRef& rSvStorage,
                     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rXModel,
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index cc47322acdd5..3843fb9b51e3 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -97,7 +97,7 @@ using namespace ::com::sun::star;
 #define DEFAULT_PITCH           0x00
 #define FIXED_PITCH             0x01
 
-// ---------------------------------------------------------------------------------------------
+
 
 PPTExBulletProvider::PPTExBulletProvider()
 {
@@ -153,7 +153,7 @@ sal_uInt16 PPTExBulletProvider::GetId( const OString& rUniqueId, Size& rGraphicS
     return nRetValue;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
 {
@@ -172,7 +172,7 @@ sal_uInt32 PPTWriter::ImplVBAInfoContainer( SvStream* pStrm )
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream* pStrm )
 {
@@ -223,7 +223,7 @@ sal_uInt32 PPTWriter::ImplSlideViewInfoContainer( sal_uInt32 nInstance, SvStream
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
 {
@@ -243,7 +243,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer( SvStream* pStrm )
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm )
 {
@@ -274,7 +274,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTag( SvStream* pStrm )
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm )
 {
@@ -305,7 +305,7 @@ sal_uInt32 PPTWriter::ImplProgBinaryTagContainer( SvStream* pStrm, SvMemoryStrea
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBinTagStrm )
 {
@@ -328,7 +328,7 @@ sal_uInt32 PPTWriter::ImplProgTagContainer( SvStream* pStrm, SvMemoryStream* pBi
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
 {
@@ -353,7 +353,7 @@ sal_uInt32 PPTWriter::ImplDocumentListContainer( SvStream* pStrm )
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
 {
@@ -376,7 +376,7 @@ sal_uInt32 PPTWriter::ImplMasterSlideListContainer( SvStream* pStrm )
     return nSize;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const sal_uInt32 nType,
     const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 )
@@ -416,7 +416,7 @@ sal_uInt32 PPTWriter::ImplInsertBookmarkURL( const OUString& rBookmarkURL, const
     return nHyperId;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriter::ImplCloseDocument()
 {
@@ -577,7 +577,7 @@ sal_Bool PPTWriter::ImplCloseDocument()
     return sal_False;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PropValue::GetPropertyValue(
     ::com::sun::star::uno::Any& rAny,
@@ -617,7 +617,7 @@ sal_Bool PropValue::GetPropertyValue(
     return bRetValue;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 ::com::sun::star::beans::PropertyState PropValue::GetPropertyState(
     const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet,
@@ -638,21 +638,21 @@ sal_Bool PropValue::GetPropertyValue(
     return eRetValue;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PropValue::ImplGetPropertyValue( const OUString& rString )
 {
     return GetPropertyValue( mAny, mXPropSet, rString );
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PropValue::ImplGetPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & aXPropSet, const OUString& rString )
 {
     return GetPropertyValue( mAny, aXPropSet, rString );
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool bGetPropertyState )
 {
@@ -681,7 +681,7 @@ sal_Bool PropStateValue::ImplGetPropertyValue( const OUString& rString, sal_Bool
     return bRetValue;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj )
 {
@@ -3890,7 +3890,7 @@ void PPTWriter::ImplCreateTable( uno::Reference< drawing::XShape >& rXShape, Esc
     mpPptEscherEx->CloseContainer();
 }
 
-//----------------------------------------------------------------------------------------------------------
+
 
 void TextObjBinary::Write( SvStream* pStrm )
 {
diff --git a/sd/source/filter/eppt/escherex.cxx b/sd/source/filter/eppt/escherex.cxx
index abd2081e7887..7e2eadf6ae0f 100644
--- a/sd/source/filter/eppt/escherex.cxx
+++ b/sd/source/filter/eppt/escherex.cxx
@@ -19,9 +19,9 @@
 
 #include "escherex.hxx"
 
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------------
+
+
+
 
 PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) :
     EscherEx( EscherExGlobalRef( new EscherExGlobal ), &rOutStrm )
@@ -30,7 +30,7 @@ PptEscherEx::PptEscherEx( SvStream& rOutStrm, const OUString& rBaseURI ) :
     mnCurrentDg = 0;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PptEscherEx::DrawingGroupContainerSize()
 {
@@ -46,7 +46,7 @@ void PptEscherEx::WriteDrawingGroupContainer( SvStream& rSt )
     ImplWriteDggContainer( rSt );
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PptEscherEx::ImplDggContainerSize()
 {
@@ -76,7 +76,7 @@ void PptEscherEx::ImplWriteDggContainer( SvStream& rSt )
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 #define ESCHER_OPT_COUNT 6
 
@@ -104,7 +104,7 @@ void PptEscherEx::ImplWriteOptAtom( SvStream& rSt )
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 #define ESCHER_SPLIT_MENU_COLORS_COUNT  4
 
@@ -131,13 +131,13 @@ void PptEscherEx::ImplWriteSplitMenuColorsAtom( SvStream& rSt )
 
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 PptEscherEx::~PptEscherEx()
 {
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance )
 {
@@ -175,7 +175,7 @@ void PptEscherEx::OpenContainer( sal_uInt16 n_EscherContainer, int nRecInstance
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PptEscherEx::CloseContainer()
 {
@@ -222,7 +222,7 @@ void PptEscherEx::CloseContainer()
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClientData )
 {
@@ -285,6 +285,6 @@ sal_uInt32 PptEscherEx::EnterGroup( Rectangle* pBoundRect, SvMemoryStream* pClie
     return nShapeId;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index f65ecc1eaeec..aae16dede5b1 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -273,7 +273,7 @@ AnimationExporter::AnimationExporter( const EscherSolverContainer& rSolverContai
 {
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int16 AnimationExporter::GetFillMode( const Reference< XAnimationNode >& xNode, const sal_Int16 nFillDefault )
 {
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 4ffe04677735..afa63d3c8bc0 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -165,7 +165,7 @@ PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
 {
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 PPTWriterBase::~PPTWriterBase()
 {
@@ -177,7 +177,7 @@ PPTWriterBase::~PPTWriterBase()
         mXStatusIndicator->end();
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::PropertyValue >& rMediaData )
 {
@@ -258,7 +258,7 @@ void PPTWriterBase::exportPPT( const std::vector< com::sun::star::beans::Propert
     exportPPTPost();
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriterBase::InitSOIface()
 {
@@ -287,7 +287,7 @@ sal_Bool PPTWriterBase::InitSOIface()
     return sal_False;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
 {
@@ -372,7 +372,7 @@ sal_Bool PPTWriterBase::GetPageByIndex( sal_uInt32 nIndex, PageType ePageType )
     return sal_False;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
 {
@@ -419,7 +419,7 @@ sal_Bool PPTWriterBase::CreateSlide( sal_uInt32 nPageNum )
     return sal_True;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
 {
@@ -432,7 +432,7 @@ sal_Bool PPTWriterBase::CreateNotes( sal_uInt32 nPageNum )
     return sal_True;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
 {
@@ -451,7 +451,7 @@ sal_Bool PPTWriterBase::CreateSlideMaster( sal_uInt32 nPageNum )
     return sal_True;
 };
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Int32 PPTWriterBase::GetLayoutOffset( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& rXPropSet ) const
 {
@@ -484,7 +484,7 @@ PHLayout& PPTWriterBase::GetLayout(  const ::com::sun::star::uno::Reference< ::c
     return pPHLayout[ GetLayoutOffsetFixed( rXPropSet ) ];
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const
 {
@@ -496,7 +496,7 @@ PHLayout& PPTWriterBase::GetLayout( sal_Int32 nOffset ) const
     return pPHLayout[ 0 ];
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType )
 {
@@ -540,7 +540,7 @@ sal_Bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum )
     return bRet;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool PPTWriterBase::GetStyleSheets()
 {
diff --git a/sd/source/filter/eppt/pptx-grouptable.cxx b/sd/source/filter/eppt/pptx-grouptable.cxx
index 2345716f0d49..60252c26aa71 100644
--- a/sd/source/filter/eppt/pptx-grouptable.cxx
+++ b/sd/source/filter/eppt/pptx-grouptable.cxx
@@ -31,7 +31,7 @@ GroupTable::GroupTable() :
     ImplResizeGroupTable( 32 );
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 GroupTable::~GroupTable()
 {
@@ -39,7 +39,7 @@ GroupTable::~GroupTable()
     delete[] mpGroupEntry;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys )
 {
@@ -55,7 +55,7 @@ void GroupTable::ImplResizeGroupTable( sal_uInt32 nEntrys )
     }
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rXIndexAccessRef )
 {
@@ -76,7 +76,7 @@ sal_Bool GroupTable::EnterGroup( ::com::sun::star::uno::Reference< ::com::sun::s
     return bRet;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_uInt32 GroupTable::GetGroupsClosed()
 {
@@ -85,7 +85,7 @@ sal_uInt32 GroupTable::GetGroupsClosed()
     return nRet;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void GroupTable::ClearGroupTable()
 {
@@ -93,7 +93,7 @@ void GroupTable::ClearGroupTable()
     mnCurrentGroupEntry = 0;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 void GroupTable::ResetGroupTable( sal_uInt32 nCount )
 {
@@ -101,7 +101,7 @@ void GroupTable::ResetGroupTable( sal_uInt32 nCount )
     mpGroupEntry[ mnCurrentGroupEntry++ ] = new GroupEntry( nCount );
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 sal_Bool GroupTable::GetNextGroupEntry()
 {
@@ -120,6 +120,6 @@ sal_Bool GroupTable::GetNextGroupEntry()
     return sal_False;
 }
 
-// ---------------------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index a2a7582ca3e3..86ea3b45dc61 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -48,14 +48,14 @@
 #include "comphelper/anytostring.hxx"
 #include "cppuhelper/exc_hlp.hxx"
 
-// --
+
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <svx/xoutbmp.hxx>
 
-// --
+
 
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
@@ -89,7 +89,7 @@ using namespace com::sun::star::ui::dialogs;
 using namespace ::sfx2;
 
 
-// -----------------------------------------------------------------------------
+
 
 class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
 {
@@ -129,22 +129,22 @@ void SdGRFFilter_ImplInteractionHdl::handle( const com::sun::star::uno::Referenc
 }
 
 
-// ---------------
+
 // - SdPPTFilter -
-// ---------------
+
 
 SdGRFFilter::SdGRFFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell ) :
     SdFilter( rMedium, rDocShell, sal_True )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdGRFFilter::~SdGRFFilter()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong nStreamError )
 {
@@ -188,7 +188,7 @@ void SdGRFFilter::HandleGraphicFilterError( sal_uInt16 nFilterError, sal_uLong n
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdGRFFilter::Import()
 {
@@ -247,7 +247,7 @@ sal_Bool SdGRFFilter::Import()
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdGRFFilter::Export()
 {
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 28d1bf3375f9..02071ef64aa5 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -116,27 +116,27 @@ Sequence< OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceNames()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdHtmlOptionsDialog::SdHtmlOptionsDialog() :
     meDocType   ( DOCUMENT_TYPE_DRAW )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdHtmlOptionsDialog::~SdHtmlOptionsDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SdHtmlOptionsDialog::acquire() throw()
 {
     OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SdHtmlOptionsDialog::release() throw()
 {
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index e3590fe7993c..7b16e80fe50e 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -604,7 +604,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams
 
     mnHeightPixel = (sal_uInt16)(mnWidthPixel/dRatio);
 
-    //------------------------------------------------------------------
+
     // we come up with a destination...
 
     INetURLObject aINetURLObj( maPath );
@@ -673,7 +673,7 @@ void HtmlExport::ExportHtml()
 
     mpDocSh->SetWaitCursor( true );
 
-    //------------------------------------------------------------------
+
     // Exceptions are cool...
 
     CreateFileNames();
@@ -2992,7 +2992,7 @@ bool HtmlExport::checkFileExists( Reference< ::com::sun::star::ucb::XSimpleFileA
     return false;
 }
 
-// ---------------------------------------------------------------------
+
 
 bool HtmlExport::checkForExistingFiles()
 {
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 83a97d1c9f63..23f27ede3da9 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -39,22 +39,22 @@
 #include "htmlex.hxx"
 #include "sdhtmlfilter.hxx"
 
-// ---------------
+
 // - SdPPTFilter -
-// ---------------
+
 
 SdHTMLFilter::SdHTMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) :
     SdFilter( rMedium, rDocShell, bShowProgress )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdHTMLFilter::~SdHTMLFilter()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdHTMLFilter::Export()
 {
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index fc30f643cf85..241407338503 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -37,7 +37,7 @@
 
 using namespace ::com::sun::star;
 
-//---------------------------------------------------------------------------------------
+
 
 void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn )
 {
@@ -57,7 +57,7 @@ void Ppt97AnimationInfoAtom::ReadStream( SvStream& rIn )
     rIn.ReadUChar( nUnknown2 );
 }
 
-//---------------------------------------------------------------------------------------
+
 
 #define MEMBER_CONSTRUCTOR_LIST() \
     m_aAtom() \
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index b6ce991f4267..fed3b94c3c6a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -2716,9 +2716,9 @@ ImplSdPPTImport::ReadFormControl( SotStorageRef& rSrc1, com::sun::star::uno::Ref
     return false;
 }
 
-// ---------------------
+
 // - exported function -
-// ---------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL ImportPPT(
         SdDrawDocument* pDocument, SvStream& rDocStream, SvStorage& rStorage, SfxMedium& rMedium )
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index e61122ee2e3e..628158d5ba3e 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -165,7 +165,7 @@ bool PropertySet::hasProperty( sal_Int32 nProperty ) const
     return maProperties.find( nProperty ) != maProperties.end();
 }
 
-// --------------------------------------------------------------------
+
 
 Any PropertySet::getProperty( sal_Int32 nProperty ) const
 {
@@ -220,7 +220,7 @@ AnimationImporter::AnimationImporter( ImplSdPPTImport* pPPTImport, SvStream& rSt
 {
 }
 
-// --------------------------------------------------------------------
+
 
 int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRecordHeader& rProgTagContentHd )
 {
@@ -260,14 +260,14 @@ int AnimationImporter::import( const Reference< XDrawPage >& xPage, const DffRec
     return nNodes;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::processAfterEffectNodes()
 {
     std::for_each( maAfterEffectNodes.begin(), maAfterEffectNodes.end(), sd::stl_process_after_effect_node_func );
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, const AnimationNode& rNode )
 {
@@ -332,7 +332,7 @@ Reference< XAnimationNode > AnimationImporter::createNode( const Atom* pAtom, co
     return xNode;
 }
 
-// --------------------------------------------------------------------
+
 
 static bool is_random( const AnimationNode& rNode, const PropertySet& rSet, sal_Int32& rPresetClass )
 {
@@ -573,7 +573,7 @@ int AnimationImporter::importAnimationContainer( const Atom* pAtom, const Refere
     return nNodes;
 }
 
-// --------------------------------------------------------------------
+
 void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
 {
     try
@@ -638,7 +638,7 @@ void AnimationImporter::fixMainSequenceTiming( const ::com::sun::star::uno::Refe
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode )
 {
@@ -663,7 +663,7 @@ void AnimationImporter::fixInteractiveSequenceTiming( const ::com::sun::star::un
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool AnimationImporter::convertAnimationNode( const Reference< XAnimationNode >& xNode, const Reference< XAnimationNode >& xParent )
 {
@@ -1043,7 +1043,7 @@ bool AnimationImporter::convertAnimationValue( MS_AttributeNames eAttribute, Any
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType )
 {
@@ -1104,7 +1104,7 @@ static OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId
         return OUString::number( nPresetSubType );
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const AnimationNode& rNode, const PropertySet& rSet )
 {
@@ -1386,7 +1386,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode >& xNode, const Anim
     }
 }
 
-// --------------------------------------------------------------------
+
 
 int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -1498,7 +1498,7 @@ int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference<
     return nNodes;
 }
 
-// --------------------------------------------------------------------
+
 
 int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -1574,7 +1574,7 @@ int AnimationImporter::importAnimationNodeContainer( const Atom* pAtom, const Re
     return nNodes;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -1653,7 +1653,7 @@ void AnimationImporter::importAnimateFilterContainer( const Atom* pAtom, const R
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -1798,7 +1798,7 @@ void AnimationImporter::importAnimateAttributeTargetContainer( const Atom* pAtom
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA*/, sal_Int32 /*nB*/, sal_Int32 /*nC*/ )
 {
@@ -1816,7 +1816,7 @@ sal_Int16 AnimationImporter::implGetColorSpace( sal_Int32 nMode, sal_Int32 /*nA*
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any AnimationImporter::implGetColorAny( sal_Int32 nMode, sal_Int32  nA, sal_Int32 nB, sal_Int32 nC )
 {
@@ -1937,7 +1937,7 @@ void AnimationImporter::importAnimateColorContainer( const Atom* pAtom, const Re
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -1996,7 +1996,7 @@ void AnimationImporter::importAnimateSetContainer( const Atom* pAtom, const Refe
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2075,7 +2075,7 @@ void AnimationImporter::importAnimateContainer( const Atom* pAtom, const Referen
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2157,7 +2157,7 @@ void AnimationImporter::importAnimateMotionContainer( const Atom* pAtom, const R
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importCommandContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2290,7 +2290,7 @@ void AnimationImporter::importCommandContainer( const Atom* pAtom, const Referen
     }
 }
 
-// --------------------------------------------------------------------
+
 
 int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2369,7 +2369,7 @@ int AnimationImporter::importAudioContainer( const Atom* pAtom, const Reference<
     return nNodes;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2470,7 +2470,7 @@ void AnimationImporter::importAnimateScaleContainer( const Atom* pAtom, const Re
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2539,7 +2539,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const
         }
     }
 }
-// --------------------------------------------------------------------
+
 
 bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames )
 {
@@ -2577,7 +2577,7 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimationValues( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2655,7 +2655,7 @@ void AnimationImporter::importAnimationValues( const Atom* pAtom, const Referenc
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2789,7 +2789,7 @@ void AnimationImporter::importAnimateKeyPoints( const Atom* pAtom, const Referen
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny )
 {
@@ -2864,7 +2864,7 @@ bool AnimationImporter::importAttributeValue( const Atom* pAtom, Any& rAny )
     return bOk;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -2982,7 +2982,7 @@ void AnimationImporter::importAnimationEvents( const Atom* pAtom, const Referenc
 #endif
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importAnimationActions( const Atom* pAtom, const Reference< XAnimationNode >& xNode )
 {
@@ -3021,7 +3021,7 @@ void AnimationImporter::importAnimationActions( const Atom* pAtom, const Referen
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rTarget, sal_Int16& rSubType )
 {
@@ -3144,7 +3144,7 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An
     return nRefMode;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertySet& rSet )
 {
@@ -3233,7 +3233,7 @@ void AnimationImporter::dump_atom_header( const Atom* pAtom, bool bOpen, bool bA
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine )
 {
@@ -3260,7 +3260,7 @@ void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine )
         fprintf(mpFile,"\n");
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine )
 {
@@ -3326,7 +3326,7 @@ void AnimationImporter::dump_atom( const Atom* pAtom, bool bNewLine )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnimationImporter::dump_anim_group( const Atom* pAtom, const AnimationNode& rNode, const PropertySet& rSet, bool bOpen )
 {
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index 2d0831f8e5e5..a7df9aff0e5c 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -35,17 +35,17 @@
 #include "drawdoc.hxx"
 #include "sdfilter.hxx"
 
-// --------------
+
 // - Namespaces -
-// --------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::task;
 using namespace ::com::sun::star::frame;
 
-// ------------
+
 // - SdFilter -
-// ------------
+
 
 SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress )
 :   mxModel( rDocShell.GetModel() )
@@ -57,13 +57,13 @@ SdFilter::SdFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdFilter::~SdFilter()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const
 {
@@ -71,7 +71,7 @@ OUString SdFilter::ImplGetFullLibraryName( const OUString& rLibraryName ) const
     return aTemp.replaceFirst( "?", rLibraryName );
 }
 
-// -----------------------------------------------------------------------------
+
 
 #ifndef DISABLE_DYNLOADING
 extern "C" { static void SAL_CALL thisModule() {} }
@@ -86,7 +86,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 
 #endif
 
-// -----------------------------------------------------------------------------
+
 
 void SdFilter::CreateStatusIndicator()
 {
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index fc27da66dfda..be51d9c4ae8f 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -31,9 +31,9 @@
 #include "drawdoc.hxx"
 #include <tools/urlobj.hxx>
 
-// --------------
+
 // - Namespaces -
-// --------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -62,9 +62,9 @@ extern "C" sal_Bool SaveVBA( SfxObjectShell&, SvMemoryStream*& );
 
 #endif
 
-// ---------------
+
 // - SdPPTFilter -
-// ---------------
+
 
 SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress ) :
     SdFilter( rMedium, rDocShell, bShowProgress ),
@@ -72,14 +72,14 @@ SdPPTFilter::SdPPTFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdPPTFilter::~SdPPTFilter()
 {
     delete pBas;    // deleting the compressed basic storage
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdPPTFilter::Import()
 {
@@ -131,7 +131,7 @@ sal_Bool SdPPTFilter::Import()
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdPPTFilter::Export()
 {
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 6578d4dc04f8..29a208c46639 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -165,9 +165,9 @@ XML_SERVICES* getServices( bool bImport, bool bDraw, sal_uLong nStoreVer )
 }
 
 
-// ----------------
+
 // - SdXMLWrapper -
-// ----------------
+
 
 SdXMLFilter::SdXMLFilter( SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell, sal_Bool bShowProgress, SdXMLFilterMode eFilterMode, sal_uLong nStoreVer ) :
     SdFilter( rMedium, rDocShell, bShowProgress ), meFilterMode( eFilterMode ), mnStoreVer( nStoreVer )
@@ -414,7 +414,7 @@ sal_Int32 ReadThroughComponent(
     return SD_XML_READERROR;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdXMLFilter::Import( ErrCode& nError )
 {
@@ -424,7 +424,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
     Reference< uno::XComponentContext > rxContext =
             comphelper::getProcessComponentContext();
 
-    // -------------------------------------
+
 
     SdDrawDocument* pDoc = mrDocShell.GetDoc();
     pDoc->EnableUndo(false);
@@ -432,11 +432,11 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
     pDoc->CreateFirstPages();
     pDoc->StopWorkStartupDelay();
 
-    // -------------------------------------
+
 
     mxModel->lockControllers();
 
-    // -------------------------------------
+
 
     /** property map for import info set */
     PropertyMapEntry const aImportInfoMap[] =
@@ -490,7 +490,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         }
     }
 
-    // -------------------------------------
+
 
     Reference< io::XActiveDataSource > xSource;
     Reference< XInterface > xPipe;
@@ -501,7 +501,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
 
     Reference< lang::XComponent > xModelComp( mxModel, uno::UNO_QUERY );
 
-    // -------------------------------------
+
 
     // try to get an XStatusIndicator from the Medium
     if( mbShowProgress )
@@ -536,9 +536,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         }
     }
 
-    // -------------------------------------
+
     // get the input stream (storage or stream)
-    // -------------------------------------
+
 
     SvStorageStreamRef xDocStream;
     Reference<io::XInputStream> xInputStream;
@@ -586,7 +586,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
     if (SDXMLMODE_Organizer == meFilterMode)
         xInfoSet->setPropertyValue("OrganizerMode", uno::makeAny(sal_True));
 
-    // -------------------------------------
+
 
     if( 0 == nRet )
     {
@@ -645,7 +645,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
         }
     }
 
-    // -------------------------------------
+
     if( pGraphicHelper )
         SvXMLGraphicHelper::Destroy( pGraphicHelper );
     xGraphicResolver = 0;
@@ -785,7 +785,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
     return nRet == 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdXMLFilter::Export()
 {
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index cb838dbc3f28..1e1912fde7bf 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -65,7 +65,7 @@ const int EXIT = 2;
 const int MOTIONPATH = 3;
 const int MISCEFFECTS = 4;
 
-// --------------------------------------------------------------------
+
 
 extern void fillDurationComboBox( ListBox* pBox );
 
@@ -146,7 +146,7 @@ void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl)
 {
@@ -154,7 +154,7 @@ IMPL_LINK_NOARG(CategoryListBox, implDoubleClickHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -170,7 +170,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 class CustomAnimationCreateTabPage : public TabPage
 {
@@ -498,7 +498,7 @@ bool CustomAnimationCreateTabPage::select( const OUString& rsPresetId )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, CustomAnimationPane* pPane, const std::vector< ::com::sun::star::uno::Any >& rTargets, bool bHasText, const OUString& rsPresetId, double fDuration  )
 :   TabDialog( pParent, "CustomAnimationCreate", "modules/simpress/ui/customanimationcreatedialog.ui" )
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 60135d8b0ad4..c66b5e70f5e9 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -116,7 +116,7 @@ private:
     ListBox* mpControl;
 };
 
-// --------------------------------------------------------------------
+
 
 PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const OUString& aPresetId, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -165,21 +165,21 @@ void PresetPropertyBox::setValue( const Any& rValue, const OUString& rPresetId )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 PresetPropertyBox::~PresetPropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 Any PresetPropertyBox::getValue()
 {
     return makeAny( maPropertyValues[mpControl->GetSelectEntryPos()] );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* PresetPropertyBox::getControl()
 {
@@ -202,7 +202,7 @@ private:
     ColorListBox* mpControl;
 };
 
-// --------------------------------------------------------------------
+
 
 ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -235,14 +235,14 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con
     }
 }
 
-// --------------------------------------------------------------------
+
 
 ColorPropertyBox::~ColorPropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 void ColorPropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -256,14 +256,14 @@ void ColorPropertyBox::setValue( const Any& rValue, const OUString& )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any ColorPropertyBox::getValue()
 {
     return makeAny( (sal_Int32)mpControl->GetSelectEntryColor().GetRGBColor() );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* ColorPropertyBox::getControl()
 {
@@ -287,7 +287,7 @@ private:
     FontNameBox* mpControl;
 };
 
-// --------------------------------------------------------------------
+
 
 FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -321,7 +321,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const
     setValue( rValue, aPresetId );
 }
 
-// --------------------------------------------------------------------
+
 
 void FontPropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -333,14 +333,14 @@ void FontPropertyBox::setValue( const Any& rValue, const OUString& )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 FontPropertyBox::~FontPropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 Any FontPropertyBox::getValue()
 {
@@ -348,7 +348,7 @@ Any FontPropertyBox::getValue()
     return makeAny( aFontName );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* FontPropertyBox::getControl()
 {
@@ -374,7 +374,7 @@ private:
     PopupMenu* mpMenu;
 };
 
-// --------------------------------------------------------------------
+
 
 DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu* pMenu )
 :   Edit( pParent, WB_BORDER|WB_TABSTOP| WB_DIALOGCONTROL ),
@@ -390,7 +390,7 @@ DropdownMenuBox::DropdownMenuBox( Window* pParent, Edit* pSubControl, PopupMenu*
     mpSubControl->Show();
 }
 
-// --------------------------------------------------------------------
+
 
 DropdownMenuBox::~DropdownMenuBox()
 {
@@ -400,7 +400,7 @@ DropdownMenuBox::~DropdownMenuBox()
     delete mpMenu;
 }
 
-// --------------------------------------------------------------------
+
 
 void DropdownMenuBox::Resize()
 {
@@ -412,7 +412,7 @@ void DropdownMenuBox::Resize()
     mpDropdownButton->setPosSizePixel( aOutSz.Width() - nSBWidth, 0, nSBWidth, aOutSz.Height() );
 }
 
-// --------------------------------------------------------------------
+
 
 bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -439,7 +439,7 @@ bool DropdownMenuBox::PreNotify( NotifyEvent& rNEvt )
     return nResult;
 }
 
-// --------------------------------------------------------------------
+
 
 class CharHeightPropertyBox : public PropertySubControl
 {
@@ -460,7 +460,7 @@ private:
     MetricField* mpMetric;
 };
 
-// --------------------------------------------------------------------
+
 
 CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -480,14 +480,14 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pP
     setValue( rValue, aPresetId );
 }
 
-// --------------------------------------------------------------------
+
 
 CharHeightPropertyBox::~CharHeightPropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
 {
@@ -504,7 +504,7 @@ IMPL_LINK( CharHeightPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void CharHeightPropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -516,14 +516,14 @@ void CharHeightPropertyBox::setValue( const Any& rValue, const OUString& )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any CharHeightPropertyBox::getValue()
 {
     return makeAny( (double)((double)mpMetric->GetValue() / 100.0) );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* CharHeightPropertyBox::getControl()
 {
@@ -555,7 +555,7 @@ private:
     Link maModifyHdl;
 };
 
-// --------------------------------------------------------------------
+
 
 TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -585,14 +585,14 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window
     setValue( rValue, aPresetId  );
 }
 
-// --------------------------------------------------------------------
+
 
 TransparencyPropertyBox::~TransparencyPropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 void TransparencyPropertyBox::updateMenu()
 {
@@ -601,7 +601,7 @@ void TransparencyPropertyBox::updateMenu()
         mpMenu->CheckItem( i, nValue == i );
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl)
 {
@@ -611,7 +611,7 @@ IMPL_LINK_NOARG(TransparencyPropertyBox, implModifyHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
 {
@@ -624,7 +624,7 @@ IMPL_LINK( TransparencyPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void TransparencyPropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -638,21 +638,21 @@ void TransparencyPropertyBox::setValue( const Any& rValue, const OUString& )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any TransparencyPropertyBox::getValue()
 {
     return makeAny( (double)((double)mpMetric->GetValue()) / 100.0 );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* TransparencyPropertyBox::getControl()
 {
     return mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 class RotationPropertyBox : public PropertySubControl
 {
@@ -677,7 +677,7 @@ private:
     Link maModifyHdl;
 };
 
-// --------------------------------------------------------------------
+
 
 RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -701,14 +701,14 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParen
     setValue( rValue, aPresetId );
 }
 
-// --------------------------------------------------------------------
+
 
 RotationPropertyBox::~RotationPropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 void RotationPropertyBox::updateMenu()
 {
@@ -725,7 +725,7 @@ void RotationPropertyBox::updateMenu()
     mpMenu->CheckItem( CM_COUNTERCLOCKWISE, !bDirection );
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(RotationPropertyBox, implModifyHdl)
 {
@@ -765,7 +765,7 @@ IMPL_LINK( RotationPropertyBox, implMenuSelectHdl, MenuButton*, pPb )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void RotationPropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -779,21 +779,21 @@ void RotationPropertyBox::setValue( const Any& rValue, const OUString& )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any RotationPropertyBox::getValue()
 {
     return makeAny( (double)((double)mpMetric->GetValue()) );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* RotationPropertyBox::getControl()
 {
     return mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 class ScalePropertyBox : public PropertySubControl
 {
@@ -819,7 +819,7 @@ private:
     int mnDirection;
 };
 
-// --------------------------------------------------------------------
+
 
 ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -842,14 +842,14 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, con
     setValue( rValue, aPresetId );
 }
 
-// --------------------------------------------------------------------
+
 
 ScalePropertyBox::~ScalePropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 void ScalePropertyBox::updateMenu()
 {
@@ -865,7 +865,7 @@ void ScalePropertyBox::updateMenu()
     mpMenu->CheckItem( CM_BOTH, mnDirection == 3 );
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ScalePropertyBox, implModifyHdl)
 {
@@ -914,7 +914,7 @@ IMPL_LINK( ScalePropertyBox, implMenuSelectHdl, MenuButton*, pPb )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void ScalePropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -946,7 +946,7 @@ void ScalePropertyBox::setValue( const Any& rValue, const OUString& )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Any ScalePropertyBox::getValue()
 {
@@ -965,7 +965,7 @@ Any ScalePropertyBox::getValue()
     return makeAny( aValues );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* ScalePropertyBox::getControl()
 {
@@ -1000,7 +1000,7 @@ private:
     sal_Int16 mnFontUnderline;
 };
 
-// --------------------------------------------------------------------
+
 
 FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pParent, const Any& rValue, const Link& rModifyHdl )
 : PropertySubControl( nControlType )
@@ -1018,14 +1018,14 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pPar
     setValue( rValue, aPresetId );
 }
 
-// --------------------------------------------------------------------
+
 
 FontStylePropertyBox::~FontStylePropertyBox()
 {
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 void FontStylePropertyBox::update()
 {
@@ -1043,7 +1043,7 @@ void FontStylePropertyBox::update()
     mpEdit->Invalidate();
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb )
 {
@@ -1077,7 +1077,7 @@ IMPL_LINK( FontStylePropertyBox, implMenuSelectHdl, MenuButton*, pPb )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void FontStylePropertyBox::setValue( const Any& rValue, const OUString& )
 {
@@ -1091,7 +1091,7 @@ void FontStylePropertyBox::setValue( const Any& rValue, const OUString& )
     update();
 }
 
-// --------------------------------------------------------------------
+
 
 Any FontStylePropertyBox::getValue()
 {
@@ -1102,7 +1102,7 @@ Any FontStylePropertyBox::getValue()
     return makeAny( aValues );
 }
 
-// --------------------------------------------------------------------
+
 
 Control* FontStylePropertyBox::getControl()
 {
@@ -1523,7 +1523,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleAfterEffectOnNextEffect, makeAny( bAfterEffectOnNextEffect ) );
     }
 
-    // ---
+
 
     nPos = mpLBTextAnim->GetSelectEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
@@ -1547,7 +1547,7 @@ void CustomAnimationEffectTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleIterateType, makeAny( nIterateType ) );
     }
 
-    // ---
+
 
     {
         double fIterateInterval = static_cast< double >( mpMFTextDelay->GetValue() ) / 10;
@@ -1930,7 +1930,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleStart, makeAny( nStart ) );
     }
 
-    // ---
+
 
     {
         double fBegin = static_cast<double>( mpMFStartDelay->GetValue()) / 10.0;
@@ -1943,7 +1943,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleBegin, makeAny( fBegin ) );
     }
 
-    // ---
+
 
     nPos = mpCBRepeat->GetSelectEntryPos();
     if( (nPos != LISTBOX_ENTRY_NOTFOUND) || (!mpCBRepeat->GetText().isEmpty()) )
@@ -1989,7 +1989,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleEnd, aEnd );
     }
 
-    // ---
+
 
     double fDuration = -1.0;
     nPos = mpCBDuration->GetSelectEntryPos();
@@ -2017,7 +2017,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
             pSet->setPropertyValue( nHandleDuration, makeAny( fDuration ) );
     }
 
-    // ---
+
 
     if( mpCBXRewind->GetState() != STATE_DONTKNOW )
     {
@@ -2249,7 +2249,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationDialog::CustomAnimationDialog(Window* pParent, STLPropertySet* pSet, OString sPage)
 : TabDialog( pParent, "CustomAnimationProperties", "modules/simpress/ui/customanimationproperties.ui")
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 641d7ff6af94..cca0944cadf5 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -217,7 +217,7 @@ private:
     CustomAnimationEffectPtr mpEffect;
 };
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription, CustomAnimationEffectPtr pEffect, CustomAnimationList* pParent  )
 : SvLBoxString( pEntry, nFlags, aDescription )
@@ -227,13 +227,13 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem( SvTreeListEntry* pEn
 {
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationListEntryItem::~CustomAnimationListEntryItem()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
 {
@@ -246,7 +246,7 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeLis
     pViewData->maSize = aSize;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationListEntryItem::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
@@ -303,14 +303,14 @@ void CustomAnimationListEntryItem::Paint(
     rDev.DrawText( aPos, rDev.GetEllipsisString( maDescription, rDev.GetOutputSizePixel().Width() - aPos.X() ) );
 }
 
-// --------------------------------------------------------------------
+
 
 SvLBoxItem* CustomAnimationListEntryItem::Create() const
 {
     return NULL;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationListEntryItem::Clone( SvLBoxItem* )
 {
@@ -331,20 +331,20 @@ private:
     CustomAnimationEffectPtr mpEffect;
 };
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationListEntry::CustomAnimationListEntry()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationListEntry::CustomAnimationListEntry( CustomAnimationEffectPtr pEffect )
 : mpEffect( pEffect )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationListEntry::~CustomAnimationListEntry()
 {
@@ -368,27 +368,27 @@ private:
     OUString        maDescription;
 };
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationTriggerEntryItem::CustomAnimationTriggerEntryItem( SvTreeListEntry* pEntry, sal_uInt16 nFlags, OUString aDescription )
 : SvLBoxString( pEntry, nFlags, aDescription ), maDescription( aDescription )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationTriggerEntryItem::~CustomAnimationTriggerEntryItem()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt16 CustomAnimationTriggerEntryItem::IsA()
 {
     return (sal_uInt16)-1;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData )
 {
@@ -401,7 +401,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTree
     pViewData->maSize = aSize;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationTriggerEntryItem::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
@@ -441,14 +441,14 @@ void CustomAnimationTriggerEntryItem::Paint(
     rDev.Pop();
 }
 
-// --------------------------------------------------------------------
+
 
 SvLBoxItem* CustomAnimationTriggerEntryItem::Create() const
 {
     return NULL;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationTriggerEntryItem::Clone( SvLBoxItem* )
 {
@@ -475,7 +475,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCustomAnimationList( ::Wind
     return new CustomAnimationList( pParent );
 }
 
-// --------------------------------------------------------------------
+
 
 const Image&  CustomAnimationList::getImage( sal_uInt16 nId )
 {
@@ -490,7 +490,7 @@ const Image&  CustomAnimationList::getImage( sal_uInt16 nId )
     return rImage;
 }
 
-// --------------------------------------------------------------------
+
 
 CustomAnimationList::~CustomAnimationList()
 {
@@ -500,7 +500,7 @@ CustomAnimationList::~CustomAnimationList()
     clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::KeyInput( const KeyEvent& rKEvt )
 {
@@ -522,7 +522,7 @@ void CustomAnimationList::KeyInput( const KeyEvent& rKEvt )
     ::SvTreeListBox::KeyInput( rKEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 /** selects or deselects the given effect.
     Selections of other effects are not changed */
@@ -547,7 +547,7 @@ void CustomAnimationList::select( CustomAnimationEffectPtr pEffect, bool bSelect
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::clear()
 {
@@ -557,7 +557,7 @@ void CustomAnimationList::clear()
     mxLastTargetShape = 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::update( MainSequencePtr pMainSequence )
 {
@@ -571,7 +571,7 @@ void CustomAnimationList::update( MainSequencePtr pMainSequence )
         mpMainSequence->addListener( this );
 }
 
-// --------------------------------------------------------------------
+
 
 struct stl_append_effect_func : public std::unary_function<CustomAnimationEffectPtr, void>
 {
@@ -584,7 +584,7 @@ void stl_append_effect_func::operator()(CustomAnimationEffectPtr pEffect)
 {
     mrList.append( pEffect );
 }
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::update()
 {
@@ -756,7 +756,7 @@ void CustomAnimationList::update()
     Invalidate();
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
 {
@@ -806,7 +806,7 @@ void CustomAnimationList::append( CustomAnimationEffectPtr pEffect )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape )
 {
@@ -824,7 +824,7 @@ void selectShape( SvTreeListBox* pTreeList, Reference< XShape > xShape )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::onSelectionChanged( Any aSelection )
 {
@@ -862,7 +862,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::SelectHdl()
 {
@@ -872,7 +872,7 @@ void CustomAnimationList::SelectHdl()
     mpController->onSelect();
 }
 
-// --------------------------------------------------------------------
+
 
 bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect ) const
 {
@@ -892,7 +892,7 @@ bool CustomAnimationList::isExpanded( const CustomAnimationEffectPtr& pEffect )
     return (pEntry == 0) || IsExpanded( pEntry );
 }
 
-// --------------------------------------------------------------------
+
 EffectSequence CustomAnimationList::getSelection() const
 {
     EffectSequence aSelection;
@@ -928,7 +928,7 @@ EffectSequence CustomAnimationList::getSelection() const
     return aSelection;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool CustomAnimationList::DoubleClickHdl()
 {
@@ -936,7 +936,7 @@ sal_Bool CustomAnimationList::DoubleClickHdl()
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 PopupMenu* CustomAnimationList::CreateContextMenu()
 {
@@ -978,21 +978,21 @@ PopupMenu* CustomAnimationList::CreateContextMenu()
     return pMenu;
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
 {
     mpController->onContextMenu( nSelectedPopupEntry );
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::SetTabs()
 {
     SvTreeListBox::SetTabs();
 }
 
-// --------------------------------------------------------------------
+
 
 void CustomAnimationList::notify_change()
 {
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 4f479db1801f..f093d0afcb2e 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -103,7 +103,7 @@ using ::sd::framework::FrameworkHelper;
 
 namespace sd {
 
-// --------------------------------------------------------------------
+
 
 void fillDurationComboBox( ListBox* pBox )
 {
@@ -147,7 +147,7 @@ void fillRepeatComboBox( ListBox* pBox )
     pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), (void*)((sal_Int32)-2) );
 }
 
-// --------------------------------------------------------------------
+
 
 
 CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase,
diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx
index 2c9460a330c6..080b33cc41eb 100644
--- a/sd/source/ui/animations/motionpathtag.cxx
+++ b/sd/source/ui/animations/motionpathtag.cxx
@@ -68,7 +68,7 @@ namespace sd
 const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
 static const int DRGPIX     = 2;                               // Drag MinMove in Pixel
 
-// --------------------------------------------------------------------
+
 
 class PathDragMove : public SdrDragMove
 {
@@ -132,7 +132,7 @@ bool PathDragMove::EndSdrDrag(bool /*bCopy*/)
         mxTag->MovePath( DragStat().GetDX(), DragStat().GetDY() );
     return true;
 }
-// --------------------------------------------------------------------
+
 
 class PathDragResize : public SdrDragResize
 {
@@ -193,7 +193,7 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/)
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 class PathDragObjOwn : public SdrDragObjOwn
 {
@@ -245,7 +245,7 @@ bool PathDragObjOwn::EndSdrDrag(bool /*bCopy*/)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 class SdPathHdl : public SmartHdl
 {
@@ -262,7 +262,7 @@ private:
     rtl::Reference< MotionPathTag > mxTag;
 };
 
-// --------------------------------------------------------------------
+
 
 SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj )
 : SmartHdl( xTag, pPathObj->GetCurrentBoundRect().TopLeft() )
@@ -271,13 +271,13 @@ SdPathHdl::SdPathHdl( const SmartTagReference& xTag, SdrPathObj* pPathObj )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 SdPathHdl::~SdPathHdl()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SdPathHdl::CreateB2dIAObject()
 {
@@ -317,21 +317,21 @@ void SdPathHdl::CreateB2dIAObject()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SdPathHdl::IsFocusHdl() const
 {
     return sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdPathHdl::isMarkable() const
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 Pointer SdPathHdl::GetSdrDragPointer() const
 {
@@ -408,7 +408,7 @@ MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, con
     }
 }
 
-// --------------------------------------------------------------------
+
 
 MotionPathTag::~MotionPathTag()
 {
@@ -416,7 +416,7 @@ MotionPathTag::~MotionPathTag()
     Dispose();
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::updatePathAttributes()
 {
@@ -446,7 +446,7 @@ void MotionPathTag::updatePathAttributes()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
@@ -465,7 +465,7 @@ void MotionPathTag::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::MovePath( int nDX, int nDY )
 {
@@ -476,7 +476,7 @@ void MotionPathTag::MovePath( int nDX, int nDY )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the MotionPathTag handled the event. */
 bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl )
@@ -606,7 +606,7 @@ bool MotionPathTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& rHdl )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the SmartTag consumes this event. */
 bool MotionPathTag::KeyInput( const KeyEvent& rKEvt )
@@ -816,7 +816,7 @@ bool MotionPathTag::OnMove( const KeyEvent& rKEvt )
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong MotionPathTag::GetMarkablePointCount() const
 {
@@ -830,7 +830,7 @@ sal_uLong MotionPathTag::GetMarkablePointCount() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong MotionPathTag::GetMarkedPointCount() const
 {
@@ -845,7 +845,7 @@ sal_uLong MotionPathTag::GetMarkedPointCount() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
 {
@@ -866,7 +866,7 @@ sal_Bool MotionPathTag::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark )
 {
@@ -897,7 +897,7 @@ sal_Bool MotionPathTag::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark )
     return bChgd;
 }
 
-// --------------------------------------------------------------------
+
 
 bool MotionPathTag::getContext( SdrViewContext& rContext )
 {
@@ -912,7 +912,7 @@ bool MotionPathTag::getContext( SdrViewContext& rContext )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::CheckPossibilities()
 {
@@ -941,7 +941,7 @@ void MotionPathTag::CheckPossibilities()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
 {
@@ -1054,7 +1054,7 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::disposing()
 {
@@ -1082,7 +1082,7 @@ void MotionPathTag::disposing()
     SmartTag::disposing();
 }
 
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::deselect()
 {
@@ -1107,9 +1107,9 @@ void MotionPathTag::selectionChanged()
         rBindings.InvalidateAll(sal_True);
     }
 }
-// --------------------------------------------------------------------
+
 // IPolyPolygonEditorController
-// --------------------------------------------------------------------
+
 
 void MotionPathTag::DeleteMarkedPoints()
 {
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index 3da2764a151b..6aa7e0ac60a4 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -100,11 +100,11 @@ using namespace ::com::sun::star::office;
 
 namespace sd {
 
-// --------------------------------------------------------------------
+
 
 extern TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation );
 
-// --------------------------------------------------------------------
+
 
 SfxItemPool* GetAnnotationPool()
 {
@@ -121,7 +121,7 @@ SfxItemPool* GetAnnotationPool()
     return mpAnnotationPool;
 }
 
-// --------------------------------------------------------------------
+
 
 static SfxBindings* getBindings( ViewShellBase& rBase )
 {
@@ -131,7 +131,7 @@ static SfxBindings* getBindings( ViewShellBase& rBase )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
 {
@@ -176,7 +176,7 @@ OUString getAnnotationDateTimeString( const Reference< XAnnotation >& xAnnotatio
     return sRet;
 }
 
-// --------------------------------------------------------------------
+
 
 AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase )
 : AnnotationManagerImplBase( m_aMutex )
@@ -190,7 +190,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase )
         mbShowAnnotations = pOptions->IsShowComments() == sal_True;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::init()
 {
@@ -216,7 +216,7 @@ void AnnotationManagerImpl::init()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 // WeakComponentImplHelper1
 void SAL_CALL AnnotationManagerImpl::disposing ()
@@ -244,7 +244,7 @@ void SAL_CALL AnnotationManagerImpl::disposing ()
     mxCurrentPage.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 // XEventListener
 void SAL_CALL AnnotationManagerImpl::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException)
@@ -274,7 +274,7 @@ void AnnotationManagerImpl::ShowAnnotations( bool bShow )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq )
 {
@@ -301,7 +301,7 @@ void AnnotationManagerImpl::ExecuteAnnotation(SfxRequest& rReq )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/)
 {
@@ -309,7 +309,7 @@ void AnnotationManagerImpl::ExecuteInsertAnnotation(SfxRequest& /*rReq*/)
     InsertAnnotation();
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq)
 {
@@ -358,7 +358,7 @@ void AnnotationManagerImpl::ExecuteDeleteAnnotation(SfxRequest& rReq)
     UpdateTags();
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::InsertAnnotation()
 {
@@ -437,7 +437,7 @@ void AnnotationManagerImpl::InsertAnnotation()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
 {
@@ -504,7 +504,7 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotation )
 {
@@ -582,7 +582,7 @@ void AnnotationManagerImpl::DeleteAllAnnotations()
         mpDoc->EndUndo();
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet)
 {
@@ -628,7 +628,7 @@ void AnnotationManagerImpl::GetAnnotationState(SfxItemSet& rSet)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
 {
@@ -737,7 +737,7 @@ void AnnotationManagerImpl::SelectNextAnnotation(bool bForeward)
     while( true );
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag )
 {
@@ -745,7 +745,7 @@ void AnnotationManagerImpl::onTagSelected( AnnotationTag& rTag )
     invalidateSlots();
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag )
 {
@@ -756,7 +756,7 @@ void AnnotationManagerImpl::onTagDeselected( AnnotationTag& rTag )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, bool bEdit /* = sal_False */ )
 {
@@ -776,7 +776,7 @@ void AnnotationManagerImpl::SelectAnnotation( ::com::sun::star::uno::Reference<
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::GetSelectedAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation )
 {
@@ -798,7 +798,7 @@ void AnnotationManagerImpl::invalidateSlots()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::onSelectionChanged()
 {
@@ -892,7 +892,7 @@ void AnnotationManagerImpl::CreateTags()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::DisposeTags()
 {
@@ -909,7 +909,7 @@ void AnnotationManagerImpl::DisposeTags()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::addListener()
 {
@@ -922,7 +922,7 @@ void AnnotationManagerImpl::addListener()
         | tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED);
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationManagerImpl::removeListener()
 {
@@ -930,7 +930,7 @@ void AnnotationManagerImpl::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK(AnnotationManagerImpl,EventMultiplexerListener,
     tools::EventMultiplexerEvent*,pEvent)
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index 857ff1a09bb6..aff8b343f247 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -59,7 +59,7 @@ namespace sd
 const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
 static const int DRGPIX     = 2;                               // Drag MinMove in Pixel
 
-// --------------------------------------------------------------------
+
 
 static OUString getInitials( const OUString& rName )
 {
@@ -93,9 +93,9 @@ static OUString getInitials( const OUString& rName )
     return sInitials;
 }
 
-// --------------------------------------------------------------------
 
-// --------------------------------------------------------------------
+
+
 
 class AnnotationDragMove : public SdrDragMove
 {
@@ -158,7 +158,7 @@ void AnnotationDragMove::CancelSdrDrag()
     Hide();
 }
 
-// --------------------------------------------------------------------
+
 
 class AnnotationHdl : public SmartHdl
 {
@@ -176,7 +176,7 @@ private:
     rtl::Reference< AnnotationTag > mxTag;
 };
 
-// --------------------------------------------------------------------
+
 
 AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt )
 : SmartHdl( xTag, rPnt )
@@ -185,13 +185,13 @@ AnnotationHdl::AnnotationHdl( const SmartTagReference& xTag, const Reference< XA
 {
 }
 
-// --------------------------------------------------------------------
+
 
 AnnotationHdl::~AnnotationHdl()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationHdl::CreateB2dIAObject()
 {
@@ -255,21 +255,21 @@ void AnnotationHdl::CreateB2dIAObject()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool AnnotationHdl::IsFocusHdl() const
 {
     return sal_True;
 }
 
-// --------------------------------------------------------------------
+
 
 bool AnnotationHdl::isMarkable() const
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 Pointer AnnotationHdl::GetSdrDragPointer() const
 {
@@ -303,7 +303,7 @@ AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView
 {
 }
 
-// --------------------------------------------------------------------
+
 
 AnnotationTag::~AnnotationTag()
 {
@@ -311,7 +311,7 @@ AnnotationTag::~AnnotationTag()
     Dispose();
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the AnnotationTag handled the event. */
 bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/ )
@@ -347,7 +347,7 @@ bool AnnotationTag::MouseButtonDown( const MouseEvent& rMEvt, SmartHdl& /*rHdl*/
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the SmartTag consumes this event. */
 bool AnnotationTag::KeyInput( const KeyEvent& rKEvt )
@@ -469,27 +469,27 @@ bool AnnotationTag::OnMove( const KeyEvent& rKEvt )
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationTag::CheckPossibilities()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong AnnotationTag::GetMarkablePointCount() const
 {
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong AnnotationTag::GetMarkedPointCount() const
 {
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ )
 {
@@ -497,7 +497,7 @@ sal_Bool AnnotationTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ )
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ )
 {
@@ -505,14 +505,14 @@ sal_Bool AnnotationTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmar
     return bChgd;
 }
 
-// --------------------------------------------------------------------
+
 
 bool AnnotationTag::getContext( SdrViewContext& /*rContext*/ )
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList )
 {
@@ -532,7 +532,7 @@ void AnnotationTag::addCustomHandles( SdrHdlList& rHandlerList )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationTag::disposing()
 {
@@ -552,7 +552,7 @@ void AnnotationTag::disposing()
     SmartTag::disposing();
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationTag::select()
 {
@@ -571,7 +571,7 @@ void AnnotationTag::select()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationTag::deselect()
 {
@@ -582,7 +582,7 @@ void AnnotationTag::deselect()
     mrManager.onTagDeselected( *this );
 }
 
-// --------------------------------------------------------------------
+
 
 BitmapEx AnnotationTag::CreateAnnotationBitmap( bool bSelected )
 {
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index ee1ab02d015b..d570ed2a6229 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -518,7 +518,7 @@ SvxLanguageItem AnnotationWindow::GetLanguage(void)
     return SvxLanguageItem( Doc()->GetLanguage( EE_CHAR_LANGUAGE ), SID_ATTR_LANGUAGE );
 }
 
-// --------------------------------------------------------------------
+
 
 TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation )
 {
@@ -530,7 +530,7 @@ TextApiObject* getTextApiObject( const Reference< XAnnotation >& xAnnotation )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void AnnotationWindow::setAnnotation( const Reference< XAnnotation >& xAnnotation, bool bGrabFocus )
 {
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index ee478f30bbfe..fcf18b394fcc 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -45,9 +45,9 @@ template< class T > T getSafeValue( const Any& rAny )
     return value;
 }
 
-// -----------------
+
 // - SdOptionsItem -
-// -----------------
+
 
 SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rSubTree ) :
     ConfigItem  ( rSubTree ),
@@ -55,13 +55,13 @@ SdOptionsItem::SdOptionsItem( const SdOptionsGeneric& rParent, const OUString rS
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdOptionsItem::~SdOptionsItem()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsItem::Commit()
 {
@@ -73,30 +73,30 @@ void SdOptionsItem::Notify( const com::sun::star::uno::Sequence<OUString>& )
 {}
 
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames )
 {
     return ConfigItem::GetProperties( rNames );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsItem::PutProperties( const Sequence< OUString >& rNames, const Sequence< Any>& rValues )
 {
     return ConfigItem::PutProperties( rNames, rValues );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsItem::SetModified()
 {
     ConfigItem::SetModified();
 }
 
-// --------------------
+
 // - SdOptionsGeneric -
-// --------------------
+
 
 SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTree ) :
     maSubTree   ( rSubTree ),
@@ -106,7 +106,7 @@ SdOptionsGeneric::SdOptionsGeneric( sal_uInt16 nConfigId, const OUString& rSubTr
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsGeneric::Init() const
 {
@@ -133,7 +133,7 @@ void SdOptionsGeneric::Init() const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdOptionsGeneric::~SdOptionsGeneric()
 {
@@ -141,7 +141,7 @@ SdOptionsGeneric::~SdOptionsGeneric()
     mpCfgItem = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const
 {
@@ -159,7 +159,7 @@ void SdOptionsGeneric::Commit( SdOptionsItem& rCfgItem ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const
 {
@@ -177,7 +177,7 @@ Sequence< OUString > SdOptionsGeneric::GetPropertyNames() const
     return aNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsGeneric::Store()
 {
@@ -185,7 +185,7 @@ void SdOptionsGeneric::Store()
         mpCfgItem->Commit();
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool SdOptionsGeneric::isMetricSystem()
 {
@@ -218,7 +218,7 @@ SdOptionsLayout::SdOptionsLayout(  sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
 {
@@ -231,7 +231,7 @@ sal_Bool SdOptionsLayout::operator==( const SdOptionsLayout& rOpt ) const
             GetDefTab() == rOpt.GetDefTab() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -265,7 +265,7 @@ void SdOptionsLayout::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
         ppNames = aPropNamesNonMetric;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsLayout::ReadData( const Any* pValues )
 {
@@ -280,7 +280,7 @@ sal_Bool SdOptionsLayout::ReadData( const Any* pValues )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsLayout::WriteData( Any* pValues ) const
 {
@@ -307,7 +307,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich )
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
 :   SfxPoolItem     ( _nWhich )
@@ -337,7 +337,7 @@ SdOptionsLayoutItem::SdOptionsLayoutItem( sal_uInt16 _nWhich, SdOptions* pOpts,
     }
 }
 
-// ----------------------------------------------------------------------
+
 
 SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const
 {
@@ -345,7 +345,7 @@ SfxPoolItem* SdOptionsLayoutItem::Clone( SfxItemPool* ) const
 }
 
 
-// ----------------------------------------------------------------------
+
 
 bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -354,7 +354,7 @@ bool SdOptionsLayoutItem::operator==( const SfxPoolItem& rAttr ) const
     return bSameType && ( maOptionsLayout == static_cast< const SdOptionsLayoutItem& >( rAttr ).maOptionsLayout );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdOptionsLayoutItem::SetOptions( SdOptions* pOpts ) const
 {
@@ -386,14 +386,14 @@ SdOptionsContents::SdOptionsContents( sal_uInt16 nConfigId, sal_Bool bUseConfig
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsContents::operator==(const SdOptionsContents&) const
 {
     return true;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -409,14 +409,14 @@ void SdOptionsContents::GetPropNameArray( const char**& ppNames, sal_uLong& rCou
     ppNames = aPropNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsContents::ReadData(const Any*)
 {
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsContents::WriteData( Any* pValues ) const
 {
@@ -441,14 +441,14 @@ SdOptionsContentsItem::SdOptionsContentsItem(sal_uInt16 _nWhich, SdOptions*, ::s
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 SfxPoolItem* SdOptionsContentsItem::Clone( SfxItemPool* ) const
 {
     return new SdOptionsContentsItem( *this );
 }
 
-// ----------------------------------------------------------------------
+
 
 bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -457,7 +457,7 @@ bool SdOptionsContentsItem::operator==( const SfxPoolItem& rAttr ) const
     return bSameType && ( maOptionsContents == static_cast<const SdOptionsContentsItem&>( rAttr ).maOptionsContents );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdOptionsContentsItem::SetOptions(SdOptions*) const
 {
@@ -508,7 +508,7 @@ SdOptionsMisc::SdOptionsMisc( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
 {
@@ -542,7 +542,7 @@ sal_Bool SdOptionsMisc::operator==( const SdOptionsMisc& rOpt ) const
         );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -587,7 +587,7 @@ void SdOptionsMisc::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
     ppNames = aPropNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
 {
@@ -648,7 +648,7 @@ sal_Bool SdOptionsMisc::ReadData( const Any* pValues )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsMisc::WriteData( Any* pValues ) const
 {
@@ -703,7 +703,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich )
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
 :   SfxPoolItem     ( _nWhich )
@@ -762,7 +762,7 @@ SdOptionsMiscItem::SdOptionsMiscItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
     }
 }
 
-// ----------------------------------------------------------------------
+
 
 SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const
 {
@@ -770,7 +770,7 @@ SfxPoolItem* SdOptionsMiscItem::Clone( SfxItemPool* ) const
 }
 
 
-// ----------------------------------------------------------------------
+
 
 bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -779,7 +779,7 @@ bool SdOptionsMiscItem::operator==( const SfxPoolItem& rAttr ) const
     return bSameType && ( maOptionsMisc == static_cast< const SdOptionsMiscItem& >(rAttr).maOptionsMisc );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdOptionsMiscItem::SetOptions( SdOptions* pOpts ) const
 {
@@ -843,7 +843,7 @@ SdOptionsSnap::SdOptionsSnap( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
 {
@@ -859,7 +859,7 @@ sal_Bool SdOptionsSnap::operator==( const SdOptionsSnap& rOpt ) const
             GetEliminatePolyPointLimitAngle() == rOpt.GetEliminatePolyPointLimitAngle() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -881,7 +881,7 @@ void SdOptionsSnap::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
     ppNames = aPropNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsSnap::ReadData( const Any* pValues )
 {
@@ -899,7 +899,7 @@ sal_Bool SdOptionsSnap::ReadData( const Any* pValues )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsSnap::WriteData( Any* pValues ) const
 {
@@ -929,7 +929,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich )
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* pView )
 :   SfxPoolItem     ( _nWhich )
@@ -963,7 +963,7 @@ SdOptionsSnapItem::SdOptionsSnapItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
     }
 }
 
-// ----------------------------------------------------------------------
+
 
 SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const
 {
@@ -971,7 +971,7 @@ SfxPoolItem* SdOptionsSnapItem::Clone( SfxItemPool* ) const
 }
 
 
-// ----------------------------------------------------------------------
+
 
 bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -980,7 +980,7 @@ bool SdOptionsSnapItem::operator==( const SfxPoolItem& rAttr ) const
     return bSameType && ( maOptionsSnap == static_cast< const SdOptionsSnapItem& >(rAttr).maOptionsSnap );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdOptionsSnapItem::SetOptions( SdOptions* pOpts ) const
 {
@@ -1016,7 +1016,7 @@ SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const
 {
@@ -1029,7 +1029,7 @@ sal_Bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const
             ( nY1 == nY2 ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -1043,7 +1043,7 @@ void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
     ppNames = aPropNames;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsZoom::ReadData( const Any* pValues )
 {
@@ -1057,7 +1057,7 @@ sal_Bool SdOptionsZoom::ReadData( const Any* pValues )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsZoom::WriteData( Any* pValues ) const
 {
@@ -1089,13 +1089,13 @@ SdOptionsGrid::SdOptionsGrid( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdOptionsGrid::~SdOptionsGrid()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsGrid::SetDefaults()
 {
@@ -1113,7 +1113,7 @@ void SdOptionsGrid::SetDefaults()
     SetEqualGrid( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
 {
@@ -1129,7 +1129,7 @@ sal_Bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
             IsEqualGrid() == rOpt.IsEqualGrid() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -1169,7 +1169,7 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
         ppNames = aPropNamesNonMetric;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsGrid::ReadData( const Any* pValues )
 {
@@ -1198,7 +1198,7 @@ sal_Bool SdOptionsGrid::ReadData( const Any* pValues )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsGrid::WriteData( Any* pValues ) const
 {
@@ -1252,7 +1252,7 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const
 {
@@ -1305,7 +1305,7 @@ SdOptionsPrint::SdOptionsPrint( sal_uInt16 nConfigId, sal_Bool bUseConfig ) :
     EnableModify( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const
 {
@@ -1332,7 +1332,7 @@ sal_Bool SdOptionsPrint::operator==( const SdOptionsPrint& rOpt ) const
             GetHandoutPages() == rOpt.GetHandoutPages() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const
 {
@@ -1392,7 +1392,7 @@ void SdOptionsPrint::GetPropNameArray( const char**& ppNames, sal_uLong& rCount
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsPrint::ReadData( const Any* pValues )
 {
@@ -1422,7 +1422,7 @@ sal_Bool SdOptionsPrint::ReadData( const Any* pValues )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdOptionsPrint::WriteData( Any* pValues ) const
 {
@@ -1464,7 +1464,7 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich )
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd::FrameView* )
 :   SfxPoolItem     ( _nWhich )
@@ -1494,14 +1494,14 @@ SdOptionsPrintItem::SdOptionsPrintItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::
     }
 }
 
-// ----------------------------------------------------------------------
+
 
 SfxPoolItem* SdOptionsPrintItem::Clone( SfxItemPool* ) const
 {
     return new SdOptionsPrintItem( *this );
 }
 
-// ----------------------------------------------------------------------
+
 
 bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -1510,7 +1510,7 @@ bool SdOptionsPrintItem::operator==( const SfxPoolItem& rAttr ) const
     return bSameType && ( maOptionsPrint == static_cast< const SdOptionsPrintItem& >( rAttr ).maOptionsPrint );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdOptionsPrintItem::SetOptions( SdOptions* pOpts ) const
 {
@@ -1555,13 +1555,13 @@ SdOptions::SdOptions( sal_uInt16 nConfigId ) :
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 SdOptions::~SdOptions()
 {
 }
 
-// ----------------------------------------------------------------------
+
 
 void SdOptions::StoreConfig( sal_uLong nOptionsRange )
 {
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 606bc1696fbf..9ec549c91b15 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -46,7 +46,7 @@ private:
     virtual void    Select();
 };
 
-// -----------------------------------------------------------------------
+
 
 SdTemplatePopup_Impl::SdTemplatePopup_Impl() :
     PopupMenu(),
@@ -54,7 +54,7 @@ SdTemplatePopup_Impl::SdTemplatePopup_Impl() :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTemplatePopup_Impl::Select()
 {
@@ -70,13 +70,13 @@ SdTemplateControl::SdTemplateControl( sal_uInt16 _nSlotId,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SdTemplateControl::~SdTemplateControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTemplateControl::StateChanged(
     sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
@@ -90,14 +90,14 @@ void SdTemplateControl::StateChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTemplateControl::Paint( const UserDrawEvent&  )
 {
     GetStatusBar().SetItemText( GetId(), msTemplate );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTemplateControl::Command( const CommandEvent& rCEvt )
 {
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index b9266f9bdf6e..86de6d3f04b4 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -65,7 +65,7 @@ namespace sd
 
 extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL );
 
-// -----------------------------------------------------------------------
+
 
 class LayoutToolbarMenu : public svtools::ToolbarMenu
 {
@@ -84,7 +84,7 @@ private:
     ValueSet* mpLayoutSet2;
 };
 
-// -----------------------------------------------------------------------
+
 
 struct snewfoil_value_info
 {
@@ -138,7 +138,7 @@ static const snewfoil_value_info v_standard[] =
     {0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
-// -----------------------------------------------------------------------
+
 
 static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pInfo )
 {
@@ -159,7 +159,7 @@ static void fillLayoutValueSet( ValueSet* pValue, const snewfoil_value_info* pIn
     pValue->SetSizePixel( pValue->CalcWindowSizePixel( aLayoutItemSize ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const Reference< XFrame >& xFrame, ::Window* pParent, const bool bInsertPage )
 : svtools::ToolbarMenu(xFrame, pParent, WB_CLIPCHILDREN )
@@ -265,13 +265,13 @@ LayoutToolbarMenu::LayoutToolbarMenu( SlideLayoutController& rController, const
     SetOutputSizePixel( getMenuSize() );
 }
 
-// -----------------------------------------------------------------------
+
 
 LayoutToolbarMenu::~LayoutToolbarMenu()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( LayoutToolbarMenu, SelectHdl, void *, pControl )
 {
@@ -316,7 +316,7 @@ OUString SlideLayoutController_getImplementationName()
     return OUString( "com.sun.star.comp.sd.SlideLayoutController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -325,7 +325,7 @@ Sequence< OUString >  SlideLayoutController_getSupportedServiceNames() throw( Ru
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
@@ -333,14 +333,14 @@ Reference< XInterface > SAL_CALL SlideLayoutController_createInstance( const Ref
         new SlideLayoutController( comphelper::getComponentContext(rSMgr), ".uno:AssignLayout", false ));
 }
 
-// --------------------------------------------------------------------
+
 
 OUString InsertSlideController_getImplementationName()
 {
     return OUString( "com.sun.star.comp.sd.InsertSlideController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -349,7 +349,7 @@ Sequence< OUString >  InsertSlideController_getSupportedServiceNames() throw( Ru
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL InsertSlideController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
@@ -367,16 +367,16 @@ SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentCo
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ::Window* SlideLayoutController::createPopupWindow( ::Window* pParent )
 {
     return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage );
 }
 
-// --------------------------------------------------------------------
+
 // XServiceInfo
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeException )
 {
@@ -386,7 +386,7 @@ OUString SAL_CALL SlideLayoutController::getImplementationName() throw( RuntimeE
         return SlideLayoutController_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL SlideLayoutController::getSupportedServiceNames(  ) throw( RuntimeException )
 {
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index b3d80e3393f0..eda2615eaa3a 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -34,37 +34,37 @@ using namespace ::com::sun::star;
 
 namespace sd {
 
-//------------------------------------------------------------------------------
+
 //                          struct ClientBoxEntry
-//------------------------------------------------------------------------------
+
 ClientBoxEntry::ClientBoxEntry( ClientInfo* pClientInfo ) :
     m_bActive( false ),
     m_pClientInfo( pClientInfo )
 {
 }
 
-//------------------------------------------------------------------------------
+
 ClientBoxEntry::~ClientBoxEntry()
 {}
 
 
-//------------------------------------------------------------------------------
+
 // ClientRemovedListener
-//------------------------------------------------------------------------------
+
 void ClientRemovedListener::disposing( lang::EventObject const & rEvt )
     throw ( uno::RuntimeException )
 {
     (void) rEvt;
 }
 
-//------------------------------------------------------------------------------
+
 ClientRemovedListener::~ClientRemovedListener()
 {
 }
 
-//------------------------------------------------------------------------------
+
 // ClientBox
-//------------------------------------------------------------------------------
+
 ClientBox::ClientBox( Window* pParent, WinBits nStyle ) :
     Control( pParent, nStyle ),
     m_bHasScrollBar( false ),
@@ -126,7 +126,7 @@ Size ClientBox::GetOptimalSize() const
     return LogicToPixel(Size(200, 140), MAP_APPFONT);
 }
 
-//------------------------------------------------------------------------------
+
 ClientBox::~ClientBox()
 {
     if ( ! m_bInDelete )
@@ -146,7 +146,7 @@ ClientBox::~ClientBox()
     m_xRemoveListener.clear();
 }
 
-//------------------------------------------------------------------------------
+
 // Title + description
 void ClientBox::CalcActiveHeight( const long nPos )
 {
@@ -179,7 +179,7 @@ void ClientBox::CalcActiveHeight( const long nPos )
     m_nActiveHeight = aTextHeight + 2;
 }
 
-//------------------------------------------------------------------------------
+
 Rectangle ClientBox::GetEntryRect( const long nPos ) const
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -201,7 +201,7 @@ Rectangle ClientBox::GetEntryRect( const long nPos ) const
     return Rectangle( aPos, aSize );
 }
 
-//------------------------------------------------------------------------------
+
 void ClientBox::DeleteRemoved()
 {
     const ::osl::MutexGuard aGuard( m_entriesMutex );
@@ -224,7 +224,7 @@ long ClientBox::GetActiveEntryIndex()
         return -1;
 }
 
-//------------------------------------------------------------------------------
+
 //This function may be called with nPos < 0
 void ClientBox::selectEntry( const long nPos )
 {
@@ -269,7 +269,7 @@ void ClientBox::selectEntry( const long nPos )
     guard.clear();
 }
 
-// -----------------------------------------------------------------------
+
 void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -377,7 +377,7 @@ void ClientBox::DrawRow( const Rectangle& rRect, const TClientBoxEntry pEntry )
     DrawLine( rRect.BottomLeft(), rRect.BottomRight() );
 }
 
-// -----------------------------------------------------------------------
+
 void ClientBox::RecalcAll()
 {
     if ( m_bHasActive )
@@ -428,13 +428,13 @@ void ClientBox::RecalcAll()
     m_bNeedsRecalc = false;
 }
 
-// -----------------------------------------------------------------------
+
 bool ClientBox::HandleTabKey( bool )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode )
 {
     if ( m_vEntries.empty() )
@@ -479,7 +479,7 @@ bool ClientBox::HandleCursorKey( sal_uInt16 nKeyCode )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 void ClientBox::Paint( const Rectangle &/*rPaintRect*/ )
 {
     if ( !m_bInDelete )
@@ -506,7 +506,7 @@ void ClientBox::Paint( const Rectangle &/*rPaintRect*/ )
     }
 }
 
-// -----------------------------------------------------------------------
+
 long ClientBox::GetTotalHeight() const
 {
     long nHeight = m_vEntries.size() * m_nStdHeight;
@@ -519,7 +519,7 @@ long ClientBox::GetTotalHeight() const
     return nHeight;
 }
 
-// -----------------------------------------------------------------------
+
 void ClientBox::SetupScrollBar()
 {
     const Size aSize = GetOutputSizePixel();
@@ -552,13 +552,13 @@ void ClientBox::SetupScrollBar()
     m_bHasScrollBar = bNeedsScrollBar;
 }
 
-// -----------------------------------------------------------------------
+
 void ClientBox::Resize()
 {
     RecalcAll();
 }
 
-//------------------------------------------------------------------------------
+
 long ClientBox::PointToPos( const Point& rPos )
 {
     long nPos = ( rPos.Y() + m_nTopIndex ) / m_nStdHeight;
@@ -579,7 +579,7 @@ OUString ClientBox::getPin()
     return OUString::number( m_aPinBox.GetValue() );
 }
 
-//------------------------------------------------------------------------------
+
 void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
     long nPos = PointToPos( rMEvt.GetPosPixel() );
@@ -593,7 +593,7 @@ void ClientBox::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool ClientBox::Notify( NotifyEvent& rNEvt )
 {
     if ( !m_bInDelete )
@@ -638,7 +638,7 @@ bool ClientBox::Notify( NotifyEvent& rNEvt )
 }
 
 
-//------------------------------------------------------------------------------
+
 long ClientBox::addEntry( ClientInfo* pClientInfo )
 {
     long         nPos = 0;
@@ -700,7 +700,7 @@ long ClientBox::addEntry( ClientInfo* pClientInfo )
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 void ClientBox::DoScroll( long nDelta )
 {
     m_nTopIndex += nDelta;
@@ -713,7 +713,7 @@ void ClientBox::DoScroll( long nDelta )
     m_aScrollBar.SetPosPixel( aNewSBPt );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( ClientBox, ScrollHdl, ScrollBar*, pScrBar )
 {
     DoScroll( pScrBar->GetDelta() );
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index b81471c1c584..2651d367deb0 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -67,13 +67,13 @@ SdDisplay::SdDisplay( Window* pWin, SdResId Id ) :
     SetBackground( Wallpaper( Color( rStyles.GetFieldColor() ) ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SdDisplay::~SdDisplay()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx )
 {
@@ -89,7 +89,7 @@ void SdDisplay::SetBitmapEx( BitmapEx* pBmpEx )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdDisplay::Paint( const Rectangle& )
 {
@@ -107,7 +107,7 @@ void SdDisplay::Paint( const Rectangle& )
     aBitmapEx.Draw( this, aPt, aBmpSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdDisplay::SetScale( const Fraction& rFrac )
 {
@@ -217,7 +217,7 @@ AnimationWindow::AnimationWindow( SfxBindings* pInBindings,
     aBtnRemoveAll.SetAccessibleRelationMemberOf( &aGrpBitmap );
 }
 
-// -----------------------------------------------------------------------
+
 
 AnimationWindow::~AnimationWindow()
 {
@@ -235,7 +235,7 @@ AnimationWindow::~AnimationWindow()
     delete pMyDoc;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl)
 {
@@ -245,7 +245,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickFirstHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl)
 {
@@ -253,7 +253,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickStopHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
 {
@@ -374,7 +374,7 @@ IMPL_LINK( AnimationWindow, ClickPlayHdl, void *, p )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl)
 {
@@ -385,7 +385,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p )
 {
@@ -411,7 +411,7 @@ IMPL_LINK( AnimationWindow, ClickRbtHdl, void *, p )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
 {
@@ -425,7 +425,7 @@ IMPL_LINK( AnimationWindow, ClickGetObjectHdl, void *, pBtn )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
 {
@@ -502,7 +502,7 @@ IMPL_LINK( AnimationWindow, ClickRemoveBitmapHdl, void *, pBtn )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
 {
@@ -514,7 +514,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickCreateGroupHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl)
 {
@@ -532,7 +532,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyBitmapHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
 {
@@ -545,7 +545,7 @@ IMPL_LINK_NOARG(AnimationWindow, ModifyTimeHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::UpdateControl(bool const bDisableCtrls)
 {
@@ -649,7 +649,7 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls)
     ClickRbtHdl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::ResetAttrs()
 {
@@ -661,7 +661,7 @@ void AnimationWindow::ResetAttrs()
     UpdateControl();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime,
                                     SfxProgress* pProgress ) const
@@ -682,7 +682,7 @@ void AnimationWindow::WaitInEffect( sal_uLong nMilliSeconds, sal_uLong nTime,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Fraction AnimationWindow::GetScale()
 {
@@ -709,7 +709,7 @@ Fraction AnimationWindow::GetScale()
     return( aFrac );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::Resize()
 {
@@ -809,7 +809,7 @@ void AnimationWindow::Resize()
     SfxDockingWindow::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AnimationWindow::Close()
 {
@@ -830,14 +830,14 @@ bool AnimationWindow::Close()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::FillInfo( SfxChildWinInfo& rInfo ) const
 {
     SfxDockingWindow::FillInfo( rInfo ) ;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::AddObj (::sd::View& rView )
 {
@@ -1020,7 +1020,7 @@ void AnimationWindow::AddObj (::sd::View& rView )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationWindow::CreateAnimObj (::sd::View& rView )
 {
@@ -1269,7 +1269,7 @@ AnimationControllerItem::AnimationControllerItem(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AnimationControllerItem::StateChanged( sal_uInt16 nSId,
                         SfxItemState eState, const SfxPoolItem* pItem )
diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx
index f6b0988476a7..553553994ee8 100644
--- a/sd/source/ui/dlg/diactrl.cxx
+++ b/sd/source/ui/dlg/diactrl.cxx
@@ -69,13 +69,13 @@ SdPagesField::SdPagesField( Window* pParent,
     Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 SdPagesField::~SdPagesField()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
 {
@@ -92,7 +92,7 @@ void SdPagesField::UpdatePagesField( const SfxUInt16Item* pItem )
         SetText( OUString() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdPagesField::Modify()
 {
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index 05f76fc49d3e..da4dced8eece 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -48,7 +48,7 @@ SdCharDlg::SdCharDlg( Window* pParent, const SfxItemSet* pAttr,
     mnCharPosition =  AddTabPage( "RID_SVXPAGE_CHAR_POSITION", pFact->GetTabPageCreatorFunc( RID_SVXPAGE_CHAR_POSITION ), 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
diff --git a/sd/source/ui/dlg/dlgctrls.cxx b/sd/source/ui/dlg/dlgctrls.cxx
index fd21be04ffd9..84c1d34a0712 100644
--- a/sd/source/ui/dlg/dlgctrls.cxx
+++ b/sd/source/ui/dlg/dlgctrls.cxx
@@ -67,7 +67,7 @@ void FadeEffectLB::Fill()
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void FadeEffectLB::applySelected( SdPage* pSlide ) const
 {
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 24afe3c4c86a..92a785c5cdd5 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -43,9 +43,9 @@
 #include <vcl/graphicfilter.hxx>
 
 
-// --------------------------------------------------------------------
+
 // -----------      SdFileDialog_Imp        ---------------------------
-// --------------------------------------------------------------------
+
 class SdFileDialog_Imp : public sfx2::FileDialogHelper
 {
 private:
@@ -76,7 +76,7 @@ public:
     virtual void SAL_CALL       ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent );
 };
 
-// ------------------------------------------------------------------------
+
 void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent )
 {
     SolarMutexGuard aGuard;
@@ -99,7 +99,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
     }
 }
 
-// ------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
 {
     maUpdateTimer.Stop();
@@ -167,7 +167,7 @@ IMPL_LINK_NOARG(SdFileDialog_Imp, PlayMusicHdl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SdFileDialog_Imp, IsMusicStoppedHdl)
 {
     SolarMutexGuard aGuard;
@@ -224,7 +224,7 @@ void SdFileDialog_Imp::CheckSelectionState()
     }
 }
 
-//-----------------------------------------------------------------------------
+
 SdFileDialog_Imp::SdFileDialog_Imp( const short     nDialogType,
                                     sal_Bool        bUsableSelection    ) :
     FileDialogHelper( nDialogType, 0 ),
@@ -273,14 +273,14 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short     nDialogType,
 }
 
 
-// ------------------------------------------------------------------------
+
 SdFileDialog_Imp::~SdFileDialog_Imp()
 {
     if( mnPlaySoundEvent )
         Application::RemoveUserEvent( mnPlaySoundEvent );
 }
 
-// ------------------------------------------------------------------------
+
 ErrCode SdFileDialog_Imp::Execute()
 {
     // make sure selection checkbox is disabled if
@@ -289,9 +289,9 @@ ErrCode SdFileDialog_Imp::Execute()
     return FileDialogHelper::Execute();
 }
 
-// --------------------------------------------------------------------
+
 // -----------      SdOpenSoundFileDialog       -----------------------
-// --------------------------------------------------------------------
+
 
 // these are simple forwarders
 SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
@@ -323,24 +323,24 @@ SdOpenSoundFileDialog::SdOpenSoundFileDialog() :
 #endif
 }
 
-// ------------------------------------------------------------------------
+
 SdOpenSoundFileDialog::~SdOpenSoundFileDialog()
 {
 }
 
-// ------------------------------------------------------------------------
+
 ErrCode SdOpenSoundFileDialog::Execute()
 {
     return mpImpl->Execute();
 }
 
-// ------------------------------------------------------------------------
+
 OUString SdOpenSoundFileDialog::GetPath() const
 {
     return mpImpl->GetPath();
 }
 
-// ------------------------------------------------------------------------
+
 void SdOpenSoundFileDialog::SetPath( const OUString& rPath )
 {
     mpImpl->SetDisplayDirectory( rPath );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index b499e3f9f7bc..e3efd3676396 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -251,7 +251,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent
     mpNotesHandoutsTabPage->init( maNotesHandoutSettings, false );
 }
 
-// -----------------------------------------------------------------------
+
 
 HeaderFooterDialog::~HeaderFooterDialog()
 {
@@ -259,7 +259,7 @@ HeaderFooterDialog::~HeaderFooterDialog()
     delete mpNotesHandoutsTabPage;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 {
@@ -272,14 +272,14 @@ IMPL_LINK( HeaderFooterDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(HeaderFooterDialog, DeactivatePageHdl)
 {
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl)
 {
@@ -287,7 +287,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyToAllHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl)
 {
@@ -295,7 +295,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickApplyHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl)
 {
@@ -303,7 +303,7 @@ IMPL_LINK_NOARG(HeaderFooterDialog, ClickCancelHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 short HeaderFooterDialog::Execute()
 {
@@ -313,7 +313,7 @@ short HeaderFooterDialog::Execute()
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterDialog::ApplyToAll()
 {
@@ -322,7 +322,7 @@ void HeaderFooterDialog::ApplyToAll()
     EndDialog(1);
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterDialog::Apply()
 {
@@ -331,14 +331,14 @@ void HeaderFooterDialog::Apply()
     EndDialog(1);
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterDialog::Cancel()
 {
     EndDialog();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
 {
@@ -418,7 +418,7 @@ void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
     mpViewShell->GetViewFrame()->GetObjectShell()->GetUndoManager()->AddUndoAction(pUndoGroup);
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterDialog::change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings )
 {
@@ -489,13 +489,13 @@ HeaderFooterTabPage::HeaderFooterTabPage( HeaderFooterDialog* pDialog, ::Window*
 
     FillFormatList(SVXDATEFORMAT_A);
 }
-// -----------------------------------------------------------------------
+
 
 HeaderFooterTabPage::~HeaderFooterTabPage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl)
 {
@@ -505,7 +505,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, LanguageChangeHdl)
     return 0L;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterTabPage::FillFormatList( int eFormat )
 {
@@ -532,7 +532,7 @@ void HeaderFooterTabPage::FillFormatList( int eFormat )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNotOnTitle )
 {
@@ -568,7 +568,7 @@ void HeaderFooterTabPage::init( const HeaderFooterSettings& rSettings, bool bNot
     update();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOnTitle )
 {
@@ -591,7 +591,7 @@ void HeaderFooterTabPage::getData( HeaderFooterSettings& rSettings, bool& rNotOn
     rNotOnTitle = mpCBNotOnTitle->IsChecked();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterTabPage::update()
 {
@@ -612,7 +612,7 @@ void HeaderFooterTabPage::update()
     mpCTPreview->update( aSettings );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl)
 {
@@ -621,7 +621,7 @@ IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet )
 {
@@ -654,7 +654,7 @@ void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, boo
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderFooterTabPage::GetOrSetDateTimeLanguage( LanguageType &rLanguage, bool bSet, SdPage* pPage )
 {
@@ -739,7 +739,7 @@ PresLayoutPreview::PresLayoutPreview( ::Window* pParent )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makePresLayoutPreview( ::Window *pParent, VclBuilder::stringmap & )
 {
@@ -755,7 +755,7 @@ Size PresLayoutPreview::GetOptimalSize() const
     return LogicToPixel(Size(80, 80), MAP_APPFONT);
 }
 
-// -----------------------------------------------------------------------
+
 
 void PresLayoutPreview::init( SdPage *pMaster )
 {
@@ -769,7 +769,7 @@ void PresLayoutPreview::update( HeaderFooterSettings& rSettings )
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisible, bool bDotted /* = false*/ )
 {
@@ -816,7 +816,7 @@ void PresLayoutPreview::Paint( OutputDevice& aOut, SdrTextObj* pObj, bool bVisib
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PresLayoutPreview::Paint( const Rectangle& )
 {
diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx
index af3a252f66ef..b0b5b4928d1e 100644
--- a/sd/source/ui/dlg/morphdlg.cxx
+++ b/sd/source/ui/dlg/morphdlg.cxx
@@ -89,7 +89,7 @@ void MorphDlg::LoadSettings()
     m_pCbxAttributes->Check( bAttrib );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MorphDlg::SaveSettings() const
 {
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 71781cbe8425..66a3ca0aa9f9 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -150,7 +150,7 @@ SdNavigatorWin::SdNavigatorWin(
         rUpdateRequest();
 }
 
-// -----------------------------------------------------------------------
+
 
 SdNavigatorWin::~SdNavigatorWin()
 {
@@ -158,7 +158,7 @@ SdNavigatorWin::~SdNavigatorWin()
     delete mpPageNameCtrlItem;
 }
 
-// -----------------------------------------------------------------------
+
 
 //when object is marked , fresh the corresponding entry tree .
 void SdNavigatorWin::FreshTree( const SdDrawDocument* pDoc )
@@ -304,7 +304,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectToolboxHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl)
@@ -312,7 +312,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickToolboxHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
 {
@@ -390,7 +390,7 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
 {
@@ -428,7 +428,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, ClickObjectHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl)
 {
@@ -559,7 +559,7 @@ IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, Menu *, pMenu )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdNavigatorWin::Resize()
 {
@@ -598,7 +598,7 @@ void SdNavigatorWin::Resize()
     Window::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SdNavigatorWin::InsertFile(const OUString& rFileName)
 {
@@ -675,7 +675,7 @@ bool SdNavigatorWin::InsertFile(const OUString& rFileName)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
 {
@@ -744,7 +744,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
     maLbDocs.SelectEntryPos( nPos );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool bImage )
 {
@@ -763,7 +763,7 @@ sal_uInt16 SdNavigatorWin::GetDragTypeSdResId( NavigatorDragType eDT, sal_Bool b
     return( 0 );
 }
 
-//------------------------------------------------------------------------
+
 
 NavDocInfo* SdNavigatorWin::GetDocInfo()
 {
@@ -889,7 +889,7 @@ SdNavigatorControllerItem::SdNavigatorControllerItem(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdNavigatorControllerItem::StateChanged( sal_uInt16 nSId,
                         SfxItemState eState, const SfxPoolItem* pItem )
@@ -974,7 +974,7 @@ SdPageNameControllerItem::SdPageNameControllerItem(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
                         SfxItemState eState, const SfxPoolItem* pItem )
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index d83df4d4ed77..d0c8c2a84432 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -221,14 +221,14 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
     nHatchingListState = CT_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg()
 {
     delete pOutSet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdPresLayoutTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
@@ -299,8 +299,8 @@ const SfxItemSet* SdPresLayoutTemplateDlg::GetOutputItemSet() const
         return SfxTabDialog::GetOutputItemSet();
 }
 
-// ---------------------------------------------------------------------
-// ---------------------------------------------------------------------
+
+
 sal_uInt16 SdPresLayoutTemplateDlg::GetOutlineLevel() const
 {
     switch( ePO )
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 2e999f64d373..f9cec00e5f76 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -72,13 +72,13 @@ SdPrintOptions::SdPrintOptions( Window* pParent, const SfxItemSet& rInAttrs ) :
     m_pCbxBack->SetAccessibleRelationLabeledBy( m_pRbtBooklet );
 }
 
-// -----------------------------------------------------------------------
+
 
 SdPrintOptions::~SdPrintOptions()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -131,7 +131,7 @@ sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs )
     return( sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdPrintOptions::Reset( const SfxItemSet& rAttrs )
 {
@@ -188,7 +188,7 @@ void SdPrintOptions::Reset( const SfxItemSet& rAttrs )
     ClickBookletHdl( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SdPrintOptions::Create( Window* pWindow,
                 const SfxItemSet& rOutAttrs )
@@ -196,7 +196,7 @@ SfxTabPage* SdPrintOptions::Create( Window* pWindow,
     return( new SdPrintOptions( pWindow, rOutAttrs ) );
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx )
 {
@@ -208,7 +208,7 @@ IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, CheckBox *, pCbx )
     return 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl)
 {
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 1c1ffb06ea14..7dd1477c935a 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -82,9 +82,9 @@ sal_Bool SdPageObjsTLB::IsInDrag()
 
 sal_uInt32 SdPageObjsTLB::SdPageObjsTransferable::mnListBoxDropFormatId = SAL_MAX_UINT32;
 
-// -----------------------------------------
+
 // - SdPageObjsTLB::SdPageObjsTransferable -
-// -----------------------------------------
+
 
 SdPageObjsTLB::SdPageObjsTransferable::SdPageObjsTransferable(
     SdPageObjsTLB& rParent,
@@ -114,7 +114,7 @@ SdPageObjsTLB::SdPageObjsTransferable::~SdPageObjsTransferable()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
 {
@@ -123,7 +123,7 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats()
     AddFormat(GetListBoxDropFormatId());
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
 {
@@ -143,7 +143,7 @@ sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star:
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
 {
@@ -151,21 +151,21 @@ void SdPageObjsTLB::SdPageObjsTransferable::DragFinished( sal_Int8 nDropAction )
     SdTransferable::DragFinished(nDropAction);
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::sd::DrawDocShell& SdPageObjsTLB::SdPageObjsTransferable::GetDocShell() const
 {
     return mrDocShell;
 }
 
-// -----------------------------------------------------------------------------
+
 
 NavigatorDragType SdPageObjsTLB::SdPageObjsTransferable::GetDragType() const
 {
     return meDragType;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL SdPageObjsTLB::SdPageObjsTransferable::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException )
 {
@@ -192,7 +192,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 >& SdPageObjsTLB::SdPageObjsTran
     return theSdPageObjsTLBUnoTunnelId::get().getSeq();
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdPageObjsTLB::SdPageObjsTransferable* SdPageObjsTLB::SdPageObjsTransferable::getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData )
     throw()
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index 70782416ea29..1cd52db0578b 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -108,7 +108,7 @@ SdTabTemplateDlg::SdTabTemplateDlg( Window* pParent,
     nHatchingListState = CT_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
@@ -175,7 +175,7 @@ void SdTabTemplateDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxItemSet* SdTabTemplateDlg::GetRefreshedSet()
 {
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 919b9db24d0f..602fc58b7e6a 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -140,13 +140,13 @@ SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet& rInAttrs)
     ClickActionHdl( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SdTPAction::~SdTPAction()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTPAction::SetView( const ::sd::View* pSdView )
 {
@@ -171,7 +171,7 @@ void SdTPAction::SetView( const ::sd::View* pSdView )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTPAction::Construct()
 {
@@ -263,7 +263,7 @@ void SdTPAction::Construct()
 
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -308,7 +308,7 @@ sal_Bool SdTPAction::FillItemSet( SfxItemSet& rAttrs )
     return( bModified );
 }
 
-//------------------------------------------------------------------------
+
 
 void SdTPAction::Reset( const SfxItemSet& rAttrs )
 {
@@ -357,13 +357,13 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs )
     m_pEdtSound->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTPAction::ActivatePage( const SfxItemSet& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 int SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
 {
@@ -373,7 +373,7 @@ int SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SdTPAction::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
@@ -381,7 +381,7 @@ SfxTabPage* SdTPAction::Create( Window* pWindow,
     return( new SdTPAction( pWindow, rAttrs ) );
 }
 
-//------------------------------------------------------------------------
+
 
 void SdTPAction::UpdateTree()
 {
@@ -393,7 +393,7 @@ void SdTPAction::UpdateTree()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SdTPAction::OpenFileDialog()
 {
@@ -474,7 +474,7 @@ void SdTPAction::OpenFileDialog()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl)
 {
@@ -483,7 +483,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickSearchHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
 {
@@ -660,7 +660,7 @@ IMPL_LINK_NOARG(SdTPAction, ClickActionHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl)
 {
@@ -668,7 +668,7 @@ IMPL_LINK_NOARG(SdTPAction, SelectTreeHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
 {
@@ -718,7 +718,7 @@ IMPL_LINK_NOARG(SdTPAction, CheckFileHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 presentation::ClickAction SdTPAction::GetActualClickAction()
 {
@@ -730,7 +730,7 @@ presentation::ClickAction SdTPAction::GetActualClickAction()
     return( eCA );
 }
 
-//------------------------------------------------------------------------
+
 
 void SdTPAction::SetActualClickAction( presentation::ClickAction eCA )
 {
@@ -741,7 +741,7 @@ void SdTPAction::SetActualClickAction( presentation::ClickAction eCA )
         m_pLbAction->SelectEntryPos( pIter-maCurrentActions.begin() );
 }
 
-//------------------------------------------------------------------------
+
 
 void SdTPAction::SetEditText( OUString const & rStr )
 {
@@ -804,7 +804,7 @@ void SdTPAction::SetEditText( OUString const & rStr )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination )
 {
@@ -871,7 +871,7 @@ OUString SdTPAction::GetEditText( sal_Bool bFullDocDestination )
     return( aStr );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SdTPAction::GetClickActionSdResId( presentation::ClickAction eCA )
 {
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 22097b8063aa..afd3547087a3 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -52,13 +52,13 @@ SdTpOptionsSnap::SdTpOptionsSnap( Window* pParent, const SfxItemSet& rInAttrs  )
     pSnapFrames->Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 SdTpOptionsSnap::~SdTpOptionsSnap()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -83,7 +83,7 @@ sal_Bool SdTpOptionsSnap::FillItemSet( SfxItemSet& rAttrs )
     return( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs )
 {
@@ -106,7 +106,7 @@ void SdTpOptionsSnap::Reset( const SfxItemSet& rAttrs )
     pCbxRotate->GetClickHdl().Call(0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
@@ -129,13 +129,13 @@ SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rIn
     get( m_pCbxMoveOutline, "moveoutline");
 }
 
-// -----------------------------------------------------------------------
+
 
 SdTpOptionsContents::~SdTpOptionsContents()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -159,7 +159,7 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs )
     return( bModified );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs )
 {
@@ -180,7 +180,7 @@ void SdTpOptionsContents::Reset( const SfxItemSet& rAttrs )
     m_pCbxHandlesBezier->SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SdTpOptionsContents::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
@@ -289,12 +289,12 @@ SdTpOptionsMisc::SdTpOptionsMisc( Window* pParent, const SfxItemSet& rInAttrs  )
         m_pCbScale->InsertEntry( GetScale(  aTable[i], 1 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SdTpOptionsMisc::~SdTpOptionsMisc()
 {
 }
-// -----------------------------------------------------------------------
+
 void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
 {
     // We have to call SaveValue again since it can happen that the value
@@ -339,7 +339,7 @@ void SdTpOptionsMisc::ActivatePage( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
 {
@@ -363,7 +363,7 @@ int SdTpOptionsMisc::DeactivatePage( SfxItemSet* pActiveSet )
     return( LEAVE_PAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
 {
@@ -432,7 +432,7 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs )
     return( bModified );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
 {
@@ -512,14 +512,14 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
     UpdateCompatibilityControls ();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow,
                 const SfxItemSet& rAttrs )
 {
     return( new SdTpOptionsMisc( pWindow, rAttrs ) );
 }
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl)
 {
@@ -569,14 +569,14 @@ void    SdTpOptionsMisc::SetDrawMode()
     m_pCbxUsePrinterMetrics->SetPosPixel (m_pCbxCompatibility->GetPosPixel());
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SdTpOptionsMisc::GetScale( sal_Int32 nX, sal_Int32 nY )
 {
     return OUString::number(nX) + OUString(TOKEN) + OUString::number(nY);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SdTpOptionsMisc::SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY )
 {
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index a4c08409ae82..1deda09f7243 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -304,7 +304,7 @@ void SAL_CALL Configuration::setName (const OUString& rsName)
 
 
 
-// ----------------------------------------------------------------------------
+
 
 void Configuration::PostEvent (
     const Reference<XResourceId>& rxResourceId,
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 6d1f70825950..ac4eb3a44d57 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -627,7 +627,7 @@ void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArgumen
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void ConfigurationController::ThrowIfDisposed (void) const
     throw (::com::sun::star::lang::DisposedException)
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 330951f722e6..49519d379acf 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -482,7 +482,7 @@ void SAL_CALL ResourceId::initialize (const Sequence<Any>& aArguments)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 /** When eMode is DIRECTLY then the anchor of the called object and the
     anchor represented by the given sequence of anchor URLs have to be
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 904c257650ca..ed51255f8437 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -413,7 +413,7 @@ void SAL_CALL BasicPaneFactory::disposing (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 Reference<XResource> BasicPaneFactory::CreateFrameWindowPane (
     const Reference<XResourceId>& rxPaneId)
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index abe7232bbf26..4b3e61d960a8 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -201,7 +201,7 @@ void SAL_CALL FullScreenPane::setAccessible (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent*, pEvent)
 {
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index 42cb84cfc84d..523b3cf0a7ff 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -221,7 +221,7 @@ sal_Int64 SAL_CALL Pane::getSomething (const Sequence<sal_Int8>& rId)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 Reference<rendering::XCanvas> Pane::CreateCanvas (void)
     throw (RuntimeException)
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index ce7b026ff834..51103b1b1fb9 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -232,7 +232,7 @@ void SAL_CALL PresentationFactory::disposing (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void PresentationFactory::ThrowIfDisposed (void) const
     throw (lang::DisposedException)
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index c731435182cb..97256c8e704b 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -147,7 +147,7 @@ void SAL_CALL ToolBarModule::notifyConfigurationChange (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 
 void ToolBarModule::HandleUpdateStart (void)
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index dffa7092cdb4..95300a078bc3 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -313,7 +313,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
 {
@@ -409,7 +409,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
     return (bOK);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
 {
@@ -548,7 +548,7 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
     delete pDlg;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
 {
@@ -684,7 +684,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
     delete pOutliner;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
 {
@@ -730,7 +730,7 @@ sal_Bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
         return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void FuInsertFile::GetSupportedFilterVector( ::std::vector< OUString >& rFilterVector )
 {
diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx
index f2882c9bab24..e5cbc4f0d2e8 100644
--- a/sd/source/ui/func/smarttag.cxx
+++ b/sd/source/ui/func/smarttag.cxx
@@ -36,13 +36,13 @@ SmartTag::SmartTag( ::sd::View& rView )
     mrView.getSmartTags().add( xThis );
 }
 
-// --------------------------------------------------------------------
+
 
 SmartTag::~SmartTag()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartTag::MouseButtonDown( const MouseEvent&, SmartHdl&  )
 {
@@ -67,34 +67,34 @@ bool SmartTag::Command( const CommandEvent& /*rCEvt*/ )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTag::addCustomHandles( SdrHdlList& /*rHandlerList*/ )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTag::select()
 {
     mbSelected = true;
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTag::deselect()
 {
     mbSelected = false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartTag::isSelected() const
 {
     return mbSelected;
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTag::disposing()
 {
@@ -102,42 +102,42 @@ void SmartTag::disposing()
     mrView.getSmartTags().remove( xThis );
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartTag::getContext( SdrViewContext& /*rContext*/ )
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong SmartTag::GetMarkablePointCount() const
 {
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong SmartTag::GetMarkedPointCount() const
 {
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTag::MarkPoint(SdrHdl& /*rHdl*/, sal_Bool /*bUnmark*/ )
 {
     return sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTag::MarkPoints(const Rectangle* /*pRect*/, sal_Bool /*bUnmark*/ )
 {
     return sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTag::CheckPossibilities()
 {
@@ -150,13 +150,13 @@ SmartTagSet::SmartTagSet( View& rView )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 SmartTagSet::~SmartTagSet()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::add( const SmartTagReference& xTag )
 {
@@ -170,7 +170,7 @@ void SmartTagSet::add( const SmartTagReference& xTag )
         mxSelectedTag.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::remove( const SmartTagReference& xTag )
 {
@@ -186,7 +186,7 @@ void SmartTagSet::remove( const SmartTagReference& xTag )
         mxSelectedTag.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::Dispose()
 {
@@ -199,7 +199,7 @@ void SmartTagSet::Dispose()
     mxSelectedTag.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::select( const SmartTagReference& xTag )
 {
@@ -218,7 +218,7 @@ void SmartTagSet::select( const SmartTagReference& xTag )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::deselect()
 {
@@ -231,7 +231,7 @@ void SmartTagSet::deselect()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -257,7 +257,7 @@ bool SmartTagSet::MouseButtonDown( const MouseEvent& rMEvt )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartTagSet::KeyInput( const KeyEvent& rKEvt )
 {
@@ -279,7 +279,7 @@ bool SmartTagSet::KeyInput( const KeyEvent& rKEvt )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -300,7 +300,7 @@ bool SmartTagSet::RequestHelp( const HelpEvent& rHEvt )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the SmartTag consumes this event. */
 bool SmartTagSet::Command( const CommandEvent& rCEvt )
@@ -331,7 +331,7 @@ bool SmartTagSet::Command( const CommandEvent& rCEvt )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::addCustomHandles( SdrHdlList& rHandlerList )
 {
@@ -342,7 +342,7 @@ void SmartTagSet::addCustomHandles( SdrHdlList& rHandlerList )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the currently selected smart tag has
     a special context, returned in rContext. */
@@ -354,16 +354,16 @@ bool SmartTagSet::getContext( SdrViewContext& rContext ) const
         return false;
 }
 
-// --------------------------------------------------------------------
+
 // support point editing
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTagSet::HasMarkablePoints() const
 {
     return GetMarkablePointCount() != 0 ? sal_True : sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong SmartTagSet::GetMarkablePointCount() const
 {
@@ -372,14 +372,14 @@ sal_uLong SmartTagSet::GetMarkablePointCount() const
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTagSet::HasMarkedPoints() const
 {
     return GetMarkedPointCount() != 0 ? sal_True : sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uLong SmartTagSet::GetMarkedPointCount() const
 {
@@ -389,7 +389,7 @@ sal_uLong SmartTagSet::GetMarkedPointCount() const
         return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const
 {
@@ -398,7 +398,7 @@ sal_Bool SmartTagSet::IsPointMarkable(const SdrHdl& rHdl) const
     return pSmartHdl && pSmartHdl->isMarkable();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
 {
@@ -408,7 +408,7 @@ sal_Bool SmartTagSet::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark )
     return sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
 {
@@ -417,7 +417,7 @@ sal_Bool SmartTagSet::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
     return sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 void SmartTagSet::CheckPossibilities()
 {
@@ -434,7 +434,7 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, SdrObject* pObject, const Poi
     SetObj( pObject );
 }
 
-// --------------------------------------------------------------------
+
 
 SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind eNewKind /*=HDL_MOVE*/ )
 : SdrHdl( rPnt, eNewKind )
@@ -442,7 +442,7 @@ SmartHdl::SmartHdl( const SmartTagReference& xTag, const Point& rPnt, SdrHdlKind
 {
 }
 
-// --------------------------------------------------------------------
+
 
 bool SmartHdl::isMarkable() const
 {
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index 8b821cbe8780..b6436608f664 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -26,7 +26,7 @@
 
 TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction );
 
-// -----------------------------------------------------------------------------
+
 
 SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
     SdDrawDocument& rDoc,
@@ -40,14 +40,14 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
     SetComment( aString );
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction()
 {
     delete mpItemSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj()
 {
@@ -61,21 +61,21 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj()
     mrPage.ActionChanged();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdBackgroundObjUndoAction::Undo()
 {
     ImplRestoreBackgroundObj();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdBackgroundObjUndoAction::Redo()
 {
     ImplRestoreBackgroundObj();
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdUndoAction* SdBackgroundObjUndoAction::Clone() const
 {
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx
index 415c339026ec..1fb36b0a7f1a 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -810,7 +810,7 @@ Reference<rendering::XBitmap> SAL_CALL PresenterCanvas::getScaledBitmap(
 
 
 
-//-----------------------------------------------------------------------------
+
 
 rendering::ViewState PresenterCanvas::MergeViewState (
     const rendering::ViewState& rViewState)
@@ -1180,7 +1180,7 @@ Reference<rendering::XCanvas> PresenterCustomSprite::getContentCanvas (void)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterCustomSprite::ThrowIfDisposed (void)
     throw (css::lang::DisposedException)
diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx
index 162ca5539a38..f1ae9f7994c8 100644
--- a/sd/source/ui/presenter/PresenterPreviewCache.cxx
+++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx
@@ -253,7 +253,7 @@ void SAL_CALL PresenterPreviewCache::resume (void)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterPreviewCache::ThrowIfDisposed (void)
     throw (::com::sun::star::lang::DisposedException)
@@ -453,7 +453,7 @@ Reference<XInterface> PresenterPreviewCache::PresenterCacheContext::GetModel (vo
 
 
 
-//-----------------------------------------------------------------------------
+
 
 const SdrPage* PresenterPreviewCache::PresenterCacheContext::GetPage (
     const sal_Int32 nSlideIndex) const
diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx
index a8be21fed460..4f3b069f2bee 100644
--- a/sd/source/ui/presenter/PresenterTextView.cxx
+++ b/sd/source/ui/presenter/PresenterTextView.cxx
@@ -189,7 +189,7 @@ void SAL_CALL PresenterTextView::initialize (const Sequence<Any>& rArguments)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 Any PresenterTextView::GetPropertyValue (const OUString& rsPropertyName)
 {
diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx
index bb3e3f528c63..938dbe36bc6c 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -170,7 +170,7 @@ awt::Size SAL_CALL SlideRenderer::calculatePreviewSize (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 BitmapEx SlideRenderer::CreatePreview (
     const Reference<drawing::XDrawPage>& rxSlide,
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index 2093c96a27e7..006919aae283 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -289,7 +289,7 @@ void ShowWindow::GetFocus()
     Window::GetFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::LoseFocus()
 {
@@ -299,21 +299,21 @@ void ShowWindow::LoseFocus()
         TerminateShow();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::Resize()
 {
     ::sd::Window::Resize();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::Move()
 {
     ::sd::Window::Move();
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ShowWindow::SetEndMode()
 {
@@ -336,7 +336,7 @@ bool ShowWindow::SetEndMode()
     return( SHOWWINDOWMODE_END == meShowWindowMode );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo )
 {
@@ -376,7 +376,7 @@ bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout
     return( SHOWWINDOWMODE_PAUSE == meShowWindowMode );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor )
 {
@@ -400,14 +400,14 @@ bool ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan
     return( SHOWWINDOWMODE_BLANK == meShowWindowMode );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::SetPreviewMode()
 {
     meShowWindowMode = SHOWWINDOWMODE_PREVIEW;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::TerminateShow()
 {
@@ -435,14 +435,14 @@ void ShowWindow::TerminateShow()
     mnRestartPageIndex = PAGE_NO_END;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::RestartShow()
 {
     RestartShow( mnRestartPageIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart )
 
@@ -486,7 +486,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
 {
@@ -561,7 +561,7 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::DrawEndScene()
 {
@@ -581,14 +581,14 @@ void ShowWindow::DrawEndScene()
     SetFont( aOldFont );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ShowWindow::DrawBlankScene()
 {
     // just blank through background color => nothing to be done here
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( ShowWindow, PauseTimeoutHdl, Timer*, pTimer )
 {
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 6795f92e8fb4..8f3f757bb182 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -102,7 +102,7 @@ namespace {
 
 
 //////////////////////////////////////////////////////////////////////////////
-// --------------------------------------------------------------------
+
 
 const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
 {
@@ -130,9 +130,9 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
     return aPresentationPropertyMap_Impl;
 }
 
-// --------------------------------------------------------------------
+
 // class SlideShow
-// --------------------------------------------------------------------
+
 
 SlideShow::SlideShow( SdDrawDocument* pDoc )
 : SlideshowBase( m_aMutex )
@@ -146,7 +146,7 @@ SlideShow::SlideShow( SdDrawDocument* pDoc )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SlideShow::ThrowIfDisposed() throw (RuntimeException)
 {
@@ -154,7 +154,7 @@ void SlideShow::ThrowIfDisposed() throw (RuntimeException)
         throw DisposedException();
 }
 
-// --------------------------------------------------------------------
+
 
 /// used by the model to create a slideshow for it
 rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc )
@@ -162,7 +162,7 @@ rtl::Reference< SlideShow > SlideShow::Create( SdDrawDocument* pDoc )
     return new SlideShow( pDoc );
 }
 
-// --------------------------------------------------------------------
+
 
 rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument )
 {
@@ -174,7 +174,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument* pDocument )
     return xRet;
 }
 
-// --------------------------------------------------------------------
+
 
 rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument )
 {
@@ -182,14 +182,14 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( SdDrawDocument& rDocument )
         dynamic_cast< SlideShow* >( rDocument.getPresentation().get() ) );
 }
 
-// --------------------------------------------------------------------
+
 
 rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase )
 {
     return GetSlideShow( rBase.GetDocument() );
 }
 
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::presentation::XSlideShowController > SlideShow::GetSlideShowController(ViewShellBase& rBase )
 {
@@ -202,7 +202,7 @@ rtl::Reference< SlideShow > SlideShow::GetSlideShow( ViewShellBase& rBase )
     return xRet;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SlideShow::StartPreview( ViewShellBase& rBase,
     const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage,
@@ -216,7 +216,7 @@ bool SlideShow::StartPreview( ViewShellBase& rBase,
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void SlideShow::Stop( ViewShellBase& rBase )
 {
@@ -225,7 +225,7 @@ void SlideShow::Stop( ViewShellBase& rBase )
         xSlideShow->end();
 }
 
-// --------------------------------------------------------------------
+
 
 bool SlideShow::IsRunning( ViewShellBase& rBase )
 {
@@ -233,7 +233,7 @@ bool SlideShow::IsRunning( ViewShellBase& rBase )
     return xSlideShow.is() && xSlideShow->isRunning();
 }
 
-// --------------------------------------------------------------------
+
 
 bool SlideShow::IsRunning( ViewShell& rViewShell )
 {
@@ -241,7 +241,7 @@ bool SlideShow::IsRunning( ViewShell& rViewShell )
     return xSlideShow.is() && xSlideShow->isRunning() && (xSlideShow->mxController->getViewShell() == &rViewShell);
 }
 
-// --------------------------------------------------------------------
+
 
 void SlideShow::CreateController(  ViewShell* pViewSh, ::sd::View* pView, ::Window* pParentWindow )
 {
@@ -561,7 +561,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
         mpDoc->SetChanged( true );
 }
 
-// --------------------------------------------------------------------
+
 
 Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -629,33 +629,33 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::addPropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::removePropertyChangeListener( const OUString& , const Reference< XPropertyChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::addVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::removeVetoableChangeListener( const OUString& , const Reference< XVetoableChangeListener >&  ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 // XPresentation
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::start() throw(RuntimeException)
 {
@@ -663,7 +663,7 @@ void SAL_CALL SlideShow::start() throw(RuntimeException)
     startWithArguments( aArguments );
 }
 
-// --------------------------------------------------------------------
+
 
 WorkWindow *SlideShow::GetWorkWindow()
 {
@@ -820,7 +820,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException)
 {
@@ -830,9 +830,9 @@ void SAL_CALL SlideShow::rehearseTimings() throw(RuntimeException)
     startWithArguments( aArguments );
 }
 
-// --------------------------------------------------------------------
+
 // XPresentation2
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rArguments ) throw (RuntimeException)
 {
@@ -895,7 +895,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA
 
 }
 
-// --------------------------------------------------------------------
+
 
 ::sal_Bool SAL_CALL SlideShow::isRunning(  ) throw (RuntimeException)
 {
@@ -903,7 +903,7 @@ void SAL_CALL SlideShow::startWithArguments( const Sequence< PropertyValue >& rA
     return mxController.is() && mxController->isRunning();
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XSlideShowController > SAL_CALL SlideShow::getController(  ) throw (RuntimeException)
 {
@@ -913,9 +913,9 @@ Reference< XSlideShowController > SAL_CALL SlideShow::getController(  ) throw (R
     return xController;
 }
 
-// --------------------------------------------------------------------
+
 // XComponent
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideShow::disposing (void)
 {
@@ -938,7 +938,7 @@ void SAL_CALL SlideShow::disposing (void)
     mpDoc = 0;
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Reference< XAnimationNode >& xAnimationNode, ::Window* pParent )
 {
@@ -965,21 +965,21 @@ bool SlideShow::startPreview( const Reference< XDrawPage >& xDrawPage, const Ref
     return true;
 }
 
-// ---------------------------------------------------------
+
 
 ShowWindow* SlideShow::getShowWindow()
 {
     return mxController.is() ? mxController->mpShowWindow : 0;
 }
 
-// ---------------------------------------------------------
+
 
 int SlideShow::getAnimationMode()
 {
     return mxController.is() ? mxController->meAnimationMode : ANIMATIONMODE_SHOW;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex )
 {
@@ -987,7 +987,7 @@ void SlideShow::jumpToPageIndex( sal_Int32 nPageIndex )
         mxController->displaySlideIndex( nPageIndex );
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber )
 {
@@ -995,14 +995,14 @@ void SlideShow::jumpToPageNumber( sal_Int32 nPageNumber )
         mxController->displaySlideNumber( nPageNumber );
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideShow::getCurrentPageNumber()
 {
     return mxController.is() ? mxController->getCurrentSlideNumber() : 0;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::jumpToBookmark( const OUString& sBookmark )
 {
@@ -1010,14 +1010,14 @@ void SlideShow::jumpToBookmark( const OUString& sBookmark )
         mxController->jumpToBookmark( sBookmark );
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::isFullScreen()
 {
     return mxController.is() ? mxController->maPresSettings.mbFullScreen : false;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::resize( const Size &rSize )
 {
@@ -1025,7 +1025,7 @@ void SlideShow::resize( const Size &rSize )
         mxController->resize( rSize );
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::activate( ViewShellBase& rBase )
 {
@@ -1058,21 +1058,21 @@ void SlideShow::activate( ViewShellBase& rBase )
 
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::deactivate( ViewShellBase& /*rBase*/ )
 {
     mxController->deactivate();
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::keyInput(const KeyEvent& rKEvt)
 {
     return mxController.is() ? mxController->keyInput(rKEvt) : false;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::paint( const Rectangle& rRect )
 {
@@ -1080,14 +1080,14 @@ void SlideShow::paint( const Rectangle& rRect )
         mxController->paint( rRect );
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::isAlwaysOnTop()
 {
     return mxController.is() ? mxController->maPresSettings.mbAlwaysOnTop : false;
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::pause( bool bPause )
 {
@@ -1101,7 +1101,7 @@ bool SlideShow::pause( bool bPause )
     return true;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::receiveRequest(SfxRequest& rReq)
 {
@@ -1109,35 +1109,35 @@ void SlideShow::receiveRequest(SfxRequest& rReq)
         mxController->receiveRequest( rReq );
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideShow::getFirstPageNumber()
 {
     return mxController.is() ? mxController->getFirstSlideNumber() : 0;
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideShow::getLastPageNumber()
 {
     return mxController.is() ? mxController->getLastSlideNumber() : 0;
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::isEndless()
 {
     return mxController.is() ? mxController->isEndless() : false;
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideShow::isDrawingPossible()
 {
     return mxController.is() ? mxController->getUsePen() : false;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::StartInPlacePresentationConfigurationCallback()
 {
@@ -1147,7 +1147,7 @@ void SlideShow::StartInPlacePresentationConfigurationCallback()
     mnInPlaceConfigEvent = Application::PostUserEvent( LINK( this, SlideShow, StartInPlacePresentationConfigurationHdl ) );
 }
 
-// ---------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl)
 {
@@ -1156,7 +1156,7 @@ IMPL_LINK_NOARG(SlideShow, StartInPlacePresentationConfigurationHdl)
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::StartInPlacePresentation()
 {
@@ -1227,7 +1227,7 @@ void SlideShow::StartInPlacePresentation()
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShow::StartFullscreenPresentation( )
 {
@@ -1274,7 +1274,7 @@ void SlideShow::StartFullscreenPresentation( )
     }
 }
 
-// ---------------------------------------------------------
+
 
 /// convert configuration setting display concept to real screens
 sal_Int32 SlideShow::GetDisplay()
@@ -1297,7 +1297,7 @@ sal_Int32 SlideShow::GetDisplay()
     return nDisplay;
 }
 
-// ---------------------------------------------------------
+
 
 
 bool SlideShow::dependsOn( ViewShellBase* pViewShellBase )
@@ -1305,13 +1305,13 @@ bool SlideShow::dependsOn( ViewShellBase* pViewShellBase )
     return mxController.is() && (pViewShellBase == mpCurrentViewShellBase) && mpFullScreenViewShellBase;
 }
 
-// ---------------------------------------------------------
+
 
 Reference< presentation::XPresentation2 > CreatePresentation( const SdDrawDocument& rDocument )
 {
     return Reference< presentation::XPresentation2 >( SlideShow::Create( const_cast< SdDrawDocument* >( &rDocument ) ).get() );
 }
 
-// ---------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index d04c43228261..eee338483171 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -915,7 +915,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
             mbRehearseTimings = pPresSettings->mbRehearseTimings;
         }
 
-        // ---
+
 
         OUString  aPresSlide( maPresSettings.maPresPage );
         SdPage* pStartPage = mpViewShell->GetActualPage();
@@ -1229,7 +1229,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException)
 {
@@ -1237,7 +1237,7 @@ void SAL_CALL SlideshowImpl::addSlideShowListener( const Reference< XSlideShowLi
         mxListenerProxy->addSlideShowListener( xListener );
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideShowListener >& xListener ) throw (RuntimeException)
 {
@@ -1245,7 +1245,7 @@ void SAL_CALL SlideshowImpl::removeSlideShowListener( const Reference< XSlideSho
         mxListenerProxy->removeSlideShowListener( xListener );
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::slideEnded(const bool bReverse)
 {
@@ -1255,7 +1255,7 @@ void SlideshowImpl::slideEnded(const bool bReverse)
         gotoNextSlide();
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::removeShapeEvents()
 {
@@ -1283,7 +1283,7 @@ void SlideshowImpl::removeShapeEvents()
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
 {
@@ -1318,7 +1318,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw( Exception )
 {
@@ -1396,7 +1396,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
 {
@@ -1427,7 +1427,7 @@ void SlideshowImpl::displayCurrentSlide (const bool bSkipAllMainSequenceEffects)
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::endPresentation()
 {
@@ -1442,7 +1442,7 @@ void SlideshowImpl::endPresentation()
         mnEndShowEvent = Application::PostUserEvent( LINK(this, SlideshowImpl, endPresentationHdl) );
 }
 
-// ---------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl)
 {
@@ -1453,7 +1453,7 @@ IMPL_LINK_NOARG(SlideshowImpl, endPresentationHdl)
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
 {
@@ -1481,7 +1481,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
 {
@@ -1520,7 +1520,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
 #endif
 }
 
-// ---------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException)
 {
@@ -1528,7 +1528,7 @@ sal_Bool SAL_CALL SlideshowImpl::isPaused() throw (RuntimeException)
     return mbIsPaused;
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeException)
 {
@@ -1543,9 +1543,9 @@ void SAL_CALL SlideshowImpl::blankScreen( sal_Int32 nColor ) throw (RuntimeExcep
     }
 }
 
-// ---------------------------------------------------------
+
 // XShapeEventListener
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& /* aOriginalEvent */ )
 {
@@ -1665,7 +1665,7 @@ void SlideshowImpl::click( const Reference< XShape >& xShape, const ::com::sun::
     }
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark )
 {
@@ -1691,7 +1691,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark
     return ( nPgNum - 1) >> 1;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException)
 {
@@ -1709,7 +1709,7 @@ void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (Runtim
     mpDocSh->OpenBookmark( aBookmark );
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber )
 {
@@ -1722,7 +1722,7 @@ void SlideshowImpl::displaySlideNumber( sal_Int32 nSlideNumber )
     }
 }
 
-// ---------------------------------------------------------
+
 
 /** nSlideIndex == -1 displays current slide again */
 void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex )
@@ -1736,7 +1736,7 @@ void SlideshowImpl::displaySlideIndex( sal_Int32 nSlideIndex )
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::jumpToBookmark( const OUString& sBookmark )
 {
@@ -1745,14 +1745,14 @@ void SlideshowImpl::jumpToBookmark( const OUString& sBookmark )
         displaySlideNumber( nSlideNumber );
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideshowImpl::getCurrentSlideNumber()
 {
     return mpSlideController.get() ? mpSlideController->getCurrentSlideNumber() : -1;
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideshowImpl::getFirstSlideNumber()
 {
@@ -1775,7 +1775,7 @@ sal_Int32 SlideshowImpl::getFirstSlideNumber()
     return nRet;
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SlideshowImpl::getLastSlideNumber()
 {
@@ -1798,7 +1798,7 @@ sal_Int32 SlideshowImpl::getLastSlideNumber()
     return nRet;
 }
 
-// ---------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException )
 {
@@ -1806,7 +1806,7 @@ sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException )
     return maPresSettings.mbEndless;
 }
 
-// ---------------------------------------------------------
+
 
 double SlideshowImpl::update()
 {
@@ -1814,7 +1814,7 @@ double SlideshowImpl::update()
     return -1;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::startUpdateTimer()
 {
@@ -1823,7 +1823,7 @@ void SlideshowImpl::startUpdateTimer()
     maUpdateTimer.Start();
 }
 
-// ---------------------------------------------------------
+
 
 /** this timer is called 20ms after a new slide was displayed.
     This is used to unfreeze user input that was disabled after
@@ -1835,7 +1835,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ReadyForNextInputHdl)
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 /** if I catch someone someday who calls this method by hand
     and not by using the timer, I will personaly punish this
@@ -1938,7 +1938,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
 {
@@ -2145,7 +2145,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent*, pEvent )
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt)
 {
@@ -2156,7 +2156,7 @@ void SlideshowImpl::mouseButtonUp(const MouseEvent& rMEvt)
     }
 }
 
-// ---------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl)
 {
@@ -2292,7 +2292,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl)
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
 {
@@ -2448,7 +2448,7 @@ IMPL_LINK( SlideshowImpl, ContextMenuSelectHdl, Menu *, pMenu )
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 Reference< XSlideShow > SlideshowImpl::createSlideShow() const
 {
@@ -2474,7 +2474,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
     return xShow;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide )
 {
@@ -2564,7 +2564,7 @@ void SlideshowImpl::createSlideList( bool bAll, const OUString& rPresSlide )
     }
 }
 
-// ---------------------------------------------------------
+
 
 typedef sal_uInt16 (*FncGetChildWindowId)();
 
@@ -2612,7 +2612,7 @@ void SlideshowImpl::hideChildWindows()
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::showChildWindows()
 {
@@ -2632,28 +2632,28 @@ void SlideshowImpl::showChildWindows()
     }
 }
 
-// ---------------------------------------------------------
+
 
 SfxViewFrame* SlideshowImpl::getViewFrame() const
 {
     return mpViewShell ? mpViewShell->GetViewFrame() : 0;
 }
 
-// ---------------------------------------------------------
+
 
 SfxDispatcher* SlideshowImpl::getDispatcher() const
 {
     return (mpViewShell && mpViewShell->GetViewFrame()) ? mpViewShell->GetViewFrame()->GetDispatcher() : 0;
 }
 
-// ---------------------------------------------------------
+
 
 SfxBindings* SlideshowImpl::getBindings() const
 {
     return (mpViewShell && mpViewShell->GetViewFrame()) ? &mpViewShell->GetViewFrame()->GetBindings() : 0;
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::resize( const Size& rSize )
 {
@@ -2681,7 +2681,7 @@ void SlideshowImpl::resize( const Size& rSize )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible )
 {
@@ -2715,7 +2715,7 @@ void SlideshowImpl::setActiveXToolbarsVisible( sal_Bool bVisible )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
 {
@@ -2756,7 +2756,7 @@ void SAL_CALL SlideshowImpl::activate() throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException)
 {
@@ -2768,7 +2768,7 @@ void SAL_CALL SlideshowImpl::deactivate() throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl)
 {
@@ -2792,7 +2792,7 @@ IMPL_LINK_NOARG(SlideshowImpl, deactivateHdl)
     return 0;
 }
 
-// ---------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException)
 {
@@ -2800,7 +2800,7 @@ sal_Bool SAL_CALL SlideshowImpl::isActive() throw (RuntimeException)
     return mbActive;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SlideshowImpl::receiveRequest(SfxRequest& rReq)
 {
@@ -2854,7 +2854,7 @@ void SlideshowImpl::receiveRequest(SfxRequest& rReq)
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideshowImpl::setAutoSaveState( bool bOn)
 {
@@ -2880,7 +2880,7 @@ void SlideshowImpl::setAutoSaveState( bool bOn)
     }
 }
 
-// ---------------------------------------------------------
+
 
 Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeException)
 {
@@ -2897,7 +2897,7 @@ Reference< XDrawPage > SAL_CALL SlideshowImpl::getCurrentSlide() throw (RuntimeE
     return xSlide;
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException)
 {
@@ -2913,23 +2913,23 @@ sal_Int32 SAL_CALL SlideshowImpl::getNextSlideIndex() throw (RuntimeException)
     }
 }
 
-// ---------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SlideshowImpl::getCurrentSlideIndex() throw (RuntimeException)
 {
     return mpSlideController.get() ? mpSlideController->getCurrentSlideIndex() : -1;
 }
 
-// --------------------------------------------------------------------
+
 // ::com::sun::star::presentation::XSlideShowController:
-// --------------------------------------------------------------------
+
 
 ::sal_Int32 SAL_CALL SlideshowImpl::getSlideCount() throw (RuntimeException)
 {
     return mpSlideController.get() ? mpSlideController->getSlideIndexCount() : 0;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XDrawPage > SAL_CALL SlideshowImpl::getSlideByIndex(::sal_Int32 Index) throw (RuntimeException, css::lang::IndexOutOfBoundsException)
 {
@@ -2945,7 +2945,7 @@ sal_Bool SAL_CALL SlideshowImpl::getAlwaysOnTop() throw (RuntimeException)
     return maPresSettings.mbAlwaysOnTop;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeException)
 {
@@ -2957,7 +2957,7 @@ void SAL_CALL SlideshowImpl::setAlwaysOnTop( sal_Bool bAlways ) throw (RuntimeEx
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException)
 {
@@ -2965,7 +2965,7 @@ sal_Bool SAL_CALL SlideshowImpl::isFullScreen() throw (RuntimeException)
     return maPresSettings.mbFullScreen;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException)
 {
@@ -2973,7 +2973,7 @@ sal_Bool SAL_CALL SlideshowImpl::getMouseVisible() throw (RuntimeException)
     return maPresSettings.mbMouseVisible;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (RuntimeException)
 {
@@ -2986,7 +2986,7 @@ void SAL_CALL SlideshowImpl::setMouseVisible( sal_Bool bVisible ) throw (Runtime
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException)
 {
@@ -2994,7 +2994,7 @@ sal_Bool SAL_CALL SlideshowImpl::getUsePen() throw (RuntimeException)
     return mbUsePen;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeException)
 {
@@ -3037,7 +3037,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
     }
 }
 
-// --------------------------------------------------------------------
+
 
 double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException)
 {
@@ -3045,7 +3045,7 @@ double SAL_CALL SlideshowImpl::getPenWidth() throw (RuntimeException)
     return mdUserPaintStrokeWidth;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeException)
 {
@@ -3054,7 +3054,7 @@ void SAL_CALL SlideshowImpl::setPenWidth( double dStrokeWidth ) throw (RuntimeEx
     setUsePen( true ); // enable pen mode, update color and width
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
 {
@@ -3062,7 +3062,7 @@ sal_Int32 SAL_CALL SlideshowImpl::getPenColor() throw (RuntimeException)
     return mnUserPaintColor;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeException)
 {
@@ -3071,13 +3071,13 @@ void SAL_CALL SlideshowImpl::setPenColor( sal_Int32 nColor ) throw (RuntimeExcep
     setUsePen( true ); // enable pen mode, update color
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setUseEraser( ::sal_Bool /*_usepen*/ ) throw (css::uno::RuntimeException)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeException)
 {
@@ -3086,7 +3086,7 @@ void SAL_CALL SlideshowImpl::setPenMode( bool bSwitchPenMode ) throw (RuntimeExc
 
 }
 
-// --------------------------------------------------------------------
+
 void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (css::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -3105,7 +3105,7 @@ void SAL_CALL SlideshowImpl::setPointerMode( bool bSwitchPointerMode ) throw (cs
     }
 }
 
-// --------------------------------------------------------------------
+
 void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -3123,7 +3123,7 @@ void SAL_CALL SlideshowImpl::setPointerPosition( const ::com::sun::star::geometr
             "exception caught: " << comphelper::anyToString( cppu::getCaughtException() ));
     }
 }
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::setEraseAllInk(bool bEraseAllInk) throw (RuntimeException)
 {
@@ -3153,9 +3153,9 @@ void SAL_CALL SlideshowImpl::setEraserMode( bool /*bSwitchEraserMode*/ ) throw (
 {
 }
 
-// --------------------------------------------------------------------
+
 // XSlideShowController Methods
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SlideshowImpl::isRunning(  ) throw (RuntimeException)
 {
@@ -3163,7 +3163,7 @@ sal_Bool SAL_CALL SlideshowImpl::isRunning(  ) throw (RuntimeException)
     return mxShow.is();
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoNextEffect(  ) throw (RuntimeException)
 {
@@ -3191,7 +3191,7 @@ void SAL_CALL SlideshowImpl::gotoNextEffect(  ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoPreviousEffect(  ) throw (RuntimeException)
 {
@@ -3215,7 +3215,7 @@ void SAL_CALL SlideshowImpl::gotoPreviousEffect(  ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoFirstSlide(  ) throw (RuntimeException)
 {
@@ -3238,7 +3238,7 @@ void SAL_CALL SlideshowImpl::gotoFirstSlide(  ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoNextSlide(  ) throw (RuntimeException)
 {
@@ -3311,7 +3311,7 @@ void SAL_CALL SlideshowImpl::gotoNextSlide(  ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoPreviousSlide(  ) throw (RuntimeException)
 {
@@ -3367,7 +3367,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException)
 {
@@ -3393,7 +3393,7 @@ void SAL_CALL SlideshowImpl::gotoLastSlide() throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (RuntimeException)
 {
@@ -3407,7 +3407,7 @@ void SAL_CALL SlideshowImpl::gotoBookmark( const OUString& rBookmark ) throw (Ru
         displaySlideNumber( nSlideNumber );
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
     throw(IllegalArgumentException, RuntimeException)
@@ -3430,7 +3430,7 @@ void SAL_CALL SlideshowImpl::gotoSlide( const Reference< XDrawPage >& xSlide )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeException)
 {
@@ -3442,7 +3442,7 @@ void SAL_CALL SlideshowImpl::gotoSlideIndex( sal_Int32 nIndex ) throw (RuntimeEx
     displaySlideIndex( nIndex );
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SlideshowImpl::stopSound(  ) throw (RuntimeException)
 {
@@ -3467,44 +3467,44 @@ void SAL_CALL SlideshowImpl::stopSound(  ) throw (RuntimeException)
     }
 }
 
-// --------------------------------------------------------------------
+
 // XIndexAccess
-// --------------------------------------------------------------------
+
 
 ::sal_Int32 SAL_CALL SlideshowImpl::getCount(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return getSlideCount();
 }
 
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Any SAL_CALL SlideshowImpl::getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     return Any( getSlideByIndex( Index ) );
 }
 
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Type SAL_CALL SlideshowImpl::getElementType(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return cppu::UnoType<XDrawPage>::get();
 }
 
-// --------------------------------------------------------------------
+
 
 ::sal_Bool SAL_CALL SlideshowImpl::hasElements(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return getSlideCount() != 0;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XSlideShow > SAL_CALL SlideshowImpl::getSlideShow() throw (RuntimeException)
 {
     return mxShow;
 }
 
-// --------------------------------------------------------------------
+
 
 
 PresentationSettingsEx::PresentationSettingsEx( const PresentationSettingsEx& r )
@@ -3631,9 +3631,9 @@ void PresentationSettingsEx::SetPropertyValue( const OUString& rProperty, const
 
 ////////////////////////////////
 
-// ---------------------------------------------------------
+
 // XAnimationListener
-// ---------------------------------------------------------
+
 
 SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowImpl >& xController, const css::uno::Reference< css::presentation::XSlideShow >& xSlideShow )
 : maListeners( m_aMutex )
@@ -3642,13 +3642,13 @@ SlideShowListenerProxy::SlideShowListenerProxy( const rtl::Reference< SlideshowI
 {
 }
 
-// ---------------------------------------------------------
+
 
 SlideShowListenerProxy::~SlideShowListenerProxy()
 {
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::addAsSlideShowListener()
 {
@@ -3659,7 +3659,7 @@ void SlideShowListenerProxy::addAsSlideShowListener()
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::removeAsSlideShowListener()
 {
@@ -3670,7 +3670,7 @@ void SlideShowListenerProxy::removeAsSlideShowListener()
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape )
 {
@@ -3681,7 +3681,7 @@ void SlideShowListenerProxy::addShapeEventListener( const css::uno::Reference< c
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference< css::drawing::XShape >& xShape )
 {
@@ -3692,21 +3692,21 @@ void SlideShowListenerProxy::removeShapeEventListener( const css::uno::Reference
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::addSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener )
 {
     maListeners.addInterface(xListener);
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::removeSlideShowListener( const css::uno::Reference< css::presentation::XSlideShowListener >& xListener )
 {
     maListeners.removeInterface(xListener);
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException)
 {
@@ -3716,7 +3716,7 @@ void SAL_CALL SlideShowListenerProxy::beginEvent( const Reference< XAnimationNod
         maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::beginEvent, _1,  boost::cref(xNode) ));
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode >& xNode ) throw (RuntimeException)
 {
@@ -3726,7 +3726,7 @@ void SAL_CALL SlideShowListenerProxy::endEvent( const Reference< XAnimationNode
         maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::endEvent, _1, boost::cref(xNode) ));
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >& xNode, ::sal_Int32 nRepeat ) throw (RuntimeException)
 {
@@ -3736,9 +3736,9 @@ void SAL_CALL SlideShowListenerProxy::repeat( const Reference< XAnimationNode >&
         maListeners.forEach<XSlideShowListener>( boost::bind( &XAnimationListener::repeat, _1,  boost::cref(xNode), boost::cref(nRepeat) ));
 }
 
-// ---------------------------------------------------------
+
 // ::com::sun::star::presentation::XSlideShowListener:
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::paused(  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3748,7 +3748,7 @@ void SAL_CALL SlideShowListenerProxy::paused(  ) throw (::com::sun::star::uno::R
         maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::paused ) );
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::resumed(  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3758,7 +3758,7 @@ void SAL_CALL SlideShowListenerProxy::resumed(  ) throw (::com::sun::star::uno::
         maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::resumed ) );
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeException)
 {
@@ -3768,7 +3768,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionStarted( ) throw (RuntimeEx
         maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionStarted ) );
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3778,7 +3778,7 @@ void SAL_CALL SlideShowListenerProxy::slideTransitionEnded( ) throw (::com::sun:
         maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideTransitionEnded ) );
 }
 
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded(  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3788,7 +3788,7 @@ void SAL_CALL SlideShowListenerProxy::slideAnimationsEnded(  ) throw (::com::sun
         maListeners.forEach<XSlideShowListener>( boost::mem_fn( &XSlideShowListener::slideAnimationsEnded ) );
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeException)
 {
@@ -3807,7 +3807,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti
     }
 }
 
-// ---------------------------------------------------------
+
 
 void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException)
 {
@@ -3825,9 +3825,9 @@ void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) thro
     }
 }
 
-// ---------------------------------------------------------
+
 // XEventListener
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::EventObject& aDisposeEvent ) throw (RuntimeException)
 {
@@ -3836,9 +3836,9 @@ void SAL_CALL SlideShowListenerProxy::disposing( const ::com::sun::star::lang::E
     mxSlideShow.clear();
 }
 
-// ---------------------------------------------------------
+
 // XShapeEventListener
-// ---------------------------------------------------------
+
 
 void SAL_CALL SlideShowListenerProxy::click( const Reference< XShape >& xShape, const ::com::sun::star::awt::MouseEvent& aOriginalEvent ) throw (RuntimeException)
 {
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 45c9b2b1aa27..2eed17d46b69 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -314,7 +314,7 @@ void SAL_CALL SlideShowView::clear() throw (::com::sun::star::uno::RuntimeExcept
     SolarMutexGuard aSolarGuard;
 
     // fill the bounds rectangle in black
-    // ----------------------------------
+
 
     const Size aWindowSize( mrOutputWindow.GetSizePixel() );
 
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 9961a19959bf..2fe886e84d45 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1270,7 +1270,7 @@ void SlotManager::NotifyEditModeChange (void)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 namespace {
 
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
index 5d9512156f3c..634638fcf6a1 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx
@@ -599,7 +599,7 @@ void SAL_CALL SlideSorterService::setIsUIReadOnly (sal_Bool bIsUIReadOnly)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void SlideSorterService::Resize (void)
 {
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 9a02cf4f59c2..45ae4beae044 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -76,7 +76,7 @@ static const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreview
 static const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1);
 
 
-// --------------------------------------------------------------------
+
 
 static const OUString* getPropertyNames()
 {
@@ -91,7 +91,7 @@ static const OUString* getPropertyNames()
     };
     return &gPropNames[0];
 }
-// --------------------------------------------------------------------
+
 
 TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )
     : mrBase(rBase)
@@ -143,14 +143,14 @@ TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBas
     updateControls();
 }
 
-// --------------------------------------------------------------------
+
 
 TableDesignWidget::~TableDesignWidget()
 {
     removeListener();
 }
 
-// --------------------------------------------------------------------
+
 
 static SfxBindings* getBindings( ViewShellBase& rBase )
 {
@@ -160,7 +160,7 @@ static SfxBindings* getBindings( ViewShellBase& rBase )
         return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
 {
@@ -170,7 +170,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
         return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl)
 {
@@ -180,7 +180,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implValueSetHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void TableDesignWidget::ApplyStyle()
 {
@@ -231,7 +231,7 @@ void TableDesignWidget::ApplyStyle()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl)
 {
@@ -244,7 +244,7 @@ IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void TableDesignWidget::ApplyOptions()
 {
@@ -282,7 +282,7 @@ void TableDesignWidget::ApplyOptions()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void TableDesignWidget::onSelectionChanged()
 {
@@ -326,7 +326,7 @@ void TableDesignWidget::onSelectionChanged()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void TableValueSet::Resize()
 {
@@ -396,7 +396,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT ::Window* SAL_CALL makeTableValueSet(::Window *p
     return new TableValueSet(pParent, nWinStyle);
 }
 
-// --------------------------------------------------------------------
+
 
 void TableDesignWidget::updateControls()
 {
@@ -451,7 +451,7 @@ void TableDesignWidget::updateControls()
     m_pValueSet->SelectItem( nSelection );
 }
 
-// --------------------------------------------------------------------
+
 
 void TableDesignWidget::addListener()
 {
@@ -465,7 +465,7 @@ void TableDesignWidget::addListener()
         | tools::EventMultiplexerEvent::EID_DISPOSING);
 }
 
-// --------------------------------------------------------------------
+
 
 void TableDesignWidget::removeListener()
 {
@@ -473,7 +473,7 @@ void TableDesignWidget::removeListener()
     mrBase.GetEventMultiplexer()->RemoveEventListener( aLink );
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK(TableDesignWidget,EventMultiplexerListener,
     tools::EventMultiplexerEvent*,pEvent)
@@ -498,7 +498,7 @@ IMPL_LINK(TableDesignWidget,EventMultiplexerListener,
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 struct CellInfo
 {
@@ -535,7 +535,7 @@ CellInfo::CellInfo( const Reference< XStyle >& xStyle )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 typedef std::vector< boost::shared_ptr< CellInfo > > CellInfoVector;
 typedef boost::shared_ptr< CellInfo > CellInfoMatrix[nPreviewColumns][nPreviewRows];
@@ -558,7 +558,7 @@ struct TableStyleSettings
         , mbUseColumnBanding(false) {}
 };
 
-// --------------------------------------------------------------------
+
 
 static void FillCellInfoVector( const Reference< XIndexAccess >& xTableStyle, CellInfoVector& rVector )
 {
@@ -655,7 +655,7 @@ static void FillCellInfoMatrix( const CellInfoVector& rStyle, const TableStyleSe
     }
 }
 
-// --------------------------------------------------------------------
+
 
 const Bitmap CreateDesignPreview( const Reference< XIndexAccess >& xTableStyle, const TableStyleSettings& rSettings, bool bIsPageDark )
 {
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx
index 7df51bef77ae..bb8482cb0351 100644
--- a/sd/source/ui/table/tablefunction.cxx
+++ b/sd/source/ui/table/tablefunction.cxx
@@ -220,7 +220,7 @@ void DrawViewShell::FuTable(SfxRequest& rReq)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void DrawViewShell::GetTableMenuState( SfxItemSet &rSet )
 {
@@ -244,7 +244,7 @@ void DrawViewShell::GetTableMenuState( SfxItemSet &rSet )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel )
 {
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 21d44e705888..ff48ace15463 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -71,19 +71,19 @@ void RegisterInterfaces(SfxModule* pMod)
     TableObjectBar::RegisterInterface(pMod);
 }
 
-// ------------------
+
 // - TableObjectBar -
-// ------------------
+
 
 TYPEINIT1( TableObjectBar, SfxShell );
 
-// -----------------------------------------------------------------------------
+
 
 SFX_IMPL_INTERFACE( TableObjectBar, SfxShell, SdResId( STR_TABLEOBJECTBARSHELL ) )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView )
 :   SfxShell( pSdViewShell->GetViewShell() )
@@ -102,14 +102,14 @@ TableObjectBar::TableObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView )
     SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Table));
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableObjectBar::~TableObjectBar()
 {
     SetRepeatTarget( NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableObjectBar::GetState( SfxItemSet& rSet )
 {
@@ -130,7 +130,7 @@ void TableObjectBar::GetState( SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableObjectBar::GetAttrState( SfxItemSet& rSet )
 {
@@ -139,7 +139,7 @@ void TableObjectBar::GetAttrState( SfxItemSet& rSet )
         pDrawViewShell->GetAttrState( rSet );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableObjectBar::Execute( SfxRequest& rReq )
 {
diff --git a/sd/source/ui/tools/PropertySet.cxx b/sd/source/ui/tools/PropertySet.cxx
index defe3f2b5939..f16f2439cb77 100644
--- a/sd/source/ui/tools/PropertySet.cxx
+++ b/sd/source/ui/tools/PropertySet.cxx
@@ -187,7 +187,7 @@ void SAL_CALL PropertySet::removeVetoableChangeListener (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void PropertySet::CallListeners (
     const OUString& rsPropertyName,
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 4068a5182293..99591d1fd5a7 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -931,7 +931,7 @@ void DrawController::getFastPropertyValue (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void DrawController::ProvideFrameworkControllers (void)
 {
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 39e2956b9763..71dd63b77eb8 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -271,7 +271,7 @@ sal_Bool SAL_CALL SdUnoDrawView::select( const Any& aSelection )
     return bOk;
 }
 
-//----------------------------------------------------------------------
+
 
 Any SAL_CALL SdUnoDrawView::getSelection()
     throw(RuntimeException)
@@ -486,7 +486,7 @@ void SAL_CALL SdUnoDrawView::setCurrentPage (
     }
 }
 
-//----------------------------------------------------------------------
+
 
 Reference< drawing::XDrawPage > SAL_CALL SdUnoDrawView::getCurrentPage()
     throw(RuntimeException)
diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx
index b77e26de2b14..9d8253e06aa5 100644
--- a/sd/source/ui/unoidl/facreg.cxx
+++ b/sd/source/ui/unoidl/facreg.cxx
@@ -200,7 +200,7 @@ using namespace ::sd::sidebar;
 
 
 
-// ----------------------------------------------------------------------------
+
 // Declaration and initialization of a map from service names to locally
 // unique factory identifiers.
 
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 45221ce0fc48..4a54b13ee4d2 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -152,7 +152,7 @@ private:
     Reference< XAnimate > mxFirstNode;
 };
 
-// --------------------------------------------------------------------
+
 
 SD_DLLPUBLIC Reference< XInterface > RandomAnimationNode_createInstance( sal_Int16 nPresetClass )
 {
@@ -160,7 +160,7 @@ SD_DLLPUBLIC Reference< XInterface > RandomAnimationNode_createInstance( sal_Int
     return xInt;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMultiServiceFactory > &  )
 {
@@ -168,14 +168,14 @@ Reference< XInterface > SAL_CALL RandomNode_createInstance( const Reference< XMu
     return xInt;
 }
 
-// --------------------------------------------------------------------
+
 
 OUString RandomNode__getImplementationName() throw( RuntimeException )
 {
     return OUString( "sd::RandomAnimationNode" ) ;
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -185,7 +185,7 @@ Sequence< OUString > SAL_CALL RandomNode_getSupportedServiceNames() throw( Runti
     return aSeq;
 }
 
-// --------------------------------------------------------------------
+
 
 RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode )
 :   RandomAnimationNodeBase(),
@@ -208,7 +208,7 @@ RandomAnimationNode::RandomAnimationNode( const RandomAnimationNode& rNode )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 RandomAnimationNode::RandomAnimationNode( sal_Int16 nPresetClass )
 {
@@ -232,7 +232,7 @@ void RandomAnimationNode::init( sal_Int16 nPresetClass )
     mbAutoReverse = sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 // XInitialization
 void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException)
@@ -254,7 +254,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments
     maTarget = aArguments[0];
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException)
@@ -263,7 +263,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getType() throw (RuntimeException)
     return ::com::sun::star::animations::AnimationNodeType::PAR;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException)
@@ -272,7 +272,7 @@ Any SAL_CALL RandomAnimationNode::getBegin() throw (RuntimeException)
     return maBegin;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeException)
@@ -281,7 +281,7 @@ void SAL_CALL RandomAnimationNode::setBegin( const Any& _begin ) throw (RuntimeE
     maBegin = _begin;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException)
@@ -290,7 +290,7 @@ Any SAL_CALL RandomAnimationNode::getDuration() throw (RuntimeException)
     return maDuration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (RuntimeException)
@@ -299,7 +299,7 @@ void SAL_CALL RandomAnimationNode::setDuration( const Any& _duration ) throw (Ru
     maDuration = _duration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException)
@@ -308,7 +308,7 @@ Any SAL_CALL RandomAnimationNode::getEnd() throw (RuntimeException)
     return maEnd;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeException)
@@ -317,7 +317,7 @@ void SAL_CALL RandomAnimationNode::setEnd( const Any& _end ) throw (RuntimeExcep
     maEnd = _end;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException)
@@ -326,7 +326,7 @@ Any SAL_CALL RandomAnimationNode::getEndSync() throw (RuntimeException)
     return maEndSync;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException)
@@ -335,7 +335,7 @@ void SAL_CALL RandomAnimationNode::setEndSync( const Any& _endsync ) throw (Runt
     maEndSync = _endsync;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException)
@@ -344,7 +344,7 @@ Any SAL_CALL RandomAnimationNode::getRepeatCount() throw (RuntimeException)
     return maRepeatCount;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException)
@@ -353,7 +353,7 @@ void SAL_CALL RandomAnimationNode::setRepeatCount( const Any& _repeatcount ) thr
     maRepeatCount = _repeatcount;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException)
@@ -362,7 +362,7 @@ Any SAL_CALL RandomAnimationNode::getRepeatDuration() throw (RuntimeException)
     return maRepeatDuration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException)
@@ -371,7 +371,7 @@ void SAL_CALL RandomAnimationNode::setRepeatDuration( const Any& _repeatduration
     maRepeatDuration = _repeatduration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException)
@@ -380,7 +380,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFill() throw (RuntimeException)
     return mnFill;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException)
@@ -389,7 +389,7 @@ void SAL_CALL RandomAnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeExce
     mnFill = _fill;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException)
@@ -398,7 +398,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getFillDefault() throw (RuntimeException
     return mnFillDefault;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException)
@@ -407,7 +407,7 @@ void SAL_CALL RandomAnimationNode::setFillDefault( sal_Int16 _filldefault ) thro
     mnFillDefault = _filldefault;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException)
@@ -416,7 +416,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestart() throw (RuntimeException)
     return mnRestart;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException)
@@ -425,7 +425,7 @@ void SAL_CALL RandomAnimationNode::setRestart( sal_Int16 _restart ) throw (Runti
     mnRestart = _restart;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeException)
@@ -434,7 +434,7 @@ sal_Int16 SAL_CALL RandomAnimationNode::getRestartDefault() throw (RuntimeExcept
     return mnRestartDefault;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException)
@@ -443,7 +443,7 @@ void SAL_CALL RandomAnimationNode::setRestartDefault( sal_Int16 _restartdefault
     mnRestartDefault = _restartdefault;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException)
@@ -452,7 +452,7 @@ double SAL_CALL RandomAnimationNode::getAcceleration() throw (RuntimeException)
     return mfAcceleration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException)
@@ -461,7 +461,7 @@ void SAL_CALL RandomAnimationNode::setAcceleration( double _acceleration ) throw
     mfAcceleration = _acceleration;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException)
@@ -470,7 +470,7 @@ double SAL_CALL RandomAnimationNode::getDecelerate() throw (RuntimeException)
     return mfDecelerate;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException)
@@ -479,7 +479,7 @@ void SAL_CALL RandomAnimationNode::setDecelerate( double _decelerate ) throw (Ru
     mfDecelerate = _decelerate;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException)
@@ -488,7 +488,7 @@ sal_Bool SAL_CALL RandomAnimationNode::getAutoReverse() throw (RuntimeException)
     return mbAutoReverse;
 }
 
-// --------------------------------------------------------------------
+
 
 // XAnimationNode
 void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException)
@@ -497,7 +497,7 @@ void SAL_CALL RandomAnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw
     mbAutoReverse = _autoreverse;
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (RuntimeException)
 {
@@ -505,7 +505,7 @@ Sequence< NamedValue > SAL_CALL RandomAnimationNode::getUserData() throw (Runtim
     return maUserData;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException)
 {
@@ -513,7 +513,7 @@ void SAL_CALL RandomAnimationNode::setUserData( const Sequence< NamedValue >& _u
     maUserData = _userdata;
 }
 
-// --------------------------------------------------------------------
+
 
 // XChild
 Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (RuntimeException)
@@ -522,7 +522,7 @@ Reference< XInterface > SAL_CALL RandomAnimationNode::getParent() throw (Runtime
     return mxParent;
 }
 
-// --------------------------------------------------------------------
+
 
 // XChild
 void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException)
@@ -531,7 +531,7 @@ void SAL_CALL RandomAnimationNode::setParent( const Reference< XInterface >& Par
     mxParent = Parent;
 }
 
-// --------------------------------------------------------------------
+
 
 // XCloneable
 Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (RuntimeException)
@@ -540,7 +540,7 @@ Reference< XCloneable > SAL_CALL RandomAnimationNode::createClone() throw (Runti
     return xNewNode;
 }
 
-// --------------------------------------------------------------------
+
 
 // XElementAccess
 Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException)
@@ -548,7 +548,7 @@ Type SAL_CALL RandomAnimationNode::getElementType() throw (RuntimeException)
     return ::getCppuType((const Reference< XAnimationNode >*)0);
 }
 
-// --------------------------------------------------------------------
+
 
 // XElementAccess
 sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException)
@@ -556,7 +556,7 @@ sal_Bool SAL_CALL RandomAnimationNode::hasElements() throw (RuntimeException)
     return sal_True;
 }
 
-// --------------------------------------------------------------------
+
 
 // XEnumerationAccess
 Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration()
@@ -602,7 +602,7 @@ Reference< XEnumeration > SAL_CALL RandomAnimationNode::createEnumeration()
     return xEnum;
 }
 
-// --------------------------------------------------------------------
+
 
 
 // XTimeContainer
@@ -612,7 +612,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertBefore( const Re
     return appendChild( newChild );
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >&  )
@@ -621,7 +621,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::insertAfter( const Ref
     return appendChild( newChild );
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >&  )
@@ -630,7 +630,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::replaceChild( const Re
     return appendChild( newChild );
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Reference< XAnimationNode >& oldChild )
@@ -639,7 +639,7 @@ Reference< XAnimationNode > SAL_CALL RandomAnimationNode::removeChild( const Ref
     return oldChild;
 }
 
-// --------------------------------------------------------------------
+
 
 // XTimeContainer
 Reference< XAnimationNode > SAL_CALL RandomAnimationNode::appendChild( const Reference< XAnimationNode >& newChild )
diff --git a/sd/source/ui/unoidl/unocpres.cxx b/sd/source/ui/unoidl/unocpres.cxx
index 11dd9cf7a204..79770d7c0685 100644
--- a/sd/source/ui/unoidl/unocpres.cxx
+++ b/sd/source/ui/unoidl/unocpres.cxx
@@ -261,7 +261,7 @@ void SAL_CALL SdXCustomPresentation::dispose() throw(uno::RuntimeException)
     mpSdCustomShow = NULL;
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw(uno::RuntimeException)
 {
@@ -271,7 +271,7 @@ void SAL_CALL SdXCustomPresentation::addEventListener( const uno::Reference< lan
     aDisposeListeners.addInterface(xListener);
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SdXCustomPresentation::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException)
 {
     if( !bDisposing )
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 42cca8620c0d..d066bc8222ef 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1466,7 +1466,7 @@ Reference< drawing::XShape >  SdGenericDrawPage::_CreateShape( SdrObject *pObj )
 
 }
 
-//----------------------------------------------------------------------
+
 
 // XServiceInfo
 Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
@@ -1479,7 +1479,7 @@ Sequence< OUString > SAL_CALL SdGenericDrawPage::getSupportedServiceNames()
     return aSeq;
 }
 
-//----------------------------------------------------------------------
+
 
 // XLinkTargetSupplier
 Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks(  )
@@ -1488,21 +1488,21 @@ Reference< container::XNameAccess > SAL_CALL SdGenericDrawPage::getLinks(  )
     return new SdPageLinkTargets( (SdGenericDrawPage*)this );
 }
 
-//----------------------------------------------------------------------
+
 
 void SdGenericDrawPage::setBackground( const Any& ) throw(lang::IllegalArgumentException)
 {
     OSL_FAIL( "Don't call me, I'm useless!" );
 }
 
-//----------------------------------------------------------------------
+
 
 void SdGenericDrawPage::getBackground( Any& ) throw()
 {
     OSL_FAIL( "Don't call me, I'm useless!" );
 }
 
-//----------------------------------------------------------------------
+
 
 OUString SdGenericDrawPage::getBookmarkURL() const
 {
@@ -1522,7 +1522,7 @@ OUString SdGenericDrawPage::getBookmarkURL() const
     return aRet.makeStringAndClear();
 }
 
-//----------------------------------------------------------------------
+
 void SdGenericDrawPage::setBookmarkURL( OUString& rURL )
 {
     if( SvxFmDrawPage::mpPage )
@@ -1544,7 +1544,7 @@ void SdGenericDrawPage::setBookmarkURL( OUString& rURL )
     }
 }
 
-//----------------------------------------------------------------------
+
 Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Reference< drawing::XShapes >& xShapes )
     throw( uno::RuntimeException )
 {
@@ -1581,7 +1581,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::combine( const Referenc
     return xShape;
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGroup )
     throw( uno::RuntimeException )
 {
@@ -1600,7 +1600,7 @@ void SAL_CALL SdGenericDrawPage::split( const Reference< drawing::XShape >& xGro
     GetModel()->SetModified();
 }
 
-//----------------------------------------------------------------------
+
 Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference< drawing::XShapes >& xShapes )
     throw( uno::RuntimeException )
 {
@@ -1634,7 +1634,7 @@ Reference< drawing::XShape > SAL_CALL SdGenericDrawPage::bind( const Reference<
     return xShape;
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SdGenericDrawPage::unbind( const Reference< drawing::XShape >& xShape )
     throw( uno::RuntimeException )
 {
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 64bf53da46ba..1f950457b552 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -56,19 +56,19 @@ namespace sd {
 
 
 
-// -----------------------
+
 // - GraphicObjectBar -
-// -----------------------
+
 
 SFX_IMPL_INTERFACE( GraphicObjectBar, SfxShell, SdResId( STR_GRAFOBJECTBARSHELL ) )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TYPEINIT1( GraphicObjectBar, SfxShell );
 
-// -----------------------------------------------------------------------------
+
 
 GraphicObjectBar::GraphicObjectBar (
     ViewShell* pSdViewShell,
@@ -87,14 +87,14 @@ GraphicObjectBar::GraphicObjectBar (
     SetName( OUString( "Graphic objectbar" ));
 }
 
-// -----------------------------------------------------------------------------
+
 
 GraphicObjectBar::~GraphicObjectBar()
 {
     SetRepeatTarget( NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void GraphicObjectBar::GetAttrState( SfxItemSet& rSet )
 {
@@ -102,7 +102,7 @@ void GraphicObjectBar::GetAttrState( SfxItemSet& rSet )
         SvxGrafAttrHelper::GetGrafAttrState( rSet, *mpView );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void GraphicObjectBar::Execute( SfxRequest& rReq )
 {
@@ -113,7 +113,7 @@ void GraphicObjectBar::Execute( SfxRequest& rReq )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void GraphicObjectBar::GetFilterState( SfxItemSet& rSet )
 {
@@ -132,7 +132,7 @@ void GraphicObjectBar::GetFilterState( SfxItemSet& rSet )
         SvxGraphicFilter::DisableGraphicFilterSlots( rSet );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq )
 {
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index bdd1f807c637..90cc1e344674 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -48,19 +48,19 @@ using namespace sd;
 
 namespace sd {
 
-// ------------------
+
 // - MediaObjectBar -
-// ------------------
+
 
 TYPEINIT1( MediaObjectBar, SfxShell );
 
-// -----------------------------------------------------------------------------
+
 
 SFX_IMPL_INTERFACE( MediaObjectBar, SfxShell, SdResId( STR_MEDIAOBJECTBARSHELL ) )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) :
     SfxShell( pSdViewShell->GetViewShell() ),
@@ -76,14 +76,14 @@ MediaObjectBar::MediaObjectBar( ViewShell* pSdViewShell, ::sd::View* pSdView ) :
     SetName(SD_RESSTR(RID_DRAW_MEDIA_TOOLBOX));
 }
 
-// -----------------------------------------------------------------------------
+
 
 MediaObjectBar::~MediaObjectBar()
 {
     SetRepeatTarget( NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaObjectBar::GetState( SfxItemSet& rSet )
 {
@@ -121,7 +121,7 @@ void MediaObjectBar::GetState( SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void MediaObjectBar::Execute( SfxRequest& rReq )
 {
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index f75d77fc8957..ccb7fab2fcf8 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -409,7 +409,7 @@ sal_Int64 SAL_CALL ViewTabBar::getSomething (const Sequence<sal_Int8>& rId)
 
 
 
-//-----------------------------------------------------------------------------
+
 
 bool ViewTabBar::ActivatePage (void)
 {
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 3c2daa7565d7..5f0012ed50da 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -79,9 +79,9 @@ namespace sd {
 
 sal_Bool DrawViewShell::mbPipette = sal_False;
 
-// ------------------------
+
 // - ScannerEventListener -
-// ------------------------
+
 
 class ScannerEventListener : public ::cppu::WeakImplHelper1< lang::XEventListener >
 {
@@ -100,13 +100,13 @@ public:
     void                    ParentDestroyed() { mpParent = NULL; }
 };
 
-// -----------------------------------------------------------------------------
+
 
 ScannerEventListener::~ScannerEventListener()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ScannerEventListener::disposing( const lang::EventObject& rEventObject ) throw (uno::RuntimeException)
 {
@@ -814,7 +814,7 @@ void DrawViewShell::ExecuteAnnotation (SfxRequest& rRequest)
         mpAnnotationManager->ExecuteAnnotation( rRequest );
 }
 
-// --------------------------------------------------------------------
+
 
 void DrawViewShell::GetAnnotationState (SfxItemSet& rItemSet )
 {
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 5a9129d9669d..1d38edc577ff 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -354,7 +354,7 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( DrawViewShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog )
 {
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index bed8e9ed55b5..143b31ef5fe6 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -61,9 +61,9 @@ using namespace ::com::sun::star::presentation;
 
 namespace sd {
 
-// -------------------
+
 // - PresentationViewShell -
-// -------------------
+
 
 SFX_IMPL_INTERFACE( PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSHELL ) )
 {
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index a2e25358b268..7eb729c3ffbc 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -784,7 +784,7 @@ SdrEndTextEditKind View::SdrEndTextEdit(sal_Bool bDontDeleteReally )
     return(eKind);
 }
 
-// --------------------------------------------------------------------
+
 
 /** restores the default text if the given text object is currently in edit mode and
     no text has been entered already. Is only useful just before text edit ends. */
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 3e8d460d7606..dc36ec97c9a2 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -70,9 +70,9 @@ namespace sd {
 
 using namespace ::com::sun::star;
 
-// ------------------------
+
 // - SdNavigatorDropEvent -
-// ------------------------
+
 
 struct SdNavigatorDropEvent : public ExecuteDropEvent
 {
@@ -95,7 +95,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
     {}
 };
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateClipboardDataObject( View*, ::Window& )
 {
@@ -162,7 +162,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateDragDataObject( View* pWorkView, ::Window& rWindow, const Point& rDragPos )
 {
@@ -213,7 +213,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > View::CreateSelectionDataObject( View* pWorkView, ::Window& rWindow )
 {
@@ -240,7 +240,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void View::UpdateSelectionClipboard( sal_Bool bForceDeselect )
 {
@@ -256,7 +256,7 @@ void View::UpdateSelectionClipboard( sal_Bool bForceDeselect )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void View::DoCut(::Window* )
 {
@@ -275,7 +275,7 @@ void View::DoCut(::Window* )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void View::DoCopy (::Window* pWindow)
 {
@@ -290,7 +290,7 @@ void View::DoCopy (::Window* pWindow)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void View::DoPaste (::Window* pWindow)
 {
@@ -371,7 +371,7 @@ void View::DoPaste (::Window* pWindow)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void View::StartDrag( const Point& rStartPos, ::Window* pWindow )
 {
@@ -404,7 +404,7 @@ void View::StartDrag( const Point& rStartPos, ::Window* pWindow )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void View::DragFinished( sal_Int8 nDropAction )
 {
@@ -468,7 +468,7 @@ void View::DragFinished( sal_Int8 nDropAction )
     mpDragSrcMarkList = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper,
                              ::sd::Window*, sal_uInt16, sal_uInt16 nLayer )
@@ -649,7 +649,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper,
                               ::sd::Window* pTargetWindow, sal_uInt16 nPage, sal_uInt16 nLayer )
@@ -834,7 +834,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEvent )
 {
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 3b755f1026bc..7cf130ca4a0e 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -75,9 +75,9 @@
 #include <svx/sdrhittesthelper.hxx>
 #include <svx/xbtmpit.hxx>
 
-// --------------
+
 // - Namespaces -
-// --------------
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 6b7ad96e73fc..7229da7458d9 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -268,7 +268,7 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
     return pNewGrafObj;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
                                    const Point& rPos, const Size& rSize,
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 84f170e862f3..73b0357431ad 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -45,29 +45,29 @@
 
 namespace sd {
 
-// -----------------------------------------
+
 // - SdTabControl::SdPageObjsTransferable -
-// -----------------------------------------
+
 
 TabControl::TabControlTransferable::~TabControlTransferable()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TabControl::TabControlTransferable::AddSupportedFormats()
 {
     AddFormat( SOT_FORMATSTR_ID_STARDRAW_TABBAR );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TabControl::TabControlTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& )
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TabControl::TabControlTransferable::DragFinished( sal_Int8 nDropAction )
 {
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 6eae63a9cf6e..b456f7f24bc2 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -63,12 +63,12 @@ namespace sd {
 
 class ImageButtonHdl;
 
-// --------------------------------------------------------------------
+
 
 static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
 static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
 
-// --------------------------------------------------------------------
+
 
 static BitmapEx loadImageResource( sal_uInt16 nId )
 {
@@ -78,7 +78,7 @@ static BitmapEx loadImageResource( sal_uInt16 nId )
     return BitmapEx( aResId );
 }
 
-// --------------------------------------------------------------------
+
 
 static BitmapEx* getButtonImage( int index, bool large )
 {
@@ -104,7 +104,7 @@ static BitmapEx* getButtonImage( int index, bool large )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
 
@@ -158,7 +158,7 @@ private:
     sal_uLong mnTip;
 };
 
-// --------------------------------------------------------------------
+
 
 ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSID, const Image& rImage, const Image& rImageMO*/, const Point& rPnt )
 : SmartHdl( xTag, rPnt )
@@ -169,14 +169,14 @@ ImageButtonHdl::ImageButtonHdl( const SmartTagReference& xTag /*, sal_uInt16 nSI
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ImageButtonHdl::~ImageButtonHdl()
 {
     HideTip();
 }
 
-// --------------------------------------------------------------------
+
 
 void ImageButtonHdl::HideTip()
 {
@@ -187,7 +187,7 @@ void ImageButtonHdl::HideTip()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL );
 
@@ -227,7 +227,7 @@ void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ImageButtonHdl::onMouseLeave()
 {
@@ -236,7 +236,7 @@ void ImageButtonHdl::onMouseLeave()
     Touch();
 }
 
-// --------------------------------------------------------------------
+
 
 void ImageButtonHdl::CreateB2dIAObject()
 {
@@ -281,21 +281,21 @@ void ImageButtonHdl::CreateB2dIAObject()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool ImageButtonHdl::IsFocusHdl() const
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool ImageButtonHdl::isMarkable() const
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 Pointer ImageButtonHdl::GetPointer() const
 {
@@ -310,13 +310,13 @@ ChangePlaceholderTag::ChangePlaceholderTag( ::sd::View& rView, SdrObject& rPlace
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ChangePlaceholderTag::~ChangePlaceholderTag()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the ChangePlaceholderTag handled the event. */
 bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHdl& rHdl )
@@ -342,7 +342,7 @@ bool ChangePlaceholderTag::MouseButtonDown( const MouseEvent& /*rMEvt*/, SmartHd
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns true if the SmartTag consumes this event. */
 bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt )
@@ -363,7 +363,7 @@ bool ChangePlaceholderTag::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 BitmapEx ChangePlaceholderTag::createOverlayImage( int nHighlight )
 {
@@ -442,28 +442,28 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ChangePlaceholderTag::disposing()
 {
     SmartTag::disposing();
 }
 
-// --------------------------------------------------------------------
+
 
 void ChangePlaceholderTag::select()
 {
     SmartTag::select();
 }
 
-// --------------------------------------------------------------------
+
 
 void ChangePlaceholderTag::deselect()
 {
     SmartTag::deselect();
 }
 
-// --------------------------------------------------------------------
+
 
 ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase )
 : mrBase( rViewShellBase )
@@ -479,7 +479,7 @@ ViewOverlayManager::ViewOverlayManager( ViewShellBase& rViewShellBase )
     StartListening( *mrBase.GetDocShell() );
 }
 
-// --------------------------------------------------------------------
+
 
 ViewOverlayManager::~ViewOverlayManager()
 {
@@ -495,7 +495,7 @@ ViewOverlayManager::~ViewOverlayManager()
     DisposeTags();
 }
 
-// --------------------------------------------------------------------
+
 
 void ViewOverlayManager::Notify(SfxBroadcaster&, const SfxHint& rHint)
 {
@@ -562,7 +562,7 @@ bool ViewOverlayManager::CreateTags()
     return bChanges;
 }
 
-// --------------------------------------------------------------------
+
 
 bool ViewOverlayManager::DisposeTags()
 {
@@ -583,7 +583,7 @@ bool ViewOverlayManager::DisposeTags()
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK(ViewOverlayManager,EventMultiplexerListener,
     tools::EventMultiplexerEvent*,pEvent)
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 46f60850f70f..f59f11475a52 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1122,7 +1122,7 @@ void ViewShell::ImpGetUndoStrings(SfxItemSet &rSet) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const
 {
@@ -1152,7 +1152,7 @@ void ViewShell::ImpGetRedoStrings(SfxItemSet &rSet) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq)
 {
@@ -1201,7 +1201,7 @@ void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq)
     rReq.Done();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq)
 {
@@ -1250,7 +1250,7 @@ void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq)
     rReq.Done();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ViewShell::ExecReq( SfxRequest& rReq )
 {
diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx
index 6941e33ab45b..99fad9ef0cb2 100644
--- a/sd/workben/custompanel/ctp_panel.cxx
+++ b/sd/workben/custompanel/ctp_panel.cxx
@@ -103,7 +103,7 @@ namespace sd { namespace colortoolpanel
     //==================================================================================================================
     //= class SingleColorPanel
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     SingleColorPanel::SingleColorPanel( const Reference< XComponentContext >& i_rContext,
             const Reference< XConfigurationController >& i_rConfigController, const Reference< XResourceId >& i_rResourceId )
         :SingleColorPanel_Base( m_aMutex )
@@ -143,12 +143,12 @@ namespace sd { namespace colortoolpanel
         osl_atomic_decrement( &m_refCount );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SingleColorPanel::~SingleColorPanel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWindow > SAL_CALL SingleColorPanel::getWindow(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -157,7 +157,7 @@ namespace sd { namespace colortoolpanel
         return m_xWindow;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL SingleColorPanel::createAccessible( const Reference< XAccessible >& i_rParentAccessible ) throw (RuntimeException)
     {
         (void)i_rParentAccessible;
@@ -166,7 +166,7 @@ namespace sd { namespace colortoolpanel
         // extension only, you'll want to do this correctly ....
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XResourceId > SAL_CALL SingleColorPanel::getResourceId(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -175,7 +175,7 @@ namespace sd { namespace colortoolpanel
         return m_xResourceId;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL SingleColorPanel::isAnchorOnly(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -184,7 +184,7 @@ namespace sd { namespace colortoolpanel
         return sal_False;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SingleColorPanel::windowPaint( const PaintEvent& i_rEvent ) throw (RuntimeException)
     {
         try
@@ -204,13 +204,13 @@ namespace sd { namespace colortoolpanel
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SingleColorPanel::disposing( const EventObject& i_rSource ) throw (RuntimeException)
     {
         (void)i_rSource;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SingleColorPanel::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx
index 28ab1ce37f8b..11c14e713268 100644
--- a/sdext/source/minimizer/informationdialog.cxx
+++ b/sdext/source/minimizer/informationdialog.cxx
@@ -37,9 +37,9 @@
 #define PAGE_WIDTH      ( DIALOG_WIDTH - PAGE_POS_X ) - 6
 
 
-// ---------------------
+
 // - INFORMATIONDIALOG -
-// ---------------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
@@ -56,7 +56,7 @@ using namespace ::com::sun::star::container;
 
 
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertFixedText( InformationDialog& rInformationDialog, const OUString& rControlName, const OUString& rLabel,
                                 sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
@@ -311,7 +311,7 @@ void InformationDialog::InitDialog()
     setControlProperty( "OpenNewDocument", "State", Any( (sal_Int16)bOpenNewDocument ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 InformationDialog::InformationDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, const OUString& rSaveAsURL, sal_Bool& rbOpenNewDocument, const sal_Int64& rSourceSize, const sal_Int64& rDestSize, const sal_Int64& rApproxSize ) :
     UnoDialog( rxContext, rxFrame ),
@@ -333,13 +333,13 @@ InformationDialog::InformationDialog( const Reference< XComponentContext > &rxCo
     InitDialog();
 }
 
-// -----------------------------------------------------------------------------
+
 
 InformationDialog::~InformationDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool InformationDialog::execute()
 {
@@ -358,7 +358,7 @@ sal_Bool InformationDialog::execute()
     return mbStatus;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OKActionListener::actionPerformed( const ActionEvent& rEvent )
     throw ( com::sun::star::uno::RuntimeException )
diff --git a/sdext/source/minimizer/optimizationstats.cxx b/sdext/source/minimizer/optimizationstats.cxx
index 89f67e11613a..046961d118c7 100644
--- a/sdext/source/minimizer/optimizationstats.cxx
+++ b/sdext/source/minimizer/optimizationstats.cxx
@@ -32,20 +32,20 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::beans;
 
-// -----------------------------------------------------------------------------
+
 
 OptimizationStats::OptimizationStats()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizationStats::SetStatusValue( const PPPOptimizerTokenEnum eStat, const uno::Any& rStatValue )
 {
     maStats[ eStat ] = rStatValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum eStat ) const
 {
@@ -53,7 +53,7 @@ const uno::Any* OptimizationStats::GetStatusValue( const PPPOptimizerTokenEnum e
     return aIter != maStats.end() ? &((*aIter).second) : NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 com::sun::star::beans::PropertyValues OptimizationStats::GetStatusSequence()
 {
@@ -68,7 +68,7 @@ com::sun::star::beans::PropertyValues OptimizationStats::GetStatusSequence()
     return aStatsSequence;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizationStats::InitializeStatusValues( const uno::Sequence< PropertyValue >& rOptimizationStats )
 {
@@ -76,7 +76,7 @@ void OptimizationStats::InitializeStatusValues( const uno::Sequence< PropertyVal
         rOptimizationStats[ i ].Value >>= maStats[ TKGet( rOptimizationStats[ i ].Name ) ];
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizationStats::InitializeStatusValuesFromDocument( Reference< XModel > rxModel )
 {
diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx
index 4a28738cad9a..4aea11c751b6 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -30,9 +30,9 @@
 #include <sal/macros.h>
 #include <osl/time.h>
 
-// -------------------
+
 // - OPTIMIZERDIALOG -
-// -------------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star::io;
@@ -48,7 +48,7 @@ using namespace ::com::sun::star::script;
 using namespace ::com::sun::star::container;
 
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::InitDialog()
 {
@@ -79,7 +79,7 @@ void OptimizerDialog::InitDialog()
     mxDialogModelMultiPropertySet->setPropertyValues( aNames, aValues );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::InitRoadmap()
 {
@@ -134,7 +134,7 @@ void OptimizerDialog::InitRoadmap()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID )
 {
@@ -155,7 +155,7 @@ void OptimizerDialog::InsertRoadmapItem( const sal_Int32 nIndex, const sal_Bool
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::UpdateConfiguration()
 {
@@ -204,7 +204,7 @@ void OptimizerDialog::UpdateConfiguration()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContext, Reference< XFrame >& rxFrame, Reference< XDispatch > rxStatusDispatcher ) :
     UnoDialog( rxContext, rxFrame ),
@@ -240,7 +240,7 @@ OptimizerDialog::OptimizerDialog( const Reference< XComponentContext > &rxContex
     UpdateStatus( aStatusSequence );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OptimizerDialog::~OptimizerDialog()
 {
@@ -249,7 +249,7 @@ OptimizerDialog::~OptimizerDialog()
         SaveConfiguration();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool OptimizerDialog::execute()
 {
@@ -261,7 +261,7 @@ sal_Bool OptimizerDialog::execute()
     return mbStatus;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::SwitchPage( sal_Int16 nNewStep )
 {
@@ -308,7 +308,7 @@ void OptimizerDialog::UpdateControlStates( sal_Int16 nPage )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString OptimizerDialog::GetSelectedString( OUString const & token )
 {
@@ -329,7 +329,7 @@ OUString OptimizerDialog::GetSelectedString( OUString const & token )
     return aSelectedItem;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rStatus )
 {
@@ -361,7 +361,7 @@ void OptimizerDialog::UpdateStatus( const com::sun::star::uno::Sequence< com::su
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ItemListener::itemStateChanged( const ItemEvent& Event )
     throw ( RuntimeException )
@@ -496,7 +496,7 @@ void ItemListener::disposing( const ::com::sun::star::lang::EventObject& /* Sour
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ActionListener::actionPerformed( const ActionEvent& rEvent )
     throw ( com::sun::star::uno::RuntimeException )
@@ -646,7 +646,7 @@ void ActionListener::disposing( const ::com::sun::star::lang::EventObject& /* So
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ActionListenerListBox0Pg0::actionPerformed( const ActionEvent& rEvent )
     throw ( com::sun::star::uno::RuntimeException )
@@ -665,7 +665,7 @@ void ActionListenerListBox0Pg0::disposing( const ::com::sun::star::lang::EventOb
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TextListenerFormattedField0Pg1::textChanged( const TextEvent& /* rEvent */ )
     throw ( com::sun::star::uno::RuntimeException )
@@ -680,7 +680,7 @@ void TextListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::Ev
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TextListenerComboBox0Pg1::textChanged( const TextEvent& /* rEvent */ )
     throw ( com::sun::star::uno::RuntimeException )
@@ -709,7 +709,7 @@ void TextListenerComboBox0Pg1::disposing( const ::com::sun::star::lang::EventObj
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SpinListenerFormattedField0Pg1::up( const SpinEvent& /* rEvent */ )
     throw ( com::sun::star::uno::RuntimeException )
@@ -756,7 +756,7 @@ void SpinListenerFormattedField0Pg1::disposing( const ::com::sun::star::lang::Ev
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void HelpCloseListener::addCloseListener( const Reference < XCloseListener >& ) throw( RuntimeException )
 {
diff --git a/sdext/source/minimizer/optimizerdialogcontrols.cxx b/sdext/source/minimizer/optimizerdialogcontrols.cxx
index 86aae05b244f..bb4049423c81 100644
--- a/sdext/source/minimizer/optimizerdialogcontrols.cxx
+++ b/sdext/source/minimizer/optimizerdialogcontrols.cxx
@@ -20,9 +20,9 @@
 
 #include "optimizerdialog.hxx"
 
-// -------------------
+
 // - OptimizerDialog -
-// -------------------
+
 #include "pppoptimizer.hxx"
 #include "graphiccollector.hxx"
 #include "pagecollector.hxx"
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::presentation;
 
-// -----------------------------------------------------------------------------
+
 
 void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl )
 {
@@ -58,7 +58,7 @@ void SetBold( OptimizerDialog& rOptimizerDialog, const OUString& rControl )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, sal_Int32 nOrientation,
                         sal_Int32 nPosX, sal_Int32 nPosY, sal_Int32 nWidth, sal_Int32 nHeight )
@@ -89,7 +89,7 @@ OUString InsertSeparator( OptimizerDialog& rOptimizerDialog, const OUString& rCo
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, Reference< XActionListener >& xActionListener,
     sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nTabIndex, sal_Bool bEnabled, PPPOptimizerTokenEnum nResID, sal_Int16 nPushButtonType )
@@ -126,7 +126,7 @@ OUString InsertButton( OptimizerDialog& rOptimizerDialog, const OUString& rContr
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const OUString& rLabel,
                                 sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Bool bBold, sal_Int16 nTabIndex )
@@ -162,7 +162,7 @@ OUString InsertFixedText( OptimizerDialog& rOptimizerDialog, const OUString& rCo
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
     const Reference< XItemListener > xItemListener, const OUString& rLabel,
@@ -199,7 +199,7 @@ OUString InsertCheckBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
         const Reference< XTextListener > xTextListener, const Reference< XSpinListener > xSpinListener, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth,
@@ -247,7 +247,7 @@ OUString InsertFormattedField( OptimizerDialog& rOptimizerDialog, const OUString
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
     const Reference< XTextListener > xTextListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList,
@@ -288,7 +288,7 @@ OUString InsertComboBox( OptimizerDialog& rOptimizerDialog, const OUString& rCon
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& rControlName, const Reference< XItemListener > xItemListener,
     const OUString& rLabel, sal_Int32 nXPos, sal_Int32 nYPos, sal_Int32 nWidth, sal_Int32 nHeight, sal_Bool bMultiLine, sal_Int16 nTabIndex )
@@ -324,7 +324,7 @@ OUString InsertRadioButton( OptimizerDialog& rOptimizerDialog, const OUString& r
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rControlName,
     const Reference< XActionListener > xActionListener, const sal_Bool bEnabled, const Sequence< OUString >& rItemList,
@@ -367,7 +367,7 @@ OUString InsertListBox( OptimizerDialog& rOptimizerDialog, const OUString& rCont
     return rControlName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::InitNavigationBar()
 {
@@ -387,7 +387,7 @@ void OptimizerDialog::InitNavigationBar()
     setControlProperty( "btnNavNext", "DefaultButton", Any( sal_True ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::UpdateControlStatesPage0()
 {
@@ -436,7 +436,7 @@ void OptimizerDialog::InitPage0()
     UpdateControlStatesPage0();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::UpdateControlStatesPage1()
 {
@@ -476,7 +476,7 @@ void OptimizerDialog::InitPage1()
     UpdateControlStatesPage1();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::UpdateControlStatesPage2()
 {
@@ -541,7 +541,7 @@ void OptimizerDialog::InitPage2()
     UpdateControlStatesPage2();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void OptimizerDialog::UpdateControlStatesPage3()
 {
@@ -583,7 +583,7 @@ void OptimizerDialog::InitPage3()
     UpdateControlStatesPage3();
 }
 
-// -----------------------------------------------------------------------------
+
 
 static OUString ImpValueOfInMB( const sal_Int64& rVal, sal_Unicode nSeparator = '.' )
 {
@@ -917,7 +917,7 @@ void OptimizerDialog::InitPage4()
     UpdateControlStatesPage4();
 }
 
-// -----------------------------------------------------------------------------
+
 void OptimizerDialog::EnablePage( sal_Int16 nStep )
 {
     std::vector< OUString >::iterator aBeg( maControlPages[ nStep ].begin() );
diff --git a/sdext/source/minimizer/pppoptimizer.cxx b/sdext/source/minimizer/pppoptimizer.cxx
index b6679e82ad46..e0dc626c7630 100644
--- a/sdext/source/minimizer/pppoptimizer.cxx
+++ b/sdext/source/minimizer/pppoptimizer.cxx
@@ -63,7 +63,7 @@ Reference< com::sun::star::frame::XDispatch > SAL_CALL PPPOptimizer::queryDispat
     return xRet;
 }
 
-//------------------------------------------------------------------------------
+
 
 Sequence< Reference< com::sun::star::frame::XDispatch > > SAL_CALL PPPOptimizer::queryDispatches(
     const Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( RuntimeException )
diff --git a/sdext/source/minimizer/unodialog.cxx b/sdext/source/minimizer/unodialog.cxx
index f1a3e7062dcb..903225cc361a 100644
--- a/sdext/source/minimizer/unodialog.cxx
+++ b/sdext/source/minimizer/unodialog.cxx
@@ -30,9 +30,9 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XControlAccess.hpp>
 
-// -------------
+
 // - UnoDialog -
-// -------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star::awt;
@@ -67,14 +67,14 @@ UnoDialog::UnoDialog( const Reference< XComponentContext > &rxContext, Reference
     createWindowPeer( mxWindowPeer );
 }
 
-// -----------------------------------------------------------------------------
+
 
 UnoDialog::~UnoDialog()
 {
 
 }
 
-// -----------------------------------------------------------------------------
+
 
 void UnoDialog::execute()
 {
@@ -89,7 +89,7 @@ void UnoDialog::endExecute( sal_Bool bStatus )
     mxDialog->endExecute();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > xParentPeer )
     throw ( Exception )
@@ -104,7 +104,7 @@ Reference< XWindowPeer > UnoDialog::createWindowPeer( Reference< XWindowPeer > x
     return mxDialog->getPeer();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XInterface > UnoDialog::insertControlModel( const OUString& rServiceName, const OUString& rName,
                                                         const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues )
@@ -123,7 +123,7 @@ Reference< XInterface > UnoDialog::insertControlModel( const OUString& rServiceN
     return xControlModel;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void UnoDialog::setVisible( const OUString& rName, sal_Bool bVisible )
 {
@@ -138,7 +138,7 @@ void UnoDialog::setVisible( const OUString& rName, sal_Bool bVisible )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference< XActionListener > xActionListener,
             const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rPropertyValues )
@@ -165,7 +165,7 @@ Reference< XButton > UnoDialog::insertButton( const OUString& rName, Reference<
     return xButton;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -183,7 +183,7 @@ Reference< XFixedText > UnoDialog::insertFixedText( const OUString& rName, const
     return xFixedText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -201,7 +201,7 @@ Reference< XCheckBox > UnoDialog::insertCheckBox( const OUString& rName, const S
     return xCheckBox;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -219,7 +219,7 @@ Reference< XControl > UnoDialog::insertFormattedField( const OUString& rName, co
     return xControl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -237,7 +237,7 @@ Reference< XComboBox > UnoDialog::insertComboBox( const OUString& rName, const S
     return xControl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -255,7 +255,7 @@ Reference< XRadioButton > UnoDialog::insertRadioButton( const OUString& rName, c
     return xControl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -273,7 +273,7 @@ Reference< XListBox > UnoDialog::insertListBox( const OUString& rName, const Seq
     return xControl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Sequence< OUString > rPropertyNames, const Sequence< Any > rPropertyValues )
 {
@@ -291,7 +291,7 @@ Reference< XControl > UnoDialog::insertImage( const OUString& rName, const Seque
     return xControl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void UnoDialog::setControlProperty( const OUString& rControlName, const OUString& rPropertyName, const Any& rPropertyValue )
 {
@@ -308,7 +308,7 @@ void UnoDialog::setControlProperty( const OUString& rControlName, const OUString
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString& rPropertyName )
 {
@@ -327,7 +327,7 @@ Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString&
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void UnoDialog::enableControl( const OUString& rControlName )
 {
@@ -335,7 +335,7 @@ void UnoDialog::enableControl( const OUString& rControlName )
     setControlProperty( rControlName, sEnabled, Any( sal_True ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void UnoDialog::disableControl( const OUString& rControlName )
 {
@@ -343,6 +343,6 @@ void UnoDialog::disableControl( const OUString& rControlName )
     setControlProperty( rControlName, sEnabled, Any( sal_False ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx
index 3ac732c318cb..964f30bfd2ff 100644
--- a/sdext/source/pdfimport/pdfiadaptor.cxx
+++ b/sdext/source/pdfimport/pdfiadaptor.cxx
@@ -200,7 +200,7 @@ void SAL_CALL PDFIHybridAdaptor::setTargetDocument( const uno::Reference< lang::
         throw lang::IllegalArgumentException();
 }
 
-//---------------------------------------------------------------------------------------
+
 
 PDFIRawAdaptor::PDFIRawAdaptor( const uno::Reference< uno::XComponentContext >& xContext ) :
     PDFIAdaptorBase( m_aMutex ),
diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
index e4cde0391be6..bfa11ee95c80 100644
--- a/sdext/source/pdfimport/wrapper/wrapper.cxx
+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
@@ -1029,7 +1029,7 @@ bool xpdf_ImportFromFile( const OUString&                             rURL,
     }
 
     // spawn separate process to keep LGPL/GPL code apart.
-    // ---------------------------------------------------
+
     rtl_uString** ppEnv = NULL;
     sal_uInt32 nEnv = 0;
 
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 4704f5b2bcdd..391f755f07ed 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -368,7 +368,7 @@ void writeImage_( OutputBuffer&     o_rOutputBuf,
 }
 
 // forwarders
-// ------------------------------------------------------------------
+
 
 inline void writeImage( OutputBuffer&     o_rOutputBuf,
                         Stream*           str,
@@ -391,7 +391,7 @@ inline void writeMaskLF( OutputBuffer&     o_rOutputBuf,
                          int               height,
                          bool              bInvert ) { writeMask_(o_rOutputBuf,str,width,height,true,bInvert); }
 
-// ------------------------------------------------------------------
+
 
 
 int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) const
diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx
index 14c477f8a143..9b916ba58ead 100644
--- a/sdext/source/presenter/PresenterButton.cxx
+++ b/sdext/source/presenter/PresenterButton.cxx
@@ -361,7 +361,7 @@ void SAL_CALL PresenterButton::disposing (const css::lang::EventObject& rEvent)
         mxWindow = NULL;
 }
 
-//-----------------------------------------------------------------------------
+
 
 css::geometry::IntegerSize2D PresenterButton::CalculateButtonSize (void)
 {
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 573066745d42..37d7bbb908bb 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -1079,7 +1079,7 @@ void SAL_CALL PresenterController::mouseDragged (const css::awt::MouseEvent& rEv
     (void)rEvent;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterController::InitializeMainPane (const Reference<XPane>& rxPane)
 {
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index 7975b05da11a..782f820cc4a7 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -462,7 +462,7 @@ sal_Bool SAL_CALL PresenterHelpView::isAnchorOnly (void)
     return false;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterHelpView::ProvideCanvas (void)
 {
diff --git a/sdext/source/presenter/PresenterNotesView.cxx b/sdext/source/presenter/PresenterNotesView.cxx
index 28d93889d22d..a1d9af939d99 100644
--- a/sdext/source/presenter/PresenterNotesView.cxx
+++ b/sdext/source/presenter/PresenterNotesView.cxx
@@ -420,7 +420,7 @@ void SAL_CALL PresenterNotesView::keyReleased (const awt::KeyEvent& rEvent)
     (void)rEvent;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterNotesView::Layout (void)
 {
diff --git a/sdext/source/presenter/PresenterPane.cxx b/sdext/source/presenter/PresenterPane.cxx
index 458ea7d6c38f..fab3c5415654 100644
--- a/sdext/source/presenter/PresenterPane.cxx
+++ b/sdext/source/presenter/PresenterPane.cxx
@@ -139,7 +139,7 @@ void SAL_CALL PresenterPane::windowPaint (const awt::PaintEvent& rEvent)
     PaintBorder(rEvent.UpdateRect);
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterPane::CreateCanvases (
     const Reference<awt::XWindow>& rxParentWindow,
diff --git a/sdext/source/presenter/PresenterPaneBase.cxx b/sdext/source/presenter/PresenterPaneBase.cxx
index 2ded1b0e3c31..87a6831b2463 100644
--- a/sdext/source/presenter/PresenterPaneBase.cxx
+++ b/sdext/source/presenter/PresenterPaneBase.cxx
@@ -314,7 +314,7 @@ void SAL_CALL PresenterPaneBase::disposing (const lang::EventObject& rEvent)
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterPaneBase::CreateWindows (
     const Reference<awt::XWindow>& rxParentWindow,
diff --git a/sdext/source/presenter/PresenterPaneBorderManager.cxx b/sdext/source/presenter/PresenterPaneBorderManager.cxx
index f02c4b0e1c7a..48f9e805a71b 100644
--- a/sdext/source/presenter/PresenterPaneBorderManager.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderManager.cxx
@@ -478,7 +478,7 @@ void SAL_CALL PresenterPaneBorderManager::disposing (const lang::EventObject& rE
         }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterPaneBorderManager::CaptureMouse (const Reference<awt::XWindow>& rxWindow)
 {
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
index 9b03dc3a576e..f72384ac792f 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx
@@ -292,7 +292,7 @@ awt::Point SAL_CALL PresenterPaneBorderPainter::getCalloutOffset (
     return awt::Point(0,0);
 }
 
-//-----------------------------------------------------------------------------
+
 
 bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanvas>& rxCanvas)
 {
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx
index 99615eb55d4c..c7799ca2d8e4 100644
--- a/sdext/source/presenter/PresenterPaneFactory.cxx
+++ b/sdext/source/presenter/PresenterPaneFactory.cxx
@@ -216,7 +216,7 @@ void SAL_CALL PresenterPaneFactory::releaseResource (const Reference<XResource>&
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference<XResource> PresenterPaneFactory::CreatePane (
     const Reference<XResourceId>& rxPaneId,
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 60068de88daf..66720aea00a7 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -321,7 +321,7 @@ Sequence<Reference<frame::XDispatch> > SAL_CALL PresenterProtocolHandler::queryD
     return Sequence<Reference<frame::XDispatch> >();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterProtocolHandler::ThrowIfDisposed (void) const
     throw (::com::sun::star::lang::DisposedException)
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index bd80b60a5aaa..bf663c05766b 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -326,7 +326,7 @@ void SAL_CALL PresenterScreen::disposing (const lang::EventObject& /*rEvent*/)
     RequestShutdownPresenterScreen();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterScreen::InitializePresenterScreen (void)
 {
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 44cb4e6f4c9b..9f88364ec170 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -474,7 +474,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven
         mxWindow = NULL;
 }
 
-//-----------------------------------------------------------------------------
+
 
 geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const
 {
diff --git a/sdext/source/presenter/PresenterSlidePreview.cxx b/sdext/source/presenter/PresenterSlidePreview.cxx
index 3055afeccfc0..55c040d41ae8 100644
--- a/sdext/source/presenter/PresenterSlidePreview.cxx
+++ b/sdext/source/presenter/PresenterSlidePreview.cxx
@@ -217,7 +217,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlidePreview::getCurrentPage (vo
     return NULL;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterSlidePreview::SetSlide (const Reference<drawing::XDrawPage>& rxPage)
 {
diff --git a/sdext/source/presenter/PresenterSlideShowView.cxx b/sdext/source/presenter/PresenterSlideShowView.cxx
index 19aa959dfadd..a230cb82381a 100644
--- a/sdext/source/presenter/PresenterSlideShowView.cxx
+++ b/sdext/source/presenter/PresenterSlideShowView.cxx
@@ -687,7 +687,7 @@ void PresenterSlideShowView::DeactivatePresenterView (void)
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterSlideShowView::PaintOuterWindow (const awt::Rectangle& rRepaintBox)
 {
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 19c07652ee9f..a330949aeb9b 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -681,7 +681,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterSlideSorter::getCurrentPage (voi
     return NULL;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterSlideSorter::UpdateLayout (void)
 {
diff --git a/sdext/source/presenter/PresenterSpritePane.cxx b/sdext/source/presenter/PresenterSpritePane.cxx
index b1bd9045f332..099495bf0a83 100644
--- a/sdext/source/presenter/PresenterSpritePane.cxx
+++ b/sdext/source/presenter/PresenterSpritePane.cxx
@@ -146,7 +146,7 @@ void SAL_CALL PresenterSpritePane::windowPaint (const awt::PaintEvent& rEvent)
     */
 }
 
-//-----------------------------------------------------------------------------
+
 
 ::boost::shared_ptr<PresenterSprite> PresenterSpritePane::GetSprite (void)
 {
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 8396f26dee3e..bf3fedae9e3b 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -613,7 +613,7 @@ Reference<drawing::XDrawPage> SAL_CALL PresenterToolBar::getCurrentPage (void)
     return mxCurrentSlide;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void PresenterToolBar::CreateControls (
     const OUString& rsConfigurationPath)
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index f3315ba79cbf..37516d060290 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -287,7 +287,7 @@ void SAL_CALL PresenterViewFactory::releaseResource (const Reference<XResource>&
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference<XResource> PresenterViewFactory::GetViewFromCache(
     const Reference<XResourceId>& rxViewId,
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index f6b5b5496b5e..ef578424e55b 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -370,7 +370,7 @@ void SAL_CALL PresenterWindowManager::disposing (const lang::EventObject& rEvent
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 bool PresenterWindowManager::PaintChildren (const awt::PaintEvent& rEvent) const
 {
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index b25602db198a..c2f690fbf724 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -54,7 +54,7 @@ BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
     return ( *pStr1 == 0 && *pStr2 == 0 );
 }
 
-//----------------------------------------------------------
+
 char* UnicodeToAnsiString( wchar_t* pUniString )
 {
     int len = WideCharToMultiByte(
@@ -68,7 +68,7 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
     return buff;
 }
 
-//----------------------------------------------------------
+
 void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
 {
     HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
@@ -95,7 +95,7 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
     }
 }
 
-//----------------------------------------------------------
+
 void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
 {
     HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
@@ -109,7 +109,7 @@ void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallF
     }
 }
 
-//----------------------------------------------------------
+
 BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
 {
     DWORD sz = 0;
@@ -128,7 +128,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
     return FALSE;
 }
 
-//----------------------------------------------------------
+
 BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
 {
     wchar_t* pProgPath = NULL;
@@ -155,7 +155,7 @@ BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
     return FALSE;
 }
 
-//----------------------------------------------------------
+
 BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDeinstallMode )
 {
     // for now the chart is always installed
@@ -254,7 +254,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
     return TRUE;
 }
 
-//----------------------------------------------------------
+
 BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
 {
     BOOL bResult = FALSE;
@@ -268,7 +268,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
     return bResult;
 }
 
-//----------------------------------------------------------
+
 BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
 {
     BOOL bResult = FALSE;
@@ -281,7 +281,7 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
 
     return bResult;
 }
-//----------------------------------------------------------
+
 extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
 {
     INSTALLSTATE current_state;
@@ -328,7 +328,7 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
     return ERROR_SUCCESS;
 }
 
-//----------------------------------------------------------
+
 extern "C" UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI )
 {
     INSTALLSTATE current_state;
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
index 0c51ccb8f97e..b8087af82deb 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
@@ -32,7 +32,7 @@
 #include <malloc.h>
 #include <stdio.h>
 
-//----------------------------------------------------------
+
 BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
 {
     if ( pStr1 == NULL && pStr2 == NULL )
@@ -46,7 +46,7 @@ BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
     return ( *pStr1 == 0 && *pStr2 == 0 );
 }
 
-//----------------------------------------------------------
+
 BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
 {
     DWORD sz = 0;
@@ -65,7 +65,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
     return FALSE;
 }
 
-//----------------------------------------------------------
+
 BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
 {
     BOOL bResult = FALSE;
@@ -79,7 +79,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
     return bResult;
 }
 
-//----------------------------------------------------------
+
 extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
 {
     // MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 4207837fead2..d76b7646b7db 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -44,7 +44,7 @@
 
 #include <systools/win32/uwinapi.h>
 
-//----------------------------------------------------------
+
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
 {
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index fb106d7cb8b5..5253b41f5cf2 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -45,7 +45,7 @@
 #include <systools/win32/uwinapi.h>
 #include <../tools/seterror.hxx>
 
-//----------------------------------------------------------
+
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
 {
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index 714894636bb2..526cc76d0839 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -35,7 +35,7 @@
 
 #include <seterror.hxx>
 
-//----------------------------------------------------------
+
 BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
 {
     DWORD sz = 0;
@@ -54,7 +54,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
     return FALSE;
 }
 
-//----------------------------------------------------------
+
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
 {
@@ -71,7 +71,7 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
 }
 #endif
 
-//----------------------------------------------------------
+
 extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI )
 {
     // MessageBox(NULL, L"CheckVersions", L"Information", MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx b/setup_native/source/win32/customactions/tools/seterror.cxx
index 8a60b8a8df30..c7de7b7a761a 100644
--- a/setup_native/source/win32/customactions/tools/seterror.cxx
+++ b/setup_native/source/win32/customactions/tools/seterror.cxx
@@ -34,7 +34,7 @@
 
 #include <seterror.hxx>
 
-//----------------------------------------------------------
+
 #ifdef DEBUG
 inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
 {
@@ -51,7 +51,7 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
 }
 #endif
 
-//----------------------------------------------------------
+
 void SetMsiErrorCode( int nErrorCode )
 {
     const TCHAR sMemMapName[] = TEXT( "Global\\MsiErrorObject" );
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 69d5b9e4161d..7a500e8c0263 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -277,7 +277,7 @@ const OUString& SfxApplication::GetLastSaveDirectory() const
     return GetLastDir_Impl();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::SetLastDir_Impl
 (
@@ -297,21 +297,21 @@ void SfxApplication::SetLastDir_Impl
     pAppData_Impl->aLastDir = rNewDir;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::ResetLastDir()
 {
     pAppData_Impl->aLastDir = "";
 }
 
-//--------------------------------------------------------------------
+
 
 SfxDispatcher* SfxApplication::GetDispatcher_Impl()
 {
     return pAppData_Impl->pViewFrame? pAppData_Impl->pViewFrame->GetDispatcher(): pAppData_Impl->pAppDispat;
 }
 
-//--------------------------------------------------------------------
+
 void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
 {
     if ( pFrame != pAppData_Impl->pViewFrame )
@@ -377,21 +377,21 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
         pFrame->GetViewShell()->SetCurrentDocument();
 }
 
-//---------------------------------------------------------------------
+
 
 ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
 {
     return ResMgr::CreateResMgr(pPrefix);
 }
 
-//--------------------------------------------------------------------
+
 
 ResMgr* SfxApplication::GetSfxResManager()
 {
     return SfxResId::GetResMgr();
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxApplication::SetProgress_Impl
 (
@@ -413,21 +413,21 @@ void SfxApplication::SetProgress_Impl
     pAppData_Impl->pProgress = pProgress;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SfxApplication::GetFreeIndex()
 {
     return pAppData_Impl->aIndexBitSet.GetFreeIndex()+1;
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxApplication::ReleaseIndex(sal_uInt16 i)
 {
     pAppData_Impl->aIndexBitSet.ReleaseIndex(i-1);
 }
 
-//--------------------------------------------------------------------
+
 
 Window* SfxApplication::GetTopWindow() const
 {
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 2aa0acb4119f..57a3733477b0 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -94,7 +94,7 @@ sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
            const char *pName, sal_uInt32 nSID, SbxDataType eType, SbxClassType eClassType )
@@ -116,7 +116,7 @@ SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 BasicManager* SfxApplication::GetBasicManager()
 {
@@ -127,7 +127,7 @@ BasicManager* SfxApplication::GetBasicManager()
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 XLibraryContainer * SfxApplication::GetDialogContainer()
 {
@@ -140,7 +140,7 @@ XLibraryContainer * SfxApplication::GetDialogContainer()
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 XLibraryContainer * SfxApplication::GetBasicContainer()
 {
@@ -153,7 +153,7 @@ XLibraryContainer * SfxApplication::GetBasicContainer()
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 StarBASIC* SfxApplication::GetBasic()
 {
@@ -164,7 +164,7 @@ StarBASIC* SfxApplication::GetBasic()
 #endif
 }
 
-//-------------------------------------------------------------------------
+
 void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 {
 #ifdef DISABLE_SCRIPTING
@@ -219,7 +219,7 @@ void SfxApplication::PropExec_Impl( SfxRequest &rReq )
 #endif
 }
 
-//-------------------------------------------------------------------------
+
 void SfxApplication::PropState_Impl( SfxItemSet &rSet )
 {
 #ifdef DISABLE_SCRIPTING
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 06660f0210ea..c7bdf9703ff5 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -78,7 +78,7 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::beans;
 
-//-------------------------------------------------------------------------
+
 
 class SfxEventAsyncer_Impl : public SfxListener
 {
@@ -93,7 +93,7 @@ public:
     DECL_LINK( TimerHdl, Timer*);
 };
 
-// -----------------------------------------------------------------------
+
 
 void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
@@ -105,7 +105,7 @@ void SfxEventAsyncer_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint )
  : aHint( rHint )
@@ -118,14 +118,14 @@ SfxEventAsyncer_Impl::SfxEventAsyncer_Impl( const SfxEventHint& rHint )
     pTimer->Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxEventAsyncer_Impl::~SfxEventAsyncer_Impl()
 {
     delete pTimer;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
 {
@@ -148,7 +148,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
 }
 
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
 {
@@ -771,7 +771,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
     batch->commit();
 }
 
-//--------------------------------------------------------------------
+
 void SfxApplication::SetOptions(const SfxItemSet &rSet)
 {
     SvtPathOptions aPathOptions;
@@ -873,7 +873,7 @@ void SfxApplication::SetOptions(const SfxItemSet &rSet)
     Broadcast( SfxItemSetHint( rSet ) );
 }
 
-//--------------------------------------------------------------------
+
 void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron )
 {
     SfxObjectShell *pDoc = rEventHint.GetObjShell();
diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx
index 9fa22a32a347..4714bb9026f9 100644
--- a/sfx2/source/appl/appchild.cxx
+++ b/sfx2/source/appl/appchild.cxx
@@ -125,14 +125,14 @@ void SfxApplication::RegisterChildWindowContext_Impl( SfxModule *pMod, sal_uInt1
     OSL_FAIL( "No ChildWindow for this Context!" );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxChildWinFactArr_Impl& SfxApplication::GetChildWinFactories_Impl() const
 {
     return ( *(pAppData_Impl->pFactArr));
 }
 
-//--------------------------------------------------------------------
+
 
 SfxTemplateDialog* SfxApplication::GetTemplateDialog()
 {
@@ -145,7 +145,7 @@ SfxTemplateDialog* SfxApplication::GetTemplateDialog()
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxWorkWindow* SfxApplication::GetWorkWindow_Impl(const SfxViewFrame *pFrame) const
 {
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index e82cb17a87e0..502759c4c8ad 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -74,7 +74,7 @@ public:
     virtual bool SysTopicExecute( const OUString* pStr );
 };
 
-//--------------------------------------------------------------------
+
 namespace
 {
     sal_Bool lcl_IsDocument( const OUString& rContent )
@@ -363,7 +363,7 @@ long SfxObjectShell::DdeExecute( const OUString&   rCmd )  // Expressed in our B
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Description]
 
@@ -379,7 +379,7 @@ bool SfxObjectShell::DdeGetData( const OUString&,              // the Item to be
     return false;
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Description]
 
@@ -582,14 +582,14 @@ DdeService* SfxApplication::GetDdeService()
     return pAppData_Impl->pDdeService;
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxDdeTriggerTopic_Impl::Execute( const OUString* )
 {
     return true;
 }
 
-//--------------------------------------------------------------------
+
 DdeData* SfxDdeDocTopic_Impl::Get( sal_uIntPtr nFormat )
 {
     OUString sMimeType( SotExchange::GetFormatMimeType( nFormat ));
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index f0a96fd2fdaa..7be5e02cea86 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -53,7 +53,7 @@ DBG_NAME(SfxAppMainCHAOSReg)
 
 TYPEINIT2(SfxApplication,SfxShell,SfxBroadcaster);
 
-//--------------------------------------------------------------------
+
 void SfxApplication::Init
 (
 )
@@ -77,7 +77,7 @@ void SfxApplication::Init
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::Exit()
 
@@ -98,7 +98,7 @@ void SfxApplication::Exit()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxFilterMatcher& SfxApplication::GetFilterMatcher()
 {
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index a1d7aa6533b7..536105edba7d 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -109,7 +109,7 @@ SFX_IMPL_INTERFACE(SfxApplication,SfxShell,SfxResId(RID_DESKTOP))
     SFX_CHILDWINDOW_REGISTRATION(SID_DOCKWIN_9);
 }
 
-//--------------------------------------------------------------------
+
 SfxProgress* SfxApplication::GetProgress() const
 
 /*  [Description]
@@ -159,7 +159,7 @@ SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl
 bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWidth)
 {
     // Load from disk
-    // ---------------------------------------------------------------------
+
     OUString aBaseName = OUString("/") + OUString::createFromAscii( pName );
 
     rtl_Locale *pLoc = NULL;
@@ -172,7 +172,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
     SvgData aSvgData(aObj.PathToFileName());
 
     // transform into [0,0,width,width*aspect] std dimensions
-    // ---------------------------------------------------------------------
+
     basegfx::B2DRange aRange(aSvgData.getRange());
     const double fAspectRatio(aRange.getWidth()/aRange.getHeight());
     basegfx::B2DHomMatrix aTransform(
@@ -188,7 +188,7 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
             aSvgData.getPrimitive2DSequence()));
 
     // UNO dance to render from drawinglayer
-    // ---------------------------------------------------------------------
+
     uno::Reference< uno::XComponentContext > xContext(::comphelper::getProcessComponentContext());
 
     try
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 69d0b374fb5f..12100ab243f0 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -166,7 +166,7 @@ private:
     Reference< embed::XStorage > mxStorage;
 };
 
-//--------------------------------------------------------------------
+
 ::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData )
 {
     o_rEncryptionData = ::comphelper::OStorageHelper::CreatePackageEncryptionData( rPassword );
@@ -174,7 +174,7 @@ private:
 }
 
 
-//--------------------------------------------------------------------
+
 ::comphelper::DocPasswordVerifierResult SfxDocPasswordVerifier::verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData )
 {
     ::comphelper::DocPasswordVerifierResult eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
@@ -207,7 +207,7 @@ private:
 
 //====================================================================
 
-//--------------------------------------------------------------------
+
 
 sal_uInt32 CheckPasswd_Impl
 (
@@ -312,7 +312,7 @@ sal_uInt32 CheckPasswd_Impl
     return nRet;
 }
 
-//--------------------------------------------------------------------
+
 
 
 sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUString &rFileName, sal_Bool bCopy, SfxItemSet* pSet )
@@ -438,7 +438,7 @@ sal_uIntPtr SfxApplication::LoadTemplate( SfxObjectShellLock& xDoc, const OUStri
     return xDoc->GetErrorCode();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
 {
@@ -471,7 +471,7 @@ void SfxApplication::NewDocDirectExec_Impl( SfxRequest& rReq )
         rReq.SetReturnValue( SfxFrameItem( 0, pItem->GetFrame() ) );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
 {
@@ -577,7 +577,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq )
     }
 }
 
-//---------------------------------------------------------------------------
+
 
 namespace {
 
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 3ced333d3577..482c0c34f14f 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -74,7 +74,7 @@ sal_Bool SfxApplication::QueryExit_Impl()
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxApplication::Deinitialize()
 {
diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx
index 4e7bd4895e44..ce07f9a5749b 100644
--- a/sfx2/source/appl/appreg.cxx
+++ b/sfx2/source/appl/appreg.cxx
@@ -65,7 +65,7 @@ void SfxApplication::Registrations_Impl()
     SfxRecentFilesToolBoxControl::RegisterControl( SID_OPENDOC );
 };
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFactory *pFact )
 {
@@ -90,7 +90,7 @@ void SfxApplication::RegisterToolBoxControl_Impl( SfxModule *pMod, SfxTbxCtrlFac
     pAppData_Impl->pTbxCtrlFac->push_back( pFact );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlFactory *pFact )
 {
@@ -115,7 +115,7 @@ void SfxApplication::RegisterStatusBarControl_Impl( SfxModule *pMod, SfxStbCtrlF
     pAppData_Impl->pStbCtrlFac->push_back( pFact );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::RegisterMenuControl_Impl( SfxModule *pMod, SfxMenuCtrlFactory *pFact )
 {
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 8faf821e684a..d1f01865bb73 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -698,7 +698,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         rReq.Done();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxApplication::MiscState_Impl(SfxItemSet &rSet)
 {
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 06114c61be23..3d2c26b2a354 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -56,7 +56,7 @@ struct SfxChildWindow_Impl
     SfxWorkWindow*      pWorkWin;
 };
 
-// -----------------------------------------------------------------------
+
 
 class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
 {
@@ -100,7 +100,7 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::
         SfxChildWindow_Impl* m_pData ;
 };
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize )
 {
@@ -185,7 +185,7 @@ void SfxChildWindow::Destroy()
         delete this;
 }
 
-//-------------------------------------------------------------------------
+
 SfxChildWindow::~SfxChildWindow()
 {
     DBG_DTOR(SfxChildWindow,0);
@@ -194,7 +194,7 @@ SfxChildWindow::~SfxChildWindow()
     delete pImp;
 }
 
-//-------------------------------------------------------------------------
+
 SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
         Window *pParent, SfxBindings* pBindings, SfxChildWinInfo& rInfo)
 {
@@ -276,7 +276,7 @@ SfxChildWindow* SfxChildWindow::CreateChildWindow( sal_uInt16 nId,
     return pChild;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
 {
     sal_uInt16 nID = GetType();
@@ -308,7 +308,7 @@ void SfxChildWindow::SaveStatus(const SfxChildWinInfo& rInfo)
     pImp->pFact->aInfo = rInfo;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
 {
     DBG_CHKTHIS(SfxChildWindow,0);
@@ -316,7 +316,7 @@ void SfxChildWindow::SetAlignment(SfxChildAlignment eAlign)
     eChildAlignment = eAlign;
 }
 
-//-------------------------------------------------------------------------
+
 SfxChildWinInfo SfxChildWindow::GetInfo() const
 {
     DBG_CHKTHIS(SfxChildWindow,0);
@@ -348,13 +348,13 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
     return aInfo;
 }
 
-//-------------------------------------------------------------------------
+
 sal_uInt16 SfxChildWindow::GetPosition()
 {
     return pImp->pFact->nPos;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxChildWindow::InitializeChildWinFactory_Impl(sal_uInt16 nId, SfxChildWinInfo& rInfo)
 {
     // load configuration
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index 13dbfc27354c..c53000fd5baf 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -63,7 +63,7 @@ struct Impl_DownLoadData
     }
 };
 
-// --------------------------------------------------------------------------
+
 
 
 SvFileObject::SvFileObject() :
diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx
index ee6b5d207078..e837e7864a60 100644
--- a/sfx2/source/appl/helpdispatch.cxx
+++ b/sfx2/source/appl/helpdispatch.cxx
@@ -41,13 +41,13 @@ HelpDispatch_Impl::HelpDispatch_Impl( HelpInterceptor_Impl& _rInterceptor,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 HelpDispatch_Impl::~HelpDispatch_Impl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 // XDispatch
 
 void SAL_CALL HelpDispatch_Impl::dispatch(
@@ -88,7 +88,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch(
     pHelpWin->loadHelpContent(aURL.Complete);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpDispatch_Impl::addStatusListener(
 
@@ -99,7 +99,7 @@ void SAL_CALL HelpDispatch_Impl::addStatusListener(
     m_xRealDispatch->addStatusListener( xControl, aURL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpDispatch_Impl::removeStatusListener(
 
diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx
index f126fc681679..9316482c044e 100644
--- a/sfx2/source/appl/helpinterceptor.cxx
+++ b/sfx2/source/appl/helpinterceptor.cxx
@@ -49,7 +49,7 @@ HelpInterceptor_Impl::HelpInterceptor_Impl() :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 HelpInterceptor_Impl::~HelpInterceptor_Impl()
 {
@@ -61,7 +61,7 @@ HelpInterceptor_Impl::~HelpInterceptor_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpInterceptor_Impl::addURL( const OUString& rURL )
 {
@@ -106,7 +106,7 @@ void HelpInterceptor_Impl::addURL( const OUString& rURL )
     m_pWindow->UpdateToolbox();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame )
 {
@@ -116,7 +116,7 @@ void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame )
         m_xIntercepted->registerDispatchProviderInterceptor( (XDispatchProviderInterceptor*)this );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool HelpInterceptor_Impl::HasHistoryPred() const
 {
@@ -129,7 +129,7 @@ sal_Bool HelpInterceptor_Impl::HasHistorySucc() const
 }
 
 
-// -----------------------------------------------------------------------
+
 // XDispatchProvider
 
 Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
@@ -155,7 +155,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch(
     return xResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatches(
 
@@ -174,7 +174,7 @@ Sequence < Reference < XDispatch > > SAL_CALL HelpInterceptor_Impl::queryDispatc
     return aReturn;
 }
 
-// -----------------------------------------------------------------------
+
 // XDispatchProviderInterceptor
 
 Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchProvider()
@@ -185,7 +185,7 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getSlaveDispatchPr
     return m_xSlaveDispatcher;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< XDispatchProvider >& xNewSlave )
 
@@ -195,7 +195,7 @@ void SAL_CALL HelpInterceptor_Impl::setSlaveDispatchProvider( const Reference< X
     m_xSlaveDispatcher = xNewSlave;
 }
 
-// -----------------------------------------------------------------------
+
 
 Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchProvider()
 
@@ -205,7 +205,7 @@ Reference< XDispatchProvider > SAL_CALL HelpInterceptor_Impl::getMasterDispatchP
     return m_xMasterDispatcher;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference< XDispatchProvider >& xNewMaster )
 
@@ -215,7 +215,7 @@ void SAL_CALL HelpInterceptor_Impl::setMasterDispatchProvider( const Reference<
     m_xMasterDispatcher = xNewMaster;
 }
 
-// -----------------------------------------------------------------------
+
 // XInterceptorInfo
 
 Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs()
@@ -228,7 +228,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs()
     return aURLList;
 }
 
-// -----------------------------------------------------------------------
+
 // XDispatch
 
 void SAL_CALL HelpInterceptor_Impl::dispatch(
@@ -268,7 +268,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpInterceptor_Impl::addStatusListener(
     const Reference< XStatusListener >& xControl, const URL& ) throw( RuntimeException )
@@ -277,7 +277,7 @@ void SAL_CALL HelpInterceptor_Impl::addStatusListener(
     m_xListener = xControl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpInterceptor_Impl::removeStatusListener(
     const Reference< XStatusListener >&, const URL&) throw( RuntimeException )
@@ -293,7 +293,7 @@ HelpListener_Impl::HelpListener_Impl( HelpInterceptor_Impl* pInter )
     pInterceptor->addStatusListener( this, ::com::sun::star::util::URL() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
 
@@ -305,7 +305,7 @@ void SAL_CALL HelpListener_Impl::statusChanged( const ::com::sun::star::frame::F
     aChangeLink.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL HelpListener_Impl::disposing( const ::com::sun::star::lang::EventObject& )
 
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 7303a78677e7..f909c0a99f7f 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -103,7 +103,7 @@ void LinkManager::CloseCachedComps()
     maCachedComps.clear();
 }
 
-//--------------------------------------------------------------------------
+
 
 void LinkManager::Remove( SvBaseLink *pLink )
 {
@@ -338,7 +338,7 @@ void LinkManager::UpdateAllLinks(
     CloseCachedComps();
 }
 
-//--------------------------------------------------------------------------
+
 
 SvLinkSourceRef LinkManager::CreateObj( SvBaseLink * pLink )
 {
@@ -503,7 +503,7 @@ sal_uIntPtr LinkManager::RegisterStatusInfoId()
     return nFormat;
 }
 
-// ----------------------------------------------------------------------
+
 
 sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
                                 const ::com::sun::star::uno::Any & rValue,
@@ -547,7 +547,7 @@ sal_Bool LinkManager::GetGraphicFromAny( const OUString& rMimeType,
 }
 
 
-// ----------------------------------------------------------------------
+
 OUString lcl_DDE_RelToAbs( const OUString& rTopic, const OUString& rBaseURL )
 {
     OUString sRet;
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index e203472cc265..346ad25ba12f 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -121,7 +121,7 @@ public:
     sal_Bool IsInDTOR() const { return bIsInDTOR; }
 };
 
-//--------------------------------------------------------------------------
+
 
 SvBaseLink::SvBaseLink()
     : m_bIsReadOnly(false)
@@ -133,7 +133,7 @@ SvBaseLink::SvBaseLink()
     bWasLastEditOK = sal_False;
 }
 
-//--------------------------------------------------------------------------
+
 
 SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
     : m_bIsReadOnly(false)
@@ -150,7 +150,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType )
     pImplData->ClientType.bIntrnlLnk = sal_False;
 }
 
-//--------------------------------------------------------------------------
+
 
 SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLinkSource* pObj )
     : pImpl(0)
@@ -189,7 +189,7 @@ SvBaseLink::SvBaseLink( const OUString& rLinkName, sal_uInt16 nObjectType, SvLin
         xObj = pObj;
 }
 
-//--------------------------------------------------------------------------
+
 
 SvBaseLink::~SvBaseLink()
 {
@@ -220,7 +220,7 @@ IMPL_LINK( SvBaseLink, EndEditHdl, OUString*, _pNewName )
     return 0;
 }
 
-//--------------------------------------------------------------------------
+
 
 void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP )
 {
@@ -230,14 +230,14 @@ void SvBaseLink::SetObjType( sal_uInt16 nObjTypeP )
     nObjType = nObjTypeP;
 }
 
-//--------------------------------------------------------------------------
+
 
 void SvBaseLink::SetName( const OUString & rNm )
 {
     aLinkName = rNm;
 }
 
-//--------------------------------------------------------------------------
+
 
 void SvBaseLink::SetObj( SvLinkSource * pObj )
 {
@@ -248,7 +248,7 @@ void SvBaseLink::SetObj( SvLinkSource * pObj )
     xObj = pObj;
 }
 
-//--------------------------------------------------------------------------
+
 
 void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm )
 {
@@ -266,14 +266,14 @@ void SvBaseLink::SetLinkSourceName( const OUString & rLnkNm )
     ReleaseRef(); // should be superfluous
 }
 
-//--------------------------------------------------------------------------
+
 
 OUString  SvBaseLink::GetLinkSourceName() const
 {
     return aLinkName;
 }
 
-//--------------------------------------------------------------------------
+
 
 void SvBaseLink::SetUpdateMode( sal_uInt16 nMode )
 {
diff --git a/sfx2/source/appl/macroloader.cxx b/sfx2/source/appl/macroloader.cxx
index ba1a0dbcd33c..333983531442 100644
--- a/sfx2/source/appl/macroloader.cxx
+++ b/sfx2/source/appl/macroloader.cxx
@@ -95,7 +95,7 @@ SfxObjectShell* SfxMacroLoader::GetObjectShell_Impl()
     return pDocShell;
 }
 
-// -----------------------------------------------------------------------
+
 uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch(
     const util::URL&   aURL            ,
     const OUString&               /*sTargetFrameName*/,
@@ -107,7 +107,7 @@ uno::Reference<frame::XDispatch> SAL_CALL SfxMacroLoader::queryDispatch(
     return xDispatcher;
 }
 
-// -----------------------------------------------------------------------
+
 uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
                 SfxMacroLoader::queryDispatches( const uno::Sequence < frame::DispatchDescriptor >& seqDescriptor )
                     throw( uno::RuntimeException )
@@ -121,7 +121,7 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL
     return lDispatcher;
 }
 
-// -----------------------------------------------------------------------
+
 void SAL_CALL SfxMacroLoader::dispatchWithNotification(
     const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& /*lArgs*/,
     const uno::Reference<frame::XDispatchResultListener>& xListener )
@@ -177,7 +177,7 @@ void SAL_CALL SfxMacroLoader::addStatusListener(
      */
 }
 
-// -----------------------------------------------------------------------
+
 void SAL_CALL SfxMacroLoader::removeStatusListener(
     const uno::Reference< frame::XStatusListener >&,
     const util::URL&                                                  )
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 05ebac78ce76..1848e74c4bf7 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -176,14 +176,14 @@ SfxModule::~SfxModule()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxSlotPool* SfxModule::GetSlotPool() const
 {
     return pImpl->pSlotPool;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
 {
@@ -205,7 +205,7 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
     pImpl->pFactArr->push_back( pFact );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
 {
@@ -227,7 +227,7 @@ void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
     pImpl->pTbxCtrlFac->push_back( pFact );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact )
 {
@@ -249,7 +249,7 @@ void SfxModule::RegisterStatusBarControl( SfxStbCtrlFactory *pFact )
     pImpl->pStbCtrlFac->push_back( pFact );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact )
 {
@@ -271,28 +271,28 @@ void SfxModule::RegisterMenuControl( SfxMenuCtrlFactory *pFact )
     pImpl->pMenuCtrlFac->push_back( pFact );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxTbxCtrlFactArr_Impl*  SfxModule::GetTbxCtrlFactories_Impl() const
 {
     return pImpl->pTbxCtrlFac;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxStbCtrlFactArr_Impl*  SfxModule::GetStbCtrlFactories_Impl() const
 {
     return pImpl->pStbCtrlFac;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxMenuCtrlFactArr_Impl* SfxModule::GetMenuCtrlFactories_Impl() const
 {
     return pImpl->pMenuCtrlFac;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const
 {
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 2a1ebe90f8a0..86deefaa3967 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -291,7 +291,7 @@ ContentListBox_Impl::ContentListBox_Impl( Window* pParent, const ResId& rResId )
     InitRoot();
 }
 
-// -----------------------------------------------------------------------
+
 
 ContentListBox_Impl::~ContentListBox_Impl()
 {
@@ -305,7 +305,7 @@ ContentListBox_Impl::~ContentListBox_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ContentListBox_Impl::InitRoot()
 {
@@ -327,7 +327,7 @@ void ContentListBox_Impl::InitRoot()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent )
 {
@@ -340,7 +340,7 @@ void ContentListBox_Impl::ClearChildren( SvTreeListEntry* pParent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent )
 {
@@ -386,7 +386,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -401,7 +401,7 @@ bool ContentListBox_Impl::Notify( NotifyEvent& rNEvt )
     return bHandled || SvTreeListBox::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ContentListBox_Impl::GetSelectEntry() const
 {
@@ -438,7 +438,7 @@ ContentTabPage_Impl::ContentTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Im
     aContentBox.Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ContentTabPage_Impl::Resize()
 {
@@ -448,7 +448,7 @@ void ContentTabPage_Impl::Resize()
     aContentBox.SetPosSizePixel( Point( 4, 4 ), aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ContentTabPage_Impl::ActivatePage()
 {
@@ -456,7 +456,7 @@ void ContentTabPage_Impl::ActivatePage()
         SetFocusOnBox();
 }
 
-// -----------------------------------------------------------------------
+
 
 Control* ContentTabPage_Impl::GetLastFocusControl()
 {
@@ -474,7 +474,7 @@ IndexBox_Impl::IndexBox_Impl( Window* pParent, const ResId& rResId ) :
     EnableUserDraw( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
 {
@@ -493,7 +493,7 @@ void IndexBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
         DrawEntry( rUDEvt, false, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool IndexBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -508,7 +508,7 @@ bool IndexBox_Impl::Notify( NotifyEvent& rNEvt )
     return bHandled || ComboBox::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexBox_Impl::SelectExecutableEntry()
 {
@@ -555,14 +555,14 @@ IndexTabPage_Impl::IndexTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl*
     nMinWidth = aOpenBtn.GetSizePixel().Width();
 }
 
-// -----------------------------------------------------------------------
+
 
 IndexTabPage_Impl::~IndexTabPage_Impl()
 {
     ClearIndex();
 }
 
-// -----------------------------------------------------------------------
+
 
 namespace sfx2 {
 
@@ -605,7 +605,7 @@ namespace sfx2 {
     else                                                                                            \
         aIndexCB.SetEntryData( nPos, NEW_ENTRY( aRefList[j], insert ) );
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::InitializeIndex()
 {
@@ -723,7 +723,7 @@ void IndexTabPage_Impl::InitializeIndex()
 #undef INSERT_DATA
 #undef UNIFY_AND_INSERT_TOKEN
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::ClearIndex()
 {
@@ -733,7 +733,7 @@ void IndexTabPage_Impl::ClearIndex()
     aIndexCB.Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl)
 {
@@ -741,7 +741,7 @@ IMPL_LINK_NOARG(IndexTabPage_Impl, OpenHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer )
 {
@@ -752,7 +752,7 @@ IMPL_LINK( IndexTabPage_Impl, TimeoutHdl, Timer*, pTimer )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::Resize()
 {
@@ -782,7 +782,7 @@ void IndexTabPage_Impl::Resize()
     aOpenBtn.SetPosPixel( aPnt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::ActivatePage()
 {
@@ -796,21 +796,21 @@ void IndexTabPage_Impl::ActivatePage()
         SetFocusOnBox();
 }
 
-// -----------------------------------------------------------------------
+
 
 Control* IndexTabPage_Impl::GetLastFocusControl()
 {
     return &aOpenBtn;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 {
     aIndexCB.SetDoubleClickHdl( rLink );
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::SetFactory( const OUString& rFactory )
 {
@@ -833,7 +833,7 @@ void IndexTabPage_Impl::SetFactory( const OUString& rFactory )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString IndexTabPage_Impl::GetSelectEntry() const
 {
@@ -844,7 +844,7 @@ OUString IndexTabPage_Impl::GetSelectEntry() const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword )
 {
@@ -856,7 +856,7 @@ void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword )
         aFactoryTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool IndexTabPage_Impl::HasKeyword() const
 {
@@ -870,7 +870,7 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
 {
@@ -894,7 +894,7 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase()
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void IndexTabPage_Impl::OpenKeyword()
 {
@@ -922,7 +922,7 @@ bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt )
     return bHandled || ComboBox::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchBox_Impl::Select()
 {
@@ -995,7 +995,7 @@ SearchTabPage_Impl::SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl
     ModifyHdl( &aSearchED );
 }
 
-// -----------------------------------------------------------------------
+
 
 SearchTabPage_Impl::~SearchTabPage_Impl()
 {
@@ -1022,7 +1022,7 @@ SearchTabPage_Impl::~SearchTabPage_Impl()
     aViewOpt.SetUserItem( USERITEM_NAME, aUserItem );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchTabPage_Impl::ClearSearchResults()
 {
@@ -1033,7 +1033,7 @@ void SearchTabPage_Impl::ClearSearchResults()
     aResultsLB.Update();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText )
 {
@@ -1049,7 +1049,7 @@ void SearchTabPage_Impl::RememberSearchText( const OUString& rSearchText )
     aSearchED.InsertEntry( rSearchText, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
 {
@@ -1091,7 +1091,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl)
 {
@@ -1099,7 +1099,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, OpenHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl)
 {
@@ -1108,7 +1108,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, ModifyHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchTabPage_Impl::Resize()
 {
@@ -1151,7 +1151,7 @@ void SearchTabPage_Impl::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchTabPage_Impl::ActivatePage()
 {
@@ -1159,21 +1159,21 @@ void SearchTabPage_Impl::ActivatePage()
         aSearchED.GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 Control* SearchTabPage_Impl::GetLastFocusControl()
 {
     return &aOpenBtn;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 {
     aResultsLB.SetDoubleClickHdl( rLink );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SearchTabPage_Impl::GetSelectEntry() const
 {
@@ -1184,7 +1184,7 @@ OUString SearchTabPage_Impl::GetSelectEntry() const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchTabPage_Impl::ClearPage()
 {
@@ -1192,7 +1192,7 @@ void SearchTabPage_Impl::ClearPage()
     aSearchED.SetText( OUString() );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword )
 {
@@ -1229,7 +1229,7 @@ void GetBookmarkEntry_Impl
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 BookmarksBox_Impl::BookmarksBox_Impl( Window* pParent, const ResId& rResId ) :
 
@@ -1238,7 +1238,7 @@ BookmarksBox_Impl::BookmarksBox_Impl( Window* pParent, const ResId& rResId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 BookmarksBox_Impl::~BookmarksBox_Impl()
 {
@@ -1256,7 +1256,7 @@ BookmarksBox_Impl::~BookmarksBox_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
 {
@@ -1307,7 +1307,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool BookmarksBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -1375,7 +1375,7 @@ BookmarksTabPage_Impl::BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindo
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl)
 {
@@ -1383,7 +1383,7 @@ IMPL_LINK_NOARG(BookmarksTabPage_Impl, OpenHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void BookmarksTabPage_Impl::Resize()
 {
@@ -1413,7 +1413,7 @@ void BookmarksTabPage_Impl::Resize()
     aBookmarksPB.SetPosPixel( aPnt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void BookmarksTabPage_Impl::ActivatePage()
 {
@@ -1421,21 +1421,21 @@ void BookmarksTabPage_Impl::ActivatePage()
         SetFocusOnBox();
 }
 
-// -----------------------------------------------------------------------
+
 
 Control* BookmarksTabPage_Impl::GetLastFocusControl()
 {
     return &aBookmarksPB;
 }
 
-// -----------------------------------------------------------------------
+
 
 void BookmarksTabPage_Impl::SetDoubleClickHdl( const Link& rLink )
 {
     aBookmarksBox.SetDoubleClickHdl( rLink );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString BookmarksTabPage_Impl::GetSelectEntry() const
 {
@@ -1446,7 +1446,7 @@ OUString BookmarksTabPage_Impl::GetSelectEntry() const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL )
 {
@@ -1560,7 +1560,7 @@ SfxHelpIndexWindow_Impl::SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* _pParent )
     aTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
 {
@@ -1578,7 +1578,7 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl()
     aViewOpt.SetPageID( (sal_Int32)aTabCtrl.GetCurPageId() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::Initialize()
 {
@@ -1602,7 +1602,7 @@ void SfxHelpIndexWindow_Impl::Initialize()
         SetActiveFactory();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::SetActiveFactory()
 {
@@ -1629,7 +1629,7 @@ void SfxHelpIndexWindow_Impl::SetActiveFactory()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId )
 {
@@ -1667,7 +1667,7 @@ HelpTabPage_Impl* SfxHelpIndexWindow_Impl::GetCurrentPage( sal_uInt16& rCurId )
     return pPage;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl )
 {
@@ -1677,7 +1677,7 @@ IMPL_LINK( SfxHelpIndexWindow_Impl, ActivatePageHdl, TabControl *, pTabCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl)
 {
@@ -1686,7 +1686,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl)
 {
@@ -1700,7 +1700,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, InitHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl)
 {
@@ -1714,7 +1714,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
 {
@@ -1740,7 +1740,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::Resize()
 {
@@ -1763,7 +1763,7 @@ void SfxHelpIndexWindow_Impl::Resize()
     aTabCtrl.SetSizePixel( aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
@@ -1813,7 +1813,7 @@ bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     return nDone || Window::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1827,7 +1827,7 @@ void SfxHelpIndexWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink )
 {
@@ -1842,7 +1842,7 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink )
         pBPage->SetDoubleClickHdl( aPageDoubleClickLink );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bActive )
 {
@@ -1857,7 +1857,7 @@ void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bAc
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const
 {
@@ -1885,14 +1885,14 @@ OUString SfxHelpIndexWindow_Impl::GetSelectEntry() const
     return sRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::AddBookmarks( const OUString& rTitle, const OUString& rURL )
 {
     GetBookmarksPage()->AddBookmarks( rTitle, rURL );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory )
 {
@@ -1909,7 +1909,7 @@ bool SfxHelpIndexWindow_Impl::IsValidFactory( const OUString& _rFactory )
     return bValid;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::ClearSearchPage()
 {
@@ -1917,7 +1917,7 @@ void SfxHelpIndexWindow_Impl::ClearSearchPage()
         pSPage->ClearPage();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::GrabFocusBack()
 {
@@ -1931,7 +1931,7 @@ void SfxHelpIndexWindow_Impl::GrabFocusBack()
         pBPage->SetFocusOnBox();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const
 {
@@ -1943,7 +1943,7 @@ sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SfxHelpIndexWindow_Impl::GetSearchText() const
 {
@@ -1953,7 +1953,7 @@ OUString SfxHelpIndexWindow_Impl::GetSearchText() const
     return sRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const
 {
@@ -1963,7 +1963,7 @@ sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::OpenKeyword( const OUString& rKeyword )
 {
@@ -1972,7 +1972,7 @@ void SfxHelpIndexWindow_Impl::OpenKeyword( const OUString& rKeyword )
     pIPage->SetKeyword( sKeyword );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpIndexWindow_Impl::SelectExecutableEntry()
 {
@@ -1998,7 +1998,7 @@ bool TextWin_Impl::Notify( NotifyEvent& rNEvt )
         return DockingWindow::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 // remove docking area acceptor from layoutmanager, so it will not layout anything further .-)
 static void lcl_disableLayoutOfFrame(const Reference< XFrame2 >& xFrame)
 {
@@ -2072,7 +2072,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) :
         aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
 {
@@ -2083,7 +2083,7 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl()
     delete pSrchDlg;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
 {
@@ -2100,7 +2100,7 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::InitToolBoxImages()
 {
@@ -2144,7 +2144,7 @@ void SfxHelpTextWindow_Impl::InitToolBoxImages()
         aToolBox.SetOutStyle( aMiscOptions.GetToolboxStyle() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
 {
@@ -2238,7 +2238,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition()
 {
@@ -2248,7 +2248,7 @@ void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition()
     aOnStartupCB.SetPosPixel( aPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator()
 {
@@ -2258,7 +2258,7 @@ Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator()
     return xBreakIterator;
 }
 
-// -----------------------------------------------------------------------
+
 
 Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const
 {
@@ -2290,7 +2290,7 @@ Reference< XTextRange > SfxHelpTextWindow_Impl::getCursor() const
     return xCursor;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode )
 {
@@ -2312,7 +2312,7 @@ bool SfxHelpTextWindow_Impl::isHandledKey( const KeyCode& _rKeyCode )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl)
 {
@@ -2357,7 +2357,7 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpTextWindow_Impl, NotifyHdl, SvtMiscOptions*, pOptions )
 {
@@ -2368,7 +2368,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, NotifyHdl, SvtMiscOptions*, pOptions )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg )
 {
@@ -2452,7 +2452,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, pDlg )
 {
@@ -2462,7 +2462,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CloseHdl, sfx2::SearchDialog*, pDlg )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox )
 {
@@ -2486,7 +2486,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::Resize()
 {
@@ -2497,7 +2497,7 @@ void SfxHelpTextWindow_Impl::Resize()
     SetOnStartupBoxPosition();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
@@ -2623,7 +2623,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     return nDone || Window::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::GetFocus()
 {
@@ -2645,7 +2645,7 @@ void SfxHelpTextWindow_Impl::GetFocus()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -2660,7 +2660,7 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn )
 {
@@ -2677,7 +2677,7 @@ void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_Bool _bIsFullWordSearch )
 {
@@ -2686,7 +2686,7 @@ void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_
     aSelectTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const
 {
@@ -2748,7 +2748,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::CloseFrame()
 {
@@ -2764,7 +2764,7 @@ void SfxHelpTextWindow_Impl::CloseFrame()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpTextWindow_Impl::DoSearch()
 {
@@ -2795,7 +2795,7 @@ void SfxHelpWindow_Impl::Resize()
     InitSizes();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::Split()
 {
@@ -2834,14 +2834,14 @@ void SfxHelpWindow_Impl::Split()
     InitSizes();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::GetFocus()
 {
     pTextWin->GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::MakeLayout()
 {
@@ -2892,7 +2892,7 @@ void SfxHelpWindow_Impl::MakeLayout()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::InitSizes()
 {
@@ -2914,7 +2914,7 @@ void SfxHelpWindow_Impl::InitSizes()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::LoadConfig()
 {
@@ -2952,7 +2952,7 @@ void SfxHelpWindow_Impl::LoadConfig()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::SaveConfig()
 {
@@ -2985,7 +2985,7 @@ void SfxHelpWindow_Impl::SaveConfig()
     aViewOpt.SetUserItem( USERITEM_NAME, makeAny( OUString( aUserData ) ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::ShowStartPage()
 {
@@ -2996,7 +2996,7 @@ void SfxHelpWindow_Impl::ShowStartPage()
     loadHelpContent(sHelpURL);
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox )
 {
@@ -3009,7 +3009,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectHdl, ToolBox* , pToolBox )
     return 1;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl)
 {
@@ -3051,7 +3051,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl)
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin )
 {
@@ -3071,7 +3071,7 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener )
 {
@@ -3079,7 +3079,7 @@ IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::openDone(const OUString& sURL    ,
                                         sal_Bool         bSuccess)
@@ -3133,7 +3133,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL    ,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     const ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 >& rFrame,
@@ -3174,7 +3174,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     LoadConfig();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxHelpWindow_Impl::~SfxHelpWindow_Impl()
 {
@@ -3187,7 +3187,7 @@ SfxHelpWindow_Impl::~SfxHelpWindow_Impl()
     delete pTextWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt )
 {
@@ -3213,7 +3213,7 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt )
     return bHandled || Window::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt::XWindow > xWin )
 {
@@ -3221,14 +3221,14 @@ void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt::
     MakeLayout();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::SetFactory( const OUString& rFactory )
 {
     pIndexWin->SetFactory( rFactory, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL )
 {
@@ -3237,7 +3237,7 @@ void SfxHelpWindow_Impl::SetHelpURL( const OUString& rURL )
         SetFactory( aObj.GetHost() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId )
 {
@@ -3338,7 +3338,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::CloseWindow()
 {
@@ -3365,7 +3365,7 @@ void SfxHelpWindow_Impl::CloseWindow()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxHelpWindow_Impl::UpdateToolbox()
 {
@@ -3373,14 +3373,14 @@ void SfxHelpWindow_Impl::UpdateToolbox()
     pTextWin->GetToolBox().EnableItem( TBI_FORWARD, pHelpInterceptor->HasHistorySucc() );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxHelpWindow_Impl::HasHistoryPredecessor() const
 {
     return pHelpInterceptor->HasHistoryPred();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxHelpWindow_Impl::HasHistorySuccessor() const
 {
@@ -3397,7 +3397,7 @@ SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, sa
         SetText(get<FixedText>("alttitle")->GetText());
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxAddHelpBookmarkDialog_Impl::SetTitle( const OUString& rTitle )
 {
diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx
index d39383b4af72..d04f1aa636aa 100644
--- a/sfx2/source/appl/opengrf.cxx
+++ b/sfx2/source/appl/opengrf.cxx
@@ -46,7 +46,7 @@
 #include "app.hrc"
 #include <sfx2/sfxresid.hxx>
 
-//-----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
@@ -56,7 +56,7 @@ using namespace ::rtl;
 using namespace ::cppu;
 
 
-//-----------------------------------------------------------------------------
+
 
 sal_uInt16  SvxOpenGrfErr2ResId(    short   err     )
 {
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 236e74fc1331..fa751c63f82f 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -32,7 +32,7 @@
 #include <unotools/localfilehelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-// ----------------------------------------------------------------------------
+
 
 #include <sfx2/app.hxx>
 #include "sfxpicklist.hxx"
@@ -52,13 +52,13 @@
 
 #include <algorithm>
 
-// ----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 
-// ----------------------------------------------------------------------------
+
 
 class StringLength : public ::cppu::WeakImplHelper1< XStringWidth >
 {
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 2947fb628281..f72f6a637a4f 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -294,7 +294,7 @@ ShutdownIcon::~ShutdownIcon()
     new IdleUnloader (&m_pPlugin);
 }
 
-// ---------------------------------------------------------------------------
+
 
 void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const Sequence< PropertyValue >& aArgs )
 {
@@ -327,7 +327,7 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const
     }
 }
 
-// ---------------------------------------------------------------------------
+
 
 void ShutdownIcon::FileOpen()
 {
@@ -339,7 +339,7 @@ void ShutdownIcon::FileOpen()
     }
 }
 
-// ---------------------------------------------------------------------------
+
 
 void ShutdownIcon::FromTemplate()
 {
@@ -382,7 +382,7 @@ void ShutdownIcon::FromTemplate()
     }
 }
 
-// ---------------------------------------------------------------------------
+
 #include <tools/rcid.h>
 OUString ShutdownIcon::GetResString( int id )
 {
@@ -398,7 +398,7 @@ OUString ShutdownIcon::GetResString( int id )
     return ResId(id, *m_pResMgr).toString();
 }
 
-// ---------------------------------------------------------------------------
+
 
 OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
 {
@@ -407,7 +407,7 @@ OUString ShutdownIcon::GetUrlDescription( const OUString& aUrl )
     return OUString( SvFileInformationManager::GetDescription( INetURLObject( aUrl ) ) );
 }
 
-// ---------------------------------------------------------------------------
+
 
 void ShutdownIcon::StartFileDialog()
 {
@@ -430,7 +430,7 @@ void ShutdownIcon::StartFileDialog()
     m_pFileDlg->StartExecuteModal( STATIC_LINK( this, ShutdownIcon, DialogClosedHdl_Impl ) );
 }
 
-// ---------------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYARG )
 {
@@ -574,7 +574,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
     return 0;
 }
 
-// ---------------------------------------------------------------------------
+
 
 void ShutdownIcon::addTerminateListener()
 {
@@ -593,7 +593,7 @@ void ShutdownIcon::addTerminateListener()
     pInst->m_bListenForTermination = true;
 }
 
-// ---------------------------------------------------------------------------
+
 
 void ShutdownIcon::terminateDesktop()
 {
@@ -618,7 +618,7 @@ void ShutdownIcon::terminateDesktop()
     ShutdownIcon::pShutdownIcon = 0;
 }
 
-// ---------------------------------------------------------------------------
+
 
 ShutdownIcon* ShutdownIcon::getInstance()
 {
@@ -626,7 +626,7 @@ ShutdownIcon* ShutdownIcon::getInstance()
     return pShutdownIcon;
 }
 
-// ---------------------------------------------------------------------------
+
 
 ShutdownIcon* ShutdownIcon::createInstance()
 {
@@ -659,7 +659,7 @@ void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
     m_xDesktop = xDesktop;
 }
 
-// ---------------------------------------------------------------------------
+
 
 void SAL_CALL ShutdownIcon::disposing()
 {
@@ -667,7 +667,7 @@ void SAL_CALL ShutdownIcon::disposing()
     m_xDesktop.clear();
 }
 
-// ---------------------------------------------------------------------------
+
 
 // XEventListener
 void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject& )
@@ -675,7 +675,7 @@ void SAL_CALL ShutdownIcon::disposing( const ::com::sun::star::lang::EventObject
 {
 }
 
-// ---------------------------------------------------------------------------
+
 
 // XTerminateListener
 void SAL_CALL ShutdownIcon::queryTermination( const ::com::sun::star::lang::EventObject& )
@@ -689,7 +689,7 @@ throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::
 }
 
 
-// ---------------------------------------------------------------------------
+
 
 void SAL_CALL ShutdownIcon::notifyTermination( const ::com::sun::star::lang::EventObject& )
 throw(::com::sun::star::uno::RuntimeException)
@@ -697,7 +697,7 @@ throw(::com::sun::star::uno::RuntimeException)
 }
 
 
-// ---------------------------------------------------------------------------
+
 
 void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any>& aArguments )
     throw( ::com::sun::star::uno::Exception )
@@ -750,14 +750,14 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< :
 
 }
 
-// -------------------------------
+
 
 void ShutdownIcon::EnterModalMode()
 {
     bModalMode = true;
 }
 
-// -------------------------------
+
 
 void ShutdownIcon::LeaveModalMode()
 {
@@ -781,7 +781,7 @@ bool ShutdownIcon::IsQuickstarterInstalled()
 }
 #endif // !WNT
 
-// ---------------------------------------------------------------------------
+
 
 #if defined (ENABLE_QUICKSTART_APPLET) && defined (UNX)
 /**
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 8c7a6a1cd42f..584d6b040f55 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -96,7 +96,7 @@ typedef struct tagMYITEM
     UINT iconId;
 } MYITEM;
 
-// -------------------------------
+
 
 static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text, int& pos, int bOwnerdraw, const OUString& module )
 {
@@ -143,7 +143,7 @@ static void addMenuItem( HMENU hMenu, UINT id, UINT iconId, const OUString& text
     InsertMenuItemW( hMenu, pos++, TRUE, &mi );
 }
 
-// -------------------------------
+
 
 static HMENU createSystrayMenu( )
 {
@@ -231,7 +231,7 @@ static HMENU createSystrayMenu( )
     return hMenu;
 }
 
-// -------------------------------
+
 
 static void deleteSystrayMenu( HMENU hMenu )
 {
@@ -257,7 +257,7 @@ static void deleteSystrayMenu( HMENU hMenu )
     }
 }
 
-// -------------------------------
+
 
 static void addTaskbarIcon( HWND hWnd )
 {
@@ -282,7 +282,7 @@ static void addTaskbarIcon( HWND hWnd )
     Shell_NotifyIconW(NIM_ADD, &nid);
 }
 
-// -------------------------------
+
 
 LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -407,7 +407,7 @@ LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
     return 0;
 }
 
-// -------------------------------
+
 
 LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
@@ -467,7 +467,7 @@ LRESULT CALLBACK executerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lP
     return 0;
 }
 
-// -------------------------------
+
 
 
 DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ )
@@ -497,7 +497,7 @@ DWORD WINAPI SystrayThread( LPVOID /*lpParam*/ )
     return msg.wParam; // Exit code of WM_QUIT
 }
 
-// -------------------------------
+
 
 void win32_init_sys_tray()
 {
@@ -554,7 +554,7 @@ void win32_init_sys_tray()
     }
 }
 
-// -------------------------------
+
 
 void win32_shutdown_sys_tray()
 {
@@ -574,7 +574,7 @@ void win32_shutdown_sys_tray()
 
 
 
-// -------------------------------
+
 
 void OnMeasureItem(HWND hwnd, LPMEASUREITEMSTRUCT lpmis)
 {
@@ -695,9 +695,9 @@ void OnDrawItem(HWND /*hwnd*/, LPDRAWITEMSTRUCT lpdis)
     SetBkColor(lpdis->hDC, clrPrevBkgnd);
 }
 
-// -------------------------------
+
 // code from setup2 project
-// -------------------------------
+
 
 void _SHFree( void *pv )
 {
@@ -790,7 +790,7 @@ BOOL CreateShortcut( const OUString& rAbsObject, const OUString& rAbsObjectPath,
     return TRUE;
 }
 
-// ------------------
+
 // install/uninstall
 
 static bool FileExistsW( LPCWSTR lpPath )
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index e141d8456d48..b595b666cedb 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -213,9 +213,9 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XComponent
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL LayoutManagerListener::addEventListener(
     const css::uno::Reference< css::lang::XEventListener >& )
 throw (::com::sun::star::uno::RuntimeException)
@@ -273,9 +273,9 @@ throw( css::uno::RuntimeException )
     }
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 //  XEventListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL LayoutManagerListener::disposing(
     const css::lang::EventObject& )
 throw( css::uno::RuntimeException )
@@ -286,9 +286,9 @@ throw( css::uno::RuntimeException )
     m_xFrame = css::uno::Reference< css::frame::XFrame >();
 }
 
-//---------------------------------------------------------------------------------------------------------
+
 // XLayoutManagerEventListener
-//---------------------------------------------------------------------------------------------------------
+
 void SAL_CALL LayoutManagerListener::layoutEvent(
     const css::lang::EventObject&,
     ::sal_Int16                   eLayoutEvent,
@@ -664,7 +664,7 @@ void SfxWorkWindow::Lock_Impl( sal_Bool bLock )
         ArrangeChildren_Impl();
 }
 
-//--------------------------------------------------------------------
+
 // Helper method to release the child lists. Should the destructor not be
 // called after this, instead work continues, then space for the object bars
 // and split windows has to be reserved in the same way as in the constructor
@@ -801,7 +801,7 @@ void SfxFrameWorkWin_Impl::ArrangeChildren_Impl( sal_Bool bForce )
     ArrangeAutoHideWindows( NULL );
 }
 
-//--------------------------------------------------------------------
+
 
 SvBorder SfxWorkWindow::Arrange_Impl()
 
@@ -967,7 +967,7 @@ sal_Bool SfxWorkWindow::PrepareClose_Impl()
     return sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
                     SfxChildAlignment eAlign, sal_Bool bCanGetFocus )
@@ -991,7 +991,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow,
     return aChildren.back();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
 {
@@ -1018,7 +1018,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
 {
@@ -1036,7 +1036,7 @@ SfxChild_Impl* SfxWorkWindow::FindChild_Impl( const Window& rWindow ) const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxWorkWindow::ShowChildren_Impl()
 {
@@ -1108,7 +1108,7 @@ void SfxWorkWindow::ShowChildren_Impl()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxWorkWindow::HideChildren_Impl()
 {
@@ -1130,7 +1130,7 @@ void SfxWorkWindow::HideChildren_Impl()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxWorkWindow::ResetObjectBars_Impl()
 {
@@ -1142,7 +1142,7 @@ void SfxWorkWindow::ResetObjectBars_Impl()
         aChildWins[n]->nId = 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
             SfxInterface* pIFace, const OUString *pName)
@@ -1179,7 +1179,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
     aObjBarList.push_back( aObjBar );
 }
 
-//------------------------------------------------------------------------
+
 
 bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
 
@@ -1203,7 +1203,7 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
     return false;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const
 {
@@ -1287,7 +1287,7 @@ Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIn
     return xStatusIndicator;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell )
 {
@@ -1301,7 +1301,7 @@ sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell )
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxWorkWindow::GetFrameInterface()
 {
@@ -1318,7 +1318,7 @@ sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell )
     return xFrame;
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxWorkWindow::UpdateObjectBars_Impl()
 {
@@ -1623,7 +1623,7 @@ void SfxWorkWindow::ResetStatusBar_Impl()
     aStatBar.nId = 0;
 }
 
-//--------------------------------------------------------------------
+
 void SfxWorkWindow::SetStatusBar_Impl( sal_uInt32 nResId, SfxShell*, SfxBindings& )
 {
     if ( nResId && bShowStatusBar && IsVisible_Impl() )
@@ -1673,7 +1673,7 @@ sal_Bool SfxWorkWindow::IsVisible_Impl()
     return nOrigMode != SFX_VISIBILITY_UNVISIBLE;
 }
 
-//------------------------------------------------------------------------
+
 void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16 nId )
 {
     for ( sal_uInt16 n = 0; n < aChildWins.size(); ++n )
@@ -1701,7 +1701,7 @@ void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16
         pParent->HidePopups_Impl( bHide, bParent, nId );
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
             SfxDockingConfig eConfig, sal_uInt16 nId)
@@ -1961,7 +1961,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnabled, sal_uInt16 nMode )
 {
@@ -2021,7 +2021,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnable
     pCW->nVisibility = nMode;
 }
 
-//--------------------------------------------------------------------
+
 // The on/off status of a ChildWindow is switched
 
 void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
@@ -2133,7 +2133,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus)
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId)
 {
@@ -2212,7 +2212,7 @@ sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId )
         return sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
 {
@@ -2238,7 +2238,7 @@ sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId)
         return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus)
 {
@@ -2290,7 +2290,7 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool b
         pWork->ToggleChildWindow_Impl(nId,bSetFocus);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus)
 {
@@ -2378,7 +2378,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId)
 {
@@ -2395,7 +2395,7 @@ SfxChildWindow* SfxWorkWindow::GetChildWindow_Impl(sal_uInt16 nId)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxWorkWindow::ResetChildWindows_Impl()
 {
@@ -2406,7 +2406,7 @@ void SfxWorkWindow::ResetChildWindows_Impl()
     }
 }
 
-//------------------------------------------------------------------------
+
 // Virtual method that returns the size of the area (client area) of the
 // parent windows, in which the ChildWindow can be fitted.
 
@@ -2415,7 +2415,7 @@ Rectangle SfxWorkWindow::GetTopRect_Impl()
     return Rectangle (Point(), pWorkWin->GetOutputSizePixel() );
 }
 
-//------------------------------------------------------------------------
+
 // Virtual method that returns the size of the area (client area) of the
 // parent windows, in which the ChildWindow can be fitted.
 
@@ -2424,7 +2424,7 @@ Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl()
     return pMasterFrame->GetTopOuterRectPixel_Impl();
 }
 
-//------------------------------------------------------------------------
+
 // Virtual method to find out if there is room for a ChildWindow in the
 // client area of the parent.
 
diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx
index 8b3c83118ce2..e86479517237 100644
--- a/sfx2/source/appl/xpackcreator.cxx
+++ b/sfx2/source/appl/xpackcreator.cxx
@@ -53,7 +53,7 @@ public:
     virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException);
 };
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolderUrl,
                                                           const uno::Reference< io::XOutputStream >& xTargetStream )
         throw ( io::IOException,
diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx
index ca778484ebad..fc336bc9d2a8 100644
--- a/sfx2/source/bastyp/bitset.cxx
+++ b/sfx2/source/bastyp/bitset.cxx
@@ -74,7 +74,7 @@ BitSet BitSet::operator<<( sal_uInt16 nOffset ) const
     return aSet;
 }
 
-//--------------------------------------------------------------------
+
 
 // substracts nOffset from each bit-value in the set
 
@@ -83,7 +83,7 @@ BitSet BitSet::operator>>( sal_uInt16 ) const
     return BitSet();
 }
 
-//--------------------------------------------------------------------
+
 
 // internal code for operator= and copy-ctor
 
@@ -100,7 +100,7 @@ void BitSet::CopyFrom( const BitSet& rSet )
         pBitmap = 0;
 }
 
-//--------------------------------------------------------------------
+
 
 // creates an empty bitset
 
@@ -111,7 +111,7 @@ BitSet::BitSet()
     pBitmap = 0;
 }
 
-//--------------------------------------------------------------------
+
 
 // creates a copy of bitset rOrig
 
@@ -120,7 +120,7 @@ BitSet::BitSet( const BitSet& rOrig )
     CopyFrom(rOrig);
 }
 
-//--------------------------------------------------------------------
+
 
 // frees the storage
 
@@ -129,7 +129,7 @@ BitSet::~BitSet()
     delete [] pBitmap;
 }
 
-//--------------------------------------------------------------------
+
 
 // assignment from another bitset
 
@@ -143,7 +143,7 @@ BitSet& BitSet::operator=( const BitSet& rOrig )
     return *this;
 }
 
-//--------------------------------------------------------------------
+
 
 // assignment from a single bit
 
@@ -163,7 +163,7 @@ BitSet& BitSet::operator=( sal_uInt16 nBit )
     return *this;
 }
 
-//--------------------------------------------------------------------
+
 
 // creates the asymetric difference with another bitset
 
@@ -184,7 +184,7 @@ BitSet& BitSet::operator-=(sal_uInt16 nBit)
     return *this;
 }
 
-//--------------------------------------------------------------------
+
 
 // unites with the bits of rSet
 
@@ -220,7 +220,7 @@ BitSet& BitSet::operator|=( const BitSet& rSet )
     return *this;
 }
 
-//--------------------------------------------------------------------
+
 
 // unites with a single bit
 
@@ -252,7 +252,7 @@ BitSet& BitSet::operator|=( sal_uInt16 nBit )
     return *this;
 }
 
-//--------------------------------------------------------------------
+
 
 // determines if the bit is set (may be the only one)
 
@@ -266,7 +266,7 @@ sal_Bool BitSet::Contains( sal_uInt16 nBit ) const
     return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal;
 }
 
-//--------------------------------------------------------------------
+
 
 // determines if the bitsets are equal
 
@@ -283,7 +283,7 @@ sal_Bool BitSet::operator==( const BitSet& rSet ) const
     return sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 // counts the number of 1-bits in the parameter
 
@@ -299,7 +299,7 @@ sal_uInt16 BitSet::CountBits( sal_uIntPtr nBits )
     return nCount;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 IndexBitSet::GetFreeIndex()
 {
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 7fb213ae6c02..5e1093699441 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -124,13 +124,13 @@ static void CreateFilterArr()
     theSfxFilterListener::get();
 }
 
-//----------------------------------------------------------------
+
 inline OUString ToUpper_Impl( const OUString &rStr )
 {
     return SvtSysLocale().GetCharClass().uppercase( rStr );
 }
 
-//----------------------------------------------------------------
+
 class SfxFilterContainer_Impl
 {
 public:
@@ -161,21 +161,21 @@ const SfxFilter* SfxFilterContainer::GetAnyFilter( SfxFilterFlags nMust, SfxFilt
     return aMatch.GetAnyFilter( nMust, nDont );
 }
 
-//----------------------------------------------------------------
+
 
 SfxFilterContainer::SfxFilterContainer( const OUString& rName )
 {
     pImpl = new SfxFilterContainer_Impl( rName );
 }
 
-//----------------------------------------------------------------
+
 
 SfxFilterContainer::~SfxFilterContainer()
 {
     delete pImpl;
 }
 
-//----------------------------------------------------------------
+
 
 const OUString SfxFilterContainer::GetName() const
 {
@@ -236,7 +236,7 @@ const SfxFilter* SfxFilterContainer::GetDefaultFilter_Impl( const OUString& rNam
 }
 
 
-//----------------------------------------------------------------
+
 
 // Impl-Data is shared between all FilterMatchers of the same factory
 class SfxFilterMatcher_Impl
@@ -375,7 +375,7 @@ const SfxFilter* SfxFilterMatcher::GetAnyFilter( SfxFilterFlags nMust, SfxFilter
     return NULL;
 }
 
-//----------------------------------------------------------------
+
 
 sal_uInt32  SfxFilterMatcher::GuessFilterIgnoringContent(
     SfxMedium& rMedium,
@@ -406,14 +406,14 @@ sal_uInt32  SfxFilterMatcher::GuessFilterIgnoringContent(
     return *ppFilter ? ERRCODE_NONE : ERRCODE_ABORT;
 }
 
-//----------------------------------------------------------------
+
 
 sal_uInt32  SfxFilterMatcher::GuessFilter( SfxMedium& rMedium, const SfxFilter**ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ) const
 {
     return GuessFilterControlDefaultUI( rMedium, ppFilter, nMust, nDont, sal_True );
 }
 
-//----------------------------------------------------------------
+
 
 sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont, sal_Bool /*bDefUI*/ ) const
 {
@@ -508,7 +508,7 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
     return ERRCODE_ABORT;
 }
 
-//----------------------------------------------------------------
+
 sal_Bool SfxFilterMatcher::IsFilterInstalled_Impl( const SfxFilter* pFilter )
 {
     if ( pFilter->GetFilterFlags() & SFX_FILTER_MUSTINSTALL )
@@ -857,7 +857,7 @@ IMPL_STATIC_LINK( SfxFilterMatcher, MaybeFileHdl_Impl, OUString*, pString )
     return sal_False;
 }
 
-//----------------------------------------------------------------
+
 
 SfxFilterMatcherIter::SfxFilterMatcherIter(
     const SfxFilterMatcher& rMatcher,
@@ -870,7 +870,7 @@ SfxFilterMatcherIter::SfxFilterMatcherIter(
     m_rMatch.InitForIterating();
 }
 
-//----------------------------------------------------------------
+
 
 const SfxFilter* SfxFilterMatcherIter::Find_Impl()
 {
@@ -893,7 +893,7 @@ const SfxFilter* SfxFilterMatcherIter::First()
     return Find_Impl();
 }
 
-//----------------------------------------------------------------
+
 
 const SfxFilter* SfxFilterMatcherIter::Next()
 {
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 7b2b73f99a34..a0d20f8d1f7c 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -46,7 +46,7 @@
 #include <rtl/strbuf.hxx>
 
 
-// -----------------------------------------------------------------------
+
 
 using namespace ::com::sun::star;
 
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index e6637142e637..00f98dac008e 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -122,7 +122,7 @@ std::vector<OUString> SfxContentHelper::GetResultSet( const OUString& rURL )
     return aList;
 }
 
-// -----------------------------------------------------------------------
+
 
 std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUString& rURL )
 {
@@ -188,7 +188,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin
     return aProperties;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL )
 {
@@ -220,7 +220,7 @@ OUString SfxContentHelper::GetActiveHelpString( const OUString& rURL )
     return aRet.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL )
 {
@@ -242,7 +242,7 @@ bool SfxContentHelper::IsHelpErrorDocument( const OUString& rURL )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int64 SfxContentHelper::GetSize( const OUString& rContent )
 {
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index ebe147067906..4cac16ace272 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -77,7 +77,7 @@ struct SfxProgress_Impl
 //========================================================================
 extern sal_uInt32 Get10ThSec();
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
 {
@@ -100,7 +100,7 @@ void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
         SFX_APP()->GetAppDispatcher_Impl()->Lock( !bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ )
     : nMax(0)
@@ -117,7 +117,7 @@ SfxProgress_Impl::SfxProgress_Impl( const OUString &/*rTitle*/ )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxProgress::SfxProgress
 (
@@ -172,7 +172,7 @@ SfxProgress::SfxProgress
     Resume();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxProgress::~SfxProgress()
 
@@ -189,7 +189,7 @@ SfxProgress::~SfxProgress()
     delete pImp;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::Stop()
 
@@ -220,7 +220,7 @@ void SfxProgress::Stop()
         pImp->Enable_Impl(sal_True);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::SetText( const OUString&  /*      new Text */)
 
@@ -238,7 +238,7 @@ void SfxProgress::SetText( const OUString&  /*      new Text */)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 // Required in App data
 static sal_uIntPtr nLastTime = 0;
@@ -255,7 +255,7 @@ long TimeOut_Impl( void*, void* pArgV )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxProgress::SetStateText
 (
@@ -269,7 +269,7 @@ sal_Bool SfxProgress::SetStateText
     return SetState( nNewVal, nNewRange );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxProgress::SetState
 (
@@ -354,7 +354,7 @@ sal_Bool SfxProgress::SetState
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::Resume()
 
@@ -400,7 +400,7 @@ void SfxProgress::Resume()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::Suspend()
 
@@ -442,7 +442,7 @@ void SfxProgress::Suspend()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::UnLock()
 {
@@ -455,7 +455,7 @@ void SfxProgress::UnLock()
     pImp->Enable_Impl(sal_True);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::Reschedule()
 
@@ -478,7 +478,7 @@ void SfxProgress::Reschedule()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxProgress* SfxProgress::GetActiveProgress
 (
@@ -527,14 +527,14 @@ SfxProgress* SfxProgress::GetActiveProgress
     return pProgress;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::EnterLock()
 {
     SFX_APP()->Get_Impl()->nRescheduleLocks++;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxProgress::LeaveLock()
 {
diff --git a/sfx2/source/bastyp/sfxresid.cxx b/sfx2/source/bastyp/sfxresid.cxx
index e83b4246aa04..32487df00e17 100644
--- a/sfx2/source/bastyp/sfxresid.cxx
+++ b/sfx2/source/bastyp/sfxresid.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/app.hxx>
 #include "tools/resmgr.hxx"
 
-// -----------------------------------------------------------------------
+
 
 static ResMgr* pMgr=NULL;
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index c70d94caf9e9..ad368c99cf74 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -48,7 +48,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 
-// -----------------------------------------------------------------------
+
 TYPEINIT1(SfxEventHint, SfxHint);
 TYPEINIT1(SfxEventNamesItem, SfxPoolItem);
 TYPEINIT1(SfxViewEventHint, SfxEventHint);
@@ -139,7 +139,7 @@ void SfxEventNamesItem::AddEvent( const OUString& rName, const OUString& rUIName
 
 //==========================================================================
 
-//--------------------------------------------------------------------------
+
 uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
 {
 /*
@@ -221,7 +221,7 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
     return aEventData;
 }
 
-//--------------------------------------------------------------------------
+
 void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMacro* pMacro )
 {
     uno::Reference < document::XEventsSupplier > xSupplier;
@@ -262,7 +262,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, OUString aEventName, const SvxMa
     }
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 void SfxEventConfiguration::ConfigureEvent( OUString aName, const SvxMacro& rMacro, SfxObjectShell *pDoc )
 {
     boost::scoped_ptr<SvxMacro> pMacro;
@@ -271,7 +271,7 @@ void SfxEventConfiguration::ConfigureEvent( OUString aName, const SvxMacro& rMac
     PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() );
 }
 
-// -------------------------------------------------------------------------------------------------------
+
 SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp )
 {
     return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 233fe94d9a86..3f7091c84bdb 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -158,7 +158,7 @@ public:
     InvalidateSlotMap       m_aInvalidateSlots; // store slots which are invalidated while in update
 };
 
-//--------------------------------------------------------------------
+
 
 struct SfxFoundCache_Impl
 {
@@ -195,7 +195,7 @@ struct SfxFoundCache_Impl
     { return nWhichId== r.nWhichId; }
 };
 
-//--------------------------------------------------------------------------
+
 
 class SfxFoundCacheArr_Impl : public std::vector<SfxFoundCache_Impl*>
 {
@@ -273,7 +273,7 @@ SfxBindings::~SfxBindings()
     delete pImp;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::DeleteControllers_Impl()
 {
@@ -339,7 +339,7 @@ void SfxBindings::DeleteControllers_Impl()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::HidePopups( bool bHide )
 {
@@ -376,7 +376,7 @@ void SfxBindings::HidePopupCtrls_Impl( bool bHide )
     pImp->ePopupAction = SFX_POPUP_DELETE;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Update_Impl
 (
@@ -439,7 +439,7 @@ void SfxBindings::Update_Impl
     DBG_PROFSTOP(SfxBindingsUpdate_Impl);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::InvalidateSlotsInMap_Impl()
 {
@@ -452,14 +452,14 @@ void SfxBindings::InvalidateSlotsInMap_Impl()
     pImp->m_aInvalidateSlots.clear();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId )
 {
     pImp->m_aInvalidateSlots[nId] = true;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Update
 (
@@ -524,7 +524,7 @@ void SfxBindings::Update
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Update()
 {
@@ -548,7 +548,7 @@ void SfxBindings::Update()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::SetState
 (
@@ -592,7 +592,7 @@ void SfxBindings::SetState
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::SetState
 (
@@ -626,7 +626,7 @@ void SfxBindings::SetState
 }
 
 
-//--------------------------------------------------------------------
+
 
 SfxStateCache* SfxBindings::GetAnyStateCache_Impl( sal_uInt16 nId )
 {
@@ -668,7 +668,7 @@ SfxStateCache* SfxBindings::GetStateCache
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::InvalidateAll
 (
@@ -709,7 +709,7 @@ void SfxBindings::InvalidateAll
     DBG_PROFSTOP(SfxBindingsInvalidateAll);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Invalidate
 (
@@ -765,7 +765,7 @@ void SfxBindings::Invalidate
     DBG_PROFSTOP(SfxBindingsInvalidateAll);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::InvalidateShell
 (
@@ -828,7 +828,7 @@ void SfxBindings::InvalidateShell
     DBG_PROFSTOP(SfxBindingsInvalidateAll);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Invalidate
 (
@@ -863,7 +863,7 @@ void SfxBindings::Invalidate
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Invalidate
 (
@@ -900,7 +900,7 @@ void SfxBindings::Invalidate
     }
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt )
 {
@@ -908,7 +908,7 @@ sal_Bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt )
     return GetStateCache(nSlotId, &nStartSearchAt ) != 0;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
 {
@@ -980,7 +980,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
     DBG_PROFSTOP(SfxBindingsMsgPos);
     return nPos;
 }
-//--------------------------------------------------------------------
+
 void SfxBindings::RegisterInternal_Impl( SfxControllerItem& rItem )
 {
     Register_Impl( rItem, sal_True );
@@ -1026,7 +1026,7 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, sal_Bool bInternal )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::Release( SfxControllerItem& rItem )
 {
@@ -1072,7 +1072,7 @@ void SfxBindings::Release( SfxControllerItem& rItem )
     LEAVEREGISTRATIONS();
 }
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem* SfxBindings::ExecuteSynchron( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi,
             const SfxPoolItem **ppInternalArgs )
 {
@@ -1293,7 +1293,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
         pDispatcher->_Execute( *pShell, *pSlot, aReq, aReq.GetCallMode() | SFX_CALLMODE_RECORD );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::UpdateSlotServer_Impl()
 {
@@ -1328,7 +1328,7 @@ void SfxBindings::UpdateSlotServer_Impl()
     DBG_PROFSTOP(SfxBindingsUpdateServers);
 }
 
-//--------------------------------------------------------------------
+
 
 SfxItemSet* SfxBindings::CreateSet_Impl
 (
@@ -1470,7 +1470,7 @@ SfxItemSet* SfxBindings::CreateSet_Impl
     return pSet;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::UpdateControllers_Impl
 (
@@ -1581,7 +1581,7 @@ void SfxBindings::UpdateControllers_Impl
 }
 
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 {
@@ -1716,7 +1716,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
 {
@@ -1757,7 +1757,7 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
 
     return nRegLevel;
 }
-//--------------------------------------------------------------------
+
 
 void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int nLine )
 {
@@ -1827,7 +1827,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
                 ? SAL_STREAM("File: " << pFile << " Line: " << nLine) : ""));
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxSlot* SfxBindings::GetSlot(sal_uInt16 nSlotId)
 {
@@ -1844,7 +1844,7 @@ const SfxSlot* SfxBindings::GetSlot(sal_uInt16 nSlotId)
             pCache->GetSlotServer(*pDispatcher, pImp->xProv)->GetSlot(): 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
 {
@@ -1911,7 +1911,7 @@ void SfxBindings::SetDispatcher( SfxDispatcher *pDisp )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId )
 {
@@ -1921,7 +1921,7 @@ void SfxBindings::ClearCache_Impl( sal_uInt16 nSlotId )
     pCache->ClearCache();
 }
 
-//--------------------------------------------------------------------
+
 void SfxBindings::StartUpdate_Impl( sal_Bool bComplete )
 {
     if ( pImp->pSubBindings )
@@ -1935,7 +1935,7 @@ void SfxBindings::StartUpdate_Impl( sal_Bool bComplete )
         NextJob_Impl(0);
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
 {
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 7a0d16dbbfc0..4851580fc24e 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -30,7 +30,7 @@
 
 DBG_NAME(SfxControllerItem);
 
-//--------------------------------------------------------------------
+
 #ifdef DBG_UTIL
 
 void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
@@ -52,7 +52,7 @@ void SfxControllerItem::CheckConfigure_Impl( sal_uIntPtr nType )
 
 #endif
 
-//--------------------------------------------------------------------
+
 // returns the next registered SfxControllerItem with the same id
 
 SfxControllerItem* SfxControllerItem::GetItemLink()
@@ -61,7 +61,7 @@ SfxControllerItem* SfxControllerItem::GetItemLink()
     return pNext == this ? 0 : pNext;
 }
 
-//--------------------------------------------------------------------
+
 // returns sal_True if this binding is really bound to a function
 
 sal_Bool SfxControllerItem::IsBound() const
@@ -159,7 +159,7 @@ DBG_CHKTHIS(SfxControllerItem, 0);
     pBindings->Register(*this);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxControllerItem::ClearCache()
 
@@ -190,7 +190,7 @@ void SfxControllerItem::ClearCache()
     pBindings->ClearCache_Impl( GetId() );
 }
 
-//--------------------------------------------------------------------
+
 // replaces the successor in the list of bindings of the same id
 
 SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLink )
@@ -201,7 +201,7 @@ SfxControllerItem* SfxControllerItem::ChangeItemLink( SfxControllerItem* pNewLin
     return pOldLink == this ? 0 : pOldLink;
 }
 
-//--------------------------------------------------------------------
+
 // changes the id of unbound functions (e.g. for sub-menu-ids)
 
 void SfxControllerItem::SetId( sal_uInt16 nItemId )
@@ -211,7 +211,7 @@ void SfxControllerItem::SetId( sal_uInt16 nItemId )
     nId = nItemId;
 }
 
-//--------------------------------------------------------------------
+
 
 // creates a atomic item for a controller without registration.
 
@@ -223,7 +223,7 @@ SfxControllerItem::SfxControllerItem():
     DBG_CTOR(SfxControllerItem, 0);
 }
 
-//--------------------------------------------------------------------
+
 // creates a representation of the function nId and registeres it
 
 SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
@@ -235,7 +235,7 @@ SfxControllerItem::SfxControllerItem( sal_uInt16 nID, SfxBindings &rBindings ):
     Bind(nId, &rBindings);
 }
 
-//--------------------------------------------------------------------
+
 // unregisteres the item in the bindings
 
 SfxControllerItem::~SfxControllerItem()
@@ -245,7 +245,7 @@ SfxControllerItem::~SfxControllerItem()
     DBG_DTOR(SfxControllerItem, 0);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxControllerItem::StateChanged
 (
@@ -278,14 +278,14 @@ void SfxControllerItem::StateChanged
     DBG_CHKTHIS(SfxControllerItem, 0);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxControllerItem::DeleteFloatingWindow()
 {
     DBG_CHKTHIS(SfxControllerItem, 0);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusForwarder::StateChanged
 (
@@ -298,7 +298,7 @@ void SfxStatusForwarder::StateChanged
     pMaster->StateChanged( nSID, eState, pState );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxStatusForwarder::SfxStatusForwarder(
             sal_uInt16              nSlotId,
@@ -308,7 +308,7 @@ SfxStatusForwarder::SfxStatusForwarder(
 {
 }
 
-//--------------------------------------------------------------------
+
 
 SfxItemState SfxControllerItem::GetItemState
 (
@@ -353,7 +353,7 @@ SfxItemState SfxControllerItem::GetItemState
                         : SFX_ITEM_AVAILABLE;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxMapUnit SfxControllerItem::GetCoreMetric() const
 
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 61f8ebf89802..4a55580811e3 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -108,7 +108,7 @@ struct SfxObjectBars_Impl
     SfxObjectBars_Impl() : nResId(0), nMode(0), pIFace(NULL) {}
 };
 
-//------------------------------------------------------------------
+
 
 struct SfxDispatcher_Impl
 {
@@ -155,11 +155,11 @@ struct SfxDispatcher_Impl
     std::deque< std::deque<SfxToDo_Impl> > aToDoCopyStack;
 };
 
-//------------------------------------------------------------------
+
 
 #define SFX_FLUSH_TIMEOUT    50
 
-//--------------------------------------------------------------------
+
 
 /** This method checks if the stack of the SfxDispatchers is flushed, or if
     push- or pop- commands are pending.
@@ -238,7 +238,7 @@ sal_Bool SfxDispatcher::IsLocked( sal_uInt16 ) const
     return pImp->bLocked;
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxDispatcher::IsAppDispatcher() const
 
 /*  [Description]
@@ -256,7 +256,7 @@ sal_Bool SfxDispatcher::IsAppDispatcher() const
     return !pImp->pFrame;
 }
 
-//--------------------------------------------------------------------
+
 int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, sal_Bool bRecord )
 
 /*  [Description]
@@ -560,7 +560,7 @@ void SfxDispatcher::Pop
     }
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid )
 
@@ -585,7 +585,7 @@ IMPL_LINK_INLINE_START( SfxDispatcher, EventHdl_Impl, void *, pvoid )
 }
 IMPL_LINK_INLINE_END( SfxDispatcher, EventHdl_Impl, void *, pvoid )
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& rShell, sal_Bool bDeep )
 
 /*  [Description]
@@ -628,7 +628,7 @@ sal_Bool SfxDispatcher::CheckVirtualStack( const SfxShell& rShell, sal_Bool bDee
     return bReturn;
 }
 
-//--------------------------------------------------------------------
+
 sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& rShell )
 
 /*  [Description]
@@ -664,7 +664,7 @@ sal_uInt16 SfxDispatcher::GetShellLevel( const SfxShell& rShell )
     return USHRT_MAX;
 }
 
-//--------------------------------------------------------------------
+
 SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const
 
 /*  [Description]
@@ -686,7 +686,7 @@ SfxShell *SfxDispatcher::GetShell(sal_uInt16 nIdx) const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 SfxBindings* SfxDispatcher::GetBindings() const
 
 /*  [Description]
@@ -707,7 +707,7 @@ SfxBindings* SfxDispatcher::GetBindings() const
         return NULL;
 }
 
-//--------------------------------------------------------------------
+
 SfxViewFrame* SfxDispatcher::GetFrame() const
 
 /*  [Description]
@@ -721,7 +721,7 @@ SfxViewFrame* SfxDispatcher::GetFrame() const
     return pImp->pFrame;
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::DoActivate_Impl( sal_Bool bMDI, SfxViewFrame* /* pOld */ )
 
 /*  [Description]
@@ -799,7 +799,7 @@ void SfxDispatcher::DoParentActivate_Impl()
         (*(pImp->aStack.rbegin() + i ))->ParentActivate();
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::DoDeactivate_Impl( sal_Bool bMDI, SfxViewFrame* pNew )
 
 /*  [Description]
@@ -887,7 +887,7 @@ void SfxDispatcher::DoParentDeactivate_Impl()
         (*(pImp->aStack.rbegin() + i))->ParentDeactivate();
 }
 
-//--------------------------------------------------------------------
+
 int SfxDispatcher::GetShellAndSlot_Impl
 (
     sal_uInt16      nSlot,    // the searchable Slot-Id
@@ -938,7 +938,7 @@ int SfxDispatcher::GetShellAndSlot_Impl
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::_Execute
 (
     SfxShell&       rShell,    // to the calling <SfxShell>
@@ -987,7 +987,7 @@ void SfxDispatcher::_Execute
         Call_Impl( rShell, rSlot, rReq, SFX_CALLMODE_RECORD==(eCallMode&SFX_CALLMODE_RECORD) );
 }
 
-//--------------------------------------------------------------------
+
 void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem )
 
 /*  [Description]
@@ -1005,7 +1005,7 @@ void MappedPut_Impl( SfxAllItemSet &rSet, const SfxPoolItem &rItem )
     rSet.Put( rItem, nWhich );
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxSlot* SfxDispatcher::GetSlot( const OUString& rCommand )
 {
@@ -1036,7 +1036,7 @@ const SfxSlot* SfxDispatcher::GetSlot( const OUString& rCommand )
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem*  SfxDispatcher::Execute(
     sal_uInt16 nSlot,
     SfxCallMode nCall,
@@ -1072,7 +1072,7 @@ const SfxPoolItem*  SfxDispatcher::Execute(
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem* SfxDispatcher::Execute
 (
     sal_uInt16 nSlot,                 // the Id of the executing function
@@ -1131,7 +1131,7 @@ const SfxPoolItem* SfxDispatcher::Execute
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem* SfxDispatcher::Execute
 (
     sal_uInt16 nSlot,        // the Id of the executing function
@@ -1157,7 +1157,7 @@ const SfxPoolItem* SfxDispatcher::Execute
     return Execute( nSlot, eCall, 0, rArgs );
 }
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem*  SfxDispatcher::Execute
 (
     sal_uInt16 nSlot,
@@ -1188,7 +1188,7 @@ const SfxPoolItem*  SfxDispatcher::Execute
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem* SfxDispatcher::Execute
 (
     sal_uInt16          nSlot,  // the Id of the executing function
@@ -1251,7 +1251,7 @@ const SfxPoolItem* SfxDispatcher::Execute
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
 
@@ -1298,7 +1298,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
     delete pReq;
     return 0;
 }
-//--------------------------------------------------------------------
+
 void SfxDispatcher::SetMenu_Impl()
 {
 #if HAVE_FEATURE_DESKTOP
@@ -1329,7 +1329,7 @@ void SfxDispatcher::SetMenu_Impl()
 #endif
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::Update_Impl( sal_Bool bForce )
 {
     SFX_STACK(SfxDispatcher::Update_Impl);
@@ -1606,7 +1606,7 @@ void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bo
     }
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::FlushImpl()
 
 /*  [Description]
@@ -1756,7 +1756,7 @@ void SfxDispatcher::FlushImpl()
     SAL_INFO("sfx.control", "SfxDispatcher(" << this << ")::Flush() done");
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::SetSlotFilter
 (
     // HACK(hier muss mal ein enum rein) ???
@@ -1817,7 +1817,7 @@ void SfxDispatcher::SetSlotFilter
     GetBindings()->InvalidateAll(sal_True);
 }
 
-//--------------------------------------------------------------------
+
 extern "C"
 #ifdef WNT
 int _cdecl
@@ -1830,7 +1830,7 @@ SfxCompareSIDs_Impl( const void* pSmaller, const void* pBigger )
     return ( (long) *((sal_uInt16*)pSmaller) ) - ( (long) *((sal_uInt16*)pBigger) );
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const
 
 /*  [Description]
@@ -1862,7 +1862,7 @@ sal_Bool SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const
     return pImp->bFilterEnabling ? bFound : !bFound;
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxDispatcher::_TryIntercept_Impl
 (
     sal_uInt16      nSlot,    // Slot-Id to search for
@@ -2062,7 +2062,7 @@ sal_Bool SfxDispatcher::_FindServer
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxDispatcher::_FillState
 (
     const SfxSlotServer&  rSvr,      // <Slot-Server> to query
@@ -2171,7 +2171,7 @@ SfxPopupMenuManager* SfxDispatcher::Popup( sal_uInt16 nConfigId,Window *pWin, co
 }
 
 
-//----------------------------------------------------------------------
+
 void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Point *pPos )
 {
     SfxDispatcher &rDisp = *SFX_APP()->GetDispatcher_Impl();
@@ -2196,14 +2196,14 @@ void SfxDispatcher::ExecutePopup( sal_uInt16 nConfigId, Window *pWin, const Poin
     }
 }
 
-//----------------------------------------------------------------------
+
 void SfxDispatcher::ExecutePopup( const ResId &rId, Window *pWin, const Point *pPos )
 {
     Window *pWindow = pWin ? pWin : pImp->pFrame->GetFrame().GetWorkWindow_Impl()->GetWindow();
     SfxPopupMenuManager::ExecutePopup( rId, GetFrame(), pPos ? *pPos : pWindow->GetPointerPosPixel(), pWindow );
 }
 
-//--------------------------------------------------------------------
+
 void SfxDispatcher::Lock( sal_Bool bLock )
 
 /*  [Description]
@@ -2237,7 +2237,7 @@ sal_uInt32 SfxDispatcher::GetObjectBarId( sal_uInt16 nPos ) const
     return pImp->aObjBars[nPos].nResId;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxDispatcher::HideUI( sal_Bool bHide )
 {
     sal_Bool bWasHidden = pImp->bNoUI;
@@ -2277,7 +2277,7 @@ sal_Bool SfxDispatcher::GetReadOnly_Impl() const
     return pImp->bReadOnly;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxDispatcher::SetQuietMode_Impl( sal_Bool bOn )
 
 /*  [Description]
diff --git a/sfx2/source/control/minfitem.cxx b/sfx2/source/control/minfitem.cxx
index 02e782fb381c..be60afb26602 100644
--- a/sfx2/source/control/minfitem.cxx
+++ b/sfx2/source/control/minfitem.cxx
@@ -23,7 +23,7 @@
 
 TYPEINIT1(SfxMacroInfoItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxMacroInfoItem::SfxMacroInfoItem(
     sal_uInt16 nWhichId,        // Slot-ID
@@ -41,7 +41,7 @@ SfxMacroInfoItem::SfxMacroInfoItem(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 // copy constructor
 
@@ -55,7 +55,7 @@ SfxMacroInfoItem::SfxMacroInfoItem(const SfxMacroInfoItem& rCopy):
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 // op ==
 
@@ -69,14 +69,14 @@ bool SfxMacroInfoItem::operator==( const SfxPoolItem& rCmp) const
             aCommentText == ((const SfxMacroInfoItem&)rCmp).aCommentText;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem *SfxMacroInfoItem::Clone( SfxItemPool *) const
 {
     return new SfxMacroInfoItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SfxMacroInfoItem::GetQualifiedName() const
 {
diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx
index 855d4f1942e3..a053010fcb10 100644
--- a/sfx2/source/control/msg.cxx
+++ b/sfx2/source/control/msg.cxx
@@ -41,7 +41,7 @@ SfxSlotKind SfxSlot::GetKind() const
         return (SfxSlotKind) SFX_KIND_ATTR;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const
 {
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index ed62cb6c79d7..f99e8978fa8c 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -141,7 +141,7 @@ const SfxSlot* SfxSlotPool::GetSlot( sal_uInt16 nId )
     return _pParentPool ? _pParentPool->GetSlot( nId ) : 0;
 }
 
-//--------------------------------------------------------------------
+
 
 // skips to the next group
 
@@ -186,7 +186,7 @@ OUString SfxSlotPool::SeekGroup( sal_uInt16 nNo )
 }
 
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxSlotPool::GetGroupCount()
 {
@@ -194,7 +194,7 @@ sal_uInt16 SfxSlotPool::GetGroupCount()
 }
 
 
-//--------------------------------------------------------------------
+
 
 // internal search loop
 
@@ -240,7 +240,7 @@ const SfxSlot* SfxSlotPool::SeekSlot( sal_uInt16 nStartInterface )
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 // skips to the next func in the current group
 
 const SfxSlot* SfxSlotPool::NextSlot()
@@ -285,9 +285,9 @@ const SfxSlot* SfxSlotPool::NextSlot()
 }
 
 
-//--------------------------------------------------------------------
+
 // Query SlotName with help text
-//--------------------------------------------------------------------
+
 
 SfxInterface* SfxSlotPool::FirstInterface()
 {
@@ -298,7 +298,7 @@ SfxInterface* SfxSlotPool::FirstInterface()
 }
 
 
-//--------------------------------------------------------------------
+
 
 const SfxSlot* SfxSlotPool::GetUnoSlot( const OUString& rName )
 {
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 9715bdb8ed18..dd42fcf68db8 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -286,7 +286,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 SfxInterface::~SfxInterface()
 {
@@ -303,7 +303,7 @@ SfxInterface::~SfxInterface()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 // searches for the specified func
 
@@ -341,7 +341,7 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const
     return pGenoType ? pGenoType->GetSlot( aCommand ) : NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
 {
@@ -361,7 +361,7 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
     return pSlot->pLinkedSlot;
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
 {
@@ -382,7 +382,7 @@ const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
     return pSlot->pLinkedSlot;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxInterface::RegisterPopupMenu( const ResId& rResId )
 {
@@ -391,7 +391,7 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
     pImpData->aPopupRes = rResId;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
         const OUString *pStr )
@@ -451,7 +451,7 @@ const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
     return pImpData->aObjectBars[nNo]->aResId;
 }
 
-//--------------------------------------------------------------------
+
 
 
 sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
@@ -473,7 +473,7 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
     return pImpData->aObjectBars[nNo]->nPos;
 }
 
-//--------------------------------------------------------------------
+
 
 
 sal_uInt16 SfxInterface::GetObjectBarCount() const
@@ -484,7 +484,7 @@ sal_uInt16 SfxInterface::GetObjectBarCount() const
         return pImpData->aObjectBars.size();
 }
 
-//--------------------------------------------------------------------
+
 void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const OUString* pChildWinName)
 {
     RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
@@ -542,7 +542,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const
     return pImpData->aChildWindows[nNo]->nFeature;
 }
 
-//--------------------------------------------------------------------
+
 
 
 sal_uInt16 SfxInterface::GetChildWindowCount() const
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 6b453952cf20..3d364d23dc8e 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -131,7 +131,7 @@ SfxRequest::~SfxRequest()
         DeleteItemOnIdle(pImp->pRetVal);
     delete pImp;
 }
-//--------------------------------------------------------------------
+
 
 
 SfxRequest::SfxRequest
@@ -162,7 +162,7 @@ SfxRequest::SfxRequest
     else
         pImp->SetPool( rOrig.pImp->pPool );
 }
-//--------------------------------------------------------------------
+
 
 
 SfxRequest::SfxRequest
@@ -210,7 +210,7 @@ SfxRequest::SfxRequest
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 
 SfxRequest::SfxRequest
@@ -258,7 +258,7 @@ SfxRequest::SfxRequest
     TransformParameters( nSlot, rArgs, *pArgs, pSlot );
 }
 
-//-----------------------------------------------------------------------
+
 
 SfxRequest::SfxRequest
 (
@@ -282,21 +282,21 @@ SfxRequest::SfxRequest
     pImp->nCallMode = nMode;
     pImp->bUseTarget = sal_False;
 }
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxRequest::GetCallMode() const
 {
     return pImp->nCallMode;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxRequest::IsSynchronCall() const
 {
     return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::SetSynchronCall( sal_Bool bSynchron )
 {
@@ -317,7 +317,7 @@ const SfxItemSet* SfxRequest::GetInternalArgs_Impl() const
     return pImp->pInternalArgs;
 }
 
-//--------------------------------------------------------------------
+
 
 
 void SfxRequest_Impl::Record
@@ -375,7 +375,7 @@ void SfxRequest_Impl::Record
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::Record_Impl
 (
@@ -400,7 +400,7 @@ void SfxRequest::Record_Impl
     pImp->pViewFrame = pViewFrame;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::SetArgs( const SfxAllItemSet& rArgs )
 {
@@ -409,7 +409,7 @@ void SfxRequest::SetArgs( const SfxAllItemSet& rArgs )
     pImp->SetPool( pArgs->GetPool() );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::AppendItem(const SfxPoolItem &rItem)
 {
@@ -418,7 +418,7 @@ void SfxRequest::AppendItem(const SfxPoolItem &rItem)
     pArgs->Put(rItem, rItem.Which());
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::RemoveItem( sal_uInt16 nID )
 {
@@ -430,7 +430,7 @@ void SfxRequest::RemoveItem( sal_uInt16 nID )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxRequest::GetArg
 (
@@ -443,7 +443,7 @@ const SfxPoolItem* SfxRequest::GetArg
 }
 
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem* SfxRequest::GetItem
 (
     const SfxItemSet* pArgs,
@@ -509,7 +509,7 @@ const SfxPoolItem* SfxRequest::GetItem
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::SetReturnValue(const SfxPoolItem &rItem)
 {
@@ -519,14 +519,14 @@ void SfxRequest::SetReturnValue(const SfxPoolItem &rItem)
     pImp->pRetVal = rItem.Clone();
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxRequest::GetReturnValue() const
 {
     return pImp->pRetVal;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::Done
 (
@@ -587,7 +587,7 @@ void SfxRequest::Done
     }
 }
 
-//--------------------------------------------------------------------
+
 
 
 void SfxRequest::Done( sal_Bool bRelease )
@@ -598,7 +598,7 @@ void SfxRequest::Done( sal_Bool bRelease )
         DELETEZ( pArgs );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::ForgetAllArgs()
 {
@@ -606,14 +606,14 @@ void SfxRequest::ForgetAllArgs()
     DELETEZ( pImp->pInternalArgs );
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxRequest::IsCancelled() const
 {
     return pImp->bCancelled;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::Cancel()
 
@@ -629,7 +629,7 @@ void SfxRequest::Cancel()
     DELETEZ( pArgs );
 }
 
-//--------------------------------------------------------------------
+
 
 
 void SfxRequest::Ignore()
@@ -651,7 +651,7 @@ void SfxRequest::Ignore()
     pImp->bIgnored = sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::Done_Impl
 (
@@ -766,7 +766,7 @@ void SfxRequest::Done_Impl
     }
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxRequest::IsDone() const
 
@@ -789,7 +789,7 @@ sal_Bool SfxRequest::IsDone() const
     return pImp->bDone;
 }
 
-//--------------------------------------------------------------------
+
 
 com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRequest::GetMacroRecorder( SfxViewFrame* pView )
 
@@ -827,7 +827,7 @@ sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
 }
 
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxRequest::IsAPI() const
 
@@ -841,19 +841,19 @@ sal_Bool SfxRequest::IsAPI() const
     return SFX_CALLMODE_API == ( SFX_CALLMODE_API & pImp->nCallMode );
 }
 
-//--------------------------------------------------------------------
+
 void SfxRequest::SetModifier( sal_uInt16 nModi )
 {
     pImp->nModifier = nModi;
 }
 
-//--------------------------------------------------------------------
+
 sal_uInt16 SfxRequest::GetModifier() const
 {
     return pImp->nModifier;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxRequest::AllowRecording( sal_Bool bSet )
 {
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 84d0160ca358..44d73a8a157b 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -141,7 +141,7 @@ SfxShell::SfxShell()
     pImp->nDisableFlags = 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxShell::SfxShell( SfxViewShell *pViewSh )
 
@@ -166,7 +166,7 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
     pImp->bActive = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxShell::~SfxShell()
 
@@ -184,7 +184,7 @@ SfxShell::~SfxShell()
     delete pImp;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::SetName( const OUString &rName )
 
@@ -198,7 +198,7 @@ void SfxShell::SetName( const OUString &rName )
     pImp->aObjectName = rName;
 }
 
-//--------------------------------------------------------------------
+
 
 const OUString& SfxShell::GetName() const
 
@@ -212,7 +212,7 @@ const OUString& SfxShell::GetName() const
     return pImp->aObjectName;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxDispatcher* SfxShell::GetDispatcher() const
 
@@ -229,7 +229,7 @@ SfxDispatcher* SfxShell::GetDispatcher() const
     return pImp->pFrame ? pImp->pFrame->GetDispatcher() : 0;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewShell* SfxShell::GetViewShell() const
 
@@ -244,7 +244,7 @@ SfxViewShell* SfxShell::GetViewShell() const
     return pImp->pViewSh;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFrame* SfxShell::GetFrame() const
 
@@ -277,7 +277,7 @@ SfxViewFrame* SfxShell::GetFrame() const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxShell::GetItem
 (
@@ -306,7 +306,7 @@ const SfxPoolItem* SfxShell::GetItem
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::PutItem
 (
@@ -370,7 +370,7 @@ void SfxShell::PutItem
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxInterface* SfxShell::GetInterface() const
 
@@ -388,7 +388,7 @@ SfxInterface* SfxShell::GetInterface() const
     return GetStaticInterface();
 }
 
-//--------------------------------------------------------------------
+
 
 ::svl::IUndoManager* SfxShell::GetUndoManager()
 
@@ -405,7 +405,7 @@ SfxInterface* SfxShell::GetInterface() const
     return pUndoMgr;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr )
 
@@ -435,7 +435,7 @@ void SfxShell::SetUndoManager( ::svl::IUndoManager *pNewUndoMgr )
             officecfg::Office::Common::Undo::Steps::get());
 }
 
-//--------------------------------------------------------------------
+
 
 SfxRepeatTarget* SfxShell::GetRepeatTarget() const
 
@@ -456,7 +456,7 @@ SfxRepeatTarget* SfxShell::GetRepeatTarget() const
     return pImp->pRepeatTarget;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget )
 
@@ -478,7 +478,7 @@ void SfxShell::SetRepeatTarget( SfxRepeatTarget *pTarget )
     pImp->pRepeatTarget = pTarget;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::Invalidate
 (
@@ -548,7 +548,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
@@ -585,7 +585,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
     Activate(bMDI);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
@@ -623,14 +623,14 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
     Deactivate(bMDI);
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxShell::IsActive() const
 {
     return pImp->bActive;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::Activate
 (
@@ -661,7 +661,7 @@ void SfxShell::Activate
     BroadcastContextForActivation(true);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::Deactivate
 (
@@ -712,7 +712,7 @@ void SfxShell::ParentActivate
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::ParentDeactivate
 (
@@ -732,7 +732,7 @@ void SfxShell::ParentDeactivate
 {
 }
 
-//--------------------------------------------------------------------
+
 
 ResMgr* SfxShell::GetResMgr() const
 
@@ -747,7 +747,7 @@ ResMgr* SfxShell::GetResMgr() const
     return GetInterface()->GetResMgr();
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
 
@@ -766,7 +766,7 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
     return aSet.GetItemState(nId) != SFX_ITEM_DISABLED;
 }
 
-//--------------------------------------------------------------------
+
 
 long ShellCall_Impl( void* pObj, void* pArg )
 {
@@ -779,7 +779,7 @@ long ShellCall_Impl( void* pObj, void* pArg )
     Asynchronous ExecuteSlot for the RELOAD
  */
 
-//--------------------------------------------------------------------
+
 const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync )
 {
     if( !bAsync )
@@ -851,7 +851,7 @@ const SfxPoolItem* SfxShell::ExecuteSlot
     return rReq.GetReturnValue();
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxShell::GetSlotState
 (
@@ -960,7 +960,7 @@ const SfxPoolItem* SfxShell::GetSlotState
     return pRetItem;
 }
 
-//--------------------------------------------------------------------
+
 
 SFX_EXEC_STUB(SfxShell, VerbExec)
 SFX_STATE_STUB(SfxShell, VerbState)
@@ -1036,14 +1036,14 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence < com::sun::star::em
     }
 }
 
-//--------------------------------------------------------------------
+
 
 const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& SfxShell::GetVerbs() const
 {
     return pImp->aVerbList;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::VerbExec(SfxRequest& rReq)
 {
@@ -1073,13 +1073,13 @@ void SfxShell::VerbExec(SfxRequest& rReq)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::VerbState(SfxItemSet& )
 {
 }
 
-//--------------------------------------------------------------------
+
 
 const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const
 {
@@ -1095,21 +1095,21 @@ const SfxSlot* SfxShell::GetVerbSlot_Impl(sal_uInt16 nId) const
         return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxShell::SetHelpId(sal_uIntPtr nId)
 {
     pImp->nHelpId = nId;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uIntPtr SfxShell::GetHelpId() const
 {
     return pImp->nHelpId;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectShell* SfxShell::GetObjectShell()
 {
@@ -1119,7 +1119,7 @@ SfxObjectShell* SfxShell::GetObjectShell()
         return NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
 {
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 2114ffaf1551..e48175ac7840 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -24,7 +24,7 @@
 
 TYPEINIT1_AUTOFACTORY(SfxScriptOrganizerItem, SfxStringItem);
 
-//------------------------------------------------------------------------
+
 
 SfxScriptOrganizerItem::SfxScriptOrganizerItem() :
 
@@ -33,7 +33,7 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) :
 
@@ -44,20 +44,20 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rI
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxScriptOrganizerItem::~SfxScriptOrganizerItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SfxScriptOrganizerItem::Clone( SfxItemPool * ) const
 {
     return new SfxScriptOrganizerItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 bool SfxScriptOrganizerItem::operator==( const SfxPoolItem& rItem) const
 {
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 1c3644205abb..bd78e889c158 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::util;
 DBG_NAME(SfxStateCache)
 DBG_NAME(SfxStateCacheSetState)
 
-//-----------------------------------------------------------------------------
+
 BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS )
     : xDisp( rDisp )
     , aURL( rURL )
@@ -184,7 +184,7 @@ void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps,
     }
 }
 
-//--------------------------------------------------------------------
+
 // This constructor for an invalid cache that is updated in the first request.
 
 SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
@@ -202,7 +202,7 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
     bItemDirty = sal_True;
 }
 
-//--------------------------------------------------------------------
+
 // The Destructor checks by assertion, even if controllers are registered.
 
 SfxStateCache::~SfxStateCache()
@@ -218,7 +218,7 @@ SfxStateCache::~SfxStateCache()
     }
 }
 
-//--------------------------------------------------------------------
+
 // invalidates the cache (next request will force update)
 void SfxStateCache::Invalidate( sal_Bool bWithMsg )
 {
@@ -235,7 +235,7 @@ void SfxStateCache::Invalidate( sal_Bool bWithMsg )
     }
 }
 
-//--------------------------------------------------------------------
+
 // gets the corresponding function from the dispatcher or the cache
 
 const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & xProv )
@@ -329,7 +329,7 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
 }
 
 
-//--------------------------------------------------------------------
+
 
 // Set Status in all Controllers
 
@@ -351,7 +351,7 @@ void SfxStateCache::SetState
     SetState_Impl( eState, pState, bMaybeDirty );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStateCache::SetVisibleState( sal_Bool bShow )
 {
@@ -397,7 +397,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStateCache::SetState_Impl
 (
@@ -462,7 +462,7 @@ void SfxStateCache::SetState_Impl
 }
 
 
-//--------------------------------------------------------------------
+
 // Set old status again in all the controllers
 
 void SfxStateCache::SetCachedState( sal_Bool bAlways )
@@ -496,7 +496,7 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways )
 }
 
 
-//--------------------------------------------------------------------
+
 // Destroy FloatingWindows in all Controls with this Id
 
 void SfxStateCache::DeleteFloatingWindows()
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index a9004590e754..da8115692b92 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -299,7 +299,7 @@ void SAL_CALL SfxStatusDispatcher::removeStatusListener( const ::com::sun::star:
     aListeners.removeInterface( aURL.Complete, aListener );
 }
 
-//-------------------------------------------------------------------------
+
 // XUnoTunnel
 sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index e515b1483bfb..573fc5e25ef5 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -153,13 +153,13 @@ BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext
 {
 }
 
-//_______________________________________________
+
 
 BackingComp::~BackingComp()
 {
 }
 
-//_______________________________________________
+
 
 /** return information about supported interfaces.
 
@@ -213,7 +213,7 @@ css::uno::Any SAL_CALL BackingComp::queryInterface( /*IN*/ const css::uno::Type&
     return aResult;
 }
 
-//_______________________________________________
+
 
 /** increase ref count of this instance.
  */
@@ -224,7 +224,7 @@ void SAL_CALL BackingComp::acquire()
     OWeakObject::acquire();
 }
 
-//_______________________________________________
+
 
 /** decrease ref count of this instance.
  */
@@ -235,7 +235,7 @@ void SAL_CALL BackingComp::release()
     OWeakObject::release();
 }
 
-//_______________________________________________
+
 
 /** return collection about all supported interfaces.
 
@@ -285,7 +285,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
     return pTypeCollection->getTypes();
 }
 
-//_______________________________________________
+
 
 /** create one unique Id for all instances of this class.
 
@@ -336,7 +336,7 @@ css::uno::Sequence< OUString > SAL_CALL BackingComp::getSupportedServiceNames()
     return lNames;
 }
 
-//_______________________________________________
+
 
 /**
     attach this component to a target frame.
@@ -465,7 +465,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f
     /* } SAFE */
 }
 
-//_______________________________________________
+
 
 /** not supported.
 
@@ -481,7 +481,7 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const css::uno::Reference< cs
     return sal_False;
 }
 
-//_______________________________________________
+
 
 /** not supported.
 
@@ -497,7 +497,7 @@ css::uno::Reference< css::frame::XModel > SAL_CALL BackingComp::getModel()
     return css::uno::Reference< css::frame::XModel >();
 }
 
-//_______________________________________________
+
 
 /** not supported.
 
@@ -510,7 +510,7 @@ css::uno::Any SAL_CALL BackingComp::getViewData()
     return css::uno::Any();
 }
 
-//_______________________________________________
+
 
 /** not supported.
 
@@ -523,7 +523,7 @@ void SAL_CALL BackingComp::restoreViewData( /*IN*/ const css::uno::Any& )
 {
 }
 
-//_______________________________________________
+
 
 /** returns the attached frame for this component.
 
@@ -542,7 +542,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL BackingComp::getFrame()
     /* } SAFE */
 }
 
-//_______________________________________________
+
 
 /** ask controller for it's current working state.
 
@@ -564,7 +564,7 @@ sal_Bool SAL_CALL BackingComp::suspend( /*IN*/ sal_Bool )
     return sal_True;
 }
 
-//_______________________________________________
+
 
 /** callback from our window member.
 
@@ -600,7 +600,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const css::lang::EventObject& aEven
     /* } SAFE */
 }
 
-//_______________________________________________
+
 
 /** kill this instance.
 
@@ -652,7 +652,7 @@ void SAL_CALL BackingComp::dispose()
     /* } SAFE */
 }
 
-//_______________________________________________
+
 
 /** not supported.
 
@@ -672,7 +672,7 @@ void SAL_CALL BackingComp::addEventListener( /*IN*/ const css::uno::Reference< c
             static_cast< ::cppu::OWeakObject* >(this));
 }
 
-//_______________________________________________
+
 
 /** not supported.
 
@@ -687,7 +687,7 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/ const css::uno::Reference
 {
 }
 
-//_______________________________________________
+
 
 /**
     force initialiation for this component.
@@ -751,7 +751,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno
     /* } SAFE */
 }
 
-//_______________________________________________
+
 
 /**
  */
@@ -761,7 +761,7 @@ void SAL_CALL BackingComp::keyPressed( /*IN*/ const css::awt::KeyEvent&  )
 {
 }
 
-//_______________________________________________
+
 
 /**
  */
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 1e3f6d12f692..0fbd80feeb61 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -93,7 +93,7 @@ void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxModalDialog::SetDialogData_Impl()
 {
@@ -105,7 +105,7 @@ void SfxModalDialog::SetDialogData_Impl()
         aDlgOpt.SetUserItem( USERITEM_NAME, makeAny( aExtraData ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxModalDialog::GetDialogData_Impl()
 
@@ -128,14 +128,14 @@ void SfxModalDialog::GetDialogData_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxModalDialog::init()
 {
     GetDialogData_Impl();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
 
@@ -162,7 +162,7 @@ SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUStri
     init();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxModalDialog::~SfxModalDialog()
 
@@ -183,7 +183,7 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool )
         pOutputSet = new SfxAllItemSet( rPool );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
 {
@@ -195,7 +195,7 @@ void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet )
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SfxModelessDialog::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_INITSHOW )
@@ -332,7 +332,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW)
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl));
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
 
@@ -365,7 +365,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
     return ModelessDialog::Notify( rEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxModelessDialog::~SfxModelessDialog()
 
@@ -380,7 +380,7 @@ SfxModelessDialog::~SfxModelessDialog()
     delete pImp;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxModelessDialog::Close()
 
@@ -401,7 +401,7 @@ bool SfxModelessDialog::Close()
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const
 
@@ -420,7 +420,7 @@ void SfxModelessDialog::FillInfo(SfxChildWinInfo& rInfo) const
         rInfo.nFlags |= SFX_CHILDWIN_ZOOMIN;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
 
@@ -456,7 +456,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
     return FloatingWindow::Notify( rEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
                         SfxChildWindow *pCW,
@@ -475,7 +475,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl));
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
                         SfxChildWindow *pCW,
@@ -495,7 +495,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx,
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxFloatingWindow,TimerHdl));
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxFloatingWindow::Close()
 
@@ -516,7 +516,7 @@ bool SfxFloatingWindow::Close()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxFloatingWindow::~SfxFloatingWindow()
 
@@ -531,7 +531,7 @@ SfxFloatingWindow::~SfxFloatingWindow()
     delete pImp;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxFloatingWindow::Resize()
 
@@ -581,7 +581,7 @@ IMPL_LINK_NOARG(SfxFloatingWindow, TimerHdl)
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxFloatingWindow::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_INITSHOW )
@@ -609,7 +609,7 @@ void SfxFloatingWindow::Initialize(SfxChildWinInfo *pInfo)
     pImp->aWinState = pInfo->aWinState;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxFloatingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
@@ -676,7 +676,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxSingleTabDialog::SfxSingleTabDialog(Window *pParent, const SfxItemSet& rSet,
     const OString& rID, const OUString& rUIXMLDescription)
@@ -702,7 +702,7 @@ SfxSingleTabDialog::SfxSingleTabDialog(Window* pParent, const SfxItemSet* pInSet
     SetInputSet( pInSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxSingleTabDialog::~SfxSingleTabDialog()
 {
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index e27c15fa072c..3288f4d82f11 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -116,7 +116,7 @@ const sal_uInt16 HI_ACTION = 4;
 
 static const char DOCUMENT_SIGNATURE_MENU_CMD[] = "Signature";
 
-//------------------------------------------------------------------------
+
 namespace {
 
 OUString CreateSizeText( sal_Int64 nSize )
@@ -193,7 +193,7 @@ OUString ConvertDateTime_Impl( const OUString& rName,
 }
 
 }
-//------------------------------------------------------------------------
+
 
 SfxDocumentInfoItem::SfxDocumentInfoItem()
     : SfxStringItem()
@@ -220,7 +220,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
@@ -280,7 +280,7 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const OUString& rFile,
     catch ( Exception& ) {}
 }
 
-//------------------------------------------------------------------------
+
 
 SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem )
     : SfxStringItem( rItem )
@@ -315,19 +315,19 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const SfxDocumentInfoItem& rItem )
     m_aCmisProperties = rItem.m_aCmisProperties;
 }
 
-//------------------------------------------------------------------------
+
 SfxDocumentInfoItem::~SfxDocumentInfoItem()
 {
     ClearCustomProperties();
 }
 
-//------------------------------------------------------------------------
+
 SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
 {
     return new SfxDocumentInfoItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
 {
     if (!(rItem.Type() == Type() && SfxStringItem::operator==(rItem)))
@@ -357,7 +357,7 @@ bool SfxDocumentInfoItem::operator==( const SfxPoolItem& rItem) const
          m_aCmisProperties.getLength() == rInfoItem.m_aCmisProperties.getLength();
 }
 
-//------------------------------------------------------------------------
+
 void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor)
 {
     setAuthor(i_rAuthor);
@@ -373,7 +373,7 @@ void SfxDocumentInfoItem::resetUserData(const OUString & i_rAuthor)
     setEditingCycles(1);
 }
 
-//------------------------------------------------------------------------
+
 void SfxDocumentInfoItem::UpdateDocumentInfo(
         const uno::Reference<document::XDocumentProperties>& i_xDocProps,
         bool i_bDoNotUpdateUserDefined) const
@@ -445,7 +445,7 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
     }
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool SfxDocumentInfoItem::IsDeleteUserData() const
 {
     return m_bDeleteUserData;
@@ -631,7 +631,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rItemSet )
     : SfxTabPage(pParent, "DescriptionInfoPage", "sfx/ui/descriptioninfopage.ui", rItemSet)
     , m_pInfoItem   ( NULL )
@@ -643,13 +643,13 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet& rI
     get(m_pCommentEd, "comments");
 }
 
-//------------------------------------------------------------------------
+
 SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItemSet)
 {
      return new SfxDocumentDescPage(pParent, rItemSet);
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
 {
     // Test whether a change is present
@@ -707,7 +707,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet)
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
 {
     m_pInfoItem = &(SfxDocumentInfoItem &)rSet.Get(SID_DOCINFO);
@@ -727,7 +727,7 @@ void SfxDocumentDescPage::Reset(const SfxItemSet &rSet)
     }
 }
 
-//------------------------------------------------------------------------
+
 namespace
 {
     OUString GetDateTimeString( sal_Int32 _nDate, sal_Int32 _nTime )
@@ -809,7 +809,7 @@ SfxDocumentPage::SfxDocumentPage(Window* pParent, const SfxItemSet& rItemSet)
         m_pSignatureBtn->Disable();
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxDocumentPage, DeleteHdl)
 {
@@ -923,14 +923,14 @@ void SfxDocumentPage::ImplCheckPasswordState()
     m_pChangePassBtn->Disable();
 }
 
-//------------------------------------------------------------------------
+
 
 SfxTabPage* SfxDocumentPage::Create( Window* pParent, const SfxItemSet& rItemSet )
 {
      return new SfxDocumentPage( pParent, rItemSet );
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxDocumentPage::EnableUseUserData()
 {
@@ -939,7 +939,7 @@ void SfxDocumentPage::EnableUseUserData()
     m_pDeleteBtn->Show();
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -998,7 +998,7 @@ sal_Bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet )
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxDocumentPage::Reset( const SfxItemSet& rSet )
 {
@@ -1127,7 +1127,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     m_pDeleteBtn->Enable( bEnableUseUserData );
 }
 
-//------------------------------------------------------------------------
+
 SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
                                               const SfxItemSet& rItemSet )
     : SfxTabDialog(0, pParent, "DocumentPropertiesDialog",
@@ -1181,7 +1181,7 @@ SfxDocumentInfoDialog::SfxDocumentInfoDialog( Window* pParent,
     AddTabPage("security", SfxSecurityPage::Create, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxDocumentInfoDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
 {
@@ -1323,7 +1323,7 @@ IMPL_LINK_NOARG(CustomPropertiesEditButton, ClickHdl)
     delete pDurationDlg;
     return 1;
 }
-//--------------------------------------------------------------------------
+
 void CustomPropertiesYesNoButton::Resize()
 {
     const long nWidth = GetSizePixel().Width();
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index be4ff1b51937..8d75488c9b1d 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -433,7 +433,7 @@ friend class SfxDockingWindow;
                         { eDockAlignment = eAlign; }
 };
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::Resize()
 
@@ -483,7 +483,7 @@ void SfxDockingWindow::Resize()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxDockingWindow::PrepareToggleFloatingMode()
 
@@ -536,7 +536,7 @@ bool SfxDockingWindow::PrepareToggleFloatingMode()
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::ToggleFloatingMode()
 
@@ -623,7 +623,7 @@ void SfxDockingWindow::ToggleFloatingMode()
         pWorkWin->ConfigChild_Impl( eIdent, SFX_TOGGLEFLOATMODE, pMgr->GetType() );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::StartDocking()
 
@@ -654,7 +654,7 @@ void SfxDockingWindow::StartDocking()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
 
@@ -757,7 +757,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect )
     return bFloatMode;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
 
@@ -830,7 +830,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
     SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::Resizing( Size& /*rSize*/ )
 
@@ -846,7 +846,7 @@ void SfxDockingWindow::Resizing( Size& /*rSize*/ )
 
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     Window* pParent, WinBits nWinBits) :
@@ -897,7 +897,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     Window* pParent, const ResId& rResId) :
@@ -948,7 +948,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW,
     pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl));
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo)
 /*  [Description]
@@ -1177,7 +1177,7 @@ void SfxDockingWindow::Initialize_Impl()
     pImp->bConstructed = sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
 
@@ -1222,7 +1222,7 @@ void SfxDockingWindow::FillInfo(SfxChildWinInfo& rInfo) const
     rInfo.aExtraString += ")";
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxDockingWindow::~SfxDockingWindow()
 {
@@ -1241,7 +1241,7 @@ void SfxDockingWindow::ReleaseChildWindow_Impl()
     pMgr=NULL;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& rRect)
 
@@ -1600,7 +1600,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle&
     return eDockAlign;
 }
 
-//-------------------------------------------------------------------------
+
 
 Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign)
 
@@ -1649,7 +1649,7 @@ Size SfxDockingWindow::CalcDockingSize(SfxChildAlignment eAlign)
     return aSize;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment,
     SfxChildAlignment eAlign)
@@ -1665,7 +1665,7 @@ SfxChildAlignment SfxDockingWindow::CheckAlignment(SfxChildAlignment,
     return eAlign;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxDockingWindow::Close()
 
@@ -1687,7 +1687,7 @@ bool SfxDockingWindow::Close()
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::Paint(const Rectangle& /*rRect*/)
 
@@ -1740,7 +1740,7 @@ void SfxDockingWindow::Paint(const Rectangle& /*rRect*/)
     aView.DrawFrame( aRect, FRAME_DRAW_OUT );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize )
 
@@ -1755,7 +1755,7 @@ void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize )
     DockingWindow::SetMinOutputSizePixel( rSize );
 }
 
-//-------------------------------------------------------------------------
+
 
 Size SfxDockingWindow::GetMinOutputSizePixel() const
 
@@ -1768,7 +1768,7 @@ Size SfxDockingWindow::GetMinOutputSizePixel() const
     return pImp->aMinSize;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
 {
@@ -1813,7 +1813,7 @@ sal_uInt16 SfxDockingWindow::GetWinBits_Impl() const
     return nBits;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDockingWindow::SetItemSize_Impl( const Size& rSize )
 {
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index 385f11e043d7..74dc1fc8b4e5 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -148,7 +148,7 @@ namespace sfx2
 // = reading of configuration data
 // =======================================================================
 
-    //--------------------------------------------------------------------
+
     void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const OUString& _rLogicalClassName,
         FilterClass& /* [out] */ _rClass )
     {
@@ -163,7 +163,7 @@ namespace sfx2
         aClassDesc.getNodeValue( sSubFiltersNodeName ) >>= _rClass.aSubFilters;
     }
 
-    //--------------------------------------------------------------------
+
     struct CreateEmptyClassRememberPos : public ::std::unary_function< FilterName, void >
     {
     protected:
@@ -190,7 +190,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     struct ReadGlobalFilter : public ::std::unary_function< FilterName, void >
     {
     protected:
@@ -223,7 +223,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     void lcl_ReadGlobalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames )
     {
         _rGlobalClasses.clear();
@@ -267,7 +267,7 @@ namespace sfx2
         );
     }
 
-    //--------------------------------------------------------------------
+
     struct ReadLocalFilter : public ::std::unary_function< FilterName, void >
     {
     protected:
@@ -293,7 +293,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     void lcl_ReadLocalFilters( const OConfigurationNode& _rFilterClassification, FilterClassList& _rLocalClasses )
     {
         _rLocalClasses.clear();
@@ -310,7 +310,7 @@ namespace sfx2
         );
     }
 
-    //--------------------------------------------------------------------
+
     void lcl_ReadClassification( FilterClassList& _rGlobalClasses, StringArray& _rGlobalClassNames, FilterClassList& _rLocalClasses )
     {
         //================================================================
@@ -336,7 +336,7 @@ namespace sfx2
 // = grouping and classifying
 // =======================================================================
 
-    //--------------------------------------------------------------------
+
     // a struct which adds helps remembering a reference to a class entry
     struct ReferToFilterEntry : public ::std::unary_function< FilterName, void >
     {
@@ -362,7 +362,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     struct FillClassGroup : public ::std::unary_function< FilterClass, void >
     {
     protected:
@@ -400,7 +400,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     static const sal_Unicode s_cWildcardSeparator( ';' );
 
     //====================================================================
@@ -504,7 +504,7 @@ namespace sfx2
             aWildCards.push_back( OUString( pTokenStart, pTokenLoop - pTokenStart ) );
     }
 
-    //--------------------------------------------------------------------
+
     void lcl_InitGlobalClasses( GroupedFilterList& _rAllFilters, const FilterClassList& _rGlobalClasses, FilterGroupEntryReferrer& _rGlobalClassesRef )
     {
         // we need an extra group in our "all filters" container
@@ -527,7 +527,7 @@ namespace sfx2
             //  and modify the descriptor for this class accordingly
     }
 
-    //--------------------------------------------------------------------
+
     typedef ::std::vector< ::std::pair< FilterGroupEntryReferrer::mapped_type, FilterGroup::iterator > >
             MapGroupEntry2GroupEntry;
             // this is not really a map - it's just called this way because it is used as a map
@@ -554,7 +554,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     struct CopyNonEmptyFilter : public ::std::unary_function< FilterDescriptor, void >
     {
         FilterGroup& rTarget;
@@ -567,7 +567,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     void lcl_GroupAndClassify( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rAllFilters )
     {
         _rAllFilters.clear();
@@ -728,7 +728,7 @@ namespace sfx2
         rGlobalFilters.swap( aNonEmptyGlobalFilters );
     }
 
-    //--------------------------------------------------------------------
+
     struct AppendFilter : public ::std::unary_function< FilterDescriptor, void >
     {
         protected:
@@ -763,7 +763,7 @@ namespace sfx2
 // = handling for the "all files" entry
 // =======================================================================
 
-    //--------------------------------------------------------------------
+
     sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName )
     {
         sal_Bool        bHasAll = sal_False;
@@ -779,7 +779,7 @@ namespace sfx2
         return bHasAll;
     }
 
-    //--------------------------------------------------------------------
+
     void lcl_EnsureAllFilesEntry( TSortedFilterList& _rFilterMatcher, GroupedFilterList& _rFilters )
     {
         // ===============================================================
@@ -800,7 +800,7 @@ namespace sfx2
 // = filling an XFilterManager
 // =======================================================================
 
-    //--------------------------------------------------------------------
+
     struct AppendFilterGroup : public ::std::unary_function< FilterGroup, void >
     {
     protected:
@@ -864,7 +864,7 @@ namespace sfx2
         }
     };
 
-    //--------------------------------------------------------------------
+
     TSortedFilterList::TSortedFilterList(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >& xFilterList)
         : m_nIterator(0)
     {
@@ -883,21 +883,21 @@ namespace sfx2
         }
     }
 
-    //--------------------------------------------------------------------
+
     const SfxFilter* TSortedFilterList::First()
     {
         m_nIterator = 0;
         return impl_getFilter(m_nIterator);
     }
 
-    //--------------------------------------------------------------------
+
     const SfxFilter* TSortedFilterList::Next()
     {
         ++m_nIterator;
         return impl_getFilter(m_nIterator);
     }
 
-    //--------------------------------------------------------------------
+
     const SfxFilter* TSortedFilterList::impl_getFilter(sal_Int32 nIndex)
     {
         if (nIndex<0 || nIndex>=(sal_Int32)m_lFilters.size())
@@ -908,7 +908,7 @@ namespace sfx2
         return SfxFilter::GetFilterByName(sFilterName);
     }
 
-    //--------------------------------------------------------------------
+
     void appendFiltersForSave( TSortedFilterList& _rFilterMatcher,
                                const Reference< XFilterManager >& _rxFilterManager,
                                OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl,
@@ -971,7 +971,7 @@ namespace sfx2
         OUString aWildcard;
     };
 
-    //--------------------------------------------------------------------
+
     void appendExportFilters( TSortedFilterList& _rFilterMatcher,
                               const Reference< XFilterManager >& _rxFilterManager,
                               OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl )
@@ -1130,7 +1130,7 @@ namespace sfx2
         }
     }
 
-    //--------------------------------------------------------------------
+
     void appendFiltersForOpen( TSortedFilterList& _rFilterMatcher,
                                const Reference< XFilterManager >& _rxFilterManager,
                                OUString& _rFirstNonEmpty, FileDialogHelper_Impl& _rFileDlgImpl )
diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx
index 444245b5f12c..aae7b16c2771 100644
--- a/sfx2/source/dialog/itemconnect.cxx
+++ b/sfx2/source/dialog/itemconnect.cxx
@@ -40,7 +40,7 @@ TriState lclConvertToTriState( bool bKnown, bool bIsKnownFlag, bool bIsUnknownFl
 
 } // namespace
 
-// ----------------------------------------------------------------------------
+
 
 sal_uInt16 ItemWrapperHelper::GetWhichId( const SfxItemSet& rItemSet, sal_uInt16 nSlot )
 {
@@ -105,7 +105,7 @@ void DummyWindowWrapper::SetControlValue( void* )
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 CheckBoxWrapper::CheckBoxWrapper( CheckBox& rCheckBox ) :
         SingleControlWrapperType( rCheckBox )
@@ -133,7 +133,7 @@ void CheckBoxWrapper::SetControlValue( sal_Bool bValue )
     GetControl().Check( bValue );
 }
 
-// ----------------------------------------------------------------------------
+
 
 ColorListBoxWrapper::ColorListBoxWrapper(ColorListBox & rListBox):
     SingleControlWrapper< ColorListBox, Color >(rListBox)
@@ -327,7 +327,7 @@ bool ItemConnectionArrayImpl::FillItemSet( SfxItemSet& rDestSet, const SfxItemSe
     return bChanged;
 }
 
-// ----------------------------------------------------------------------------
+
 
 ItemConnectionArray::ItemConnectionArray() :
     mxImpl( new ItemConnectionArrayImpl )
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 1b51bd5f2a41..587d9a8f0903 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -74,7 +74,7 @@
 #include <vcl/svapp.hxx>
 #include <cppuhelper/implbase1.hxx>
 
-// --------------------------------------------------------------
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 63abb278453e..f33ce5000f3e 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -230,7 +230,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(Window* pParent, const SfxItemS
         m_pAutoCB->Show();
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
 
@@ -248,7 +248,7 @@ SfxManageStyleSheetPage::~SfxManageStyleSheetPage()
 
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
                                                const OUString& rNew )
@@ -276,7 +276,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxManageStyleSheetPage::SetDescriptionText_Impl()
 
@@ -314,7 +314,7 @@ void SfxManageStyleSheetPage::SetDescriptionText_Impl()
     m_pDescFt->SetText( pStyle->GetDescription( eUnit ) );
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
 
@@ -329,7 +329,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
 }
 IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, GetFocusHdl, Edit *, pEdit )
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 
@@ -350,7 +350,7 @@ IMPL_LINK_INLINE_START( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 }
 IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
 
@@ -397,7 +397,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
     return bModified;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
 
@@ -466,7 +466,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent,
                                              const SfxItemSet &rAttrSet )
@@ -484,7 +484,7 @@ SfxTabPage* SfxManageStyleSheetPage::Create( Window* pParent,
     return new SfxManageStyleSheetPage( pParent, rAttrSet );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
 
@@ -515,7 +515,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
     m_pAutoCB->SaveValue();
 }
 
-//-------------------------------------------------------------------------
+
 
 int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
 
diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx
index 062b86f44df8..c8fd34ab0d5c 100644
--- a/sfx2/source/dialog/newstyle.cxx
+++ b/sfx2/source/dialog/newstyle.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( SfxNewStyleDlg, OKHdl, Control *, pControl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxNewStyleDlg, ModifyHdl, ComboBox *, pBox )
 {
@@ -86,7 +86,7 @@ SfxNewStyleDlg::SfxNewStyleDlg( Window* pParent, SfxStyleSheetBasePool& rInPool
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxNewStyleDlg::~SfxNewStyleDlg()
 {
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 14b4221e6cd6..c1d47d5d1e8c 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -27,7 +27,7 @@
 
 #include "dialog.hrc"
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
 {
@@ -61,7 +61,7 @@ IMPL_LINK_INLINE_START( SfxPasswordDialog, EditModifyHdl, Edit *, pEdit )
 }
 IMPL_LINK_INLINE_END(SfxPasswordDialog, EditModifyHdl, Edit *, pEdit)
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxPasswordDialog, OKHdl)
 {
@@ -124,7 +124,7 @@ SfxPasswordDialog::SfxPasswordDialog(Window* pParent, const OUString* pGroupText
     SetPasswdText();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxPasswordDialog::SetPasswdText( )
 {
@@ -139,7 +139,7 @@ void SfxPasswordDialog::SetPasswdText( )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen )
 {
@@ -153,7 +153,7 @@ void SfxPasswordDialog::ShowMinLengthText(bool bShow)
     mpMinLengthFT->Show(bShow);
 }
 
-// -----------------------------------------------------------------------
+
 
 short SfxPasswordDialog::Execute()
 {
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 2b9847da4f63..7f975fe3436e 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -190,7 +190,7 @@ void SfxEmptySplitWin_Impl::FadeIn()
         pOwner->SaveConfig_Impl();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -203,7 +203,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt )
     SplitWindow::MouseMove( rMEvt );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
         SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits )
@@ -317,7 +317,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl,
     pEmptyWin->SetAutoHideState( !bPinned );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxSplitWindow::~SfxSplitWindow()
 {
@@ -373,7 +373,7 @@ void SfxSplitWindow::SaveConfig_Impl()
     aWinOpt.SetUserItem( USERITEM_NAME, makeAny( aWinData.makeStringAndClear() ) );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::StartSplit()
 {
@@ -402,7 +402,7 @@ void SfxSplitWindow::StartSplit()
     SetMaxSizePixel( nSize );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::SplitResize()
 {
@@ -415,7 +415,7 @@ void SfxSplitWindow::SplitResize()
         pWorkWin->ArrangeAutoHideWindows( this );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::Split()
 {
@@ -467,7 +467,7 @@ void SfxSplitWindow::Split()
     SaveConfig_Impl();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize)
 
@@ -559,7 +559,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
         SaveConfig_Impl();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave)
 {
@@ -589,7 +589,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSa
         SaveConfig_Impl();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
                         sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
@@ -613,7 +613,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize,
     InsertWindow( pDockWin, rSize, nLine, nPos, bNewLine );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize,
                         sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine)
@@ -683,7 +683,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize
     SaveConfig_Impl();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
                         const Size& rSize,
@@ -815,7 +815,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide )
 
@@ -879,7 +879,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide )
     bLocked = sal_False;
 };
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
                                         sal_uInt16& rLine, sal_uInt16& rPos ) const
@@ -899,7 +899,7 @@ sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow,
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos,
                                       sal_uInt16& rLine, sal_uInt16& rPos ) const
@@ -920,7 +920,7 @@ sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos,
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SfxSplitWindow::GetLineCount() const
 
@@ -932,7 +932,7 @@ sal_uInt16 SfxSplitWindow::GetLineCount() const
     return GetItemCount( 0 );
 }
 
-//-------------------------------------------------------------------------
+
 
 long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const
 
@@ -945,7 +945,7 @@ long SfxSplitWindow::GetLineSize( sal_uInt16 nLine ) const
     return GetItemSize( nId );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const
 
@@ -958,7 +958,7 @@ sal_uInt16 SfxSplitWindow::GetWindowCount( sal_uInt16 nLine ) const
     return GetItemCount( nId );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SfxSplitWindow::GetWindowCount() const
 
@@ -970,14 +970,14 @@ sal_uInt16 SfxSplitWindow::GetWindowCount() const
     return GetItemCount( 0 );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::Command( const CommandEvent& rCEvt )
 {
     SplitWindow::Command( rCEvt );
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
 {
@@ -1050,7 +1050,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer)
     return 0L;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const
 {
@@ -1091,7 +1091,7 @@ sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 SplitWindow* SfxSplitWindow::GetSplitWindow()
 {
@@ -1100,7 +1100,7 @@ SplitWindow* SfxSplitWindow::GetSplitWindow()
     return this;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxSplitWindow::IsFadeIn() const
 {
     return pEmptyWin->bFadeIn;
@@ -1111,7 +1111,7 @@ sal_Bool SfxSplitWindow::IsAutoHide( sal_Bool bSelf ) const
     return bSelf ? pEmptyWin->bAutoHide && !pEmptyWin->bEndAutoHide : pEmptyWin->bAutoHide;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn )
 {
@@ -1166,7 +1166,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn )
     pEmptyWin->SetAutoHideState( !bPinned );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn )
 {
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 88213917984d..9da42533ac16 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -21,7 +21,7 @@
 #include <svtools/localresaccess.hxx>
 #include <tools/debug.hxx>
 
-// -----------------------------------------------------------------------
+
 
 class SfxStyleFamilyItem_Impl
 {
@@ -29,7 +29,7 @@ class SfxStyleFamilyItem_Impl
     Image   aImage;
 };
 
-// -----------------------------------------------------------------------
+
 
 // Implementierung des Resource-Konstruktors
 
@@ -80,7 +80,7 @@ SfxStyleFamilyItem::SfxStyleFamilyItem( const ResId &rResId ) :
         aImage = Image(aBitmap);
 }
 
-// -----------------------------------------------------------------------
+
 
 // Destructor; releases the internal data
 
@@ -91,7 +91,7 @@ SfxStyleFamilyItem::~SfxStyleFamilyItem()
     aFilterList.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 // Implementation of the resource constructor
 
@@ -112,7 +112,7 @@ SfxStyleFamilies::SfxStyleFamilies( const ResId& rResId ) :
     updateImages( rResId );
 }
 
-// -----------------------------------------------------------------------
+
 
 // Destructor; releases the internal data
 
@@ -124,7 +124,7 @@ SfxStyleFamilies::~SfxStyleFamilies()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
 {
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index 1cc80b135d5d..09c84ee20520 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -68,7 +68,7 @@ SfxStyleDialog::SfxStyleDialog
     GetCancelButton().SetClickHdl( LINK(this, SfxStyleDialog, CancelHdl) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxStyleDialog::~SfxStyleDialog()
 
@@ -84,7 +84,7 @@ SfxStyleDialog::~SfxStyleDialog()
     delete GetInputSetImpl();
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxItemSet* SfxStyleDialog::GetRefreshedSet()
 
@@ -98,7 +98,7 @@ const SfxItemSet* SfxStyleDialog::GetRefreshedSet()
     return GetInputSetImpl();
 }
 
-// -----------------------------------------------------------------------
+
 
 short SfxStyleDialog::Ok()
 
@@ -112,7 +112,7 @@ short SfxStyleDialog::Ok()
     return RET_OK;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxStyleDialog, CancelHdl, Button *, pButton )
 
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 22d5f8585021..844fcb226db0 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -239,7 +239,7 @@ SfxTabPage::SfxTabPage(Window *pParent, const OString& rID, const OUString& rUIX
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage::~SfxTabPage()
 
@@ -252,14 +252,14 @@ SfxTabPage::~SfxTabPage()
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxTabPage::FillItemSet( SfxItemSet& rSet )
 {
     return pImpl->maItemConn.DoFillItemSet( rSet, GetItemSet() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -267,7 +267,7 @@ void SfxTabPage::Reset( const SfxItemSet& rSet )
     pImpl->maItemConn.DoReset( rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabPage::ActivatePage( const SfxItemSet& )
 
@@ -281,7 +281,7 @@ void SfxTabPage::ActivatePage( const SfxItemSet& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 int SfxTabPage::DeactivatePage( SfxItemSet* )
 
@@ -304,7 +304,7 @@ int SfxTabPage::DeactivatePage( SfxItemSet* )
     return LEAVE_PAGE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabPage::FillUserData()
 
@@ -318,14 +318,14 @@ void SfxTabPage::FillUserData()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SfxTabPage::IsReadOnly() const
 {
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, sal_Bool bDeep )
 
@@ -346,7 +346,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot
     return pItem;
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxTabPage::GetOldItem( const SfxItemSet& rSet,
                                            sal_uInt16 nSlot, sal_Bool bDeep )
@@ -376,7 +376,7 @@ void SfxTabPage::PageCreated( SfxAllItemSet /*aSet*/ )
     DBG_ASSERT(false, "SfxTabPage::PageCreated should not be called");
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabPage::AddItemConnection( sfx::ItemConnectionBase* pConnection )
 {
@@ -388,7 +388,7 @@ SfxTabDialog* SfxTabPage::GetTabDialog() const
     return dynamic_cast<SfxTabDialog*>(GetParentDialog());
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabDialog::SfxTabDialog
 (
@@ -414,7 +414,7 @@ SfxTabDialog::SfxTabDialog
     Init_Impl( bFmt, NULL, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabDialog::SfxTabDialog
 
@@ -446,7 +446,7 @@ SfxTabDialog::SfxTabDialog
     DBG_WARNING( "Please use the Construtor with the ViewFrame" );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabDialog::~SfxTabDialog()
 {
@@ -502,7 +502,7 @@ SfxTabDialog::~SfxTabDialog()
         delete m_pBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText, const ResId *pResId )
 
@@ -626,7 +626,7 @@ void SfxTabDialog::Init_Impl( sal_Bool bFmtFlag, const OUString* pUserButtonText
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::RemoveResetButton()
 {
@@ -634,7 +634,7 @@ void SfxTabDialog::RemoveResetButton()
     pImpl->bHideResetBtn = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 short SfxTabDialog::Execute()
 {
@@ -644,7 +644,7 @@ short SfxTabDialog::Execute()
     return TabDialog::Execute();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
 {
@@ -654,7 +654,7 @@ void SfxTabDialog::StartExecuteModal( const Link& rEndDialogHdl )
     TabDialog::StartExecuteModal( rEndDialogHdl );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::Start( sal_Bool bShow )
 {
@@ -668,7 +668,7 @@ void SfxTabDialog::Start( sal_Bool bShow )
         GrabFocusToFirstControl();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
 {
@@ -677,7 +677,7 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl)
         m_pApplyBtn->SetClickHdl( _rHdl );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::Start_Impl()
 {
@@ -757,7 +757,7 @@ sal_uInt16 SfxTabDialog::AddTabPage
     return nPageId;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::AddTabPage
 
@@ -783,7 +783,7 @@ void SfxTabDialog::AddTabPage
         new Data_Impl( nId, pCreateFunc, pRangesFunc, bItemsOnDemand ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
 
@@ -829,7 +829,7 @@ void SfxTabDialog::RemoveTabPage(const OString &rName)
     RemoveTabPage(m_pTabCtrl->GetPageId(rName));
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::PageCreated
 
@@ -847,7 +847,7 @@ void SfxTabDialog::PageCreated
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet* SfxTabDialog::GetInputSetImpl()
 
@@ -861,7 +861,7 @@ SfxItemSet* SfxTabDialog::GetInputSetImpl()
     return (SfxItemSet*)pSet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
 
@@ -887,7 +887,7 @@ void SfxTabDialog::SavePosAndId()
     aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() );
 }
 
-// -----------------------------------------------------------------------
+
 
 short SfxTabDialog::Ok()
 
@@ -956,7 +956,7 @@ short SfxTabDialog::Ok()
     return bModified ? RET_OK : RET_CANCEL;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxTabDialog, CancelHdl)
 {
@@ -964,7 +964,7 @@ IMPL_LINK_NOARG(SfxTabDialog, CancelHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
 
@@ -979,7 +979,7 @@ SfxItemSet* SfxTabDialog::CreateInputItemSet( sal_uInt16 )
     return new SfxAllItemSet( SFX_APP()->GetPool() );
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxItemSet* SfxTabDialog::GetRefreshedSet()
 
@@ -995,7 +995,7 @@ const SfxItemSet* SfxTabDialog::GetRefreshedSet()
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxTabDialog, OkHdl)
 
@@ -1029,7 +1029,7 @@ bool SfxTabDialog::Apply()
     return bApplied;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxTabDialog::PrepareLeaveCurrentPage()
 {
@@ -1065,7 +1065,7 @@ bool SfxTabDialog::PrepareLeaveCurrentPage()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxTabDialog, UserHdl)
 
@@ -1091,7 +1091,7 @@ IMPL_LINK_NOARG(SfxTabDialog, UserHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxTabDialog, ResetHdl)
 
@@ -1118,7 +1118,7 @@ IMPL_LINK_NOARG(SfxTabDialog, ResetHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
 
@@ -1195,7 +1195,7 @@ IMPL_LINK_NOARG(SfxTabDialog, BaseFmtHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
 
@@ -1277,7 +1277,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
 
@@ -1362,7 +1362,7 @@ IMPL_LINK( SfxTabDialog, DeactivatePageHdl, TabControl *, pTabCtrl )
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::ShowPage( sal_uInt16 nId )
 
@@ -1376,7 +1376,7 @@ void SfxTabDialog::ShowPage( sal_uInt16 nId )
     ActivatePageHdl( m_pTabCtrl );
 }
 
-// -----------------------------------------------------------------------
+
 
 const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
 
@@ -1444,7 +1444,7 @@ const sal_uInt16* SfxTabDialog::GetInputRanges( const SfxItemPool& rPool )
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxTabDialog::SetInputSet( const SfxItemSet* pInSet )
 
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index 48db4d06e10b..63ddd9598f33 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -94,7 +94,7 @@ namespace sfx2
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         ::utl::OConfigurationTreeRoot lcl_getModuleUIElementStatesConfig( const OUString& i_rModuleIdentifier,
             const OUString& i_rResourceURL = OUString() )
         {
@@ -122,7 +122,7 @@ namespace sfx2
             return ::utl::OConfigurationTreeRoot( xContext, aPathComposer.makeStringAndClear(), false );
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         OUString lcl_identifyModule( const Reference< XFrame >& i_rDocumentFrame )
         {
             OUString sModuleName;
@@ -139,7 +139,7 @@ namespace sfx2
             return sModuleName;
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         Reference< XFrame > lcl_getFrame( const SfxBindings* i_pBindings )
         {
             const SfxViewFrame* pViewFrame = i_pBindings->GetDispatcher()->GetFrame();
@@ -148,14 +148,14 @@ namespace sfx2
             return xFrame;
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         OUString lcl_getPanelHelpURL( const ::utl::OConfigurationNode& i_rPanelConfigNode )
         {
             const OUString sHelpURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "HelpURL" ) ) );
             return sHelpURL;
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         Image lcl_getPanelImage( const Reference< XFrame >& i_rDocFrame, const ::utl::OConfigurationNode& i_rPanelConfigNode )
         {
             const OUString sImageURL( ::comphelper::getString( i_rPanelConfigNode.getNodeValue( "ImageURL" ) ) );
@@ -199,7 +199,7 @@ namespace sfx2
     //==================================================================================================================
     //= TaskPaneDockingWindow
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TaskPaneDockingWindow::TaskPaneDockingWindow( SfxBindings* i_pBindings, TaskPaneWrapper& i_rWrapper, Window* i_pParent, WinBits i_nBits )
         :TitledDockingWindow( i_pBindings, &i_rWrapper, i_pParent, i_nBits )
         ,m_aTaskPane( GetContentWindow(), lcl_getFrame( i_pBindings ) )
@@ -209,20 +209,20 @@ namespace sfx2
         SetText( SfxResId( SID_TASKPANE ).toString() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneDockingWindow::ActivateToolPanel( const OUString& i_rPanelURL )
     {
         m_aPaneController.ActivateToolPanel( i_rPanelURL );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneDockingWindow::GetFocus()
     {
         TitledDockingWindow::GetFocus();
         m_aTaskPane.GrabFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneDockingWindow::onLayoutDone()
     {
         m_aTaskPane.SetPosSizePixel( Point(), GetContentWindow().GetOutputSizePixel() );
@@ -231,10 +231,10 @@ namespace sfx2
     //==================================================================================================================
     //= TaskPaneWrapper
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     SFX_IMPL_DOCKINGWINDOW( TaskPaneWrapper, SID_TASKPANE );
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TaskPaneWrapper::TaskPaneWrapper( Window* i_pParent, sal_uInt16 i_nId, SfxBindings* i_pBindings, SfxChildWinInfo* i_pInfo )
         :SfxChildWindow( i_pParent, i_nId )
     {
@@ -251,7 +251,7 @@ namespace sfx2
         pWindow->Show();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneWrapper::ActivateToolPanel( const OUString& i_rPanelURL )
     {
         TaskPaneDockingWindow* pDockingWindow = dynamic_cast< TaskPaneDockingWindow* >( GetWindow() );
@@ -331,7 +331,7 @@ namespace sfx2
         bool                    m_bAttemptedCreation;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     CustomToolPanel::CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame )
         :m_sUIName( ::comphelper::getString( i_rPanelWindowState.getNodeValue( "UIName" ) ) )
         ,m_aPanelImage( lcl_getPanelImage( i_rFrame, i_rPanelWindowState ) )
@@ -344,12 +344,12 @@ namespace sfx2
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     CustomToolPanel::~CustomToolPanel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool CustomToolPanel::impl_ensureToolPanelWindow( Window& i_rPanelParentWindow )
     {
         if ( m_bAttemptedCreation )
@@ -377,7 +377,7 @@ namespace sfx2
         return m_aCustomPanel.is();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void CustomToolPanel::impl_updatePanelConfig( const bool i_bVisible ) const
     {
         ::utl::OConfigurationTreeRoot aConfig( ::comphelper::getProcessComponentContext(), m_sPanelConfigPath, true );
@@ -386,13 +386,13 @@ namespace sfx2
         aConfig.commit();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString CustomToolPanel::GetDisplayName() const
     {
         return m_sUIName;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Image CustomToolPanel::GetImage() const
     {
         return m_aPanelImage;
@@ -407,13 +407,13 @@ namespace sfx2
             return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OString CustomToolPanel::GetHelpID() const
     {
         return lcl_getHelpId( m_aPanelHelpURL );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void CustomToolPanel::Activate( Window& i_rParentWindow )
     {
         ENSURE_OR_RETURN_VOID( impl_ensureToolPanelWindow( i_rParentWindow ), "no panel to activate!" );
@@ -426,7 +426,7 @@ namespace sfx2
         impl_updatePanelConfig( true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void CustomToolPanel::Deactivate()
     {
         ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel to deactivate!" );
@@ -437,7 +437,7 @@ namespace sfx2
         impl_updatePanelConfig( false );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void CustomToolPanel::SetSizePixel( const Size& i_rPanelWindowSize )
     {
         ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to position!" );
@@ -453,7 +453,7 @@ namespace sfx2
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void CustomToolPanel::GrabFocus()
     {
         ENSURE_OR_RETURN_VOID( m_aCustomPanel.is(), "no panel/window to focus!" );
@@ -461,7 +461,7 @@ namespace sfx2
         m_aCustomPanel.getPanelWindow()->setFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void CustomToolPanel::Dispose()
     {
         if ( !m_bAttemptedCreation )
@@ -480,7 +480,7 @@ namespace sfx2
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > CustomToolPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible )
     {
         ENSURE_OR_RETURN( m_aCustomPanel.is(), "no panel to ask!", NULL );
@@ -550,32 +550,32 @@ namespace sfx2
         ::svt::ToolPanelDeck        m_aPanelDeck;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane_Impl::OnResize()
     {
         m_aPanelDeck.SetPosSizePixel( Point(), m_rAntiImpl.GetOutputSizePixel() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane_Impl::OnGetFocus()
     {
         m_aPanelDeck.GrabFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( ModuleTaskPane_Impl, OnActivatePanel, void*, i_pArg )
     {
         m_aPanelDeck.ActivatePanel( reinterpret_cast< size_t >( i_pArg ) );
         return 1L;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool ModuleTaskPane_Impl::impl_isToolPanelResource( const OUString& i_rResourceURL )
     {
         return i_rResourceURL.startsWith( "private:resource/toolpanel/" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane_Impl::impl_initFromConfiguration( const IToolPanelCompare* i_pPanelCompare )
     {
         const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( m_sModuleIdentifier ) );
@@ -634,7 +634,7 @@ namespace sfx2
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool ModuleTaskPane_Impl::ModuleHasToolPanels( const OUString& i_rModuleIdentifier )
     {
         const ::utl::OConfigurationTreeRoot aWindowStateConfig( lcl_getModuleUIElementStatesConfig( i_rModuleIdentifier ) );
@@ -653,7 +653,7 @@ namespace sfx2
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< size_t > ModuleTaskPane_Impl::GetPanelPos( const OUString& i_rResourceURL )
     {
         ::boost::optional< size_t > aPanelPos;
@@ -676,7 +676,7 @@ namespace sfx2
         return aPanelPos;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString ModuleTaskPane_Impl::GetPanelResourceURL( const size_t i_nPanelPos ) const
     {
         ENSURE_OR_RETURN( i_nPanelPos < m_aPanelDeck.GetPanelCount(), "ModuleTaskPane_Impl::GetPanelResourceURL: illegal panel position!", OUString() );
@@ -686,7 +686,7 @@ namespace sfx2
         return pCustomPanel->GetResourceURL();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane_Impl::SetDrawersLayout()
     {
         const ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() );
@@ -697,7 +697,7 @@ namespace sfx2
         m_aPanelDeck.SetLayouter( new ::svt::DrawerDeckLayouter( m_aPanelDeck, m_aPanelDeck ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane_Impl::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent )
     {
         ::svt::PDeckLayouter pLayouter( m_aPanelDeck.GetLayouter() );
@@ -722,63 +722,63 @@ namespace sfx2
     //==================================================================================================================
     //= ModuleTaskPane
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ModuleTaskPane::ModuleTaskPane( Window& i_rParentWindow, const Reference< XFrame >& i_rDocumentFrame )
         :Window( &i_rParentWindow, WB_DIALOGCONTROL )
         ,m_pImpl( new ModuleTaskPane_Impl( *this, i_rDocumentFrame, NULL ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ModuleTaskPane::~ModuleTaskPane()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool ModuleTaskPane::ModuleHasToolPanels( const Reference< XFrame >& i_rDocumentFrame )
     {
         return ModuleTaskPane_Impl::ModuleHasToolPanels( lcl_identifyModule( i_rDocumentFrame ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane::Resize()
     {
         Window::Resize();
         m_pImpl->OnResize();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane::GetFocus()
     {
         Window::GetFocus();
         m_pImpl->OnGetFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck()
     {
         return m_pImpl->GetPanelDeck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     const ::svt::ToolPanelDeck& ModuleTaskPane::GetPanelDeck() const
     {
         return m_pImpl->GetPanelDeck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< size_t > ModuleTaskPane::GetPanelPos( const OUString& i_rResourceURL )
     {
         return m_pImpl->GetPanelPos( i_rResourceURL );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane::SetDrawersLayout()
     {
         m_pImpl->SetDrawersLayout();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ModuleTaskPane::SetTabsLayout( const ::svt::TabAlignment i_eTabAlignment, const ::svt::TabItemContent i_eTabContent )
     {
         m_pImpl->SetTabsLayout( i_eTabAlignment, i_eTabContent );
@@ -906,7 +906,7 @@ namespace sfx2
         OUString         m_sDefaultTitle;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TaskPaneController_Impl::TaskPaneController_Impl( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow )
         :m_rTaskPane( i_rTaskPane )
         ,m_rDockingWindow( i_rDockingWindow )
@@ -937,7 +937,7 @@ namespace sfx2
         SetDefaultTitle( SfxResId( STR_SFX_TASKS ).toString() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TaskPaneController_Impl::~TaskPaneController_Impl()
     {
         m_rTaskPane.GetPanelDeck().RemoveListener( *this );
@@ -955,14 +955,14 @@ namespace sfx2
         m_aPanelRepository.clear();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::SetDefaultTitle( const OUString& i_rTitle )
     {
         m_sDefaultTitle = i_rTitle;
         impl_updateDockingWindowTitle();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::ActivateToolPanel( const OUString& i_rPanelURL )
     {
         ::boost::optional< size_t > aPanelPos( m_rTaskPane.GetPanelPos( i_rPanelURL ) );
@@ -979,7 +979,7 @@ namespace sfx2
         }
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( TaskPaneController_Impl, DockingChanged, TitledDockingWindow*, i_pDockingWindow )
     {
         ENSURE_OR_RETURN( i_pDockingWindow && &m_rDockingWindow, "TaskPaneController_Impl::DockingChanged: where does this come from?", 0L );
@@ -991,7 +991,7 @@ namespace sfx2
         return 1L;
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( TaskPaneController_Impl, OnToolboxClicked, ToolBox*, i_pToolBox )
     {
         if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
@@ -1012,7 +1012,7 @@ namespace sfx2
         return 0;
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( TaskPaneController_Impl, OnMenuItemSelected, Menu*, i_pMenu )
     {
         ENSURE_OR_RETURN( i_pMenu, "TaskPaneController_Impl::OnMenuItemSelected: illegal menu!", 0L );
@@ -1047,7 +1047,7 @@ namespace sfx2
         return 1L;
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     size_t TaskPaneController_Impl::impl_getLogicalPanelIndex( const size_t i_nVisibleIndex )
     {
         size_t nLogicalIndex = 0;
@@ -1065,7 +1065,7 @@ namespace sfx2
         return nLogicalIndex;
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         if ( m_bTogglingPanelVisibility )
@@ -1075,7 +1075,7 @@ namespace sfx2
         m_aPanelRepository.insert( m_aPanelRepository.begin() + nLogicalIndex, PanelDescriptor( i_pPanel ) );
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::PanelRemoved( const size_t i_nPosition )
     {
         if ( m_bTogglingPanelVisibility )
@@ -1085,7 +1085,7 @@ namespace sfx2
         m_aPanelRepository.erase( m_aPanelRepository.begin() + nLogicalIndex );
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         if ( impl_getLayout() == LAYOUT_DRAWERS )
@@ -1097,14 +1097,14 @@ namespace sfx2
         (void)i_rNewActive;
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter )
     {
         // not interested in
         (void)i_rNewLayouter;
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::Dying()
     {
         OSL_FAIL( "TaskPaneController_Impl::Dying: unexpected call!" );
@@ -1112,7 +1112,7 @@ namespace sfx2
         // as listener from the panel deck, this method here should never be called.
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::impl_togglePanelVisibility( const size_t i_nLogicalPanelIndex )
     {
         ENSURE_OR_RETURN_VOID( i_nLogicalPanelIndex < m_aPanelRepository.size(), "illegal index" );
@@ -1147,7 +1147,7 @@ namespace sfx2
             m_rTaskPane.GetPanelDeck().ActivatePanel( *aActivatePanel );
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::impl_setLayout( const PanelSelectorLayout i_eLayout, const bool i_bForce )
     {
         if ( !i_bForce && ( m_eCurrentLayout == i_eLayout ) )
@@ -1176,7 +1176,7 @@ namespace sfx2
         impl_updateDockingWindowTitle();
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController_Impl::impl_updateDockingWindowTitle()
     {
         ::boost::optional< size_t > aActivePanel( m_rTaskPane.GetPanelDeck().GetActivePanel() );
@@ -1200,7 +1200,7 @@ namespace sfx2
         }
     }
 
-    // ---------------------------------------------------------------------------------------------------------------------
+
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< PopupMenu > TaskPaneController_Impl::impl_createPopupMenu() const
     {
@@ -1255,18 +1255,18 @@ namespace sfx2
     //==================================================================================================================
     //= TaskPaneController
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TaskPaneController::TaskPaneController( ModuleTaskPane& i_rTaskPane, TitledDockingWindow& i_rDockingWindow )
         :m_pImpl( new TaskPaneController_Impl( i_rTaskPane, i_rDockingWindow ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TaskPaneController::~TaskPaneController()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TaskPaneController::ActivateToolPanel( const OUString& i_rPanelURL )
     {
         m_pImpl->ActivateToolPanel( i_rPanelURL );
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index fbb51f8844b5..c5feb4f0e755 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -92,7 +92,7 @@ TYPEINIT1(SfxTemplateDialog_Impl,SfxCommonTemplateDialog_Impl);
 
 SFX_IMPL_DOCKINGWINDOW_WITHID(SfxTemplateDialogWrapper, SID_STYLE_DESIGNER)
 
-//-------------------------------------------------------------------------
+
 
 class SfxCommonTemplateDialog_Impl::DeletionWatcher : private boost::noncopyable
 {
@@ -147,7 +147,7 @@ SfxTemplateDialog::SfxTemplateDialog
     pImpl->updateNonFamilyImages();
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxTemplateDialog::~SfxTemplateDialog()
 {
@@ -167,7 +167,7 @@ void SfxTemplateDialog::SetParagraphFamily()
     pImpl->SetAutomaticFilter();
 }
 
-// ------------------------------------------------------------------------
+
 
 void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt )
 {
@@ -181,14 +181,14 @@ void SfxTemplateDialog::DataChanged( const DataChangedEvent& _rDCEvt )
     SfxDockingWindow::DataChanged( _rDCEvt );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog::Update()
 {
     pImpl->Update();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog::Resize()
 {
@@ -198,7 +198,7 @@ void SfxTemplateDialog::Resize()
 }
 
 
-//-------------------------------------------------------------------------
+
 
 SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign,SfxChildAlignment eAlign)
 {
@@ -225,7 +225,7 @@ SfxChildAlignment SfxTemplateDialog::CheckAlignment(SfxChildAlignment eActAlign,
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -259,7 +259,7 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
     return SvTreeListBox::AcceptDrop( rEvt );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
@@ -329,7 +329,7 @@ bool DropListBox_Impl::Notify( NotifyEvent& rNEvt )
 }
 
 
-//-------------------------------------------------------------------------
+
 
 
 SfxActionListBox::SfxActionListBox
@@ -350,7 +350,7 @@ SfxActionListBox::SfxActionListBox
     EnableContextMenuHandling();
 }
 
-//-------------------------------------------------------------------------
+
 
 PopupMenu* SfxActionListBox::CreateContextMenu( void )
 {
@@ -363,7 +363,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
     return pDialog->CreateContextMenu();
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd,
         sal_uInt16 nId,  SfxBindings *p, SfxChildWinInfo *pInfo) :
@@ -505,7 +505,7 @@ void SfxTemplatePanelControl::StateChanged( StateChangedType nStateChange )
     DockingWindow::StateChanged( nStateChange );
 }
 
-//-------------------------------------------------------------------------
+
 
 void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries_t& rEntries) const
 {
@@ -536,7 +536,7 @@ sal_Bool StyleTreeListBox_Impl::DoubleClickHdl()
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
 
@@ -549,7 +549,7 @@ void StyleTreeListBox_Impl::Command( const CommandEvent& rCEvt )
     SvTreeListBox::Command(rCEvt);
 }
 
-//-------------------------------------------------------------------------
+
 
 bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -572,7 +572,7 @@ bool StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry*  pTarget,
                                          SvTreeListEntry*  pEntry,
@@ -601,7 +601,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry*  pTarget,
     return bRet? (sal_Bool)2: sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool  StyleTreeListBox_Impl::ExpandingHdl()
 
@@ -618,7 +618,7 @@ bool  StyleTreeListBox_Impl::ExpandingHdl()
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 
 void  StyleTreeListBox_Impl::ExpandedHdl()
 
@@ -638,7 +638,7 @@ void  StyleTreeListBox_Impl::ExpandedHdl()
     pCurEntry = 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 StyleTreeListBox_Impl::StyleTreeListBox_Impl(
     SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle) :
@@ -653,7 +653,7 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl(
     EnableContextMenuHandling();
 }
 
-//-------------------------------------------------------------------------
+
 
 class StyleTreeArr_Impl;
 
@@ -693,14 +693,14 @@ sal_uIntPtr StyleTree_Impl::Count()
     return pChildren ? pChildren->size() : 0L;
 }
 
-//-------------------------------------------------------------------------
+
 
 StyleTree_Impl::~StyleTree_Impl()
 {
     delete pChildren;
 }
 
-//-------------------------------------------------------------------------
+
 
 void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
 {
@@ -713,7 +713,7 @@ void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
         pChildren->insert( pChildren->begin() + (sal_uInt16)lPos, pIns );
 }
 
-//-------------------------------------------------------------------------
+
 
 StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
 {
@@ -757,7 +757,7 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
     return rArr;
 }
 
-//-------------------------------------------------------------------------
+
 
 
 inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries,
@@ -785,7 +785,7 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox *pBox,
     return pNewEntry;
 }
 
-//-------------------------------------------------------------------------
+
 // Constructor
 
 SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Window* pW, bool ) :
@@ -836,7 +836,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Win
     aFmtLb.SetFont( aFont );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
 {
@@ -844,7 +844,7 @@ sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
     return SfxFamilyIdToNId(pItem->GetFamily())-1;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
 {
@@ -853,7 +853,7 @@ void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
         EnableItem( SID_STYLE_UPDATE_BY_EXAMPLE, bEnable);
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::ReadResource()
 {
@@ -953,7 +953,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
     pModule = pCurObjShell ? pCurObjShell->GetModule() : NULL;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::ClearResource()
 {
@@ -979,7 +979,7 @@ void SfxCommonTemplateDialog_Impl::impl_setDeletionWatcher(DeletionWatcher* pNew
     m_pDeletionWatcher = pNewWatcher;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::Initialize()
 {
@@ -1001,7 +1001,7 @@ void SfxCommonTemplateDialog_Impl::Initialize()
         aFmtLb.Show();
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 {
@@ -1027,7 +1027,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
         m_pDeletionWatcher->signal();
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
 {
@@ -1059,7 +1059,7 @@ void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
     }
 }
 
-//-------------------------------------------------------------------------
+
 // Helper function: Access to the current family item
 const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() const
 {
@@ -1083,7 +1083,7 @@ SfxStyleSheetBase *SfxCommonTemplateDialog_Impl::GetSelectedStyle() const
     return pStyleSheetPool->Find( aTemplName, pItem->GetFamily(), SFXSTYLEBIT_ALL );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr)
 {
@@ -1158,7 +1158,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
 {
@@ -1178,7 +1178,7 @@ OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
 {
@@ -1196,7 +1196,7 @@ void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
     bTreeDrag = bEnable;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::FillTreeBox()
 {
@@ -1250,7 +1250,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
     }
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 {
     return pTreeBox? pTreeBox->FirstSelected() != 0:
@@ -1258,7 +1258,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
 }
 
 
-//-------------------------------------------------------------------------
+
 
 // internal: Refresh the display
 // nFlags: what we should update.
@@ -1403,7 +1403,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 // Updated display: Watering the house
 void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
@@ -1444,7 +1444,7 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
     pBindings->LeaveRegistrations();
 }
 
-//-------------------------------------------------------------------------
+
 
 // Item with the status of a Family is copied and noted
 // (is updated when all states have also been updated.)
@@ -1462,7 +1462,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const Sfx
     bUpdateFamily = sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 // Notice from SfxBindings that the update is completed. Pushes out the update
 // of the display.
 
@@ -1564,7 +1564,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
      EnableNew( bCanNew );
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
 {
@@ -1594,7 +1594,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
 }
 
 
-//-------------------------------------------------------------------------
+
 void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
 {
     // tap update
@@ -1689,7 +1689,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
 }
 
 
-//-------------------------------------------------------------------------
+
 // Other filters; can be switched by the users or as a result of new or
 // editing, if the current document has been assigned a different filter.
 void SfxCommonTemplateDialog_Impl::FilterSelect(
@@ -1715,7 +1715,7 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 // Internal: Perform functions through the Dispatcher
 sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
@@ -1781,7 +1781,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 // Handler der Listbox der Filter
 void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable)
@@ -1843,7 +1843,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 // Select-Handler for the Toolbox
 void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
@@ -1861,7 +1861,7 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
 {
@@ -1940,7 +1940,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModMgr, SfxObjectShell* i_pObjSh )
 {
@@ -1965,7 +1965,7 @@ static OUString getModuleIdentifier( const Reference< XModuleManager2 >& i_xModM
     return sIdentifier;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell* i_pObjSh )
 {
@@ -1984,7 +1984,7 @@ sal_Int32 SfxCommonTemplateDialog_Impl::LoadFactoryStyleFilter( SfxObjectShell*
     return nFilter;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pObjSh, sal_Int32 i_nFilter )
 {
@@ -2008,7 +2008,7 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection()
     return pDocShell;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox )
 {
@@ -2020,7 +2020,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox
     return ret;
 }
 
-//-------------------------------------------------------------------------
+
 
 // Handler for the New-Buttons
 void SfxCommonTemplateDialog_Impl::NewHdl(void *)
@@ -2058,7 +2058,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 // Handler for the edit-Buttons
 void SfxCommonTemplateDialog_Impl::EditHdl(void *)
@@ -2083,7 +2083,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 // Handler for the Delete-Buttons
 void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
@@ -2193,7 +2193,7 @@ void SfxCommonTemplateDialog_Impl::ShowHdl(void *)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void    SfxCommonTemplateDialog_Impl::EnableDelete()
 {
@@ -2227,7 +2227,7 @@ void    SfxCommonTemplateDialog_Impl::EnableDelete()
     }
 }
 
-//-------------------------------------------------------------------------
+
 // After selecting a focused item if possible again on the app window
 void    SfxCommonTemplateDialog_Impl::ResetFocus()
 {
@@ -2241,7 +2241,7 @@ void    SfxCommonTemplateDialog_Impl::ResetFocus()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 // Doppelclick on a style sheet in the ListBox is applied.
 IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
@@ -2261,7 +2261,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 // Selection of a template during the Watercan-Status
 IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox )
@@ -2310,7 +2310,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
 {
@@ -2333,7 +2333,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin )
 {
@@ -2345,7 +2345,7 @@ void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, W
     delete pMenu;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
 {
@@ -2356,7 +2356,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
         return pFamilyItem->GetFamily();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable)
 {
@@ -2374,7 +2374,7 @@ void SfxCommonTemplateDialog_Impl::PrepareDeleteAction()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
 {
@@ -2395,7 +2395,7 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
     return pMenu;
 }
 
-// ------------------------------------------------------------------------
+
 
 
 SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
@@ -2440,14 +2440,14 @@ void SfxTemplateDialog_Impl::Initialize (void)
     m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
 {
     m_aActionTbL.EnableItem( nId, bEnable );
 }
 
-//-------------------------------------------------------------------------
+
 // Insert element into dropdown filter "Frame Styles", "List Styles", etc.
 
 void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem)
@@ -2466,7 +2466,7 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamil
     m_aActionTbL.SetHelpId( nId, sHelpId );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
 {
@@ -2475,7 +2475,7 @@ void SfxTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
             TIB_DROPDOWNONLY|m_aActionTbR.GetItemBits( SID_STYLE_NEW_BY_EXAMPLE ));
 }
 
-// ------------------------------------------------------------------------
+
 void SfxTemplateDialog_Impl::updateFamilyImages()
 {
     if ( !m_pStyleFamiliesId )
@@ -2495,20 +2495,20 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
     }
 }
 
-// ------------------------------------------------------------------------
+
 void SfxTemplateDialog_Impl::updateNonFamilyImages()
 {
     m_aActionTbR.SetImageList( ImageList( SfxResId( DLG_STYLE_DESIGNER ) ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::ClearFamilyList()
 {
     m_aActionTbL.Clear();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxCommonTemplateDialog_Impl::InvalidateBindings()
 {
@@ -2524,13 +2524,13 @@ void SfxCommonTemplateDialog_Impl::InvalidateBindings()
     pBindings->Update( SID_STYLE_DRAGHIERARCHIE );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxTemplateDialog_Impl::~SfxTemplateDialog_Impl()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::LoadedFamilies()
 {
@@ -2538,7 +2538,7 @@ void SfxTemplateDialog_Impl::LoadedFamilies()
     Resize();
 }
 
-//-------------------------------------------------------------------------
+
 
 // Overloaded Resize-Handler ( StarView )
 // The size of the Listboxen is adjusted
@@ -2611,7 +2611,7 @@ void SfxTemplateDialog_Impl::Resize()
         pTreeBox->SetSizePixel(aFmtSize);
 }
 
-// -----------------------------------------------------------------------
+
 
 
 Size SfxTemplateDialog_Impl::GetMinOutputSizePixel()
@@ -2630,7 +2630,7 @@ Size SfxTemplateDialog_Impl::GetMinOutputSizePixel()
         return Size(0,0);
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
 {
@@ -2643,7 +2643,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
 {
@@ -2660,7 +2660,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
 {
@@ -2675,7 +2675,7 @@ void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
 {
@@ -2688,7 +2688,7 @@ sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 {
@@ -2698,7 +2698,7 @@ IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox
 }
 IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
 
-//-------------------------------------------------------------------------
+
 static OUString lcl_GetLabel(uno::Any& rAny)
 {
     OUString sRet;
@@ -2716,7 +2716,7 @@ static OUString lcl_GetLabel(uno::Any& rAny)
     }
     return sRet;
 }
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
 {
@@ -2726,7 +2726,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
         ActionSelect(nEntry);
     return 0;
 }
-//-------------------------------------------------------------------------
+
 IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
 {
     const sal_uInt16 nEntry = pBox->GetCurItemId();
@@ -2778,14 +2778,14 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
     }
     return 0;
 }
-//-------------------------------------------------------------------------
+
 IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
 {
     sal_uInt16 nMenuId = pMenu->GetCurItemId();
     ActionSelect(nMenuId);
     return 0;
 }
-//-------------------------------------------------------------------------
+
 
 
 void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index dacebcabddb5..1499ca0a28eb 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -35,7 +35,7 @@ namespace sfx2
     //==================================================================================================================
     //= TitledDockingWindow
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent,
             WinBits i_nStyle )
         :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_nStyle )
@@ -49,7 +49,7 @@ namespace sfx2
         impl_construct();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TitledDockingWindow::TitledDockingWindow( SfxBindings* i_pBindings, SfxChildWindow* i_pChildWindow, Window* i_pParent,
             const ResId& i_rResId )
         :SfxDockingWindow( i_pBindings, i_pChildWindow, i_pParent, i_rResId )
@@ -62,7 +62,7 @@ namespace sfx2
         impl_construct();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::impl_construct()
     {
         SetBackground( Wallpaper() );
@@ -76,19 +76,19 @@ namespace sfx2
         m_aContentWindow.Show();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TitledDockingWindow::~TitledDockingWindow()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::SetTitle( const OUString& i_rTitle )
     {
         m_sTitle = i_rTitle;
         Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::SetText( const OUString& i_rText )
     {
         SfxDockingWindow::SetText( i_rText );
@@ -97,26 +97,26 @@ namespace sfx2
             Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::Resize()
     {
         SfxDockingWindow::Resize();
         impl_scheduleLayout();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::onLayoutDone()
     {
         // not interested in
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::impl_scheduleLayout()
     {
         m_bLayoutPending = true;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::impl_layout()
     {
         m_bLayoutPending = false;
@@ -153,7 +153,7 @@ namespace sfx2
         onLayoutDone();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::Paint( const Rectangle& i_rArea )
     {
         if ( m_bLayoutPending )
@@ -220,13 +220,13 @@ namespace sfx2
         Pop();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TitledDockingWindow::impl_getTitle() const
     {
         return !m_sTitle.isEmpty() ? m_sTitle : GetText();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::impl_resetToolBox()
     {
         m_aToolbox.Clear();
@@ -237,7 +237,7 @@ namespace sfx2
         m_aToolbox.ShowItem( 1 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_uInt16 TitledDockingWindow::impl_addDropDownToolBoxItem( const OUString& i_rItemText, const OString& i_nHelpId, const Link& i_rCallback )
     {
         // Add the menu before the closer button.
@@ -256,7 +256,7 @@ namespace sfx2
         return nItemId;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( TitledDockingWindow, OnToolboxItemSelected, ToolBox*, pToolBox )
     {
         const sal_uInt16 nId = pToolBox->GetCurItemId();
@@ -278,7 +278,7 @@ namespace sfx2
         return 0;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::StateChanged( StateChangedType i_nType )
     {
         switch ( i_nType )
@@ -290,7 +290,7 @@ namespace sfx2
         SfxDockingWindow::StateChanged( i_nType );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::EndDocking( const Rectangle& i_rRect, sal_Bool i_bFloatMode )
     {
         SfxDockingWindow::EndDocking( i_rRect, i_bFloatMode );
@@ -299,7 +299,7 @@ namespace sfx2
             m_aEndDockingHdl.Call( this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TitledDockingWindow::DataChanged( const DataChangedEvent& i_rDataChangedEvent )
     {
         SfxDockingWindow::DataChanged( i_rDataChangedEvent );
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index 38d77b15eb9d..de100e37bc23 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -44,14 +44,14 @@ SfxTemplateControllerItem::SfxTemplateControllerItem(
     nUserEventId(0)
 {
 }
-// -----------------------------------------------------------------------
+
 SfxTemplateControllerItem::~SfxTemplateControllerItem()
 {
     if(nUserEventId)
         Application::RemoveUserEvent(nUserEventId);
 }
 
-// -----------------------------------------------------------------------
+
 // Notice about change of status, is  propagated through the Controller
 // passed on by the constructor
 
diff --git a/sfx2/source/dialog/tplpitem.cxx b/sfx2/source/dialog/tplpitem.cxx
index f34844c1ef18..58b7ce855a55 100644
--- a/sfx2/source/dialog/tplpitem.cxx
+++ b/sfx2/source/dialog/tplpitem.cxx
@@ -42,7 +42,7 @@ SfxTemplateItem::SfxTemplateItem
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 // copy constuctor
 SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) :
@@ -53,7 +53,7 @@ SfxTemplateItem::SfxTemplateItem( const SfxTemplateItem& rCopy ) :
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 // op ==
 
@@ -63,14 +63,14 @@ bool SfxTemplateItem::operator==( const SfxPoolItem& rCmp ) const
              aStyle == ( (const SfxTemplateItem&)rCmp ).aStyle );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxPoolItem* SfxTemplateItem::Clone( SfxItemPool *) const
 {
     return new SfxTemplateItem(*this);
 }
 
-//-------------------------------------------------------------------------
+
 bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     ::com::sun::star::frame::status::Template aTemplate;
@@ -82,7 +82,7 @@ bool SfxTemplateItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nM
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     ::com::sun::star::frame::status::Template aTemplate;
@@ -97,7 +97,7 @@ bool SfxTemplateItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
     return false;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt8 SfxTemplateItem::GetFlagCount() const
 {
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 44164b417533..04f1f0a1aef5 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -151,7 +151,7 @@ SfxVersionTableDtor& SfxVersionTableDtor::operator=( const SfxVersionTableDtor&
     return *this;
 }
 
-//----------------------------------------------------------------
+
 SfxVersionInfo::SfxVersionInfo()
     : aCreationDate( DateTime::EMPTY )
 {
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 425289d8833f..2cf506594ddf 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -480,7 +480,7 @@ struct XmlIdRegistryDocument::XmlIdRegistry_Impl
     XmlIdReverseMap_t m_XmlIdReverseMap;
 };
 
-// -------------------------------------------------------------------
+
 
 static void
 rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter,
@@ -498,7 +498,7 @@ rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter,
     }
 }
 
-// -------------------------------------------------------------------
+
 
 const XmlIdList_t *
 XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElementList(
@@ -806,7 +806,7 @@ void XmlIdRegistryDocument::RemoveXmlIdForElement(const Metadatable& i_rObject)
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
     Metadatable & i_rCopy, const bool i_bCopyPrecedesSource)
@@ -965,7 +965,7 @@ struct XmlIdRegistryClipboard::XmlIdRegistry_Impl
     ClipboardXmlIdReverseMap_t m_XmlIdReverseMap;
 };
 
-// -------------------------------------------------------------------
+
 
 static void
 rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap,
@@ -987,7 +987,7 @@ rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap,
     }
 }
 
-// -------------------------------------------------------------------
+
 
 Metadatable* const*
 XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry(
@@ -1232,7 +1232,7 @@ void XmlIdRegistryClipboard::RemoveXmlIdForElement(const Metadatable& i_rObject)
     }
 }
 
-// -------------------------------------------------------------------
+
 
 ::boost::shared_ptr<MetadatableClipboard>
 XmlIdRegistryClipboard::CreateClipboard(const bool i_isInContent)
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index faf99f882b29..0a04920f25c1 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -93,7 +93,7 @@ SfxFilterContainer* SfxObjectFactory::GetFilterContainer( sal_Bool /*bForceLoad*
     return pImpl->pFilterContainer;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectFactory::SfxObjectFactory
 (
@@ -126,7 +126,7 @@ SfxObjectFactory::SfxObjectFactory
         pImpl->pNameResId = new SfxResId( STR_DOCTYPENAME_MESSAGE );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectFactory::~SfxObjectFactory()
 {
@@ -137,7 +137,7 @@ SfxObjectFactory::~SfxObjectFactory()
     delete pImpl;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectFactory::RegisterViewFactory
 (
@@ -167,21 +167,21 @@ void SfxObjectFactory::RegisterViewFactory
     pImpl->aViewFactoryArr.insert(it, &rFactory);
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxObjectFactory::GetViewFactoryCount() const
 {
     return pImpl->aViewFactoryArr.size();
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFactory& SfxObjectFactory::GetViewFactory(sal_uInt16 i) const
 {
     return *pImpl->aViewFactoryArr[i];
 }
 
-//--------------------------------------------------------------------
+
 
 SfxModule* SfxObjectFactory::GetModule() const
 {
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6f158a7fa65e..141cd90559ac 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -146,7 +146,7 @@ bool IsSystemFileLockingUsed()
 #endif
 }
 
-//----------------------------------------------------------------
+
 bool IsOOoLockFileUsed()
 {
 #if HAVE_FEATURE_MACOSX_SANDBOX
@@ -167,7 +167,7 @@ bool IsLockingUsed()
 //==========================================================
 
 
-//----------------------------------------------------------------
+
 class SfxMediumHandler_Impl : public ::cppu::WeakImplHelper1< com::sun::star::task::XInteractionHandler >
 {
     com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > m_xInter;
@@ -183,12 +183,12 @@ public:
     ~SfxMediumHandler_Impl();
 };
 
-//----------------------------------------------------------------
+
 SfxMediumHandler_Impl::~SfxMediumHandler_Impl()
 {
 }
 
-//----------------------------------------------------------------
+
 void SAL_CALL SfxMediumHandler_Impl::handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest )
         throw( com::sun::star::uno::RuntimeException )
 {
@@ -286,7 +286,7 @@ public:
     { return m_pFilter == 0 ? OUString() : m_pFilter->GetMimeType(); }
 };
 
-//------------------------------------------------------------------
+
 SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
     m_nStorOpenMode(SFX_STREAM_READWRITE),
     m_eError(SVSTREAM_OK),
@@ -323,7 +323,7 @@ SfxMedium_Impl::SfxMedium_Impl( SfxMedium* pAntiImplP ) :
     aDoneLink.CreateMutex();
 }
 
-//------------------------------------------------------------------
+
 SfxMedium_Impl::~SfxMedium_Impl()
 {
     aDoneLink.ClearPendingCall();
@@ -342,13 +342,13 @@ void SfxMedium::ResetError()
         pImp->m_pOutStream->ResetError();
 }
 
-//------------------------------------------------------------------
+
 sal_uInt32 SfxMedium::GetLastStorageCreationState()
 {
     return pImp->nLastStorageError;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::AddLog( const OUString& aMessage )
 {
     if ( !pImp->m_xLogRing.is() )
@@ -366,7 +366,7 @@ void SfxMedium::AddLog( const OUString& aMessage )
         pImp->m_xLogRing->logString( aMessage );
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::SetError( sal_uInt32 nError, const OUString& aLogMessage )
 {
     pImp->m_eError = nError;
@@ -374,7 +374,7 @@ void SfxMedium::SetError( sal_uInt32 nError, const OUString& aLogMessage )
         AddLog( aLogMessage );
 }
 
-//------------------------------------------------------------------
+
 sal_uInt32 SfxMedium::GetErrorCode() const
 {
     sal_uInt32 lError = pImp->m_eError;
@@ -385,7 +385,7 @@ sal_uInt32 SfxMedium::GetErrorCode() const
     return lError;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::CheckFileDate( const util::DateTime& aInitDate )
 {
     GetInitFileDate( true );
@@ -423,13 +423,13 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate )
     }
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::DocNeedsFileDateCheck()
 {
     return ( !IsReadOnly() && ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) );
 }
 
-//------------------------------------------------------------------
+
 util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue )
 {
     if ( ( bIgnoreOldValue || !pImp->m_bGotDateTime ) && !pImp->m_aLogicName.isEmpty() )
@@ -450,7 +450,7 @@ util::DateTime SfxMedium::GetInitFileDate( sal_Bool bIgnoreOldValue )
     return pImp->m_aDateTime;
 }
 
-//------------------------------------------------------------------
+
 Reference < XContent > SfxMedium::GetContent() const
 {
     if ( !pImp->aContent.get().is() )
@@ -488,7 +488,7 @@ Reference < XContent > SfxMedium::GetContent() const
     return pImp->aContent.get();
 }
 
-//------------------------------------------------------------------
+
 OUString SfxMedium::GetBaseURL( bool bForSaving )
 {
     OUString aBaseURL;
@@ -521,7 +521,7 @@ OUString SfxMedium::GetBaseURL( bool bForSaving )
     return aBaseURL;
 }
 
-//------------------------------------------------------------------
+
 SvStream* SfxMedium::GetInStream()
 {
     if ( pImp->m_pInStream )
@@ -552,7 +552,7 @@ SvStream* SfxMedium::GetInStream()
     return pImp->m_pInStream;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::CloseInStream()
 {
     CloseInStream_Impl();
@@ -592,7 +592,7 @@ void SfxMedium::CloseInStream_Impl()
     }
 }
 
-//------------------------------------------------------------------
+
 SvStream* SfxMedium::GetOutStream()
 {
     if ( !pImp->m_pOutStream )
@@ -630,7 +630,7 @@ SvStream* SfxMedium::GetOutStream()
     return pImp->m_pOutStream;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::CloseOutStream()
 {
     CloseOutStream_Impl();
@@ -667,7 +667,7 @@ sal_Bool SfxMedium::CloseOutStream_Impl()
     return true;
 }
 
-//------------------------------------------------------------------
+
 const OUString& SfxMedium::GetPhysicalName() const
 {
     if ( pImp->m_aName.isEmpty() && !pImp->m_aLogicName.isEmpty() )
@@ -677,7 +677,7 @@ const OUString& SfxMedium::GetPhysicalName() const
     return pImp->m_aName;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::CreateFileStream()
 {
     ForceSynchronStream_Impl( true );
@@ -690,7 +690,7 @@ void SfxMedium::CreateFileStream()
     }
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::Commit()
 {
     if( pImp->xStorage.is() )
@@ -716,7 +716,7 @@ sal_Bool SfxMedium::Commit()
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::IsStorage()
 {
     if ( pImp->xStorage.is() )
@@ -746,7 +746,7 @@ sal_Bool SfxMedium::IsStorage()
     return pImp->bIsStorage;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::IsPreview_Impl()
 {
     bool bPreview = false;
@@ -768,7 +768,7 @@ sal_Bool SfxMedium::IsPreview_Impl()
     return bPreview;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::StorageBackup_Impl()
 {
     ::ucbhelper::Content aOriginalContent;
@@ -788,7 +788,7 @@ void SfxMedium::StorageBackup_Impl()
     }
 }
 
-//------------------------------------------------------------------
+
 OUString SfxMedium::GetBackup_Impl()
 {
     if ( pImp->m_aBackupURL.isEmpty() )
@@ -797,7 +797,7 @@ OUString SfxMedium::GetBackup_Impl()
     return pImp->m_aBackupURL;
 }
 
-//------------------------------------------------------------------
+
 uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage()
 {
     if ( GetError() )
@@ -822,7 +822,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetOutputStorage()
     return GetStorage();
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::SetEncryptionDataToStorage_Impl()
 {
     // in case media-descriptor contains password it should be used on opening
@@ -866,7 +866,7 @@ void SfxMedium::SetEncryptionDataToStorage_Impl()
 // that. Clearly the knowledge whether lock files should be used or
 // not for some URL scheme belongs in UCB, not here.
 
-//------------------------------------------------------------------
+
 sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< OUString >& aData, sal_Bool bIsLoading, sal_Bool bOwnLock )
 {
     sal_Int8 nResult = LOCK_UI_NOLOCK;
@@ -1236,7 +1236,7 @@ void SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI )
 #endif
 }
 
-//------------------------------------------------------------------
+
 uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIfNo )
 {
     if ( pImp->xStorage.is() || pImp->m_bTriedStorage )
@@ -1403,7 +1403,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( sal_Bool bCreateTempIf
     return pImp->xStorage;
 }
 
-//------------------------------------------------------------------
+
 uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool bReadOnly )
 {
     if ( !GetError() && !pImp->m_xZipStorage.is() )
@@ -1435,7 +1435,7 @@ uno::Reference< embed::XStorage > SfxMedium::GetZipStorageToSign_Impl( sal_Bool
     return pImp->m_xZipStorage;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::CloseZipStorage_Impl()
 {
     if ( pImp->m_xZipStorage.is() )
@@ -1505,7 +1505,7 @@ void SfxMedium::SetOpenMode( StreamMode nStorOpen,
     }
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalContent,
                                             const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv )
 {
@@ -1529,7 +1529,7 @@ sal_Bool SfxMedium::UseBackupToRestore_Impl( ::ucbhelper::Content& aOriginalCont
     return false;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::StorageCommit_Impl()
 {
     bool bResult = false;
@@ -1588,7 +1588,7 @@ sal_Bool SfxMedium::StorageCommit_Impl()
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
                                                  const INetURLObject& aDest,
                                                  const Reference< ::com::sun::star::ucb::XCommandEnvironment >& xComEnv )
@@ -1714,7 +1714,7 @@ sal_Bool SfxMedium::TransactedTransferForFS_Impl( const INetURLObject& aSource,
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTargetSet )
 {
     if ( GetError() )
@@ -1782,7 +1782,7 @@ sal_Bool SfxMedium::TryDirectTransfer( const OUString& aURL, SfxItemSet& aTarget
     return false;
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::Transfer_Impl()
 {
     // The transfer is required only in two cases: either if there is a temporary file or if there is a salvage item
@@ -2078,7 +2078,7 @@ void SfxMedium::Transfer_Impl()
     }
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent,
                                        const OUString& aPrefix,
                                        const OUString& aExtension,
@@ -2120,7 +2120,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
         aTransactTemp.EnableKillingFile( true );
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalContent )
 {
     if ( !pImp->m_aBackupURL.isEmpty() )
@@ -2157,7 +2157,7 @@ void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Content& aOriginalCont
 }
 
 
-//------------------------------------------------------------------
+
 void SfxMedium::DoBackup_Impl()
 {
     SAL_INFO( "sfx.doc", "SfxMedium::DoBackup_Impl" );
@@ -2218,7 +2218,7 @@ void SfxMedium::DoBackup_Impl()
     }
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::ClearBackup_Impl()
 {
     if( pImp->m_bRemoveBackup )
@@ -2243,7 +2243,7 @@ void SfxMedium::ClearBackup_Impl()
         pImp->m_aBackupURL = "";
 }
 
-//----------------------------------------------------------------
+
 void SfxMedium::GetLockingStream_Impl()
 {
     if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) )
@@ -2282,7 +2282,7 @@ void SfxMedium::GetLockingStream_Impl()
     }
 }
 
-//----------------------------------------------------------------
+
 void SfxMedium::GetMedium_Impl()
 {
     if ( !pImp->m_pInStream )
@@ -2409,19 +2409,19 @@ void SfxMedium::GetMedium_Impl()
     }
 }
 
-//----------------------------------------------------------------
+
 sal_Bool SfxMedium::IsRemote()
 {
     return pImp->m_bRemote;
 }
 
-//------------------------------------------------------------------
+
 
 void SfxMedium::SetUpdatePickList(sal_Bool bVal)
 {
     pImp->bUpdatePickList = bVal;
 }
-//------------------------------------------------------------------
+
 
 sal_Bool SfxMedium::IsUpdatePickList() const
 {
@@ -2454,7 +2454,7 @@ void SfxMedium::DownLoad( const Link& aLink )
     }
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::Init_Impl()
 /*  [Description]
     Includes a valid:: sun:: com:: star:: util:: URL (If a file name was
@@ -2536,20 +2536,20 @@ void SfxMedium::Init_Impl()
     SetIsRemote_Impl();
 }
 
-//------------------------------------------------------------------
+
 SfxMedium::SfxMedium() : pImp(new SfxMedium_Impl(this))
 {
     Init_Impl();
 }
 
-//------------------------------------------------------------------
+
 
 void SfxMedium::UseInteractionHandler( sal_Bool bUse )
 {
     pImp->bAllowDefaultIntHdl = bUse;
 }
 
-//------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
 SfxMedium::GetInteractionHandler()
@@ -2582,7 +2582,7 @@ SfxMedium::GetInteractionHandler()
     return pImp->xInteraction;
 }
 
-//----------------------------------------------------------------
+
 
 void SfxMedium::SetFilter( const SfxFilter* pFilterP, sal_Bool /*bResetOrig*/ )
 {
@@ -2594,14 +2594,14 @@ const SfxFilter* SfxMedium::GetFilter() const
     return pImp->m_pFilter;
 }
 
-//----------------------------------------------------------------
+
 
 const SfxFilter* SfxMedium::GetOrigFilter( sal_Bool bNotCurrent ) const
 {
     return ( pImp->pOrigFilter || bNotCurrent ) ? pImp->pOrigFilter : pImp->m_pFilter;
 }
 
-//----------------------------------------------------------------
+
 
 sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_Bool bWriter )
 {
@@ -2623,7 +2623,7 @@ sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, sal_B
     return nHash;
 }
 
-//------------------------------------------------------------------
+
 
 void SfxMedium::Close()
 {
@@ -2723,7 +2723,7 @@ void SfxMedium::CloseAndReleaseStreams_Impl()
     }
 }
 
-//------------------------------------------------------------------
+
 void SfxMedium::CloseStreams_Impl()
 {
     CloseInStream_Impl();
@@ -2735,7 +2735,7 @@ void SfxMedium::CloseStreams_Impl()
     pImp->aContent = ::ucbhelper::Content();
 }
 
-//------------------------------------------------------------------
+
 
 void SfxMedium::SetIsRemote_Impl()
 {
@@ -2776,13 +2776,13 @@ void SfxMedium::SetName( const OUString& aNameP, sal_Bool bSetOrigURL )
     Init_Impl();
 }
 
-//----------------------------------------------------------------
+
 const OUString& SfxMedium::GetOrigURL() const
 {
     return pImp->aOrigURL.isEmpty() ? pImp->m_aLogicName : pImp->aOrigURL;
 }
 
-//----------------------------------------------------------------
+
 
 void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP )
 {
@@ -2803,7 +2803,7 @@ void SfxMedium::SetPhysicalName_Impl( const OUString& rNameP )
     }
 }
 
-//------------------------------------------------------------------
+
 
 void SfxMedium::ReOpen()
 {
@@ -2813,7 +2813,7 @@ void SfxMedium::ReOpen()
     pImp->bUseInteractionHandler = bUseInteractionHandler;
 }
 
-//------------------------------------------------------------------
+
 
 void SfxMedium::CompleteReOpen()
 {
@@ -2943,7 +2943,7 @@ SfxMedium::SfxMedium( const uno::Sequence<beans::PropertyValue>& aArgs ) :
 }
 
 
-//------------------------------------------------------------------
+
 
 SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const SfxItemSet* p ) :
     pImp(new SfxMedium_Impl(this))
@@ -2962,7 +2962,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS
         GetItemSet()->Put( *p );
 }
 
-//------------------------------------------------------------------
+
 
 SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUString& rBaseURL, const OUString &rTypeName, const SfxItemSet* p ) :
     pImp(new SfxMedium_Impl(this))
@@ -2980,7 +2980,7 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const OUS
         GetItemSet()->Put( *p );
 }
 
-//------------------------------------------------------------------
+
 
 SfxMedium::~SfxMedium()
 {
@@ -3026,13 +3026,13 @@ void SfxMedium::SetExpired_Impl( const DateTime& rDateTime )
 {
     pImp->aExpireTime = rDateTime;
 }
-//----------------------------------------------------------------
+
 
 sal_Bool SfxMedium::IsExpired() const
 {
     return pImp->aExpireTime.IsValidAndGregorian() && pImp->aExpireTime < DateTime( DateTime::SYSTEM );
 }
-//----------------------------------------------------------------
+
 
 void SfxMedium::ForceSynchronStream_Impl( sal_Bool bForce )
 {
@@ -3044,7 +3044,7 @@ void SfxMedium::ForceSynchronStream_Impl( sal_Bool bForce )
     }
 }
 
-//----------------------------------------------------------------
+
 SfxFrame* SfxMedium::GetLoadTargetFrame() const
 {
     return pImp->wLoadTargetFrame;
@@ -3060,13 +3060,13 @@ void SfxMedium::SetLoadTargetFrame(SfxFrame* pFrame )
 {
     pImp->wLoadTargetFrame = pFrame;
 }
-//----------------------------------------------------------------
+
 
 void SfxMedium::SetStorage_Impl( const uno::Reference < embed::XStorage >& rStor )
 {
     pImp->xStorage = rStor;
 }
-//----------------------------------------------------------------
+
 
 SfxItemSet* SfxMedium::GetItemSet() const
 {
@@ -3075,7 +3075,7 @@ SfxItemSet* SfxMedium::GetItemSet() const
         pImp->m_pSet = new SfxAllItemSet( SFX_APP()->GetPool() );
     return pImp->m_pSet;
 }
-//----------------------------------------------------------------
+
 
 SvKeyValueIterator* SfxMedium::GetHeaderAttributes_Impl()
 {
@@ -3233,7 +3233,7 @@ sal_Bool SfxMedium::SaveVersionList_Impl( sal_Bool /*bUseXML*/ )
     return false;
 }
 
-//----------------------------------------------------------------
+
 sal_Bool SfxMedium::IsReadOnly()
 {
     // a) ReadOnly filter cant produce read/write contents!
@@ -3262,7 +3262,7 @@ bool SfxMedium::IsOriginallyReadOnly() const
     return pImp->m_bOriginallyReadOnly;
 }
 
-//----------------------------------------------------------------
+
 sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL )
 {
     // UCB does not allow to allow write access only for the user,
@@ -3292,7 +3292,7 @@ sal_Bool SfxMedium::SetWritableForUserOnly( const OUString& aURL )
     return bResult;
 }
 
-//----------------------------------------------------------------
+
 void SfxMedium::CreateTempFile( sal_Bool bReplace )
 {
     if ( pImp->pTempFile )
@@ -3396,7 +3396,7 @@ void SfxMedium::CreateTempFile( sal_Bool bReplace )
     CloseStorage();
 }
 
-//----------------------------------------------------------------
+
 void SfxMedium::CreateTempFileNoCopy()
 {
     // this call always replaces the existing temporary file
@@ -3525,13 +3525,13 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const OUStrin
     return bChanges;
 }
 
-//----------------------------------------------------------------
+
 sal_uInt16 SfxMedium::GetCachedSignatureState_Impl()
 {
     return pImp->m_nSignatureState;
 }
 
-//----------------------------------------------------------------
+
 void SfxMedium::SetCachedSignatureState_Impl( sal_uInt16 nState )
 {
     pImp->m_nSignatureState = nState;
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 7082bc44ec4d..e7e8a701ffbc 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -131,32 +131,32 @@ namespace sfx2
     //====================================================================
     //= DocumentMacroMode
     //====================================================================
-    //--------------------------------------------------------------------
+
     DocumentMacroMode::DocumentMacroMode( IMacroDocumentAccess& rDocumentAccess )
         :m_pData( new DocumentMacroMode_Data( rDocumentAccess ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     DocumentMacroMode::~DocumentMacroMode()
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::allowMacroExecution()
     {
         m_pData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::ALWAYS_EXECUTE_NO_WARN );
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::disallowMacroExecution()
     {
         m_pData->m_rDocumentAccess.setCurrentMacroExecMode( MacroExecMode::NEVER_EXECUTE );
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::adjustMacroMode( const Reference< XInteractionHandler >& rxInteraction )
     {
         sal_uInt16 nMacroExecutionMode = m_pData->m_rDocumentAccess.getCurrentMacroExecMode();
@@ -308,13 +308,13 @@ namespace sfx2
         return ( bSecure ? allowMacroExecution() : disallowMacroExecution() );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::isMacroExecutionDisallowed() const
     {
         return m_pData->m_rDocumentAccess.getCurrentMacroExecMode() == MacroExecMode::NEVER_EXECUTE;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::containerHasBasicMacros( const Reference< XLibraryContainer >& xContainer )
     {
         sal_Bool bHasMacroLib = sal_False;
@@ -361,7 +361,7 @@ namespace sfx2
         return bHasMacroLib;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::hasMacroLibrary() const
     {
         sal_Bool bHasMacroLib = sal_False;
@@ -383,7 +383,7 @@ namespace sfx2
         return bHasMacroLib;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::storageHasMacros( const Reference< XStorage >& rxStorage )
     {
         sal_Bool bHasMacros = sal_False;
@@ -410,7 +410,7 @@ namespace sfx2
         return bHasMacros;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& rxInteraction )
     {
         sal_Bool bAllow = sal_False;
diff --git a/sfx2/source/doc/docstoragemodifylistener.cxx b/sfx2/source/doc/docstoragemodifylistener.cxx
index 671c67de68ae..5bb66ba48ea4 100644
--- a/sfx2/source/doc/docstoragemodifylistener.cxx
+++ b/sfx2/source/doc/docstoragemodifylistener.cxx
@@ -39,26 +39,26 @@ namespace sfx2
     //====================================================================
     //=
     //====================================================================
-    //--------------------------------------------------------------------
+
     DocumentStorageModifyListener::DocumentStorageModifyListener( IModifiableDocument& _rDocument, comphelper::SolarMutex& _rMutex )
         :m_pDocument( &_rDocument )
         ,m_rMutex( _rMutex )
     {
     }
 
-    //--------------------------------------------------------------------
+
     DocumentStorageModifyListener::~DocumentStorageModifyListener()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void DocumentStorageModifyListener::dispose()
     {
         ::osl::Guard< comphelper::SolarMutex > aGuard( m_rMutex );
         m_pDocument = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DocumentStorageModifyListener::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException)
     {
         ::osl::Guard< comphelper::SolarMutex > aGuard( m_rMutex );
@@ -67,7 +67,7 @@ namespace sfx2
             m_pDocument->storageIsModified();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL DocumentStorageModifyListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
     {
         // not interested in. In particular, we do *not* dispose ourself when a storage we're
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 97d66c4e3c82..c8fb07e37b11 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -146,7 +146,7 @@ public:
 
 using namespace ::DocTempl;
 
-// ------------------------------------------------------------------------
+
 
 class RegionData_Impl
 {
@@ -191,7 +191,7 @@ public:
 
 typedef vector< RegionData_Impl* > RegionList_Impl;
 
-// ------------------------------------------------------------------------
+
 
 class SfxDocTemplate_Impl : public SvRefBase
 {
@@ -242,7 +242,7 @@ public:
     uno::Reference< XDocumentTemplates >     getDocTemplates() { return mxTemplates; }
 };
 
-// ------------------------------------------------------------------------
+
 
 class DocTemplLocker_Impl
 {
@@ -260,7 +260,7 @@ public:
     }
 };
 
-// ------------------------------------------------------------------------
+
 
 #ifndef SFX_DECL_DOCTEMPLATES_DEFINED
 #define SFX_DECL_DOCTEMPLATES_DEFINED
@@ -269,11 +269,11 @@ SV_DECL_REF(SfxDocTemplate_Impl)
 
 SV_IMPL_REF(SfxDocTemplate_Impl)
 
-// ------------------------------------------------------------------------
+
 
 SfxDocTemplate_Impl *gpTemplateData = 0;
 
-// -----------------------------------------------------------------------
+
 
 static sal_Bool getTextProperty_Impl( Content& rContent,
                                       const OUString& rPropName,
@@ -315,7 +315,7 @@ OUString SfxDocumentTemplates::GetFullRegionName
     return aName;
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString& SfxDocumentTemplates::GetRegionName
 (
@@ -351,7 +351,7 @@ const OUString& SfxDocumentTemplates::GetRegionName
     return maTmpString;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SfxDocumentTemplates::GetRegionCount() const
 
@@ -374,7 +374,7 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const
     return (sal_uInt16) nCount;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SfxDocumentTemplates::GetCount
 (
@@ -405,7 +405,7 @@ sal_uInt16 SfxDocumentTemplates::GetCount
     return (sal_uInt16) nCount;
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString& SfxDocumentTemplates::GetName
 (
@@ -446,7 +446,7 @@ const OUString& SfxDocumentTemplates::GetName
     return maTmpString;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString SfxDocumentTemplates::GetPath
 (
@@ -480,7 +480,7 @@ OUString SfxDocumentTemplates::GetPath
         return OUString();
 }
 
-//------------------------------------------------------------------------
+
 
 OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString& aGroupName,
                                                                          const OUString& aTitle )
@@ -511,7 +511,7 @@ OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const OUString
     return aResult;
 }
 
-//------------------------------------------------------------------------
+
 
 /** Convert a resource string - a template name - to its localised pair if it exists.
     @param nSourceResIds
@@ -536,7 +536,7 @@ OUString SfxDocumentTemplates::ConvertResourceString (
     return rString;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::CopyOrMove
 (
@@ -642,7 +642,7 @@ sal_Bool SfxDocumentTemplates::CopyOrMove
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::Move
 (
@@ -672,7 +672,7 @@ sal_Bool SfxDocumentTemplates::Move
                        nSourceRegion, nSourceIdx, sal_True );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::Copy
 (
@@ -703,7 +703,7 @@ sal_Bool SfxDocumentTemplates::Copy
                        nSourceRegion, nSourceIdx, sal_False );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::CopyTo
 (
@@ -775,7 +775,7 @@ sal_Bool SfxDocumentTemplates::CopyTo
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::CopyFrom
 (
@@ -920,7 +920,7 @@ sal_Bool SfxDocumentTemplates::CopyFrom
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::Delete
 (
@@ -984,7 +984,7 @@ sal_Bool SfxDocumentTemplates::Delete
     return bRet;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::InsertDir
 (
@@ -1105,7 +1105,7 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegio
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::GetFull
 (
@@ -1161,7 +1161,7 @@ sal_Bool SfxDocumentTemplates::GetFull
     return ( pEntry != NULL );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxDocumentTemplates::GetLogicNames
 (
@@ -1229,7 +1229,7 @@ sal_Bool SfxDocumentTemplates::GetLogicNames
     return bFound;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxDocumentTemplates::SfxDocumentTemplates()
 
@@ -1244,7 +1244,7 @@ SfxDocumentTemplates::SfxDocumentTemplates()
     pImp = gpTemplateData;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxDocumentTemplates::Construct()
 
@@ -1253,7 +1253,7 @@ void SfxDocumentTemplates::Construct()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxDocumentTemplates::~SfxDocumentTemplates()
 
@@ -1283,7 +1283,7 @@ void SfxDocumentTemplates::ReInitFromComponent()
     pImp->ReInitFromComponent();
 }
 
-// -----------------------------------------------------------------------
+
 DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent,
                                 const OUString& rTitle )
 {
@@ -1294,13 +1294,13 @@ DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent,
     mbDidConvert= sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 int DocTempl_EntryData_Impl::Compare( const OUString& rTitle ) const
 {
     return maTitle.compareTo( rTitle );
 }
 
-// -----------------------------------------------------------------------
+
 const OUString& DocTempl_EntryData_Impl::GetHierarchyURL()
 {
     if ( maOwnURL.isEmpty() )
@@ -1318,7 +1318,7 @@ const OUString& DocTempl_EntryData_Impl::GetHierarchyURL()
     return maOwnURL;
 }
 
-// -----------------------------------------------------------------------
+
 const OUString& DocTempl_EntryData_Impl::GetTargetURL()
 {
     if ( maTargetURL.isEmpty() )
@@ -1341,7 +1341,7 @@ const OUString& DocTempl_EntryData_Impl::GetTargetURL()
     return maTargetURL;
 }
 
-// -----------------------------------------------------------------------
+
 RegionData_Impl::RegionData_Impl( const SfxDocTemplate_Impl* pParent,
                                   const OUString& rTitle )
 {
@@ -1349,7 +1349,7 @@ RegionData_Impl::RegionData_Impl( const SfxDocTemplate_Impl* pParent,
     mpParent    = pParent;
 }
 
-// -----------------------------------------------------------------------
+
 RegionData_Impl::~RegionData_Impl()
 {
     for ( size_t i = 0, n = maEntries.size(); i < n; ++i )
@@ -1357,7 +1357,7 @@ RegionData_Impl::~RegionData_Impl()
     maEntries.clear();
 }
 
-// -----------------------------------------------------------------------
+
 size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, sal_Bool& rFound ) const
 {
 #if 1   // Don't use binary search today
@@ -1418,7 +1418,7 @@ size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, sal_Bool& rFound )
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 void RegionData_Impl::AddEntry( const OUString& rTitle,
                                 const OUString& rTargetURL,
                                 size_t *pPos )
@@ -1455,13 +1455,13 @@ void RegionData_Impl::AddEntry( const OUString& rTitle,
     }
 }
 
-// -----------------------------------------------------------------------
+
 size_t RegionData_Impl::GetCount() const
 {
     return maEntries.size();
 }
 
-// -----------------------------------------------------------------------
+
 const OUString& RegionData_Impl::GetHierarchyURL()
 {
     if ( maOwnURL.isEmpty() )
@@ -1479,7 +1479,7 @@ const OUString& RegionData_Impl::GetHierarchyURL()
     return maOwnURL;
 }
 
-// -----------------------------------------------------------------------
+
 DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) const
 {
     sal_Bool    bFound = sal_False;
@@ -1491,7 +1491,7 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) cons
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( size_t nIndex ) const
 {
     if ( nIndex < maEntries.size() )
@@ -1499,7 +1499,7 @@ DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( size_t nIndex ) const
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 void RegionData_Impl::DeleteEntry( size_t nIndex )
 {
     if ( nIndex < maEntries.size() )
@@ -1511,7 +1511,7 @@ void RegionData_Impl::DeleteEntry( size_t nIndex )
     }
 }
 
-// -----------------------------------------------------------------------
+
 int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const
 {
     int nCompare = maTitle.compareTo( pCompare->maTitle );
@@ -1519,7 +1519,7 @@ int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const
     return nCompare;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxDocTemplate_Impl::SfxDocTemplate_Impl()
 : mbConstructed( sal_False )
@@ -1527,7 +1527,7 @@ SfxDocTemplate_Impl::SfxDocTemplate_Impl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 SfxDocTemplate_Impl::~SfxDocTemplate_Impl()
 {
     Clear();
@@ -1535,14 +1535,14 @@ SfxDocTemplate_Impl::~SfxDocTemplate_Impl()
     gpTemplateData = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::IncrementLock()
 {
     ::osl::MutexGuard aGuard( maMutex );
     mnLockCounter++;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::DecrementLock()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1550,7 +1550,7 @@ void SfxDocTemplate_Impl::DecrementLock()
         mnLockCounter--;
 }
 
-// -----------------------------------------------------------------------
+
 RegionData_Impl* SfxDocTemplate_Impl::GetRegion( size_t nIndex ) const
 {
     if ( nIndex < maRegions.size() )
@@ -1558,7 +1558,7 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( size_t nIndex ) const
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName )
     const
 {
@@ -1571,7 +1571,7 @@ RegionData_Impl* SfxDocTemplate_Impl::GetRegion( const OUString& rName )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex )
 {
     if ( nIndex < maRegions.size() )
@@ -1583,7 +1583,7 @@ void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex )
     }
 }
 
-// -----------------------------------------------------------------------
+
 /*  AddRegion adds a Region to the RegionList
 */
 void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle,
@@ -1633,7 +1633,7 @@ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle,
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot )
 {
     uno::Reference< XResultSet > xResultSet;
@@ -1672,7 +1672,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot )
     }
 }
 
-// ------------------------------------------------------------------------
+
 sal_Bool SfxDocTemplate_Impl::Construct( )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1711,7 +1711,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::ReInitFromComponent()
 {
     uno::Reference< XDocumentTemplates > xTemplates = getDocTemplates();
@@ -1725,7 +1725,7 @@ void SfxDocTemplate_Impl::ReInitFromComponent()
     }
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos )
 {
     ::osl::MutexGuard   aGuard( maMutex );
@@ -1751,7 +1751,7 @@ sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::Rescan()
 {
     Clear();
@@ -1777,7 +1777,7 @@ void SfxDocTemplate_Impl::Rescan()
     }
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL,
                                            OUString& aTitle )
 {
@@ -1821,7 +1821,7 @@ sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL,
 }
 
 
-// -----------------------------------------------------------------------
+
 void SfxDocTemplate_Impl::Clear()
 {
     ::osl::MutexGuard   aGuard( maMutex );
@@ -1833,7 +1833,7 @@ void SfxDocTemplate_Impl::Clear()
     maRegions.clear();
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool getTextProperty_Impl( Content& rContent,
                                const OUString& rPropName,
                                OUString& rPropValue )
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index e61eeac6d896..574232a28e46 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -390,9 +390,9 @@ public:
     DocTemplates_EntryData_Impl*    getEntry( size_t nPos ) { return maEntries[ nPos ]; }
 };
 
-//-----------------------------------------------------------------------------
+
 // private SfxDocTplService_Impl
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::init_Impl()
 {
     uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
@@ -485,7 +485,7 @@ void SfxDocTplService_Impl::init_Impl()
     mbIsInitialized = bIsInitialized;
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::getDefaultLocale()
 {
     if ( !mbLocaleSet )
@@ -499,7 +499,7 @@ void SfxDocTplService_Impl::getDefaultLocale()
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTplService_Impl::readFolderList()
 {
     SolarMutexGuard aGuard;
@@ -521,7 +521,7 @@ void SfxDocTplService_Impl::readFolderList()
     }
 }
 
-// -----------------------------------------------------------------------
+
 OUString SfxDocTplService_Impl::getLongName( const OUString& rShortName )
 {
     OUString         aRet;
@@ -542,7 +542,7 @@ OUString SfxDocTplService_Impl::getLongName( const OUString& rShortName )
     return aRet;
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::getDirList()
 {
     OUString aPropName( PROPERTY_DIRLIST  );
@@ -582,7 +582,7 @@ void SfxDocTplService_Impl::getDirList()
     setProperty( maRootContent, aPropName, aValue );
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::needsUpdate()
 {
     OUString aPropName( PROPERTY_NEEDSUPDATE  );
@@ -607,7 +607,7 @@ sal_Bool SfxDocTplService_Impl::needsUpdate()
     return bNeedsUpdate;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUString& aTitle )
 {
     if (m_xDocProps.is())
@@ -636,7 +636,7 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, sal_Bool& bDocHasTitle )
 {
     bDocHasTitle = sal_False;
@@ -682,7 +682,7 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString&
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder,
                                           const OUString& rTitle,
                                           const OUString& rTargetURL,
@@ -725,7 +725,7 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder,
     return bAddedEntry;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
                                               sal_Bool  bCreateParent,
                                               sal_Bool  bFsysFolder,
@@ -794,7 +794,7 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL,
     return bCreatedFolder;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPath,
                                                                 const OUString& aPrefix,
                                                                 OUString& aNewFolderName,
@@ -856,7 +856,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString&
     return bCreated;
 }
 
-// -----------------------------------------------------------------------
+
 OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& aPath,
                                                                         const OUString& aPrefix,
                                                                         const OUString& aExt )
@@ -921,7 +921,7 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a
     return aNewFileURL;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::removeContent( Content& rContent )
 {
     sal_Bool bRemoved = sal_False;
@@ -939,7 +939,7 @@ sal_Bool SfxDocTplService_Impl::removeContent( Content& rContent )
     return bRemoved;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL )
 {
     Content aContent;
@@ -950,7 +950,7 @@ sal_Bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL )
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
                                              const OUString& rPropName,
                                              const Any& rPropValue )
@@ -1022,7 +1022,7 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent,
     return bPropertySet;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent,
                                              const OUString& rPropName,
                                              Any& rPropValue )
@@ -1089,7 +1089,7 @@ SfxDocTplService_Impl::SfxDocTplService_Impl( const uno::Reference< XComponentCo
     mbLocaleSet     = sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 SfxDocTplService_Impl::~SfxDocTplService_Impl()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1106,7 +1106,7 @@ SfxDocTplService_Impl::~SfxDocTplService_Impl()
     maNames.clear();
 }
 
-//-----------------------------------------------------------------------------
+
 Locale SfxDocTplService_Impl::getLocale()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1117,7 +1117,7 @@ Locale SfxDocTplService_Impl::getLocale()
     return maLocale;
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::setLocale( const Locale &rLocale )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1132,7 +1132,7 @@ void SfxDocTplService_Impl::setLocale( const Locale &rLocale )
     mbLocaleSet = sal_True;
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::update( sal_Bool bUpdateNow )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1146,7 +1146,7 @@ void SfxDocTplService_Impl::update( sal_Bool bUpdateNow )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::doUpdate()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1232,7 +1232,7 @@ void SfxDocTplService_Impl::doUpdate()
     setProperty( maRootContent, aPropName, aValue );
 }
 
-//-----------------------------------------------------------------------------
+
 uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplateDir_Impl( const OUString& aUserPath )
 {
     INetURLObject aLocObj( aUserPath );
@@ -1258,7 +1258,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate
     return aUINames;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath,
                                                                   const OUString& aGroupName,
                                                                   const OUString& aNewFolderName )
@@ -1278,7 +1278,7 @@ sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString
     return WriteUINamesForTemplateDir_Impl( aUserPath, aUINames );
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath,
                                                                   const OUString& aDefaultFsysGroupName,
                                                                   const OUString& aOldGroupName,
@@ -1304,7 +1304,7 @@ sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUStrin
     return WriteUINamesForTemplateDir_Impl( aUserPath, aUINames );
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath,
                                                                   const OUString& aGroupName )
 {
@@ -1330,7 +1330,7 @@ sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString
 }
 
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath,
                                                                 const uno::Sequence< beans::StringPair >& aUINames )
 {
@@ -1372,7 +1372,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString&
     return bResult;
 }
 
-//-----------------------------------------------------------------------------
+
 OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup )
 {
     OUString aResultURL;
@@ -1421,7 +1421,7 @@ OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName,
     return aResultURL;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1504,7 +1504,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName )
     return sal_True;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName )
 {
     // remove all the elements that have the prefix aTargetURL
@@ -1610,7 +1610,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName )
     return bResult;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
                                              const OUString& rNewName )
 {
@@ -1713,7 +1713,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName,
     return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
                                                const OUString& rTemplateName,
                                                const uno::Reference< frame::XStorable >& rStorable )
@@ -1899,7 +1899,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName,
     }
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
                                              const OUString& rTemplateName,
                                              const OUString& rSourceURL )
@@ -2050,7 +2050,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName,
     return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName,
                                                 const OUString& rTemplateName )
 {
@@ -2102,7 +2102,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName,
     return removeContent( aTemplate );
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
                                                 const OUString& rOldName,
                                                 const OUString& rNewName )
@@ -2162,7 +2162,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName,
     return setProperty( aTemplate, aTitleProp, aTitleValue );
 }
 
-//-----------------------------------------------------------------------------
+
 class SfxDocTplService: public ::cppu::WeakImplHelper3< css::lang::XLocalizable, css::frame::XDocumentTemplates, css::lang::XServiceInfo >
 {
     SfxDocTplService_Impl       *pImp;
@@ -2216,22 +2216,22 @@ public:
     void SAL_CALL                   update() throw( css::uno::RuntimeException );
 };
 
-//-----------------------------------------------------------------------------
+
 SfxDocTplService::SfxDocTplService( const uno::Reference< XComponentContext >& xContext )
 {
     pImp = new SfxDocTplService_Impl(xContext);
 }
 
-//-----------------------------------------------------------------------------
+
 
 SfxDocTplService::~SfxDocTplService()
 {
     delete pImp;
 }
 
-//-----------------------------------------------------------------------------
+
 //--- XLocalizable ---
-//-----------------------------------------------------------------------------
+
 
 Locale SAL_CALL SfxDocTplService::getLocale()
     throw( uno::RuntimeException )
@@ -2239,7 +2239,7 @@ Locale SAL_CALL SfxDocTplService::getLocale()
     return pImp->getLocale();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale )
     throw( uno::RuntimeException )
@@ -2247,9 +2247,9 @@ void SAL_CALL SfxDocTplService::setLocale( const Locale & rLocale )
     pImp->setLocale( rLocale );
 }
 
-//-----------------------------------------------------------------------------
+
 //--- XDocumentTemplates ---
-//-----------------------------------------------------------------------------
+
 uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent()
     throw( uno::RuntimeException )
 {
@@ -2259,7 +2259,7 @@ uno::Reference< ucb::XContent > SAL_CALL SfxDocTplService::getContent()
         return NULL;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName,
                                                    const OUString& TemplateName,
                                                    const uno::Reference< frame::XStorable >& Storable )
@@ -2271,7 +2271,7 @@ sal_Bool SAL_CALL SfxDocTplService::storeTemplate( const OUString& GroupName,
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName,
                                                  const OUString& rTemplateName,
                                                  const OUString& rSourceURL )
@@ -2283,7 +2283,7 @@ sal_Bool SAL_CALL SfxDocTplService::addTemplate( const OUString& rGroupName,
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName,
                                                     const OUString& rTemplateName )
     throw( uno::RuntimeException )
@@ -2294,7 +2294,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeTemplate( const OUString& rGroupName,
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName,
                                                     const OUString& rOldName,
                                                     const OUString& rNewName )
@@ -2309,7 +2309,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameTemplate( const OUString& rGroupName,
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName )
     throw( uno::RuntimeException )
 {
@@ -2319,7 +2319,7 @@ sal_Bool SAL_CALL SfxDocTplService::addGroup( const OUString& rGroupName )
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName )
     throw( uno::RuntimeException )
 {
@@ -2329,7 +2329,7 @@ sal_Bool SAL_CALL SfxDocTplService::removeGroup( const OUString& rGroupName )
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName,
                                                  const OUString& rNewName )
     throw( uno::RuntimeException )
@@ -2343,7 +2343,7 @@ sal_Bool SAL_CALL SfxDocTplService::renameGroup( const OUString& rOldName,
         return sal_False;
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxDocTplService::update()
     throw( uno::RuntimeException )
 {
@@ -2351,32 +2351,32 @@ void SAL_CALL SfxDocTplService::update()
         pImp->update( sal_True );
 }
 
-//------------------------------------------------------------------------
+
 
 Updater_Impl::Updater_Impl( SfxDocTplService_Impl* pTemplates )
 {
     mpDocTemplates = pTemplates;
 }
 
-//------------------------------------------------------------------------
+
 Updater_Impl::~Updater_Impl()
 {
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL Updater_Impl::run()
 {
     mpDocTemplates->doUpdate();
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL Updater_Impl::onTerminated()
 {
     mpDocTemplates->finished();
     delete this;
 }
 
-//-----------------------------------------------------------------------------
+
 WaitWindow_Impl::WaitWindow_Impl()
     : WorkWindow( NULL, WB_BORDER | WB_3DLOOK )
 {
@@ -2394,19 +2394,19 @@ WaitWindow_Impl::WaitWindow_Impl()
     Flush();
 }
 
-//-----------------------------------------------------------------------------
+
 WaitWindow_Impl::~WaitWindow_Impl()
 {
     Hide();
 }
 
-//-----------------------------------------------------------------------------
+
 void WaitWindow_Impl::Paint( const Rectangle& /*rRect*/ )
 {
     DrawText( _aRect, _aText, _nTextStyle );
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
                                           const OUString& rTitle,
                                           const OUString& rOwnURL )
@@ -2477,7 +2477,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList,
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
                                           const OUString& rTitle,
                                           const OUString& rUITitle,
@@ -2568,7 +2568,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList,
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList,
                                                Content &rContent,
                                                sal_Bool bHierarchy,
@@ -2635,7 +2635,7 @@ void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList,
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::removeFromHierarchy( DocTemplates_EntryData_Impl *pData )
 {
     Content aTemplate;
@@ -2646,7 +2646,7 @@ void SfxDocTplService_Impl::removeFromHierarchy( DocTemplates_EntryData_Impl *pD
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup,
                                             DocTemplates_EntryData_Impl *pData )
 {
@@ -2673,7 +2673,7 @@ void SfxDocTplService_Impl::addToHierarchy( GroupData_Impl *pGroup,
               pData->getType() );
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData )
 {
     Content aTemplate;
@@ -2696,7 +2696,7 @@ void SfxDocTplService_Impl::updateData( DocTemplates_EntryData_Impl *pData )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup )
 {
     OUString aAdditionalProp( TARGET_DIR_URL  );
@@ -2723,7 +2723,7 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup )
 {
     Content aGroup;
@@ -2734,7 +2734,7 @@ void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup )
     }
 }
 
-// -----------------------------------------------------------------------
+
 GroupData_Impl::GroupData_Impl( const OUString& rTitle )
 {
     maTitle = rTitle;
@@ -2742,7 +2742,7 @@ GroupData_Impl::GroupData_Impl( const OUString& rTitle )
     mbInHierarchy = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 GroupData_Impl::~GroupData_Impl()
 {
     for ( size_t i = 0, n = maEntries.size(); i < n; ++i )
@@ -2750,7 +2750,7 @@ GroupData_Impl::~GroupData_Impl()
     maEntries.clear();
 }
 
-// -----------------------------------------------------------------------
+
 DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle,
                                           const OUString& rTargetURL,
                                           const OUString& rType,
@@ -2802,7 +2802,7 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle,
     return pData;
 }
 
-// -----------------------------------------------------------------------
+
 DocTemplates_EntryData_Impl::DocTemplates_EntryData_Impl( const OUString& rTitle )
 {
     maTitle         = rTitle;
@@ -2825,18 +2825,18 @@ bool SfxURLRelocator_Impl::propertyCanContainOfficeDir(
     return ( rPropName == TARGET_DIR_URL || rPropName == PROPERTY_DIRLIST );
 }
 
-// -----------------------------------------------------------------------
+
 SfxURLRelocator_Impl::SfxURLRelocator_Impl( const uno::Reference< XComponentContext > & xContext )
 : mxContext( xContext )
 {
 }
 
-// -----------------------------------------------------------------------
+
 SfxURLRelocator_Impl::~SfxURLRelocator_Impl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 void SfxURLRelocator_Impl::initOfficeInstDirs()
 {
     if ( !mxOfficeInstDirs.is() )
@@ -2851,7 +2851,7 @@ void SfxURLRelocator_Impl::initOfficeInstDirs()
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxURLRelocator_Impl::implExpandURL( OUString& io_url )
 {
     const INetURLObject aParser( io_url );
@@ -2873,7 +2873,7 @@ void SfxURLRelocator_Impl::implExpandURL( OUString& io_url )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxURLRelocator_Impl::makeRelocatableURL( OUString & rURL )
 {
     if ( !rURL.isEmpty() )
@@ -2884,7 +2884,7 @@ void SfxURLRelocator_Impl::makeRelocatableURL( OUString & rURL )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxURLRelocator_Impl::makeAbsoluteURL( OUString & rURL )
 {
     if ( !rURL.isEmpty() )
diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx
index d895492cb972..e250d9f0bca6 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -32,7 +32,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------
+
 uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -40,7 +40,7 @@ uno::Sequence< beans::StringPair > DocTemplLocaleHelper::ReadGroupLocalizationSe
     return ReadLocalizationSequence_Impl( xInStream, aStringID, xContext );
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::Reference< io::XOutputStream >& xOutStream, const uno::Sequence< beans::StringPair >& aSequence, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -89,7 +89,7 @@ void SAL_CALL DocTemplLocaleHelper::WriteGroupLocalizationSequence( const uno::R
 
 // ==================================================================================
 
-// -----------------------------------
+
 uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizationSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
@@ -110,7 +110,7 @@ uno::Sequence< beans::StringPair > SAL_CALL DocTemplLocaleHelper::ReadLocalizati
     return pHelper->GetParsingResult();
 }
 
-// -----------------------------------
+
 DocTemplLocaleHelper::DocTemplLocaleHelper()
 : m_aGroupListElement( "groupuinames:template-group-list" )
 , m_aGroupElement( "groupuinames:template-group" )
@@ -119,12 +119,12 @@ DocTemplLocaleHelper::DocTemplLocaleHelper()
 {
 }
 
-// -----------------------------------
+
 DocTemplLocaleHelper::~DocTemplLocaleHelper()
 {
 }
 
-// -----------------------------------
+
 uno::Sequence< beans::StringPair > DocTemplLocaleHelper::GetParsingResult()
 {
     if ( m_aElementsSeq.getLength() )
@@ -133,19 +133,19 @@ uno::Sequence< beans::StringPair > DocTemplLocaleHelper::GetParsingResult()
     return m_aResultSeq;
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::startDocument()
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::endDocument()
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
@@ -197,7 +197,7 @@ void SAL_CALL DocTemplLocaleHelper::startElement( const OUString& aName, const u
     }
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName )
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
@@ -211,25 +211,25 @@ void SAL_CALL DocTemplLocaleHelper::endElement( const OUString& aName )
     m_aElementsSeq.realloc( nLength - 1 );
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::characters( const OUString& /*aChars*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
-// -----------------------------------
+
 void SAL_CALL DocTemplLocaleHelper::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx
index f33f89e92a25..5401b8d7b047 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -122,7 +122,7 @@ namespace sfx2
         }
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::svl::IUndoManager& DocumentUndoManager_Impl::getImplUndoManager()
     {
         ENSURE_OR_THROW( pUndoManager != NULL, "DocumentUndoManager_Impl::getImplUndoManager: no access to the doc's UndoManager implementation!" );
@@ -138,13 +138,13 @@ namespace sfx2
         return *pUndoManager;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XUndoManager > DocumentUndoManager_Impl::getThis()
     {
         return static_cast< XUndoManager* >( &rAntiImpl );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DocumentUndoManager_Impl::invalidateXDo_nolck()
     {
         SfxModelGuard aGuard( rAntiImpl );
@@ -227,44 +227,44 @@ namespace sfx2
     //==================================================================================================================
     //= DocumentUndoManager
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     DocumentUndoManager::DocumentUndoManager( SfxBaseModel& i_document )
         :SfxModelSubComponent( i_document )
         ,m_pImpl( new DocumentUndoManager_Impl( *this ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DocumentUndoManager::~DocumentUndoManager()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DocumentUndoManager::disposing()
     {
         m_pImpl->disposing();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DocumentUndoManager::isInContext() const
     {
         // No mutex locking within this method, no disposal check - this is the responsibility of the owner.
         return m_pImpl->getImplUndoManager().IsInListAction();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::acquire(  ) throw ()
     {
         SfxModelSubComponent::acquire();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::release(  ) throw ()
     {
         SfxModelSubComponent::release();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -274,7 +274,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::enterHiddenUndoContext(  ) throw (EmptyUndoStackException, RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -284,7 +284,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::leaveUndoContext(  ) throw (InvalidStateException, RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -294,7 +294,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (RuntimeException, IllegalArgumentException)
     {
         // SYNCHRONIZED --->
@@ -304,7 +304,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::undo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -314,7 +314,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::redo(  ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -324,49 +324,49 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL DocumentUndoManager::isUndoPossible(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.isUndoPossible();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL DocumentUndoManager::isRedoPossible(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.isRedoPossible();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL DocumentUndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getCurrentUndoActionTitle();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL DocumentUndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getCurrentRedoActionTitle();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL DocumentUndoManager::getAllUndoActionTitles(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getAllUndoActionTitles();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL DocumentUndoManager::getAllRedoActionTitles(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.getAllRedoActionTitles();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::clear(  ) throw (UndoContextNotClosedException, RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -376,7 +376,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::clearRedo(  ) throw (UndoContextNotClosedException, RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -386,7 +386,7 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::reset() throw (RuntimeException)
     {
         // SYNCHRONIZED --->
@@ -396,49 +396,49 @@ namespace sfx2
         m_pImpl->invalidateXDo_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::lock(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         m_pImpl->aUndoHelper.lock();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::unlock(  ) throw (RuntimeException, NotLockedException)
     {
         UndoManagerGuard aGuard( *this );
         m_pImpl->aUndoHelper.unlock();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL DocumentUndoManager::isLocked(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.isLocked();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.addUndoManagerListener( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return m_pImpl->aUndoHelper.removeUndoManagerListener( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL DocumentUndoManager::getParent(  ) throw (RuntimeException)
     {
         UndoManagerGuard aGuard( *this );
         return static_cast< XModel* >( &getBaseModel() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DocumentUndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException)
     {
         (void)i_parent;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 8ca270242f65..f03a54c14a4e 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -193,14 +193,14 @@ bool SfxFrameDescriptorItem::operator==( const SfxPoolItem& rAttr ) const
     return aProperties == ((SfxFrameDescriptorItem&)rAttr).aProperties;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxFrameDescriptorItem::Clone( SfxItemPool* ) const
 {
     return new SfxFrameDescriptorItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SfxFrameDescriptorItem::GetPresentation
 (
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 12482c236885..6a6597d9197d 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -84,7 +84,7 @@ SvMemoryStream* GraphicHelper::getFormatStrFromGDI_Impl( const GDIMetaFile* pGDI
     return pResult;
 }
 
-//---------------------------------------------------------------
+
 // static
 void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta )
 {
@@ -121,7 +121,7 @@ void* GraphicHelper::getEnhMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta )
     return pResult;
 }
 
-//---------------------------------------------------------------
+
 // static
 void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, const Size& aMetaSize )
 {
@@ -193,7 +193,7 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co
     return pResult;
 }
 
-//---------------------------------------------------------------
+
 // static
 sal_Bool GraphicHelper::supportsMetaFileHandle_Impl()
 {
@@ -204,7 +204,7 @@ sal_Bool GraphicHelper::supportsMetaFileHandle_Impl()
 #endif
 }
 
-//---------------------------------------------------------------
+
 // static
 sal_Bool GraphicHelper::mergeBitmaps_Impl( const BitmapEx& rBmpEx, const BitmapEx& rOverlay,
                    const Rectangle& rOverlayRect, BitmapEx& rReturn )
@@ -325,7 +325,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un
     return bResult;
 }
 
-//---------------------------------------------------------------
+
 // static
 sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ )
 {
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 32d1c5773371..be619af4a12d 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -121,7 +121,7 @@ using namespace ::com::sun::star;
 using namespace css::system;
 
 namespace {
-//-------------------------------------------------------------------------
+
 static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
 {
     // This is a temporary hardcoded solution must be removed when
@@ -143,7 +143,7 @@ static sal_uInt16 getSlotIDFromMode( sal_Int8 nStoreMode )
     return nResult;
 }
 
-//-------------------------------------------------------------------------
+
 static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName )
 {
     sal_uInt8 nResult = 0;
@@ -166,14 +166,14 @@ static sal_uInt8 getStoreModeFromSlotName( const OUString& aSlotName )
     return nResult;
 }
 
-//-------------------------------------------------------------------------
+
 static sal_Int32 getMustFlags( sal_Int8 nStoreMode )
 {
     return ( SFX_FILTER_EXPORT
             | ( ( ( nStoreMode & EXPORT_REQUESTED ) && !( nStoreMode & WIDEEXPORT_REQUESTED ) ) ? 0 : SFX_FILTER_IMPORT ) );
 }
 
-//-------------------------------------------------------------------------
+
 static sal_Int32 getDontFlags( sal_Int8 nStoreMode )
 {
     return ( SFX_FILTER_INTERNAL
@@ -323,7 +323,7 @@ public:
 
 };
 
-//-------------------------------------------------------------------------
+
 ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner,
                                 const uno::Reference< frame::XModel >& xModel,
                                 const uno::Sequence< beans::PropertyValue >& aMediaDescr )
@@ -360,7 +360,7 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner,
     }
 }
 
-//-------------------------------------------------------------------------
+
 ModelData_Impl::~ModelData_Impl()
 {
     FreeDocumentProps();
@@ -371,7 +371,7 @@ ModelData_Impl::~ModelData_Impl()
         delete m_pModulePropsHM;
 }
 
-//-------------------------------------------------------------------------
+
 void ModelData_Impl::FreeDocumentProps()
 {
     if ( m_pDocumentPropsHM )
@@ -381,7 +381,7 @@ void ModelData_Impl::FreeDocumentProps()
     }
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< frame::XModel > ModelData_Impl::GetModel()
 {
     if ( !m_xModel.is() )
@@ -390,7 +390,7 @@ uno::Reference< frame::XModel > ModelData_Impl::GetModel()
     return m_xModel;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< frame::XStorable > ModelData_Impl::GetStorable()
 {
     if ( !m_xStorable.is() )
@@ -403,7 +403,7 @@ uno::Reference< frame::XStorable > ModelData_Impl::GetStorable()
     return m_xStorable;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< frame::XStorable2 > ModelData_Impl::GetStorable2()
 {
     if ( !m_xStorable2.is() )
@@ -416,7 +416,7 @@ uno::Reference< frame::XStorable2 > ModelData_Impl::GetStorable2()
     return m_xStorable2;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< util::XModifiable > ModelData_Impl::GetModifiable()
 {
     if ( !m_xModifiable.is() )
@@ -429,7 +429,7 @@ uno::Reference< util::XModifiable > ModelData_Impl::GetModifiable()
     return m_xModifiable;
 }
 
-//-------------------------------------------------------------------------
+
 const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps()
 {
     if ( !m_pDocumentPropsHM )
@@ -438,7 +438,7 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps()
     return *m_pDocumentPropsHM;
 }
 
-//-------------------------------------------------------------------------
+
 OUString ModelData_Impl::GetModuleName()
 {
     if ( m_aModuleName.isEmpty() )
@@ -451,7 +451,7 @@ OUString ModelData_Impl::GetModuleName()
     return m_aModuleName;
 }
 
-//-------------------------------------------------------------------------
+
 const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps()
 {
     if ( !m_pModulePropsHM )
@@ -466,13 +466,13 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetModuleProps()
     return *m_pModulePropsHM;
 }
 
-//-------------------------------------------------------------------------
+
 OUString ModelData_Impl::GetDocServiceName()
 {
     return GetModuleProps().getUnpackedValueOrDefault("ooSetupFactoryDocumentService", OUString());
 }
 
-//-------------------------------------------------------------------------
+
 void ModelData_Impl::CheckInteractionHandler()
 {
     ::comphelper::SequenceAsHashMap::const_iterator aInteractIter =
@@ -495,7 +495,7 @@ void ModelData_Impl::CheckInteractionHandler()
     }
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter()
 {
     uno::Sequence< beans::PropertyValue > aProps;
@@ -509,7 +509,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
     return aProps;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilterCheckFlags( sal_Int32 nMust,
                                                                                                 sal_Int32 nDont )
 {
@@ -528,7 +528,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceDefaultFilter
 }
 
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sal_Int32 nMust, sal_Int32 nDont )
 {
     uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
@@ -538,7 +538,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetDocServiceAnyFilter( sa
     return ::comphelper::MimeConfigurationHelper::SearchForFilter( m_pOwner->GetFilterQuery(), aSearchRequest, nMust, nDont );
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( sal_Int8 nStoreMode )
 {
     uno::Sequence< beans::PropertyValue > aFilterProps;
@@ -571,7 +571,7 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
     return aFilterProps;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
 {
     sal_Bool bDialogUsed = sal_False;
@@ -650,7 +650,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
     return bDialogUsed;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus )
 {
     sal_Int8 nResult = nCurStatus;
@@ -677,7 +677,7 @@ sal_Int8 ModelData_Impl::CheckSaveAcceptable( sal_Int8 nCurStatus )
     return nResult;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int8 ModelData_Impl::CheckStateForSave()
 {
     // if the document is readonly or a new one a SaveAs operation must be used
@@ -835,7 +835,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName )
     return STATUS_SAVE;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence()
 {
     uno::Sequence< beans::NamedValue > aSearchRequest( 1 );
@@ -862,7 +862,7 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence()
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
                                             const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM,
                                             sal_Bool bSetStandardName,
@@ -1173,7 +1173,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
     return bUseFilterOptions;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
 {
     sal_Bool bDialogUsed = sal_False;
@@ -1211,7 +1211,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
     return bDialogUsed;
 }
 
-//-------------------------------------------------------------------------
+
 OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir )
 {
     OUString aRecommendedDir;
@@ -1249,7 +1249,7 @@ OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir )
     return aRecommendedDir;
 }
 
-//-------------------------------------------------------------------------
+
 OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, const OUString& aTypeName )
 {
     // the last used name might be provided by aSuggestedName from the old selection, or from the MediaDescriptor
@@ -1301,12 +1301,12 @@ OUString ModelData_Impl::GetRecommendedName( const OUString& aSuggestedName, con
 //=========================================================================
 // class SfxStoringHelper
 //=========================================================================
-//-------------------------------------------------------------------------
+
 SfxStoringHelper::SfxStoringHelper()
 {
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguration()
 {
     if ( !m_xFilterCFG.is() )
@@ -1322,7 +1322,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio
     return m_xFilterCFG;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery()
 {
     if ( !m_xFilterQuery.is() )
@@ -1335,7 +1335,7 @@ uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery()
     return m_xFilterQuery;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::GetModuleManager()
 {
     if ( !m_xModuleManager.is() )
@@ -1347,7 +1347,7 @@ uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::Get
     return m_xModuleManager;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel,
                                             const OUString& aSlotName,
                                             uno::Sequence< beans::PropertyValue >& aArgsSequence,
@@ -1724,7 +1724,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel
     return bDialogUsed;
 }
 
-//-------------------------------------------------------------------------
+
 // static
 sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence(
                                                     const uno::Reference< container::XNameAccess >& xFilterCFG,
@@ -1756,7 +1756,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence(
     return bUseFilterOptions;
 }
 
-//-------------------------------------------------------------------------
+
 // static
 void SfxStoringHelper::SetDocInfoState(
         const uno::Reference< frame::XModel >& xModel,
@@ -1836,7 +1836,7 @@ void SfxStoringHelper::SetDocInfoState(
         xModifiable->setModified( bIsModified );
 }
 
-//-------------------------------------------------------------------------
+
 // static
 sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel,
                                                     OUString aOldUIName,
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 13417a5d5265..4fb3137c660b 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -187,7 +187,7 @@ public:
 };
 
 
-//-------------------------------------------------------------------------
+
 
 void SfxNewFileDialog_Impl::ClearInfo()
 {
@@ -198,7 +198,7 @@ void SfxNewFileDialog_Impl::ClearInfo()
     aDescEd.SetText(aNo);
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
 {
@@ -273,7 +273,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, Update)
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox )
 {
@@ -300,7 +300,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, RegionSelect, ListBox *, pBox )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand)
 {
@@ -309,7 +309,7 @@ IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, Expand)
 }
 IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, Expand)
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox )
 {
@@ -331,7 +331,7 @@ IMPL_LINK( SfxNewFileDialog_Impl, PreviewClick, CheckBox *, pBox )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
 {
@@ -347,7 +347,7 @@ IMPL_LINK_NOARG(SfxNewFileDialog_Impl, TemplateSelect)
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
 {
@@ -359,7 +359,7 @@ IMPL_LINK_INLINE_START( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox
 }
 IMPL_LINK_INLINE_END( SfxNewFileDialog_Impl, DoubleClick, ListBox *, pListBox )
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile)
 {
@@ -367,7 +367,7 @@ IMPL_LINK_NOARG_INLINE_START(SfxNewFileDialog_Impl, LoadFile)
     return 0;
 }
 IMPL_LINK_NOARG_INLINE_END(SfxNewFileDialog_Impl, LoadFile)
-//-------------------------------------------------------------------------
+
 
 sal_uInt16  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
 {
@@ -383,7 +383,7 @@ sal_uInt16  SfxNewFileDialog_Impl::GetSelectedTemplatePos() const
     return nEntry;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxNewFileDialog_Impl::IsTemplate() const
 {
@@ -391,7 +391,7 @@ sal_Bool SfxNewFileDialog_Impl::IsTemplate() const
 
 }
 
-//-------------------------------------------------------------------------
+
 
 OUString SfxNewFileDialog_Impl::GetTemplateFileName() const
 {
@@ -401,7 +401,7 @@ OUString SfxNewFileDialog_Impl::GetTemplateFileName() const
                               GetSelectedTemplatePos()-1);
 }
 
-//-------------------------------------------------------------------------
+
 
 void AdjustPosSize_Impl(Window *pWin, short nMoveOffset, short nSizeOffset)
 {
@@ -411,7 +411,7 @@ void AdjustPosSize_Impl(Window *pWin, short nMoveOffset, short nSizeOffset)
     aSize.Width() += nSizeOffset;
     pWin->SetPosSizePixel(aPos, aSize);
 }
-//-------------------------------------------------------------------------
+
 sal_uInt16  SfxNewFileDialog_Impl::GetTemplateFlags()const
 {
     sal_uInt16 nRet = aTextStyleCB.IsChecked() ? SFX_LOAD_TEXT_STYLES : 0;
@@ -425,7 +425,7 @@ sal_uInt16  SfxNewFileDialog_Impl::GetTemplateFlags()const
         nRet |= SFX_MERGE_STYLES;
     return nRet;
 }
-//-------------------------------------------------------------------------
+
 void    SfxNewFileDialog_Impl::SetTemplateFlags(sal_uInt16 nSet)
 {
     aTextStyleCB.Check(  0 != (nSet&SFX_LOAD_TEXT_STYLES ));
@@ -435,7 +435,7 @@ void    SfxNewFileDialog_Impl::SetTemplateFlags(sal_uInt16 nSet)
     aMergeStyleCB.Check( 0 != (nSet&SFX_MERGE_STYLES     ));
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     SfxNewFileDialog* pAntiImplP, sal_uInt16 nFl)
@@ -554,7 +554,7 @@ SfxNewFileDialog_Impl::SfxNewFileDialog_Impl(
     RegionSelect(&aRegionLb);
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl()
 {
@@ -565,34 +565,34 @@ SfxNewFileDialog_Impl::~SfxNewFileDialog_Impl()
 
     delete pMoreBt;
 }
-//-------------------------------------------------------------------------
+
 SfxNewFileDialog::SfxNewFileDialog(Window *pParent, sal_uInt16 nFlags)
     : SfxModalDialog( pParent, SfxResId( DLG_NEW_FILE ) )
 {
     pImpl = new SfxNewFileDialog_Impl( this, nFlags );
 }
-//-------------------------------------------------------------------------
+
 SfxNewFileDialog::~SfxNewFileDialog()
 {
     delete pImpl;
 }
-//-------------------------------------------------------------------------
+
 sal_Bool SfxNewFileDialog::IsTemplate() const
 {
     return pImpl->IsTemplate();
 }
-//-------------------------------------------------------------------------
+
 OUString SfxNewFileDialog::GetTemplateFileName() const
 {
     return pImpl->GetTemplateFileName();
 }
-//-------------------------------------------------------------------------
+
 sal_uInt16 SfxNewFileDialog::GetTemplateFlags()const
 {
     return pImpl->GetTemplateFlags();
 
 }
-//-------------------------------------------------------------------------
+
 void    SfxNewFileDialog::SetTemplateFlags(sal_uInt16 nSet)
 {
     pImpl->SetTemplateFlags(nSet);
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 31bb6c819372..2f1d53cbd12c 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -214,7 +214,7 @@ void SfxObjectShell::UpdateDocInfoForSave()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 static void
 lcl_add(util::Duration & rDur, Time const& rTime)
@@ -286,7 +286,7 @@ void SfxObjectShell::UpdateTime_Impl(
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog
 (
@@ -297,7 +297,7 @@ SfxDocumentInfoDialog* SfxObjectShell::CreateDocumentInfoDialog
     return new SfxDocumentInfoDialog(pParent, rSet);
 }
 
-//--------------------------------------------------------------------
+
 
 SfxStyleSheetBasePool* SfxObjectShell::GetStyleSheetPool()
 {
@@ -362,7 +362,7 @@ void SfxObjectShell::LoadStyles
     delete [] pFound;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::UpdateFromTemplate_Impl(  )
 
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 32cfcaf270e2..875eddcc2474 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -39,7 +39,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------
+
 // TODO/LATER: this workaround must be replaced by API in future if possible
 SfxObjectShell* SfxObjectShell::GetParentShellByModel_Impl()
 {
@@ -66,7 +66,7 @@ SfxObjectShell* SfxObjectShell::GetParentShellByModel_Impl()
     return pResult;
 }
 
-// -----------------------------------------------------------------------
+
 Printer* SfxObjectShell::GetDocumentPrinter()
 {
     SfxObjectShell* pParent = GetParentShellByModel_Impl();
@@ -75,7 +75,7 @@ Printer* SfxObjectShell::GetDocumentPrinter()
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 OutputDevice* SfxObjectShell::GetDocumentRefDev()
 {
     SfxObjectShell* pParent = GetParentShellByModel_Impl();
@@ -84,13 +84,13 @@ OutputDevice* SfxObjectShell::GetDocumentRefDev()
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::OnDocumentPrinterChanged( Printer* /*pNewPrinter*/ )
 {
     // virtual method
 }
 
-// -----------------------------------------------------------------------
+
 Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const
 {
     if( nAspect == ASPECT_CONTENT )
@@ -105,14 +105,14 @@ Rectangle SfxObjectShell::GetVisArea( sal_uInt16 nAspect ) const
     return Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 const Rectangle& SfxObjectShell::GetVisArea() const
 {
     pImp->m_aVisArea = GetVisArea( ASPECT_CONTENT );
     return pImp->m_aVisArea;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::SetVisArea( const Rectangle & rVisArea )
 {
     if( pImp->m_aVisArea != rVisArea )
@@ -128,31 +128,31 @@ void SfxObjectShell::SetVisArea( const Rectangle & rVisArea )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::SetVisAreaSize( const Size & rVisSize )
 {
     SetVisArea( Rectangle( GetVisArea().TopLeft(), rVisSize ) );
 }
 
-// -----------------------------------------------------------------------
+
 sal_uIntPtr SfxObjectShell::GetMiscStatus() const
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 MapUnit SfxObjectShell::GetMapUnit() const
 {
     return pImp->m_nMapUnit;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::SetMapUnit( MapUnit nMapUnit )
 {
     pImp->m_nMapUnit = nMapUnit;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescriptor& rDesc ) const
 {
     sal_uInt32 nClipFormat;
@@ -167,7 +167,7 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip
     rDesc.mbCanLink = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::DoDraw( OutputDevice* pDev,
                             const Point & rObjPos,
                             const Size & rSize,
@@ -187,7 +187,7 @@ void SfxObjectShell::DoDraw( OutputDevice* pDev,
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev,
                                const Point & rViewPos,
                                const Fraction & rScaleX,
diff --git a/sfx2/source/doc/objitem.cxx b/sfx2/source/doc/objitem.cxx
index c48fce0663a6..39400c3ba380 100644
--- a/sfx2/source/doc/objitem.cxx
+++ b/sfx2/source/doc/objitem.cxx
@@ -34,21 +34,21 @@ bool SfxObjectShellItem::operator==( const SfxPoolItem &rItem ) const
      return PTR_CAST(SfxObjectShellItem, &rItem)->pObjSh == pObjSh;
 }
 
-//--------------------------------------------------------------------
+
 
 OUString SfxObjectShellItem::GetValueText() const
 {
     return OUString();
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPoolItem* SfxObjectShellItem::Clone( SfxItemPool *) const
 {
     return new SfxObjectShellItem( Which(), pObjSh );
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
@@ -65,7 +65,7 @@ bool SfxObjectShellItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /
     return true;
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxObjectShellItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
@@ -105,7 +105,7 @@ SfxObjectItem::SfxObjectItem( sal_uInt16 nWhichId, SfxShell *pSh )
     _pSh( pSh )
 {}
 
-//--------------------------------------------------------------------
+
 
 bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const
 {
@@ -113,7 +113,7 @@ bool SfxObjectItem::operator==( const SfxPoolItem &rItem ) const
      return pOther->_pSh == _pSh;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPoolItem* SfxObjectItem::Clone( SfxItemPool *) const
 {
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 6a149c0ac4e8..255260c3c1b0 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -172,14 +172,14 @@ void SfxObjectShell::AbortImport()
     pImp->bIsAbortingImport = sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsAbortingImport() const
 {
     return pImp->bIsAbortingImport;
 }
 
-//-------------------------------------------------------------------------
+
 
 uno::Reference<document::XDocumentProperties>
 SfxObjectShell::getDocProperties()
@@ -193,13 +193,13 @@ SfxObjectShell::getDocProperties()
     return xDocProps;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::DoFlushDocInfo()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 // Note: the only thing that calls this is the modification event handler
 // that is installed at the XDocumentProperties
@@ -217,7 +217,7 @@ void SfxObjectShell::FlushDocInfo()
                  (delay > 0) || !url.isEmpty() );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage )
 {
@@ -230,14 +230,14 @@ void SfxObjectShell::SetError( sal_uInt32 lErr, const OUString& aLogMessage )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt32 SfxObjectShell::GetError() const
 {
     return ERRCODE_TOERROR(GetErrorCode());
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt32 SfxObjectShell::GetErrorCode() const
 {
@@ -247,7 +247,7 @@ sal_uInt32 SfxObjectShell::GetErrorCode() const
     return lError;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::ResetError()
 {
@@ -260,14 +260,14 @@ void SfxObjectShell::ResetError()
         pMed->ResetError();
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsTemplate() const
 {
     return pImp->bIsTemplate;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::EnableSetModified( sal_Bool bEnable )
 {
@@ -278,14 +278,14 @@ void SfxObjectShell::EnableSetModified( sal_Bool bEnable )
     pImp->m_bEnableSetModified = bEnable;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsEnableSetModified() const
 {
     return pImp->m_bEnableSetModified && !IsReadOnly();
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsModified()
 {
@@ -325,7 +325,7 @@ sal_Bool SfxObjectShell::IsModified()
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::SetModified( sal_Bool bModifiedP )
 {
@@ -344,7 +344,7 @@ void SfxObjectShell::SetModified( sal_Bool bModifiedP )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::ModifyChanged()
 {
@@ -365,7 +365,7 @@ void SfxObjectShell::ModifyChanged()
     SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_MODIFYCHANGED, GlobalEventConfig::GetEventName(STR_EVENT_MODIFYCHANGED), this ) );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsReadOnlyUI() const
 
@@ -379,7 +379,7 @@ sal_Bool SfxObjectShell::IsReadOnlyUI() const
     return pImp->bReadOnlyUI;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsReadOnlyMedium() const
 
@@ -399,7 +399,7 @@ bool SfxObjectShell::IsOriginallyReadOnlyMedium() const
     return pMedium == 0 || pMedium->IsOriginallyReadOnly();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly )
 
@@ -417,7 +417,7 @@ void SfxObjectShell::SetReadOnlyUI( sal_Bool bReadOnly )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::SetReadOnly()
 {
@@ -443,14 +443,14 @@ void SfxObjectShell::SetReadOnly()
             Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
     }
 }
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsReadOnly() const
 {
     return pImp->bReadOnlyUI || pMedium == 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsInModalMode() const
 {
@@ -462,7 +462,7 @@ sal_Bool SfxObjectShell::AcceptStateUpdate() const
     return !IsInModalMode();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal )
 {
@@ -473,7 +473,7 @@ void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::SetModalMode_Impl( sal_Bool bModal )
 {
@@ -609,7 +609,7 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave )
     return bResult;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::FreeSharedFile()
 {
@@ -617,7 +617,7 @@ void SfxObjectShell::FreeSharedFile()
         FreeSharedFile( pMedium->GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) );
 }
 
-//--------------------------------------------------------------------
+
 void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL )
 {
     SetSharedXMLFlag( sal_False );
@@ -647,32 +647,32 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL )
     }
 }
 
-//--------------------------------------------------------------------
+
 void SfxObjectShell::DoNotCleanShareControlFile()
 {
     pImp->m_bAllowShareControlFileClean = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 void SfxObjectShell::SetSharedXMLFlag( sal_Bool bFlag ) const
 {
     pImp->m_bSharedXMLFlag = bFlag;
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::HasSharedXMLFlagSet() const
 {
     return pImp->m_bSharedXMLFlag;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsDocShared() const
 {
     return ( !pImp->m_aSharedFileURL.isEmpty() );
 }
 
-//--------------------------------------------------------------------
+
 
 OUString SfxObjectShell::GetSharedFileURL() const
 {
@@ -681,7 +681,7 @@ OUString SfxObjectShell::GetSharedFileURL() const
 
 #endif
 
-//--------------------------------------------------------------------
+
 
 Size SfxObjectShell::GetFirstPageSize()
 {
@@ -689,14 +689,14 @@ Size SfxObjectShell::GetFirstPageSize()
 }
 
 
-//--------------------------------------------------------------------
+
 
 IndexBitSet& SfxObjectShell::GetNoSet_Impl()
 {
     return pImp->aBitSet;
 }
 
-//--------------------------------------------------------------------
+
 // changes the title of the document
 
 void SfxObjectShell::SetTitle
@@ -741,7 +741,7 @@ void SfxObjectShell::SetTitle
     }
 }
 
-//--------------------------------------------------------------------
+
 
 #if OSL_DEBUG_LEVEL > 1
 OUString X(const OUString &rRet)
@@ -754,7 +754,7 @@ OUString X(const OUString &rRet)
 #define X(ret) ret
 #endif
 
-//--------------------------------------------------------------------
+
 OUString SfxObjectShell::GetTitle
 (
     sal_uInt16  nMaxLength      /*  0 (default)
@@ -940,7 +940,7 @@ OUString SfxObjectShell::GetTitle
     return X(pImp->aTitle);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::InvalidateName()
 
@@ -957,7 +957,7 @@ void SfxObjectShell::InvalidateName()
     Broadcast( SfxSimpleHint(SFX_HINT_TITLECHANGED) );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::SetNamedVisibility_Impl()
 {
@@ -980,14 +980,14 @@ void SfxObjectShell::SetNoName()
     GetModel()->attachResource( OUString(), GetModel()->getArgs() );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxProgress* SfxObjectShell::GetProgress() const
 {
     return pImp->pProgress;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::SetProgress_Impl
 (
@@ -1008,7 +1008,7 @@ void SfxObjectShell::SetProgress_Impl
     pImp->pProgress = pProgress;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame )
 {
@@ -1028,7 +1028,7 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::SetActivateEvent_Impl(sal_uInt16 nId )
 {
@@ -1054,13 +1054,13 @@ sal_Bool SfxObjectShell::IsAutoLoadLocked() const
     return !IsReadOnly() || pImp->nAutoLoadLocks > 0;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::BreakMacroSign_Impl( sal_Bool bBreakMacroSign )
 {
     pImp->m_bMacroSignBroken = bBreakMacroSign;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::CheckSecurityOnLoading_Impl()
 {
     uno::Reference< task::XInteractionHandler > xInteraction;
@@ -1076,7 +1076,7 @@ void SfxObjectShell::CheckSecurityOnLoading_Impl()
     pImp->aMacroMode.checkMacrosOnLoading( xInteraction );
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteractionHandler >& xHandler )
 {
     OUString aVersion;
@@ -1115,7 +1115,7 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::CheckForBrokenDocSignatures_Impl( const uno::Reference< task::XInteractionHandler >& xHandler )
 {
     sal_Int16 nSignatureState = GetDocumentSignatureState();
@@ -1129,7 +1129,7 @@ void SfxObjectShell::CheckForBrokenDocSignatures_Impl( const uno::Reference< tas
     pImp->aMacroMode.disallowMacroExecution();
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::SetAutoLoad(
     const INetURLObject& rUrl, sal_uInt32 nTime, sal_Bool bReload )
 {
@@ -1278,7 +1278,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags )
     }
 }
 
-//-------------------------------------------------------------------------
+
 extern void SetTemplate_Impl( const OUString&, const OUString&, SfxObjectShell* );
 
 void SfxObjectShell::TemplateDisconnectionAfterLoad()
@@ -1372,7 +1372,7 @@ void SfxObjectShell::TemplateDisconnectionAfterLoad()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::PositionView_Impl()
 {
@@ -1388,7 +1388,7 @@ void SfxObjectShell::PositionView_Impl()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsLoading() const
 /*  [Description]
@@ -1399,7 +1399,7 @@ sal_Bool SfxObjectShell::IsLoading() const
     return !( pImp->nLoadedFlags & SFX_LOADED_MAINDOCUMENT );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::CancelTransfers()
 /*  [Description]
@@ -1416,7 +1416,7 @@ void SfxObjectShell::CancelTransfers()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 AutoReloadTimer_Impl::AutoReloadTimer_Impl(
     const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh )
@@ -1425,7 +1425,7 @@ AutoReloadTimer_Impl::AutoReloadTimer_Impl(
     SetTimeout( nTime );
 }
 
-//-------------------------------------------------------------------------
+
 
 void AutoReloadTimer_Impl::Timeout()
 {
@@ -1588,7 +1588,7 @@ ErrCode SfxObjectShell::CallXScript( const OUString& rScriptURL,
     return CallXScript( GetModel(), rScriptURL, aParams, aRet, aOutParamIndex, aOutParam, bRaiseError, pCaller );
 }
 
-//-------------------------------------------------------------------------
+
 SfxFrame* SfxObjectShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ )
 {
     return pSelf;
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 381454cf55bf..365ee234abb3 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -268,7 +268,7 @@ void SfxObjectShell::PrintExec_Impl(SfxRequest &rReq)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet)
 {
@@ -282,7 +282,7 @@ void SfxObjectShell::PrintState_Impl(SfxItemSet &rSet)
     rSet.Put( SfxBoolItem( SID_PRINTOUT, bPrinting ) );
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::APISaveAs_Impl
 (
@@ -421,7 +421,7 @@ uno::Sequence< document::CmisVersion > SfxObjectShell::GetCmisVersions( )
     }
     return uno::Sequence< document::CmisVersion > ( );
 }
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 {
@@ -926,7 +926,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
     rReq.Done();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
 {
@@ -1148,7 +1148,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq)
 {
@@ -1190,7 +1190,7 @@ void SfxObjectShell::ExecProps_Impl(SfxRequest &rReq)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet)
 {
@@ -1269,7 +1269,7 @@ void SfxObjectShell::StateProps_Impl(SfxItemSet &rSet)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
 {
@@ -1306,7 +1306,7 @@ void SfxObjectShell::ExecView_Impl(SfxRequest &rReq)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/)
 {
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index d03542757507..efe57bd7b2ee 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -168,21 +168,21 @@ sal_Bool SfxObjectShell::Save()
     return SaveChildren();
 }
 
-//--------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::SaveAs( SfxMedium& rMedium )
 {
     return SaveAsChildren( rMedium );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::QuerySlotExecutable( sal_uInt16 /*nSlotId*/ )
 {
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::NamedValue >& o_rEncryptionData )
 {
@@ -210,7 +210,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, uno::Sequence< beans::Named
     return bResult;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl(
                                             OUString aURL,
                                             const uno::Reference< embed::XStorage >& xDocStorage,
@@ -267,7 +267,7 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl(
     return bResult;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< embed::XStorage >& xStorage )
 {
     OUString aTempURL = ::utl::TempFile().GetURL();
@@ -300,7 +300,7 @@ OUString SfxObjectShell::CreateTempCopyOfStorage_Impl( const uno::Reference< emb
     return aTempURL;
 }
 
-//-------------------------------------------------------------------------
+
 SvGlobalName SfxObjectShell::GetClassName() const
 {
     return GetFactory().GetClassId();
@@ -335,7 +335,7 @@ sal_uInt32 GetChartVersion( sal_Int32 nVersion, bool bTemplate )
 
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xStorage,
                                    sal_Int32 nVersion, sal_Bool bTemplate, bool bChart ) const
 {
@@ -420,7 +420,7 @@ void SfxObjectShell::SetupStorage( const uno::Reference< embed::XStorage >& xSto
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SfxObjectShell::PrepareSecondTryLoad_Impl()
 {
     // only for internal use
@@ -429,7 +429,7 @@ void SfxObjectShell::PrepareSecondTryLoad_Impl()
     ResetError();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage >& xStorage,
                                             sal_Bool bTypeMustBeSetAlready )
 {
@@ -468,13 +468,13 @@ sal_Bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::InitNew( const uno::Reference< embed::XStorage >& xStorage )
 {
     return GeneralInit_Impl( xStorage, sal_False );
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::Load( SfxMedium& rMedium )
 {
     return GeneralInit_Impl( rMedium.GetStorage(), sal_True );
@@ -545,7 +545,7 @@ sal_Bool SfxObjectShell::DoInitNew( SfxMedium* pMed )
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl(
                     const uno::Reference< io::XStream >& xStream,
@@ -618,7 +618,7 @@ sal_Bool SfxObjectShell::ImportFromGeneratedStream_Impl(
     return bResult;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed )
 {
@@ -986,7 +986,7 @@ sal_uInt32 SfxObjectShell::HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDo
     return nError;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const
 {
@@ -996,7 +996,7 @@ sal_Bool SfxObjectShell::IsOwnStorageFormat_Impl(const SfxMedium &rMedium) const
              rMedium.GetFilter()->GetVersion() >= SOFFICE_FILEFORMAT_60 );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) const
 {
@@ -1005,7 +1005,7 @@ sal_Bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) c
              rMedium.GetFilter()->GetVersion() >= SOFFICE_FILEFORMAT_60 );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::DoSave()
 // DoSave is only invoked for OLE. Save your own documents in the SFX through
@@ -1099,7 +1099,7 @@ void Lock_Impl( SfxObjectShell* pDoc, sal_Bool bLock )
 
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::SaveTo_Impl
 (
@@ -1763,7 +1763,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl
     return bOk;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium )
 {
     SAL_INFO( "sfx.doc", "SfxObjectShell::DisconnectStorage_Impl" );
@@ -1810,7 +1810,7 @@ sal_Bool SfxObjectShell::DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMediu
     return bResult;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
     const uno::Reference< embed::XStorage >& xStorage,
@@ -1894,7 +1894,7 @@ sal_Bool SfxObjectShell::ConnectTmpStorage_Impl(
     return bResult;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
 {
@@ -1936,7 +1936,7 @@ sal_Bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, sal_Bool bCommit )
     return bOk;
 }
 
-//-------------------------------------------------------------------------
+
 // TODO/LATER: may be the call must be removed completelly
 sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium )
 {
@@ -1956,7 +1956,7 @@ sal_Bool SfxObjectShell::DoSaveAs( SfxMedium& rMedium )
     return bRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
 {
@@ -2120,7 +2120,7 @@ void SfxObjectShell::AddToRecentlyUsedList()
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::ConvertFrom
 (
@@ -2414,7 +2414,7 @@ sal_Bool SfxObjectShell::ExportTo( SfxMedium& rMedium )
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::ConvertTo
 (
@@ -2471,7 +2471,7 @@ sal_Bool SfxObjectShell::ConvertTo
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
 {
@@ -2559,7 +2559,7 @@ sal_Bool SfxObjectShell::DoSave_Impl( const SfxItemSet* pArgs )
     return bSaved;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
 {
@@ -2600,7 +2600,7 @@ sal_Bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet )
     return bSaved;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::CommonSaveAs_Impl
 (
@@ -2746,7 +2746,7 @@ sal_Bool SfxObjectShell::CommonSaveAs_Impl
         return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::PreDoSaveAs_Impl
 (
@@ -2884,7 +2884,7 @@ sal_Bool SfxObjectShell::PreDoSaveAs_Impl
     return bOk;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ )
 {
@@ -2892,7 +2892,7 @@ sal_Bool SfxObjectShell::LoadFrom( SfxMedium& /*rMedium*/ )
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::IsInformationLost()
 {
     Sequence< PropertyValue > aProps = GetModel()->getArgs();
@@ -2918,7 +2918,7 @@ sal_Bool SfxObjectShell::IsInformationLost()
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxObjectShell::CanReload_Impl()
 
 /*  [Description]
@@ -2931,7 +2931,7 @@ sal_Bool SfxObjectShell::CanReload_Impl()
     return pMedium && HasName() && !IsInModalMode() && !pImp->bForbidReload;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates )
 {
@@ -3662,7 +3662,7 @@ sal_Bool SfxObjectShell::QuerySaveSizeExceededModules_Impl( const uno::Reference
     // No interaction handler, default is to continue to save
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< task::XInteractionHandler > SfxObjectShell::getInteractionHandler() const
 {
     uno::Reference< task::XInteractionHandler > xRet;
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index c34781a2a0f8..15cb8dd03ee3 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -207,7 +207,7 @@ void SAL_CALL SfxModelListener_Impl::disposing( const com::sun::star::lang::Even
 
 TYPEINIT1(SfxObjectShell, SfxShell);
 
-//--------------------------------------------------------------------
+
 SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
     :mpObjectContainer(0)
     ,pBasicManager( new SfxBasicManagerHolder )
@@ -277,14 +277,14 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell )
     bInList = sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectShell_Impl::~SfxObjectShell_Impl()
 {
     delete pBasicManager;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags )
     :   pImp( new SfxObjectShell_Impl( *this ) )
@@ -305,7 +305,7 @@ SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags )
         pImp->m_bDocRecoverySupport = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 // initializes a document from a file-description
 
@@ -345,7 +345,7 @@ SfxObjectShell::SfxObjectShell
     DBG_CTOR(SfxObjectShell, 0);
 }
 
-//--------------------------------------------------------------------
+
 
 // virtual destructor of typical base-class SfxObjectShell
 
@@ -410,21 +410,21 @@ SfxObjectShell::~SfxObjectShell()
     delete pImp;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::Stamp_SetPrintCancelState(sal_Bool bState)
 {
     pImp->bIsPrintJobCancelable = bState;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::Stamp_GetPrintCancelState() const
 {
     return pImp->bIsPrintJobCancelable;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::ViewAssigned()
 
@@ -436,7 +436,7 @@ void SfxObjectShell::ViewAssigned()
 {
 }
 
-//--------------------------------------------------------------------
+
 // closes the Object and all its views
 
 bool SfxObjectShell::Close()
@@ -479,7 +479,7 @@ bool SfxObjectShell::Close()
     return true;
 }
 
-//--------------------------------------------------------------------
+
 
 // returns a pointer the first SfxDocument of specified type
 
@@ -505,7 +505,7 @@ SfxObjectShell* SfxObjectShell::GetFirst
 
     return 0;
 }
-//--------------------------------------------------------------------
+
 
 // returns a pointer to the next SfxDocument of specified type behind *pDoc
 
@@ -538,7 +538,7 @@ SfxObjectShell* SfxObjectShell::GetNext
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectShell* SfxObjectShell::Current()
 {
@@ -546,14 +546,14 @@ SfxObjectShell* SfxObjectShell::Current()
     return pFrame ? pFrame->GetObjectShell() : 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::IsInPrepareClose() const
 {
     return pImp->bInPrepareClose;
 }
 
-//------------------------------------------------------------------------
+
 
 struct BoolEnv_Impl
 {
@@ -655,7 +655,7 @@ bool SfxObjectShell::PrepareClose
     return true;
 }
 
-//--------------------------------------------------------------------
+
 #ifndef DISABLE_SCRIPTING
 namespace
 {
@@ -692,7 +692,7 @@ namespace
 }
 #endif
 
-//--------------------------------------------------------------------
+
 
 BasicManager* SfxObjectShell::GetBasicManager() const
 {
@@ -706,14 +706,14 @@ BasicManager* SfxObjectShell::GetBasicManager() const
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::SetHasNoBasic()
 {
     pImp->m_bNoBasicCapabilities = sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::HasBasic() const
 {
@@ -730,7 +730,7 @@ sal_Bool SfxObjectShell::HasBasic() const
 #endif
 }
 
-//--------------------------------------------------------------------
+
 #ifndef DISABLE_SCRIPTING
 namespace
 {
@@ -761,7 +761,7 @@ namespace
     }
 }
 #endif
-//--------------------------------------------------------------------
+
 
 Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer()
 {
@@ -778,7 +778,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetDialogContainer()
     return SFX_APP()->GetDialogContainer();
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
 {
@@ -795,7 +795,7 @@ Reference< XLibraryContainer > SfxObjectShell::GetBasicContainer()
     return SFX_APP()->GetBasicContainer();
 }
 
-//--------------------------------------------------------------------
+
 
 StarBASIC* SfxObjectShell::GetBasic() const
 {
@@ -806,7 +806,7 @@ StarBASIC* SfxObjectShell::GetBasic() const
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxObjectShell::InitBasicManager_Impl()
 /*  [Description]
@@ -853,21 +853,21 @@ void SfxObjectShell::InitBasicManager_Impl()
 #endif
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxObjectShell::DoClose()
 {
     return Close();
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectShell* SfxObjectShell::GetObjectShell()
 {
     return this;
 }
 
-//--------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SfxObjectShell::GetEventNames()
 {
@@ -886,7 +886,7 @@ uno::Sequence< OUString > SfxObjectShell::GetEventNames()
     return *pEventNameContainer;
 }
 
-//--------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SfxObjectShell::GetModel() const
 {
@@ -903,7 +903,7 @@ void SfxObjectShell::SetBaseModel( SfxBaseModel* pModel )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SfxObjectShell::GetBaseModel() const
 {
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index 1610923f989c..c6e800c7e402 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -283,7 +283,7 @@ void SfxOleTextEncoding::SetCodePage( sal_uInt16 nCodePage )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString SfxOleStringHelper::LoadString8( SvStream& rStrm ) const
 {
@@ -384,7 +384,7 @@ void SfxOleStringHelper::ImplSaveString16( SvStream& rStrm, const OUString& rVal
         rStrm.WriteUInt16( sal_uInt16( 0 ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleObjectBase::~SfxOleObjectBase()
 {
@@ -416,7 +416,7 @@ void SfxOleObjectBase::SaveObject( SvStream& rStrm, SfxOleObjectBase& rObj )
     SetError( rObj.Save( rStrm ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleCodePageProperty::SfxOleCodePageProperty() :
     SfxOlePropertyBase( PROPID_CODEPAGE, PROPTYPE_INT16 )
@@ -437,7 +437,7 @@ void SfxOleCodePageProperty::ImplSave( SvStream& rStrm )
     rStrm.WriteUInt16( GetCodePage() );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleInt32Property::SfxOleInt32Property( sal_Int32 nPropId, sal_Int32 nValue ) :
     SfxOlePropertyBase( nPropId, PROPTYPE_INT32 ),
@@ -455,7 +455,7 @@ void SfxOleInt32Property::ImplSave( SvStream& rStrm )
     rStrm.WriteInt32( mnValue );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleDoubleProperty::SfxOleDoubleProperty( sal_Int32 nPropId, double fValue ) :
     SfxOlePropertyBase( nPropId, PROPTYPE_DOUBLE ),
@@ -473,7 +473,7 @@ void SfxOleDoubleProperty::ImplSave( SvStream& rStrm )
     rStrm.WriteDouble( mfValue );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleBoolProperty::SfxOleBoolProperty( sal_Int32 nPropId, bool bValue ) :
     SfxOlePropertyBase( nPropId, PROPTYPE_BOOL ),
@@ -493,7 +493,7 @@ void SfxOleBoolProperty::ImplSave( SvStream& rStrm )
     rStrm.WriteInt16( static_cast< sal_Int16 >( mbValue ? -1 : 0 ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleStringPropertyBase::SfxOleStringPropertyBase(
         sal_Int32 nPropId, sal_Int32 nPropType, const SfxOleTextEncoding& rTextEnc ) :
@@ -517,7 +517,7 @@ SfxOleStringPropertyBase::SfxOleStringPropertyBase(
 {
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleString8Property::SfxOleString8Property(
         sal_Int32 nPropId, const SfxOleTextEncoding& rTextEnc ) :
@@ -541,7 +541,7 @@ void SfxOleString8Property::ImplSave( SvStream& rStrm )
     SaveString8( rStrm, GetValue() );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleString16Property::SfxOleString16Property( sal_Int32 nPropId ) :
     SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING16, RTL_TEXTENCODING_UCS2 )
@@ -558,7 +558,7 @@ void SfxOleString16Property::ImplSave( SvStream& rStrm )
     SaveString16( rStrm, GetValue() );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleFileTimeProperty::SfxOleFileTimeProperty( sal_Int32 nPropId ) :
     SfxOlePropertyBase( nPropId, PROPTYPE_FILETIME )
@@ -643,7 +643,7 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm )
     rStrm.WriteDouble( fValue );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleThumbnailProperty::SfxOleThumbnailProperty(
         sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) :
@@ -693,7 +693,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId,
         const uno::Sequence<sal_uInt8> & i_rData) :
@@ -718,7 +718,7 @@ void SfxOleBlobProperty::ImplSave( SvStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleDictionaryProperty::SfxOleDictionaryProperty( const SfxOleTextEncoding& rTextEnc ) :
     SfxOlePropertyBase( PROPID_DICTIONARY, 0 ),
@@ -765,7 +765,7 @@ void SfxOleDictionaryProperty::ImplSave( SvStream& rStrm )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 SfxOleSection::SfxOleSection( bool bSupportsDict ) :
     maDictProp( maCodePageProp ),
@@ -1151,7 +1151,7 @@ void SfxOleSection::SaveProperty( SvStream& rStrm, SfxOlePropertyBase& rProp, sa
     rnPropPosPos = rStrm.Tell();
 }
 
-// ----------------------------------------------------------------------------
+
 
 ErrCode SfxOlePropertySet::LoadPropertySet( SotStorage* pStrg, const OUString& rStrmName )
 {
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index 913452b67807..c5f893c7b8f1 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -249,9 +249,9 @@ namespace
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  XPrintable
-//________________________________________________________________________________________________________
+
 
 uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() throw(::com::sun::star::uno::RuntimeException)
 {
@@ -308,9 +308,9 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SfxPrintHelper::getPrinter() thro
     return aPrinter;
 }
 
-//________________________________________________________________________________________________________
+
 //  XPrintable
-//________________________________________________________________________________________________________
+
 
 void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >& rPrinter,SfxPrinter*& pPrinter,sal_uInt16& nChangeFlags,SfxViewShell*& pViewSh)
 
@@ -462,9 +462,9 @@ void SAL_CALL SfxPrintHelper::setPrinter(const uno::Sequence< beans::PropertyVal
         pViewSh->SetPrinter( pPrinter, nChangeFlags, false );
 }
 
-//________________________________________________________________________________________________________
+
 //  ImplPrintWatch thread for asynchronous printing with moving temp. file to ucb location
-//________________________________________________________________________________________________________
+
 
 /* This implements a thread which will be started to wait for asynchronous
    print jobs to temp. localy files. If they finish we move the temp. files
@@ -575,11 +575,11 @@ class ImplUCBPrintWatcher : public ::osl::Thread
         }
 };
 
-//------------------------------------------------
 
-//________________________________________________________________________________________________________
+
+
 //  XPrintable
-//________________________________________________________________________________________________________
+
 void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& rOptions)
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8c6d40d72c11..01f60708e9ad 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -115,9 +115,9 @@
 
 #include <sfx2/sfxresid.hxx>
 
-//________________________________________________________________________________________________________
+
 //  namespaces
-//________________________________________________________________________________________________________
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -175,9 +175,9 @@ void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
 {
 }
 
-//________________________________________________________________________________________________________
+
 //  impl. declarations
-//________________________________________________________________________________________________________
+
 
 
 struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
@@ -513,9 +513,9 @@ SfxSaveGuard::~SfxSaveGuard()
 
 // =======================================================================================================
 
-//________________________________________________________________________________________________________
+
 //  constructor
-//________________________________________________________________________________________________________
+
 DBG_NAME(sfx2_SfxBaseModel)
 SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
 : BaseMutex()
@@ -530,18 +530,18 @@ SfxBaseModel::SfxBaseModel( SfxObjectShell *pObjectShell )
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  destructor
-//________________________________________________________________________________________________________
+
 
 SfxBaseModel::~SfxBaseModel()
 {
     DBG_DTOR(sfx2_SfxBaseModel,NULL);
 }
 
-//________________________________________________________________________________________________________
+
 //  XInterface
-//________________________________________________________________________________________________________
+
 
 Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( RuntimeException )
 {
@@ -553,9 +553,9 @@ Any SAL_CALL SfxBaseModel::queryInterface( const uno::Type& rType ) throw( Runti
     return SfxBaseModel_Base::queryInterface( rType );
 }
 
-//________________________________________________________________________________________________________
+
 //  XInterface
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::acquire() throw( )
 {
@@ -566,9 +566,9 @@ void SAL_CALL SfxBaseModel::acquire() throw( )
     OWeakObject::acquire() ;
 }
 
-//________________________________________________________________________________________________________
+
 //  XInterface
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::release() throw( )
 {
@@ -579,9 +579,9 @@ void SAL_CALL SfxBaseModel::release() throw( )
     OWeakObject::release() ;
 }
 
-//________________________________________________________________________________________________________
+
 //  XTypeProvider
-//________________________________________________________________________________________________________
+
 
 namespace
 {
@@ -611,9 +611,9 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException
     return aTypes;
 }
 
-//________________________________________________________________________________________________________
+
 //  XTypeProvider
-//________________________________________________________________________________________________________
+
 
 Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException )
 {
@@ -643,9 +643,9 @@ Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( Runtime
     return pID->getImplementationId() ;
 }
 
-//________________________________________________________________________________________________________
+
 //  XStarBasicAccess
-//________________________________________________________________________________________________________
+
 
 Reference< script::XStarBasicAccess > implGetStarBasicAccess( SfxObjectShell* pObjectShell )
 {
@@ -755,9 +755,9 @@ void SAL_CALL SfxBaseModel::addDialog( const OUString& LibraryName, const OUStri
 }
 
 
-//________________________________________________________________________________________________________
+
 //  XChild
-//________________________________________________________________________________________________________
+
 
 Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeException )
 {
@@ -766,9 +766,9 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getParent() throw( RuntimeExcepti
     return m_pData->m_xParent;
 }
 
-//________________________________________________________________________________________________________
+
 //  XChild
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) throw(lang::NoSupportException, RuntimeException)
 {
@@ -776,9 +776,9 @@ void SAL_CALL SfxBaseModel::setParent(const Reference< XInterface >& Parent) thr
     m_pData->m_xParent = Parent;
 }
 
-//________________________________________________________________________________________________________
+
 //  XChild
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException)
 {
@@ -831,9 +831,9 @@ void SAL_CALL SfxBaseModel::dispose() throw(RuntimeException)
     delete pData;
 }
 
-//________________________________________________________________________________________________________
+
 //  XChild
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListener >& aListener )
     throw(RuntimeException)
@@ -842,9 +842,9 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< lang::XEventListe
     m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
 }
 
-//________________________________________________________________________________________________________
+
 //  XChild
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::removeEventListener( const Reference< lang::XEventListener >& aListener )
     throw(RuntimeException)
@@ -880,9 +880,9 @@ SfxBaseModel::getDocumentProperties()
 }
 
 
-//________________________________________________________________________________________________________
+
 //  lang::XEventListener
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
     throw(RuntimeException)
@@ -903,9 +903,9 @@ void SAL_CALL SfxBaseModel::disposing( const lang::EventObject& aObject )
         m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), xListener );
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseModel::attachResource( const   OUString&                   rURL    ,
                                                 const   Sequence< beans::PropertyValue >&  rArgs   )
@@ -990,9 +990,9 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const   OUString&
     return sal_True ;
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException)
 {
@@ -1000,9 +1000,9 @@ OUString SAL_CALL SfxBaseModel::getURL() throw(RuntimeException)
     return m_pData->m_sURL ;
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeException)
 {
@@ -1099,9 +1099,9 @@ Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getArgs() throw(RuntimeE
     return m_pData->m_seqArguments;
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XController >& xController )
     throw(RuntimeException)
@@ -1129,9 +1129,9 @@ void SAL_CALL SfxBaseModel::connectController( const Reference< frame::XControll
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::disconnectController( const Reference< frame::XController >& xController ) throw(RuntimeException)
 {
@@ -1202,9 +1202,9 @@ namespace
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException)
 {
@@ -1221,9 +1221,9 @@ void SAL_CALL SfxBaseModel::lockControllers() throw(RuntimeException)
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException)
 {
@@ -1240,9 +1240,9 @@ void SAL_CALL SfxBaseModel::unlockControllers() throw(RuntimeException)
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException)
 {
@@ -1250,9 +1250,9 @@ sal_Bool SAL_CALL SfxBaseModel::hasControllersLocked() throw(RuntimeException)
     return ( m_pData->m_nControllerLockCount != 0 ) ;
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() throw(RuntimeException)
 {
@@ -1266,9 +1266,9 @@ Reference< frame::XController > SAL_CALL SfxBaseModel::getCurrentController() th
     return m_pData->m_seqControllers.getLength() ? m_pData->m_seqControllers.getConstArray()[0] : m_pData->m_xCurrent;
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XController >& xCurrentController )
         throw (container::NoSuchElementException, RuntimeException)
@@ -1278,9 +1278,9 @@ void SAL_CALL SfxBaseModel::setCurrentController( const Reference< frame::XContr
     m_pData->m_xCurrent = xCurrentController;
 }
 
-//________________________________________________________________________________________________________
+
 //  frame::XModel
-//________________________________________________________________________________________________________
+
 
 Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(RuntimeException)
 {
@@ -1302,9 +1302,9 @@ Reference< XInterface > SAL_CALL SfxBaseModel::getCurrentSelection() throw(Runti
     return xReturn ;
 }
 
-//________________________________________________________________________________________________________
+
 //  XModifiable2
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException)
 {
@@ -1342,9 +1342,9 @@ sal_Bool SAL_CALL SfxBaseModel::isSetModifiedEnabled() throw (RuntimeException)
     return m_pData->m_pObjectShell->IsEnableSetModified();
 }
 
-//________________________________________________________________________________________________________
+
 //  XModifiable
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException)
 {
@@ -1353,9 +1353,9 @@ sal_Bool SAL_CALL SfxBaseModel::isModified() throw(RuntimeException)
     return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsModified() : sal_False;
 }
 
-//________________________________________________________________________________________________________
+
 //  XModifiable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified )
         throw (beans::PropertyVetoException, RuntimeException)
@@ -1366,9 +1366,9 @@ void SAL_CALL SfxBaseModel::setModified( sal_Bool bModified )
         m_pData->m_pObjectShell->SetModified(bModified);
 }
 
-//________________________________________________________________________________________________________
+
 //  XModifiable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException )
 {
@@ -1377,9 +1377,9 @@ void SAL_CALL SfxBaseModel::addModifyListener(const Reference< util::XModifyList
     m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XModifyListener >*)0),xListener );
 }
 
-//________________________________________________________________________________________________________
+
 //  XModifiable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyListener >& xListener) throw( RuntimeException )
 {
@@ -1388,9 +1388,9 @@ void SAL_CALL SfxBaseModel::removeModifyListener(const Reference< util::XModifyL
     m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XModifyListener >*)0), xListener );
 }
 
-//____________________________________________________________________________________________________
+
 //  XCloseable
-//____________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::CloseVetoException, RuntimeException)
 {
@@ -1451,9 +1451,9 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
     dispose();
 }
 
-//____________________________________________________________________________________________________
+
 //  XCloseBroadcaster
-//____________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException)
 {
@@ -1462,9 +1462,9 @@ void SAL_CALL SfxBaseModel::addCloseListener( const Reference< util::XCloseListe
     m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener );
 }
 
-//____________________________________________________________________________________________________
+
 //  XCloseBroadcaster
-//____________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseListener >& xListener ) throw (RuntimeException)
 {
@@ -1473,9 +1473,9 @@ void SAL_CALL SfxBaseModel::removeCloseListener( const Reference< util::XCloseLi
     m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< util::XCloseListener >*)0), xListener );
 }
 
-//________________________________________________________________________________________________________
+
 //  XPrintable
-//________________________________________________________________________________________________________
+
 
 Sequence< beans::PropertyValue > SAL_CALL SfxBaseModel::getPrinter() throw(RuntimeException)
 {
@@ -1505,9 +1505,9 @@ void SAL_CALL SfxBaseModel::print(const Sequence< beans::PropertyValue >& rOptio
         m_pData->m_xPrintable->print( rOptions );
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException)
 {
@@ -1516,9 +1516,9 @@ sal_Bool SAL_CALL SfxBaseModel::hasLocation() throw(RuntimeException)
     return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->HasName() : sal_False;
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable
-//________________________________________________________________________________________________________
+
 
 OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException)
 {
@@ -1536,9 +1536,9 @@ OUString SAL_CALL SfxBaseModel::getLocation() throw(RuntimeException)
     return m_pData->m_sURL;
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException)
 {
@@ -1547,9 +1547,9 @@ sal_Bool SAL_CALL SfxBaseModel::isReadonly() throw(RuntimeException)
     return m_pData->m_pObjectShell.Is() ? m_pData->m_pObjectShell->IsReadOnly() : sal_True;
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable2
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::storeSelf( const    Sequence< beans::PropertyValue >&  aSeqArgs )
         throw ( lang::IllegalArgumentException,
@@ -1669,18 +1669,18 @@ void SAL_CALL SfxBaseModel::storeSelf( const    Sequence< beans::PropertyValue >
 
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::store() throw (io::IOException, RuntimeException)
 {
     storeSelf( Sequence< beans::PropertyValue >() );
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::storeAsURL( const   OUString&                   rURL    ,
                                         const   Sequence< beans::PropertyValue >&  rArgs   )
@@ -1709,9 +1709,9 @@ void SAL_CALL SfxBaseModel::storeAsURL( const   OUString&                   rURL
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  XUndoManagerSupplier
-//________________________________________________________________________________________________________
+
 Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager(  ) throw (RuntimeException)
 {
     SfxModelGuard aGuard( *this );
@@ -1720,9 +1720,9 @@ Reference< XUndoManager > SAL_CALL SfxBaseModel::getUndoManager(  ) throw (Runti
     return m_pData->m_pDocumentUndoManager.get();
 }
 
-//________________________________________________________________________________________________________
+
 //  XStorable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::storeToURL( const   OUString&                   rURL    ,
                                         const   Sequence< beans::PropertyValue >&  rArgs   )
@@ -1783,9 +1783,9 @@ void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, c
     // not want to overwrite it with the "old" elements passed to this method here.
 }
 
-//________________________________________________________________________________________________________
+
 // XLoadable
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::initNew()
         throw (frame::DoubleInitializationException,
@@ -1966,9 +1966,9 @@ void SAL_CALL SfxBaseModel::load(   const Sequence< beans::PropertyValue >& seqA
 #endif
 }
 
-//________________________________________________________________________________________________________
+
 // XTransferable
-//________________________________________________________________________________________________________
+
 
 Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFlavor )
         throw (datatransfer::UnsupportedFlavorException,
@@ -2206,9 +2206,9 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
     return aAny;
 }
 
-//________________________________________________________________________________________________________
+
 // XTransferable
-//________________________________________________________________________________________________________
+
 
 
 Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavors()
@@ -2275,9 +2275,9 @@ Sequence< datatransfer::DataFlavor > SAL_CALL SfxBaseModel::getTransferDataFlavo
     return aFlavorSeq;
 }
 
-//________________________________________________________________________________________________________
+
 // XTransferable
-//________________________________________________________________________________________________________
+
 
 
 sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor )
@@ -2336,9 +2336,9 @@ sal_Bool SAL_CALL SfxBaseModel::isDataFlavorSupported( const datatransfer::DataF
 }
 
 
-//--------------------------------------------------------------------------------------------------------
+
 //  XEventsSupplier
-//--------------------------------------------------------------------------------------------------------
+
 
 Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( RuntimeException )
 {
@@ -2352,9 +2352,9 @@ Reference< container::XNameReplace > SAL_CALL SfxBaseModel::getEvents() throw( R
     return m_pData->m_xEvents;
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  XEmbeddedScripts
-//--------------------------------------------------------------------------------------------------------
+
 
 Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getBasicLibraries() throw (RuntimeException)
 {
@@ -2385,9 +2385,9 @@ Reference< script::XStorageBasedLibraryContainer > SAL_CALL SfxBaseModel::getDia
     return sal_False;
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  XScriptInvocationContext
-//--------------------------------------------------------------------------------------------------------
+
 
 Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContainer() throw (RuntimeException)
 {
@@ -2421,9 +2421,9 @@ Reference< document::XEmbeddedScripts > SAL_CALL SfxBaseModel::getScriptContaine
     return xDocumentScripts;
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  XEventBroadcaster
-//--------------------------------------------------------------------------------------------------------
+
 
 void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException )
 {
@@ -2432,9 +2432,9 @@ void SAL_CALL SfxBaseModel::addEventListener( const Reference< document::XEventL
     m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener );
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  XEventBroadcaster
-//--------------------------------------------------------------------------------------------------------
+
 
 void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEventListener >& aListener ) throw( RuntimeException )
 {
@@ -2443,10 +2443,10 @@ void SAL_CALL SfxBaseModel::removeEventListener( const Reference< document::XEve
     m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XEventListener >*)0), aListener );
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  XDocumentEventBroadcaster
-//--------------------------------------------------------------------------------------------------------
-// ---------------------------------
+
+
 void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener )
     throw ( RuntimeException )
 {
@@ -2454,7 +2454,7 @@ void SAL_CALL SfxBaseModel::addDocumentEventListener( const Reference< document:
     m_pData->m_aInterfaceContainer.addInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener );
 }
 
-// ---------------------------------
+
 void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< document::XDocumentEventListener >& aListener )
     throw ( RuntimeException )
 {
@@ -2462,7 +2462,7 @@ void SAL_CALL SfxBaseModel::removeDocumentEventListener( const Reference< docume
     m_pData->m_aInterfaceContainer.removeInterface( ::getCppuType((const Reference< document::XDocumentEventListener >*)0), aListener );
 }
 
-// ---------------------------------
+
 void SAL_CALL SfxBaseModel::notifyDocumentEvent( const OUString&, const Reference< frame::XController2 >&, const Any& )
     throw ( lang::IllegalArgumentException, lang::NoSupportException, RuntimeException )
 {
@@ -2739,9 +2739,9 @@ void SfxBaseModel::handleLoadError( sal_uInt32 nError, SfxMedium* pMedium )
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxListener
-//________________________________________________________________________________________________________
+
 
 void addTitle_Impl( Sequence < beans::PropertyValue >& rSeq, const OUString& rTitle )
 {
@@ -2867,9 +2867,9 @@ void SfxBaseModel::Notify(          SfxBroadcaster& rBC     ,
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  public impl.
-//________________________________________________________________________________________________________
+
 
 void SfxBaseModel::NotifyModifyListeners_Impl() const
 {
@@ -2896,18 +2896,18 @@ void SfxBaseModel::changing()
     NotifyModifyListeners_Impl();
 }
 
-//________________________________________________________________________________________________________
+
 //  public impl.
-//________________________________________________________________________________________________________
+
 
 SfxObjectShell* SfxBaseModel::GetObjectShell() const
 {
     return m_pData ? (SfxObjectShell*) m_pData->m_pObjectShell : 0;
 }
 
-//________________________________________________________________________________________________________
+
 //  public impl.
-//________________________________________________________________________________________________________
+
 
 sal_Bool SfxBaseModel::IsInitialized() const
 {
@@ -2933,9 +2933,9 @@ sal_Bool SfxBaseModel::impl_isDisposed() const
     return ( m_pData == NULL ) ;
 }
 
-//________________________________________________________________________________________________________
+
 //  private impl.
-//________________________________________________________________________________________________________
+
 
 OUString SfxBaseModel::GetMediumFilterName_Impl()
 {
@@ -3363,9 +3363,9 @@ sal_Int64 SAL_CALL SfxBaseModel::getSomething( const Sequence< sal_Int8 >& aIden
     return 0;
 }
 
-//____________________________________________________________________________________________________
+
 //  XDocumentSubStorageSupplier
-//____________________________________________________________________________________________________
+
 
 void SfxBaseModel::ListenForStorage_Impl( const Reference< embed::XStorage >& xStorage )
 {
@@ -3441,9 +3441,9 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames()
        return aResult;
 }
 
-//____________________________________________________________________________________________________
+
 //  XScriptProviderSupplier
-//____________________________________________________________________________________________________
+
 
 
 Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptProvider()
@@ -3469,9 +3469,9 @@ Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptP
     return xScriptProvider;
 }
 
-//____________________________________________________________________________________________________
+
 //  XUIConfigurationManagerSupplier
-//____________________________________________________________________________________________________
+
 
 OUString SfxBaseModel::getRuntimeUID() const
 {
@@ -3662,9 +3662,9 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage
     return m_pData->m_xUIConfigurationManager;
 }
 
-//____________________________________________________________________________________________________
+
 //  XVisualObject
-//____________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::setVisualAreaSize( sal_Int64 nAspect, const awt::Size& aSize )
         throw ( lang::IllegalArgumentException,
@@ -3746,9 +3746,9 @@ embed::VisualRepresentation SAL_CALL SfxBaseModel::getPreferredVisualRepresentat
     return aVisualRepresentation;
 }
 
-//____________________________________________________________________________________________________
+
 //  XStorageBasedDocument
-//____________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& xStorage,
                                              const Sequence< beans::PropertyValue >& aMediaDescriptor )
diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx
index d96fdfd3e6bb..56b910900bd9 100644
--- a/sfx2/source/doc/sfxmodelfactory.cxx
+++ b/sfx2/source/doc/sfxmodelfactory.cxx
@@ -100,7 +100,7 @@ namespace sfx2
     //====================================================================
     //= SfxModelFactory - implementation
     //====================================================================
-    //--------------------------------------------------------------------
+
     SfxModelFactory::SfxModelFactory( const Reference< XMultiServiceFactory >& _rxServiceFactory,
             const OUString& _rImplementationName, const SfxModelFactoryFunc _pComponentFactoryFunc,
             const Sequence< OUString >& _rServiceNames )
@@ -111,24 +111,24 @@ namespace sfx2
     {
     }
 
-    //--------------------------------------------------------------------
+
     SfxModelFactory::~SfxModelFactory()
     {
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SfxModelFactory::impl_createInstance( const sal_uInt64 _nCreationFlags ) const
     {
         return (*m_pComponentFactoryFunc)( m_xServiceFactory, _nCreationFlags );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL SfxModelFactory::createInstance(  ) throw (Exception, RuntimeException)
     {
         return createInstanceWithArguments( Sequence< Any >() );
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         struct IsSpecialArgument : public ::std::unary_function< Any, bool >
@@ -151,7 +151,7 @@ namespace sfx2
         };
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException)
     {
         ::comphelper::NamedValueCollection aArgs( _rArguments );
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index 445b5c2c5743..1eb14cf42787 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <sfx2/sfx.hrc>
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem);
 
@@ -33,7 +33,7 @@ TYPEINIT1_FACTORY(SvxZoomItem,SfxUInt16Item, new SvxZoomItem);
 #define ZOOM_PARAM_TYPE     "Type"
 #define ZOOM_PARAMS         3
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomItem::SvxZoomItem
 (
@@ -47,7 +47,7 @@ SvxZoomItem::SvxZoomItem
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig )
 :   SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ),
@@ -56,20 +56,20 @@ SvxZoomItem::SvxZoomItem( const SvxZoomItem& rOrig )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomItem::~SvxZoomItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxZoomItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SvxZoomItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const
 {
@@ -82,7 +82,7 @@ SfxPoolItem* SvxZoomItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) con
     return pNew;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -92,7 +92,7 @@ SvStream& SvxZoomItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) con
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const
 {
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index 76b2e63b9221..58893f87b700 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -53,7 +53,7 @@ public:
     const SfxItemInfo* GetItemInfos() const { return m_pItemInfos; }
 };
 
-//----------------------------------------------------------------------------
+
 
 //=========================================================================
 
@@ -71,9 +71,9 @@ public:
     static sal_uInt16       Release();
 };
 
-//----------------------------------------------------------------------------
 
-//----------------------------------------------------------------------------
+
+
 // static
 SfxItemPool* NoChaos::GetItemPool()
 {
@@ -81,7 +81,7 @@ SfxItemPool* NoChaos::GetItemPool()
     return CntItemPool::Acquire();
 }
 
-//----------------------------------------------------------------------------
+
 // static
 sal_uInt16 NoChaos::ReleaseItemPool()
 {
@@ -98,7 +98,7 @@ static CntStaticPoolDefaults_Impl* pPoolDefs_Impl = NULL;
 // static member!
 CntItemPool* CntItemPool::_pThePool = NULL;
 
-//-------------------------------------------------------------------------
+
 CntItemPool::CntItemPool()
 : SfxItemPool( "chaos", WID_CHAOS_START, WID_CHAOS_START, NULL ),
   _nRefs( 0 )
@@ -117,7 +117,7 @@ CntItemPool::CntItemPool()
     SetDefaults( pPoolDefs_Impl->GetDefaults() );
 }
 
-//-------------------------------------------------------------------------
+
 //virtual
 CntItemPool::~CntItemPool()
 {
@@ -125,7 +125,7 @@ CntItemPool::~CntItemPool()
     ReleaseDefaults( false );
 }
 
-//-------------------------------------------------------------------------
+
 // static
 CntItemPool* CntItemPool::Acquire()
 {
@@ -137,7 +137,7 @@ CntItemPool* CntItemPool::Acquire()
     return _pThePool;
 }
 
-//-------------------------------------------------------------------------
+
 // static
 sal_uInt16 CntItemPool::Release()
 {
@@ -174,7 +174,7 @@ inline void CntStaticPoolDefaults_Impl::Insert(
     m_pItemInfos[ nPos ]._nFlags = nFlags;
 }
 
-//-------------------------------------------------------------------------
+
 CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl()
 {
     for ( sal_uInt32 n = 0; n < m_nItems; ++n )
@@ -184,7 +184,7 @@ CntStaticPoolDefaults_Impl::~CntStaticPoolDefaults_Impl()
     delete [] m_pItemInfos;
 }
 
-//-------------------------------------------------------------------------
+
 CntStaticPoolDefaults_Impl::CntStaticPoolDefaults_Impl( CntItemPool* /*pPool*/ )
 : m_nItems( 1 ),
   m_ppDefaults( new SfxPoolItem* [ m_nItems ] ),
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index af7afe18f9b7..869a3c9f447a 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -132,7 +132,7 @@ void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew*
     }
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK_NOINSTANCE( SfxURLToolBoxControl_Impl, ExecuteHdl_Impl, ExecuteInfo*, pExecuteInfo )
 {
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index dfae122b03ab..aba877d15448 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -88,7 +88,7 @@ void SfxMenuControl::Bind(
 }
 
 
-//--------------------------------------------------------------------
+
 
 // binds the item to the specified menu and assignes the title
 
@@ -106,7 +106,7 @@ void SfxMenuControl::Bind(
     aTitle = rTitle;
 }
 
-//--------------------------------------------------------------------
+
 
 // Constructor for explicit registration
 
@@ -117,7 +117,7 @@ SfxMenuControl::SfxMenuControl( sal_Bool bShowStrings )
 {
 }
 
-//--------------------------------------------------------------------
+
 
 // Constructor for array
 SfxMenuControl::SfxMenuControl():
@@ -127,7 +127,7 @@ SfxMenuControl::SfxMenuControl():
 {
 }
 
-//--------------------------------------------------------------------
+
 
 SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
     SfxControllerItem(nSlotId, rBindings),
@@ -143,14 +143,14 @@ SfxMenuControl::SfxMenuControl(sal_uInt16 nSlotId, SfxBindings& rBindings):
 }
 
 
-//--------------------------------------------------------------------
+
 
 SfxMenuControl::~SfxMenuControl()
 {
     delete pSubMenu;
 }
 
-//--------------------------------------------------------------------
+
 
 // changes the state in the virtual menu
 
@@ -236,7 +236,7 @@ void SfxMenuControl::StateChanged
     pOwnMenu->CheckItem( GetId(), bCheck );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxMenuControl* SfxMenuControl::CreateImpl( sal_uInt16 /*nId*/, Menu& /*rMenu*/, SfxBindings& /*rBindings*/ )
 {
@@ -249,7 +249,7 @@ void SfxMenuControl::RegisterControl( sal_uInt16 nSlotId, SfxModule *pMod )
                 SfxMenuControl::CreateImpl, TYPE(SfxStringItem), nSlotId ) );
 }
 
-//--------------------------------------------------------------------
+
 void SfxMenuControl::RegisterMenuControl(SfxModule* pMod, SfxMenuCtrlFactory* pFact)
 {
     SFX_APP()->RegisterMenuControl_Impl( pMod, pFact );
@@ -288,7 +288,7 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 PopupMenu* SfxMenuControl::GetPopup () const
 {
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 1b189f721e2b..122d9335fef4 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -78,7 +78,7 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxMenuManager::~SfxMenuManager()
 {
@@ -87,7 +87,7 @@ SfxMenuManager::~SfxMenuManager()
     pBindings->LEAVEREGISTRATIONS();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxMenuManager::Construct( SfxVirtualMenu& rMenu )
 {
@@ -99,7 +99,7 @@ void SfxMenuManager::Construct( SfxVirtualMenu& rMenu )
     TryToHideDisabledEntries_Impl( pSvMenu );
 }
 
-//-------------------------------------------------------------------------
+
 void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs, Menu* pMenu )
 {
     SfxViewShell *pView = pBindings->GetDispatcher()->GetFrame()->GetViewShell();
@@ -203,7 +203,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
     return pThesSubMenu;
 }
 
-// ------------------------------------------------------------------------
+
 
 // executes the function for the selected item
 IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
@@ -237,7 +237,7 @@ SfxPopupMenuManager::~SfxPopupMenuManager()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxPopupMenuManager::RemoveDisabledEntries()
 {
@@ -245,7 +245,7 @@ void SfxPopupMenuManager::RemoveDisabledEntries()
         TryToHideDisabledEntries_Impl( pSVMenu );
 }
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
 {
@@ -254,7 +254,7 @@ sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPos, Window* pWindow )
     return nVal;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
 :   pMenu(0),
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index 8f1a3a1319e3..c728b471fc9f 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -166,7 +166,7 @@ void SfxVirtualMenu::Construct_Impl()
         pResMgr = pParent->pResMgr;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
                 SfxVirtualMenu* pOwnParent, Menu& rMenu, sal_Bool bWithHelp,
@@ -198,7 +198,7 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId,
     bHelpInitialized = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 // creates a virtual menu from a StarView MenuBar or PopupMenu
 
@@ -232,7 +232,7 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp,
     bHelpInitialized = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 /*  The destructor of the class SfxVirtualMenu releases bounded items and
     the associated StarView-PopupMenu is released from its parent.
@@ -283,7 +283,7 @@ SfxVirtualMenu::~SfxVirtualMenu()
     DBG_OUTF( ("SfxVirtualMenu %lx destroyed", this) );
     DBG_ASSERT( !nLocks, "destroying active menu" );
 }
-//--------------------------------------------------------------------
+
 // internal: creates the virtual menu from the pSVMenu
 
 void SfxVirtualMenu::CreateFromSVMenu()
@@ -489,7 +489,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
     pBindings->LEAVEREGISTRATIONS(); --nLocks;
 }
 
-//--------------------------------------------------------------------
+
 
 // called on activation of the SV-Menu
 
@@ -566,7 +566,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxVirtualMenu::UpdateImages( Menu* pMenu )
 {
@@ -607,7 +607,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
 {
@@ -626,7 +626,7 @@ void SfxVirtualMenu::RemoveMenuImages( Menu* pMenu )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 {
@@ -744,7 +744,7 @@ void SfxVirtualMenu::UnbindControllers()
 }
 
 
-//--------------------------------------------------------------------
+
 void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
 {
     // Create special popup menu that is filled with the 3rd party components popup menu items
@@ -781,7 +781,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
         delete pAddonMenu;
 }
 
-//--------------------------------------------------------------------
+
 
 // called on activation of the SV-Menu
 
@@ -917,7 +917,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
 {
@@ -932,7 +932,7 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu )
     }
     return sal_True;
 }
-//--------------------------------------------------------------------
+
 
 // called on activation of the SV-Menu
 
@@ -980,7 +980,7 @@ IMPL_LINK( SfxVirtualMenu, Select, Menu *, pMenu )
     return sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 // returns the associated StarView-menu
 
@@ -991,7 +991,7 @@ Menu* SfxVirtualMenu::GetSVMenu() const
     return pSVMenu;
 }
 
-//--------------------------------------------------------------------
+
 
 // set the checkmark of the specified item
 
@@ -1003,7 +1003,7 @@ void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
         pSVMenu->CheckItem( nItemId, bCheck );
 }
-//--------------------------------------------------------------------
+
 
 // set the enabled-state of the specified item
 
@@ -1016,7 +1016,7 @@ void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable )
     if (pSVMenu->GetItemPos( nItemId ) != MENU_ITEM_NOTFOUND )
         pSVMenu->EnableItem( nItemId, bEnable );
 }
-//--------------------------------------------------------------------
+
 
 // set the text of the specified item
 
@@ -1029,7 +1029,7 @@ void SfxVirtualMenu::SetItemText( sal_uInt16 nItemId, const OUString& rText )
         pSVMenu->SetItemText( nItemId, rText );
 }
 
-//--------------------------------------------------------------------
+
 
 
 void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
@@ -1046,7 +1046,7 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 // Forces the initialization, which is otherwise only happens in Activate
 
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 4ed2da689951..5c49ba694b9f 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -47,16 +47,16 @@
 #include <sfx2/frame.hxx>
 #include <macroloader.hxx>
 
-//--------------------------------------------------------------------------------------------------------
+
 
 #define MACRO_PRFIX         "macro://"
 #define MACRO_POSTFIX       "()"
 
 using namespace css;
 
-//--------------------------------------------------------------------------------------------------------
+
     //  --- XNameReplace ---
-//--------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::Any & rElement )
                                 throw( lang::IllegalArgumentException, container::NoSuchElementException,
                                        lang::WrappedTargetException, uno::RuntimeException )
@@ -112,9 +112,9 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUString & aName, const uno::
     throw container::NoSuchElementException();
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  --- XNameAccess ---
-//--------------------------------------------------------------------------------------------------------
+
 uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName )
                                 throw( container::NoSuchElementException, lang::WrappedTargetException,
                                        uno::RuntimeException )
@@ -134,13 +134,13 @@ uno::Any SAL_CALL SfxEvents_Impl::getByName( const OUString& aName )
     throw container::NoSuchElementException();
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL SfxEvents_Impl::getElementNames() throw ( uno::RuntimeException )
 {
     return maEventNames;
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -158,16 +158,16 @@ sal_Bool SAL_CALL SfxEvents_Impl::hasByName( const OUString& aName ) throw ( uno
     return sal_False;
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 //  --- XElementAccess ( parent of XNameAccess ) ---
-//--------------------------------------------------------------------------------------------------------
+
 uno::Type SAL_CALL SfxEvents_Impl::getElementType() throw ( uno::RuntimeException )
 {
     uno::Type aElementType = ::getCppuType( (const uno::Sequence < beans::PropertyValue > *)0 );
     return aElementType;
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxEvents_Impl::hasElements() throw ( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -271,9 +271,9 @@ void SfxEvents_Impl::Execute( uno::Any& aEventData, const document::DocumentEven
     }
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 // --- ::document::XEventListener ---
-//--------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException )
 {
     ::osl::ClearableMutexGuard aGuard( maMutex );
@@ -301,9 +301,9 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent )
     Execute( aEventData, document::DocumentEvent(aEvent.Source, aEvent.EventName, NULL, uno::Any()), mpObjShell );
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 // --- ::lang::XEventListener ---
-//--------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) throw( uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -315,8 +315,8 @@ void SAL_CALL SfxEvents_Impl::disposing( const lang::EventObject& /*Source*/ ) t
     }
 }
 
-//--------------------------------------------------------------------------------------------------------
-//--------------------------------------------------------------------------------------------------------
+
+
 SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell,
                                 uno::Reference< document::XEventBroadcaster > xBroadcaster )
 {
@@ -335,12 +335,12 @@ SfxEvents_Impl::SfxEvents_Impl( SfxObjectShell* pShell,
         mxBroadcaster->addEventListener( this );
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 SfxEvents_Impl::~SfxEvents_Impl()
 {
 }
 
-//--------------------------------------------------------------------------------------------------------
+
 SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShell* pObjShell, sal_Bool bNormalizeMacro )
 {
     SvxMacro* pMacro = NULL;
diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx
index 367e8adf700a..c02bab054160 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -227,7 +227,7 @@ uno::Any SAL_CALL ModelCollectionEnumeration::nextElement()
     return uno::makeAny(xModel);
 }
 
-//-----------------------------------------------------------------------------
+
 SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XComponentContext >& rxContext)
     : ModelCollectionMutexBase(       )
     , m_xJobExecutorListener( task::theJobExecutor::get( rxContext ), uno::UNO_QUERY_THROW )
@@ -242,12 +242,12 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const uno::Reference < uno::XCompone
     m_refCount--;
 }
 
-//-----------------------------------------------------------------------------
+
 SfxGlobalEvents_Impl::~SfxGlobalEvents_Impl()
 {
 }
 
-//-----------------------------------------------------------------------------
+
 uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEvents()
     throw(uno::RuntimeException)
 {
@@ -257,7 +257,7 @@ uno::Reference< container::XNameReplace > SAL_CALL SfxGlobalEvents_Impl::getEven
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< document::XEventListener >& xListener)
     throw(uno::RuntimeException)
 {
@@ -265,7 +265,7 @@ void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const uno::Reference< docum
     m_aLegacyListeners.addInterface(xListener);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< document::XEventListener >& xListener)
     throw(uno::RuntimeException)
 {
@@ -273,21 +273,21 @@ void SAL_CALL SfxGlobalEvents_Impl::removeEventListener(const uno::Reference< do
     m_aLegacyListeners.removeInterface(xListener);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::addDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener )
     throw(uno::RuntimeException)
 {
     m_aDocumentListeners.addInterface( _Listener );
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::removeDocumentEventListener( const uno::Reference< document::XDocumentEventListener >& _Listener )
     throw(uno::RuntimeException)
 {
     m_aDocumentListeners.removeInterface( _Listener );
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_EventName*/,
         const uno::Reference< frame::XController2 >& /*_ViewController*/, const uno::Any& /*_Supplement*/ )
         throw (lang::IllegalArgumentException, lang::NoSupportException, uno::RuntimeException)
@@ -296,7 +296,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyDocumentEvent( const OUString& /*_Even
     throw lang::NoSupportException(OUString(), *this);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEvent)
     throw(uno::RuntimeException)
 {
@@ -306,7 +306,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const document::EventObject& aEv
     implts_notifyListener(aDocEvent);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::DocumentEvent& _Event )
     throw (uno::RuntimeException)
 {
@@ -315,7 +315,7 @@ void SAL_CALL SfxGlobalEvents_Impl::documentEventOccured( const document::Docume
     implts_notifyListener(_Event);
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent)
     throw(uno::RuntimeException)
 {
@@ -330,7 +330,7 @@ void SAL_CALL SfxGlobalEvents_Impl::disposing(const lang::EventObject& aEvent)
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement)
     throw (uno::RuntimeException)
 {
@@ -350,7 +350,7 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement)
     return bHas;
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement )
     throw (lang::IllegalArgumentException  ,
            container::ElementExistException,
@@ -387,7 +387,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const uno::Any& aElement )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement )
     throw (lang::IllegalArgumentException   ,
            container::NoSuchElementException,
@@ -424,7 +424,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const uno::Any& aElement )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createEnumeration()
     throw (uno::RuntimeException)
 {
@@ -441,14 +441,14 @@ uno::Reference< container::XEnumeration > SAL_CALL SfxGlobalEvents_Impl::createE
     return xEnum;
 }
 
-//-----------------------------------------------------------------------------
+
 uno::Type SAL_CALL SfxGlobalEvents_Impl::getElementType()
     throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast< uno::Reference< frame::XModel >* >(NULL));
 }
 
-//-----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxGlobalEvents_Impl::hasElements()
     throw (uno::RuntimeException)
 {
@@ -458,7 +458,7 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::hasElements()
     // <- SAFE
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxGlobalEvents_Impl::implts_notifyJobExecution(const document::EventObject& aEvent)
 {
     try
@@ -471,7 +471,7 @@ void SfxGlobalEvents_Impl::implts_notifyJobExecution(const document::EventObject
         {}
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const document::DocumentEvent& aEvent)
 {
     try
@@ -497,7 +497,7 @@ void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const document::D
     }
 }
 
-//-----------------------------------------------------------------------------
+
 void SfxGlobalEvents_Impl::implts_notifyListener(const document::DocumentEvent& aEvent)
 {
     // containers are threadsafe
@@ -507,7 +507,7 @@ void SfxGlobalEvents_Impl::implts_notifyListener(const document::DocumentEvent&
     m_aDocumentListeners.notifyEach( &document::XDocumentEventListener::documentEventOccured, aEvent );
 }
 
-//-----------------------------------------------------------------------------
+
 // not threadsafe ... must be locked from outside!
 TModelList::iterator SfxGlobalEvents_Impl::impl_searchDoc(const uno::Reference< frame::XModel >& xModel)
 {
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 359a8a831506..fddafb36f30c 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -23,7 +23,7 @@
 #include <sfx2/app.hxx>
 #include "sfxtypes.hxx"
 
-//--------------------------------------------------------------------
+
 
 SfxHintPoster::SfxHintPoster( const GenLink& rLink ):
     aLink(rLink)
@@ -31,13 +31,13 @@ SfxHintPoster::SfxHintPoster( const GenLink& rLink ):
 }
 
 
-//--------------------------------------------------------------------
+
 
 SfxHintPoster::~SfxHintPoster()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxHintPoster::Post( SfxHint* pHintToPost )
 {
@@ -45,7 +45,7 @@ void SfxHintPoster::Post( SfxHint* pHintToPost )
     AddRef();
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
 {
@@ -55,14 +55,14 @@ IMPL_LINK_INLINE_START( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
 }
 IMPL_LINK_INLINE_END( SfxHintPoster, DoEvent_Impl, SfxHint *, pPostedHint )
 
-//--------------------------------------------------------------------
+
 
 void SfxHintPoster::Event( SfxHint* pPostedHint )
 {
     aLink.Call( pPostedHint );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxHintPoster::SetEventHdl( const GenLink& rLink )
 {
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index c03b48284fd6..4c5c34758d58 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -50,7 +50,7 @@
 
 using namespace ::com::sun::star;
 
-//--------------------------------------------------------------------
+
 
 sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouseButtons )
 {
@@ -66,7 +66,7 @@ sal_uInt16 SfxStatusBarControl::convertAwtToVCLMouseButtons( sal_Int16 nAwtMouse
     return nVCLMouseButtons;
 }
 
-//--------------------------------------------------------------------
+
 
 svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     const uno::Reference< frame::XFrame >& rFrame,
@@ -128,7 +128,7 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory(
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxStatusBarControl::SfxStatusBarControl
 (
@@ -161,7 +161,7 @@ SfxStatusBarControl::SfxStatusBarControl
 {
 }
 
-//--------------------------------------------------------------------
+
 
 SfxStatusBarControl::~SfxStatusBarControl()
 
@@ -173,7 +173,7 @@ SfxStatusBarControl::~SfxStatusBarControl()
 
 {}
 
-//--------------------------------------------------------------------
+
 // XInterface
 uno::Any SAL_CALL SfxStatusBarControl::queryInterface( const uno::Type & rType )
 throw( uno::RuntimeException)
@@ -191,7 +191,7 @@ void SAL_CALL SfxStatusBarControl::release() throw()
     OWeakObject::release();
 }
 
-//--------------------------------------------------------------------
+
 // XEventListener
 void SAL_CALL SfxStatusBarControl::disposing( const lang::EventObject& aEvent )
 throw( uno::RuntimeException )
@@ -199,7 +199,7 @@ throw( uno::RuntimeException )
     svt::StatusbarController::disposing( aEvent );
 }
 
-//--------------------------------------------------------------------
+
 // XComponent
 void SAL_CALL SfxStatusBarControl::dispose()
 throw (uno::RuntimeException)
@@ -207,7 +207,7 @@ throw (uno::RuntimeException)
     svt::StatusbarController::dispose();
 }
 
-//--------------------------------------------------------------------
+
 // XStatusListener
 void SAL_CALL SfxStatusBarControl::statusChanged( const frame::FeatureStateEvent& rEvent )
 throw ( ::com::sun::star::uno::RuntimeException )
@@ -313,7 +313,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
     }
 }
 
-//--------------------------------------------------------------------
+
 // XStatusbarController
 
 ::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonDown(
@@ -332,7 +332,7 @@ throw ( uno::RuntimeException )
     return MouseButtonDown( aMouseEvent );
 }
 
-//--------------------------------------------------------------------
+
 
 ::sal_Bool SAL_CALL SfxStatusBarControl::mouseMove(
     const awt::MouseEvent& rMouseEvent )
@@ -349,7 +349,7 @@ throw (uno::RuntimeException)
     return MouseMove( aMouseEvent );
 }
 
-//--------------------------------------------------------------------
+
 
 ::sal_Bool SAL_CALL SfxStatusBarControl::mouseButtonUp(
     const ::awt::MouseEvent& rMouseEvent )
@@ -366,7 +366,7 @@ throw ( uno::RuntimeException )
     return MouseButtonUp( aMouseEvent );
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL SfxStatusBarControl::command(
     const awt::Point& rPos,
@@ -382,7 +382,7 @@ throw (::com::sun::star::uno::RuntimeException)
     Command( aCmdEvent );
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL SfxStatusBarControl::paint(
     const uno::Reference< awt::XGraphics >& xGraphics,
@@ -401,7 +401,7 @@ throw ( ::uno::RuntimeException )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL SfxStatusBarControl::click( const awt::Point& )
 throw ( uno::RuntimeException )
@@ -410,7 +410,7 @@ throw ( uno::RuntimeException )
     Click();
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL SfxStatusBarControl::doubleClick( const awt::Point& )
 throw ( uno::RuntimeException )
@@ -419,9 +419,9 @@ throw ( uno::RuntimeException )
     DoubleClick();
 }
 
-//--------------------------------------------------------------------
+
 // old sfx2 interface
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::StateChanged
 (
@@ -457,7 +457,7 @@ void SfxStatusBarControl::StateChanged
     }
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
 
@@ -484,7 +484,7 @@ sal_Bool SfxStatusBarControl::MouseButtonDown( const MouseEvent & )
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
 
@@ -511,7 +511,7 @@ sal_Bool SfxStatusBarControl::MouseMove( const MouseEvent & )
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
 
@@ -538,7 +538,7 @@ sal_Bool SfxStatusBarControl::MouseButtonUp( const MouseEvent & )
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::Command( const CommandEvent& )
 
@@ -553,7 +553,7 @@ void SfxStatusBarControl::Command( const CommandEvent& )
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::Click()
 
@@ -568,7 +568,7 @@ void SfxStatusBarControl::Click()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::DoubleClick()
 
@@ -583,7 +583,7 @@ void SfxStatusBarControl::DoubleClick()
     execute( aArgs );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::Paint
 (
@@ -603,19 +603,19 @@ void SfxStatusBarControl::Paint
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::CaptureMouse()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxStatusBarControl::ReleaseMouse()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 SfxStatusBarControl* SfxStatusBarControl::CreateControl
 (
@@ -662,11 +662,11 @@ SfxStatusBarControl* SfxStatusBarControl::CreateControl
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 void SfxStatusBarControl::RegisterStatusBarControl(SfxModule* pMod, SfxStbCtrlFactory* pFact)
 {
     SFX_APP()->RegisterStatusBarControl_Impl( pMod, pFact );
 }
-//--------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index e4f06128f2db..cc18a8700fae 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -153,7 +153,7 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule )
     m_bAppEventListener = true;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxImageManager_Impl::~SfxImageManager_Impl()
 {
@@ -164,7 +164,7 @@ SfxImageManager_Impl::~SfxImageManager_Impl()
         delete m_aToolBoxes[i];
 }
 
-//-------------------------------------------------------------------------
+
 
 ImageList* SfxImageManager_Impl::GetImageList( bool bBig )
 {
@@ -180,7 +180,7 @@ ImageList* SfxImageManager_Impl::GetImageList( bool bBig )
     return m_pImageList[nIndex];
 }
 
-//-------------------------------------------------------------------------
+
 
 Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig )
 {
@@ -190,7 +190,7 @@ Image SfxImageManager_Impl::GetImage( sal_uInt16 nId, bool bBig )
     return Image();
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
 {
@@ -236,7 +236,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl)
 {
@@ -244,7 +244,7 @@ IMPL_LINK_NOARG(SfxImageManager_Impl, OptionsChanged_Impl)
     return 0L;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent)
 {
@@ -274,7 +274,7 @@ IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent)
     return 0L;
 }
 
-//-------------------------------------------------------------------------
+
 
 //=========================================================================
 
@@ -283,13 +283,13 @@ SfxImageManager::SfxImageManager( SfxModule* pModule )
     pImp = ::GetImageManager( pModule );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxImageManager::~SfxImageManager()
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 namespace
 {
@@ -317,7 +317,7 @@ SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
     return pSfxImageManager;
 }
 
-//-------------------------------------------------------------------------
+
 
 Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const
 {
@@ -327,7 +327,7 @@ Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const
     return Image();
 }
 
-//-------------------------------------------------------------------------
+
 
 Image SfxImageManager::GetImage( sal_uInt16 nId ) const
 {
@@ -335,7 +335,7 @@ Image SfxImageManager::GetImage( sal_uInt16 nId ) const
     return GetImage( nId, bLarge );
 }
 
-//-------------------------------------------------------------------------
+
 
 Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const
 {
@@ -352,7 +352,7 @@ Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const
     return Image();
 }
 
-//-------------------------------------------------------------------------
+
 
 Image SfxImageManager::SeekImage( sal_uInt16 nId ) const
 {
@@ -360,7 +360,7 @@ Image SfxImageManager::SeekImage( sal_uInt16 nId ) const
     return SeekImage( nId, bLarge );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags )
 {
@@ -372,7 +372,7 @@ void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags )
     pImp->m_aToolBoxes.push_back( pInf );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
 {
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index b51353c97617..efaeed328b08 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -218,7 +218,7 @@ IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclSimpleEvent*, pEvent
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxToolBoxControl::SfxToolBoxControl(
     sal_uInt16          nSlotID,
@@ -239,7 +239,7 @@ SfxToolBoxControl::SfxToolBoxControl(
     pImpl->mpPopupWindow = 0;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxToolBoxControl::~SfxToolBoxControl()
 {
@@ -252,7 +252,7 @@ SfxToolBoxControl::~SfxToolBoxControl()
     delete pImpl;
 }
 
-//--------------------------------------------------------------------
+
 
 ToolBox& SfxToolBoxControl::GetToolBox() const
 {
@@ -267,7 +267,7 @@ unsigned short SfxToolBoxControl::GetSlotId() const
     return pImpl->nSlotId;
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::RuntimeException)
 {
@@ -302,7 +302,7 @@ void SAL_CALL SfxToolBoxControl::dispose() throw (::com::sun::star::uno::Runtime
     pImpl->mpPopupWindow = 0;
 }
 
-//--------------------------------------------------------------------
+
 void SfxToolBoxControl::RegisterToolBoxControl( SfxModule* pMod, SfxTbxCtrlFactory* pFact)
 {
     SFX_APP()->RegisterToolBoxControl_Impl( pMod, pFact );
@@ -865,7 +865,7 @@ void SfxToolBoxControl::createAndPositionSubToolBar( const OUString& rSubToolBar
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow )
 {
@@ -874,7 +874,7 @@ void SfxToolBoxControl::SetPopupWindow( SfxPopupWindow* pWindow )
     pImpl->mpPopupWindow->SetDeleteLink_Impl( LINK( this, SfxToolBoxControl, ClosePopupWindow ));
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
 {
@@ -899,7 +899,7 @@ IMPL_LINK_NOARG(SfxToolBoxControl, PopupModeEndHdl)
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow )
 {
     if ( pWindow == pImpl->mpFloatingWindow )
@@ -910,7 +910,7 @@ IMPL_LINK( SfxToolBoxControl, ClosePopupWindow, SfxPopupWindow *, pWindow )
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxToolBoxControl::StateChanged
 (
@@ -965,7 +965,7 @@ void SfxToolBoxControl::StateChanged
     pImpl->pBox->SetItemBits( GetId(), nItemBits );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxToolBoxControl::Select( sal_uInt16 nModifier )
 {
@@ -973,33 +973,33 @@ void SfxToolBoxControl::Select( sal_uInt16 nModifier )
     Select( sal_Bool((nModifier & KEY_MOD1)!=0) );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxToolBoxControl::Select( sal_Bool /*bMod1*/ )
 {
     svt::ToolboxController::execute( pImpl->nSelectModifier );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxToolBoxControl::DoubleClick()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxToolBoxControl::Click()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindowType SfxToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_NONE;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindow* SfxToolBoxControl::CreatePopupWindow()
 {
@@ -1011,14 +1011,14 @@ SfxPopupWindow* SfxToolBoxControl::CreatePopupWindowCascading()
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 Window* SfxToolBoxControl::CreateItemWindow( Window * )
 {
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxFrameStatusListener::SfxFrameStatusListener(
     const Reference< XComponentContext >& rxContext,
@@ -1029,13 +1029,13 @@ SfxFrameStatusListener::SfxFrameStatusListener(
 {
 }
 
-//--------------------------------------------------------------------
+
 
 SfxFrameStatusListener::~SfxFrameStatusListener()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 // XStatusListener
 void SAL_CALL SfxFrameStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent )
@@ -1152,7 +1152,7 @@ throw ( ::com::sun::star::uno::RuntimeException )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindow::SfxPopupWindow(
     sal_uInt16 nId,
@@ -1170,7 +1170,7 @@ SfxPopupWindow::SfxPopupWindow(
         ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindow::SfxPopupWindow(
     sal_uInt16 nId,
@@ -1188,7 +1188,7 @@ SfxPopupWindow::SfxPopupWindow(
         ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindow::SfxPopupWindow(
     sal_uInt16 nId,
@@ -1224,7 +1224,7 @@ SfxPopupWindow::SfxPopupWindow(
         ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindow::~SfxPopupWindow()
 {
@@ -1239,7 +1239,7 @@ SfxPopupWindow::~SfxPopupWindow()
         ((SystemWindow *)pWindow)->GetTaskPaneList()->RemoveWindow( this );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener()
 {
@@ -1256,7 +1256,7 @@ SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener()
     return m_pStatusListener;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::BindListener()
 {
@@ -1265,7 +1265,7 @@ void SfxPopupWindow::BindListener()
         m_pStatusListener->bindListener();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::UnbindListener()
 {
@@ -1274,7 +1274,7 @@ void SfxPopupWindow::UnbindListener()
         m_pStatusListener->unbindListener();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL )
 {
@@ -1283,7 +1283,7 @@ void SfxPopupWindow::AddStatusListener( const OUString& rCommandURL )
         m_pStatusListener->addStatusListener( rCommandURL );
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxPopupWindow::Close()
 {
@@ -1294,7 +1294,7 @@ bool SfxPopupWindow::Close()
     return true;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::PopupModeEnd()
 {
@@ -1311,7 +1311,7 @@ void SfxPopupWindow::PopupModeEnd()
         Close();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::DeleteFloatingWindow()
 {
@@ -1322,7 +1322,7 @@ void SfxPopupWindow::DeleteFloatingWindow()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
 {
@@ -1348,14 +1348,14 @@ void SfxPopupWindow::MouseMove( const ::MouseEvent& rMEvt )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::StartCascading()
 {
     m_bCascading= sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPopupWindow* SfxPopupWindow::Clone() const
 
@@ -1373,7 +1373,7 @@ SfxPopupWindow* SfxPopupWindow::Clone() const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::StateChanged(
     sal_uInt16 /*nSID*/,
@@ -1400,7 +1400,7 @@ void SfxPopupWindow::StateChanged(
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPopupWindow::Delete()
 {
@@ -1409,7 +1409,7 @@ void SfxPopupWindow::Delete()
     delete this;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxRecentFilesToolBoxControl::SfxRecentFilesToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox )
     : SfxToolBoxControl( nSlotId, nId, rBox )
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index f565c8b54a2c..099e0907caa6 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -84,7 +84,7 @@ SvCompatWeakHdl* SfxFrame::GetHdl()
     return pImp->GetHdl();
 }
 
-//--------------------------------------------------------------------
+
 void SfxFrame::Construct_Impl()
 {
     pImp = new SfxFrame_Impl( this );
@@ -93,7 +93,7 @@ void SfxFrame::Construct_Impl()
     pFramesArr_Impl->push_back( this );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxFrame::~SfxFrame()
 {
@@ -240,7 +240,7 @@ bool SfxFrame::PrepareClose_Impl( sal_Bool bUI )
     return nRet;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const
 {
@@ -458,7 +458,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell *pDoc )
     pSet->Put( SfxStringItem( SID_FILTER_NAME, aFilter ));
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxFrameDescriptor* SfxFrame::GetDescriptor() const
 {
@@ -475,7 +475,7 @@ SfxFrameDescriptor* SfxFrame::GetDescriptor() const
     return pImp->pDescr;
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxFrame::GetTargetList( TargetList& rList ) const
 {
@@ -501,7 +501,7 @@ void SfxFrame::GetTargetList( TargetList& rList ) const
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const
 {
@@ -554,7 +554,7 @@ bool SfxFrameItem::operator==( const SfxPoolItem &rItem ) const
          ((SfxFrameItem&)rItem).wFrame == wFrame;
 }
 
-//--------------------------------------------------------------------
+
 
 OUString SfxFrameItem::GetValueText() const
 {
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 9e2d9f6b0043..9bcba34d75c5 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -60,7 +60,7 @@ using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::lang::XComponent;
 using ::com::sun::star::frame::XComponentLoader;
 
-//------------------------------------------------------------------------
+
 
 class SfxFrameWindow_Impl : public Window
 {
diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx
index ddb17a1c4316..01f146aca582 100644
--- a/sfx2/source/view/frmload.cxx
+++ b/sfx2/source/view/frmload.cxx
@@ -117,9 +117,9 @@ public:
     virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
         throw (css::uno::RuntimeException);
 
-    //----------------------------------------------------------------------------------
+
     // XSynchronousFrameLoader
-    //----------------------------------------------------------------------------------
+
     virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException );
     virtual void SAL_CALL cancel() throw( css::uno::RuntimeException );
 
@@ -206,7 +206,7 @@ SfxFrameLoader_Impl::~SfxFrameLoader_Impl()
 {
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& sURL,
         const ::comphelper::NamedValueCollection& i_rDescriptor, const SfxFilterMatcher& rMatcher ) const
 {
@@ -253,7 +253,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_detectFilterForURL( const OUString& s
     return pFilter;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( const OUString& i_rServiceName ) const
 {
     try
@@ -298,7 +298,7 @@ const SfxFilter* SfxFrameLoader_Impl::impl_getFilterFromServiceName_nothrow( con
     return NULL;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInteractionHandler >& i_rxHandler,
                                                                  const OUString& i_rDocumentURL ) const
 {
@@ -320,7 +320,7 @@ OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInter
     return sFilterName;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 namespace
 {
     sal_Bool lcl_getDispatchResult( const SfxPoolItem* _pResult )
@@ -342,7 +342,7 @@ namespace
     }
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame,
                                                               const bool i_bHidden )
 {
@@ -353,7 +353,7 @@ sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _
     return lcl_getDispatchResult( SFX_APP()->ExecuteSlot( aRequest ) );
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollection& io_rDescriptor ) const
 {
     const OUString     sURL         = io_rDescriptor.getOrDefault( "URL",                OUString() );
@@ -402,7 +402,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti
     }
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XModel2 >& i_rxDocument ) const
 {
     for ( SfxObjectShell* pDoc = SfxObjectShell::GetFirst( NULL, sal_False ); pDoc; pDoc = SfxObjectShell::GetNext( *pDoc, NULL, sal_False ) )
@@ -417,7 +417,7 @@ SfxObjectShellRef SfxFrameLoader_Impl::impl_findObjectShell( const Reference< XM
     return NULL;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedValueCollection& io_rDescriptor ) const
 {
     try
@@ -468,7 +468,7 @@ bool SfxFrameLoader_Impl::impl_determineTemplateDocument( ::comphelper::NamedVal
     return false;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryURL ) const
 {
     OUString sSlotParam;
@@ -487,7 +487,7 @@ sal_uInt16 SfxFrameLoader_Impl::impl_findSlotParam( const OUString& i_rFactoryUR
     return 0;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtError, const ::comphelper::NamedValueCollection& i_rDescriptor ) const
 {
     try
@@ -519,7 +519,7 @@ void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtEr
     }
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCollection& io_rDescriptor )
 {
     // remove the arguments which are for the loader only, and not for a call to attachResource
@@ -527,7 +527,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo
     io_rDescriptor.remove( "Model" );
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 ::comphelper::NamedValueCollection SfxFrameLoader_Impl::impl_extractViewCreationArgs( ::comphelper::NamedValueCollection& io_rDescriptor )
 {
     const sal_Char* pKnownViewArgs[] = {
@@ -546,7 +546,7 @@ void SfxFrameLoader_Impl::impl_removeLoaderArguments( ::comphelper::NamedValueCo
     return aViewArgs;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxObjectShell& i_rDocument, const ::comphelper::NamedValueCollection& i_rDescriptor )
 {
     sal_Int16 nViewId = i_rDescriptor.getOrDefault( "ViewId", sal_Int16( 0 ) );
@@ -592,7 +592,7 @@ sal_Int16 SfxFrameLoader_Impl::impl_determineEffectiveViewId_nothrow( const SfxO
     return nViewId;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Reference< XModel2 >& i_rModel,
         const Reference< XFrame >& i_rFrame, const ::comphelper::NamedValueCollection& i_rViewFactoryArgs,
         const OUString& i_rViewName )
@@ -614,7 +614,7 @@ Reference< XController2 > SfxFrameLoader_Impl::impl_createDocumentView( const Re
     return xController;
 }
 
-// --------------------------------------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rArgs,
                                              const Reference< XFrame >& _rTargetFrame )
     throw( RuntimeException )
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 98c61b4c8902..518bdc9888fc 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -89,7 +89,7 @@ public:
 //====================================================================
 // SfxInPlaceClient_Impl
 
-//--------------------------------------------------------------------
+
 class SfxInPlaceClient_Impl : public ::cppu::WeakImplHelper5< embed::XEmbeddedClient,
                                                               embed::XInplaceClient,
                                                               document::XEventListener,
@@ -206,7 +206,7 @@ throw (::com::sun::star::uno::RuntimeException)
 }
 
 // XEmbeddedClient
-//--------------------------------------------------------------------
+
 uno::Reference < frame::XFrame > SfxInPlaceClient_Impl::GetFrame() const
 {
     if ( !m_pClient )
@@ -309,7 +309,7 @@ void SAL_CALL SfxInPlaceClient_Impl::saveObject()
     // m_pClient->Invalidate();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible )
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -325,7 +325,7 @@ void SAL_CALL SfxInPlaceClient_Impl::visibilityChanged( sal_Bool bVisible )
 
 
 // XInplaceClient
-//--------------------------------------------------------------------
+
 sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate()
     throw ( uno::RuntimeException )
 {
@@ -339,7 +339,7 @@ sal_Bool SAL_CALL SfxInPlaceClient_Impl::canInplaceActivate()
     return sal_True;
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::activatingInplace()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -350,7 +350,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingInplace()
     m_pClient->GetViewShell()->InplaceActivating( m_pClient );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::activatingUI()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -363,7 +363,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI()
     m_pClient->GetViewShell()->UIActivating( m_pClient );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -374,7 +374,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedInplace()
     m_pClient->GetViewShell()->InplaceDeactivated( m_pClient );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -386,7 +386,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI()
     m_bUIActive = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceClient_Impl::getLayoutManager()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -409,7 +409,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SfxInPlaceCli
     return xMan;
 }
 
-//--------------------------------------------------------------------
+
 uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getInplaceDispatchProvider()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -417,7 +417,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SfxInPlaceClient_Impl::getIn
     return uno::Reference < frame::XDispatchProvider >( GetFrame(), uno::UNO_QUERY_THROW );
 }
 
-//--------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -434,7 +434,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getPlacement()
     return AWTRectangle( aRealObjArea );
 }
 
-//--------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -451,7 +451,7 @@ awt::Rectangle SAL_CALL SfxInPlaceClient_Impl::getClipRectangle()
     return AWTRectangle( aRealObjArea );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ )
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -462,7 +462,7 @@ void SAL_CALL SfxInPlaceClient_Impl::translateAccelerators( const uno::Sequence<
     // TODO/MBA: keyboard accelerators
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/ )
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -471,7 +471,7 @@ void SAL_CALL SfxInPlaceClient_Impl::scrollObject( const awt::Size& /*aOffset*/
         throw uno::RuntimeException();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPosRect )
     throw ( embed::WrongStateException,
             uno::Exception,
@@ -523,7 +523,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo
 }
 
 // XComponentSupplier
-//--------------------------------------------------------------------
+
 uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent()
     throw ( uno::RuntimeException )
 {
@@ -544,7 +544,7 @@ uno::Reference< util::XCloseable > SAL_CALL SfxInPlaceClient_Impl::getComponent(
 
 
 // XWindowSupplier
-//--------------------------------------------------------------------
+
 uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow()
     throw ( uno::RuntimeException )
 {
@@ -555,7 +555,7 @@ uno::Reference< awt::XWindow > SAL_CALL SfxInPlaceClient_Impl::getWindow()
     return xWin;
 }
 
-//--------------------------------------------------------------------
+
 // notification to the client implementation that either the object area or the scaling has been changed
 // as a result the logical size of the window has changed also
 void SfxInPlaceClient_Impl::SizeHasChanged()
@@ -594,7 +594,7 @@ void SfxInPlaceClient_Impl::SizeHasChanged()
     }
 }
 
-//--------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl)
 {
     if ( m_pClient && m_xObject.is() )
@@ -606,7 +606,7 @@ IMPL_LINK_NOARG(SfxInPlaceClient_Impl, TimerHdl)
 //====================================================================
 // SfxInPlaceClient
 
-//--------------------------------------------------------------------
+
 SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal_Int64 nAspect ) :
     m_pImp( new SfxInPlaceClient_Impl ),
     m_pViewSh( pViewShell ),
@@ -622,7 +622,7 @@ SfxInPlaceClient::SfxInPlaceClient( SfxViewShell* pViewShell, Window *pDraw, sal
     m_pImp->m_aTimer.SetTimeoutHdl( LINK( m_pImp, SfxInPlaceClient_Impl, TimerHdl ) );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxInPlaceClient::~SfxInPlaceClient()
 {
@@ -644,7 +644,7 @@ SfxInPlaceClient::~SfxInPlaceClient()
     // must be guarded with mutex
 }
 
-//--------------------------------------------------------------------
+
 void SfxInPlaceClient::SetObjectState( sal_Int32 nState )
 {
     if ( GetObject().is() )
@@ -665,7 +665,7 @@ void SfxInPlaceClient::SetObjectState( sal_Int32 nState )
     }
 }
 
-//--------------------------------------------------------------------
+
 sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const
 {
     if ( GetObject().is() )
@@ -673,13 +673,13 @@ sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 uno::Reference < embed::XEmbeddedObject > SfxInPlaceClient::GetObject() const
 {
     return m_pImp->m_xObject;
 }
 
-//--------------------------------------------------------------------
+
 void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject >& rObject )
 {
     if ( m_pImp->m_xObject.is() && rObject != m_pImp->m_xObject )
@@ -730,7 +730,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
         m_pImp->m_aTimer.Stop();
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
 {
     if( rArea != m_pImp->m_aObjArea )
@@ -745,7 +745,7 @@ sal_Bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea )
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 Rectangle SfxInPlaceClient::GetObjArea() const
 {
     return m_pImp->m_aObjArea;
@@ -759,7 +759,7 @@ Rectangle SfxInPlaceClient::GetScaledObjArea() const
     return aRealObjArea;
 }
 
-//--------------------------------------------------------------------
+
 void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight )
 {
     if ( m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight )
@@ -775,7 +775,7 @@ void SfxInPlaceClient::SetSizeScale( const Fraction & rScaleWidth, const Fractio
     }
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fraction& rScaleWidth, const Fraction& rScaleHeight )
 {
     if( rArea != m_pImp->m_aObjArea || m_pImp->m_aScaleWidth != rScaleWidth || m_pImp->m_aScaleHeight != rScaleHeight )
@@ -793,19 +793,19 @@ sal_Bool SfxInPlaceClient::SetObjAreaAndScale( const Rectangle& rArea, const Fra
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 const Fraction& SfxInPlaceClient::GetScaleWidth() const
 {
     return m_pImp->m_aScaleWidth;
 }
 
-//--------------------------------------------------------------------
+
 const Fraction& SfxInPlaceClient::GetScaleHeight() const
 {
     return m_pImp->m_aScaleHeight;
 }
 
-//--------------------------------------------------------------------
+
 void SfxInPlaceClient::Invalidate()
 {
     // TODO/LATER: do we need both?
@@ -819,7 +819,7 @@ void SfxInPlaceClient::Invalidate()
     ViewChanged();
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxInPlaceClient::IsObjectUIActive() const
 {
     try {
@@ -831,7 +831,7 @@ sal_Bool SfxInPlaceClient::IsObjectUIActive() const
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const
 {
     try {
@@ -852,7 +852,7 @@ sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject )
 {
     for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) )
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index a0d0168872bd..8c22941bbc4e 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -83,7 +83,7 @@ SfxPrinter* SfxPrinter::Create( SvStream& rStream, SfxItemSet* pOptions )
     return pPrinter;
 }
 
-//--------------------------------------------------------------------
+
 
 SvStream& SfxPrinter::Store( SvStream& rStream ) const
 
@@ -96,7 +96,7 @@ SvStream& SfxPrinter::Store( SvStream& rStream ) const
     return WriteJobSetup( rStream, GetJobSetup() );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) :
 
@@ -112,7 +112,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) :
     pImpl = new SfxPrinter_Impl;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
                         const JobSetup& rTheOrigJobSetup ) :
@@ -128,7 +128,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
         SetJobSetup( rTheOrigJobSetup );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
                         const OUString& rPrinterName ) :
@@ -141,7 +141,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
     pImpl = new SfxPrinter_Impl;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) :
 
@@ -160,7 +160,7 @@ SfxPrinter::SfxPrinter( const SfxPrinter& rPrinter ) :
     pImpl->mbRange = rPrinter.pImpl->mbRange;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrinter* SfxPrinter::Clone() const
 {
@@ -181,7 +181,7 @@ SfxPrinter* SfxPrinter::Clone() const
         return new SfxPrinter( *this );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrinter::~SfxPrinter()
 {
@@ -189,14 +189,14 @@ SfxPrinter::~SfxPrinter()
     delete pImpl;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPrinter::SetOptions( const SfxItemSet &rNewOptions )
 {
     pOptions->Set(rNewOptions);
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent,
                                               SfxViewShell *pViewShell,
@@ -221,7 +221,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(Window *pParent,
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
 {
@@ -230,7 +230,7 @@ SfxPrintOptionsDialog::~SfxPrintOptionsDialog()
     delete pOptions;
 }
 
-//--------------------------------------------------------------------
+
 
 short SfxPrintOptionsDialog::Execute()
 {
@@ -245,7 +245,7 @@ short SfxPrintOptionsDialog::Execute()
     return nRet;
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt )
 {
@@ -258,7 +258,7 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt )
     return ModalDialog::Notify( rNEvt );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxPrintOptionsDialog::DisableHelp()
 {
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index a69475464966..56634cd2a6e8 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -306,9 +306,9 @@ void SAL_CALL SfxStatusIndicator::disposing( const lang::EventObject& /*Source*/
     xProgress.clear();
 }
 
-//________________________________________________________________________________________________________
+
 //  declaration IMPL_SfxBaseController_ListenerHelper
-//________________________________________________________________________________________________________
+
 
 class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< frame::XFrameActionListener >
 {
@@ -382,9 +382,9 @@ void SAL_CALL IMPL_SfxBaseController_CloseListenerHelper::notifyClosing( const l
 {
 }
 
-//________________________________________________________________________________________________________
+
 //  declaration IMPL_SfxBaseController_DataContainer
-//________________________________________________________________________________________________________
+
 
 struct IMPL_SfxBaseController_DataContainer
 {
@@ -419,18 +419,18 @@ struct IMPL_SfxBaseController_DataContainer
 
 } ; // struct IMPL_SfxBaseController_DataContainer
 
-//________________________________________________________________________________________________________
+
 //  IMPL_SfxBaseController_ListenerHelper constructor
-//________________________________________________________________________________________________________
+
 
 IMPL_SfxBaseController_ListenerHelper::IMPL_SfxBaseController_ListenerHelper(   SfxBaseController*  pController )
         : m_pController ( pController   )
 {
 }
 
-//________________________________________________________________________________________________________
+
 //  IMPL_SfxBaseController_ListenerHelper destructor
-//________________________________________________________________________________________________________
+
 
 IMPL_SfxBaseController_ListenerHelper::~IMPL_SfxBaseController_ListenerHelper()
 {
@@ -457,9 +457,9 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::frameAction( const frame::F
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  IMPL_SfxBaseController_ListenerHelper -> XEventListener
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::EventObject& /*aEvent*/ ) throw( RuntimeException )
 {
@@ -468,9 +468,9 @@ void SAL_CALL IMPL_SfxBaseController_ListenerHelper::disposing( const lang::Even
         m_pController->getFrame()->removeFrameActionListener( this ) ;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> constructor
-//________________________________________________________________________________________________________
+
 DBG_NAME(sfx2_SfxBaseController)
 SfxBaseController::SfxBaseController( SfxViewShell* pViewShell )
     :   m_pData ( new IMPL_SfxBaseController_DataContainer( m_aMutex, pViewShell, this ))
@@ -479,9 +479,9 @@ SfxBaseController::SfxBaseController( SfxViewShell* pViewShell )
     m_pData->m_pViewShell->SetController( this );
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> destructor
-//________________________________________________________________________________________________________
+
 
 SfxBaseController::~SfxBaseController()
 {
@@ -489,9 +489,9 @@ SfxBaseController::~SfxBaseController()
     delete m_pData;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController2
-//________________________________________________________________________________________________________
+
 
 Reference< XWindow > SAL_CALL SfxBaseController::getComponentWindow() throw (RuntimeException)
 {
@@ -542,9 +542,9 @@ SfxViewFrame& SfxBaseController::GetViewFrame_Impl() const
     return *pActFrame;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController2 -> XController
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >& xFrame ) throw( RuntimeException )
 {
@@ -580,9 +580,9 @@ void SAL_CALL SfxBaseController::attachFrame( const Reference< frame::XFrame >&
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel >& xModel ) throw( RuntimeException )
 {
@@ -599,9 +599,9 @@ sal_Bool SAL_CALL SfxBaseController::attachModel( const Reference< frame::XModel
     return sal_True;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController
-//________________________________________________________________________________________________________
+
 
 sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( RuntimeException )
 {
@@ -657,9 +657,9 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController
-//________________________________________________________________________________________________________
+
 
 uno::Any SfxBaseController::getViewData() throw( RuntimeException )
 {
@@ -675,9 +675,9 @@ uno::Any SfxBaseController::getViewData() throw( RuntimeException )
     return aAny ;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw( RuntimeException )
 {
@@ -690,9 +690,9 @@ void SAL_CALL SfxBaseController::restoreViewData( const uno::Any& aValue ) throw
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController
-//________________________________________________________________________________________________________
+
 
 Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( RuntimeException )
 {
@@ -700,9 +700,9 @@ Reference< frame::XFrame > SAL_CALL SfxBaseController::getFrame() throw( Runtime
     return m_pData->m_xFrame;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XController
-//________________________________________________________________________________________________________
+
 
 Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( RuntimeException )
 {
@@ -710,9 +710,9 @@ Reference< frame::XModel > SAL_CALL SfxBaseController::getModel() throw( Runtime
     return m_pData->m_pViewShell ? m_pData->m_pViewShell->GetObjectShell()->GetModel() : Reference < frame::XModel > () ;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XDispatchProvider
-//________________________________________________________________________________________________________
+
 
 Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch(   const   util::URL&             aURL            ,
                                                                     const   OUString&            sTargetFrameName,
@@ -868,9 +868,9 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch(   const
     return xDisp;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XDispatchProvider
-//________________________________________________________________________________________________________
+
 
 uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::queryDispatches( const uno::Sequence< frame::DispatchDescriptor >& seqDescripts ) throw( RuntimeException )
 {
@@ -889,9 +889,9 @@ uno::Sequence< Reference< frame::XDispatch > > SAL_CALL SfxBaseController::query
     return lDispatcher;
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XControllerBorder
-//________________________________________________________________________________________________________
+
 
 frame::BorderWidths SAL_CALL SfxBaseController::getBorder()
     throw ( RuntimeException )
@@ -963,9 +963,9 @@ void SfxBaseController::BorderWidthsChanged_Impl()
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XComponent
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseController::dispose() throw( RuntimeException )
 {
@@ -1034,18 +1034,18 @@ void SAL_CALL SfxBaseController::dispose() throw( RuntimeException )
     }
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XComponent
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseController::addEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException )
 {
     m_pData->m_aListenerContainer.addInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
 }
 
-//________________________________________________________________________________________________________
+
 //  SfxBaseController -> XComponent
-//________________________________________________________________________________________________________
+
 
 void SAL_CALL SfxBaseController::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw( RuntimeException )
 {
diff --git a/sfx2/source/view/userinputinterception.cxx b/sfx2/source/view/userinputinterception.cxx
index e557c9a28b22..dc5d77905df3 100644
--- a/sfx2/source/view/userinputinterception.cxx
+++ b/sfx2/source/view/userinputinterception.cxx
@@ -117,56 +117,56 @@ namespace sfx2
     //====================================================================
     //= UserInputInterception
     //====================================================================
-    //--------------------------------------------------------------------
+
     UserInputInterception::UserInputInterception( ::cppu::OWeakObject& _rControllerImpl, ::osl::Mutex& _rMutex )
         :m_pData( new UserInputInterception_Data( _rControllerImpl, _rMutex ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     UserInputInterception::~UserInputInterception()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void UserInputInterception::addKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException)
     {
         if ( _rxHandler.is() )
             m_pData->m_aKeyHandlers.addInterface( _rxHandler );
     }
 
-    //--------------------------------------------------------------------
+
     void UserInputInterception::removeKeyHandler( const Reference< XKeyHandler >& _rxHandler ) throw (RuntimeException)
     {
         m_pData->m_aKeyHandlers.removeInterface( _rxHandler );
     }
 
-    //--------------------------------------------------------------------
+
     void UserInputInterception::addMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException)
     {
         if ( _rxHandler.is() )
             m_pData->m_aMouseClickHandlers.addInterface( _rxHandler );
     }
 
-    //--------------------------------------------------------------------
+
     void UserInputInterception::removeMouseClickHandler( const Reference< XMouseClickHandler >& _rxHandler ) throw (RuntimeException)
     {
         m_pData->m_aMouseClickHandlers.removeInterface( _rxHandler );
     }
 
-    //--------------------------------------------------------------------
+
     bool UserInputInterception::hasKeyHandlers() const
     {
         return m_pData->m_aKeyHandlers.getLength() > 0;
     }
 
-    //--------------------------------------------------------------------
+
     bool UserInputInterception::hasMouseClickListeners() const
     {
         return m_pData->m_aMouseClickHandlers.getLength() > 0;
     }
 
-    //--------------------------------------------------------------------
+
     bool UserInputInterception::handleNotifyEvent( const NotifyEvent& _rEvent )
     {
         Reference < XInterface > xHoldAlive( m_pData->m_rControllerImpl );
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 2d39b8805e69..607ce9474a79 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -140,14 +140,14 @@ using ::com::sun::star::container::XIndexContainer;
 #include "../appl/app.hrc"
 #include "impviewframe.hxx"
 
-//-------------------------------------------------------------------------
+
 DBG_NAME(SfxViewFrame)
 
 #define SfxViewFrame
 #include "sfxslots.hxx"
 #undef SfxViewFrame
 
-//-------------------------------------------------------------------------
+
 
 SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
 {
@@ -162,7 +162,7 @@ SFX_IMPL_INTERFACE(SfxViewFrame,SfxShell,SfxResId(0))
 TYPEINIT2(SfxViewFrame,SfxShell,SfxListener);
 TYPEINIT1(SfxViewFrameItem, SfxPoolItem);
 
-//-------------------------------------------------------------------------
+
 namespace
 {
     bool moduleHasToolPanels( SfxViewFrame_Impl& i_rViewFrameImpl )
@@ -176,7 +176,7 @@ namespace
     }
 }
 
-//-------------------------------------------------------------------------
+
 static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHandler >& xHandler, const OUString& aPath, const SfxFilter* pFilter, sal_uInt32 nPasswordHash, const uno::Sequence< beans::PropertyValue > aInfo )
 {
     // TODO/LATER: In future the info should replace the direct hash completely
@@ -225,20 +225,20 @@ static sal_Bool AskPasswordToModify_Impl( const uno::Reference< task::XInteracti
     return bResult;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxViewFrame::SetDowning_Impl()
 {
     pImp->bIsDowning = sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SfxViewFrame::IsDowning_Impl() const
 {
     return pImp->bIsDowning;
 }
 
 
-//--------------------------------------------------------------------
+
 class SfxViewNotificatedFrameList_Impl :
     public SfxListener, public SfxViewFrameArr_Impl
 {
@@ -252,7 +252,7 @@ public:
     void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
 
-//-------------------------------------------------------------------------
+
 void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
 {
     if ( rHint.IsA(TYPE(SfxSimpleHint)) )
@@ -272,7 +272,7 @@ void SfxViewNotificatedFrameList_Impl::Notify( SfxBroadcaster& rBC, const SfxHin
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 long ReloadDecouple_Impl( void* pObj, void* pArg )
 {
@@ -856,7 +856,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 {
     SfxObjectShell* pSh = GetObjectShell();
@@ -930,7 +930,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet )
 }
 
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq )
 {
     // Is there an Undo-Manager on the top Shell?
@@ -977,7 +977,7 @@ void SfxViewFrame::ExecHistory_Impl( SfxRequest &rReq )
     rReq.Done();
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
 {
     // Search for Undo-Manager
@@ -1032,7 +1032,7 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
         rSet.DisableItem( SID_REPEAT );
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell )
 {
     i_rViewShell.PopSubShells_Impl();
@@ -1055,7 +1055,7 @@ void SfxViewFrame::PopShellAndSubShells_Impl( SfxViewShell& i_rViewShell )
 
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::ReleaseObjectShell_Impl()
 
 /*  [Description]
@@ -1127,7 +1127,7 @@ void SfxViewFrame::ReleaseObjectShell_Impl()
     GetDispatcher()->SetDisableFlags( 0 );
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxViewFrame::Close()
 {
     DBG_CHKTHIS(SfxViewFrame, 0);
@@ -1151,7 +1151,7 @@ sal_Bool SfxViewFrame::Close()
     return sal_True;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
 {
@@ -1174,7 +1174,7 @@ void SfxViewFrame::DoActivate( sal_Bool bUI, SfxViewFrame* pOldFrame )
     }
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame )
 {
     DBG_CHKTHIS(SfxViewFrame, 0);
@@ -1195,7 +1195,7 @@ void SfxViewFrame::DoDeactivate(sal_Bool bUI, SfxViewFrame* pNewFrame )
     }
 }
 
-//------------------------------------------------------------------------
+
 void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
 {
     if( pSh && !nAdjustPosPixelLock )
@@ -1213,7 +1213,7 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh )
     }
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool SfxViewFrame::SetBorderPixelImpl
 (
     const SfxViewShell* pVSh,
@@ -1256,7 +1256,7 @@ sal_Bool SfxViewFrame::SetBorderPixelImpl
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 const SvBorder& SfxViewFrame::GetBorderPixelImpl
 (
     const SfxViewShell* /*pSh*/
@@ -1266,7 +1266,7 @@ const SvBorder& SfxViewFrame::GetBorderPixelImpl
     return pImp->aBorder;
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     {DBG_CHKTHIS(SfxViewFrame, 0);}
@@ -1394,7 +1394,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     }
 }
 
-//------------------------------------------------------------------------
+
 void SfxViewFrame::Construct_Impl( SfxObjectShell *pObjSh )
 {
     pImp->bResizeInToOut = sal_True;
@@ -1476,7 +1476,7 @@ SfxViewFrame::SfxViewFrame
     rFrame.CreateWorkWindow_Impl();
 }
 
-//------------------------------------------------------------------------
+
 SfxViewFrame::~SfxViewFrame()
 {
     DBG_DTOR(SfxViewFrame, 0);
@@ -1509,7 +1509,7 @@ SfxViewFrame::~SfxViewFrame()
     delete pImp;
 }
 
-//------------------------------------------------------------------------
+
 void SfxViewFrame::KillDispatcher_Impl()
 
 // Remove and delete the Dispatcher.
@@ -1530,13 +1530,13 @@ void SfxViewFrame::KillDispatcher_Impl()
     }
 }
 
-//------------------------------------------------------------------------
+
 SfxViewFrame* SfxViewFrame::Current()
 {
     return SfxApplication::Get() ? SFX_APP()->Get_Impl()->pViewFrame : NULL;
 }
 
-//--------------------------------------------------------------------
+
 // returns the first window of spec. type viewing the specified doc.
 SfxViewFrame* SfxViewFrame::GetFirst
 (
@@ -1559,7 +1559,7 @@ SfxViewFrame* SfxViewFrame::GetFirst
 
     return 0;
 }
-//--------------------------------------------------------------------
+
 
 // returns thenext window of spec. type viewing the specified doc.
 SfxViewFrame* SfxViewFrame::GetNext
@@ -1590,14 +1590,14 @@ SfxViewFrame* SfxViewFrame::GetNext
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 SfxProgress* SfxViewFrame::GetProgress() const
 {
     SfxObjectShell *pObjSh = GetObjectShell();
     return pObjSh ? pObjSh->GetProgress() : 0;
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer...
 (
     SfxViewShell*   pSh,
@@ -1626,19 +1626,19 @@ bool SfxViewFrameItem::operator==( const SfxPoolItem &rItem ) const
      return PTR_CAST(SfxViewFrameItem, &rItem)->pFrame== pFrame;
 }
 
-//--------------------------------------------------------------------
+
 OUString SfxViewFrameItem::GetValueText() const
 {
     return OUString();
 }
 
-//--------------------------------------------------------------------
+
 SfxPoolItem* SfxViewFrameItem::Clone( SfxItemPool *) const
 {
     return new SfxViewFrameItem( pFrame);
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
 
 /*  [Description]
@@ -1655,7 +1655,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
         pImp->bResizeInToOut = sal_False;
 }
 
-//--------------------------------------------------------------------
+
 /*  [Description]
 
     The ParentViewFrame of the Containers ViewFrame in the internal InPlace
@@ -1667,20 +1667,20 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::ForceOuterResize_Impl(sal_Bool bOn)
 {
     if ( !pImp->bDontOverwriteResizeInToOut )
         pImp->bResizeInToOut = !bOn;
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxViewFrame::IsResizeInToOut_Impl() const
 {
     return pImp->bResizeInToOut;
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::GetDocNumber_Impl()
 {
     DBG_ASSERT( GetObjectShell(), "No Document!" );
@@ -1688,7 +1688,7 @@ void SfxViewFrame::GetDocNumber_Impl()
     pImp->nDocViewNo = GetObjectShell()->GetNoSet_Impl().GetFreeIndex()+1;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewFrame::Enable( sal_Bool bEnable )
 {
@@ -1728,7 +1728,7 @@ void SfxViewFrame::Enable( sal_Bool bEnable )
     }
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::Show()
 
 /*  [Description]
@@ -1764,13 +1764,13 @@ void SfxViewFrame::Show()
     GetFrame().GetWindow().Show();
 }
 
-//--------------------------------------------------------------------
+
 sal_Bool SfxViewFrame::IsVisible() const
 {
     return pImp->bObjLocked;
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock )
 {
     DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" );
@@ -1780,7 +1780,7 @@ void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock )
     pImp->bObjLocked = bLock;
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus )
 {
     if ( GetViewShell() && !GetFrame().IsClosing_Impl() )
@@ -1832,14 +1832,14 @@ void SfxViewFrame::MakeActive_Impl( sal_Bool bGrabFocus )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SfxViewFrame::SetQuietMode_Impl( sal_Bool bOn )
 {
     GetDispatcher()->SetQuietMode_Impl( bOn );
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxObjectShell* SfxViewFrame::GetObjectShell()
 {
@@ -1873,7 +1873,7 @@ SfxViewFrame* SfxViewFrame::GetActiveChildFrame_Impl() const
     return pViewFrame;
 }
 
-//--------------------------------------------------------------------
+
 SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
                                                    const sal_uInt16 i_nViewId, const bool i_bHidden )
 {
@@ -1944,7 +1944,7 @@ SfxViewFrame* SfxViewFrame::LoadViewIntoFrame_Impl_NoThrow( const SfxObjectShell
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rFrame,
                                            const Sequence< PropertyValue >& i_rLoadArgs, const sal_uInt16 i_nViewId,
                                            const bool i_bHidden )
@@ -1974,35 +1974,35 @@ SfxViewShell* SfxViewFrame::LoadViewIntoFrame_Impl( const SfxObjectShell& i_rDoc
     return pViewShell;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFrame* SfxViewFrame::LoadHiddenDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, true );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFrame* SfxViewFrame::LoadDocument( SfxObjectShell& i_rDoc, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, Reference< XFrame >(), i_nViewId, false );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const Reference< XFrame >& i_rTargetFrame, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_rTargetFrame, i_nViewId, false );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFrame* SfxViewFrame::LoadDocumentIntoFrame( SfxObjectShell& i_rDoc, const SfxFrameItem* i_pFrameItem, const sal_uInt16 i_nViewId )
 {
     return LoadViewIntoFrame_Impl_NoThrow( i_rDoc, i_pFrameItem && i_pFrameItem->GetFrame() ? i_pFrameItem->GetFrame()->GetFrameInterface() : NULL, i_nViewId, false );
 }
 
-//--------------------------------------------------------------------
+
 SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const SfxRequest& i_rCreateDocRequest, const sal_uInt16 i_nViewId )
 {
     SFX_REQUEST_ARG( i_rCreateDocRequest, pFrameItem, SfxUnoFrameItem, SID_FILLFRAME, false );
@@ -2016,7 +2016,7 @@ SfxViewFrame* SfxViewFrame::DisplayNewDocument( SfxObjectShell& i_rDoc, const Sf
     );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, const SfxObjectShell* i_pDoc )
 {
@@ -2050,7 +2050,7 @@ SfxViewFrame* SfxViewFrame::Get( const Reference< XController>& i_rController, c
     return pViewFrame;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId )
 {
@@ -2116,7 +2116,7 @@ void SfxViewFrame::SaveCurrentViewData_Impl( const sal_uInt16 i_nNewViewId )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxViewFrame::SwitchToViewShell_Impl
 (
@@ -2210,19 +2210,19 @@ sal_Bool SfxViewFrame::SwitchToViewShell_Impl
     return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxViewFrame::SetCurViewId_Impl( const sal_uInt16 i_nID )
 {
     pImp->nCurViewId = i_nID;
 }
 
-//-------------------------------------------------------------------------
+
 sal_uInt16 SfxViewFrame::GetCurViewId() const
 {
     return pImp->nCurViewId;
 }
 
-//-------------------------------------------------------------------------
+
 void SfxViewFrame::ExecView_Impl
 (
     SfxRequest& rReq        // The executable <SfxRequest>
@@ -2324,7 +2324,7 @@ void SfxViewFrame::ExecView_Impl
     }
 }
 
-//-------------------------------------------------------------------------
+
 /* TODO as96863:
         This method try to collect information about the count of currently open documents.
         But the algorithm is implemented very simple ...
@@ -2374,7 +2374,7 @@ sal_Bool impl_maxOpenDocCountReached()
     return (nOpenDocs >= nMaxDocs);
 }
 
-//-------------------------------------------------------------------------
+
 void SfxViewFrame::StateView_Impl
 (
     SfxItemSet&     rSet            /*  empty <SfxItemSet> with <Which-Ranges>,
@@ -2449,13 +2449,13 @@ void SfxViewFrame::StateView_Impl
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SfxViewFrame::ToTop()
 {
     GetFrame().Appear();
 }
 
-//-------------------------------------------------------------------------
+
 SfxViewFrame* SfxViewFrame::GetParentViewFrame() const
 /*  [Description]
 
@@ -2466,7 +2466,7 @@ SfxViewFrame* SfxViewFrame::GetParentViewFrame() const
     return pFrame ? pFrame->GetCurrentViewFrame() : NULL;
 }
 
-//-------------------------------------------------------------------------
+
 SfxFrame& SfxViewFrame::GetFrame() const
 /*  [Description]
 
@@ -2476,7 +2476,7 @@ SfxFrame& SfxViewFrame::GetFrame() const
     return pImp->rFrame;
 }
 
-//-------------------------------------------------------------------------
+
 SfxViewFrame* SfxViewFrame::GetTopViewFrame() const
 {
     return GetFrame().GetTopFrame().GetCurrentViewFrame();
@@ -3158,7 +3158,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
 
@@ -3236,7 +3236,7 @@ void SfxViewFrame::ChildWindowState( SfxItemSet& rState )
     }
 }
 
-//--------------------------------------------------------------------
+
 SfxWorkWindow* SfxViewFrame::GetWorkWindow_Impl( sal_uInt16 /*nId*/ )
 {
     SfxWorkWindow* pWork = 0;
@@ -3251,7 +3251,7 @@ void SfxViewFrame::SetChildWindow(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFoc
         pWork->SetChildWindow_Impl( nId, bOn, bSetFocus );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
 {
@@ -3260,7 +3260,7 @@ void SfxViewFrame::ToggleChildWindow(sal_uInt16 nId)
         pWork->ToggleChildWindow_Impl( nId, sal_True );
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
 {
@@ -3268,7 +3268,7 @@ bool SfxViewFrame::HasChildWindow( sal_uInt16 nId )
     return pWork && pWork->HasChildWindow_Impl(nId);
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId )
 {
@@ -3276,7 +3276,7 @@ sal_Bool SfxViewFrame::KnowsChildWindow( sal_uInt16 nId )
     return pWork ? pWork->KnowsChildWindow_Impl(nId) : sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible )
 {
@@ -3288,7 +3288,7 @@ void SfxViewFrame::ShowChildWindow( sal_uInt16 nId, sal_Bool bVisible )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 SfxChildWindow* SfxViewFrame::GetChildWindow(sal_uInt16 nId)
 {
@@ -3311,7 +3311,7 @@ void SfxViewFrame::SetViewFrame( SfxViewFrame* pFrame )
     SFX_APP()->SetViewFrame_Impl( pFrame );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL )
 {
     SolarMutexGuard aGuard;
@@ -3329,7 +3329,7 @@ void SfxViewFrame::ActivateToolPanel( const ::com::sun::star::uno::Reference< ::
     pViewFrame->ActivateToolPanel_Impl( i_rPanelURL );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SfxViewFrame::ActivateToolPanel_Impl( const OUString& i_rPanelURL )
 {
     // ensure the task pane is visible
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index e073426e8e97..8633f23d51b7 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::beans;
 using ::com::sun::star::lang::XMultiServiceFactory;
 using ::com::sun::star::lang::XComponent;
 
-//--------------------------------------------------------------------
+
 void SfxFrameViewWindow_Impl::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_INITSHOW )
@@ -78,7 +78,7 @@ void SfxFrameViewWindow_Impl::Resize()
 
 //========================================================================
 
-//--------------------------------------------------------------------
+
 void SfxViewFrame::UpdateTitle()
 
 /*  [Description]
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index f7a83e3319a8..1416c0fe5d2f 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -299,7 +299,7 @@ SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
 
 TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
 
-//--------------------------------------------------------------------
+
 /** search for a filter name dependent on type and module
  */
 
@@ -341,7 +341,7 @@ static OUString impl_retrieveFilterNameFromTypeAndModule(
     return aFoundFilterName;
 }
 
-//--------------------------------------------------------------------
+
 /** search for an internal typename, which map to the current app module
     and map also to a "family" of file formats as e.g. PDF/MS Doc/OOo Doc.
  */
@@ -410,7 +410,7 @@ OUString impl_searchFormatTypeForApp(const css::uno::Reference< css::frame::XFra
     return OUString();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient )
 {
@@ -428,7 +428,7 @@ void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient )
 
 
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
 {
@@ -778,7 +778,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
 {
@@ -843,7 +843,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::SetZoomFactor( const Fraction &rZoomX,
     const Fraction &rZoomY )
@@ -855,7 +855,7 @@ void SfxViewShell::SetZoomFactor( const Fraction &rZoomX,
     GetWindow()->SetMapMode( aMap );
 }
 
-//--------------------------------------------------------------------
+
 ErrCode SfxViewShell::DoVerb(long /*nVerb*/)
 
 /*  [Description]
@@ -869,7 +869,7 @@ ErrCode SfxViewShell::DoVerb(long /*nVerb*/)
     return ERRCODE_SO_NOVERBS;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pClient*/ )
 {
@@ -877,7 +877,7 @@ void SfxViewShell::OutplaceActivated( sal_Bool bActive, SfxInPlaceClient* /*pCli
         GetFrame()->GetFrame().Appear();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ )
 {
@@ -885,14 +885,14 @@ void SfxViewShell::InplaceActivating( SfxInPlaceClient* /*pClient*/ )
     // but may be the bug will not affect the real office vcl windows, then it is not required
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::InplaceDeactivated( SfxInPlaceClient* /*pClient*/ )
 {
     // TODO/LATER: paint the replacement image in normal way if the painting was stopped
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ )
 {
@@ -905,7 +905,7 @@ void SfxViewShell::UIActivating( SfxInPlaceClient* /*pClient*/ )
     pFrame->GetDispatcher()->Update_Impl( sal_True );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ )
 {
@@ -916,7 +916,7 @@ void SfxViewShell::UIDeactivated( SfxInPlaceClient* /*pClient*/ )
     pFrame->GetBindings().InvalidateAll(sal_True);
 }
 
-//--------------------------------------------------------------------
+
 
 SfxInPlaceClient* SfxViewShell::FindIPClient
 (
@@ -940,14 +940,14 @@ SfxInPlaceClient* SfxViewShell::FindIPClient
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxInPlaceClient* SfxViewShell::GetIPClient() const
 {
     return GetUIActiveClient();
 }
 
-//--------------------------------------------------------------------
+
 
 SfxInPlaceClient* SfxViewShell::GetUIActiveIPClient_Impl() const
 {
@@ -982,7 +982,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::Activate( sal_Bool bMDI )
 {
@@ -997,14 +997,14 @@ void SfxViewShell::Activate( sal_Bool bMDI )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::Deactivate(sal_Bool /*bMDI*/)
 {
     DBG_CHKTHIS(SfxViewShell, 0);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::AdjustPosSizePixel
 (
@@ -1016,7 +1016,7 @@ void SfxViewShell::AdjustPosSizePixel
     DBG_CHKTHIS(SfxViewShell, 0);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::Move()
 
@@ -1038,7 +1038,7 @@ void SfxViewShell::Move()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::OuterResizePixel
 (
@@ -1089,7 +1089,7 @@ void SfxViewShell::OuterResizePixel
     SetBorderPixel( SvBorder() );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::InnerResizePixel
 (
@@ -1140,7 +1140,7 @@ void SfxViewShell::InnerResizePixel
     SetBorderPixel( SvBorder() );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::InvalidateBorder()
 {
@@ -1154,7 +1154,7 @@ void SfxViewShell::InvalidateBorder()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::SetBorderPixel( const SvBorder &rBorder )
 {
@@ -1170,7 +1170,7 @@ void SfxViewShell::SetBorderPixel( const SvBorder &rBorder )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 const SvBorder& SfxViewShell::GetBorderPixel() const
 {
@@ -1180,7 +1180,7 @@ const SvBorder& SfxViewShell::GetBorderPixel() const
     return GetViewFrame()->GetBorderPixelImpl( this );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::SetWindow
 (
@@ -1222,7 +1222,7 @@ void SfxViewShell::SetWindow
     //SFX_APP()->GrabFocus( pWindow );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewShell::SfxViewShell
 (
@@ -1256,7 +1256,7 @@ SfxViewShell::SfxViewShell
     rViewArr.push_back(this);
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewShell::~SfxViewShell()
 {
@@ -1284,7 +1284,7 @@ SfxViewShell::~SfxViewShell()
     DELETEZ( pIPClientList );
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxViewShell::PrepareClose
 (
@@ -1312,7 +1312,7 @@ bool SfxViewShell::PrepareClose
     return true;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewShell* SfxViewShell::Current()
 {
@@ -1320,7 +1320,7 @@ SfxViewShell* SfxViewShell::Current()
     return pCurrent ? pCurrent->GetViewShell() : NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController )
 {
@@ -1338,7 +1338,7 @@ SfxViewShell* SfxViewShell::Get( const Reference< XController>& i_rController )
     return NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 SdrView* SfxViewShell::GetDrawView() const
 
@@ -1354,7 +1354,7 @@ SdrView* SfxViewShell::GetDrawView() const
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 OUString SfxViewShell::GetSelectionText
 (
@@ -1384,7 +1384,7 @@ OUString SfxViewShell::GetSelectionText
     return OUString();
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxViewShell::HasSelection( sal_Bool ) const
 
@@ -1465,13 +1465,13 @@ void SfxViewShell::PushSubShells_Impl( sal_Bool bPush )
     pDisp->Flush();
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::WriteUserData( OUString&, bool )
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::ReadUserData(const OUString&, bool )
 {
@@ -1486,7 +1486,7 @@ void SfxViewShell::WriteUserDataSequence ( uno::Sequence < beans::PropertyValue
 }
 
 
-//--------------------------------------------------------------------
+
 // returns the first shell of spec. type viewing the specified doc.
 
 SfxViewShell* SfxViewShell::GetFirst
@@ -1523,7 +1523,7 @@ SfxViewShell* SfxViewShell::GetFirst
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 // returns the next shell of spec. type viewing the specified doc.
 
 SfxViewShell* SfxViewShell::GetNext
@@ -1565,7 +1565,7 @@ SfxViewShell* SfxViewShell::GetNext
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::Notify( SfxBroadcaster& rBC,
                             const SfxHint& rHint )
@@ -1604,7 +1604,7 @@ void SfxViewShell::Notify( SfxBroadcaster& rBC,
     }
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
 {
@@ -1619,7 +1619,7 @@ sal_Bool SfxViewShell::ExecKey_Impl(const KeyEvent& aKey)
     return pImp->m_pAccExec->execute(aKey.GetKeyCode());
 }
 
-//--------------------------------------------------------------------
+
 
 bool SfxViewShell::KeyInput( const KeyEvent &rKeyEvent )
 
@@ -1652,7 +1652,7 @@ bool SfxViewShell::GlobalKeyInput_Impl( const KeyEvent &rKeyEvent )
     return ExecKey_Impl(rKeyEvent);
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::ShowCursor( bool /*bOn*/ )
 
@@ -1666,7 +1666,7 @@ void SfxViewShell::ShowCursor( bool /*bOn*/ )
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::GotFocus() const
 
@@ -1685,7 +1685,7 @@ void SfxViewShell::GotFocus() const
 {
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
 {
 
@@ -1701,7 +1701,7 @@ void SfxViewShell::ResetAllClients_Impl( SfxInPlaceClient *pIP )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::DisconnectAllClients()
 {
@@ -1714,13 +1714,13 @@ void SfxViewShell::DisconnectAllClients()
         delete pClients->at( n );
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::QueryObjAreaPixel( Rectangle& ) const
 {
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
 {
@@ -1737,7 +1737,7 @@ void SfxViewShell::VisAreaChanged(const Rectangle& /*rVisArea*/)
     }
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectangle& rVisArea )
 {
     if ( GetObjectShell()->IsInClose() )
@@ -1775,7 +1775,7 @@ void SfxViewShell::CheckIPClient_Impl( SfxInPlaceClient *pIPClient, const Rectan
     }
 }
 
-//--------------------------------------------------------------------
+
 void SfxViewShell::DiscardClients_Impl()
 
 /*  [Description]
@@ -1793,14 +1793,14 @@ void SfxViewShell::DiscardClients_Impl()
         delete pClients->at( n );
 }
 
-//--------------------------------------------------------------------
+
 
 SfxObjectShell* SfxViewShell::GetObjectShell()
 {
     return pFrame ? pFrame->GetObjectShell() : NULL;
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XModel > SfxViewShell::GetCurrentDocument() const
 {
@@ -1813,7 +1813,7 @@ Reference< XModel > SfxViewShell::GetCurrentDocument() const
     return xDocument;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::SetCurrentDocument() const
 {
@@ -1822,14 +1822,14 @@ void SfxViewShell::SetCurrentDocument() const
         SfxObjectShell::SetCurrentComponent( xDocument );
 }
 
-//--------------------------------------------------------------------
+
 
 const Size& SfxViewShell::GetMargin() const
 {
     return pImp->aMargin;
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::SetMargin( const Size& rSize )
 {
@@ -1847,27 +1847,27 @@ void SfxViewShell::SetMargin( const Size& rSize )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SfxViewShell::MarginChanged()
 {
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SfxViewShell::IsShowView_Impl() const
 {
     return pImp->m_bIsShowView;
 }
 
-//--------------------------------------------------------------------
+
 
 SfxFrame* SfxViewShell::GetSmartSelf( SfxFrame* pSelf, SfxMedium& /*rMedium*/ )
 {
     return pSelf;
 }
 
-//------------------------------------------------------------------------
+
 
 void SfxViewShell::JumpToMark( const OUString& rMark )
 {
@@ -1878,7 +1878,7 @@ void SfxViewShell::JumpToMark( const OUString& rMark )
         &aMarkItem, 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxInPlaceClientList* SfxViewShell::GetIPClientList_Impl( sal_Bool bCreate ) const
 {
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index de8eb29966e6..8cf9f4b9ee0f 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -200,7 +200,7 @@ static OUString xdg_user_dir_lookup (const char *type)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
 {
@@ -224,7 +224,7 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue )
     return uno::Any();
 }
 
-//------------------------------------------------------------------------------
+
 
 static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &rHeight)
 {
@@ -242,7 +242,7 @@ static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 &
    rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 );
 }
 
-//------------------------------------------------------------------------------
+
 
 uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfValue )
 {
@@ -371,7 +371,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal
     return uno::Any();
 }
 
-//------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL isDependencySatisfied( GConfClient* pClient, const ConfigurationValue &rValue )
 {
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 2d38cd28dcd3..c008fc582975 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -203,26 +203,26 @@ static OUString ImplGetLocale(int category)
 
 #endif
 
-// -------------------------------------------------------------------------------
+
 
 LocaleBackend::LocaleBackend()
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 LocaleBackend::~LocaleBackend(void)
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 LocaleBackend* LocaleBackend::createInstance()
 {
     return new LocaleBackend;
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 OUString LocaleBackend::getLocale(void)
 {
@@ -235,7 +235,7 @@ OUString LocaleBackend::getLocale(void)
 #endif
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString LocaleBackend::getUILocale(void)
 {
@@ -248,7 +248,7 @@ OUString LocaleBackend::getUILocale(void)
 #endif
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 OUString LocaleBackend::getSystemLocale(void)
 {
@@ -259,7 +259,7 @@ OUString LocaleBackend::getSystemLocale(void)
     return getLocale();
 #endif
 }
-//------------------------------------------------------------------------------
+
 
 void LocaleBackend::setPropertyValue(
     OUString const &, css::uno::Any const &)
@@ -300,7 +300,7 @@ css::uno::Any LocaleBackend::getPropertyValue(
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL LocaleBackend::getBackendName(void) {
     return OUString("com.sun.star.comp.configuration.backend.LocaleBackend") ;
diff --git a/shell/source/backends/localebe/localebecdef.cxx b/shell/source/backends/localebe/localebecdef.cxx
index 4eaf340a10ea..22549779c02a 100644
--- a/shell/source/backends/localebe/localebecdef.cxx
+++ b/shell/source/backends/localebe/localebecdef.cxx
@@ -25,7 +25,7 @@
 
 namespace uno = com::sun::star::uno ;
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend(
     SAL_UNUSED_PARAMETER const uno::Reference<uno::XComponentContext>&){
@@ -33,7 +33,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createLocaleBackend(
     return * LocaleBackend::createInstance();
 }
 
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -48,7 +48,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     { NULL, NULL, NULL, NULL, NULL, 0 }
 } ;
 
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory(
     const sal_Char *aImplementationName,
@@ -62,6 +62,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL localebe1_component_getFactory(
         kImplementations_entries) ;
 }
 
-//------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/macbe/macbecdef.cxx b/shell/source/backends/macbe/macbecdef.cxx
index 0e7ba99a2ab4..919441443ebf 100644
--- a/shell/source/backends/macbe/macbecdef.cxx
+++ b/shell/source/backends/macbe/macbecdef.cxx
@@ -26,7 +26,7 @@
 
 namespace uno = com::sun::star::uno;
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend(
     const uno::Reference<uno::XComponentContext>&)
@@ -34,7 +34,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createMacOSXBackend(
     return * MacOSXBackend::createInstance();
 }
 
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -49,7 +49,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     { 0, 0, 0, 0, 0, 0 }
 };
 
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( const sal_Char *aImplementationName, void *aServiceManager, void *aRegistryKey)
 {
@@ -61,6 +61,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL macbe1_component_getFactory( con
         kImplementations_entries);
 }
 
-//------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx
index 2feac4964849..1c6b4de581d6 100644
--- a/shell/source/backends/wininetbe/wininetbackend.cxx
+++ b/shell/source/backends/wininetbe/wininetbackend.cxx
@@ -56,9 +56,9 @@ typedef struct
     OUString Port;
 } ProxyEntry;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace // private
 {
@@ -100,7 +100,7 @@ namespace // private
 
 } // end private namespace
 
-//------------------------------------------------------------------------------
+
 
 WinInetBackend::WinInetBackend()
 {
@@ -205,7 +205,7 @@ WinInetBackend::WinInetBackend()
 
             if( aProxyList.getLength() > 0 )
             {
-                //-------------------------------------------------
+
                 // this implementation follows the algorithm
                 // of the internet explorer
                 // if there are type-dependent proxy settings
@@ -220,7 +220,7 @@ WinInetBackend::WinInetBackend()
                 // if there is no port specified for a type independent
                 // server the ie uses the port of an http server if
                 // there is one and it has a port
-                //-------------------------------------------------
+
 
                 ProxyEntry aTypeIndepProxy = FindProxyEntry( aProxyList, OUString());
                 ProxyEntry aHttpProxy = FindProxyEntry( aProxyList, OUString(
@@ -296,20 +296,20 @@ WinInetBackend::WinInetBackend()
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 WinInetBackend::~WinInetBackend(void)
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 WinInetBackend* WinInetBackend::createInstance()
 {
     return new WinInetBackend;
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 void WinInetBackend::setPropertyValue(
     OUString const &, css::uno::Any const &)
@@ -360,13 +360,13 @@ css::uno::Any WinInetBackend::getPropertyValue(
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL WinInetBackend::getBackendName(void) {
     return OUString("com.sun.star.comp.configuration.backend.WinInetBackend") ;
 }
 
-//------------------------------------------------------------------------------
+
 
 OUString SAL_CALL WinInetBackend::getImplementationName(void)
     throw (uno::RuntimeException)
diff --git a/shell/source/backends/wininetbe/wininetbecdef.cxx b/shell/source/backends/wininetbe/wininetbecdef.cxx
index bff57de1c2b3..8958ac1dc596 100644
--- a/shell/source/backends/wininetbe/wininetbecdef.cxx
+++ b/shell/source/backends/wininetbe/wininetbecdef.cxx
@@ -26,7 +26,7 @@
 
 namespace uno = com::sun::star::uno ;
 
-//------------------------------------------------------------------------------
+
 
 static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend(
     const uno::Reference<uno::XComponentContext>&){
@@ -34,7 +34,7 @@ static uno::Reference<uno::XInterface> SAL_CALL createWinInetBackend(
     return * WinInetBackend::createInstance();
 }
 
-//------------------------------------------------------------------------------
+
 
 static const cppu::ImplementationEntry kImplementations_entries[] =
 {
@@ -49,7 +49,7 @@ static const cppu::ImplementationEntry kImplementations_entries[] =
     { NULL, NULL, NULL, NULL, NULL, 0 }
 } ;
 
-//------------------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory( const sal_Char *aImplementationName,
     void *aServiceManager,
@@ -62,6 +62,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL wininetbe1_component_getFactory(
         kImplementations_entries) ;
 }
 
-//------------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/shell/source/cmdmail/cmdmailentry.cxx b/shell/source/cmdmail/cmdmailentry.cxx
index 4448d1d01692..33a343ca9989 100644
--- a/shell/source/cmdmail/cmdmailentry.cxx
+++ b/shell/source/cmdmail/cmdmailentry.cxx
@@ -22,9 +22,9 @@
 #include <osl/diagnose.h>
 #include "cmdmailsuppl.hxx"
 
-//-----------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::com::sun::star::uno       ;
@@ -37,7 +37,7 @@ using com::sun::star::system::XSimpleMailClientSupplier;
 #define COMP_SERVICE_NAME  "com.sun.star.system.SimpleCommandMail"
 #define COMP_IMPL_NAME     "com.sun.star.comp.system.SimpleCommandMail"
 
-//-----------------------------------------------------------------------
+
 
 namespace
 {
@@ -49,9 +49,9 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL cmdmail_component_getFactory(
     const sal_Char* pImplName,
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index 7f4059478e71..e0a6eaeb8d20 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -40,9 +40,9 @@
 #include <errno.h>
 #include <unistd.h>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using com::sun::star::beans::PropertyValue;
 using com::sun::star::system::XSimpleMailClientSupplier;
@@ -62,9 +62,9 @@ using namespace com::sun::star::configuration;
 
 #define COMP_IMPL_NAME  "com.sun.star.comp.system.SimpleCommandMail2"
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace // private
 {
@@ -77,7 +77,7 @@ namespace // private
 
 } // end private namespace
 
-//-------------------------------------------------
+
 
 CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
     WeakImplHelper3< XSimpleMailClientSupplier, XSimpleMailClient, XServiceInfo >()
@@ -85,9 +85,9 @@ CmdMailSuppl::CmdMailSuppl( const Reference< XComponentContext >& xContext ) :
     m_xConfigurationProvider = theDefaultProvider::get(xContext);
 }
 
-//-------------------------------------------------
+
 // XSimpleMailClientSupplier
-//-------------------------------------------------
+
 
 Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient(  )
     throw (RuntimeException)
@@ -95,9 +95,9 @@ Reference< XSimpleMailClient > SAL_CALL CmdMailSuppl::querySimpleMailClient(  )
     return static_cast < XSimpleMailClient * > (this);
 }
 
-//------------------------------------------------
+
 // XSimpleMailClient
-//------------------------------------------------
+
 
 Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage(  )
         throw (::com::sun::star::uno::RuntimeException)
@@ -105,9 +105,9 @@ Reference< XSimpleMailMessage > SAL_CALL CmdMailSuppl::createSimpleMailMessage(
     return Reference< XSimpleMailMessage >( new CmdMailMsg(  ) );
 }
 
-//------------------------------------------------
+
 // XSimpleMailClient
-//------------------------------------------------
+
 
 namespace {
 
diff --git a/shell/source/tools/lngconvex/cmdline.cxx b/shell/source/tools/lngconvex/cmdline.cxx
index 770f49fa5e37..ba6bed4c3140 100644
--- a/shell/source/tools/lngconvex/cmdline.cxx
+++ b/shell/source/tools/lngconvex/cmdline.cxx
@@ -22,7 +22,7 @@
 #include <osl/diagnose.h>
 #include "cmdline.hxx"
 
-//---------------------------------
+
 /** Simple command line abstraction
 */
 
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 972957bba73b..41af7b2059b6 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -41,9 +41,9 @@
 #include <errno.h>
 #include <unistd.h>
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using com::sun::star::system::XSystemShellExecute;
 using com::sun::star::system::SystemShellExecuteException;
@@ -57,9 +57,9 @@ using namespace cppu;
 
 #define SHELLEXEC_IMPL_NAME  "com.sun.star.comp.system.SystemShellExecute2"
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace // private
 {
@@ -85,7 +85,7 @@ void escapeForShell( OStringBuffer & rBuffer, const OString & rURL)
     }
 }
 
-//-----------------------------------------------------------------------------------------
+
 
 ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) :
     WeakImplHelper2< XSystemShellExecute, XServiceInfo >(),
@@ -109,7 +109,7 @@ ShellExec::ShellExec( const Reference< XComponentContext >& xContext ) :
     }
 }
 
-//-------------------------------------------------
+
 
 void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
     throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException)
diff --git a/shell/source/unix/exec/shellexecentry.cxx b/shell/source/unix/exec/shellexecentry.cxx
index 13b10ac268f8..45f47a0c3684 100644
--- a/shell/source/unix/exec/shellexecentry.cxx
+++ b/shell/source/unix/exec/shellexecentry.cxx
@@ -21,9 +21,9 @@
 #include <osl/diagnose.h>
 #include "shellexec.hxx"
 
-//-----------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------
+
 
 using namespace ::rtl;
 using namespace ::com::sun::star::uno;
@@ -35,7 +35,7 @@ using com::sun::star::system::XSystemShellExecute;
 #define SHELLEXEC_SERVICE_NAME  "com.sun.star.system.SystemShellExecute"
 #define SHELLEXEC_IMPL_NAME     "com.sun.star.comp.system.SystemShellExecute"
 
-//-----------------------------------------------------------------------
+
 
 namespace
 {
@@ -47,9 +47,9 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory(
     const sal_Char* pImplName,
diff --git a/shell/source/unix/exec/urltest.cxx b/shell/source/unix/exec/urltest.cxx
index 5a85dbe18dfa..1a48b180d54a 100644
--- a/shell/source/unix/exec/urltest.cxx
+++ b/shell/source/unix/exec/urltest.cxx
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <strings.h>
 
-// -----------------------------------------------------------------------
+
 
 int main(int argc, const char *argv[])
 {
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index b1a71b795ab4..2bce26c8b972 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -44,7 +44,7 @@ inline void ensure_final_slash(/*inout*/ OUString& path)
 
 } // namespace private
 
-//------------------------------------------------
+
 recently_used_file::recently_used_file() :
     file_(NULL)
 {
@@ -85,7 +85,7 @@ recently_used_file::recently_used_file() :
         throw "Cannot determine user home directory";
 }
 
-//------------------------------------------------
+
 recently_used_file::~recently_used_file()
 {
     int ret = lockf(fileno(file_), F_ULOCK, 0);
@@ -93,20 +93,20 @@ recently_used_file::~recently_used_file()
     fclose(file_);
 }
 
-//------------------------------------------------
+
 void recently_used_file::reset() const
 {
     rewind(file_);
 }
 
-//------------------------------------------------
+
 void recently_used_file::truncate(off_t length)
 {
     if (ftruncate(fileno(file_), length) == -1)
         throw "I/O error: ftruncate failed";
 }
 
-//------------------------------------------------
+
 size_t recently_used_file::read(char* buffer, size_t size) const
 {
     size_t  r = fread(reinterpret_cast<void*>(buffer), sizeof(char), size, file_);
@@ -117,14 +117,14 @@ size_t recently_used_file::read(char* buffer, size_t size) const
     return r;
 }
 
-//----------------------------
+
 void recently_used_file::write(const char* buffer, size_t size) const
 {
     if (size != fwrite(reinterpret_cast<const void*>(buffer), sizeof(char), size, file_))
         throw "I/O error: write failed";
 }
 
-//----------------------------
+
 bool recently_used_file::eof() const
 {
     return feof(file_);
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 54f9a52b0869..c6c02baeb82c 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -47,7 +47,7 @@ namespace /* private */ {
     #define TAG_GROUPS       "Groups"
     #define TAG_GROUP        "Group"
 
-    //------------------------------------------------
+
     // compare two string_t's case insensitive, may also be done
     // by specifying special traits for the string type but in this
     // case it's easier to do it this way
@@ -58,7 +58,7 @@ namespace /* private */ {
         { return (0 == strcasecmp(s1.c_str(), s2.c_str())); }
     };
 
-    //------------------------------------------------
+
     struct recently_used_item
     {
         recently_used_item() :
@@ -282,7 +282,7 @@ namespace /* private */ {
         recently_used_file_filter& operator=(const recently_used_file_filter&);
     };
 
-    //------------------------------------------------
+
     void read_recently_used_items(
         recently_used_file& file,
         recently_used_item_list_t& item_list)
@@ -300,7 +300,7 @@ namespace /* private */ {
         }
     }
 
-    //------------------------------------------------
+
     // The file ~/.recently_used shall not contain more than 500
     // entries (see www.freedesktop.org)
     const int MAX_RECENTLY_USED_ITEMS = 500;
@@ -327,11 +327,11 @@ namespace /* private */ {
         int items_written_;
     };
 
-    //------------------------------------------------
+
     const char* XML_HEADER = "<?xml version=\"1.0\"?>\n<RecentFiles>\n";
     const char* XML_FOOTER = "</RecentFiles>";
 
-    //------------------------------------------------
+
     // assumes that the list is ordered decreasing
     void write_recently_used_items(
         recently_used_file& file,
@@ -353,14 +353,14 @@ namespace /* private */ {
         }
     }
 
-    //------------------------------------------------
+
     struct delete_recently_used_item
     {
         void operator() (const recently_used_item* item) const
         { delete item; }
     };
 
-    //------------------------------------------------
+
     void recently_used_item_list_clear(recently_used_item_list_t& item_list)
     {
         std::for_each(
@@ -370,7 +370,7 @@ namespace /* private */ {
         item_list.clear();
     }
 
-    //------------------------------------------------
+
     class find_item_predicate
     {
     public:
@@ -384,19 +384,19 @@ namespace /* private */ {
         string_t uri_;
     };
 
-    //------------------------------------------------
+
     struct greater_recently_used_item
     {
         bool operator ()(const recently_used_item* lhs, const recently_used_item* rhs) const
         { return (lhs->timestamp_ > rhs->timestamp_); }
     };
 
-    //------------------------------------------------
+
     const char* GROUP_OOO         = "openoffice.org";
     const char* GROUP_STAR_OFFICE = "staroffice";
     const char* GROUP_STAR_SUITE  = "starsuite";
 
-    //------------------------------------------------
+
     void recently_used_item_list_add(
         recently_used_item_list_t& item_list, const OUString& file_url, const OUString& mime_type)
     {
@@ -443,7 +443,7 @@ namespace /* private */ {
             greater_recently_used_item());
     }
 
-    //------------------------------------------------
+
     struct cleanup_guard
     {
         cleanup_guard(recently_used_item_list_t& item_list) :
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 0d4d7793293e..efeb6cc7147f 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -37,9 +37,9 @@
 #pragma warning(pop)
 #endif
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
@@ -57,9 +57,9 @@ using namespace cppu;
 
 #define SYSSHEXEC_IMPL_NAME  "com.sun.star.sys.shell.SystemShellExecute"
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 namespace // private
 {
@@ -170,7 +170,7 @@ namespace // private
 
     #define E_UNKNOWN_EXEC_ERROR -1
 
-    //-----------------------------------------
+
 
     bool is_system_path(const OUString& path_or_uri)
     {
@@ -179,9 +179,9 @@ namespace // private
         return (rc == osl::FileBase::E_None);
     }
 
-    //-----------------------------------------
+
     // trying to identify a jump mark
-    //-----------------------------------------
+
 
     const OUString    JUMP_MARK_HTM(".htm#");
     const OUString    JUMP_MARK_HTML(".html#");
@@ -199,7 +199,7 @@ namespace // private
         return (jmp_mark > -1);
     }
 
-    //-----------------------------------------
+
 
     bool is_existing_file(const OUString& file_name)
     {
@@ -219,9 +219,9 @@ namespace // private
         return exist;
     }
 
-    //-------------------------------------------------
+
     // Jump marks in file urls are illegal.
-    //-------------------------------------------------
+
 
     void remove_jump_mark(OUString* p_command)
     {
@@ -240,7 +240,7 @@ namespace // private
 
 } // end namespace
 
-//-----------------------------------------------------------------------------------------
+
 
 CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext ) :
     WeakComponentImplHelper2< XSystemShellExecute, XServiceInfo >( m_aMutex ),
@@ -257,7 +257,7 @@ CSysShExec::CSysShExec( const Reference< css::uno::XComponentContext >& xContext
     CoInitialize( NULL );
 }
 
-//-------------------------------------------------
+
 
 void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 nFlags )
         throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException)
diff --git a/shell/source/win32/SysShentry.cxx b/shell/source/win32/SysShentry.cxx
index d37d83013eaf..7c8ea3387bf0 100644
--- a/shell/source/win32/SysShentry.cxx
+++ b/shell/source/win32/SysShentry.cxx
@@ -22,9 +22,9 @@
 #include <osl/diagnose.h>
 #include "SysShExec.hxx"
 
-//-----------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::com::sun::star::uno       ;
@@ -37,7 +37,7 @@ using com::sun::star::system::XSystemShellExecute;
 #define SYSSHEXEC_SERVICE_NAME  "com.sun.star.system.SystemShellExecute"
 #define SYSSHEXEC_IMPL_NAME     "com.sun.star.system.SystemShellExecute"
 
-//-----------------------------------------------------------------------
+
 
 namespace
 {
@@ -49,10 +49,10 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
 // returns a factory to create XFilePicker-Services
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL syssh_component_getFactory( const sal_Char* pImplName, uno_Interface*, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
index 74866b631172..91860d81906e 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -36,26 +36,26 @@ m_ZipFile( DocumentName )
 {
 }
 
-//------------------------------
+
 
 CBaseReader::CBaseReader(StreamInterface * sw):
 m_ZipFile( sw )
 {
 }
 
-//------------------------------
+
 
 CBaseReader::~CBaseReader()
 {
 }
 
-//------------------------------
+
 
 void CBaseReader::start_document()
 {
 }
 
-//------------------------------
+
 
 void CBaseReader::end_document()
 {
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index 8190f66d4fe3..7f4ecd717243 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -167,9 +167,9 @@ LocaleSet_t const & CContentReader::getLocale( const StyleName_t Style )
 
 /***********************   event handler functions  ***********************/
 
-//------------------------------
+
 // start_element occurs when a tag is start
-//------------------------------
+
 
 void CContentReader::start_element(
     const std::wstring& /*raw_name*/,
@@ -184,9 +184,9 @@ void CContentReader::start_element(
 
 }
 
-//------------------------------
+
 // end_element occurs when a tag is closed
-//------------------------------
+
 
 void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::wstring& local_name)
 {
@@ -213,9 +213,9 @@ void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::ws
 
 }
 
-//------------------------------
+
 // characters occurs when receiving characters
-//------------------------------
+
 
 void CContentReader::characters( const std::wstring& character )
 {
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index 9edecc97a1b1..cc3fdd87545d 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -223,9 +223,9 @@ ITag* CMetaInfoReader::chooseTagReader( const std::wstring& tag_name, const XmlT
 
 }
 
-//------------------------------
+
 // save the received content into structure.
-//------------------------------
+
 void CMetaInfoReader::saveTagContent( const std::wstring& tag_name )
 {
     ITag* pTagBuilder;
@@ -250,9 +250,9 @@ void CMetaInfoReader::saveTagContent( const std::wstring& tag_name )
 
 /***********************   event handler functions  ***********************/
 
-//------------------------------
+
 // start_element occurs when a tag is start
-//------------------------------
+
 
 void CMetaInfoReader::start_element(
     const std::wstring& /*raw_name*/,
@@ -267,9 +267,9 @@ void CMetaInfoReader::start_element(
 
 }
 
-//------------------------------
+
 // end_element occurs when a tag is closed
-//------------------------------
+
 
 void CMetaInfoReader::end_element(const std::wstring& /*raw_name*/, const std::wstring& local_name)
 {
@@ -282,9 +282,9 @@ void CMetaInfoReader::end_element(const std::wstring& /*raw_name*/, const std::w
 
 }
 
-//------------------------------
+
 // characters occurs when receiving characters
-//------------------------------
+
 
 void CMetaInfoReader::characters( const std::wstring& character )
 {
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index 018333b154ed..2c223113be37 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -35,11 +35,11 @@ using ::std::min;
 #include "internal/thumbviewer.hxx"
 #include "internal/shlxthdl.hxx"
 
-//-----------------------------
+
 
 long CClassFactory::s_ServerLocks = 0;
 
-//-----------------------------
+
 
 CClassFactory::CClassFactory(const CLSID& clsid) :
     m_RefCnt(1),
@@ -48,16 +48,16 @@ CClassFactory::CClassFactory(const CLSID& clsid) :
     InterlockedIncrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 
 CClassFactory::~CClassFactory()
 {
     InterlockedDecrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 // IUnknown methods
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject)
 {
@@ -74,14 +74,14 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface(REFIID riid, void __RPC_
     return E_NOINTERFACE;
 }
 
-//-----------------------------
+
 
 ULONG STDMETHODCALLTYPE CClassFactory::AddRef(void)
 {
     return InterlockedIncrement(&m_RefCnt);
 }
 
-//-----------------------------
+
 
 ULONG STDMETHODCALLTYPE CClassFactory::Release(void)
 {
@@ -93,9 +93,9 @@ ULONG STDMETHODCALLTYPE CClassFactory::Release(void)
     return refcnt;
 }
 
-//-----------------------------
+
 // IClassFactory methods
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
             IUnknown __RPC_FAR *pUnkOuter,
@@ -132,7 +132,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
     return hr;
 }
 
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock)
 {
@@ -144,7 +144,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer(BOOL fLock)
     return S_OK;
 }
 
-//-----------------------------
+
 
 bool CClassFactory::IsLocked()
 {
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index 9b276adeb393..6f4129e8f21f 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -31,7 +31,7 @@
 #pragma GCC diagnostic warning "-Wmissing-braces"
 #endif
 
-//----------------------------
+
 
 namespace /* private */
 {
@@ -48,7 +48,7 @@ namespace /* private */
     size_t ColumnInfoTableSize = sizeof(ColumnInfoTable)/sizeof(ColumnInfoTable[0]);
 }
 
-//----------------------------
+
 
 CColumnInfo::CColumnInfo(long RefCnt) :
     m_RefCnt(RefCnt)
@@ -56,16 +56,16 @@ CColumnInfo::CColumnInfo(long RefCnt) :
     InterlockedIncrement(&g_DllRefCnt);
 }
 
-//----------------------------
+
 
 CColumnInfo::~CColumnInfo()
 {
     InterlockedDecrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 // IUnknown methods
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject)
 {
@@ -82,14 +82,14 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::QueryInterface(REFIID riid, void __RPC_FA
     return E_NOINTERFACE;
 }
 
-//----------------------------
+
 
 ULONG STDMETHODCALLTYPE CColumnInfo::AddRef(void)
 {
     return InterlockedIncrement(&m_RefCnt);
 }
 
-//----------------------------
+
 
 ULONG STDMETHODCALLTYPE CColumnInfo::Release( void)
 {
@@ -101,18 +101,18 @@ ULONG STDMETHODCALLTYPE CColumnInfo::Release( void)
     return refcnt;
 }
 
-//-----------------------------
+
 // IColumnProvider
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CColumnInfo::Initialize(LPCSHCOLUMNINIT /*psci*/)
 {
     return S_OK;
 }
 
-//-----------------------------
+
 // Register all columns we support
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO *psci)
 {
@@ -132,7 +132,7 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetColumnInfo(DWORD dwIndex, SHCOLUMNINFO
     return S_OK;
 }
 
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOLUMNDATA pscd, VARIANT *pvarData)
 {
@@ -198,7 +198,7 @@ HRESULT STDMETHODCALLTYPE CColumnInfo::GetItemData(LPCSHCOLUMNID pscid, LPCSHCOL
     return S_FALSE;
 }
 
-//-----------------------------
+
 
 bool CColumnInfo::IsOOFileExtension(wchar_t* Extension) const
 {
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 9dbb6fe88911..29cb838d303e 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -38,7 +38,7 @@
 #define KB 1024.0
 const std::wstring WSPACE = std::wstring(SPACE);
 
-//-----------------------------
+
 
 CInfoTip::CInfoTip(long RefCnt) :
     m_RefCnt(RefCnt)
@@ -47,16 +47,16 @@ CInfoTip::CInfoTip(long RefCnt) :
     InterlockedIncrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 
 CInfoTip::~CInfoTip()
 {
     InterlockedDecrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 // IUnknown methods
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject)
 {
@@ -82,14 +82,14 @@ HRESULT STDMETHODCALLTYPE CInfoTip::QueryInterface(REFIID riid, void __RPC_FAR *
     return E_NOINTERFACE;
 }
 
-//----------------------------
+
 
 ULONG STDMETHODCALLTYPE CInfoTip::AddRef(void)
 {
     return InterlockedIncrement(&m_RefCnt);
 }
 
-//----------------------------
+
 
 ULONG STDMETHODCALLTYPE CInfoTip::Release( void)
 {
@@ -191,9 +191,9 @@ std::wstring getFileSizeInfo(char* FileName)
     return EMPTY_STRING;
 }
 
-//----------------------------
+
 // IQueryInfo methods
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppwszTip)
 {
@@ -300,16 +300,16 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppws
     return E_FAIL;
 }
 
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoFlags(DWORD * /*pdwFlags*/ )
 {
     return E_NOTIMPL;
 }
 
-//----------------------------
+
 // IPersist methods
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::GetClassID(CLSID* pClassID)
 {
@@ -317,9 +317,9 @@ HRESULT STDMETHODCALLTYPE CInfoTip::GetClassID(CLSID* pClassID)
     return S_OK;
 }
 
-//----------------------------
+
 // IPersistFile methods
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/)
 {
@@ -345,28 +345,28 @@ HRESULT STDMETHODCALLTYPE CInfoTip::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/
     return S_OK;
 }
 
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::IsDirty(void)
 {
     return E_NOTIMPL;
 }
 
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/)
 {
     return E_NOTIMPL;
 }
 
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::SaveCompleted(LPCOLESTR /*pszFileName*/)
 {
     return E_NOTIMPL;
 }
 
-//----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CInfoTip::GetCurFile(LPOLESTR __RPC_FAR * /*ppszFileName*/)
 {
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index c5a57f11eef7..7f26e1259137 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -18,7 +18,7 @@
  */
 
 
-//--------------------------------------------------------------------------
+
 //  File:       ooofilt.cxx
 //  Contents:   Filter Implementation for OpenOffice.Org Document using
 //              Indexing Service
@@ -28,13 +28,13 @@
 //              to be filtered.
 //
 //  Platform:   Windows 2000, Windows XP
-//--------------------------------------------------------------------------
+
 #include "internal/contentreader.hxx"
 #include "internal/metainforeader.hxx"
 #include "internal/registry.hxx"
 #include "internal/fileextensions.hxx"
 
-//--------------------------------------------------------------------------
+
 //  Include file    Purpose
 //  windows.h       Win32 declarations
 //  string.h        string wstring declarations
@@ -44,7 +44,7 @@
 //  assert.h        assertion function.
 //  ooofilt.hxx     LibreOffice filter declarations
 //  propspec.hxx    PROPSPEC
-//--------------------------------------------------------------------------
+
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
@@ -72,13 +72,13 @@ using ::std::min;
 //C-------------------------------------------------------------------------
 //  Class:      COooFilter
 //  Summary:    Implements LibreOffice filter class
-//--------------------------------------------------------------------------
+
 //M-------------------------------------------------------------------------
 //  Method:     COooFilter::COooFilter
 //  Summary:    Class constructor
 //  Arguments:  void
 //  Purpose:    Manages global instance count
-//--------------------------------------------------------------------------
+
 COooFilter::COooFilter() :
     m_lRefs(1),
     m_pContentReader(NULL),
@@ -104,7 +104,7 @@ COooFilter::COooFilter() :
 //  Summary:    Class destructor
 //  Arguments:  void
 //  Purpose:    Manages global instance count and file handle
-//--------------------------------------------------------------------------
+
 COooFilter::~COooFilter()
 {
     delete [] m_pAttributes;
@@ -130,7 +130,7 @@ COooFilter::~COooFilter()
 //              Interface is supported
 //              E_NOINTERFACE
 //              Interface is not supported
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::QueryInterface(
     REFIID riid,
     void  ** ppvObject)
@@ -160,7 +160,7 @@ SCODE STDMETHODCALLTYPE COooFilter::QueryInterface(
 //  Summary:    Increments interface refcount
 //  Arguments:  void
 //  Returns:    Value of incremented interface refcount
-//--------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE COooFilter::AddRef()
 {
     return InterlockedIncrement( &m_lRefs );
@@ -170,7 +170,7 @@ ULONG STDMETHODCALLTYPE COooFilter::AddRef()
 //  Summary:    Decrements interface refcount, deleting if unreferenced
 //  Arguments:  void
 //  Returns:    Value of decremented interface refcount
-//--------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE COooFilter::Release()
 {
     ULONG ulTmp = InterlockedDecrement( &m_lRefs );
@@ -200,7 +200,7 @@ ULONG STDMETHODCALLTYPE COooFilter::Release()
 //                  Unable to access file to be filtered
 //              FILTER_E_PASSWORD
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 const int COUNT_ATTRIBUTES = 5;
 
 SCODE STDMETHODCALLTYPE COooFilter::Init(
@@ -310,7 +310,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Init(
 //                  (not implemented)
 //              FILTER_E_PASSWORD
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat)
 {
     for(;;)
@@ -407,7 +407,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetChunk(STAT_CHUNK * pStat)
 //                  All of the text in the current chunk has been returned
 //              FILTER_S_LAST_TEXT
 //                  Next call to GetText will return FILTER_E_NO_MORE_TEXT
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffer)
 {
     switch ( m_eState )
@@ -446,7 +446,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe
 //  Arguments:  ulPropID
 //                  [in] property ID
 //  Returns:    corresponding metainfo names.
-//--------------------------------------------------------------------------
+
 
 ::std::wstring GetMetaInfoNameFromPropertyId( ULONG ulPropID )
 {
@@ -469,7 +469,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetText(ULONG * pcwcBuffer, WCHAR * awcBuffe
 //                  Always
 //              FILTER_E_NO_MORE_VALUES
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 
 SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue)
 {
@@ -515,7 +515,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetValue(PROPVARIANT ** ppPropValue)
 //                  Always
 //              FILTER_W_REGION_CLIPPED
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 
 SCODE STDMETHODCALLTYPE COooFilter::BindRegion(
     FILTERREGION /*origPos*/,
@@ -534,7 +534,7 @@ SCODE STDMETHODCALLTYPE COooFilter::BindRegion(
 //                  Always
 //              E_FAIL
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID)
 {
     *pClassID = CLSID_COooFilter;
@@ -548,7 +548,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID)
 //                  Always
 //              S_OK
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::IsDirty()
 {
     // File is opened read-only and never changes
@@ -568,7 +568,7 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty()
 //                  File could not be loaded due to insufficient memory
 //              E_FAIL
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/)
 {
     // Load just sets the filename for GetChunk to read and ignores the mode
@@ -603,7 +603,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/)
 //                  Always
 //              S_OK
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRemember*/)
 {
     // File is opened read-only; saving it is an error
@@ -617,7 +617,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRememb
 //                       absolute path where file was previously saved
 //  Returns:    S_OK
 //                  Always
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/)
 {
     // File is opened read-only, so "save" is always finished
@@ -632,7 +632,7 @@ SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/)
 //  Returns:    S_OK
 //              E_OUTOFMEMORY
 //              E_FAIL
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
 {
     m_pStream = new BufferStream(pStm);
@@ -659,7 +659,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
 //  Arguments:  pcbSize
 //                  [out] Pointer to a 64 bit unsigned int indicating the size needed
 //  Returns:    E_NOTIMPL
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
 {
     return E_NOTIMPL;
@@ -673,7 +673,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
 //              fClearDirty
 //                  [in] Indicates whether to clear dirty flag
 //  Returns:    E_NOTIMPL
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
 {
     return E_NOTIMPL;
@@ -694,7 +694,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
 //              E_FAIL
 //                  Operation failed due to some reason
 //                  other than insufficient memory
-//-------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName)
 {
     if ( EMPTY_STRING == m_pwszFileName )
@@ -709,7 +709,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName)
 //  Summary:    Class factory constructor
 //  Arguments:  void
 //  Purpose:    Manages global instance count
-//--------------------------------------------------------------------------
+
 COooFilterCF::COooFilterCF() :
     m_lRefs(1)
 {
@@ -720,7 +720,7 @@ COooFilterCF::COooFilterCF() :
 //  Summary:    Class factory destructor
 //  Arguments:  void
 //  Purpose:    Manages global instance count
-//--------------------------------------------------------------------------
+
 COooFilterCF::~COooFilterCF()
 {
    InterlockedDecrement( &g_lInstances );
@@ -736,7 +736,7 @@ COooFilterCF::~COooFilterCF()
 //                  Interface is supported
 //              E_NOINTERFACE
 //                  Interface is not supported
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void  ** ppvObject)
 {
     IUnknown *pUnkTemp;
@@ -759,7 +759,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void  ** ppvOb
 //  Summary:    Increments interface refcount
 //  Arguments:  void
 //  Returns:    Value of incremented interface refcount
-//-------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE COooFilterCF::AddRef()
 {
    return InterlockedIncrement( &m_lRefs );
@@ -769,7 +769,7 @@ ULONG STDMETHODCALLTYPE COooFilterCF::AddRef()
 //  Summary:    Decrements interface refcount, deleting if unreferenced
 //  Arguments:  void
 //  Returns:    Value of decremented refcount
-//--------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE COooFilterCF::Release()
 {
     ULONG ulTmp = InterlockedDecrement( &m_lRefs );
@@ -798,7 +798,7 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release()
 //                  due to insufficient memory
 //              E_UNEXPECTED
 //                  Unsuccessful due to an unexpected condition
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance(
     IUnknown * pUnkOuter,
     REFIID riid,
@@ -834,7 +834,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance(
 //                  (not implemented)
 //              E_UNEXPECTED
 //                  (not implemented)
-//--------------------------------------------------------------------------
+
 SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock)
 {
     if( fLock )
@@ -846,7 +846,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock)
 //+-------------------------------------------------------------------------
 //  DLL:        ooofilt.dll
 //  Summary:    Implements Dynamic Link Library functions for LibreOffice filter
-//--------------------------------------------------------------------------
+
 //F-------------------------------------------------------------------------
 //  Function:   DllMain
 //  Summary:    Called from C-Runtime on process/thread attach/detach
@@ -858,7 +858,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock)
 //                  [in] Details of DLL initialization and cleanup
 //  Returns:    TRUE
 //                  Always
-//--------------------------------------------------------------------------
+
 extern "C" BOOL WINAPI DllMain(
     HINSTANCE hInstance,
     DWORD     fdwReason,
@@ -888,7 +888,7 @@ extern "C" BOOL WINAPI DllMain(
 //                  Insufficient memory to create the class factory object
 //              E_UNEXPECTED
 //                  Unsuccessful due to an unexpected condition
-//-------------------------------------------------------------------------
+
 extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
     REFCLSID   cid,
     REFIID     iid,
@@ -923,7 +923,7 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
 //                  DLL can be unloaded now
 //              S_FALSE
 //                  DLL must remain loaded
-//--------------------------------------------------------------------------
+
 extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow()
 {
     if ( 0 >= g_lInstances )
@@ -960,12 +960,12 @@ extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow()
 //                      (not implemented)
 //                  E_UNEXPECTED
 //                      (not implemented)
-//--------------------------------------------------------------------------
+
 
 
 //F-------------------------------------------------------------------------
 //  helper functions to register the Indexing Service.
-//--------------------------------------------------------------------------
+
 
 namespace /* private */
 {
@@ -981,10 +981,10 @@ namespace /* private */
 
     const char* INDEXING_FILTER_DLLSTOREGISTER      = "SYSTEM\\CurrentControlSet\\Control\\ContentIndex";
 
-    //---------------------------
+
     // "String Placeholder" ->
     // "String Replacement"
-    //---------------------------
+
 
     void SubstitutePlaceholder(std::string& String, const std::string& Placeholder, const std::string& Replacement)
     {
@@ -998,12 +998,12 @@ namespace /* private */
         }
     }
 
-    //----------------------------------------------
+
     // Make the registry entry and set Filter Handler
     // HKCR\CLSID\{7BC0E710-5703-45be-A29D-5D46D8B39262} = LibreOffice Filter
     //                   InProcServer32  (Default)       = Path\ooofilt.dll
     //                                   ThreadingModel  = Both
-    //----------------------------------------------
+
 
     HRESULT RegisterFilterHandler(const char* FilePath, const CLSID& FilterGuid)
     {
@@ -1025,12 +1025,12 @@ namespace /* private */
         return S_OK;
     }
 
-    //----------------------------------------------
+
     // Make the registry entry and set Persistent Handler
     // HKCR\CLSID\{7BC0E713-5703-45be-A29D-5D46D8B39262}  = LibreOffice Persistent Handler
     //      PersistentAddinsRegistered
     //          {89BCB740-6119-101A-BCB7-00DD010655AF} = {7BC0E710-5703-45be-A29D-5D46D8B39262}
-    //----------------------------------------------
+
 
     HRESULT RegisterPersistentHandler(const CLSID& FilterGuid, const CLSID& PersistentGuid)
     {
@@ -1064,9 +1064,9 @@ namespace /* private */
         return S_OK;
     }
 
-    //---------------------------
+
     // Unregister Filter Handler or persistent handler
-    //---------------------------
+
 
     HRESULT UnregisterHandler(const CLSID& Guid)
     {
@@ -1075,11 +1075,11 @@ namespace /* private */
         return DeleteRegistryKey(HKEY_CLASSES_ROOT, tmp.c_str()) ? S_OK : E_FAIL;
     }
 
-    //---------------------------
+
     // Register Indexing Service ext and class.
     // HKCR\{EXT}\PersistentHandler = {7BC0E713-5703-45be-A29D-5D46D8B39262}
     // HKCR\{GUID\PersistentHandler = {7BC0E713-5703-45be-A29D-5D46D8B39262}
-    //---------------------------
+
 
     HRESULT RegisterSearchHandler(const char* ModuleFileName)
     {
@@ -1164,11 +1164,11 @@ namespace /* private */
         return ((UnregisterHandler(CLSID_FILTER_HANDLER)==S_OK) && (UnregisterHandler(CLSID_PERSISTENT_HANDLER)==S_OK))?S_OK:E_FAIL;
     }
 
-    //---------------------------
+
     //    add or remove an entry to DllsToRegister entry of Indexing
     //    Filter to let Indexing Service register our filter automatically
     //    each time.
-    //---------------------------
+
     HRESULT AddOrRemoveDllsToRegisterList( const ::std::string & DllPath, bool isAdd )
     {
         char DllsToRegisterList[4096];
@@ -1240,7 +1240,7 @@ STDAPI DllRegisterServer()
     return S_OK;
 }
 
-//---------------------------
+
 
 STDAPI DllUnregisterServer()
 {
diff --git a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
index ae0859f004e0..233cf86dca76 100644
--- a/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/propspec.cxx
@@ -21,7 +21,7 @@
 //+-------------------------------------------------------------------------
 //  File:       propspec.cxx
 //  Contents:   C++ wrappers for FULLPROPSPEC
-//--------------------------------------------------------------------------
+
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
@@ -48,7 +48,7 @@
 //  Member:     CFullPropSpec::CFullPropSpec, public
 //  Synopsis:   Default constructor
 //  Effects:    Defines property with null guid and propid 0
-//--------------------------------------------------------------------------
+
 
 CFullPropSpec::CFullPropSpec()
 {
@@ -61,7 +61,7 @@ CFullPropSpec::CFullPropSpec()
 //  Synopsis:   Construct propid based propspec
 //  Arguments:  [guidPropSet]  -- Property set
 //              [pidProperty] -- Property
-//--------------------------------------------------------------------------
+
 CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) :
     _guidPropSet( guidPropSet )
 {
@@ -73,7 +73,7 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet, PROPID pidProperty ) :
 //  Synopsis:   Construct name based propspec
 //  Arguments:  [guidPropSet] -- Property set
 //              [wcsProperty] -- Property
-//--------------------------------------------------------------------------
+
 CFullPropSpec::CFullPropSpec( GUID const & guidPropSet,
                               WCHAR const * wcsProperty ) :
     _guidPropSet( guidPropSet )
@@ -85,7 +85,7 @@ CFullPropSpec::CFullPropSpec( GUID const & guidPropSet,
 //  Member:     CFullPropSpec::CFullPropSpec, public
 //  Synopsis:   Copy constructor
 //  Arguments:  [src] -- Source property spec
-//--------------------------------------------------------------------------
+
 CFullPropSpec::CFullPropSpec( CFullPropSpec const & src ) :
     _guidPropSet( src._guidPropSet )
 {
@@ -113,7 +113,7 @@ inline void * operator new( size_t /*size*/, void * p )
 //  Member:     CFullPropSpec::operator=, public
 //  Synopsis:   Assignment operator
 //  Arguments:  [Property] -- Source property
-//--------------------------------------------------------------------------
+
 CFullPropSpec & CFullPropSpec::operator=( CFullPropSpec const & Property )
 {
     // Clean up.
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index a961c9da777a..8d25aef23749 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -38,9 +38,9 @@
 
 #include "internal/stream_helper.hxx"
 
-//---------------------------
+
 // Module global
-//---------------------------
+
 long g_DllRefCnt = 0;
 HINSTANCE g_hModule = NULL;
 
@@ -63,7 +63,7 @@ PROPERTYMAP g_rgPROPERTYMAP[] =
 
 size_t gPropertyMapTableSize = sizeof(g_rgPROPERTYMAP)/sizeof(g_rgPROPERTYMAP[0]);
 
-//----------------------------
+
 
 CPropertyHdl::CPropertyHdl( long nRefCnt ) :
     m_RefCnt( nRefCnt ),
@@ -73,7 +73,7 @@ CPropertyHdl::CPropertyHdl( long nRefCnt ) :
     InterlockedIncrement( &g_DllRefCnt );
 }
 
-//----------------------------
+
 
 CPropertyHdl::~CPropertyHdl()
 {
@@ -85,9 +85,9 @@ CPropertyHdl::~CPropertyHdl()
     InterlockedDecrement( &g_DllRefCnt );
 }
 
-//-----------------------------
+
 // IUnknown methods
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject)
 {
     *ppvObject = 0;
@@ -121,13 +121,13 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::QueryInterface(REFIID riid, void __RPC_F
     return E_NOINTERFACE;
 }
 
-//----------------------------
+
 ULONG STDMETHODCALLTYPE CPropertyHdl::AddRef( void )
 {
     return InterlockedIncrement( &m_RefCnt );
 }
 
-//----------------------------
+
 ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void )
 {
     long refcnt = InterlockedDecrement( &m_RefCnt );
@@ -138,9 +138,9 @@ ULONG STDMETHODCALLTYPE CPropertyHdl::Release( void )
     return refcnt;
 }
 
-//-----------------------------
+
 // IPropertyStore
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE CPropertyHdl::GetCount( DWORD *pcProps )
 {
     HRESULT hr = E_UNEXPECTED;
@@ -152,7 +152,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetCount( DWORD *pcProps )
     return hr;
 }
 
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE CPropertyHdl::GetAt( DWORD iProp, PROPERTYKEY *pKey )
 {
     HRESULT hr = E_UNEXPECTED;
@@ -164,7 +164,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetAt( DWORD iProp, PROPERTYKEY *pKey )
     return hr;
 }
 
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE CPropertyHdl::GetValue( REFPROPERTYKEY key, PROPVARIANT *pPropVar )
 {
     HRESULT hr = E_UNEXPECTED;
@@ -176,7 +176,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::GetValue( REFPROPERTYKEY key, PROPVARIAN
     return hr;
 }
 
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE
 CPropertyHdl::SetValue(REFPROPERTYKEY /*key*/, REFPROPVARIANT /*propVar*/)
 {
@@ -188,15 +188,15 @@ CPropertyHdl::SetValue(REFPROPERTYKEY /*key*/, REFPROPVARIANT /*propVar*/)
     return hr;
 }
 
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE CPropertyHdl::Commit()
 {
     return S_OK;
 }
 
-//-----------------------------
+
 // IPropertyStore
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE
 CPropertyHdl::IsPropertyWritable(REFPROPERTYKEY /*key*/)
 {
@@ -204,9 +204,9 @@ CPropertyHdl::IsPropertyWritable(REFPROPERTYKEY /*key*/)
     return S_FALSE;
 }
 
-//-----------------------------
+
 // IInitializeWithStream
-//-----------------------------
+
 HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfMode )
 {
     if ( grfMode & STGM_READWRITE )
@@ -241,7 +241,7 @@ HRESULT STDMETHODCALLTYPE CPropertyHdl::Initialize( IStream *pStream, DWORD grfM
     return S_OK;
 }
 
-//-----------------------------
+
 void CPropertyHdl::LoadProperties( CMetaInfoReader *pMetaInfoReader )
 {
     OutputDebugStringFormat( "CPropertyHdl: LoadProperties\n" );
@@ -264,7 +264,7 @@ void CPropertyHdl::LoadProperties( CMetaInfoReader *pMetaInfoReader )
     }
 }
 
-//-----------------------------
+
 HRESULT CPropertyHdl::GetItemData( CMetaInfoReader *pMetaInfoReader, UINT nIndex, PROPVARIANT *pVarData )
 {
     switch (nIndex) {
@@ -309,13 +309,13 @@ HRESULT CPropertyHdl::GetItemData( CMetaInfoReader *pMetaInfoReader, UINT nIndex
     return S_FALSE;
 }
 
-//-----------------------------------------------------------------------------
+
 //                              CClassFactory
-//-----------------------------------------------------------------------------
+
 
 long CClassFactory::s_ServerLocks = 0;
 
-//-----------------------------------------------------------------------------
+
 CClassFactory::CClassFactory( const CLSID& clsid ) :
     m_RefCnt(1),
     m_Clsid(clsid)
@@ -323,15 +323,15 @@ CClassFactory::CClassFactory( const CLSID& clsid ) :
     InterlockedIncrement( &g_DllRefCnt );
 }
 
-//-----------------------------------------------------------------------------
+
 CClassFactory::~CClassFactory()
 {
     InterlockedDecrement( &g_DllRefCnt );
 }
 
-//-----------------------------------------------------------------------------
+
 //                              IUnknown methods
-//-----------------------------------------------------------------------------
+
 HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject )
 {
     *ppvObject = 0;
@@ -347,13 +347,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::QueryInterface( REFIID riid, void __RPC
     return E_NOINTERFACE;
 }
 
-//-----------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE CClassFactory::AddRef( void )
 {
     return InterlockedIncrement( &m_RefCnt );
 }
 
-//-----------------------------------------------------------------------------
+
 ULONG STDMETHODCALLTYPE CClassFactory::Release( void )
 {
     long refcnt = InterlockedDecrement( &m_RefCnt );
@@ -364,9 +364,9 @@ ULONG STDMETHODCALLTYPE CClassFactory::Release( void )
     return refcnt;
 }
 
-//-----------------------------------------------------------------------------
+
 //                          IClassFactory methods
-//-----------------------------------------------------------------------------
+
 HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
             IUnknown __RPC_FAR *pUnkOuter,
             REFIID riid,
@@ -393,7 +393,7 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
     return hr;
 }
 
-//-----------------------------------------------------------------------------
+
 HRESULT STDMETHODCALLTYPE CClassFactory::LockServer( BOOL fLock )
 {
     if ( fLock )
@@ -404,13 +404,13 @@ HRESULT STDMETHODCALLTYPE CClassFactory::LockServer( BOOL fLock )
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------
+
 bool CClassFactory::IsLocked()
 {
     return ( s_ServerLocks > 0 );
 }
 
-//-----------------------------------------------------------------------------
+
 extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
 {
     OutputDebugStringFormat( "DllGetClassObject.\n" );
@@ -427,7 +427,7 @@ extern "C" STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------
+
 extern "C" STDAPI DllCanUnloadNow( void )
 {
     OutputDebugStringFormat( "DllCanUnloadNow.\n" );
@@ -437,7 +437,7 @@ extern "C" STDAPI DllCanUnloadNow( void )
     return S_OK;
 }
 
-//-----------------------------------------------------------------------------
+
 BOOL WINAPI DllMain( HINSTANCE hInst, ULONG /*ul_reason_for_call*/, LPVOID /*lpReserved*/ )
 {
     OutputDebugStringFormat( "DllMain.\n" );
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 91d7632507f4..7984f2dc22dc 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -31,7 +31,7 @@
 #include <tchar.h>
 #include "internal/resource.h"
 
-//------------------------------------
+
 
 list_view_builder_ptr create_list_view_builder(
     HWND hwnd_lv, const std::wstring& col1, const std::wstring& col2)
@@ -42,7 +42,7 @@ list_view_builder_ptr create_list_view_builder(
         return list_view_builder_ptr(new list_view_builder(hwnd_lv, col1, col2));
 }
 
-//------------------------------------
+
 
 list_view_builder::list_view_builder(
     HWND hwnd_list_view,
@@ -55,13 +55,13 @@ list_view_builder::list_view_builder(
 {
 }
 
-//------------------------------------
+
 
 list_view_builder::~list_view_builder()
 {
 }
 
-//------------------------------------
+
 
 void list_view_builder::build(statistic_group_list_t& gl)
 {
@@ -83,7 +83,7 @@ void list_view_builder::build(statistic_group_list_t& gl)
     }
 }
 
-//------------------------------------
+
 
 void list_view_builder::setup_list_view()
 {
@@ -113,14 +113,14 @@ void list_view_builder::setup_list_view()
     ListView_InsertColumn(hwnd_list_view_, 1, &lvc);
 }
 
-//------------------------------------
+
 
 void list_view_builder::insert_group(const std::wstring& /*title*/)
 {
     insert_item(L"", L"", false);
 }
 
-//------------------------------------
+
 
 void list_view_builder::insert_item(const std::wstring& title, const std::wstring& value, bool is_editable)
 {
@@ -153,14 +153,14 @@ void list_view_builder::insert_item(const std::wstring& title, const std::wstrin
     ListView_SetItem(hwnd_list_view_, &lvi);
 }
 
-//------------------------------------
+
 
 HWND list_view_builder::get_list_view() const
 {
     return hwnd_list_view_;
 }
 
-//------------------------------------
+
 
 winxp_list_view_builder::winxp_list_view_builder(
     HWND hwnd_list_view,
@@ -172,7 +172,7 @@ winxp_list_view_builder::winxp_list_view_builder(
 {
 }
 
-//------------------------------------
+
 
 void winxp_list_view_builder::setup_list_view()
 {
@@ -181,7 +181,7 @@ void winxp_list_view_builder::setup_list_view()
     ListView_EnableGroupView(get_list_view(), TRUE);
 }
 
-//------------------------------------
+
 
 void winxp_list_view_builder::insert_group(const std::wstring& name)
 {
@@ -200,7 +200,7 @@ void winxp_list_view_builder::insert_group(const std::wstring& name)
     ListView_InsertGroup(get_list_view(), row_count_++, &lvg);
 }
 
-//------------------------------------
+
 
 void winxp_list_view_builder::insert_item(
     const std::wstring& title, const std::wstring& value, bool is_editable)
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 505346d6b0dc..936b3dba32f2 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -49,7 +49,7 @@
     INFO - INFO - INFO - INFO - INFO - INFO
 ----------------------------------------------*/
 
-//-----------------------------
+
 
 CPropertySheet::CPropertySheet(long RefCnt) :
     m_RefCnt(RefCnt)
@@ -58,7 +58,7 @@ CPropertySheet::CPropertySheet(long RefCnt) :
     InterlockedIncrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 
 CPropertySheet::~CPropertySheet()
 {
@@ -66,9 +66,9 @@ CPropertySheet::~CPropertySheet()
     InterlockedDecrement(&g_DllRefCnt);
 }
 
-//-----------------------------
+
 // IUnknown methods
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface(
     REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject)
@@ -94,7 +94,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::QueryInterface(
     return E_NOINTERFACE;
 }
 
-//-----------------------------
+
 
 ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void)
 {
@@ -102,7 +102,7 @@ ULONG STDMETHODCALLTYPE CPropertySheet::AddRef(void)
     return InterlockedIncrement(&m_RefCnt);
 }
 
-//-----------------------------
+
 
 ULONG STDMETHODCALLTYPE CPropertySheet::Release(void)
 {
@@ -115,9 +115,9 @@ ULONG STDMETHODCALLTYPE CPropertySheet::Release(void)
     return refcnt;
 }
 
-//-----------------------------
+
 // IShellExtInit
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
     LPCITEMIDLIST /*pidlFolder*/, LPDATAOBJECT lpdobj, HKEY /*hkeyProgID*/)
@@ -166,9 +166,9 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
     return hr;
 }
 
-//-----------------------------
+
 // IShellPropSheetExt
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
 {
@@ -239,7 +239,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP
     return NOERROR;
 }
 
-//-----------------------------
+
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage(
     UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/)
@@ -247,7 +247,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage(
     return E_NOTIMPL;
 }
 
-//-----------------------------
+
 
 UINT CALLBACK CPropertySheet::PropPageSummaryCallback(
     HWND /*hwnd*/, UINT uMsg, LPPROPSHEETPAGE ppsp)
@@ -266,7 +266,7 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback(
 }
 
 
-//-----------------------------
+
 
 BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam)
 {
@@ -284,7 +284,7 @@ BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM
     return FALSE;
 }
 
-//-----------------------------
+
 
 BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam)
 {
@@ -329,7 +329,7 @@ void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
     }
 }
 
-//---------------------------------
+
 /**
 */
 void CPropertySheet::InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index a2f8a1d3bc8a..74357bfddc34 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -29,9 +29,9 @@
 #include <string>
 #include <shlobj.h>
 
-//---------------------------
+
 // Module global
-//---------------------------
+
 long g_DllRefCnt = 0;
 HINSTANCE g_hModule = NULL;
 
@@ -53,10 +53,10 @@ namespace /* private */
 
     const char* SHELL_EXTENSION_APPROVED_KEY_NAME   = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved";
 
-    //---------------------------
+
     // "String Placeholder" ->
     // "String Replacement"
-    //---------------------------
+
     void SubstitutePlaceholder(std::string& String, const std::string& Placeholder, const std::string& Replacement)
     {
         std::string::size_type idx = String.find(Placeholder);
@@ -298,9 +298,9 @@ namespace /* private */
 } // namespace /* private */
 
 
-//---------------------
+
 // COM exports
-//---------------------
+
 
 extern "C" STDAPI DllRegisterServer()
 {
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index 3e12e040cce5..2ee68f3b5f42 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -21,7 +21,7 @@
 #include "internal/fileextensions.hxx"
 #include <sal/macros.h>
 
-//------------------------------------
+
 
 const std::string WRITER_FILE_EXTENSIONS   = "sxwstwsxgodtottodm";
 const std::string CALC_FILE_EXTENSIONS     = "sxcstcodsots";
@@ -59,7 +59,7 @@ FileExtensionEntry OOFileExtensionTable[] = {
 
 size_t OOFileExtensionTableSize = sizeof(OOFileExtensionTable)/sizeof(OOFileExtensionTable[0]);
 
-//---------------------------------
+
 /** Return the extension of a file
     name without the '.'
 */
@@ -73,7 +73,7 @@ std::string get_file_name_extension(const std::string& file_name)
     return std::string();
 }
 
-//---------------------------------
+
 /** Return the type of a file
 */
 
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index bcf089d28abd..537ca8d36ab1 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -27,7 +27,7 @@
 #include <sstream>
 #include <iomanip>
 
-//-----------------------------------
+
 /* Converts ISO 8601 conform date/time
    represenation to the representation
    conforming to the current locale
@@ -88,7 +88,7 @@ std::wstring iso8601_date_to_local_date(const std::wstring& isoDate )
     return ws8601DateTime;
 }
 
-//------------------------------------
+
 /* Converts ISO 8601 conform duration
    representation to the representation
    conforming to the current locale
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index 01bb22587952..256ebd16c17c 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -36,12 +36,12 @@
 #pragma warning(pop)
 #endif
 
-//---------------------------------------
+
 
 // Size of a CLSID as a string
 const int CLSID_STRING_SIZE = 39;
 
-//---------------------------------------
+
 
 bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, const char* Value)
 {
@@ -64,7 +64,7 @@ bool SetRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, co
     return (ERROR_SUCCESS == rc);
 }
 
-//---------------------------------------
+
 
 bool DeleteRegistryKey(HKEY RootKey, const char* KeyName)
 {
@@ -163,7 +163,7 @@ std::string ClsidToString(const CLSID& clsid)
     return std::string(buff);
 }
 
-//---------------------------------------
+
 
 bool QueryRegistryKey(HKEY RootKey, const char* KeyName, const char* ValueName, char *pszData, DWORD dwBufLen)
 {
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 6fc78002a339..1f2423dbd40a 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -25,9 +25,9 @@
 #include "internal/config.hxx"
 #include "internal/utilities.hxx"
 
-//-----------------------------
+
 // constants
-//-----------------------------
+
 
 const size_t MAX_RES_STRING = 1024;
 const wchar_t SPACE_CHAR = _T(' ');
@@ -60,7 +60,7 @@ static std::string WStringToString(const std::wstring& String, int codepage)
     return std::string(buff);
 }
 
-//---------------------------------
+
 /**
 */
 std::wstring StringToWString(const std::string& String)
@@ -68,7 +68,7 @@ std::wstring StringToWString(const std::string& String)
     return StringToWString(String, CP_ACP);
 }
 
-//---------------------------------
+
 /**
 */
 std::string WStringToString(const std::wstring& String)
@@ -76,7 +76,7 @@ std::string WStringToString(const std::wstring& String)
     return WStringToString(String, CP_ACP);
 }
 
-//---------------------------------
+
 /**
 */
 std::wstring UTF8ToWString(const std::string& String)
@@ -84,7 +84,7 @@ std::wstring UTF8ToWString(const std::string& String)
     return StringToWString(String, CP_UTF8);
 }
 
-//---------------------------------
+
 /**
 */
 std::wstring GetResString(int ResId)
@@ -99,7 +99,7 @@ std::wstring GetResString(int ResId)
     return std::wstring(szResStr);
 }
 
-//---------------------------------
+
 /**
 */
 bool is_windows_xp_or_above()
@@ -118,7 +118,7 @@ bool is_windows_xp_or_above()
     return false;
 }
 
-//---------------------------------
+
 /** helper function to judge if the string is only has spaces.
     @returns
         <TRUE>if the provided string contains only but at least one space
@@ -141,7 +141,7 @@ bool HasOnlySpaces(const std::wstring& String)
     return true;
 }
 
-//---------------------------------
+
 /** helper function to convert windows paths to short form.
     @returns
         shortend path.
diff --git a/shell/source/win32/simplemail/smplmailentry.cxx b/shell/source/win32/simplemail/smplmailentry.cxx
index 6fa91c379b21..5812d1e41e1c 100644
--- a/shell/source/win32/simplemail/smplmailentry.cxx
+++ b/shell/source/win32/simplemail/smplmailentry.cxx
@@ -22,9 +22,9 @@
 #include <osl/diagnose.h>
 #include "smplmailsuppl.hxx"
 
-//-----------------------------------------------------------------------
+
 // namespace directives
-//-----------------------------------------------------------------------
+
 
 using namespace ::rtl                       ;
 using namespace ::com::sun::star::uno       ;
@@ -37,7 +37,7 @@ using com::sun::star::system::XSimpleMailClientSupplier;
 #define COMP_SERVICE_NAME  "com.sun.star.system.SimpleSystemMail"
 #define COMP_IMPL_NAME     "com.sun.star.system.SimpleSystemMail"
 
-//-----------------------------------------------------------------------
+
 
 namespace
 {
@@ -49,10 +49,10 @@ namespace
 
 extern "C"
 {
-//----------------------------------------------------------------------
+
 // component_getFactory
 // returns a factory to create XFilePicker-Services
-//----------------------------------------------------------------------
+
 
 SAL_DLLPUBLIC_EXPORT void* SAL_CALL smplmail_component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
 {
diff --git a/shell/source/win32/simplemail/smplmailmsg.cxx b/shell/source/win32/simplemail/smplmailmsg.cxx
index d37fe836183a..1870b16ad3b0 100644
--- a/shell/source/win32/simplemail/smplmailmsg.cxx
+++ b/shell/source/win32/simplemail/smplmailmsg.cxx
@@ -22,9 +22,9 @@
 #include <osl/file.h>
 #include "smplmailmsg.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using com::sun::star::uno::Reference;
 using com::sun::star::uno::RuntimeException;
@@ -35,9 +35,9 @@ using osl::Mutex;
 
 using namespace cppu;
 
-//------------------------------------------------------------------------
+
 // helper functions
-//------------------------------------------------------------------------
+
 
 CSmplMailMsg::CSmplMailMsg( )
 {
@@ -55,7 +55,7 @@ void SAL_CALL CSmplMailMsg::setBody( const ::rtl::OUString& aBody )
     return m_aBody;
 }
 
-//------------------------------------------------
+
 
 void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient )
     throw (RuntimeException)
@@ -63,7 +63,7 @@ void SAL_CALL CSmplMailMsg::setRecipient( const OUString& aRecipient )
     m_aRecipient = aRecipient;
 }
 
-//------------------------------------------------
+
 
 OUString SAL_CALL CSmplMailMsg::getRecipient(  )
     throw (RuntimeException)
@@ -71,7 +71,7 @@ OUString SAL_CALL CSmplMailMsg::getRecipient(  )
     return m_aRecipient;
 }
 
-//------------------------------------------------
+
 
 void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecipient )
     throw (RuntimeException)
@@ -79,7 +79,7 @@ void SAL_CALL CSmplMailMsg::setCcRecipient( const Sequence< OUString >& aCcRecip
     m_CcRecipients = aCcRecipient;
 }
 
-//------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient(  )
     throw (RuntimeException)
@@ -87,7 +87,7 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getCcRecipient(  )
     return m_CcRecipients;
 }
 
-//------------------------------------------------
+
 
 void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRecipient )
     throw (RuntimeException)
@@ -95,7 +95,7 @@ void SAL_CALL CSmplMailMsg::setBccRecipient( const Sequence< OUString >& aBccRec
     m_BccRecipients = aBccRecipient;
 }
 
-//------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient(  )
     throw (RuntimeException)
@@ -103,7 +103,7 @@ Sequence< OUString > SAL_CALL CSmplMailMsg::getBccRecipient(  )
     return m_BccRecipients;
 }
 
-//------------------------------------------------
+
 
 void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator )
     throw (RuntimeException)
@@ -111,7 +111,7 @@ void SAL_CALL CSmplMailMsg::setOriginator( const OUString& aOriginator )
     m_aOriginator = aOriginator;
 }
 
-//------------------------------------------------
+
 
 OUString SAL_CALL CSmplMailMsg::getOriginator(  )
     throw (RuntimeException)
@@ -119,7 +119,7 @@ OUString SAL_CALL CSmplMailMsg::getOriginator(  )
     return m_aOriginator;
 }
 
-//------------------------------------------------
+
 
 void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject )
     throw (RuntimeException)
@@ -127,7 +127,7 @@ void SAL_CALL CSmplMailMsg::setSubject( const OUString& aSubject )
     m_aSubject = aSubject;
 }
 
-//------------------------------------------------
+
 
 OUString SAL_CALL CSmplMailMsg::getSubject(  )
     throw (RuntimeException)
@@ -135,7 +135,7 @@ OUString SAL_CALL CSmplMailMsg::getSubject(  )
     return m_aSubject;
 }
 
-//------------------------------------------------
+
 
 void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttachement )
     throw (IllegalArgumentException, RuntimeException)
@@ -143,7 +143,7 @@ void SAL_CALL CSmplMailMsg::setAttachement( const Sequence< OUString >& aAttache
     m_Attachements = aAttachement;
 }
 
-//------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL CSmplMailMsg::getAttachement(  )
     throw (RuntimeException)
diff --git a/shell/source/win32/workbench/TestSmplMail.cxx b/shell/source/win32/workbench/TestSmplMail.cxx
index 99e08359e17a..6d32d387a49e 100644
--- a/shell/source/win32/workbench/TestSmplMail.cxx
+++ b/shell/source/win32/workbench/TestSmplMail.cxx
@@ -36,9 +36,9 @@
 
 #include <osl/file.hxx>
 
-//--------------------------------------------------------------
+
 //  namesapces
-//--------------------------------------------------------------
+
 
 using namespace ::rtl                   ;
 using namespace ::cppu                  ;
@@ -49,24 +49,24 @@ using namespace com::sun::star::system;
 
 #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb"
 
-//--------------------------------------------------------------
+
 //  global variables
-//--------------------------------------------------------------
+
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
-//--------------------------------------------------------------
+
 //  main
-//--------------------------------------------------------------
+
 
 
 // int SAL_CALL main(int nArgc, char* Argv[], char* pEnv[]  )
 // make Warning free, leave out typename
 int SAL_CALL main(int , char*, char* )
 {
-    //-------------------------------------------------
+
     // get the global service-manager
-    //-------------------------------------------------
+
 
     // Get global factory for uno services.
     OUString rdbName = OUString( RDB_SYSPATH  );
@@ -81,9 +81,9 @@ int SAL_CALL main(int , char*, char* )
 
     printf("Creating RegistryServiceFactory successful\n");
 
-    //-------------------------------------------------
+
     // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
+
 
     try
     {
@@ -144,9 +144,9 @@ int SAL_CALL main(int , char*, char* )
     {
     }
 
-    //--------------------------------------------------
+
     // shutdown
-    //--------------------------------------------------
+
 
     // Cast factory to XComponent
     Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
diff --git a/shell/source/win32/workbench/TestSysShExec.cxx b/shell/source/win32/workbench/TestSysShExec.cxx
index 6d6ffb302420..fe1936ddb6ff 100644
--- a/shell/source/win32/workbench/TestSysShExec.cxx
+++ b/shell/source/win32/workbench/TestSysShExec.cxx
@@ -38,9 +38,9 @@
 #pragma warning(pop)
 #endif
 
-//--------------------------------------------------------------
+
 //  namesapces
-//--------------------------------------------------------------
+
 
 using namespace ::rtl                   ;
 using namespace ::cppu                  ;
@@ -51,24 +51,24 @@ using namespace com::sun::star::system;
 
 #define RDB_SYSPATH "D:\\Projects\\gsl\\shell\\wntmsci7\\bin\\applicat.rdb"
 
-//--------------------------------------------------------------
+
 //  global variables
-//--------------------------------------------------------------
+
 
 Reference< XMultiServiceFactory >   g_xFactory;
 
 
-//--------------------------------------------------------------
+
 //  main
-//--------------------------------------------------------------
+
 
 
 // int SAL_CALL main(int nArgc, char* Argv[], char* Env[]   )
 int SAL_CALL main(int nArgc, char* Argv[], char*    )
 {
-    //-------------------------------------------------
+
     // get the global service-manager
-    //-------------------------------------------------
+
 
     if ( nArgc < 4 )
         return 0;
@@ -86,9 +86,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char*    )
 
     printf("Creating RegistryServiceFactory successful\n");
 
-    //-------------------------------------------------
+
     // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
+
 
     Reference< XSystemShellExecute > xSysShExec(
         g_xFactory->createInstance("com.sun.star.system.SystemShellExecute"), UNO_QUERY );
@@ -116,9 +116,9 @@ int SAL_CALL main(int nArgc, char* Argv[], char*    )
         OSL_FAIL( "Invalid parameter" );
     }
 
-    //--------------------------------------------------
+
     // shutdown
-    //--------------------------------------------------
+
 
     // Cast factory to XComponent
     Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
diff --git a/shell/source/win32/zipfile/zipexcptn.cxx b/shell/source/win32/zipfile/zipexcptn.cxx
index 0f8e7fedcde9..f42165022eed 100644
--- a/shell/source/win32/zipfile/zipexcptn.cxx
+++ b/shell/source/win32/zipfile/zipexcptn.cxx
@@ -20,7 +20,7 @@
 #include "internal/global.hxx"
 #include "zipexcptn.hxx"
 
-//------------------------------------------
+
 /**
 */
 RuntimeException::RuntimeException(int Error) :
@@ -28,14 +28,14 @@ RuntimeException::RuntimeException(int Error) :
 {
 }
 
-//------------------------------------------
+
 /**
 */
 RuntimeException::~RuntimeException() throw()
 {
 }
 
-//------------------------------------------
+
 /**
 */
 int RuntimeException::GetErrorCode() const
@@ -43,7 +43,7 @@ int RuntimeException::GetErrorCode() const
     return m_Error;
 }
 
-//------------------------------------------
+
 /**
 */
 ZipException::ZipException(int Error) :
@@ -51,7 +51,7 @@ ZipException::ZipException(int Error) :
 {
 }
 
-//------------------------------------------
+
 /**
 */
 const char* ZipException::what() const throw()
@@ -59,7 +59,7 @@ const char* ZipException::what() const throw()
     return 0;
 }
 
-//------------------------------------------
+
 /**
 */
 Win32Exception::Win32Exception(int Error) :
@@ -68,7 +68,7 @@ Win32Exception::Win32Exception(int Error) :
 {
 }
 
-//------------------------------------------
+
 /**
 */
 Win32Exception::~Win32Exception() throw()
@@ -77,7 +77,7 @@ Win32Exception::~Win32Exception() throw()
         LocalFree(m_MsgBuff);
 }
 
-//------------------------------------------
+
 /**
 */
 const char* Win32Exception::what() const throw()
@@ -96,7 +96,7 @@ const char* Win32Exception::what() const throw()
     return reinterpret_cast<char*>(m_MsgBuff);
 }
 
-//------------------------------------------
+
 /**
 */
 ZipContentMissException::ZipContentMissException(int Error) :
@@ -104,7 +104,7 @@ ZipContentMissException::ZipContentMissException(int Error) :
 {
 }
 
-//------------------------------------------
+
 /**
 */
 AccessViolationException::AccessViolationException(int Error) :
@@ -112,7 +112,7 @@ AccessViolationException::AccessViolationException(int Error) :
 {
 }
 
-//------------------------------------------
+
 /**
 */
 IOException::IOException(int Error) :
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index d7877828e4fa..2d3017260eff 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -91,7 +91,7 @@ namespace slideshow
                 }
 
                 // Animation interface
-                // -------------------
+
                 virtual void prefetch( const AnimatableShapeSharedPtr&,
                                        const ShapeAttributeLayerSharedPtr& )
                 {}
@@ -137,7 +137,7 @@ namespace slideshow
                 }
 
                 // PairAnimation interface
-                // -----------------------
+
 
                 virtual bool operator()( const ::basegfx::B2DTuple& rValue )
                 {
@@ -245,7 +245,7 @@ namespace slideshow
                 }
 
                 // Animation interface
-                // -------------------
+
                 virtual void prefetch( const AnimatableShapeSharedPtr&,
                                        const ShapeAttributeLayerSharedPtr& )
                 {}
@@ -300,7 +300,7 @@ namespace slideshow
                 }
 
                 // NumberAnimation interface
-                // -----------------------
+
 
                 virtual bool operator()( double nValue )
                 {
@@ -443,7 +443,7 @@ namespace slideshow
                 }
 
                 // Animation interface
-                // -------------------
+
                 virtual void prefetch( const AnimatableShapeSharedPtr&,
                                        const ShapeAttributeLayerSharedPtr& )
                 {}
@@ -518,7 +518,7 @@ namespace slideshow
                 }
 
                 // Derived Animation interface
-                // ---------------------------
+
 
                 /** For by-reference interfaces (B2DTuple, OUString)
                  */
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index bdb6b90f5a36..e109f18262fb 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -365,7 +365,7 @@ bool implCreateIteratedNodes(
         else
         {
             // setup iteration parameters
-            // --------------------------
+
 
             // iterate target is the whole shape (or the
             // whole parent subshape), thus, can save
@@ -399,7 +399,7 @@ bool implCreateIteratedNodes(
 
 
             // iterate node, generate copies of the children for each subset
-            // -------------------------------------------------------------
+
 
             // NodeContext::mnStartDelay contains additional node delay.
             // This will make the duplicated nodes for each iteration start
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 57506f1da921..502bec2bf036 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -82,7 +82,7 @@ namespace slideshow
         private:
 
             // View layer methods
-            //------------------------------------------------------------------
+
 
             virtual void addViewLayer( const ViewLayerSharedPtr&    rNewLayer,
                                        bool                         bRedrawLayer );
@@ -91,7 +91,7 @@ namespace slideshow
 
 
             // ExternalShapeBase methods
-            //------------------------------------------------------------------
+
 
             virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const;
             virtual void implViewChanged( const UnoViewSharedPtr& rView );
@@ -127,7 +127,7 @@ namespace slideshow
         {
         }
 
-        // ---------------------------------------------------------------------
+
 
         void AppletShape::implViewChanged( const UnoViewSharedPtr& rView )
         {
@@ -143,7 +143,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         void AppletShape::implViewsChanged()
         {
@@ -156,7 +156,7 @@ namespace slideshow
                                  ::boost::cref( AppletShape::getBounds())) );
         }
 
-        // ---------------------------------------------------------------------
+
 
         void AppletShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer,
                                         bool                      bRedrawLayer )
@@ -185,7 +185,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::removeViewLayer( const ViewLayerSharedPtr& rLayer )
         {
@@ -219,7 +219,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::clearAllViewLayers()
         {
@@ -227,7 +227,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const
         {
@@ -248,7 +248,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::implStartIntrinsicAnimation()
         {
@@ -262,7 +262,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::implEndIntrinsicAnimation()
         {
@@ -275,7 +275,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::implPauseIntrinsicAnimation()
         {
@@ -284,14 +284,14 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool AppletShape::implIsIntrinsicAnimationPlaying() const
         {
             return mbIsPlaying;
         }
 
-        // ---------------------------------------------------------------------
+
 
         void AppletShape::implSetIntrinsicAnimationTime(double)
         {
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 79b3817ac1f8..674664ffdac9 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -82,7 +82,7 @@ namespace slideshow
                 ::com::sun::star::drawing::XShape > getXShape() const;
 
             // View layer methods
-            //------------------------------------------------------------------
+
 
             virtual void addViewLayer( const ViewLayerSharedPtr&    rNewLayer,
                                        bool                         bRedrawLayer );
@@ -91,7 +91,7 @@ namespace slideshow
 
 
             // attribute methods
-            //------------------------------------------------------------------
+
 
             virtual ::basegfx::B2DRectangle getBounds() const;
             virtual ::basegfx::B2DRectangle getDomBounds() const;
@@ -102,7 +102,7 @@ namespace slideshow
 
 
             // render methods
-            //------------------------------------------------------------------
+
 
             virtual bool update() const;
             virtual bool render() const;
@@ -149,7 +149,7 @@ namespace slideshow
 
             // there is a special background shape, add it
             // as the first one
-            // ---------------------------------------------------
+
 
             sal_Int32 nDocWidth=0;
             sal_Int32 nDocHeight=0;
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 76e60b4e13ef..1bb3a29459c6 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -207,7 +207,7 @@ namespace slideshow
 
 
             // determine what has to be updated
-            // --------------------------------
+
 
             // do we have an attribute layer?
             if( mpAttributeLayer )
@@ -327,7 +327,7 @@ namespace slideshow
 
 
                         // retrieve bounds for subset of whole metafile
-                        // --------------------------------------------
+
 
                         ::basegfx::B2DRange aTotalBounds;
 
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index d6375a9e1cdf..a6daaec7c2b0 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -54,7 +54,7 @@ namespace slideshow
 
         private:
             // ViewEventHandler
-            // -------------------------------------------------
+
 
             virtual void viewAdded( const UnoViewSharedPtr& ) {}
             virtual void viewRemoved( const UnoViewSharedPtr& ) {}
@@ -69,7 +69,7 @@ namespace slideshow
 
 
             // IntrinsicAnimationEventHandler
-            // -------------------------------------------------
+
 
             virtual bool enableAnimations()
             {
@@ -101,7 +101,7 @@ namespace slideshow
             mrEventMultiplexer.addViewHandler( mpListener );
         }
 
-        // ---------------------------------------------------------------------
+
 
         ExternalShapeBase::~ExternalShapeBase()
         {
@@ -119,56 +119,56 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         uno::Reference< drawing::XShape > ExternalShapeBase::getXShape() const
         {
             return mxShape;
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ExternalShapeBase::play()
         {
             implStartIntrinsicAnimation();
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ExternalShapeBase::stop()
         {
             implEndIntrinsicAnimation();
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ExternalShapeBase::pause()
         {
             implPauseIntrinsicAnimation();
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ExternalShapeBase::isPlaying() const
         {
             return implIsIntrinsicAnimationPlaying();
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ExternalShapeBase::setMediaTime(double fTime)
         {
             implSetIntrinsicAnimationTime(fTime);
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ExternalShapeBase::update() const
         {
             return render();
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ExternalShapeBase::render() const
         {
@@ -182,49 +182,49 @@ namespace slideshow
             return implRender( maBounds );
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ExternalShapeBase::isContentChanged() const
         {
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         ::basegfx::B2DRectangle ExternalShapeBase::getBounds() const
         {
             return maBounds;
         }
 
-        // ---------------------------------------------------------------------
+
 
         ::basegfx::B2DRectangle ExternalShapeBase::getDomBounds() const
         {
             return maBounds;
         }
 
-        // ---------------------------------------------------------------------
+
 
         ::basegfx::B2DRectangle ExternalShapeBase::getUpdateArea() const
         {
             return maBounds;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ExternalShapeBase::isVisible() const
         {
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         double ExternalShapeBase::getPriority() const
         {
             return mnPriority;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ExternalShapeBase::isBackgroundDetached() const
         {
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index c47b081c64ba..9c34049b400e 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -68,7 +68,7 @@ namespace slideshow
         private:
 
             // View layer methods
-            //------------------------------------------------------------------
+
 
             virtual void addViewLayer( const ViewLayerSharedPtr&    rNewLayer,
                                        bool                         bRedrawLayer );
@@ -77,7 +77,7 @@ namespace slideshow
 
 
             // ExternalShapeBase methods
-            //------------------------------------------------------------------
+
 
             virtual bool implRender( const ::basegfx::B2DRange& rCurrBounds ) const;
             virtual void implViewChanged( const UnoViewSharedPtr& rView );
@@ -104,7 +104,7 @@ namespace slideshow
         {
         }
 
-        // ---------------------------------------------------------------------
+
 
         void MediaShape::implViewChanged( const UnoViewSharedPtr& rView )
         {
@@ -120,7 +120,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         void MediaShape::implViewsChanged()
         {
@@ -133,7 +133,7 @@ namespace slideshow
                                  ::boost::cref( getBounds())) );
         }
 
-        // ---------------------------------------------------------------------
+
 
         void MediaShape::addViewLayer( const ViewLayerSharedPtr& rNewLayer,
                                        bool                      bRedrawLayer )
@@ -151,7 +151,7 @@ namespace slideshow
                 maViewMediaShapes.back()->render( getBounds() );
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::removeViewLayer( const ViewLayerSharedPtr& rLayer )
         {
@@ -185,7 +185,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::clearAllViewLayers()
         {
@@ -193,7 +193,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::implRender( const ::basegfx::B2DRange& rCurrBounds ) const
         {
@@ -214,7 +214,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::implStartIntrinsicAnimation()
         {
@@ -227,7 +227,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::implEndIntrinsicAnimation()
         {
@@ -240,7 +240,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::implPauseIntrinsicAnimation()
         {
@@ -253,14 +253,14 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool MediaShape::implIsIntrinsicAnimationPlaying() const
         {
             return mbIsPlaying;
         }
 
-        // ---------------------------------------------------------------------
+
 
         void MediaShape::implSetIntrinsicAnimationTime(double fTime)
         {
@@ -270,7 +270,7 @@ namespace slideshow
                                             _1, boost::cref(fTime)) );
         }
 
-        // ---------------------------------------------------------------------
+
 
         ShapeSharedPtr createMediaShape(
             const uno::Reference< drawing::XShape >& xShape,
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 5d1879fde006..2f1a8588d61f 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -356,7 +356,7 @@ ShapeSharedPtr ShapeImporter::createShape(
 
 
         // now extract relevant shape attributes via API
-        // ---------------------------------------------
+
 
         drawing::ColorMode eColorMode( drawing::ColorMode_STANDARD );
         sal_Int16 nLuminance(0);
@@ -400,7 +400,7 @@ ShapeSharedPtr ShapeImporter::createShape(
 
         // fetch readily transformed and color-modified
         // graphic
-        // ---------------------------------------------
+
 
         Graphic aGraphic(
             aGraphicObject.GetTransformedGraphic(
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 87175eeb3d8a..00f2456c7c1e 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -100,7 +100,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         ViewAppletShape::~ViewAppletShape()
         {
@@ -117,14 +117,14 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         ViewLayerSharedPtr ViewAppletShape::getViewLayer() const
         {
             return mpViewLayer;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds )
         {
@@ -213,7 +213,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ViewAppletShape::endApplet()
         {
@@ -228,7 +228,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewAppletShape::render( const ::basegfx::B2DRectangle& rBounds ) const
         {
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index e4138c3230db..24873968703a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -91,7 +91,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         ViewMediaShape::~ViewMediaShape()
         {
@@ -108,14 +108,14 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         ViewLayerSharedPtr ViewMediaShape::getViewLayer() const
         {
             return mpViewLayer;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewMediaShape::startMedia()
         {
@@ -128,7 +128,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ViewMediaShape::endMedia()
         {
@@ -159,7 +159,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ViewMediaShape::pauseMedia()
         {
@@ -167,7 +167,7 @@ namespace slideshow
                 mxPlayer->stop();
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ViewMediaShape::setMediaTime(double fTime)
         {
@@ -175,7 +175,7 @@ namespace slideshow
                 mxPlayer->setMediaTime(fTime);
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const
         {
@@ -278,7 +278,7 @@ namespace slideshow
             return true;
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewMediaShape::implInitialize( const ::basegfx::B2DRectangle& rBounds )
         {
@@ -354,7 +354,7 @@ namespace slideshow
             return mxPlayer.is() || mxPlayerWindow.is();
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ViewMediaShape::implSetMediaProperties( const uno::Reference< beans::XPropertySet >& rxProps )
         {
@@ -394,7 +394,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL )
         {
@@ -421,7 +421,7 @@ namespace slideshow
             }
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewMediaShape::implInitializeVCLBasedPlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
                                                                  const uno::Sequence< uno::Any >& rVCLDeviceParams)
@@ -509,7 +509,7 @@ namespace slideshow
             return mxPlayerWindow.is();
         }
 
-        // ---------------------------------------------------------------------
+
 
         bool ViewMediaShape::implInitializeDXBasedPlayerWindow( const ::basegfx::B2DRectangle&   rBounds,
                                                                 const uno::Sequence< uno::Any >& rDXDeviceParams )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 6be622bc5a99..6fc93cb21085 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -231,7 +231,7 @@ namespace slideshow
             else
             {
                 // render subsets of whole metafile
-                // --------------------------------
+
 
                 bool bRet(true);
                 VectorOfDocTreeNodes::const_iterator        aIter( rSubsets.begin() );
@@ -556,7 +556,7 @@ namespace slideshow
 
 
             // shape needs repaint - setup all that's needed
-            // ---------------------------------------------
+
 
             boost::optional<basegfx::B2DPolyPolygon> aClip;
 
@@ -580,7 +580,7 @@ namespace slideshow
                         // render with global alpha - have to prepare
                         // a bitmap, and render that with modulated
                         // alpha
-                        // -------------------------------------------
+
 
                         const ::basegfx::B2DHomMatrix aTransform(
                             getShapeTransformation( rBounds,
@@ -721,7 +721,7 @@ namespace slideshow
         }
 
 
-        // -------------------------------------------------------------------------------------
+
 
         ViewShape::ViewShape( const ViewLayerSharedPtr& rViewLayer ) :
             mpViewLayer( rViewLayer ),
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index bbe45787836f..7640e086ed01 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -816,7 +816,7 @@ namespace slideshow
                 {
                     // discontinuity found - current shape needs to
                     // get into a new layer
-                    // --------------------------------------------
+
 
                     // commit changes to previous layer
                     commitLayerChanges(nCurrLayerIndex,
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index 4ed8b92171b3..09224861cf9d 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -74,7 +74,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------------
+
 
 namespace slideshow
 {
@@ -113,13 +113,13 @@ public:
 
 
     // Disposable interface
-    // -------------------------------------------------------------------
+
 
     virtual void dispose();
 
 
     // Slide interface
-    // -------------------------------------------------------------------
+
 
     virtual bool prefetch();
     virtual bool show( bool );
@@ -464,7 +464,7 @@ bool SlideImpl::prefetch()
 
 bool SlideImpl::show( bool bSlideBackgoundPainted )
 {
-    // ---------------------------------------------------------------
+
 
     if( mbActive )
         return true; // already active
@@ -472,14 +472,14 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
     if( !mpShapeManager || !mpLayerManager )
         return false; // disposed
 
-    // ---------------------------------------------------------------
+
 
     // set initial shape attributes (e.g. hide shapes that have
     // 'appear' effect set)
     if( !applyInitialShapeAttributes(mxRootNode) )
         return false;
 
-    // ---------------------------------------------------------------
+
 
     // activate and take over view - clears view, if necessary
     mbActive = true;
@@ -491,7 +491,7 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
     // buffered slide bitmaps instead.
     mpShapeManager->activate( true );
 
-    // ---------------------------------------------------------------
+
 
     // render slide to screen, if requested
     if( !bSlideBackgoundPainted )
@@ -506,7 +506,7 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
         maContext.mrScreenUpdater.notifyUpdate();
     }
 
-    // ---------------------------------------------------------------
+
 
     // fire up animations
     const bool bIsAnimated( isAnimated() );
@@ -534,12 +534,12 @@ bool SlideImpl::show( bool bSlideBackgoundPainted )
     if( mbIntrinsicAnimationsAllowed )
         startIntrinsicAnimations();
 
-    // ---------------------------------------------------------------
+
 
     // enable paint overlay, if maUserPaintColor is valid
     activatePaintOverlay();
 
-    // ---------------------------------------------------------------
+
 
     // from now on, animations might be showing
     meAnimationState = SHOWING_STATE;
@@ -552,18 +552,18 @@ void SlideImpl::hide()
     if( !mbActive || !mpShapeManager )
         return; // already hidden/disposed
 
-    // ---------------------------------------------------------------
+
 
     // from now on, all animations are stopped
     meAnimationState = FINAL_STATE;
 
-    // ---------------------------------------------------------------
+
 
     // disable user paint overlay under all circumstances,
     // this slide now ceases to be active.
     deactivatePaintOverlay();
 
-    // ---------------------------------------------------------------
+
 
     // switch off all shape-intrinsic animations.
     endIntrinsicAnimations();
@@ -571,7 +571,7 @@ void SlideImpl::hide()
     // force-end all SMIL animations, too
     maAnimations.end();
 
-    // ---------------------------------------------------------------
+
 
     // disable shape management & event broadcasting for shapes of this
     // slide. Also disables LayerManager.
@@ -581,7 +581,7 @@ void SlideImpl::hide()
     resetCursor();
     mbActive = false;
 
-    // ---------------------------------------------------------------
+
 }
 
 basegfx::B2ISize SlideImpl::getSlideSize() const
@@ -666,7 +666,7 @@ SlideBitmapSharedPtr SlideImpl::getCurrentSlideBitmap( const UnoViewSharedPtr& r
 
 
 // private methods
-//--------------------------------------------------------------------------------------------------------------
+
 
 
 void SlideImpl::viewAdded( const UnoViewSharedPtr& rView )
@@ -1135,7 +1135,7 @@ bool SlideImpl::loadShapes()
             try
             {
                 // load the masterpage shapes
-                // -------------------------------------------------------------------------
+
                 ShapeImporter aMPShapesFunctor( xMasterPage,
                                                 mxDrawPage,
                                                 mxDrawPagesSupplier,
@@ -1182,7 +1182,7 @@ bool SlideImpl::loadShapes()
     try
     {
         // load the normal page shapes
-        // -------------------------------------------------------------------------
+
 
         ShapeImporter aShapesFunctor( mxDrawPage,
                                       mxDrawPage,
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 79d13d6179f2..fa112f372e70 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -327,7 +327,7 @@ private:
         throw (uno::RuntimeException);
 
     // CursorManager
-    // -----------------------------------------------------------
+
 
     virtual bool requestCursor( sal_Int16 nCursorShape );
     virtual void resetCursor();
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 5db492d1b3b9..9b77578c3459 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -242,7 +242,7 @@ basegfx::B2IRange getLayerBoundsPixel( basegfx::B2DRange const&     rLayerBounds
 }
 
 
-// ----------------------------------------------------------------
+
 
 /** Container class for sprites issued by a ViewLayer
 
@@ -377,7 +377,7 @@ public:
 };
 
 
-// ----------------------------------------------------------------
+
 
 
 /** This class provides layers for a slide view
@@ -500,7 +500,7 @@ public:
 
 private:
     // ViewLayer interface
-    // ----------------------------------------------
+
 
     virtual cppcanvas::CustomSpriteSharedPtr createSprite(
         const ::basegfx::B2DSize& rSpriteSizePixel,
@@ -672,7 +672,7 @@ private:
 };
 
 
-// ---------------------------------------------------------
+
 
 typedef cppu::WeakComponentImplHelper2<
     ::com::sun::star::util::XModifyListener,
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 5050d4fc2efc..34ef3e95749b 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -61,7 +61,7 @@ namespace slideshow
             // maBackgroundRect.transform( aMatrix );
 
             // extract modification info from maTransitionInfo
-            // -----------------------------------------------
+
 
             // perform general transformations _before_ the reverse
             // mode changes. This allows the Transition table to be
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 3eed4b7d7aa2..123d62861b6d 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -62,7 +62,7 @@ public:
     ~ClippingAnimation();
 
     // Animation interface
-    // -------------------
+
     virtual void prefetch( const AnimatableShapeSharedPtr&     rShape,
                            const ShapeAttributeLayerSharedPtr& rAttrLayer );
     virtual void start( const AnimatableShapeSharedPtr&     rShape,
@@ -70,7 +70,7 @@ public:
     virtual void end();
 
     // NumberAnimation interface
-    // -----------------------
+
     virtual bool operator()( double nValue );
     virtual double getUnderlyingValue() const;
 
diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx
index 0416089b7ab1..a54799769e00 100644
--- a/slideshow/source/engine/unoviewcontainer.cxx
+++ b/slideshow/source/engine/unoviewcontainer.cxx
@@ -28,7 +28,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------------
+
 
 namespace slideshow
 {
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 8b5f0a28d691..5a72b6bbc469 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -360,7 +360,7 @@ public:
 
 }; // class LayerManagerTest
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(LayerManagerTest);
 } // namespace
 
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index 8cd7fbe9af55..4b751b237d2e 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -73,7 +73,7 @@ public:
 
 }; // class UnoViewContainerTest
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(UnoViewContainerTest, "UnoViewContainerTest");
 } // namespace
 
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index a2b6922c004d..bfd29d6d93d1 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -50,7 +50,7 @@ struct DataFlavorRepresentation
     const ::com::sun::star::uno::Type*  pType;
 };
 
-// -----------------------------------------------------------------------------
+
 
 namespace
 {
@@ -212,7 +212,7 @@ namespace
             const DataFlavorRepresentation, ImplFormatArray_Impl > {};
 }
 
-//-----------------------------------------------------------------------
+
 
 static tDataFlavorList& InitFormats_Impl()
 {
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index c31304c53694..36716a348880 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1294,9 +1294,9 @@ static SotDestinationEntry_Impl const aDestinationArray[] =     \
 
 
 
-// ---------------------------------
+
 // - new style GetExchange methods -
-// ---------------------------------
+
 
 bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uLong nId )
 {
@@ -1316,7 +1316,7 @@ bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, sal_uLong
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 static bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxTransferable, const SotAction_Impl& rEntry )
 {
@@ -1378,7 +1378,7 @@ static bool CheckTransferableContext_Impl( const Reference< XTransferable >* pxT
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 static sal_uInt16 GetTransferableAction_Impl(
                             const DataFlavorExVector& rDataFlavorExVector,
@@ -1465,7 +1465,7 @@ static sal_uInt16 GetTransferableAction_Impl(
     return EXCHG_INOUT_ACTION_NONE;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavorExVector,
                                        sal_uInt16 nDestination,
@@ -1579,7 +1579,7 @@ sal_uInt16 SotExchange::GetExchangeAction( const DataFlavorExVector& rDataFlavor
     return nUserAction;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 SotExchange::IsChart(  const SvGlobalName& rName )
 {
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index f9fd6109d198..0eabb17b685e 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -105,7 +105,7 @@ protected:
     void checkError();
 };
 
-//------------------------------------------------------------------
+
 FileStreamWrapper_Impl::FileStreamWrapper_Impl( const OUString& rName )
     : m_aURL( rName )
     , m_pSvStream(0)
@@ -113,7 +113,7 @@ FileStreamWrapper_Impl::FileStreamWrapper_Impl( const OUString& rName )
     // if no URL is provided the stream is empty
 }
 
-//------------------------------------------------------------------
+
 FileStreamWrapper_Impl::~FileStreamWrapper_Impl()
 {
     if ( m_pSvStream )
@@ -128,7 +128,7 @@ FileStreamWrapper_Impl::~FileStreamWrapper_Impl()
         ::utl::UCBContentHelper::Kill( m_aURL );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
                 throw( NotConnectedException, BufferSizeExceededException, RuntimeException )
 {
@@ -157,7 +157,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readBytes(Sequence< sal_Int8 >& aData
     return nRead;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException )
 {
     if ( m_aURL.isEmpty() )
@@ -180,7 +180,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::readSomeBytes(Sequence< sal_Int8 >& a
         return readBytes(aData, nMaxBytesToRead);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FileStreamWrapper_Impl::skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException )
 {
     if ( m_aURL.isEmpty() )
@@ -193,7 +193,7 @@ void SAL_CALL FileStreamWrapper_Impl::skipBytes(sal_Int32 nBytesToSkip) throw( N
     checkError();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL FileStreamWrapper_Impl::available() throw( NotConnectedException, RuntimeException )
 {
     if ( m_aURL.isEmpty() )
@@ -215,7 +215,7 @@ sal_Int32 SAL_CALL FileStreamWrapper_Impl::available() throw( NotConnectedExcept
     return nAvailable;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FileStreamWrapper_Impl::closeInput() throw( NotConnectedException, RuntimeException )
 {
     if ( m_aURL.isEmpty() )
@@ -231,7 +231,7 @@ void SAL_CALL FileStreamWrapper_Impl::closeInput() throw( NotConnectedException,
     m_aURL = "";
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FileStreamWrapper_Impl::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException)
 {
     if ( m_aURL.isEmpty() )
@@ -244,7 +244,7 @@ void SAL_CALL FileStreamWrapper_Impl::seek( sal_Int64 _nLocation ) throw (Illega
     checkError();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  ) throw (IOException, RuntimeException)
 {
     if ( m_aURL.isEmpty() )
@@ -258,7 +258,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getPosition(  ) throw (IOException, R
     return (sal_Int64)nPos;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength(  ) throw (IOException, RuntimeException)
 {
     if ( m_aURL.isEmpty() )
@@ -279,7 +279,7 @@ sal_Int64 SAL_CALL FileStreamWrapper_Impl::getLength(  ) throw (IOException, Run
     return (sal_Int64)nEndPos;
 }
 
-//------------------------------------------------------------------------------
+
 void FileStreamWrapper_Impl::checkConnected()
 {
     if ( m_aURL.isEmpty() )
@@ -293,7 +293,7 @@ void FileStreamWrapper_Impl::checkConnected()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FileStreamWrapper_Impl::checkError()
 {
     checkConnected();
diff --git a/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 1de814e0bcac..6fd2a1489dde 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star;
 const sal_Int32 nBytesCount = 32000;
 
 
-// --------------------------------------------------------------------------------
+
 OLESimpleStorage::OLESimpleStorage( uno::Reference< lang::XMultiServiceFactory > xFactory )
 : m_bDisposed( false )
 , m_pStream( NULL )
@@ -56,7 +56,7 @@ OLESimpleStorage::OLESimpleStorage( uno::Reference< lang::XMultiServiceFactory >
         throw uno::RuntimeException();
 }
 
-// --------------------------------------------------------------------------------
+
 OLESimpleStorage::~OLESimpleStorage()
 {
     try {
@@ -72,7 +72,7 @@ OLESimpleStorage::~OLESimpleStorage()
     }
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServiceNames()
 {
     uno::Sequence< OUString > aRet(1);
@@ -80,20 +80,20 @@ uno::Sequence< OUString > SAL_CALL OLESimpleStorage::impl_staticGetSupportedServ
     return aRet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL OLESimpleStorage::impl_staticGetImplementationName()
 {
     return OUString("com.sun.star.comp.embed.OLESimpleStorage");
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< uno::XInterface > SAL_CALL OLESimpleStorage::impl_staticCreateSelfInstance(
             const uno::Reference< lang::XMultiServiceFactory >& xServiceManager )
 {
     return uno::Reference< uno::XInterface >( *new OLESimpleStorage( xServiceManager ) );
 }
 
-//-------------------------------------------------------------------------
+
 void OLESimpleStorage::UpdateOriginal_Impl()
 {
     if ( !m_bNoTemporaryCopy )
@@ -119,7 +119,7 @@ void OLESimpleStorage::UpdateOriginal_Impl()
     }
 }
 
-//-------------------------------------------------------------------------
+
 void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, OUString aName, const uno::Reference< io::XInputStream >& xInputStream )
     throw ( uno::Exception )
 {
@@ -164,7 +164,7 @@ void OLESimpleStorage::InsertInputStreamToStorage_Impl( BaseStorage* pStorage, O
     DELETEZ( pNewStream );
 }
 
-//-------------------------------------------------------------------------
+
 void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, OUString aName, const uno::Reference< container::XNameAccess >& xNameAccess )
     throw ( uno::Exception )
 {
@@ -208,9 +208,9 @@ void OLESimpleStorage::InsertNameAccessToStorage_Impl( BaseStorage* pStorage, OU
     DELETEZ( pNewStorage );
 }
 
-//____________________________________________________________________________________________________
+
 //  XInitialization
-//____________________________________________________________________________________________________
+
 
 void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aArguments )
         throw ( uno::Exception,
@@ -311,11 +311,11 @@ void SAL_CALL OLESimpleStorage::initialize( const uno::Sequence< uno::Any >& aAr
 }
 
 
-//____________________________________________________________________________________________________
+
 //  XNameContainer
-//____________________________________________________________________________________________________
 
-// --------------------------------------------------------------------------------
+
+
 void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::Any& aElement )
         throw ( lang::IllegalArgumentException,
                 container::ElementExistException,
@@ -367,7 +367,7 @@ void SAL_CALL OLESimpleStorage::insertByName( const OUString& aName, const uno::
     }
 }
 
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OLESimpleStorage::removeByName( const OUString& aName )
         throw ( container::NoSuchElementException,
                 lang::WrappedTargetException,
@@ -396,7 +396,7 @@ void SAL_CALL OLESimpleStorage::removeByName( const OUString& aName )
     }
 }
 
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OLESimpleStorage::replaceByName( const OUString& aName, const uno::Any& aElement )
         throw ( lang::IllegalArgumentException,
                 container::NoSuchElementException,
@@ -424,7 +424,7 @@ void SAL_CALL OLESimpleStorage::replaceByName( const OUString& aName, const uno:
     }
 }
 
-// --------------------------------------------------------------------------------
+
 uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName )
         throw ( container::NoSuchElementException,
                 lang::WrappedTargetException,
@@ -537,7 +537,7 @@ uno::Any SAL_CALL OLESimpleStorage::getByName( const OUString& aName )
     return aResult;
 }
 
-// --------------------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getElementNames()
         throw ( uno::RuntimeException )
 {
@@ -565,7 +565,7 @@ uno::Sequence< OUString > SAL_CALL OLESimpleStorage::getElementNames()
     return aSeq;
 }
 
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OLESimpleStorage::hasByName( const OUString& aName )
         throw ( uno::RuntimeException )
 {
@@ -588,7 +588,7 @@ sal_Bool SAL_CALL OLESimpleStorage::hasByName( const OUString& aName )
     return bResult ? sal_True : sal_False;
 }
 
-// --------------------------------------------------------------------------------
+
 uno::Type SAL_CALL OLESimpleStorage::getElementType()
         throw ( uno::RuntimeException )
 {
@@ -600,7 +600,7 @@ uno::Type SAL_CALL OLESimpleStorage::getElementType()
     return getCppuType( (const uno::Reference< io::XInputStream >*)NULL );
 }
 
-// --------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL OLESimpleStorage::hasElements()
         throw ( uno::RuntimeException )
 {
@@ -624,11 +624,11 @@ sal_Bool SAL_CALL OLESimpleStorage::hasElements()
     return aList.size() != 0 ? sal_True : sal_False;
 }
 
-//____________________________________________________________________________________________________
+
 //  XComponent
-//____________________________________________________________________________________________________
 
-// --------------------------------------------------------------------------------
+
+
 void SAL_CALL OLESimpleStorage::dispose()
         throw ( uno::RuntimeException )
 {
@@ -652,7 +652,7 @@ void SAL_CALL OLESimpleStorage::dispose()
     m_bDisposed = true;
 }
 
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OLESimpleStorage::addEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
         throw ( uno::RuntimeException )
@@ -668,7 +668,7 @@ void SAL_CALL OLESimpleStorage::addEventListener(
     m_pListenersContainer->addInterface( xListener );
 }
 
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OLESimpleStorage::removeEventListener(
             const uno::Reference< lang::XEventListener >& xListener )
         throw ( uno::RuntimeException )
@@ -682,11 +682,11 @@ void SAL_CALL OLESimpleStorage::removeEventListener(
         m_pListenersContainer->removeInterface( xListener );
 }
 
-//____________________________________________________________________________________________________
+
 //  XTransactedObject
-//____________________________________________________________________________________________________
 
-// --------------------------------------------------------------------------------
+
+
 void SAL_CALL OLESimpleStorage::commit()
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::lang::WrappedTargetException,
@@ -712,7 +712,7 @@ void SAL_CALL OLESimpleStorage::commit()
     UpdateOriginal_Impl();
 }
 
-// --------------------------------------------------------------------------------
+
 void SAL_CALL OLESimpleStorage::revert()
         throw ( ::com::sun::star::io::IOException,
                 ::com::sun::star::lang::WrappedTargetException,
@@ -738,9 +738,9 @@ void SAL_CALL OLESimpleStorage::revert()
     UpdateOriginal_Impl();
 }
 
-//____________________________________________________________________________________________________
+
 //  XClassifiedObject
-//____________________________________________________________________________________________________
+
 
 uno::Sequence< sal_Int8 > SAL_CALL OLESimpleStorage::getClassID()
     throw ( uno::RuntimeException )
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 4a26f395d4ed..69f65cc5fbec 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -813,7 +813,7 @@ Sequence< OUString > SAL_CALL SmGraphicAccessible::getSupportedServiceNames()
 
 //////////////////////////////////////////////////////////////////////
 
-//------------------------------------------------------------------------
+
 
 SmEditSource::SmEditSource( SmEditWindow * /*pWin*/, SmEditAccessible &rAcc ) :
     aViewFwd    (rAcc),
@@ -867,7 +867,7 @@ SfxBroadcaster & SmEditSource::GetBroadcaster() const
     return ((SmEditSource *) this)->aBroadCaster;
 }
 
-//------------------------------------------------------------------------
+
 
 SmViewForwarder::SmViewForwarder( SmEditAccessible &rAcc ) :
     rEditAcc(rAcc)
@@ -945,7 +945,7 @@ Point SmViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMapMod
 }
 
 
-//------------------------------------------------------------------------
+
 
 SmTextForwarder::SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource) :
     rEditAcc ( rAcc ),
@@ -1483,7 +1483,7 @@ void SmTextForwarder::CopyText(const SvxTextForwarder& rSource)
     }
 }
 
-//------------------------------------------------------------------------
+
 
 SmEditViewForwarder::SmEditViewForwarder( SmEditAccessible& rAcc ) :
     rEditAcc( rAcc )
@@ -1622,7 +1622,7 @@ sal_Bool SmEditViewForwarder::Paste()
     return bRes;
 }
 
-//------------------------------------------------------------------------
+
 
 SmEditAccessible::SmEditAccessible( SmEditWindow *pEditWin ) :
     aAccName            (SM_RESSTR(STR_CMDBOXWINDOW)),
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 79ca6ccd7ea0..c550e567f524 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -844,7 +844,7 @@ sal_Bool SmDocShell::Load( SfxMedium& rMedium )
     return bRet;
 }
 
-//------------------------------------------------------------------
+
 
 sal_Bool SmDocShell::Save()
 {
diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index e329f63470d9..374bc43d4a1b 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -27,26 +27,26 @@ namespace stoc_corefl
 {
 
 // XInterface
-//__________________________________________________________________________________________________
+
 Any ArrayIdlClassImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
     Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlArray * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlClassImpl::queryInterface( rType ));
 }
-//__________________________________________________________________________________________________
+
 void ArrayIdlClassImpl::acquire() throw()
 {
     IdlClassImpl::acquire();
 }
-//__________________________________________________________________________________________________
+
 void ArrayIdlClassImpl::release() throw()
 {
     IdlClassImpl::release();
 }
 
 // XTypeProvider
-//__________________________________________________________________________________________________
+
 Sequence< Type > ArrayIdlClassImpl::getTypes()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -64,7 +64,7 @@ Sequence< Type > ArrayIdlClassImpl::getTypes()
     }
     return s_pTypes->getTypes();
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -82,7 +82,7 @@ Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()
 }
 
 // XIdlArray
-//__________________________________________________________________________________________________
+
 void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -107,7 +107,7 @@ void ArrayIdlClassImpl::realloc( Any & rArray, sal_Int32 nLen )
                           reinterpret_cast< uno_ReleaseFunc >(cpp_release) );
     rArray.pData = ppSeq;
 }
-//__________________________________________________________________________________________________
+
 sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -121,7 +121,7 @@ sal_Int32 ArrayIdlClassImpl::getLen( const Any & rArray )
 
     return (*(uno_Sequence **)rArray.getValue())->nElements;
 }
-//__________________________________________________________________________________________________
+
 Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
 {
@@ -152,7 +152,7 @@ Any ArrayIdlClassImpl::get( const Any & rArray, sal_Int32 nIndex )
     return aRet;
 }
 
-//__________________________________________________________________________________________________
+
 void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewValue )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::ArrayIndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException)
 {
@@ -195,7 +195,7 @@ void ArrayIdlClassImpl::set( Any & rArray, sal_Int32 nIndex, const Any & rNewVal
 }
 
 // ArrayIdlClassImpl
-//__________________________________________________________________________________________________
+
 sal_Bool ArrayIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -204,13 +204,13 @@ sal_Bool ArrayIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xTy
              (xType->getTypeClass() == getTypeClass() && // must be sequence|array
               getComponentType()->isAssignableFrom( xType->getComponentType() ))));
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > ArrayIdlClassImpl::getComponentType()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return getReflection()->forType( getTypeDescr()->pType );
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlArray > ArrayIdlClassImpl::getArray()
     throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/stoc/source/corereflection/crbase.cxx b/stoc/source/corereflection/crbase.cxx
index b598a0f488e4..0e3dc6aa771b 100644
--- a/stoc/source/corereflection/crbase.cxx
+++ b/stoc/source/corereflection/crbase.cxx
@@ -29,7 +29,7 @@ namespace stoc_corefl
 ClassNameList g_aClassNames;
 #endif
 
-//--------------------------------------------------------------------------------------------------
+
 Mutex & getMutexAccess()
 {
     static Mutex * s_pMutex = 0;
@@ -45,7 +45,7 @@ Mutex & getMutexAccess()
     return *s_pMutex;
 }
 
-//__________________________________________________________________________________________________
+
 IdlClassImpl::IdlClassImpl( IdlReflectionServiceImpl * pReflection,
                             const OUString & rName, typelib_TypeClass eTypeClass,
                             typelib_TypeDescription * pTypeDescr )
@@ -69,7 +69,7 @@ IdlClassImpl::IdlClassImpl( IdlReflectionServiceImpl * pReflection,
     g_aClassNames.push_front( _aName );
 #endif
 }
-//__________________________________________________________________________________________________
+
 IdlClassImpl::~IdlClassImpl()
 {
     if (_pTypeDescr)
@@ -85,19 +85,19 @@ IdlClassImpl::~IdlClassImpl()
 }
 
 // XIdlClassImpl default implementation
-//__________________________________________________________________________________________________
+
 TypeClass IdlClassImpl::getTypeClass()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return _eTypeClass;
 }
-//__________________________________________________________________________________________________
+
 OUString IdlClassImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return _aName;
 }
-//__________________________________________________________________________________________________
+
 sal_Bool IdlClassImpl::equals( const Reference< XIdlClass >& xType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -120,7 +120,7 @@ static const sal_Bool s_aAssignableFromTab[11][11] =
 /* TypeClass_FLOAT */           { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0 },
 /* TypeClass_DOUBLE */          { 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1 }
 };
-//__________________________________________________________________________________________________
+
 sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -140,7 +140,7 @@ sal_Bool IdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
     }
     return sal_False;
 }
-//__________________________________________________________________________________________________
+
 void IdlClassImpl::createObject( Any & rObj )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -150,21 +150,21 @@ void IdlClassImpl::createObject( Any & rObj )
 }
 
 // what TODO ????
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > IdlClassImpl::getClasses()
     throw(::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "### unexpected use!" );
     return Sequence< Reference< XIdlClass > >();
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlClassImpl::getClass( const OUString & )
     throw(::com::sun::star::uno::RuntimeException)
 {
     OSL_FAIL( "### unexpected use!" );
     return Reference< XIdlClass >();
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -173,51 +173,51 @@ Sequence< Reference< XIdlClass > > IdlClassImpl::getInterfaces()
 }
 
 // structs, interfaces
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > IdlClassImpl::getSuperclasses() throw(::com::sun::star::uno::RuntimeException)
 {
     return Sequence< Reference< XIdlClass > >();
 }
 // structs
-//__________________________________________________________________________________________________
+
 Reference< XIdlField > IdlClassImpl::getField( const OUString & )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Reference< XIdlField >();
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlField > > IdlClassImpl::getFields()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Sequence< Reference< XIdlField > >();
 }
 // interfaces
-//__________________________________________________________________________________________________
+
 Uik IdlClassImpl::getUik()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Uik();
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlMethod > IdlClassImpl::getMethod( const OUString & )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Reference< XIdlMethod >();
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlMethod > > IdlClassImpl::getMethods()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Sequence< Reference< XIdlMethod > >();
 }
 // array
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlClassImpl::getComponentType()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Reference< XIdlClass >();
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlArray > IdlClassImpl::getArray()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -230,7 +230,7 @@ Reference< XIdlArray > IdlClassImpl::getArray()
 //##################################################################################################
 
 
-//__________________________________________________________________________________________________
+
 IdlMemberImpl::IdlMemberImpl( IdlReflectionServiceImpl * pReflection, const OUString & rName,
                               typelib_TypeDescription * pTypeDescr,
                               typelib_TypeDescription * pDeclTypeDescr )
@@ -247,7 +247,7 @@ IdlMemberImpl::IdlMemberImpl( IdlReflectionServiceImpl * pReflection, const OUSt
     if (! _pDeclTypeDescr->bComplete)
         typelib_typedescription_complete( &_pDeclTypeDescr );
 }
-//__________________________________________________________________________________________________
+
 IdlMemberImpl::~IdlMemberImpl()
 {
     typelib_typedescription_release( _pDeclTypeDescr );
@@ -256,7 +256,7 @@ IdlMemberImpl::~IdlMemberImpl()
 }
 
 // XIdlMember
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlMemberImpl::getDeclaringClass()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -269,7 +269,7 @@ Reference< XIdlClass > IdlMemberImpl::getDeclaringClass()
     }
     return _xDeclClass;
 }
-//__________________________________________________________________________________________________
+
 OUString IdlMemberImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index 5835840b5f41..c9f2deee54f9 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -67,7 +67,7 @@ public:
 };
 
 // XInterface
-//__________________________________________________________________________________________________
+
 Any IdlCompFieldImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -76,19 +76,19 @@ Any IdlCompFieldImpl::queryInterface( const Type & rType )
                                       static_cast< XIdlField2 * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType ));
 }
-//__________________________________________________________________________________________________
+
 void IdlCompFieldImpl::acquire() throw()
 {
     IdlMemberImpl::acquire();
 }
-//__________________________________________________________________________________________________
+
 void IdlCompFieldImpl::release() throw()
 {
     IdlMemberImpl::release();
 }
 
 // XTypeProvider
-//__________________________________________________________________________________________________
+
 Sequence< Type > IdlCompFieldImpl::getTypes()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -107,7 +107,7 @@ Sequence< Type > IdlCompFieldImpl::getTypes()
     }
     return s_pTypes->getTypes();
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -125,7 +125,7 @@ Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()
 }
 
 // XIdlMember
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -153,7 +153,7 @@ Reference< XIdlClass > IdlCompFieldImpl::getDeclaringClass()
     }
     return _xDeclClass;
 }
-//__________________________________________________________________________________________________
+
 OUString IdlCompFieldImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -161,19 +161,19 @@ OUString IdlCompFieldImpl::getName()
 }
 
 // XIdlField
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlCompFieldImpl::getType()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return getReflection()->forType( getTypeDescr() );
 }
-//__________________________________________________________________________________________________
+
 FieldAccessMode IdlCompFieldImpl::getAccessMode()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return FieldAccessMode_READWRITE;
 }
-//__________________________________________________________________________________________________
+
 Any IdlCompFieldImpl::get( const Any & rObj )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -206,7 +206,7 @@ Any IdlCompFieldImpl::get( const Any & rObj )
         OUString("illegal object given!"),
         (XWeak *)(OWeakObject *)this, 0 );
 }
-//__________________________________________________________________________________________________
+
 void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
 {
@@ -243,7 +243,7 @@ void IdlCompFieldImpl::set( const Any & rObj, const Any & rValue )
         (XWeak *)(OWeakObject *)this, 0 );
 }
 
-//__________________________________________________________________________________________________
+
 void IdlCompFieldImpl::set( Any & rObj, const Any & rValue )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
 {
@@ -285,13 +285,13 @@ void IdlCompFieldImpl::set( Any & rObj, const Any & rValue )
 //##################################################################################################
 
 
-//__________________________________________________________________________________________________
+
 CompoundIdlClassImpl::~CompoundIdlClassImpl()
 {
     delete _pFields;
 }
 
-//__________________________________________________________________________________________________
+
 sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -315,7 +315,7 @@ sal_Bool CompoundIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
     }
     return sal_False;
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -334,7 +334,7 @@ Sequence< Reference< XIdlClass > > CompoundIdlClassImpl::getSuperclasses()
     else
         return Sequence< Reference< XIdlClass > >();
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -347,7 +347,7 @@ Reference< XIdlField > CompoundIdlClassImpl::getField( const OUString & rName )
     else
         return Reference< XIdlField >();
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlField > > CompoundIdlClassImpl::getFields()
     throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index 1ba2ed44fb2d..3af166452254 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -56,7 +56,7 @@ static OUString core_getImplementationName()
 {
     return OUString(IMPLNAME);
 }
-//__________________________________________________________________________________________________
+
 IdlReflectionServiceImpl::IdlReflectionServiceImpl(
     const Reference< XComponentContext > & xContext )
     : OComponentHelper( _aComponentMutex )
@@ -67,11 +67,11 @@ IdlReflectionServiceImpl::IdlReflectionServiceImpl(
         "/singletons/com.sun.star.reflection.theTypeDescriptionManager") ) >>= _xTDMgr;
     OSL_ENSURE( _xTDMgr.is(), "### cannot get singleton \"TypeDescriptionManager\" from context!" );
 }
-//__________________________________________________________________________________________________
+
 IdlReflectionServiceImpl::~IdlReflectionServiceImpl() {}
 
 // XInterface
-//__________________________________________________________________________________________________
+
 Any IdlReflectionServiceImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -83,19 +83,19 @@ Any IdlReflectionServiceImpl::queryInterface( const Type & rType )
 
     return (aRet.hasValue() ? aRet : OComponentHelper::queryInterface( rType ));
 }
-//__________________________________________________________________________________________________
+
 void IdlReflectionServiceImpl::acquire() throw()
 {
     OComponentHelper::acquire();
 }
-//__________________________________________________________________________________________________
+
 void IdlReflectionServiceImpl::release() throw()
 {
     OComponentHelper::release();
 }
 
 // XTypeProvider
-//__________________________________________________________________________________________________
+
 Sequence< Type > IdlReflectionServiceImpl::getTypes()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -115,7 +115,7 @@ Sequence< Type > IdlReflectionServiceImpl::getTypes()
     }
     return s_pTypes->getTypes();
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -133,7 +133,7 @@ Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
 }
 
 // XComponent
-//__________________________________________________________________________________________________
+
 void IdlReflectionServiceImpl::dispose()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -153,19 +153,19 @@ void IdlReflectionServiceImpl::dispose()
 }
 
 // XServiceInfo
-//__________________________________________________________________________________________________
+
 OUString IdlReflectionServiceImpl::getImplementationName()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return core_getImplementationName();
 }
-//__________________________________________________________________________________________________
+
 sal_Bool IdlReflectionServiceImpl::supportsService( const OUString & rServiceName )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > IdlReflectionServiceImpl::getSupportedServiceNames()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -173,14 +173,14 @@ Sequence< OUString > IdlReflectionServiceImpl::getSupportedServiceNames()
 }
 
 // XIdlReflection
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlReflectionServiceImpl::getType( const Any & rObj )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return (rObj.hasValue() ? forType( rObj.getValueTypeRef() ) : Reference< XIdlClass >());
 }
 
-//__________________________________________________________________________________________________
+
 inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass(
     typelib_TypeDescription * pTypeDescr )
 {
@@ -230,7 +230,7 @@ inline Reference< XIdlClass > IdlReflectionServiceImpl::constructClass(
         return Reference< XIdlClass >();
     }
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlReflectionServiceImpl::forName( const OUString & rTypeName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -259,7 +259,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forName( const OUString & rType
 }
 
 // XHierarchicalNameAccess
-//__________________________________________________________________________________________________
+
 Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
     throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
 {
@@ -313,7 +313,7 @@ Any IdlReflectionServiceImpl::getByHierarchicalName( const OUString & rName )
     }
     return aRet;
 }
-//__________________________________________________________________________________________________
+
 sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -327,7 +327,7 @@ sal_Bool IdlReflectionServiceImpl::hasByHierarchicalName( const OUString & rName
     return sal_False;
 }
 
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescription * pTypeDescr )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -348,7 +348,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio
 
     return xRet;
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptionReference * pRef )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -365,7 +365,7 @@ Reference< XIdlClass > IdlReflectionServiceImpl::forType( typelib_TypeDescriptio
         (XWeak *)(OWeakObject *)this );
 }
 
-//__________________________________________________________________________________________________
+
 const Mapping & IdlReflectionServiceImpl::getCpp2Uno()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -388,7 +388,7 @@ const Mapping & IdlReflectionServiceImpl::getCpp2Uno()
     }
     return _aCpp2Uno;
 }
-//__________________________________________________________________________________________________
+
 const Mapping & IdlReflectionServiceImpl::getUno2Cpp()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -411,7 +411,7 @@ const Mapping & IdlReflectionServiceImpl::getUno2Cpp()
     }
     return _aUno2Cpp;
 }
-//__________________________________________________________________________________________________
+
 uno_Interface * IdlReflectionServiceImpl::mapToUno(
     const Any & rObj, typelib_InterfaceTypeDescription * pTo )
     throw(::com::sun::star::uno::RuntimeException)
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index a2040639d5e7..32a28f96930a 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -59,13 +59,13 @@ public:
     // XIdlField2: getType, getAccessMode and get are equal to XIdlField
     virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 IdlEnumFieldImpl::~IdlEnumFieldImpl()
 {
 }
 
 // XInterface
-//__________________________________________________________________________________________________
+
 Any IdlEnumFieldImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -74,19 +74,19 @@ Any IdlEnumFieldImpl::queryInterface( const Type & rType )
                                       static_cast< XIdlField2 * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType ));
 }
-//__________________________________________________________________________________________________
+
 void IdlEnumFieldImpl::acquire() throw()
 {
     IdlMemberImpl::acquire();
 }
-//__________________________________________________________________________________________________
+
 void IdlEnumFieldImpl::release() throw()
 {
     IdlMemberImpl::release();
 }
 
 // XTypeProvider
-//__________________________________________________________________________________________________
+
 Sequence< Type > IdlEnumFieldImpl::getTypes()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -105,7 +105,7 @@ Sequence< Type > IdlEnumFieldImpl::getTypes()
     }
     return s_pTypes->getTypes();
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -123,13 +123,13 @@ Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()
 }
 
 // XIdlMember
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlEnumFieldImpl::getDeclaringClass()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return IdlMemberImpl::getDeclaringClass();
 }
-//__________________________________________________________________________________________________
+
 OUString IdlEnumFieldImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -137,25 +137,25 @@ OUString IdlEnumFieldImpl::getName()
 }
 
 // XIdlField
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlEnumFieldImpl::getType()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return getDeclaringClass();
 }
-//__________________________________________________________________________________________________
+
 FieldAccessMode IdlEnumFieldImpl::getAccessMode()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return FieldAccessMode_READONLY;
 }
-//__________________________________________________________________________________________________
+
 Any IdlEnumFieldImpl::get( const Any & )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     return Any( &_nValue, getTypeDescr() );
 }
-//__________________________________________________________________________________________________
+
 void IdlEnumFieldImpl::set( const Any &, const Any & )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
 {
@@ -163,7 +163,7 @@ void IdlEnumFieldImpl::set( const Any &, const Any & )
         OUString("enum field is constant!"),
         (XWeak *)(OWeakObject *)this );
 }
-//__________________________________________________________________________________________________
+
 void IdlEnumFieldImpl::set( Any &, const Any & )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
 {
@@ -177,14 +177,14 @@ void IdlEnumFieldImpl::set( Any &, const Any & )
 //##################################################################################################
 
 
-//__________________________________________________________________________________________________
+
 EnumIdlClassImpl::~EnumIdlClassImpl()
 {
     delete _pFields;
 }
 
 // IdlClassImpl modifications
-//__________________________________________________________________________________________________
+
 Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -197,7 +197,7 @@ Reference< XIdlField > EnumIdlClassImpl::getField( const OUString & rName )
     else
         return Reference< XIdlField >();
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -223,7 +223,7 @@ Sequence< Reference< XIdlField > > EnumIdlClassImpl::getFields()
     }
     return *_pFields;
 }
-//__________________________________________________________________________________________________
+
 void EnumIdlClassImpl::createObject( Any & rObj )
     throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index b6387ca19191..8f46bf813e42 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -79,7 +79,7 @@ private:
 };
 
 // XInterface
-//__________________________________________________________________________________________________
+
 Any IdlAttributeFieldImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -88,19 +88,19 @@ Any IdlAttributeFieldImpl::queryInterface( const Type & rType )
                                       static_cast< XIdlField2 * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType ));
 }
-//__________________________________________________________________________________________________
+
 void IdlAttributeFieldImpl::acquire() throw()
 {
     IdlMemberImpl::acquire();
 }
-//__________________________________________________________________________________________________
+
 void IdlAttributeFieldImpl::release() throw()
 {
     IdlMemberImpl::release();
 }
 
 // XTypeProvider
-//__________________________________________________________________________________________________
+
 Sequence< Type > IdlAttributeFieldImpl::getTypes()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -119,7 +119,7 @@ Sequence< Type > IdlAttributeFieldImpl::getTypes()
     }
     return s_pTypes->getTypes();
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -137,7 +137,7 @@ Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
 }
 
 // XIdlMember
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -154,7 +154,7 @@ Reference< XIdlClass > IdlAttributeFieldImpl::getDeclaringClass()
     }
     return _xDeclClass;
 }
-//__________________________________________________________________________________________________
+
 OUString IdlAttributeFieldImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -162,21 +162,21 @@ OUString IdlAttributeFieldImpl::getName()
 }
 
 // XIdlField
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlAttributeFieldImpl::getType()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return getReflection()->forType(
         getAttributeTypeDescr()->pAttributeTypeRef );
 }
-//__________________________________________________________________________________________________
+
 FieldAccessMode IdlAttributeFieldImpl::getAccessMode()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return (((typelib_InterfaceAttributeTypeDescription *)getAttributeTypeDescr())->bReadOnly
             ? FieldAccessMode_READONLY : FieldAccessMode_READWRITE);
 }
-//__________________________________________________________________________________________________
+
 Any IdlAttributeFieldImpl::get( const Any & rObj )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -209,7 +209,7 @@ Any IdlAttributeFieldImpl::get( const Any & rObj )
         OUString("illegal object given!"),
         (XWeak *)(OWeakObject *)this, 0 );
 }
-//__________________________________________________________________________________________________
+
 void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
 {
@@ -299,7 +299,7 @@ void IdlAttributeFieldImpl::set( Any & rObj, const Any & rValue )
         OUString("illegal destination object given!"),
         (XWeak *)(OWeakObject *)this, 0 );
 }
-//__________________________________________________________________________________________________
+
 void IdlAttributeFieldImpl::set( const Any & rObj, const Any & rValue )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IllegalAccessException, ::com::sun::star::uno::RuntimeException)
 {
@@ -377,7 +377,7 @@ public:
     virtual MethodMode SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException);
     virtual Any SAL_CALL invoke( const Any & rObj, Sequence< Any > & rArgs ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 IdlInterfaceMethodImpl::~IdlInterfaceMethodImpl()
 {
     delete _pParamInfos;
@@ -386,26 +386,26 @@ IdlInterfaceMethodImpl::~IdlInterfaceMethodImpl()
 }
 
 // XInterface
-//__________________________________________________________________________________________________
+
 Any IdlInterfaceMethodImpl::queryInterface( const Type & rType )
     throw(::com::sun::star::uno::RuntimeException)
 {
     Any aRet( ::cppu::queryInterface( rType, static_cast< XIdlMethod * >( this ) ) );
     return (aRet.hasValue() ? aRet : IdlMemberImpl::queryInterface( rType ));
 }
-//__________________________________________________________________________________________________
+
 void IdlInterfaceMethodImpl::acquire() throw()
 {
     IdlMemberImpl::acquire();
 }
-//__________________________________________________________________________________________________
+
 void IdlInterfaceMethodImpl::release() throw()
 {
     IdlMemberImpl::release();
 }
 
 // XTypeProvider
-//__________________________________________________________________________________________________
+
 Sequence< Type > IdlInterfaceMethodImpl::getTypes()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -423,7 +423,7 @@ Sequence< Type > IdlInterfaceMethodImpl::getTypes()
     }
     return s_pTypes->getTypes();
 }
-//__________________________________________________________________________________________________
+
 Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()
     throw (::com::sun::star::uno::RuntimeException)
 {
@@ -441,7 +441,7 @@ Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()
 }
 
 // XIdlMember
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -458,7 +458,7 @@ Reference< XIdlClass > IdlInterfaceMethodImpl::getDeclaringClass()
     }
     return _xDeclClass;
 }
-//__________________________________________________________________________________________________
+
 OUString IdlInterfaceMethodImpl::getName()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -466,13 +466,13 @@ OUString IdlInterfaceMethodImpl::getName()
 }
 
 // XIdlMethod
-//__________________________________________________________________________________________________
+
 Reference< XIdlClass > SAL_CALL IdlInterfaceMethodImpl::getReturnType()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return getReflection()->forType( getMethodTypeDescr()->pReturnTypeRef );
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -498,7 +498,7 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getExceptionTypes()
     }
     return *_pExceptionTypes;
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -524,7 +524,7 @@ Sequence< Reference< XIdlClass > > IdlInterfaceMethodImpl::getParameterTypes()
     }
     return *_pParamTypes;
 }
-//__________________________________________________________________________________________________
+
 Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -584,14 +584,14 @@ Sequence< ParamInfo > IdlInterfaceMethodImpl::getParameterInfos()
     }
     return *_pParamInfos;
 }
-//__________________________________________________________________________________________________
+
 MethodMode SAL_CALL IdlInterfaceMethodImpl::getMode()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return
         getMethodTypeDescr()->bOneWay ? MethodMode_ONEWAY : MethodMode_TWOWAY;
 }
-//__________________________________________________________________________________________________
+
 Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > & rArgs )
     throw(::com::sun::star::lang::IllegalArgumentException,
           ::com::sun::star::reflection::InvocationTargetException,
@@ -785,7 +785,7 @@ Any SAL_CALL IdlInterfaceMethodImpl::invoke( const Any & rObj, Sequence< Any > &
 //##################################################################################################
 
 
-//__________________________________________________________________________________________________
+
 InterfaceIdlClassImpl::~InterfaceIdlClassImpl()
 {
     for ( sal_Int32 nPos = _nMethods + _nAttributes; nPos--; )
@@ -794,7 +794,7 @@ InterfaceIdlClassImpl::~InterfaceIdlClassImpl()
     delete [] _pSortedMemberInit;
 }
 
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -810,7 +810,7 @@ Sequence< Reference< XIdlClass > > InterfaceIdlClassImpl::getSuperclasses()
     }
     return Sequence< Reference< XIdlClass > >(_xSuperClasses);
 }
-//__________________________________________________________________________________________________
+
 void InterfaceIdlClassImpl::initMembers()
 {
     sal_Int32 nAll = getTypeDescr()->nAllMembers;
@@ -842,7 +842,7 @@ void InterfaceIdlClassImpl::initMembers()
 
     _pSortedMemberInit = pSortedMemberInit;
 }
-//__________________________________________________________________________________________________
+
 sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > & xType )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -862,14 +862,14 @@ sal_Bool InterfaceIdlClassImpl::isAssignableFrom( const Reference< XIdlClass > &
     }
     return sal_False;
 }
-//__________________________________________________________________________________________________
+
 Uik InterfaceIdlClassImpl::getUik()
     throw(::com::sun::star::uno::RuntimeException)
 {
     return Uik(0, 0, 0, 0, 0);
         // Uiks are deprecated and this function must not be called
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -889,7 +889,7 @@ Sequence< Reference< XIdlMethod > > InterfaceIdlClassImpl::getMethods()
     }
     return aRet;
 }
-//__________________________________________________________________________________________________
+
 Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields()
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -909,7 +909,7 @@ Sequence< Reference< XIdlField > > InterfaceIdlClassImpl::getFields()
     }
     return aRet;
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -939,7 +939,7 @@ Reference< XIdlMethod > InterfaceIdlClassImpl::getMethod( const OUString & rName
     }
     return xRet;
 }
-//__________________________________________________________________________________________________
+
 Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -969,7 +969,7 @@ Reference< XIdlField > InterfaceIdlClassImpl::getField( const OUString & rName )
     }
     return xRet;
 }
-//__________________________________________________________________________________________________
+
 void InterfaceIdlClassImpl::createObject( Any & rObj )
     throw(::com::sun::star::uno::RuntimeException)
 {
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 738f25ad68d9..c5be2a5a28d5 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -894,7 +894,7 @@ static void deleteAllServiceEntries(    const Reference < XSimpleRegistry >& xRe
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static bool is_supported_service(
     OUString const & service_name,
     Reference< reflection::XServiceTypeDescription > const & xService_td )
@@ -912,7 +912,7 @@ static bool is_supported_service(
     return false;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void insert_singletons(
     Reference< registry::XSimpleRegistry > const & xDest,
     Reference< registry::XRegistryKey > const & xImplKey,
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 821239761617..b2963f570ba5 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -1431,7 +1431,7 @@ OUString ImplIntrospectionAccess::getExactName( const OUString& rApproximateName
 }
 
 
-//-----------------------------------------------------------------------------
+
 
 struct hashIntrospectionKey_Impl
 {
@@ -1717,7 +1717,7 @@ void ImplIntrospection::dispose() throw(::com::sun::star::uno::RuntimeException)
 }
 
 
-//-----------------------------------------------------------------------------
+
 
 // XInterface
 Any ImplIntrospection::queryInterface( const Type & rType )
@@ -1836,7 +1836,7 @@ Reference<XIntrospectionAccess> ImplIntrospection::inspect(const Any& aToInspect
     return xAccess;
 }
 
-//-----------------------------------------------------------------------------
+
 
 // Hashtable fuer Pruefung auf mehrfache Beruecksichtigung von Interfaces
 struct hashInterface_Impl
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index ecc8626c8646..2daa180850b3 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -236,7 +236,7 @@ private:
 //==================================================================================================
 //==================================================================================================
 
-//--------------------------------------------------------------------------------------------------
+
 Invocation_Impl::Invocation_Impl
 (
     const Any & rAdapted,
@@ -329,7 +329,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & aType )
 }
 
 
-//--------------------------------------------------------------------------------------------------
+
 Any Invocation_Impl::getMaterial(void) throw(RuntimeException)
 {
     // AB, 12.2.1999  Sicherstellen, dass das Material wenn moeglich
@@ -353,7 +353,7 @@ Any Invocation_Impl::getMaterial(void) throw(RuntimeException)
     return _aMaterial;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void Invocation_Impl::setMaterial( const Any& rMaterial )
 {
     // set the material first and only once
@@ -441,7 +441,7 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
     throw( RuntimeException )
 {
@@ -456,7 +456,7 @@ OUString Invocation_Impl::getExactName( const OUString& rApproximateName )
     return aRet;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection(void)
     throw( RuntimeException )
 {
@@ -466,7 +466,7 @@ Reference<XIntrospectionAccess> Invocation_Impl::getIntrospection(void)
         return _xIntrospectionAccess;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
     throw( RuntimeException )
 {
@@ -477,7 +477,7 @@ sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
     return sal_False;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 sal_Bool Invocation_Impl::hasProperty( const OUString& Name )
     throw( RuntimeException )
 {
@@ -493,7 +493,7 @@ sal_Bool Invocation_Impl::hasProperty( const OUString& Name )
     return sal_False;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Any Invocation_Impl::getValue( const OUString& PropertyName )
     throw( UnknownPropertyException, RuntimeException )
 {
@@ -529,7 +529,7 @@ Any Invocation_Impl::getValue( const OUString& PropertyName )
         Reference< XInterface >() );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
     throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException )
 {
@@ -608,7 +608,7 @@ void Invocation_Impl::setValue( const OUString& PropertyName, const Any& Value )
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>& InParams,
                                 Sequence<sal_Int16>& OutIndices, Sequence<Any>& OutParams )
     throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException )
@@ -712,7 +712,7 @@ Any Invocation_Impl::invoke( const OUString& FunctionName, const Sequence<Any>&
     throw aExc;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 
 // Struct to optimize sorting
 struct MemberItem
@@ -1123,14 +1123,14 @@ Sequence< OUString > InvocationService::getSupportedServiceNames(void) throw( Ru
     return inv_getSupportedServiceNames();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Reference<XInterface> InvocationService::createInstance(void) throw( Exception, RuntimeException )
 {
     //TODO:throw( Exception("no default construction of invocation adapter possible!", *this) );
     return Reference<XInterface>(); // dummy
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Reference<XInterface> InvocationService::createInstanceWithArguments(
     const Sequence<Any>& rArguments ) throw( Exception, RuntimeException )
 {
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index 93f2b68074c2..5759351522d9 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -173,7 +173,7 @@ struct AdapterImpl
         FactoryImpl * pFactory )
         SAL_THROW( (RuntimeException) );
 };
-//______________________________________________________________________________
+
 inline AdapterImpl::~AdapterImpl()
     SAL_THROW(())
 {
@@ -187,13 +187,13 @@ inline AdapterImpl::~AdapterImpl()
     (*m_pReceiver->release)( m_pReceiver );
     m_pFactory->release();
 }
-//______________________________________________________________________________
+
 inline void AdapterImpl::acquire()
     SAL_THROW(())
 {
     osl_atomic_increment( &m_nRef );
 }
-//______________________________________________________________________________
+
 inline void AdapterImpl::release()
     SAL_THROW(())
 {
@@ -220,7 +220,7 @@ inline void AdapterImpl::release()
         delete this;
 }
 
-//------------------------------------------------------------------------------
+
 static inline void constructRuntimeException(
     uno_Any * pExc, const OUString & rMsg )
 {
@@ -230,7 +230,7 @@ static inline void constructRuntimeException(
         pExc, &exc, ::getCppuType( &exc ).getTypeLibType(), 0 );
 }
 
-//------------------------------------------------------------------------------
+
 static inline bool type_equals(
     typelib_TypeDescriptionReference * pType1,
     typelib_TypeDescriptionReference * pType2 )
@@ -242,7 +242,7 @@ static inline bool type_equals(
                  pType1->pTypeName->buffer, pType2->pTypeName->buffer )));
 }
 
-//______________________________________________________________________________
+
 bool AdapterImpl::coerce_assign(
     void * pDest, typelib_TypeDescriptionReference * pType, uno_Any * pSource,
     uno_Any * pOutExc )
@@ -316,7 +316,7 @@ bool AdapterImpl::coerce_assign(
         }
     }
 }
-//______________________________________________________________________________
+
 inline bool AdapterImpl::coerce_construct(
     void * pDest, typelib_TypeDescriptionReference * pType, uno_Any * pSource,
     uno_Any * pExc )
@@ -335,7 +335,7 @@ inline bool AdapterImpl::coerce_construct(
     return coerce_assign( pDest, pType, pSource, pExc );
 }
 
-//------------------------------------------------------------------------------
+
 static void handleInvokExc( uno_Any * pDest, uno_Any * pSource )
 {
     OUString const & name =
@@ -364,7 +364,7 @@ static void handleInvokExc( uno_Any * pDest, uno_Any * pSource )
         }
     }
 }
-//______________________________________________________________________________
+
 void AdapterImpl::getValue(
     const typelib_TypeDescription * pMemberType,
     void * pReturn, uno_Any ** ppException )
@@ -399,7 +399,7 @@ void AdapterImpl::getValue(
         ::uno_any_destruct( &aInvokRet, 0 );
     }
 }
-//______________________________________________________________________________
+
 void AdapterImpl::setValue(
     const typelib_TypeDescription * pMemberType,
     void * pArgs[], uno_Any ** ppException )
@@ -433,7 +433,7 @@ void AdapterImpl::setValue(
 
     ::uno_any_destruct( &aInvokVal, 0 ); // cleanup
 }
-//______________________________________________________________________________
+
 void AdapterImpl::invoke(
     const typelib_TypeDescription * pMemberType,
     void * pReturn, void * pArgs[], uno_Any ** ppException )
@@ -567,17 +567,17 @@ void AdapterImpl::invoke(
 
 extern "C"
 {
-//______________________________________________________________________________
+
 static void SAL_CALL adapter_acquire( uno_Interface * pUnoI )
 {
     static_cast< InterfaceAdapterImpl * >( pUnoI )->m_pAdapter->acquire();
 }
-//______________________________________________________________________________
+
 static void SAL_CALL adapter_release( uno_Interface * pUnoI )
 {
     static_cast< InterfaceAdapterImpl * >( pUnoI )->m_pAdapter->release();
 }
-//______________________________________________________________________________
+
 static void SAL_CALL adapter_dispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberType,
     void * pReturn, void * pArgs[], uno_Any ** ppException )
@@ -642,7 +642,7 @@ static void SAL_CALL adapter_dispatch(
     }
 }
 }
-//______________________________________________________________________________
+
 AdapterImpl::AdapterImpl(
     void * key, Reference< script::XInvocation > const & xReceiver,
     const Sequence< Type > & rTypes,
@@ -695,7 +695,7 @@ AdapterImpl::AdapterImpl(
     m_pFactory->acquire();
 }
 
-//______________________________________________________________________________
+
 FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext )
     SAL_THROW( (RuntimeException) )
     : m_pInvokMethodTD( 0 ),
@@ -763,7 +763,7 @@ FactoryImpl::FactoryImpl( Reference< XComponentContext > const & xContext )
             "missing type descriptions!", Reference< XInterface >() );
     }
 }
-//______________________________________________________________________________
+
 FactoryImpl::~FactoryImpl() SAL_THROW(())
 {
     ::typelib_typedescription_release( m_pInvokMethodTD );
@@ -780,7 +780,7 @@ FactoryImpl::~FactoryImpl() SAL_THROW(())
 #endif
 }
 
-//------------------------------------------------------------------------------
+
 static inline AdapterImpl * lookup_adapter(
     t_ptr_set ** pp_adapter_set,
     t_ptr_map & map, void * key, Sequence< Type > const & rTypes )
@@ -827,7 +827,7 @@ static inline AdapterImpl * lookup_adapter(
 }
 
 // XInvocationAdapterFactory2 impl
-//______________________________________________________________________________
+
 Reference< XInterface > FactoryImpl::createAdapter(
     const Reference< script::XInvocation > & xReceiver,
     const Sequence< Type > & rTypes )
@@ -889,7 +889,7 @@ Reference< XInterface > FactoryImpl::createAdapter(
     return xRet;
 }
 // XInvocationAdapterFactory impl
-//______________________________________________________________________________
+
 Reference< XInterface > FactoryImpl::createAdapter(
     const Reference< script::XInvocation > & xReceiver, const Type & rType )
     throw (RuntimeException)
@@ -898,19 +898,19 @@ Reference< XInterface > FactoryImpl::createAdapter(
 }
 
 // XServiceInfo
-//______________________________________________________________________________
+
 OUString FactoryImpl::getImplementationName()
     throw (RuntimeException)
 {
     return invadp_getImplementationName();
 }
-//______________________________________________________________________________
+
 sal_Bool FactoryImpl::supportsService( const OUString & rServiceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-//______________________________________________________________________________
+
 Sequence< OUString > FactoryImpl::getSupportedServiceNames()
     throw (RuntimeException)
 {
diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx
index ef76460ed462..25aefdfa983d 100644
--- a/stoc/source/proxy_factory/proxyfac.cxx
+++ b/stoc/source/proxy_factory/proxyfac.cxx
@@ -91,7 +91,7 @@ struct FactoryImpl : public ::cppu::WeakImplHelper2< lang::XServiceInfo,
         throw (RuntimeException);
 };
 
-//______________________________________________________________________________
+
 UnoInterfaceReference FactoryImpl::binuno_queryInterface(
     UnoInterfaceReference const & unoI,
     typelib_InterfaceTypeDescription * pTypeDescr )
@@ -200,7 +200,7 @@ struct binuno_Proxy : public uno_Interface
 extern "C"
 {
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL binuno_proxy_free(
     uno_ExtEnvironment * pEnv, void * pProxy )
 {
@@ -211,7 +211,7 @@ static void SAL_CALL binuno_proxy_free(
     delete proxy;
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI )
 {
     binuno_Proxy * that = static_cast< binuno_Proxy * >( pUnoI );
@@ -230,7 +230,7 @@ static void SAL_CALL binuno_proxy_acquire( uno_Interface * pUnoI )
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI )
 {
     binuno_Proxy * that = static_cast< binuno_Proxy * >( pUnoI );
@@ -243,7 +243,7 @@ static void SAL_CALL binuno_proxy_release( uno_Interface * pUnoI )
     }
 }
 
-//------------------------------------------------------------------------------
+
 static void SAL_CALL binuno_proxy_dispatch(
     uno_Interface * pUnoI, const typelib_TypeDescription * pMemberType,
     void * pReturn, void * pArgs [], uno_Any ** ppException )
@@ -290,7 +290,7 @@ static void SAL_CALL binuno_proxy_dispatch(
 
 }
 
-//______________________________________________________________________________
+
 inline binuno_Proxy::binuno_Proxy(
     ::rtl::Reference< ProxyRoot > const & root,
     UnoInterfaceReference const & target,
@@ -306,12 +306,12 @@ inline binuno_Proxy::binuno_Proxy(
     uno_Interface::pDispatcher = binuno_proxy_dispatch;
 }
 
-//______________________________________________________________________________
+
 ProxyRoot::~ProxyRoot()
 {
 }
 
-//______________________________________________________________________________
+
 inline ProxyRoot::ProxyRoot(
     ::rtl::Reference< FactoryImpl > const & factory,
     Reference< XInterface > const & xTarget )
@@ -323,7 +323,7 @@ inline ProxyRoot::ProxyRoot(
     OSL_ENSURE( m_target.is(), "### mapping interface failed!" );
 }
 
-//______________________________________________________________________________
+
 Any ProxyRoot::queryAggregation( Type const & rType )
     throw (RuntimeException)
 {
@@ -397,7 +397,7 @@ Any ProxyRoot::queryAggregation( Type const & rType )
 
 //##############################################################################
 
-//______________________________________________________________________________
+
 FactoryImpl::FactoryImpl()
 {
     OUString uno = UNO_LB_UNO;
@@ -422,11 +422,11 @@ FactoryImpl::FactoryImpl()
     OSL_ENSURE( m_cpp2uno.is(), "### cannot get bridge C++ <-> uno!" );
 }
 
-//______________________________________________________________________________
+
 FactoryImpl::~FactoryImpl() {}
 
 // XProxyFactory
-//______________________________________________________________________________
+
 Reference< XAggregation > FactoryImpl::createProxy(
     Reference< XInterface > const & xTarget )
     throw (RuntimeException)
@@ -435,7 +435,7 @@ Reference< XAggregation > FactoryImpl::createProxy(
 }
 
 // XServiceInfo
-//______________________________________________________________________________
+
 OUString FactoryImpl::getImplementationName()
     throw (RuntimeException)
 {
diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx
index abc959c056b0..23f7f8313e14 100644
--- a/stoc/source/security/access_controller.cxx
+++ b/stoc/source/security/access_controller.cxx
@@ -95,7 +95,7 @@ public:
         Any const & perm )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 inline acc_Intersection::acc_Intersection(
     Reference< security::XAccessControlContext > const & x1,
     Reference< security::XAccessControlContext > const & x2 )
@@ -103,11 +103,11 @@ inline acc_Intersection::acc_Intersection(
     : m_x1( x1 )
     , m_x2( x2 )
 {}
-//__________________________________________________________________________________________________
+
 acc_Intersection::~acc_Intersection()
     SAL_THROW(())
 {}
-//--------------------------------------------------------------------------------------------------
+
 inline Reference< security::XAccessControlContext > acc_Intersection::create(
     Reference< security::XAccessControlContext > const & x1,
     Reference< security::XAccessControlContext > const & x2 )
@@ -119,7 +119,7 @@ inline Reference< security::XAccessControlContext > acc_Intersection::create(
         return x1;
     return new acc_Intersection( x1, x2 );
 }
-//__________________________________________________________________________________________________
+
 void acc_Intersection::checkPermission(
     Any const & perm )
     throw (RuntimeException)
@@ -154,7 +154,7 @@ public:
         Any const & perm )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 inline acc_Union::acc_Union(
     Reference< security::XAccessControlContext > const & x1,
     Reference< security::XAccessControlContext > const & x2 )
@@ -162,11 +162,11 @@ inline acc_Union::acc_Union(
     : m_x1( x1 )
     , m_x2( x2 )
 {}
-//__________________________________________________________________________________________________
+
 acc_Union::~acc_Union()
     SAL_THROW(())
 {}
-//--------------------------------------------------------------------------------------------------
+
 inline Reference< security::XAccessControlContext > acc_Union::create(
     Reference< security::XAccessControlContext > const & x1,
     Reference< security::XAccessControlContext > const & x2 )
@@ -178,7 +178,7 @@ inline Reference< security::XAccessControlContext > acc_Union::create(
         return Reference< security::XAccessControlContext >(); // unrestricted
     return new acc_Union( x1, x2 );
 }
-//__________________________________________________________________________________________________
+
 void acc_Union::checkPermission(
     Any const & perm )
     throw (RuntimeException)
@@ -212,17 +212,17 @@ public:
         Any const & perm )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 inline acc_Policy::acc_Policy(
     PermissionCollection const & permissions )
     SAL_THROW(())
     : m_permissions( permissions )
 {}
-//__________________________________________________________________________________________________
+
 acc_Policy::~acc_Policy()
     SAL_THROW(())
 {}
-//__________________________________________________________________________________________________
+
 void acc_Policy::checkPermission(
     Any const & perm )
     throw (RuntimeException)
@@ -257,7 +257,7 @@ public:
     virtual Any SAL_CALL getValueByName( OUString const & name )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 inline acc_CurrentContext::acc_CurrentContext(
     Reference< XCurrentContext > const & xDelegate,
     Reference< security::XAccessControlContext > const & xRestriction )
@@ -271,17 +271,17 @@ inline acc_CurrentContext::acc_CurrentContext(
     }
     // return empty any otherwise on getValueByName(), not null interface
 }
-//__________________________________________________________________________________________________
+
 acc_CurrentContext::~acc_CurrentContext()
     SAL_THROW(())
 {}
-//__________________________________________________________________________________________________
+
 void acc_CurrentContext::acquire()
     throw ()
 {
     osl_atomic_increment( &m_refcount );
 }
-//__________________________________________________________________________________________________
+
 void acc_CurrentContext::release()
     throw ()
 {
@@ -290,7 +290,7 @@ void acc_CurrentContext::release()
         delete this;
     }
 }
-//__________________________________________________________________________________________________
+
 Any acc_CurrentContext::getValueByName( OUString const & name )
     throw (RuntimeException)
 {
@@ -427,7 +427,7 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 AccessController::AccessController( Reference< XComponentContext > const & xComponentContext )
     SAL_THROW( (RuntimeException) )
     : t_helper( m_mutex )
@@ -490,11 +490,11 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp
         m_user2permissions.setSize( cacheSize );
     }
 }
-//__________________________________________________________________________________________________
+
 AccessController::~AccessController()
     SAL_THROW(())
 {}
-//__________________________________________________________________________________________________
+
 void AccessController::disposing()
 {
     m_mode = OFF; // avoid checks from now on xxx todo review/ better DYNAMIC_ONLY?
@@ -503,7 +503,7 @@ void AccessController::disposing()
 }
 
 // XInitialization impl
-//__________________________________________________________________________________________________
+
 void AccessController::initialize(
     Sequence< Any > const & arguments )
     throw (Exception)
@@ -527,7 +527,7 @@ void AccessController::initialize(
     m_singleUser_init = false;
 }
 
-//__________________________________________________________________________________________________
+
 Reference< security::XPolicy > const & AccessController::getPolicy()
     SAL_THROW( (RuntimeException) )
 {
@@ -583,13 +583,13 @@ static void dumpPermissions(
 #endif
 
 
-//__________________________________________________________________________________________________
+
 inline void AccessController::clearPostPoned() SAL_THROW(())
 {
     delete reinterpret_cast< t_rec_vec * >( m_rec.getData() );
     m_rec.setData( 0 );
 }
-//__________________________________________________________________________________________________
+
 void AccessController::checkAndClearPostPoned() SAL_THROW( (RuntimeException) )
 {
     // check postponed permissions
@@ -648,7 +648,7 @@ void AccessController::checkAndClearPostPoned() SAL_THROW( (RuntimeException) )
         }
     }
 }
-//__________________________________________________________________________________________________
+
 /** this is the only function calling the policy singleton and thus has to take care
     of recurring calls!
 
@@ -833,7 +833,7 @@ PermissionCollection AccessController::getEffectivePermissions(
 }
 
 // XAccessController impl
-//__________________________________________________________________________________________________
+
 void AccessController::checkPermission(
     Any const & perm )
     throw (RuntimeException)
@@ -862,7 +862,7 @@ void AccessController::checkPermission(
     // then static check
     getEffectivePermissions( xContext, perm ).checkPermission( perm );
 }
-//__________________________________________________________________________________________________
+
 Any AccessController::doRestricted(
     Reference< security::XAction > const & xAction,
     Reference< security::XAccessControlContext > const & xRestriction )
@@ -895,7 +895,7 @@ Any AccessController::doRestricted(
         return xAction->run();
     }
 }
-//__________________________________________________________________________________________________
+
 Any AccessController::doPrivileged(
     Reference< security::XAction > const & xAction,
     Reference< security::XAccessControlContext > const & xRestriction )
@@ -932,7 +932,7 @@ Any AccessController::doPrivileged(
         return xAction->run();
     }
 }
-//__________________________________________________________________________________________________
+
 Reference< security::XAccessControlContext > AccessController::getContext()
     throw (RuntimeException)
 {
@@ -956,19 +956,19 @@ Reference< security::XAccessControlContext > AccessController::getContext()
 }
 
 // XServiceInfo impl
-//__________________________________________________________________________________________________
+
 OUString AccessController::getImplementationName()
     throw (RuntimeException)
 {
     return OUString("com.sun.star.security.comp.stoc.AccessController");
 }
-//__________________________________________________________________________________________________
+
 sal_Bool AccessController::supportsService( OUString const & serviceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, serviceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > AccessController::getSupportedServiceNames()
     throw (RuntimeException)
 {
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index 9d646a78f2e2..d5bc3c966880 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -93,7 +93,7 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext )
     SAL_THROW(())
     : t_helper( m_mutex )
@@ -101,11 +101,11 @@ FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext
     , m_ac( xComponentContext )
     , m_init( false )
 {}
-//__________________________________________________________________________________________________
+
 FilePolicy::~FilePolicy()
     SAL_THROW(())
 {}
-//__________________________________________________________________________________________________
+
 void FilePolicy::disposing()
 {
     m_userPermissions.clear();
@@ -113,7 +113,7 @@ void FilePolicy::disposing()
     m_xComponentContext.clear();
 }
 
-//__________________________________________________________________________________________________
+
 Sequence< Any > FilePolicy::getPermissions(
     OUString const & userId )
     throw (RuntimeException)
@@ -135,7 +135,7 @@ Sequence< Any > FilePolicy::getPermissions(
         return iFind->second;
     }
 }
-//__________________________________________________________________________________________________
+
 Sequence< Any > FilePolicy::getDefaultPermissions()
     throw (RuntimeException)
 {
@@ -193,7 +193,7 @@ public:
     void assureToken( sal_Unicode token )
         SAL_THROW( (RuntimeException) );
 };
-//__________________________________________________________________________________________________
+
 void PolicyReader::assureToken( sal_Unicode token )
     SAL_THROW( (RuntimeException) )
 {
@@ -207,7 +207,7 @@ void PolicyReader::assureToken( sal_Unicode token )
     buf.append( "<!" );
     error( buf.makeStringAndClear() );
 }
-//__________________________________________________________________________________________________
+
 OUString PolicyReader::assureQuotedToken()
     SAL_THROW( (RuntimeException) )
 {
@@ -216,7 +216,7 @@ OUString PolicyReader::assureQuotedToken()
         error( "unexpected end of file!" );
     return token;
 }
-//__________________________________________________________________________________________________
+
 OUString PolicyReader::getQuotedToken()
     SAL_THROW( (RuntimeException) )
 {
@@ -233,7 +233,7 @@ OUString PolicyReader::getQuotedToken()
     }
     return buf.makeStringAndClear();
 }
-//__________________________________________________________________________________________________
+
 OUString PolicyReader::assureToken()
     SAL_THROW( (RuntimeException) )
 {
@@ -242,7 +242,7 @@ OUString PolicyReader::assureToken()
         error( "unexpected end of file!" );
     return token;
 }
-//__________________________________________________________________________________________________
+
 OUString PolicyReader::getToken()
     SAL_THROW( (RuntimeException) )
 {
@@ -259,7 +259,7 @@ OUString PolicyReader::getToken()
     back( c );
     return buf.makeStringAndClear();
 }
-//__________________________________________________________________________________________________
+
 void PolicyReader::skipWhiteSpace()
     SAL_THROW( (RuntimeException) )
 {
@@ -321,7 +321,7 @@ void PolicyReader::skipWhiteSpace()
         back( c );
     }
 }
-//__________________________________________________________________________________________________
+
 sal_Unicode PolicyReader::get()
     SAL_THROW( (RuntimeException) )
 {
@@ -358,7 +358,7 @@ sal_Unicode PolicyReader::get()
     }
     return (m_line.getConstArray()[ m_pos++ ]);
 }
-//__________________________________________________________________________________________________
+
 void PolicyReader::error( OUString const & msg )
     SAL_THROW( (RuntimeException) )
 {
@@ -373,7 +373,7 @@ void PolicyReader::error( OUString const & msg )
     buf.append( msg );
     throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
 }
-//__________________________________________________________________________________________________
+
 PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac )
     SAL_THROW( (RuntimeException) )
     : m_fileName( fileName )
@@ -391,7 +391,7 @@ PolicyReader::PolicyReader( OUString const & fileName, AccessControl & ac )
         throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface >() );
     }
 }
-//__________________________________________________________________________________________________
+
 PolicyReader::~PolicyReader()
     SAL_THROW(())
 {
@@ -411,7 +411,7 @@ PolicyReader::~PolicyReader()
 #define s_runtimePermission "com.sun.star.security.RuntimePermission"
 #define s_allPermission "com.sun.star.security.AllPermission"
 
-//__________________________________________________________________________________________________
+
 void FilePolicy::refresh()
     throw (RuntimeException)
 {
@@ -517,19 +517,19 @@ void FilePolicy::refresh()
     m_userPermissions = userPermissions;
 }
 
-//__________________________________________________________________________________________________
+
 OUString FilePolicy::getImplementationName()
     throw (RuntimeException)
 {
     return OUString(IMPL_NAME);
 }
-//__________________________________________________________________________________________________
+
 sal_Bool FilePolicy::supportsService( OUString const & serviceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, serviceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > FilePolicy::getSupportedServiceNames()
     throw (RuntimeException)
 {
diff --git a/stoc/source/security/permissions.cxx b/stoc/source/security/permissions.cxx
index f2b8e3120152..0e6060619fbf 100644
--- a/stoc/source/security/permissions.cxx
+++ b/stoc/source/security/permissions.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star::uno;
 namespace stoc_sec
 {
 
-//--------------------------------------------------------------------------------------------------
+
 static inline sal_Int32 makeMask(
     OUString const & items, char const * const * strings ) SAL_THROW(())
 {
@@ -81,7 +81,7 @@ static inline sal_Int32 makeMask(
     while (n >= 0); // all items
     return mask;
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline OUString makeStrings(
     sal_Int32 mask, char const * const * strings ) SAL_THROW(())
 {
@@ -126,9 +126,9 @@ public:
     virtual bool implies( Permission const & perm ) const SAL_THROW(());
     virtual OUString toString() const SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 char const * SocketPermission::s_actions [] = { "accept", "connect", "listen", "resolve", 0 };
-//__________________________________________________________________________________________________
+
 SocketPermission::SocketPermission(
     connection::SocketPermission const & perm,
     ::rtl::Reference< Permission > const & next )
@@ -170,7 +170,7 @@ SocketPermission::SocketPermission(
         m_host = m_host.copy( 0, colon );
     }
 }
-//__________________________________________________________________________________________________
+
 inline bool SocketPermission::resolveHost() const SAL_THROW(())
 {
     if (m_resolveErr)
@@ -196,7 +196,7 @@ inline bool SocketPermission::resolveHost() const SAL_THROW(())
     }
     return m_resolvedHost;
 }
-//__________________________________________________________________________________________________
+
 bool SocketPermission::implies( Permission const & perm ) const SAL_THROW(())
 {
     // check type
@@ -238,7 +238,7 @@ bool SocketPermission::implies( Permission const & perm ) const SAL_THROW(())
         return false;
     return m_ip.equals( demanded.m_ip );
 }
-//__________________________________________________________________________________________________
+
 OUString SocketPermission::toString() const SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
@@ -290,9 +290,9 @@ public:
     virtual bool implies( Permission const & perm ) const SAL_THROW(());
     virtual OUString toString() const SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 char const * FilePermission::s_actions [] = { "read", "write", "execute", "delete", 0 };
-//--------------------------------------------------------------------------------------------------
+
 static OUString const & getWorkingDir() SAL_THROW(())
 {
     static OUString * s_workingDir = 0;
@@ -310,7 +310,7 @@ static OUString const & getWorkingDir() SAL_THROW(())
     }
     return *s_workingDir;
 }
-//__________________________________________________________________________________________________
+
 FilePermission::FilePermission(
     io::FilePermission const & perm,
     ::rtl::Reference< Permission > const & next )
@@ -355,7 +355,7 @@ FilePermission::FilePermission(
 #endif
     }
 }
-//__________________________________________________________________________________________________
+
 bool FilePermission::implies( Permission const & perm ) const SAL_THROW(())
 {
     // check type
@@ -414,7 +414,7 @@ bool FilePermission::implies( Permission const & perm ) const SAL_THROW(())
     }
     return false;
 }
-//__________________________________________________________________________________________________
+
 OUString FilePermission::toString() const SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
@@ -446,7 +446,7 @@ public:
     virtual bool implies( Permission const & perm ) const SAL_THROW(());
     virtual OUString toString() const SAL_THROW(());
 };
-//__________________________________________________________________________________________________
+
 bool RuntimePermission::implies( Permission const & perm ) const SAL_THROW(())
 {
     // check type
@@ -457,7 +457,7 @@ bool RuntimePermission::implies( Permission const & perm ) const SAL_THROW(())
     // check name
     return m_name.equals( demanded.m_name );
 }
-//__________________________________________________________________________________________________
+
 OUString RuntimePermission::toString() const SAL_THROW(())
 {
     OUStringBuffer buf( 48 );
@@ -469,12 +469,12 @@ OUString RuntimePermission::toString() const SAL_THROW(())
 
 //##################################################################################################
 
-//__________________________________________________________________________________________________
+
 bool AllPermission::implies( Permission const & ) const SAL_THROW(())
 {
     return true;
 }
-//__________________________________________________________________________________________________
+
 OUString AllPermission::toString() const SAL_THROW(())
 {
     return OUString("com.sun.star.security.AllPermission");
@@ -482,7 +482,7 @@ OUString AllPermission::toString() const SAL_THROW(())
 
 //##################################################################################################
 
-//__________________________________________________________________________________________________
+
 PermissionCollection::PermissionCollection(
     Sequence< Any > const & permissions, PermissionCollection const & addition )
     SAL_THROW( (RuntimeException) )
@@ -525,7 +525,7 @@ PermissionCollection::PermissionCollection(
     }
 }
 #ifdef __DIAGNOSE
-//__________________________________________________________________________________________________
+
 Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW(())
 {
     vector< OUString > strings;
@@ -538,7 +538,7 @@ Sequence< OUString > PermissionCollection::toStrings() const SAL_THROW(())
         strings.empty() ? 0 : &strings[ 0 ], strings.size() );
 }
 #endif
-//__________________________________________________________________________________________________
+
 inline static bool __implies(
     ::rtl::Reference< Permission > const & head, Permission const & demanded ) SAL_THROW(())
 {
@@ -551,7 +551,7 @@ inline static bool __implies(
 }
 
 #ifdef __DIAGNOSE
-//--------------------------------------------------------------------------------------------------
+
 static void demanded_diag(
     Permission const & perm )
     SAL_THROW(())
@@ -565,7 +565,7 @@ static void demanded_diag(
     OSL_TRACE( "%s", str.getStr() );
 }
 #endif
-//--------------------------------------------------------------------------------------------------
+
 static void throwAccessControlException(
     Permission const & perm, Any const & demanded_perm )
     SAL_THROW( (security::AccessControlException) )
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 0abf06d80198..3f576004a8b5 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -206,13 +206,13 @@ public:
     virtual sal_Bool SAL_CALL hasPropertyByName( OUString const & name )
         throw (RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 Sequence< beans::Property > PropertySetInfo_Impl::getProperties()
     throw (RuntimeException)
 {
     return m_properties;
 }
-//__________________________________________________________________________________________________
+
 beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name )
     throw (beans::UnknownPropertyException, RuntimeException)
 {
@@ -225,7 +225,7 @@ beans::Property PropertySetInfo_Impl::getPropertyByName( OUString const & name )
     throw beans::UnknownPropertyException(
         "unknown property: " + name, Reference< XInterface >() );
 }
-//__________________________________________________________________________________________________
+
 sal_Bool PropertySetInfo_Impl::hasPropertyByName( OUString const & name )
     throw (RuntimeException)
 {
@@ -481,7 +481,7 @@ private:
 };
 
 
-//______________________________________________________________________________
+
 inline bool OServiceManager::is_disposed() const
     SAL_THROW( (lang::DisposedException) )
 {
@@ -489,7 +489,7 @@ inline bool OServiceManager::is_disposed() const
     return (m_bInDisposing || rBHelper.bDisposed);
 }
 
-//______________________________________________________________________________
+
 inline void OServiceManager::check_undisposed() const
     SAL_THROW( (lang::DisposedException) )
 {
@@ -609,7 +609,7 @@ public:
         throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException)
         { Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->removeVetoableChangeListener( PropertyName, aListener ); }
 };
-//__________________________________________________________________________________________________
+
 void SAL_CALL OServiceManagerWrapper::setPropertyValue(
     const OUString& PropertyName, const Any& aValue )
     throw (beans::UnknownPropertyException, beans::PropertyVetoException,
@@ -635,7 +635,7 @@ void SAL_CALL OServiceManagerWrapper::setPropertyValue(
         Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->setPropertyValue( PropertyName, aValue );
     }
 }
-//__________________________________________________________________________________________________
+
 Any SAL_CALL OServiceManagerWrapper::getPropertyValue(
     const OUString& PropertyName )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, RuntimeException)
@@ -653,7 +653,7 @@ Any SAL_CALL OServiceManagerWrapper::getPropertyValue(
         return Reference< XPropertySet >(getRoot(), UNO_QUERY_THROW)->getPropertyValue( PropertyName );
     }
 }
-//__________________________________________________________________________________________________
+
 void OServiceManagerWrapper::disposing()
 {
     m_xContext.clear();
@@ -661,9 +661,9 @@ void OServiceManagerWrapper::disposing()
 // no m_root->dispose(), because every context disposes its service manager...
     m_root.clear();
 }
-//__________________________________________________________________________________________________
+
 OServiceManagerWrapper::~OServiceManagerWrapper() SAL_THROW(()) {}
-//__________________________________________________________________________________________________
+
 OServiceManagerWrapper::OServiceManagerWrapper(
     Reference< XComponentContext > const & xContext )
     SAL_THROW( (RuntimeException) )
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index 19d235337797..0228db3a0edf 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -96,7 +96,7 @@ static inline double unsigned_int64_to_double( sal_uInt64 n ) SAL_THROW(())
 #endif
 
 
-//--------------------------------------------------------------------------------------------------
+
 static inline double round( double aVal )
 {
     sal_Bool bPos   = (aVal >= 0.0);    //
@@ -107,7 +107,7 @@ static inline double round( double aVal )
     return (bPos ? aVal : -aVal);
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static sal_Bool getNumericValue( double & rfVal, const OUString & rStr )
 {
     double fRet = rStr.toDouble();
@@ -302,7 +302,7 @@ Sequence< OUString > TypeConverter_Impl::getSupportedServiceNames(void) throw( R
     return stoc_services::tcv_getSupportedServiceNames();
 }
 
-//--------------------------------------------------------------------------------------------------
+
 sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt64 max )
     throw( CannotConvertException )
 {
@@ -417,7 +417,7 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
         Reference<XInterface>(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) const
     throw( CannotConvertException )
 {
@@ -498,7 +498,7 @@ double TypeConverter_Impl::toDouble( const Any& rAny, double min, double max ) c
         Reference< XInterface >(), aDestinationClass, FailReason::OUT_OF_RANGE, 0 );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestType )
     throw( IllegalArgumentException, CannotConvertException, RuntimeException)
 {
@@ -692,7 +692,7 @@ Any SAL_CALL TypeConverter_Impl::convertTo( const Any& rVal, const Type& aDestTy
         Reference< XInterface >(), aDestinationClass, FailReason::INVALID, 0 );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 Any TypeConverter_Impl::convertToSimpleType( const Any& rVal, TypeClass aDestinationClass )
     throw( IllegalArgumentException, CannotConvertException, RuntimeException )
 {
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 1f850cb3917c..679d937d6463 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -300,7 +300,7 @@ public:
     virtual sal_Bool SAL_CALL hasMethod( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL hasProperty( const OUString & rName ) throw(::com::sun::star::uno::RuntimeException);
 };
-//__________________________________________________________________________________________________
+
 Any XLB_Invocation::invoke( const OUString & rFunctionName,
                             const Sequence< Any > & rParams,
                             Sequence< sal_Int16 > & rOutParamIndex,
@@ -539,7 +539,7 @@ Any XLB_Invocation::invoke( const OUString & rFunctionName,
 
     return aRet;
 }
-//__________________________________________________________________________________________________
+
 void XLB_Invocation::setValue( const OUString & rName, const Any & rValue )
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::script::CannotConvertException, ::com::sun::star::reflection::InvocationTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -580,7 +580,7 @@ void XLB_Invocation::setValue( const OUString & rName, const Any & rValue )
     else if ( rName == "RuntimeException" )
         _xLBT->setRuntimeException( *(const sal_Int32 *)rValue.getValue() );
 }
-//__________________________________________________________________________________________________
+
 Any XLB_Invocation::getValue( const OUString & rName )
     throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
@@ -629,7 +629,7 @@ Any XLB_Invocation::getValue( const OUString & rName )
         aRet <<= _xLBT->getRuntimeException();
     return aRet;
 }
-//__________________________________________________________________________________________________
+
 sal_Bool XLB_Invocation::hasMethod( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -641,7 +641,7 @@ sal_Bool XLB_Invocation::hasMethod( const OUString & rName )
             rName == "release" ||
             rName == "queryInterface" );
 }
-//__________________________________________________________________________________________________
+
 sal_Bool XLB_Invocation::hasProperty( const OUString & rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
@@ -667,7 +667,7 @@ sal_Bool XLB_Invocation::hasProperty( const OUString & rName )
 
 //##################################################################################################
 
-//__________________________________________________________________________________________________
+
 void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
                            sal_Int16 nShort, sal_uInt16 nUShort,
                            sal_Int32 nLong, sal_uInt32 nULong,
@@ -685,7 +685,7 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
             eEnum, rStr, xTest, rAny, rSequence );
     _aStructData = rStruct;
 }
-//__________________________________________________________________________________________________
+
 test::TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                       sal_Int16& nShort, sal_uInt16& nUShort,
                                       sal_Int32& nLong, sal_uInt32& nULong,
@@ -704,7 +704,7 @@ test::TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_I
     _aStructData = rStruct;
     return _aStructData;
 }
-//__________________________________________________________________________________________________
+
 test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                      sal_Int16& nShort, sal_uInt16& nUShort,
                                      sal_Int32& nLong, sal_uInt32& nULong,
@@ -849,7 +849,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
     return sal_False;
 }
 
-//__________________________________________________________________________________________________
+
 test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cChar*/, sal_Int8& /*nByte*/, sal_Int16& /*nShort*/, sal_uInt16& /*nUShort*/, sal_Int32& /*nLong*/, sal_uInt32& /*nULong*/, sal_Int64& /*nHyper*/, sal_uInt64& /*nUHyper*/, float& /*fFloat*/, double& /*fDouble*/, test::TestEnum& /*eEnum*/, OUString& /*aString*/, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*xInterface*/, ::com::sun::star::uno::Any& /*aAny*/, ::com::sun::star::uno::Sequence< test::TestElement >& /*aSequence*/, test::TestData& /*aStruct*/ )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -859,7 +859,7 @@ test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cC
     aExc.Context          = *this;
     throw aExc;
 }
-//__________________________________________________________________________________________________
+
 sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
@@ -867,7 +867,7 @@ sal_Int32 Test_Impl::getRuntimeException() throw(::com::sun::star::uno::RuntimeE
     aExc.Context          = *this;
     throw aExc;
 }
-//__________________________________________________________________________________________________
+
 void Test_Impl::setRuntimeException( sal_Int32 /*_runtimeexception*/ ) throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index d564ba63e832..682afb56a927 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -84,7 +84,7 @@ public:
         { return makeAny( name ); }
 };
 
-//______________________________________________________________________________
+
 Any TargetObject::queryInterface( Type const & type )
     throw (RuntimeException)
 {
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 7c9538f101a9..d3c7d49ea28e 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -405,7 +405,7 @@ SvtCJKOptions::SvtCJKOptions(bool bDontLoad)
     pImp = pCJKOptions;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtCJKOptions::~SvtCJKOptions()
 {
@@ -414,43 +414,43 @@ SvtCJKOptions::~SvtCJKOptions()
     if ( !--nCJKRefCount )
         DELETEZ( pCJKOptions );
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsCJKFontEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsCJKFontEnabled();
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsVerticalTextEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsVerticalTextEnabled();
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsAsianTypographyEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsAsianTypographyEnabled();
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsJapaneseFindEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsJapaneseFindEnabled();
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsRubyEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsRubyEnabled();
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsChangeCaseMapEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
     return pCJKOptions->IsChangeCaseMapEnabled();
 }
-// -----------------------------------------------------------------------
+
 bool SvtCJKOptions::IsDoubleLinesEnabled() const
 {
     DBG_ASSERT(pCJKOptions->IsLoaded(), "CJK options not loaded");
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index 561f2f59e20b..f26b3f44161c 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -133,13 +133,13 @@ SvtCTLOptions_Impl::~SvtCTLOptions_Impl()
     if ( IsModified() )
         Commit();
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions_Impl::Notify( const Sequence< OUString >& )
 {
     Load();
     NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions_Impl::Commit()
 {
     Sequence< OUString > &rPropertyNames = PropertyNames::get();
@@ -231,7 +231,7 @@ void SvtCTLOptions_Impl::Commit()
     //broadcast changes
     NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions_Impl::Load()
 {
     Sequence< OUString >& rPropertyNames = PropertyNames::get();
@@ -402,7 +402,7 @@ SvtCTLOptions::SvtCTLOptions( bool bDontLoad )
     m_pImp->AddListener(this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtCTLOptions::~SvtCTLOptions()
 {
@@ -413,84 +413,84 @@ SvtCTLOptions::~SvtCTLOptions()
     if ( !--nCTLRefCount )
         DELETEZ( pCTLOptions );
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions::SetCTLFontEnabled( bool _bEnabled )
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLFontEnabled( _bEnabled );
 }
-// -----------------------------------------------------------------------------
+
 bool SvtCTLOptions::IsCTLFontEnabled() const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsCTLFontEnabled();
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions::SetCTLSequenceChecking( bool _bEnabled )
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLSequenceChecking(_bEnabled);
 }
-// -----------------------------------------------------------------------------
+
 bool SvtCTLOptions::IsCTLSequenceChecking() const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsCTLSequenceChecking();
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions::SetCTLSequenceCheckingRestricted( bool _bEnable )
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLSequenceCheckingRestricted(_bEnable);
 }
-// -----------------------------------------------------------------------------
+
 bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsCTLSequenceCheckingRestricted();
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( bool _bEnable )
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLSequenceCheckingTypeAndReplace(_bEnable);
 }
-// -----------------------------------------------------------------------------
+
 bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsCTLSequenceCheckingTypeAndReplace();
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eMovement )
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLCursorMovement( _eMovement );
 }
-// -----------------------------------------------------------------------------
+
 SvtCTLOptions::CursorMovement SvtCTLOptions::GetCTLCursorMovement() const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->GetCTLCursorMovement();
 }
-// -----------------------------------------------------------------------------
+
 void SvtCTLOptions::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumerals )
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     pCTLOptions->SetCTLTextNumerals( _eNumerals );
 }
-// -----------------------------------------------------------------------------
+
 SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->GetCTLTextNumerals();
 }
-// -----------------------------------------------------------------------------
+
 bool SvtCTLOptions::IsReadOnly(EOption eOption) const
 {
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsReadOnly(eOption);
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 0bdfea1af765..72c53385228a 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -157,7 +157,7 @@ sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang )
     }
     return nScript;
 }
-// -----------------------------------------------------------------------------
+
 
 SvtSystemLanguageOptions::SvtSystemLanguageOptions() :
     utl::ConfigItem( "System/L10N")
diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx
index 2b7724785661..84e6da9968e6 100644
--- a/svl/source/filepicker/pickerhistory.cxx
+++ b/svl/source/filepicker/pickerhistory.cxx
@@ -30,21 +30,21 @@ namespace svt
         typedef ::com::sun::star::uno::WeakReference< XInterface >  InterfaceAdapter;
         typedef ::std::vector< InterfaceAdapter  >                  InterfaceArray;
 
-        // ----------------------------------------------------------------
+
         InterfaceArray& getFolderPickerHistory()
         {
             static InterfaceArray s_aHistory;
             return s_aHistory;
         }
 
-        // ----------------------------------------------------------------
+
         InterfaceArray& getFilePickerHistory()
         {
             static InterfaceArray s_aHistory;
             return s_aHistory;
         }
 
-        // ----------------------------------------------------------------
+
         void implPushBackPicker( InterfaceArray& _rHistory, const Reference< XInterface >& _rxPicker )
         {
             if ( !_rxPicker.is() )
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 237e0a714492..bfc14c607133 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -27,7 +27,7 @@ DBG_NAME(SfxAllEnumItem)
 
 TYPEINIT1_AUTOFACTORY(SfxAllEnumItem, SfxEnumItem)
 
-// -----------------------------------------------------------------------
+
 
 struct SfxAllEnumValue_Impl
 {
@@ -45,7 +45,7 @@ public:
     }
 };
 
-// -----------------------------------------------------------------------
+
 
 SfxAllEnumItem::SfxAllEnumItem() :
     SfxEnumItem(),
@@ -54,7 +54,7 @@ SfxAllEnumItem::SfxAllEnumItem() :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal):
     SfxEnumItem(which, nVal),
@@ -65,7 +65,7 @@ SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal):
     InsertValue( nVal );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxAllEnumItem::SfxAllEnumItem( sal_uInt16 which, SvStream &rStream ):
     SfxEnumItem(which, rStream),
@@ -76,7 +76,7 @@ SfxAllEnumItem::SfxAllEnumItem( sal_uInt16 which, SvStream &rStream ):
     InsertValue( GetValue() );
 }
 
-// -----------------------------------------------------------------------
+
 
 
 SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which):
@@ -88,7 +88,7 @@ SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which):
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SfxAllEnumItem::SfxAllEnumItem(const SfxAllEnumItem &rCopy):
     SfxEnumItem(rCopy),
@@ -115,7 +115,7 @@ SfxAllEnumItem::SfxAllEnumItem(const SfxAllEnumItem &rCopy):
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxAllEnumItem::~SfxAllEnumItem()
 {
@@ -124,7 +124,7 @@ SfxAllEnumItem::~SfxAllEnumItem()
     delete pDisabledValues;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxAllEnumItem::GetValueCount() const
 {
@@ -132,7 +132,7 @@ sal_uInt16 SfxAllEnumItem::GetValueCount() const
     return pValues ? pValues->size() : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
 {
@@ -141,7 +141,7 @@ OUString SfxAllEnumItem::GetValueTextByPos( sal_uInt16 nPos ) const
     return (*pValues)[nPos]->aText;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxAllEnumItem::GetValueByPos( sal_uInt16 nPos ) const
 {
@@ -150,7 +150,7 @@ sal_uInt16 SfxAllEnumItem::GetValueByPos( sal_uInt16 nPos ) const
     return (*pValues)[nPos]->nValue;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxAllEnumItem::Clone( SfxItemPool * ) const
 {
@@ -158,7 +158,7 @@ SfxPoolItem* SfxAllEnumItem::Clone( SfxItemPool * ) const
     return new SfxAllEnumItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, sal_uInt16 ) const
 {
@@ -167,7 +167,7 @@ SfxPoolItem* SfxAllEnumItem::Create( SvStream & rStream, sal_uInt16 ) const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal ) const
 
@@ -192,7 +192,7 @@ sal_uInt16 SfxAllEnumItem::_GetPosByValue( sal_uInt16 nVal ) const
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
 
@@ -212,7 +212,7 @@ sal_uInt16 SfxAllEnumItem::GetPosByValue( sal_uInt16 nValue ) const
     return SfxEnumItem::GetPosByValue( nValue );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
 {
@@ -229,7 +229,7 @@ void SfxAllEnumItem::InsertValue( sal_uInt16 nValue, const OUString &rValue )
     pValues->insert( pValues->begin() + _GetPosByValue(nValue), pVal ); //! doppelte?!
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxAllEnumItem::InsertValue( sal_uInt16 nValue )
 {
@@ -264,7 +264,7 @@ bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxAllEnumItem::RemoveValue( sal_uInt16 nValue )
 {
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 49bb28e02ce8..afd8e34774f8 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -29,13 +29,13 @@
 
 TYPEINIT1( CntWallpaperItem, SfxPoolItem );
 
-// -----------------------------------------------------------------------
+
 CntWallpaperItem::CntWallpaperItem( sal_uInt16 which )
     : SfxPoolItem( which ), _nColor( COL_TRANSPARENT ), _nStyle( 0 )
 {
 }
 
-// -----------------------------------------------------------------------
+
 CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uInt16 nVersion )
     : SfxPoolItem( which ), _nColor( COL_TRANSPARENT ), _nStyle( 0 )
 {
@@ -74,7 +74,7 @@ CntWallpaperItem::CntWallpaperItem( sal_uInt16 which, SvStream& rStream, sal_uIn
     }
 }
 
-// -----------------------------------------------------------------------
+
 CntWallpaperItem::CntWallpaperItem( const CntWallpaperItem& rItem ) :
     SfxPoolItem( rItem ),
     _aURL( rItem._aURL ),
@@ -83,12 +83,12 @@ CntWallpaperItem::CntWallpaperItem( const CntWallpaperItem& rItem ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 CntWallpaperItem::~CntWallpaperItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 bool CntWallpaperItem::operator==( const SfxPoolItem& rItem ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
@@ -106,13 +106,13 @@ sal_uInt16 CntWallpaperItem::GetVersion(sal_uInt16) const
     return 1; // because it uses SfxPoolItem::read/writeUnicodeString()
 }
 
-// -----------------------------------------------------------------------
+
 SfxPoolItem* CntWallpaperItem::Create( SvStream& rStream, sal_uInt16 nVersion) const
 {
     return new CntWallpaperItem( Which(), rStream, nVersion );
 }
 
-// -----------------------------------------------------------------------
+
 SvStream& CntWallpaperItem::Store( SvStream& rStream, sal_uInt16 ) const
 {
     rStream.WriteUInt32( CNTWALLPAPERITEM_STREAM_MAGIC );
@@ -126,7 +126,7 @@ SvStream& CntWallpaperItem::Store( SvStream& rStream, sal_uInt16 ) const
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const
 {
     return new CntWallpaperItem( *this );
diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index a730c5ce7445..a99a6fa04be6 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.cxx
@@ -35,11 +35,11 @@ sal_uInt16 nSfxFlagVal[16] =
 };
 
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(SfxFlagItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) :
     SfxPoolItem( nW ),
@@ -48,7 +48,7 @@ SfxFlagItem::SfxFlagItem( sal_uInt16 nW, sal_uInt16 nV ) :
     DBG_CTOR(SfxFlagItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) :
     SfxPoolItem( rItem ),
@@ -57,7 +57,7 @@ SfxFlagItem::SfxFlagItem( const SfxFlagItem& rItem ) :
     DBG_CTOR(SfxFlagItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const
 {
@@ -66,7 +66,7 @@ SvStream& SfxFlagItem::Store(SvStream &rStream, sal_uInt16) const
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SfxFlagItem::GetPresentation
 (
@@ -84,7 +84,7 @@ SfxItemPresentation SfxFlagItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt8 SfxFlagItem::GetFlagCount() const
 {
@@ -93,7 +93,7 @@ sal_uInt8 SfxFlagItem::GetFlagCount() const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const
 {
@@ -102,7 +102,7 @@ SfxPoolItem* SfxFlagItem::Create(SvStream &, sal_uInt16) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -111,7 +111,7 @@ bool SfxFlagItem::operator==( const SfxPoolItem& rItem ) const
     return (((SfxFlagItem&)rItem).nVal == nVal);
 }
 
-// -----------------------------------------------------------------------
+
 
 
 SfxPoolItem* SfxFlagItem::Clone(SfxItemPool *) const
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 50000b7c7750..077e8b9aca0a 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -30,17 +30,17 @@
 // STATIC DATA -----------------------------------------------------------
 
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxGlobalNameItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxGlobalNameItem::SfxGlobalNameItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName )
 :   SfxPoolItem( nW ),
@@ -48,20 +48,20 @@ SfxGlobalNameItem::SfxGlobalNameItem( sal_uInt16 nW, const SvGlobalName& rName )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxGlobalNameItem::~SfxGlobalNameItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxGlobalNameItem::operator==( const SfxPoolItem& rItem ) const
 {
     return ((SfxGlobalNameItem&)rItem).m_aName == m_aName;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
 {
diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index ef4336525a0a..cf87b2f80a94 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.cxx
@@ -27,7 +27,7 @@
 DBG_NAME(SfxItemIter);
 
 
-// --------------------------------------------------------------------------
+
 
 
 SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
@@ -58,7 +58,7 @@ SfxItemIter::SfxItemIter( const SfxItemSet& rItemSet )
     _nAkt = _nStt;
 }
 
-// --------------------------------------------------------------------------
+
 
 
 SfxItemIter::~SfxItemIter()
@@ -66,7 +66,7 @@ SfxItemIter::~SfxItemIter()
     DBG_DTOR(SfxItemIter, 0);
 }
 
-// --------------------------------------------------------------------------
+
 
 
 const SfxPoolItem* SfxItemIter::NextItem()
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 706f7fa4bba2..c293c384474f 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -107,7 +107,7 @@ const SfxPoolItem* SfxItemPool::GetPoolDefaultItem( sal_uInt16 nWhich ) const
     return pRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, sal_uInt16 nFlag ) const
 {
@@ -115,7 +115,7 @@ bool SfxItemPool::IsItemFlag_Impl( sal_uInt16 nPos, sal_uInt16 nFlag ) const
     return nFlag == (nItemFlag & nFlag);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const
 {
@@ -128,14 +128,14 @@ bool SfxItemPool::IsItemFlag( sal_uInt16 nWhich, sal_uInt16 nFlag ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxBroadcaster& SfxItemPool::BC()
 {
     return pImp->aBC;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 SfxItemPool::SfxItemPool
@@ -203,7 +203,7 @@ SfxItemPool::SfxItemPool
         SetDefaults(pDefaults);
 }
 
-// -----------------------------------------------------------------------
+
 
 
 SfxItemPool::SfxItemPool
@@ -279,7 +279,7 @@ SfxItemPool::SfxItemPool
         SetSecondaryPool( rPool.pImp->mpSecondary->Clone() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults )
 {
@@ -304,7 +304,7 @@ void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::ReleaseDefaults
 (
@@ -336,7 +336,7 @@ void SfxItemPool::ReleaseDefaults
         pImp->ppStaticDefaults = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::ReleaseDefaults
 (
@@ -379,7 +379,7 @@ void SfxItemPool::ReleaseDefaults
         { delete[] pDefaults; pDefaults = 0; }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPool::~SfxItemPool()
 {
@@ -424,7 +424,7 @@ void SfxItemPool::Free(SfxItemPool* pPool)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
@@ -490,7 +490,7 @@ void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos)
     CHECK_SLOTS();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const
 {
@@ -499,7 +499,7 @@ SfxMapUnit SfxItemPool::GetMetric( sal_uInt16 ) const
     return pImp->eDefMetric;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::SetDefaultMetric( SfxMapUnit eNewMetric )
 {
@@ -513,7 +513,7 @@ const OUString& SfxItemPool::GetName() const
     return pImp->aName;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SfxItemPool::GetPresentation
 (
@@ -530,7 +530,7 @@ SfxItemPresentation SfxItemPool::GetPresentation
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPool* SfxItemPool::Clone() const
 {
@@ -540,7 +540,7 @@ SfxItemPool* SfxItemPool::Clone() const
     return pPool;
 }
 
-// ----------------------------------------------------------------------
+
 
 void SfxItemPool::Delete()
 {
@@ -631,7 +631,7 @@ void SfxItemPool::Delete()
     pImp->DeleteItems();
 }
 
-// ----------------------------------------------------------------------
+
 
 void SfxItemPool::SetPoolDefaultItem(const SfxPoolItem &rItem)
 {
@@ -682,7 +682,7 @@ void SfxItemPool::ResetPoolDefaultItem( sal_uInt16 nWhichId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich )
 {
@@ -811,7 +811,7 @@ const SfxPoolItem& SfxItemPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
     return *pNewItem;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::Remove( const SfxPoolItem& rItem )
 {
@@ -892,7 +892,7 @@ void SfxItemPool::Remove( const SfxPoolItem& rItem )
     SFX_ASSERT( false, rItem.Which(), "removing Item not in Pool" );
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem& SfxItemPool::GetDefaultItem( sal_uInt16 nWhich ) const
 {
@@ -939,7 +939,7 @@ void SfxItemPool::FreezeIdRanges()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::FillItemIdRanges_Impl( sal_uInt16*& pWhichRanges ) const
 {
@@ -990,7 +990,7 @@ const SfxPoolItem *SfxItemPool::GetItem2(sal_uInt16 nWhich, sal_uInt32 nOfst) co
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const
 {
@@ -1010,7 +1010,7 @@ sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const
 {
@@ -1026,7 +1026,7 @@ sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const
     return nSlotId;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const
 {
@@ -1045,7 +1045,7 @@ sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const
     return nSID ? nSID : nWhich;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const
 {
@@ -1061,7 +1061,7 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, bool bDeep ) const
 {
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 5403f2c95fb9..7b1c14cdebec 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -77,7 +77,7 @@ const sal_Char *DbgCheckItemSet( const void* pVoid )
 }
 
 #endif
-// -----------------------------------------------------------------------
+
 
 SfxItemSet::SfxItemSet
 (
@@ -125,7 +125,7 @@ SfxItemSet::SfxItemSet
     memset( (void*) _aItems, 0, nSize * sizeof( SfxPoolItem* ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet::SfxItemSet( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ):
     _pPool( &rPool ),
@@ -140,7 +140,7 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhic
     InitRanges_Impl(nWhich1, nWhich2);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2)
 {
@@ -154,7 +154,7 @@ void SfxItemSet::InitRanges_Impl(sal_uInt16 nWh1, sal_uInt16 nWh2)
     memset( (void*) _aItems, 0, nRg * sizeof( SfxPoolItem* ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2, sal_uInt16 nNull)
 {
@@ -165,7 +165,7 @@ void SfxItemSet::InitRanges_Impl(va_list pArgs, sal_uInt16 nWh1, sal_uInt16 nWh2
     memset( (void*) _aItems, 0, sizeof( SfxPoolItem* ) * nSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet::SfxItemSet( SfxItemPool& rPool,
                         USHORT_ARG nWh1, USHORT_ARG nWh2, USHORT_ARG nNull, ... ):
@@ -194,7 +194,7 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable)
 {
@@ -220,7 +220,7 @@ void SfxItemSet::InitRanges_Impl(const sal_uInt16 *pWhichPairTable)
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable ):
     _pPool( &rPool ),
@@ -237,7 +237,7 @@ SfxItemSet::SfxItemSet( SfxItemPool& rPool, const sal_uInt16* pWhichPairTable ):
         InitRanges_Impl(pWhichPairTable);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
     _pPool( rASet._pPool ),
@@ -289,7 +289,7 @@ SfxItemSet::SfxItemSet( const SfxItemSet& rASet ):
     memcpy( _pWhichRanges, rASet._pWhichRanges, sizeof( sal_uInt16 ) * cnt);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet::~SfxItemSet()
 {
@@ -330,7 +330,7 @@ SfxItemSet::~SfxItemSet()
     DBG( delete _pChildCount(this); _pChildCountDtor );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
 
@@ -430,7 +430,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
     return nDel;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault )
 {
@@ -484,7 +484,7 @@ void SfxItemSet::InvalidateAllItems()
     memset( (void*)_aItems, -1, ( _nCount = TotalCount() ) * sizeof( SfxPoolItem*) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
                                         bool bSrchInParent,
@@ -549,7 +549,7 @@ bool SfxItemSet::HasItem(sal_uInt16 nWhich, const SfxPoolItem** ppItem) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich )
 {
@@ -629,7 +629,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault )
 {
@@ -662,7 +662,7 @@ bool SfxItemSet::Put( const SfxItemSet& rSet, bool bInvalidAsDefault )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::PutExtended
 (
@@ -749,7 +749,7 @@ void SfxItemSet::PutExtended
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
 /** <H3>Description</H3>
@@ -769,7 +769,7 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
     SetRanges( aRanges );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges )
 
@@ -862,7 +862,7 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemSet::Set
 (
@@ -1031,14 +1031,14 @@ const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) c
 }
 
     // Notification-Callback
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::Changed( const SfxPoolItem&, const SfxPoolItem& )
 {
     DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemSet::TotalCount() const
 {
@@ -1052,7 +1052,7 @@ sal_uInt16 SfxItemSet::TotalCount() const
     }
     return nRet;
 }
-// -----------------------------------------------------------------------
+
 
 // behalte nur die Items, die auch in rSet enthalten sein (Wert egal)
 
@@ -1133,7 +1133,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::Differentiate( const SfxItemSet& rSet )
 {
@@ -1205,7 +1205,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 /* Entscheidungstabelle fuer MergeValue[s]
 
 Grundsaetze:
@@ -1350,7 +1350,7 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
 {
@@ -1408,7 +1408,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults )
 {
@@ -1430,7 +1430,7 @@ void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemSet::InvalidateItem( sal_uInt16 nWhich )
 {
@@ -1464,7 +1464,7 @@ void SfxItemSet::InvalidateItem( sal_uInt16 nWhich )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const
 {
@@ -1483,7 +1483,7 @@ sal_uInt16 SfxItemSet::GetWhichByPos( sal_uInt16 nPos ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream &SfxItemSet::Store
 (
@@ -1549,7 +1549,7 @@ SvStream &SfxItemSet::Store
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream &SfxItemSet::Load
 (
@@ -1626,7 +1626,7 @@ SvStream &SfxItemSet::Load
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
 {
@@ -1696,7 +1696,7 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
 {
@@ -1724,7 +1724,7 @@ SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
                 : new SfxItemSet(*_pPool, _pWhichRanges);
 }
 
-// -----------------------------------------------------------------------
+
 
 int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
 {
@@ -1770,7 +1770,7 @@ int SfxItemSet::PutDirect(const SfxPoolItem &rItem)
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
 :   SfxItemSet(rPool, (const sal_uInt16*) 0),
@@ -1786,7 +1786,7 @@ SfxAllItemSet::SfxAllItemSet( SfxItemPool &rPool )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 
 SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy)
@@ -1796,7 +1796,7 @@ SfxAllItemSet::SfxAllItemSet(const SfxItemSet &rCopy)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 
 
@@ -1812,7 +1812,7 @@ SfxAllItemSet::SfxAllItemSet(const SfxAllItemSet &rCopy)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_uInt16 *AddRanges_Impl(
     sal_uInt16 *pUS, std::ptrdiff_t nOldSize, sal_uInt16 nIncr)
@@ -1843,7 +1843,7 @@ static sal_uInt16 *AddRanges_Impl(
     return pNew;
 }
 
-// -----------------------------------------------------------------------
+
 
 static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_uInt16 nPos)
 
@@ -1881,7 +1881,7 @@ static SfxItemArray AddItem_Impl(SfxItemArray pItems, sal_uInt16 nOldSize, sal_u
     return pNew;
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich )
 
@@ -2005,7 +2005,7 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi
     return &rNew;
 }
 
-// -----------------------------------------------------------------------
+
 // Item disablen, wenn durch ein VoidItem mit dem Which-Wert 0 ausgedrueckt
 
 void SfxItemSet::DisableItem(sal_uInt16 nWhich)
@@ -2014,7 +2014,7 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich)
     Put( SfxVoidItem(0), nWhich );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet *SfxAllItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
 {
@@ -2030,14 +2030,14 @@ SfxItemSet *SfxAllItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
         return bItems ? new SfxAllItemSet(*this) : new SfxAllItemSet(*_pPool);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 SfxItemSet::getHash() const
 {
     return stringify().hashCode();
 }
 
-// -----------------------------------------------------------------------
+
 
 OString SfxItemSet::stringify() const
 {
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 71116aa88844..d89eb630cd6d 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -22,17 +22,17 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxLockBytesItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxLockBytesItem::SfxLockBytesItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream )
 :   SfxPoolItem( nW )
@@ -44,7 +44,7 @@ SfxLockBytesItem::SfxLockBytesItem( sal_uInt16 nW, SvStream &rStream )
     rStream.ReadStream( aLockBytesStream );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem )
 :   SfxPoolItem( rItem ),
@@ -52,27 +52,27 @@ SfxLockBytesItem::SfxLockBytesItem( const SfxLockBytesItem& rItem )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxLockBytesItem::~SfxLockBytesItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxLockBytesItem::operator==( const SfxPoolItem& rItem ) const
 {
     return ((SfxLockBytesItem&)rItem)._xVal == _xVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxLockBytesItem::Clone(SfxItemPool *) const
 {
     return new SfxLockBytesItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 #define MAX_BUF 32000
 
@@ -97,7 +97,7 @@ SfxPoolItem* SfxLockBytesItem::Create( SvStream &rStream, sal_uInt16 ) const
     return new SfxLockBytesItem( Which(), aNewStream );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxLockBytesItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 393f4c9b0cf1..bf7df9bbefa3 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -25,11 +25,11 @@
 
 DBG_NAME(SvxMacroItem);
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxMacroItem, SfxPoolItem, new SvxMacroItem(0));
 
-// -----------------------------------------------------------------------
+
 
 SvxMacro::SvxMacro( const OUString &rMacName, const OUString &rLanguage)
     : aMacName( rMacName ), aLibName( rLanguage),
@@ -70,7 +70,7 @@ SvxMacro& SvxMacro::operator=( const SvxMacro& rBase )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl )
 {
@@ -190,7 +190,7 @@ bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent)
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -202,7 +202,7 @@ bool SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const
     return rOwn == rOther;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxMacroItem::Clone( SfxItemPool* ) const
 {
@@ -237,14 +237,14 @@ SfxItemPresentation SvxMacroItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxMacroItem::Store( SvStream& rStrm , sal_uInt16 ) const
 {
     return aMacroTable.Write( rStrm );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
@@ -253,14 +253,14 @@ SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
     return pAttr;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMacroItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
 {
     aMacroTable.Insert( nEvent, rMacro);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxMacroItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
 {
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index a6ec3016555d..90d952ad76de 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -461,7 +461,7 @@ void SfxItemPool_Impl::readTheItems (
     delete pOldArr;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream &SfxItemPool::Load(SvStream &rStream)
 {
@@ -988,7 +988,7 @@ SvStream &SfxItemPool::Load1_Impl(SvStream &rStream)
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 const SfxPoolItem* SfxItemPool::LoadSurrogate
 (
@@ -1155,7 +1155,7 @@ bool SfxItemPool::StoreSurrogate
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
 {
@@ -1188,7 +1188,7 @@ sal_uInt32 SfxItemPool::GetSurrogate(const SfxPoolItem *pItem) const
     return SFX_ITEMS_NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemPool::IsInStoringRange( sal_uInt16 nWhich ) const
 {
@@ -1220,7 +1220,7 @@ void SfxItemPool::SetStoringRange( sal_uInt16 nFrom, sal_uInt16 nTo )
     pImp->nStoringEnd = nTo;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxItemPool::SetVersionMap
 (
@@ -1310,7 +1310,7 @@ void SfxItemPool::SetVersionMap
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxItemPool::GetNewWhich
 (
@@ -1401,7 +1401,7 @@ sal_uInt16 SfxItemPool::GetNewWhich
     return nFileWhich;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 bool SfxItemPool::IsInVersionsRange( sal_uInt16 nWhich ) const
@@ -1409,7 +1409,7 @@ bool SfxItemPool::IsInVersionsRange( sal_uInt16 nWhich ) const
     return nWhich >= pImp->nVerStart && nWhich <= pImp->nVerEnd;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxItemPool::IsCurrentVersionLoading() const
 
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 530b8dfb2c3b..d2e1361e0a95 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -36,7 +36,7 @@ TYPEINIT1(SfxVoidItem, SfxPoolItem);
 TYPEINIT1(SfxSetItem, SfxPoolItem);
 // @@@ TYPEINIT1(SfxItemChangedHint, SfxHint);
 
-// ------------------------------------------------------------------------
+
 #if OSL_DEBUG_LEVEL > 1
 static sal_uLong nItemCount = 0;
 
@@ -87,7 +87,7 @@ SfxPoolItem::SfxPoolItem(sal_uInt16 const nWhich)
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
     : m_nRefCount(0) // don't copy that
     , m_nWhich(rCpy.Which()) // call function because of ChkThis() (WTF does that mean?)
@@ -124,7 +124,7 @@ SfxPoolItem::SfxPoolItem( const SfxPoolItem& rCpy )
 #endif
 }
 
-// ------------------------------------------------------------------------
+
 SfxPoolItem::~SfxPoolItem()
 {
     DBG_DTOR(SfxPoolItem, 0);
@@ -135,40 +135,40 @@ SfxPoolItem::~SfxPoolItem()
 #endif
 }
 
-// ------------------------------------------------------------------------
+
 int SfxPoolItem::Compare( const SfxPoolItem& ) const
 {
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 int SfxPoolItem::Compare( const SfxPoolItem& rWith, const IntlWrapper& ) const
 {
     return Compare( rWith );
 }
 
-// ------------------------------------------------------------------------
+
 bool SfxPoolItem::operator==( const SfxPoolItem& rCmp ) const
 {
     DBG_CHKTHIS(SfxPoolItem, 0);
     return rCmp.Type() == Type();
 }
 
-// -----------------------------------------------------------------------
+
 SfxPoolItem* SfxPoolItem::Create(SvStream &, sal_uInt16) const
 {
     DBG_CHKTHIS(SfxPoolItem, 0);
     return Clone(0);
 }
 
-// -----------------------------------------------------------------------
+
 sal_uInt16 SfxPoolItem::GetVersion( sal_uInt16 ) const
 {
     DBG_CHKTHIS(SfxPoolItem, 0);
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 SvStream& SfxPoolItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
     DBG_CHKTHIS(SfxPoolItem, 0);
@@ -200,7 +200,7 @@ void SfxPoolItem::writeUnicodeString(SvStream & rStream, const OUString& rString
     rStream.WriteUniOrByteString(rString, RTL_TEXTENCODING_UCS2);
 }
 
-// ------------------------------------------------------------------------
+
 SfxItemPresentation SfxPoolItem::GetPresentation
 (
     SfxItemPresentation /*ePresentation*/,       // IN:  wie formatiert werden soll
@@ -273,7 +273,7 @@ SfxVoidItem::SfxVoidItem( const SfxVoidItem& rCopy):
     DBG_CTOR(SfxVoidItem, 0);
 }
 
-// ------------------------------------------------------------------------
+
 bool SfxVoidItem::operator==( const SfxPoolItem&
 #ifdef DBG_UTIL
 rCmp
@@ -285,7 +285,7 @@ rCmp
     return true;
 }
 
-// ------------------------------------------------------------------------
+
 SfxItemPresentation SfxVoidItem::GetPresentation
 (
     SfxItemPresentation     /*ePresentation*/,
@@ -300,7 +300,7 @@ SfxItemPresentation SfxVoidItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// ------------------------------------------------------------------------
+
 SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const
 {
     DBG_CHKTHIS(SfxVoidItem, 0);
@@ -317,7 +317,7 @@ SfxItemHandle::SfxItemHandle(SfxPoolItem &rItem):
     DBG_CTOR(SfxItemHandle, 0);
 }
 
-// ------------------------------------------------------------------------
+
 SfxItemHandle::SfxItemHandle(const SfxItemHandle &rCopy):
     pRef(rCopy.pRef),
     pItem(rCopy.pItem)
@@ -326,7 +326,7 @@ SfxItemHandle::SfxItemHandle(const SfxItemHandle &rCopy):
     ++(*pRef);
 }
 
-// ------------------------------------------------------------------------
+
 const SfxItemHandle &SfxItemHandle::operator=(const SfxItemHandle &rCopy)
 {
     DBG_CHKTHIS(SfxItemHandle, 0);
@@ -344,7 +344,7 @@ const SfxItemHandle &SfxItemHandle::operator=(const SfxItemHandle &rCopy)
     return *this;
 }
 
-// ------------------------------------------------------------------------
+
 SfxItemHandle::~SfxItemHandle()
 {
     DBG_DTOR(SfxItemHandle, 0);
@@ -355,19 +355,19 @@ SfxItemHandle::~SfxItemHandle()
     }
 }
 
-// ------------------------------------------------------------------------
+
 bool SfxPoolItem::ScaleMetrics( long /*lMult*/, long /*lDiv*/ )
 {
     return false;
 }
 
-// ------------------------------------------------------------------------
+
 bool SfxPoolItem::HasMetrics() const
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8 ) const
 {
@@ -375,7 +375,7 @@ bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, sal_uInt8 ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, sal_uInt8 )
 {
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 5adf1b9b6e50..b032a376b2bf 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -34,18 +34,18 @@ DBG_NAME(SfxPointItem)
 #define TWIP_TO_MM100(TWIP)     ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
 #define MM100_TO_TWIP(MM100)    ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxPointItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxPointItem::SfxPointItem()
 {
     DBG_CTOR(SfxPointItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) :
     SfxPoolItem( nW ),
@@ -54,7 +54,7 @@ SfxPointItem::SfxPointItem( sal_uInt16 nW, const Point& rVal ) :
     DBG_CTOR(SfxPointItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) :
     SfxPoolItem( rItem ),
@@ -63,7 +63,7 @@ SfxPointItem::SfxPointItem( const SfxPointItem& rItem ) :
     DBG_CTOR(SfxPointItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SfxPointItem::GetPresentation
 (
@@ -79,7 +79,7 @@ SfxItemPresentation SfxPointItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -88,7 +88,7 @@ bool SfxPointItem::operator==( const SfxPoolItem& rItem ) const
     return ((SfxPointItem&)rItem).aVal == aVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const
 {
@@ -96,7 +96,7 @@ SfxPoolItem* SfxPointItem::Clone(SfxItemPool *) const
     return new SfxPointItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const
 {
@@ -106,7 +106,7 @@ SfxPoolItem* SfxPointItem::Create(SvStream &rStream, sal_uInt16 ) const
     return new SfxPointItem(Which(), aStr);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
@@ -115,7 +115,7 @@ SvStream& SfxPointItem::Store(SvStream &rStream, sal_uInt16 ) const
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxPointItem::QueryValue( uno::Any& rVal,
                                sal_uInt8 nMemberId ) const
@@ -139,7 +139,7 @@ bool SfxPointItem::QueryValue( uno::Any& rVal,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxPointItem::PutValue( const uno::Any& rVal,
                              sal_uInt8 nMemberId )
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 1c676767bc20..8a1da88a515a 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -31,18 +31,18 @@
 DBG_NAME(SfxRectangleItem)
 
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxRectangleItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxRectangleItem::SfxRectangleItem()
 {
     DBG_CTOR(SfxRectangleItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) :
     SfxPoolItem( nW ),
@@ -51,7 +51,7 @@ SfxRectangleItem::SfxRectangleItem( sal_uInt16 nW, const Rectangle& rVal ) :
     DBG_CTOR(SfxRectangleItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) :
     SfxPoolItem( rItem ),
@@ -60,7 +60,7 @@ SfxRectangleItem::SfxRectangleItem( const SfxRectangleItem& rItem ) :
     DBG_CTOR(SfxRectangleItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SfxRectangleItem::GetPresentation
 (
@@ -79,7 +79,7 @@ SfxItemPresentation SfxRectangleItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -88,7 +88,7 @@ bool SfxRectangleItem::operator==( const SfxPoolItem& rItem ) const
     return ((SfxRectangleItem&)rItem).aVal == aVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const
 {
@@ -96,7 +96,7 @@ SfxPoolItem* SfxRectangleItem::Clone(SfxItemPool *) const
     return new SfxRectangleItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const
 {
@@ -106,7 +106,7 @@ SfxPoolItem* SfxRectangleItem::Create(SvStream &rStream, sal_uInt16 ) const
     return new SfxRectangleItem(Which(), aStr);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
@@ -116,7 +116,7 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, sal_uInt16 ) const
 }
 
 
-// -----------------------------------------------------------------------
+
 bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
                                    sal_uInt8 nMemberId) const
 {
@@ -141,7 +141,7 @@ bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
                                  sal_uInt8 nMemberId  )
 {
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index 80ac48a7418e..841b13ab2cc7 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.cxx
@@ -27,14 +27,14 @@ static inline sal_uInt16 Count_Impl(const sal_uInt16 * pRanges)
     return nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxRangeItem, SfxPoolItem);
 TYPEINIT1_AUTOFACTORY(SfxUShortRangesItem, SfxPoolItem);
 
 sal_uInt16 Count_Impl( const sal_uInt16 *pRanges );
 
-// -----------------------------------------------------------------------
+
 
 SfxRangeItem::SfxRangeItem()
 {
@@ -42,7 +42,7 @@ SfxRangeItem::SfxRangeItem()
     nTo = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ):
     SfxPoolItem( which ),
@@ -51,7 +51,7 @@ SfxRangeItem::SfxRangeItem( sal_uInt16 which, sal_uInt16 from, sal_uInt16 to ):
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) :
     SfxPoolItem( rItem )
@@ -60,7 +60,7 @@ SfxRangeItem::SfxRangeItem( const SfxRangeItem& rItem ) :
     nTo = rItem.nTo;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SfxRangeItem::GetPresentation
 (
@@ -75,7 +75,7 @@ SfxItemPresentation SfxRangeItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -86,14 +86,14 @@ bool SfxRangeItem::operator==( const SfxPoolItem& rItem ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxRangeItem::Clone(SfxItemPool *) const
 {
     return new SfxRangeItem( Which(), nFrom, nTo );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxRangeItem::Create(SvStream &rStream, sal_uInt16) const
 {
@@ -103,7 +103,7 @@ SfxPoolItem* SfxRangeItem::Create(SvStream &rStream, sal_uInt16) const
     return new SfxRangeItem( Which(), nVon, nBis );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxRangeItem::Store(SvStream &rStream, sal_uInt16) const
 {
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index bdb1128217b1..14467d4457eb 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -26,7 +26,7 @@
 
 DBG_NAME(SfxSetItem)
 
-// --------------------------------------------------------------------------
+
 
 SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
     SfxPoolItem(which),
@@ -35,7 +35,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
     DBG_CTOR(SfxSetItem, 0);
 }
 
-// --------------------------------------------------------------------------
+
 
 SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) :
     SfxPoolItem(which),
@@ -45,7 +45,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) :
     DBG_ASSERT(pS, "SfxSetItem without set constructed" );
 }
 
-// --------------------------------------------------------------------------
+
 
 SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) :
     SfxPoolItem(rCopy.Which()),
@@ -54,7 +54,7 @@ SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) :
     DBG_CTOR(SfxSetItem, 0);
 }
 
-// --------------------------------------------------------------------------
+
 
 SfxSetItem::~SfxSetItem()
 {
@@ -62,7 +62,7 @@ SfxSetItem::~SfxSetItem()
     delete pSet; pSet = 0;
 }
 
-// --------------------------------------------------------------------------
+
 
 bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const
 {
@@ -71,7 +71,7 @@ bool SfxSetItem::operator==( const SfxPoolItem& rCmp) const
     return *pSet == *(((const SfxSetItem &)rCmp).pSet);
 }
 
-// --------------------------------------------------------------------------
+
 
 SfxItemPresentation SfxSetItem::GetPresentation
 (
@@ -86,7 +86,7 @@ SfxItemPresentation SfxSetItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// --------------------------------------------------------------------------
+
 
 SvStream& SfxSetItem::Store(SvStream& rStream, sal_uInt16) const
 {
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index 751ff5c812a0..b8ef8f4aee0b 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -28,7 +28,7 @@
 
 DBG_NAME(SfxStringListItem)
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxStringListItem, SfxPoolItem);
 
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 9da71b854baa..8beec542924c 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star::util;
 
 TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0));
 
-// -----------------------------------------------------------------------
+
 
 static Sequence< OUString > lcl_GetNotifyNames()
 {
@@ -96,7 +96,7 @@ static Sequence< OUString > lcl_GetNotifyNames()
     return aNames;
 }
 
-// -----------------------------------------------------------------------
+
 SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 
     SfxPoolItem( nId ),
@@ -185,7 +185,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
 
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
 
@@ -209,19 +209,19 @@ SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
     EnableNotification( lcl_GetNotifyNames() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxSearchItem::~SvxSearchItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const
 {
     return new SvxSearchItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 //! used below
 static bool operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 )
@@ -446,7 +446,7 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index b5d09d19e9bc..d6fdec0039a8 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -30,18 +30,18 @@
 
 DBG_NAME(SfxSizeItem)
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SfxSizeItem, SfxPoolItem);
 
-// -----------------------------------------------------------------------
+
 
 SfxSizeItem::SfxSizeItem()
 {
     DBG_CTOR(SfxSizeItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) :
     SfxPoolItem( nW ),
@@ -50,7 +50,7 @@ SfxSizeItem::SfxSizeItem( sal_uInt16 nW, const Size& rVal ) :
     DBG_CTOR(SfxSizeItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) :
     SfxPoolItem( rItem ),
@@ -59,7 +59,7 @@ SfxSizeItem::SfxSizeItem( const SfxSizeItem& rItem ) :
     DBG_CTOR(SfxSizeItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SfxSizeItem::GetPresentation
 (
@@ -75,7 +75,7 @@ SfxItemPresentation SfxSizeItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -84,7 +84,7 @@ bool SfxSizeItem::operator==( const SfxPoolItem& rItem ) const
     return ((SfxSizeItem&)rItem).aVal == aVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const
 {
@@ -92,7 +92,7 @@ SfxPoolItem* SfxSizeItem::Clone(SfxItemPool *) const
     return new SfxSizeItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const
 {
@@ -102,7 +102,7 @@ SfxPoolItem* SfxSizeItem::Create(SvStream &rStream, sal_uInt16 ) const
     return new SfxSizeItem(Which(), aStr);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
@@ -111,7 +111,7 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, sal_uInt16 ) const
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 bool  SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
                                sal_uInt8 nMemberId ) const
 {
@@ -142,7 +142,7 @@ bool  SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
                             sal_uInt8 nMemberId )
 {
diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index 403bfd1e69cf..d1502c74b151 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.cxx
@@ -23,7 +23,7 @@
 
 DBG_NAME(SfxWhichIter)
 
-// -----------------------------------------------------------------------
+
 
 SfxWhichIter::SfxWhichIter( const SfxItemSet& rSet, sal_uInt16 nFromWh, sal_uInt16 nToWh ):
     pRanges(rSet.GetRanges()),
@@ -35,14 +35,14 @@ SfxWhichIter::SfxWhichIter( const SfxItemSet& rSet, sal_uInt16 nFromWh, sal_uInt
         FirstWhich();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxWhichIter::~SfxWhichIter()
 {
     DBG_DTOR(SfxWhichIter, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxWhichIter::NextWhich()
 {
@@ -63,7 +63,7 @@ sal_uInt16 SfxWhichIter::NextWhich()
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SfxWhichIter::FirstWhich()
 {
diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index 14745c1d653b..9ebb0dd927e9 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.cxx
@@ -52,18 +52,18 @@ namespace svt {
 
 bool DocumentLockFile::m_bAllowInteraction = true;
 
-// ----------------------------------------------------------------------
+
 DocumentLockFile::DocumentLockFile( const OUString& aOrigURL )
 : LockFileCommon( aOrigURL, OUString( ".~lock."  ) )
 {
 }
 
-// ----------------------------------------------------------------------
+
 DocumentLockFile::~DocumentLockFile()
 {
 }
 
-// ----------------------------------------------------------------------
+
 void DocumentLockFile::WriteEntryToStream( uno::Sequence< OUString > aEntry, uno::Reference< io::XOutputStream > xOutput )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -84,7 +84,7 @@ void DocumentLockFile::WriteEntryToStream( uno::Sequence< OUString > aEntry, uno
     xOutput->writeBytes( aData );
 }
 
-// ----------------------------------------------------------------------
+
 bool DocumentLockFile::CreateOwnLockFile()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -131,7 +131,7 @@ bool DocumentLockFile::CreateOwnLockFile()
     return true;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< OUString > DocumentLockFile::GetLockData()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -155,7 +155,7 @@ uno::Sequence< OUString > DocumentLockFile::GetLockData()
     return ParseEntry( aBuffer, nCurPos );
 }
 
-// ----------------------------------------------------------------------
+
 uno::Reference< io::XInputStream > DocumentLockFile::OpenStream()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -167,7 +167,7 @@ uno::Reference< io::XInputStream > DocumentLockFile::OpenStream()
     return aSourceContent.openStream();
 }
 
-// ----------------------------------------------------------------------
+
 bool DocumentLockFile::OverwriteOwnLockFile()
 {
     // allows to overwrite the lock file with the current data
@@ -194,7 +194,7 @@ bool DocumentLockFile::OverwriteOwnLockFile()
     return true;
 }
 
-// ----------------------------------------------------------------------
+
 void DocumentLockFile::RemoveFile()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index e0f3f89d0325..ea0a5965649f 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.cxx
@@ -53,7 +53,7 @@ using namespace ::com::sun::star;
 
 namespace svt {
 
-// ----------------------------------------------------------------------
+
 LockFileCommon::LockFileCommon( const OUString& aOrigURL, const OUString& aPrefix )
 {
     INetURLObject aDocURL = ResolveLinks( INetURLObject( aOrigURL ) );
@@ -65,12 +65,12 @@ LockFileCommon::LockFileCommon( const OUString& aOrigURL, const OUString& aPrefi
     m_aURL = INetURLObject( aShareURLString ).GetMainURL( INetURLObject::NO_DECODE );
 }
 
-// ----------------------------------------------------------------------
+
 LockFileCommon::~LockFileCommon()
 {
 }
 
-// ----------------------------------------------------------------------
+
 INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL )
 {
     if ( aDocURL.HasError() )
@@ -94,7 +94,7 @@ INetURLObject LockFileCommon::ResolveLinks( const INetURLObject& aDocURL )
     return INetURLObject( aURLToCheck );
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< uno::Sequence< OUString > > LockFileCommon::ParseList( const uno::Sequence< sal_Int8 >& aBuffer )
 {
     sal_Int32 nCurPos = 0;
@@ -113,7 +113,7 @@ uno::Sequence< uno::Sequence< OUString > > LockFileCommon::ParseList( const uno:
     return aResult;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< OUString > LockFileCommon::ParseEntry( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos )
 {
     uno::Sequence< OUString > aResult( LOCKFILE_ENTRYSIZE );
@@ -130,7 +130,7 @@ uno::Sequence< OUString > LockFileCommon::ParseEntry( const uno::Sequence< sal_I
     return aResult;
 }
 
-// ----------------------------------------------------------------------
+
 OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sal_Int32& io_nCurPos )
 {
     OStringBuffer aResult;
@@ -168,7 +168,7 @@ OUString LockFileCommon::ParseName( const uno::Sequence< sal_Int8 >& aBuffer, sa
     return OStringToOUString( aResult.makeStringAndClear(), RTL_TEXTENCODING_UTF8 );
 }
 
-// ----------------------------------------------------------------------
+
 OUString LockFileCommon::EscapeCharacters( const OUString& aSource )
 {
     OUStringBuffer aBuffer;
@@ -183,7 +183,7 @@ OUString LockFileCommon::EscapeCharacters( const OUString& aSource )
     return aBuffer.makeStringAndClear();
 }
 
-// ----------------------------------------------------------------------
+
 OUString LockFileCommon::GetOOOUserName()
 {
     SvtUserOptions aUserOpt;
@@ -195,7 +195,7 @@ OUString LockFileCommon::GetOOOUserName()
     return aName;
 }
 
-// ----------------------------------------------------------------------
+
 OUString LockFileCommon::GetCurrentLocalTime()
 {
     OUString aTime;
@@ -219,7 +219,7 @@ OUString LockFileCommon::GetCurrentLocalTime()
     return aTime;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< OUString > LockFileCommon::GenerateOwnEntry()
 {
     uno::Sequence< OUString > aResult( LOCKFILE_ENTRYSIZE );
diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index c1e69060fc0d..c174bb0f79a8 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.cxx
@@ -51,7 +51,7 @@ using namespace ::com::sun::star;
 
 namespace svt {
 
-// ----------------------------------------------------------------------
+
 ShareControlFile::ShareControlFile( const OUString& aOrigURL )
 : LockFileCommon( aOrigURL, OUString( ".~sharing."  ) )
 {
@@ -61,7 +61,7 @@ ShareControlFile::ShareControlFile( const OUString& aOrigURL )
         throw io::NotConnectedException();
 }
 
-// ----------------------------------------------------------------------
+
 ShareControlFile::~ShareControlFile()
 {
     try
@@ -72,7 +72,7 @@ ShareControlFile::~ShareControlFile()
     {}
 }
 
-// ----------------------------------------------------------------------
+
 void ShareControlFile::OpenStream()
 {
     // if it is called outside of constructor the mutex must be locked already
@@ -128,7 +128,7 @@ void ShareControlFile::OpenStream()
     }
 }
 
-// ----------------------------------------------------------------------
+
 void ShareControlFile::Close()
 {
     // if it is called outside of destructor the mutex must be locked
@@ -154,7 +154,7 @@ void ShareControlFile::Close()
     }
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< uno::Sequence< OUString > > ShareControlFile::GetUsersData()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -191,7 +191,7 @@ uno::Sequence< uno::Sequence< OUString > > ShareControlFile::GetUsersData()
     return m_aUsersData;
 }
 
-// ----------------------------------------------------------------------
+
 void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence< OUString > >& aUsersData )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -227,7 +227,7 @@ void ShareControlFile::SetUsersDataAndStore( const uno::Sequence< uno::Sequence<
     m_aUsersData = aUsersData;
 }
 
-// ----------------------------------------------------------------------
+
 uno::Sequence< OUString > ShareControlFile::InsertOwnEntry()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -273,7 +273,7 @@ uno::Sequence< OUString > ShareControlFile::InsertOwnEntry()
     return aNewEntry;
 }
 
-// ----------------------------------------------------------------------
+
 bool ShareControlFile::HasOwnEntry()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -300,7 +300,7 @@ bool ShareControlFile::HasOwnEntry()
     return false;
 }
 
-// ----------------------------------------------------------------------
+
 void ShareControlFile::RemoveEntry( const uno::Sequence< OUString >& aArgEntry )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -341,7 +341,7 @@ void ShareControlFile::RemoveEntry( const uno::Sequence< OUString >& aArgEntry )
     }
 }
 
-// ----------------------------------------------------------------------
+
 void ShareControlFile::RemoveFile()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index f20611f6e0b6..a3b704697eab 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 
-// -----------------------------------------------------------------------
+
 
 class PathService : public ::cppu::WeakImplHelper2< css::frame::XConfigManager, css::lang::XServiceInfo >
 {
@@ -79,7 +79,7 @@ public:
         {}
 };
 
-// -----------------------------------------------------------------------
+
 
 css::uno::Reference< css::uno::XInterface > PathService_CreateInstance (
     SAL_UNUSED_PARAMETER const css::uno::Reference<
@@ -89,6 +89,6 @@ css::uno::Reference< css::uno::XInterface > PathService_CreateInstance (
         static_cast< cppu::OWeakObject* >(new PathService()));
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx
index e188dbdb8055..1df00c98eaed 100644
--- a/svl/source/uno/registerservices.cxx
+++ b/svl/source/uno/registerservices.cxx
@@ -28,7 +28,7 @@
 using css::uno::Reference;
 using css::uno::Sequence;
 
-// -------------------------------------------------------------------------------------
+
 
 #define DECLARE_CREATEINSTANCE( ImplName ) \
     Reference< css::uno::XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< css::lang::XMultiServiceFactory >& );
@@ -37,7 +37,7 @@ DECLARE_CREATEINSTANCE( SvNumberFormatterServiceObj )
 DECLARE_CREATEINSTANCE( SvNumberFormatsSupplierServiceObject )
 DECLARE_CREATEINSTANCE( PathService )
 
-// -------------------------------------------------------------------------------------
+
 
 extern "C"
 {
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 6ec387356f9d..be9ad5d96473 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -46,7 +46,7 @@ using com::sun::star::lang::XComponent;
 using namespace ::com::sun::star::uno;
 using namespace svt;
 
-//-------------------------------------------------------------------
+
 
 namespace
 {
@@ -116,7 +116,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
                 ( bHasFocus ? 0 : 1 ) + ( GetUpdateMode() ? 0 : 1 );
 }
 
-//-------------------------------------------------------------------
+
 
 BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode )
     :Control( pParent, nBits | WB_3DLOOK )
@@ -128,7 +128,7 @@ BrowseBox::BrowseBox( Window* pParent, WinBits nBits, BrowserMode nMode )
     ConstructImpl( nMode );
 }
 
-//-------------------------------------------------------------------
+
 
 BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode )
     :Control( pParent, rId )
@@ -139,7 +139,7 @@ BrowseBox::BrowseBox( Window* pParent, const ResId& rId, BrowserMode nMode )
     DBG_CTOR( BrowseBox, NULL );
     ConstructImpl(nMode);
 }
-//-------------------------------------------------------------------
+
 
 BrowseBox::~BrowseBox()
 {
@@ -169,14 +169,14 @@ BrowseBox::~BrowseBox()
         delete uRow.pSel;
 }
 
-//-------------------------------------------------------------------
+
 
 short BrowseBox::GetCursorHideCount() const
 {
     return getDataWindow()->nCursorHidden;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::DoShowCursor( const char * )
 {
@@ -193,7 +193,7 @@ void BrowseBox::DoShowCursor( const char * )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::DoHideCursor( const char * )
 {
@@ -210,14 +210,14 @@ void BrowseBox::DoHideCursor( const char * )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetRealRowCount( const OUString &rRealRowCount )
 {
     getDataWindow()->aRealRowCount = rRealRowCount;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetFont( const Font& rNewFont )
 {
@@ -226,14 +226,14 @@ void BrowseBox::SetFont( const Font& rNewFont )
     ImpGetDataRowHeight();
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uLong BrowseBox::GetDefaultColumnWidth( const OUString& _rText ) const
 {
     return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth(OUString('0')) * 4;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
 {
@@ -265,7 +265,7 @@ void BrowseBox::InsertHandleColumn( sal_uLong nWidth )
     ColumnInserted( 0 );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
         long nWidth, HeaderBarItemBits nBits, sal_uInt16 nPos )
@@ -308,7 +308,7 @@ void BrowseBox::InsertDataColumn( sal_uInt16 nItemId, const OUString& rText,
     ColumnInserted( nPos );
 }
 
-//-------------------------------------------------------------------
+
 sal_uInt16 BrowseBox::ToggleSelectedColumn()
 {
     sal_uInt16 nSelectedColId = BROWSER_INVALIDID;
@@ -321,7 +321,7 @@ sal_uInt16 BrowseBox::ToggleSelectedColumn()
     }
     return nSelectedColId;
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId)
 {
     if ( pColSel && _nSelectedColumnId != BROWSER_INVALIDID )
@@ -332,7 +332,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId)
         DoShowCursor( "SetToggledSelectedColumn" );
     }
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
@@ -411,7 +411,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze )
     SetToggledSelectedColumn(nSelectedColId);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
 {
@@ -530,7 +530,7 @@ void BrowseBox::SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos )
 
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle )
 {
@@ -576,7 +576,7 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const OUString& rTitle )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
 {
@@ -685,7 +685,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::AutoSizeLastColumn()
 {
@@ -698,7 +698,7 @@ void BrowseBox::AutoSizeLastColumn()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
 {
@@ -782,7 +782,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::RemoveColumns()
 {
@@ -854,7 +854,7 @@ void BrowseBox::RemoveColumns()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
 {
@@ -866,14 +866,14 @@ OUString BrowseBox::GetColumnTitle( sal_uInt16 nId ) const
     return (*pCols)[ nItemPos ]->Title();
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::GetRowCount() const
 {
     return nRowCount;
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uInt16 BrowseBox::ColCount() const
 {
@@ -882,7 +882,7 @@ sal_uInt16 BrowseBox::ColCount() const
     return (sal_uInt16) pCols->size();
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::ImpGetDataRowHeight() const
 {
@@ -895,7 +895,7 @@ long BrowseBox::ImpGetDataRowHeight() const
     return nDataRowHeight;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetDataRowHeight( long nPixel )
 {
@@ -906,7 +906,7 @@ void BrowseBox::SetDataRowHeight( long nPixel )
     getDataWindow()->Invalidate();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetTitleLines( sal_uInt16 nLines )
 {
@@ -915,7 +915,7 @@ void BrowseBox::SetTitleLines( sal_uInt16 nLines )
     nTitleLines = nLines;
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::ScrollColumns( long nCols )
 {
@@ -1059,7 +1059,7 @@ long BrowseBox::ScrollColumns( long nCols )
     return nCols;
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::ScrollRows( long nRows )
 {
@@ -1117,7 +1117,7 @@ long BrowseBox::ScrollRows( long nRows )
     return nTopRow - nOldTopRow;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::RowModified( long nRow, sal_uInt16 nColId )
 {
@@ -1139,7 +1139,7 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId )
     getDataWindow()->Invalidate( aRect );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::Clear()
 {
@@ -1205,7 +1205,7 @@ void BrowseBox::Clear()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection )
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
@@ -1310,7 +1310,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo
     DBG_ASSERT(nCurRow < nRowCount,"nCurRow >= nRowCount");
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
 {
@@ -1483,14 +1483,14 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint )
     DBG_ASSERT(nCurRow < nRowCount,"nCurRow >= nRowCount");
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::GoToRow( long nRow)
 {
     return GoToRow(nRow, sal_False, sal_False);
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSelection )
 {
@@ -1578,7 +1578,7 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele
     return sal_True;
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId)
 {
@@ -1630,7 +1630,7 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_
     return sal_True;
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
 {
@@ -1662,7 +1662,7 @@ sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId )
     return bMoved;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetNoSelection()
 {
@@ -1703,7 +1703,7 @@ void BrowseBox::SetNoSelection()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SelectAll()
 {
@@ -1770,7 +1770,7 @@ void BrowseBox::SelectAll()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
 {
@@ -1844,7 +1844,7 @@ void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::GetSelectRowCount() const
 {
@@ -1854,7 +1854,7 @@ long BrowseBox::GetSelectRowCount() const
            uRow.nSel == BROWSER_ENDOFSELECTION ? 0 : 1;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_Bool bMakeVisible )
 {
@@ -1920,7 +1920,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B
     OSL_TRACE( "BrowseBox: %p->ShowCursor", this );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uInt16 BrowseBox::GetSelectColumnCount() const
 {
@@ -1931,13 +1931,13 @@ sal_uInt16 BrowseBox::GetSelectColumnCount() const
            nCurRow >= 0 ? 1 : 0;
 }
 
-//-------------------------------------------------------------------
+
 long BrowseBox::FirstSelectedColumn( ) const
 {
     return pColSel ? pColSel->FirstSelected() : BROWSER_ENDOFSELECTION;
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::FirstSelectedRow( sal_Bool bInverse )
 {
@@ -1946,7 +1946,7 @@ long BrowseBox::FirstSelectedRow( sal_Bool bInverse )
     return bMultiSelection ? uRow.pSel->FirstSelected(bInverse) : uRow.nSel;
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::NextSelectedRow()
 {
@@ -1955,7 +1955,7 @@ long BrowseBox::NextSelectedRow()
     return bMultiSelection ? uRow.pSel->NextSelected() : BROWSER_ENDOFSELECTION;
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::LastSelectedRow()
 {
@@ -1964,7 +1964,7 @@ long BrowseBox::LastSelectedRow()
     return bMultiSelection ? uRow.pSel->LastSelected() : uRow.nSel;
 }
 
-//-------------------------------------------------------------------
+
 
 bool BrowseBox::IsRowSelected( long nRow ) const
 {
@@ -1973,7 +1973,7 @@ bool BrowseBox::IsRowSelected( long nRow ) const
     return bMultiSelection ? uRow.pSel->IsSelected(nRow) : nRow == uRow.nSel;
 }
 
-//-------------------------------------------------------------------
+
 
 bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const
 {
@@ -1983,7 +1983,7 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const
                      nCurColId == nColumnId;
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::MakeFieldVisible
 (
@@ -2063,7 +2063,7 @@ sal_Bool BrowseBox::MakeFieldVisible
     return IsFieldVisible( nRow, nColId, bComplete );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
                                 sal_Bool bCompletely ) const
@@ -2090,7 +2090,7 @@ sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId,
         return !aOutRect.Intersection( aRect ).IsEmpty();
 }
 
-//-------------------------------------------------------------------
+
 
 Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
                                         sal_Bool bRelToBrowser) const
@@ -2113,7 +2113,7 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId,
     return Rectangle( aTopLeft, aRect.GetSize() );
 }
 
-//-------------------------------------------------------------------
+
 
 Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser  ) const
 {
@@ -2142,7 +2142,7 @@ Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser  ) const
     return Rectangle( aTopLeft, aRect.GetSize() );
 }
 
-//-------------------------------------------------------------------
+
 
 Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
 {
@@ -2173,7 +2173,7 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const
               GetDataRowHeight() - 1 ) );
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const
 {
@@ -2194,7 +2194,7 @@ long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const
     return nY / GetDataRowHeight() + nTopRow;
 }
 
-//-------------------------------------------------------------------
+
 
 Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
 {
@@ -2203,7 +2203,7 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const
     return GetFieldRectPixel( nCurRow, nColumnId );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const
 {
@@ -2224,7 +2224,7 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const
     return BROWSER_INVALIDID;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ReserveControlArea( sal_uInt16 nWidth )
 {
@@ -2238,7 +2238,7 @@ void BrowseBox::ReserveControlArea( sal_uInt16 nWidth )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 Rectangle BrowseBox::GetControlArea() const
 {
@@ -2250,7 +2250,7 @@ Rectangle BrowseBox::GetControlArea() const
              aHScroll.GetSizePixel().Height() ) );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetMode( BrowserMode nMode )
 {
@@ -2381,7 +2381,7 @@ void BrowseBox::SetMode( BrowserMode nMode )
     m_nCurrentMode = nMode;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::VisibleRowsChanged( long, sal_uInt16 )
 {
@@ -2398,7 +2398,7 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
 
@@ -2418,14 +2418,14 @@ sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const
     return sal_True;
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::GetDataRowHeight() const
 {
     return CalcZoom(nDataRowHeight ? nDataRowHeight : ImpGetDataRowHeight());
 }
 
-//-------------------------------------------------------------------
+
 
 BrowserHeader* BrowseBox::CreateHeaderBar( BrowseBox* pParent )
 {
@@ -2440,7 +2440,7 @@ void BrowseBox::SetHeaderBar( BrowserHeader* pHeaderBar )
     ( (BrowserDataWin*)pDataWin )->pHeaderBar = pHeaderBar;
     ( (BrowserDataWin*)pDataWin )->pHeaderBar->SetStartDragHdl( LINK( this, BrowseBox, StartDragHdl ) );
 }
-//-------------------------------------------------------------------
+
 
 #ifdef DBG_UTIL
 const char* BrowseBoxCheckInvariants( const void * pVoid )
@@ -2461,7 +2461,7 @@ const char* BrowseBoxCheckInvariants( const void * pVoid )
 }
 #endif
 
-//-------------------------------------------------------------------
+
 long BrowseBox::GetTitleHeight() const
 {
     long nHeight;
@@ -2476,7 +2476,7 @@ long BrowseBox::GetTitleHeight() const
     return nTitleLines ? nTitleLines * nHeight + 4 : 0;
 }
 
-//-------------------------------------------------------------------
+
 long BrowseBox::CalcReverseZoom(long nVal)
 {
     if (IsZoom())
@@ -2504,7 +2504,7 @@ void BrowseBox::CursorMoved()
         );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::LoseFocus()
 {
@@ -2527,7 +2527,7 @@ void BrowseBox::LoseFocus()
     Control::LoseFocus();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::GetFocus()
 {
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index 5b9057c5486f..fb3918610cf8 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -220,14 +220,14 @@ void BrowseBox::Select()
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::DoubleClick( const BrowserMouseEvent & )
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::QueryMinimumRowHeight()
 {
@@ -235,35 +235,35 @@ long BrowseBox::QueryMinimumRowHeight()
     return CalcZoom( 5 );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ImplStartTracking()
 {
     DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ImplTracking()
 {
     DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ImplEndTracking()
 {
     DBG_CHKTHIS( BrowseBox, BrowseBoxCheckInvariants );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::RowHeightChanged()
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth )
 {
@@ -271,21 +271,21 @@ long BrowseBox::QueryColumnResize( sal_uInt16, long nWidth )
     return nWidth;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ColumnResized( sal_uInt16 )
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ColumnMoved( sal_uInt16 )
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::StartScroll()
 {
@@ -293,7 +293,7 @@ void BrowseBox::StartScroll()
     DoHideCursor( "StartScroll" );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::EndScroll()
 {
@@ -303,7 +303,7 @@ void BrowseBox::EndScroll()
     DoShowCursor( "EndScroll" );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ToggleSelection( sal_Bool bForce )
 {
@@ -378,7 +378,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
     bNotToggleSel = sal_False;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::DrawCursor()
 {
@@ -448,7 +448,7 @@ void BrowseBox::DrawCursor()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const
 {
@@ -460,7 +460,7 @@ sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const
     return (*pCols)[ nItemPos ]->Width();
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
 {
@@ -471,7 +471,7 @@ sal_uInt16 BrowseBox::GetColumnId( sal_uInt16 nPos ) const
     return (*pCols)[ nPos ]->GetId();
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
 {
@@ -483,7 +483,7 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const
     return BROWSER_INVALIDID;
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
 {
@@ -495,7 +495,7 @@ sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const
     return sal_False;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
 {
@@ -561,7 +561,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
     DoShowCursor( "ExpandRowSelection" );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::Resize()
 {
@@ -640,7 +640,7 @@ void BrowseBox::Resize()
     DoShowCursor( "Resize" );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::Paint( const Rectangle& rRect )
 {
@@ -735,13 +735,13 @@ void BrowseBox::Paint( const Rectangle& rRect )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::PaintRow( OutputDevice&, const Rectangle& )
 {
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
@@ -884,7 +884,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections)
 {
@@ -1131,7 +1131,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_
     _rOut.SetLineColor( aOldLineColor );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect )
 {
@@ -1149,7 +1149,7 @@ void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect )
     ImplPaintData(rWin, rRect, sal_False, sal_True);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::UpdateScrollbars()
 {
@@ -1324,7 +1324,7 @@ void BrowseBox::UpdateScrollbars()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetUpdateMode( sal_Bool bUpdate )
 {
@@ -1355,7 +1355,7 @@ void BrowseBox::SetUpdateMode( sal_Bool bUpdate )
         DoHideCursor( "SetUpdateMode" );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::GetUpdateMode() const
 {
@@ -1364,7 +1364,7 @@ sal_Bool BrowseBox::GetUpdateMode() const
     return getDataWindow()->IsUpdateMode();
 }
 
-//-------------------------------------------------------------------
+
 
 long BrowseBox::GetFrozenWidth() const
 {
@@ -1378,7 +1378,7 @@ long BrowseBox::GetFrozenWidth() const
     return nWidth;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::ColumnInserted( sal_uInt16 nPos )
 {
@@ -1389,7 +1389,7 @@ void BrowseBox::ColumnInserted( sal_uInt16 nPos )
     UpdateScrollbars();
 }
 
-//-------------------------------------------------------------------
+
 
 sal_uInt16 BrowseBox::FrozenColCount() const
 {
@@ -1402,7 +1402,7 @@ sal_uInt16 BrowseBox::FrozenColCount() const
     return nCol;
 }
 
-//-------------------------------------------------------------------
+
 
 IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
 {
@@ -1425,7 +1425,7 @@ IMPL_LINK(BrowseBox,ScrollHdl,ScrollBar*,pBar)
     return 0;
 }
 
-//-------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(BrowseBox, EndScrollHdl)
 {
@@ -1440,7 +1440,7 @@ IMPL_LINK_NOARG(BrowseBox, EndScrollHdl)
     return 0;
 }
 
-//-------------------------------------------------------------------
+
 
 IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar )
 {
@@ -1448,7 +1448,7 @@ IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar )
     return 0;
 }
 
-//-------------------------------------------------------------------
+
 // usually only the first column was resized
 
 void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
@@ -1505,7 +1505,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt )
         SetNoSelection();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::MouseMove( const MouseEvent& rEvt )
 {
@@ -1559,7 +1559,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt )
     SetPointer( aNewPointer );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
 {
@@ -1596,7 +1596,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt )
                     rEvt.GetModifier() ) ) );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool bExtendedMode = sal_False;
 sal_Bool bFieldMode = sal_False;
@@ -1748,14 +1748,14 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::MouseMove( const BrowserMouseEvent& )
 {
     DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
 {
@@ -1794,7 +1794,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::KeyInput( const KeyEvent& rEvt )
 {
@@ -1802,7 +1802,7 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt )
         Control::KeyInput( rEvt );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
 {
@@ -1873,7 +1873,7 @@ sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt )
     return nId != BROWSER_NONE;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::Dispatch( sal_uInt16 nId )
 {
@@ -2056,7 +2056,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
     //! return bDone;
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowseBox::SetCursorColor(const Color& _rCol)
 {
@@ -2074,7 +2074,7 @@ void BrowseBox::SetCursorColor(const Color& _rCol)
         DoShowCursor("SetCursorColor - force");
     DoShowCursor("SetCursorColor");
 }
-// -----------------------------------------------------------------------------
+
 Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen)
 {
     Window* pParent = NULL;
@@ -2098,7 +2098,7 @@ Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen)
     aTopLeft += GetWindowExtentsRelative( pParent ).TopLeft();
     return Rectangle(aTopLeft,Size(nWidth,nHeight));
 }
-// -----------------------------------------------------------------------------
+
 Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen)
 {
     Window* pParent = NULL;
@@ -2114,7 +2114,7 @@ Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen)
 
     return Rectangle(aRowBar.TopRight(), Size(aSize.A() - nX, aSize.B() - nY - aHScroll.GetSizePixel().Height()) );
 }
-// -----------------------------------------------------------------------------
+
 Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool /*_bIsHeader*/, sal_Bool _bOnScreen )
 {
     Window* pParent = NULL;
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index ea8a201ff086..1683c63ed41d 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -66,7 +66,7 @@ namespace svt
     }
 
     // ============================================================================
-    // ----------------------------------------------------------------------------
+
     Reference< XAccessible > BrowseBoxImpl::getAccessibleHeaderBar( AccessibleBrowseBoxObjType _eObjType )
     {
         if ( m_pAccessible && m_pAccessible->isAlive() )
@@ -74,7 +74,7 @@ namespace svt
         return NULL;
     }
 
-    // ----------------------------------------------------------------------------
+
     Reference< XAccessible > BrowseBoxImpl::getAccessibleTable( )
     {
         if ( m_pAccessible && m_pAccessible->isAlive() )
@@ -107,7 +107,7 @@ Reference< XAccessible > BrowseBox::CreateAccessible()
 
     return xAccessible;
 }
-// -----------------------------------------------------------------------------
+
 
 // Children -------------------------------------------------------------------
 
@@ -125,7 +125,7 @@ Reference< XAccessible > BrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_u
         OFFSET_DEFAULT
     );
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow )
 {
@@ -138,7 +138,7 @@ Reference< XAccessible > BrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow )
         m_pImpl->m_aFactoryAccess.getFactory()
     );
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > BrowseBox::CreateAccessibleColumnHeader( sal_uInt16 _nColumnPos )
 {
@@ -151,20 +151,20 @@ Reference< XAccessible > BrowseBox::CreateAccessibleColumnHeader( sal_uInt16 _nC
             m_pImpl->m_aFactoryAccess.getFactory()
     );
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 BrowseBox::GetAccessibleControlCount() const
 {
     return 0;
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > BrowseBox::CreateAccessibleControl( sal_Int32 )
 {
     DBG_ASSERT( false, "BrowseBox::CreateAccessibleControl: to be overwritten!" );
     return NULL;
 }
-// -----------------------------------------------------------------------------
+
 
 // Conversions ----------------------------------------------------------------
 
@@ -176,7 +176,7 @@ sal_Bool BrowseBox::ConvertPointToCellAddress(
     rnColumnPos = GetColumnAtXPosPixel(rPoint.X());
     return rnRow != BROWSER_INVALIDID && rnColumnPos != BROWSER_INVALIDID;
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint )
 {
@@ -184,14 +184,14 @@ sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoi
     //  sal_uInt16 nColumnId = GetColumnAtXPosPixel(rPoint.X());
     return rnRow != BROWSER_INVALIDID;// && nColumnId == 0;
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::ConvertPointToColumnHeader( sal_uInt16& _rnColumnPos, const Point& _rPoint )
 {
     _rnColumnPos = GetColumnAtXPosPixel(_rPoint.X());
     return _rnColumnPos != BROWSER_INVALIDID;
 }
-// -----------------------------------------------------------------------------
+
 
 sal_Bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )
 {
@@ -204,7 +204,7 @@ sal_Bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point
 
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 
 // Object data and state ------------------------------------------------------
 
@@ -272,7 +272,7 @@ OUString BrowseBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType e
     }
     return aRetText;
 }
-// -----------------------------------------------------------------------------
+
 
 OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 ) const
 {
@@ -305,20 +305,20 @@ OUString BrowseBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxOb
     }
     return aRetText;
 }
-// -----------------------------------------------------------------------------
+
 
 OUString BrowseBox::GetRowDescription( sal_Int32 ) const
 {
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 
 OUString BrowseBox::GetColumnDescription( sal_uInt16 _nColumn ) const
 {
     return OUString( GetColumnTitle( GetColumnId( _nColumn ) ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void BrowseBox::FillAccessibleStateSet(
         ::utl::AccessibleStateSetHelper& rStateSet,
@@ -379,7 +379,7 @@ void BrowseBox::FillAccessibleStateSet(
             break;
     }
 }
-// -----------------------------------------------------------------------
+
 void BrowseBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet,
                                                sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const
 {
@@ -391,20 +391,20 @@ void BrowseBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper&
     else // only transient when column is not focused
         _rStateSet.AddState( AccessibleStateType::TRANSIENT );
 }
-// -----------------------------------------------------------------------------
+
 
 void BrowseBox::GrabTableFocus()
 {
     GrabFocus();
 }
-// -----------------------------------------------------------------------------
+
 OUString BrowseBox::GetCellText(long, sal_uInt16 ) const
 {
     DBG_ASSERT(false,"This method has to be implemented by the derived classes! BUG!!");
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId,
         const Any& rNewValue, const Any& rOldValue, sal_Bool _bColumnHeaderBar )
 {
@@ -413,81 +413,81 @@ void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId,
             rNewValue, rOldValue, _bColumnHeaderBar );
 }
 
-// -----------------------------------------------------------------------------
+
 void BrowseBox::commitTableEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
 {
     if ( isAccessibleAlive() )
         m_pImpl->m_pAccessible->commitTableEvent( _nEventId, _rNewValue, _rOldValue );
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::commitBrowseBoxEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
 {
     if ( isAccessibleAlive() )
         m_pImpl->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue);
 }
 
-// -----------------------------------------------------------------------------
+
 ::svt::IAccessibleFactory& BrowseBox::getAccessibleFactory()
 {
     return m_pImpl->m_aFactoryAccess.getFactory();
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::isAccessibleAlive( ) const
 {
     return ( NULL != m_pImpl->m_pAccessible ) && m_pImpl->m_pAccessible->isAlive();
 }
-// -----------------------------------------------------------------------------
+
 // IAccessibleTableProvider
-// -----------------------------------------------------------------------------
+
 sal_Int32 BrowseBox::GetCurrRow() const
 {
     return GetCurRow();
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 BrowseBox::GetCurrColumn() const
 {
     return GetColumnPos( GetCurColumnId() );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::HasRowHeader() const
 {
     return ( GetColumnId( 0 ) == HandleColumnId ); // HandleColumn == RowHeader
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::IsCellFocusable() const
 {
     return sal_True;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
 {
     return GoToRowColumnId( _nRow, GetColumnId( _nColumn ) );
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect )
 {
     SelectColumnPos( _nColumn, _bSelect );
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::IsColumnSelected( long _nColumn ) const
 {
     return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) ?
         pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) ) :
         sal_False;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 BrowseBox::GetSelectedRowCount() const
 {
     return GetSelectRowCount();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 BrowseBox::GetSelectedColumnCount() const
 {
     const MultiSelection* pColumnSel = GetColumnSelection();
     return pColumnSel ? pColumnSel->GetSelectCount() : 0;
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& _rRows ) const
 {
     sal_Int32 nCount = GetSelectRowCount();
@@ -501,7 +501,7 @@ void BrowseBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >
                     "BrowseBox::GetAllSelectedRows - too many selected rows found" );
     }
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& _rColumns ) const
 {
     const MultiSelection* pColumnSel = GetColumnSelection();
@@ -526,43 +526,43 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const
 {
     return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) );
 }
-// -----------------------------------------------------------------------------
+
 OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const
 {
     return GetCellText( _nRow, GetColumnId( _nColPos ) );
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector )
 {
     return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector );
 }
-// -----------------------------------------------------------------------------
+
 Rectangle BrowseBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const
 {
     return Control::GetWindowExtentsRelative( pRelativeWindow );
 }
-// -----------------------------------------------------------------------------
+
 void BrowseBox::GrabFocus()
 {
     Control::GrabFocus();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > BrowseBox::GetAccessible( sal_Bool bCreate )
 {
     return Control::GetAccessible( bCreate );
 }
-// -----------------------------------------------------------------------------
+
 Window* BrowseBox::GetAccessibleParentWindow() const
 {
     return Control::GetAccessibleParentWindow();
 }
-// -----------------------------------------------------------------------------
+
 Window* BrowseBox::GetWindowInstance()
 {
     return this;
diff --git a/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index d3b7a7e9d0f9..42160d891831 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.cxx
@@ -35,7 +35,7 @@ BrowserHeader::BrowserHeader( BrowseBox* pParent, WinBits nWinBits )
     Show();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserHeader::Command( const CommandEvent& rCEvt )
 {
@@ -50,14 +50,14 @@ void BrowserHeader::Command( const CommandEvent& rCEvt )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserHeader::Select()
 {
     HeaderBar::Select();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserHeader::EndDrag()
 {
@@ -99,7 +99,7 @@ void BrowserHeader::EndDrag()
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 77eed29b9917..a43c1fea893f 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.cxx
@@ -101,7 +101,7 @@ void ButtonFrame::Draw( OutputDevice& rDev )
     rDev.SetFillColor( aOldFillColor );
 }
 
-//-------------------------------------------------------------------
+
 
 BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage,
                               const OUString& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom )
@@ -121,7 +121,7 @@ BrowserColumn::~BrowserColumn()
 {
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom)
 {
@@ -132,7 +132,7 @@ void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZ
     _nOriginalWidth = n>0 ? (long)(n+0.5) : -(long)(-n+0.5);
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, sal_Bool bCurs  )
 {
@@ -172,7 +172,7 @@ void BrowserColumn::Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserColumn::ZoomChanged(const Fraction& rNewZoom)
 {
@@ -183,7 +183,7 @@ void BrowserColumn::ZoomChanged(const Fraction& rNewZoom)
     _nWidth = n>0 ? (long)(n+0.5) : -(long)(-n+0.5);
 }
 
-//-------------------------------------------------------------------
+
 
 BrowserDataWin::BrowserDataWin( BrowseBox* pParent )
     :Control( pParent, WinBits(WB_CLIPCHILDREN) )
@@ -217,7 +217,7 @@ BrowserDataWin::BrowserDataWin( BrowseBox* pParent )
     aMouseTimer.SetTimeout( 100 );
 }
 
-//-------------------------------------------------------------------
+
 BrowserDataWin::~BrowserDataWin()
 {
     if( pDtorNotify )
@@ -228,7 +228,7 @@ BrowserDataWin::~BrowserDataWin()
     aInvalidRegion.clear();
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::LeaveUpdateLock()
 {
     if ( !--nUpdateLock )
@@ -242,7 +242,7 @@ void BrowserDataWin::LeaveUpdateLock()
     }
 }
 
-//-------------------------------------------------------------------
+
 void InitSettings_Impl( Window *pWin,
                      sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
 {
@@ -274,7 +274,7 @@ void InitSettings_Impl( Window *pWin,
     }
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::Update()
 {
     if ( !nUpdateLock )
@@ -283,7 +283,7 @@ void BrowserDataWin::Update()
         bUpdateOnUnlock = true;
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -302,7 +302,7 @@ void BrowserDataWin::DataChanged( const DataChangedEvent& rDCEvt )
         Control::DataChanged( rDCEvt );
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::Paint( const Rectangle& rRect )
 {
     if ( !nUpdateLock && GetUpdateMode() )
@@ -321,7 +321,7 @@ void BrowserDataWin::Paint( const Rectangle& rRect )
         aInvalidRegion.push_back( new Rectangle( rRect ) );
 }
 
-//-------------------------------------------------------------------
+
 
 BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel )
 {
@@ -365,7 +365,7 @@ BrowseEvent BrowserDataWin::CreateBrowseEvent( const Point& rPosPixel )
     return BrowseEvent( this, nRow, nCol, nColId, aFieldRect );
 }
 
-//-------------------------------------------------------------------
+
 sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent& _rEvt )
 {
     bCallingDropCallback = true;
@@ -374,7 +374,7 @@ sal_Int8 BrowserDataWin::AcceptDrop( const AcceptDropEvent& _rEvt )
     return nReturn;
 }
 
-//-------------------------------------------------------------------
+
 sal_Int8 BrowserDataWin::ExecuteDrop( const ExecuteDropEvent& _rEvt )
 {
     bCallingDropCallback = true;
@@ -383,7 +383,7 @@ sal_Int8 BrowserDataWin::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     return nReturn;
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
 {
     if ( !GetParent()->bRowDividerDrag )
@@ -394,7 +394,7 @@ void BrowserDataWin::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
     }
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::Command( const CommandEvent& rEvt )
 {
     // scroll mouse event?
@@ -442,7 +442,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt )
     Control::Command( rEvt );
 }
 
-//-------------------------------------------------------------------
+
 
 sal_Bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent )
 {
@@ -458,7 +458,7 @@ sal_Bool BrowserDataWin::ImplRowDividerHitTest( const BrowserMouseEvent& _rEvent
     return ( nDividerDistance <= 4 );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt )
 {
@@ -474,7 +474,7 @@ void BrowserDataWin::MouseButtonDown( const MouseEvent& rEvt )
     GetParent()->MouseButtonDown( BrowserMouseEvent( this, rEvt ) );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::MouseMove( const MouseEvent& rEvt )
 {
@@ -509,7 +509,7 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt )
             aMouseTimer.Stop();
 }
 
-//-------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove)
 {
@@ -518,7 +518,7 @@ IMPL_LINK_NOARG_INLINE_START(BrowserDataWin, RepeatedMouseMove)
 }
 IMPL_LINK_NOARG_INLINE_END(BrowserDataWin, RepeatedMouseMove)
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt )
 {
@@ -536,7 +536,7 @@ void BrowserDataWin::MouseButtonUp( const MouseEvent& rEvt )
     GetParent()->MouseButtonUp( BrowserMouseEvent( this, rEvt ) );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos )
 {
@@ -561,7 +561,7 @@ void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos )
     StartTracking();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::Tracking( const TrackingEvent& rTEvt )
 {
@@ -606,7 +606,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::KeyInput( const KeyEvent& rEvt )
 {
@@ -615,7 +615,7 @@ void BrowserDataWin::KeyInput( const KeyEvent& rEvt )
         Control::KeyInput( rEvt );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -645,7 +645,7 @@ BrowserMouseEvent::BrowserMouseEvent( BrowserDataWin *pWindow,
 {
 }
 
-//-------------------------------------------------------------------
+
 
 BrowserMouseEvent::BrowserMouseEvent( Window *pWindow, const MouseEvent& rEvt,
                           long nAbsRow, sal_uInt16 nColumn, sal_uInt16 nColumnId,
@@ -673,7 +673,7 @@ BrowserExecuteDropEvent::BrowserExecuteDropEvent( BrowserDataWin *pWindow, const
 
 //===================================================================
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::SetUpdateMode( sal_Bool bMode )
 {
@@ -686,7 +686,7 @@ void BrowserDataWin::SetUpdateMode( sal_Bool bMode )
         DoOutstandingInvalidations();
 }
 
-//-------------------------------------------------------------------
+
 void BrowserDataWin::DoOutstandingInvalidations()
 {
     for ( size_t i = 0, n = aInvalidRegion.size(); i < n; ++i ) {
@@ -696,7 +696,7 @@ void BrowserDataWin::DoOutstandingInvalidations()
     aInvalidRegion.clear();
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::Invalidate( sal_uInt16 nFlags )
 {
@@ -711,7 +711,7 @@ void BrowserDataWin::Invalidate( sal_uInt16 nFlags )
         Window::Invalidate( nFlags );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
 {
@@ -746,7 +746,7 @@ void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt )
     ScrollBar::Tracking( rTEvt );
 }
 
-//-------------------------------------------------------------------
+
 
 void BrowserScrollBar::EndScroll()
 {
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 57c951ac6e26..f95303af39c6 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -49,7 +49,7 @@ namespace svt
         SetDropDownLineCount(5);
     }
 
-    //------------------------------------------------------------------
+
     bool ComboBoxControl::PreNotify( NotifyEvent& rNEvt )
     {
         switch (rNEvt.GetType())
@@ -82,13 +82,13 @@ namespace svt
     //==================================================================
     //= ComboBoxCellController
     //==================================================================
-    //------------------------------------------------------------------
+
     ComboBoxCellController::ComboBoxCellController(ComboBoxControl* pWin)
                              :CellController(pWin)
     {
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool ComboBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
         ComboBoxControl& rBox = GetComboBox();
@@ -126,19 +126,19 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool ComboBoxCellController::IsModified() const
     {
         return GetComboBox().GetSavedValue() != GetComboBox().GetText();
     }
 
-    //------------------------------------------------------------------
+
     void ComboBoxCellController::ClearModified()
     {
         GetComboBox().SaveValue();
     }
 
-    //------------------------------------------------------------------
+
     void ComboBoxCellController::SetModifyHdl(const Link& rLink)
     {
         GetComboBox().SetModifyHdl(rLink);
@@ -147,7 +147,7 @@ namespace svt
     //==================================================================
     //= ListBoxControl
     //==================================================================
-    //------------------------------------------------------------------
+
     ListBoxControl::ListBoxControl(Window* pParent, WinBits nWinStyle)
                   :ListBox(pParent, nWinStyle|WB_DROPDOWN|WB_NOBORDER)
     {
@@ -156,7 +156,7 @@ namespace svt
         SetDropDownLineCount(20);
     }
 
-    //------------------------------------------------------------------
+
     bool ListBoxControl::PreNotify( NotifyEvent& rNEvt )
     {
         switch (rNEvt.GetType())
@@ -192,13 +192,13 @@ namespace svt
     //==================================================================
     //= ListBoxCellController
     //==================================================================
-    //------------------------------------------------------------------
+
     ListBoxCellController::ListBoxCellController(ListBoxControl* pWin)
                              :CellController(pWin)
     {
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
         ListBoxControl& rBox = GetListBox();
@@ -222,19 +222,19 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool ListBoxCellController::IsModified() const
     {
         return GetListBox().GetSelectEntryPos() != GetListBox().GetSavedValue();
     }
 
-    //------------------------------------------------------------------
+
     void ListBoxCellController::ClearModified()
     {
         GetListBox().SaveValue();
     }
 
-    //------------------------------------------------------------------
+
     void ListBoxCellController::SetModifyHdl(const Link& rLink)
     {
         GetListBox().SetSelectHdl(rLink);
@@ -243,7 +243,7 @@ namespace svt
     //==================================================================
     //= CheckBoxControl
     //==================================================================
-    //------------------------------------------------------------------
+
     CheckBoxControl::CheckBoxControl(Window* pParent, WinBits nWinStyle)
                    :Control(pParent, nWinStyle)
     {
@@ -266,34 +266,34 @@ namespace svt
         pBox->Show();
     }
 
-    //------------------------------------------------------------------
+
     CheckBoxControl::~CheckBoxControl()
     {
         delete pBox;
     }
 
-    //------------------------------------------------------------------
+
     IMPL_LINK_NOARG(CheckBoxControl, OnClick)
     {
         m_aClickLink.Call(pBox);
         return m_aModifyLink.Call(pBox);
     }
 
-    //------------------------------------------------------------------
+
     void CheckBoxControl::Resize()
     {
         Control::Resize();
         pBox->SetPosSizePixel(Point(0,0),GetSizePixel());
     }
 
-    //------------------------------------------------------------------------------
+
     void CheckBoxControl::DataChanged( const DataChangedEvent& _rEvent )
     {
         if ( _rEvent.GetType() == DATACHANGED_SETTINGS )
             pBox->SetSettings( GetSettings() );
     }
 
-    //------------------------------------------------------------------------------
+
     void CheckBoxControl::StateChanged( StateChangedType nStateChange )
     {
         Control::StateChanged(nStateChange);
@@ -301,19 +301,19 @@ namespace svt
             pBox->SetZoom(GetZoom());
     }
 
-    //------------------------------------------------------------------
+
     void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
     {
         pBox->Draw(pDev,rPos,rSize,nFlags);
     }
 
-    //------------------------------------------------------------------
+
     void CheckBoxControl::GetFocus()
     {
         pBox->GrabFocus();
     }
 
-    //------------------------------------------------------------------
+
     void CheckBoxControl::Paint(const Rectangle& rClientRect)
     {
         Control::Paint(rClientRect);
@@ -321,7 +321,7 @@ namespace svt
             ShowFocus(aFocusRect);
     }
 
-    //------------------------------------------------------------------
+
     bool CheckBoxControl::PreNotify(NotifyEvent& rEvt)
     {
         switch (rEvt.GetType())
@@ -338,31 +338,31 @@ namespace svt
     //==================================================================
     //= CheckBoxCellController
     //==================================================================
-    //------------------------------------------------------------------
+
     sal_Bool CheckBoxCellController::WantMouseEvent() const
     {
         return sal_True;
     }
 
-    //------------------------------------------------------------------
+
     CheckBox& CheckBoxCellController::GetCheckBox() const
     {
         return ((CheckBoxControl &)GetWindow()).GetBox();
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool CheckBoxCellController::IsModified() const
     {
         return GetCheckBox().GetSavedValue() != GetCheckBox().GetState();
     }
 
-    //------------------------------------------------------------------
+
     void CheckBoxCellController::ClearModified()
     {
         GetCheckBox().SaveValue();
     }
 
-    //------------------------------------------------------------------
+
     void CheckBoxCellController::SetModifyHdl(const Link& rLink)
     {
         ((CheckBoxControl &)GetWindow()).SetModifyHdl(rLink);
@@ -371,13 +371,13 @@ namespace svt
     //==================================================================
     //= MultiLineEditImplementation
     //==================================================================
-    //------------------------------------------------------------------
+
     OUString MultiLineEditImplementation::GetText( LineEnd aSeparator ) const
     {
         return const_cast< MultiLineEditImplementation* >( this )->GetEditWindow().GetText( aSeparator );
     }
 
-    //------------------------------------------------------------------
+
     OUString MultiLineEditImplementation::GetSelected( LineEnd aSeparator ) const
     {
         return const_cast< MultiLineEditImplementation* >( this )->GetEditWindow().GetSelected( aSeparator );
@@ -386,7 +386,7 @@ namespace svt
     //==================================================================
     //= EditCellController
     //==================================================================
-    //------------------------------------------------------------------
+
     EditCellController::EditCellController( Edit* _pEdit )
         :CellController( _pEdit )
         ,m_pEditImplementation( new EditImplementation( *_pEdit ) )
@@ -394,7 +394,7 @@ namespace svt
     {
     }
 
-    //------------------------------------------------------------------
+
     EditCellController::EditCellController( IEditImplementation* _pImplementation )
         :CellController( &_pImplementation->GetControl() )
         ,m_pEditImplementation( _pImplementation )
@@ -402,26 +402,26 @@ namespace svt
     {
     }
 
-    //-----------------------------------------------------------------------------
+
     EditCellController::~EditCellController( )
     {
         if ( m_bOwnImplementation )
             DELETEZ( m_pEditImplementation );
     }
 
-    //-----------------------------------------------------------------------------
+
     void EditCellController::SetModified()
     {
         m_pEditImplementation->SetModified();
     }
 
-    //-----------------------------------------------------------------------------
+
     void EditCellController::ClearModified()
     {
         m_pEditImplementation->ClearModified();
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool EditCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
         sal_Bool bResult;
@@ -445,13 +445,13 @@ namespace svt
         return bResult;
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool EditCellController::IsModified() const
     {
         return m_pEditImplementation->IsModified();
     }
 
-    //------------------------------------------------------------------
+
     void EditCellController::SetModifyHdl(const Link& rLink)
     {
         m_pEditImplementation->SetModifyHdl(rLink);
@@ -460,25 +460,25 @@ namespace svt
     //==================================================================
     //= SpinCellController
     //==================================================================
-    //------------------------------------------------------------------
+
     SpinCellController::SpinCellController(SpinField* pWin)
                          :CellController(pWin)
     {
     }
 
-    //-----------------------------------------------------------------------------
+
     void SpinCellController::SetModified()
     {
         GetSpinWindow().SetModifyFlag();
     }
 
-    //-----------------------------------------------------------------------------
+
     void SpinCellController::ClearModified()
     {
         GetSpinWindow().ClearModifyFlag();
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool SpinCellController::MoveAllowed(const KeyEvent& rEvt) const
     {
         sal_Bool bResult;
@@ -502,13 +502,13 @@ namespace svt
         return bResult;
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool SpinCellController::IsModified() const
     {
         return GetSpinWindow().IsModified();
     }
 
-    //------------------------------------------------------------------
+
     void SpinCellController::SetModifyHdl(const Link& rLink)
     {
         GetSpinWindow().SetModifyHdl(rLink);
@@ -517,13 +517,13 @@ namespace svt
     //==================================================================
     //= FormattedFieldCellController
     //==================================================================
-    //------------------------------------------------------------------
+
     FormattedFieldCellController::FormattedFieldCellController( FormattedField* _pFormatted )
         :EditCellController( _pFormatted )
     {
     }
 
-    //------------------------------------------------------------------
+
     void FormattedFieldCellController::CommitModifications()
     {
         static_cast< FormattedField& >( GetWindow() ).Commit();
@@ -532,14 +532,14 @@ namespace svt
     //==================================================================
     //= MultiLineTextCell
     //==================================================================
-    //------------------------------------------------------------------
+
     void MultiLineTextCell::Modify()
     {
         GetTextEngine()->SetModified( true );
         MultiLineEdit::Modify();
     }
 
-    //------------------------------------------------------------------
+
     sal_Bool MultiLineTextCell::dispatchKeyEvent( const KeyEvent& _rEvent )
     {
         Selection aOldSelection( GetSelection() );
@@ -567,7 +567,7 @@ namespace svt
         return sal_False;
     }
 
-    //------------------------------------------------------------------
+
     bool MultiLineTextCell::PreNotify( NotifyEvent& rNEvt )
     {
         if ( rNEvt.GetType() == EVENT_KEYINPUT )
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 135740c2f518..128793b21201 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -71,7 +71,7 @@ namespace svt
     //==================================================================
     //= EditBrowserHeader
     //==================================================================
-    //------------------------------------------------------------------------------
+
     void EditBrowserHeader::DoubleClick()
     {
         sal_uInt16 nColId = GetCurItemId();
@@ -90,13 +90,13 @@ namespace svt
     //==================================================================
     //= EditBrowseBox
     //==================================================================
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::BrowserMouseEventPtr::Clear()
     {
         DELETEZ(pEvent);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown)
     {
         if (pEvt == pEvent)
@@ -117,7 +117,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     DBG_NAME(EditBrowseBox);
     void EditBrowseBox::impl_construct()
     {
@@ -133,7 +133,7 @@ namespace svt
         pCheckBoxPaint->SetBackground();
     }
 
-    //------------------------------------------------------------------------------
+
     EditBrowseBox::EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags, BrowserMode _nMode )
                   :BrowseBox( pParent, rId, _nMode )
                   ,nStartEvent(0)
@@ -176,13 +176,13 @@ namespace svt
         impl_construct();
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::Init()
     {
         // late construction
     }
 
-    //------------------------------------------------------------------------------
+
     EditBrowseBox::~EditBrowseBox()
     {
         if (nStartEvent)
@@ -197,7 +197,7 @@ namespace svt
         DBG_DTOR(EditBrowseBox,NULL);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::RemoveRows()
     {
         BrowseBox::Clear();
@@ -205,7 +205,7 @@ namespace svt
         nEditCol = nOldEditCol = 0;
     }
 
-    //------------------------------------------------------------------------------
+
     BrowserHeader* EditBrowseBox::CreateHeaderBar(BrowseBox* pParent)
     {
         pHeader = imp_CreateHeaderBar(pParent);
@@ -214,20 +214,20 @@ namespace svt
         return pHeader;
     }
 
-    //------------------------------------------------------------------------------
+
     BrowserHeader* EditBrowseBox::imp_CreateHeaderBar(BrowseBox* pParent)
     {
         return new EditBrowserHeader(pParent);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::LoseFocus()
     {
         BrowseBox::LoseFocus();
         DetermineFocus( 0 );
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::GetFocus()
     {
         BrowseBox::GetFocus();
@@ -240,14 +240,14 @@ namespace svt
         DetermineFocus( getRealGetFocusFlags( this ) );
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool EditBrowseBox::SeekRow(long nRow)
     {
         nPaintRow = nRow;
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl)
     {
         nStartEvent = 0;
@@ -260,7 +260,7 @@ namespace svt
         return 0;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::PaintField( OutputDevice& rDev, const Rectangle& rRect,
                                     sal_uInt16 nColumnId ) const
     {
@@ -283,7 +283,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     Image EditBrowseBox::GetImage(RowStatus eStatus) const
     {
         if ( !m_aStatusImages.GetImageCount() )
@@ -335,7 +335,7 @@ namespace svt
         return aImage;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const
     {
         if (nPaintRow < 0)
@@ -382,7 +382,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ImplStartTracking()
     {
         bActiveBeforeTracking = IsEditing();
@@ -395,13 +395,13 @@ namespace svt
         BrowseBox::ImplStartTracking();
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ImplTracking()
     {
         BrowseBox::ImplTracking();
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ImplEndTracking()
     {
         if ( bActiveBeforeTracking )
@@ -411,7 +411,7 @@ namespace svt
         BrowseBox::ImplEndTracking();
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::RowHeightChanged()
     {
         if ( IsEditing() )
@@ -425,13 +425,13 @@ namespace svt
         BrowseBox::RowHeightChanged();
     }
 
-    //------------------------------------------------------------------------------
+
     EditBrowseBox::RowStatus EditBrowseBox::GetRowStatus(long) const
     {
         return CLEAN;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::KeyInput( const KeyEvent& rEvt )
     {
         sal_uInt16 nCode = rEvt.GetKeyCode().GetCode();
@@ -474,7 +474,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::MouseButtonDown(const BrowserMouseEvent& rEvt)
     {
         sal_uInt16  nColPos = GetColumnPos( rEvt.GetColumnId() );
@@ -520,7 +520,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::MouseButtonUp( const BrowserMouseEvent& rEvt )
     {
         // absorb double clicks
@@ -536,7 +536,7 @@ namespace svt
                 implActivateCellOnMouseEvent(rEvt, sal_True);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, sal_Bool _bUp)
     {
         if (!IsEditing())
@@ -586,7 +586,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::Dispatch( sal_uInt16 _nId )
     {
         if ( _nId == BROWSER_ENHANCESELECTION )
@@ -610,7 +610,7 @@ namespace svt
         BrowseBox::Dispatch( _nId );
     }
 
-    //------------------------------------------------------------------------------
+
     bool EditBrowseBox::PreNotify(NotifyEvent& rEvt)
     {
         switch (rEvt.GetType())
@@ -729,13 +729,13 @@ namespace svt
         return BrowseBox::PreNotify(rEvt);
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool EditBrowseBox::IsTabAllowed(sal_Bool) const
     {
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     bool EditBrowseBox::Notify(NotifyEvent& rEvt)
     {
         switch (rEvt.GetType())
@@ -751,7 +751,7 @@ namespace svt
         return BrowseBox::Notify(rEvt);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::StateChanged( StateChangedType nType )
     {
         BrowseBox::StateChanged( nType );
@@ -799,7 +799,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::DataChanged( const DataChangedEvent& rDCEvt )
     {
         BrowseBox::DataChanged( rDCEvt );
@@ -813,7 +813,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -863,7 +863,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const
     {
         sal_uInt16 nInfo = 0;
@@ -951,7 +951,7 @@ namespace svt
             return pTHIS->CursorMoving(nNewRow, nNewColId);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ColumnMoved(sal_uInt16 nId)
     {
         BrowseBox::ColumnMoved(nId);
@@ -964,20 +964,20 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool EditBrowseBox::SaveRow()
     {
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool EditBrowseBox::CursorMoving(long, sal_uInt16)
     {
         ((EditBrowseBox *) this)->DeactivateCell(sal_False);
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::CursorMoved()
     {
         long nNewRow = GetCurRow();
@@ -993,7 +993,7 @@ namespace svt
         //BrowseBox::CursorMoved();
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::EndScroll()
     {
         if (IsEditing())
@@ -1005,7 +1005,7 @@ namespace svt
         BrowseBox::EndScroll();
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bCellFocus)
     {
         if (IsEditing())
@@ -1055,7 +1055,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::DeactivateCell(sal_Bool bUpdate)
     {
         if (IsEditing())
@@ -1091,7 +1091,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, sal_Bool bRel) const
     {
         Rectangle aRect( GetFieldRectPixel(nRow, nColId, bRel));
@@ -1103,7 +1103,7 @@ namespace svt
         return aRect;
     }
 
-    //------------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl)
     {
         nEndEvent = 0;
@@ -1116,7 +1116,7 @@ namespace svt
         return 0;
     }
 
-    //------------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(EditBrowseBox, ModifyHdl)
     {
         if (nCellModifiedEvent)
@@ -1125,7 +1125,7 @@ namespace svt
         return 0;
     }
 
-    //------------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl)
     {
         nCellModifiedEvent = 0;
@@ -1133,7 +1133,7 @@ namespace svt
         return 0;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ColumnResized( sal_uInt16 )
     {
         if (IsEditing())
@@ -1145,7 +1145,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_uInt16 EditBrowseBox::AppendColumn(const OUString& rName, sal_uInt16 nWidth, sal_uInt16 nPos, sal_uInt16 nId)
     {
         if (nId == BROWSER_INVALIDID)
@@ -1173,7 +1173,7 @@ namespace svt
         return nId;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::Resize()
     {
         BrowseBox::Resize();
@@ -1195,46 +1195,46 @@ namespace svt
         ReserveControlArea((sal_uInt16)nX);
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ArrangeControls(sal_uInt16&, sal_uInt16)
     {
     }
 
-    //------------------------------------------------------------------------------
+
     CellController* EditBrowseBox::GetController(long, sal_uInt16)
     {
         return NULL;
     }
 
-    //-----------------------------------------------------------------------------
+
     void EditBrowseBox::ResizeController(CellControllerRef& rController, const Rectangle& rRect)
     {
         rController->GetWindow().SetPosSizePixel(rRect.TopLeft(), rRect.GetSize());
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::InitController(CellControllerRef&, long, sal_uInt16)
     {
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::ReleaseController(CellControllerRef&, long, sal_uInt16)
     {
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::CellModified()
     {
     }
 
 
-    //------------------------------------------------------------------------------
+
     sal_Bool EditBrowseBox::SaveModified()
     {
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::DoubleClick(const BrowserMouseEvent& rEvt)
     {
         // when double clicking on the column, the optimum size will be calculated
@@ -1243,7 +1243,7 @@ namespace svt
             SetColumnWidth(nColId, GetAutoColumnWidth(nColId));
     }
 
-    //------------------------------------------------------------------------------
+
     sal_uInt32 EditBrowseBox::GetAutoColumnWidth(sal_uInt16 nColId)
     {
         sal_uInt32 nCurColWidth  = GetColumnWidth(nColId);
@@ -1265,13 +1265,13 @@ namespace svt
         return nNewColWidth;
     }
 
-    //------------------------------------------------------------------------------
+
     sal_uInt32 EditBrowseBox::GetTotalCellWidth(long, sal_uInt16)
     {
         return 0;
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::InvalidateHandleColumn()
     {
         Rectangle aHdlFieldRect( GetFieldRectPixel( 0, 0 ));
@@ -1280,7 +1280,7 @@ namespace svt
         Invalidate( aInvalidRect );
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::PaintTristate(OutputDevice&, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled) const
     {
         pCheckBoxPaint->GetBox().SetState(eState);
@@ -1301,7 +1301,7 @@ namespace svt
         pCheckBoxPaint->SetParentUpdateMode( true );
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::AsynchGetFocus()
     {
         if (nStartEvent)
@@ -1311,7 +1311,7 @@ namespace svt
         nStartEvent = Application::PostUserEvent(LINK(this,EditBrowseBox,StartEditHdl));
     }
 
-    //------------------------------------------------------------------------------
+
     void EditBrowseBox::SetBrowserFlags(sal_Int32 nFlags)
     {
         if (m_nBrowserFlags == nFlags)
@@ -1324,12 +1324,12 @@ namespace svt
         if (RowPicturesChanges)
             InvalidateStatusCell(GetCurRow());
     }
-    //------------------------------------------------------------------------------
+
     inline void EditBrowseBox::HideAndDisable(CellControllerRef& rController)
     {
         rController->suspend();
     }
-    //------------------------------------------------------------------------------
+
     inline void EditBrowseBox::EnableAndShow() const
     {
         Controller()->resume();
@@ -1337,7 +1337,7 @@ namespace svt
     //===============================================================================
 
     DBG_NAME(CellController);
-    //------------------------------------------------------------------------------
+
     CellController::CellController(Control* pW)
                    :pWindow( pW )
                    ,bSuspended( true )
@@ -1348,14 +1348,14 @@ namespace svt
         DBG_ASSERT(!pWindow->IsVisible(), "CellController::CellController: window should not be visible!");
     }
 
-    //-----------------------------------------------------------------------------
+
     CellController::~CellController()
     {
 
         DBG_DTOR(CellController,NULL);
     }
 
-    //-----------------------------------------------------------------------------
+
     void CellController::suspend( )
     {
         DBG_ASSERT( bSuspended == !GetWindow().IsVisible(), "CellController::suspend: inconsistence!" );
@@ -1368,7 +1368,7 @@ namespace svt
         }
     }
 
-    //-----------------------------------------------------------------------------
+
     void CellController::resume( )
     {
         DBG_ASSERT( bSuspended == !GetWindow().IsVisible(), "CellController::resume: inconsistence!" );
@@ -1380,24 +1380,24 @@ namespace svt
         }
     }
 
-    //-----------------------------------------------------------------------------
+
     void CellController::CommitModifications()
     {
         // nothing to do in this base class
     }
 
-    //-----------------------------------------------------------------------------
+
     sal_Bool CellController::WantMouseEvent() const
     {
         return sal_False;
     }
 
-    //-----------------------------------------------------------------------------
+
     void CellController::SetModified()
     {
     }
 
-    //-----------------------------------------------------------------------------
+
     sal_Bool CellController::MoveAllowed(const KeyEvent&) const
     {
         return sal_True;
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index b5e9b80664c3..89e2405f0b73 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -31,7 +31,7 @@ namespace svt
     using namespace com::sun::star::uno;
     using namespace ::com::sun::star::accessibility::AccessibleEventId;
 
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow, sal_uInt16 _nColumnPos,const TriState& eState)
 {
     Reference< XAccessible > xAccessible( GetAccessible() );
@@ -54,17 +54,17 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow,
     }
     return xReturn;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > EditBrowseBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
 {
     return BrowseBox::CreateAccessibleCell( _nRow, _nColumnPos );
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 EditBrowseBox::GetAccessibleControlCount() const
 {
     return IsEditing() ? 1 : 0;
 }
-// -----------------------------------------------------------------------------
+
 void EditBrowseBox::implCreateActiveAccessible( )
 {
     DBG_ASSERT( IsEditing(), "EditBrowseBox::implCreateActiveAccessible: not to be called if we're not editing currently!" );
@@ -90,7 +90,7 @@ void EditBrowseBox::implCreateActiveAccessible( )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > EditBrowseBox::CreateAccessibleControl( sal_Int32
 #ifdef DBG_UTIL
 _nIndex
@@ -107,12 +107,12 @@ _nIndex
 
     return m_aImpl->m_xActiveCell;
 }
-// -----------------------------------------------------------------------------
+
 Reference<XAccessible > EditBrowseBox::CreateAccessibleRowHeader( sal_Int32 _nRow )
 {
     return BrowseBox::CreateAccessibleRowHeader( _nRow );
 }
-// -----------------------------------------------------------------------------
+
 void EditBrowseBoxImpl::clearActiveCell()
 {
     try
@@ -126,13 +126,13 @@ void EditBrowseBoxImpl::clearActiveCell()
 
     m_xActiveCell = NULL;
 }
-// -----------------------------------------------------------------------------
+
 void EditBrowseBox::GrabTableFocus()
 {
     if ( aController.Is() )
         aController->GetWindow().GrabFocus();
 }
-//------------------------------------------------------------------------------
+
 void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags )
 {
     sal_Bool bFocus = sal_False;
@@ -177,7 +177,7 @@ void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags )
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 Rectangle EditBrowseBox::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 _nIndex)
 {
     Rectangle aRect;
@@ -190,7 +190,7 @@ Rectangle EditBrowseBox::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nCol
     }
     return aRect;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)
 {
     sal_Int32 nRet = -1;
@@ -203,10 +203,10 @@ sal_Int32 EditBrowseBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumn
     }
     return nRet;
 }
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 } // namespace svt
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 986ef274626b..e7389e454ec0 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -117,7 +117,7 @@ namespace
         : public rtl::Static< ::osl::Mutex, SingletonMutex > {};
 }
 
-// -----------------------------------------------------------------------
+
 // class SvtAccessibilityOptions_Impl ---------------------------------------------
 
 SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
@@ -144,7 +144,7 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
 {
     css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -701,7 +701,7 @@ void SvtAccessibilityOptions_Impl::SetPreviewUsesCheckeredBackground(sal_Bool bS
     }
 }
 
-// -----------------------------------------------------------------------
+
 // class SvtAccessibilityOptions --------------------------------------------------
 
 SvtAccessibilityOptions::SvtAccessibilityOptions()
@@ -718,7 +718,7 @@ SvtAccessibilityOptions::SvtAccessibilityOptions()
     //StartListening( *sm_pSingleImplConfig, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtAccessibilityOptions::~SvtAccessibilityOptions()
 {
@@ -732,7 +732,7 @@ SvtAccessibilityOptions::~SvtAccessibilityOptions()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
@@ -744,7 +744,7 @@ void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvtAccessibilityOptions::IsModified() const
 {
@@ -755,7 +755,7 @@ void SvtAccessibilityOptions::Commit()
     //sm_pSingleImplConfig->Commit();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
 {
@@ -810,7 +810,7 @@ sal_Bool SvtAccessibilityOptions::GetPreviewUsesCheckeredBackground() const
     return sm_pSingleImplConfig->GetPreviewUsesCheckeredBackground();
 }
 
-// -----------------------------------------------------------------------
+
 void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet)
 {
     sm_pSingleImplConfig->SetAutoDetectSystemHC(bSet);
@@ -868,6 +868,6 @@ void SvtAccessibilityOptions::SetPreviewUsesCheckeredBackground(sal_Bool bSet)
     sm_pSingleImplConfig->SetPreviewUsesCheckeredBackground(bSet);
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index e1de6a70bc77..b99d04b1f2cf 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -42,7 +42,7 @@
 #include <vcl/settings.hxx>
 #include <rtl/instance.hxx>
 
-//-----------------------------------------------------------------------------
+
 using namespace utl;
 using namespace com::sun::star;
 
@@ -360,7 +360,7 @@ IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclWindowEvent*, pEvent )
         return 0L;
 }
 
-// ---------------------------------------------------------------------------
+
 
 /** updates the font color in the vcl window settings */
 void ColorConfig_Impl::ImplUpdateApplicationSettings()
@@ -387,7 +387,7 @@ void ColorConfig_Impl::ImplUpdateApplicationSettings()
     }
 }
 
-// ---------------------------------------------------------------------------
+
 
 ColorConfig::ColorConfig()
 {
@@ -600,17 +600,17 @@ void EditableColorConfig::Commit()
         m_pImpl->Commit();
     m_bModified = sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void EditableColorConfig::DisableBroadcast()
 {
     m_pImpl->BlockBroadcasts(true);
 }
-// -----------------------------------------------------------------------------
+
 void EditableColorConfig::EnableBroadcast()
 {
     m_pImpl->BlockBroadcasts(false);
 }
-// -----------------------------------------------------------------------------
+
 
 }//namespace svtools
 
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index ddded1e761ac..3e14d99b7515 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -40,7 +40,7 @@
 #include <rtl/instance.hxx>
 #include <rtl/strbuf.hxx>
 
-//-----------------------------------------------------------------------------
+
 using namespace utl;
 using namespace com::sun::star;
 
@@ -147,12 +147,12 @@ uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUStri
     }
     return aNames;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ExtendedColorConfig_Impl::GetComponentCount() const
 {
     return m_aConfigValues.size();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sName) const
 {
     sal_Int32 nSize = 0;
@@ -163,7 +163,7 @@ sal_Int32 ExtendedColorConfig_Impl::GetComponentColorCount(const OUString& _sNam
     }
     return nSize;
 }
-// -----------------------------------------------------------------------------
+
 ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const
 {
     TComponents::const_iterator aFind = m_aConfigValues.find(_sName);
@@ -176,7 +176,7 @@ ExtendedColorConfigValue ExtendedColorConfig_Impl::GetComponentColorConfigValue(
     }
     return ExtendedColorConfigValue();
 }
-// -----------------------------------------------------------------------------
+
 OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sComponentName) const
 {
     OUString sRet;
@@ -185,7 +185,7 @@ OUString ExtendedColorConfig_Impl::GetComponentDisplayName(const OUString& _sCom
         sRet = aFind->second;
     return sRet;
 }
-// -----------------------------------------------------------------------------
+
 OUString ExtendedColorConfig_Impl::GetComponentName(sal_uInt32 _nPos) const
 {
     OUString sRet;
@@ -219,19 +219,19 @@ ExtendedColorConfig_Impl::~ExtendedColorConfig_Impl()
     // #100822#
     ::Application::RemoveEventListener( LINK(this, ExtendedColorConfig_Impl, DataChangedEventListener) );
 }
-// -----------------------------------------------------------------------------
+
 void ExtendedColorConfig_Impl::DisableBroadcast()
 {
     if ( ExtendedColorConfig::m_pImpl )
         ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void ExtendedColorConfig_Impl::EnableBroadcast()
 {
     if ( ExtendedColorConfig::m_pImpl )
         ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled = sal_True;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ExtendedColorConfig_Impl::IsEnableBroadcast()
 {
     return ExtendedColorConfig::m_pImpl ? ExtendedColorConfig::m_pImpl->m_bIsBroadcastEnabled : sal_False;
@@ -244,7 +244,7 @@ void lcl_addString(uno::Sequence < OUString >& _rSeq,const OUString& _sAdd)
     for(;pIter != pEnd;++pIter)
         *pIter += _sAdd;
 }
-// -----------------------------------------------------------------------------
+
 void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
 {
     m_aComponentDisplayNames.clear();
@@ -333,7 +333,7 @@ void ExtendedColorConfig_Impl::Load(const OUString& rScheme)
         CommitCurrentSchemeName();
     }
 }
-// -----------------------------------------------------------------------------
+
 void ExtendedColorConfig_Impl::FillComponentColors(uno::Sequence < OUString >& _rComponents,const TDisplayNames& _rDisplayNames)
 {
     const OUString sColorEntries("/Entries");
@@ -469,7 +469,7 @@ void ExtendedColorConfig_Impl::CommitCurrentSchemeName()
     aCurrentVal.getArray()[0] <<= m_sLoadedScheme;
     PutProperties(aCurrent, aCurrentVal);
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool ExtendedColorConfig_Impl::ExistsScheme(const OUString& _sSchemeName)
 {
     OUString sBase("ExtendedColorScheme/ColorSchemes");
@@ -558,9 +558,9 @@ IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclWindowEvent*,
         return 0L;
 }
 
-// ---------------------------------------------------------------------------
 
-// ---------------------------------------------------------------------------
+
+
 
 ExtendedColorConfig::ExtendedColorConfig()
 {
@@ -586,27 +586,27 @@ ExtendedColorConfigValue ExtendedColorConfig::GetColorValue(const OUString& _sCo
 {
     return m_pImpl->GetColorConfigValue(_sComponentName,_sName);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ExtendedColorConfig::GetComponentCount() const
 {
     return m_pImpl->GetComponentCount();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 ExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const
 {
     return m_pImpl->GetComponentColorCount(_sName);
 }
-// -----------------------------------------------------------------------------
+
 ExtendedColorConfigValue ExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentColorConfigValue(_sName,_nPos);
 }
-// -----------------------------------------------------------------------------
+
 OUString ExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentName(_nPos);
 }
-// -----------------------------------------------------------------------------
+
 OUString ExtendedColorConfig::GetComponentDisplayName(const OUString& _sComponentName) const
 {
     return m_pImpl->GetComponentDisplayName(_sComponentName);
@@ -687,32 +687,32 @@ void EditableExtendedColorConfig::Commit()
         m_pImpl->Commit();
     m_bModified = sal_False;
 }
-// -----------------------------------------------------------------------------
+
 void EditableExtendedColorConfig::DisableBroadcast()
 {
     m_pImpl->DisableBroadcast();
 }
-// -----------------------------------------------------------------------------
+
 void EditableExtendedColorConfig::EnableBroadcast()
 {
     m_pImpl->EnableBroadcast();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 EditableExtendedColorConfig::GetComponentCount() const
 {
     return m_pImpl->GetComponentCount();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 EditableExtendedColorConfig::GetComponentColorCount(const OUString& _sName) const
 {
     return m_pImpl->GetComponentColorCount(_sName);
 }
-// -----------------------------------------------------------------------------
+
 ExtendedColorConfigValue EditableExtendedColorConfig::GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentColorConfigValue(_sName,_nPos);
 }
-// -----------------------------------------------------------------------------
+
 OUString EditableExtendedColorConfig::GetComponentName(sal_uInt32 _nPos) const
 {
     return m_pImpl->GetComponentName(_nPos);
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 6ca2548cb6aa..a646c17a4a0f 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -121,7 +121,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SvtHelpOptions_Impl::SvtHelpOptions_Impl()
     : ConfigItem( OUString( "Office.Common/Help" ) )
@@ -134,7 +134,7 @@ SvtHelpOptions_Impl::SvtHelpOptions_Impl()
     EnableNotification( aNames );
 }
 
-// -----------------------------------------------------------------------
+
 static int lcl_MapPropertyName( const OUString rCompare,
                 const uno::Sequence< OUString>& aInternalPropertyNames)
 {
@@ -215,7 +215,7 @@ void  SvtHelpOptions_Impl::Load(const uno::Sequence< OUString>& rPropertyNames)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtHelpOptions_Impl::Commit()
 {
@@ -251,7 +251,7 @@ void SvtHelpOptions_Impl::Commit()
     PutProperties( aNames, aValues );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtHelpOptions_Impl::Notify( const Sequence<OUString>& aPropertyNames )
 {
@@ -272,7 +272,7 @@ SvtHelpOptions::SvtHelpOptions()
     pImp = pOptions;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtHelpOptions::~SvtHelpOptions()
 {
@@ -306,7 +306,7 @@ bool SvtHelpOptions::IsHelpTips() const
     return pImp->IsHelpTips();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtHelpOptions::SetWelcomeScreen( sal_Bool b )
 {
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 5fff13455a32..caef175e6d6f 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -28,7 +28,7 @@
 #include <rtl/instance.hxx>
 #include <list>
 
-// -----------------------------------------------------------------------
+
 #define HTMLCFG_UNKNOWN_TAGS            0x01
 //#define HTMLCFG_STYLE_SHEETS          0x02
 //#define HTMLCFG_NETSCAPE3             0x04
@@ -100,7 +100,7 @@ const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames()
     }
     return aNames;
 }
-// -----------------------------------------------------------------------
+
 SvxHtmlOptions::SvxHtmlOptions() :
     ConfigItem("Office.Common/Filter/HTML")
 {
@@ -108,7 +108,7 @@ SvxHtmlOptions::SvxHtmlOptions() :
     Load( GetPropertyNames() );
 }
 
-// -----------------------------------------------------------------------
+
 SvxHtmlOptions::~SvxHtmlOptions()
 {
     delete pImp;
@@ -189,7 +189,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void    SvxHtmlOptions::Commit()
 {
     const Sequence<OUString>& aNames = GetPropertyNames();
@@ -255,14 +255,14 @@ void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< OUString >& )
     CallListeners();
 }
 
-// -----------------------------------------------------------------------
+
 sal_uInt16  SvxHtmlOptions::GetFontSize(sal_uInt16 nPos) const
 {
     if(nPos < HTML_FONT_COUNT)
         return (sal_uInt16)pImp->aFontSizeArr[nPos];
     return 0;
 }
-// -----------------------------------------------------------------------
+
 void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize)
 {
     if(nPos < HTML_FONT_COUNT)
@@ -272,9 +272,9 @@ void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize)
     }
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 
 sal_Bool SvxHtmlOptions::IsImportUnknown() const
@@ -282,7 +282,7 @@ sal_Bool SvxHtmlOptions::IsImportUnknown() const
     return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxHtmlOptions::SetImportUnknown(sal_Bool bSet)
@@ -294,7 +294,7 @@ void SvxHtmlOptions::SetImportUnknown(sal_Bool bSet)
     SetModified();
 }
 
-// -----------------------------------------------------------------------
+
 
 
 sal_uInt16  SvxHtmlOptions::GetExportMode() const
@@ -302,7 +302,7 @@ sal_uInt16  SvxHtmlOptions::GetExportMode() const
     return (sal_uInt16)pImp->nExportMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet)
@@ -315,7 +315,7 @@ void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 
 sal_Bool SvxHtmlOptions::IsStarBasic() const
@@ -323,7 +323,7 @@ sal_Bool SvxHtmlOptions::IsStarBasic() const
     return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void SvxHtmlOptions::SetStarBasic(sal_Bool bSet)
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 856125f4a8d2..78c8778aa5b0 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.cxx
@@ -38,7 +38,7 @@
 #include <tools/debug.hxx>
 
 namespace svtools {
-//-----------------------------------------------
+
 ItemHolder2::ItemHolder2()
     : ItemHolderMutexBase()
 {
@@ -73,27 +73,27 @@ ItemHolder2::ItemHolder2()
 #endif
 }
 
-//-----------------------------------------------
+
 ItemHolder2::~ItemHolder2()
 {
     impl_releaseAllItems();
 }
 
-//-----------------------------------------------
+
 void ItemHolder2::holdConfigItem(EItem eItem)
 {
     static ItemHolder2* pHolder = new ItemHolder2();
     pHolder->impl_addItem(eItem);
 }
 
-//-----------------------------------------------
+
 void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&)
     throw(css::uno::RuntimeException)
 {
     impl_releaseAllItems();
 }
 
-//-----------------------------------------------
+
 void ItemHolder2::impl_addItem(EItem eItem)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -115,7 +115,7 @@ void ItemHolder2::impl_addItem(EItem eItem)
         m_lItems.push_back(aNewItem);
 }
 
-//-----------------------------------------------
+
 void ItemHolder2::impl_releaseAllItems()
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -131,7 +131,7 @@ void ItemHolder2::impl_releaseAllItems()
     m_lItems.clear();
 }
 
-//-----------------------------------------------
+
 void ItemHolder2::impl_newItem(TItemInfo& rItem)
 {
     switch(rItem.eItem)
@@ -178,7 +178,7 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem)
     }
 }
 
-//-----------------------------------------------
+
 void ItemHolder2::impl_deleteItem(TItemInfo& rItem)
 {
     if (rItem.pItem)
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index baed68e798c1..05c482bc7088 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -31,9 +31,9 @@
 
 #include <list>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::utl                   ;
 using namespace ::rtl                   ;
@@ -59,15 +59,15 @@ using namespace ::com::sun::star::uno   ;
 
 #include <tools/link.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  private declarations!
-//_________________________________________________________________________________________________________________
+
 
 class SvtMenuOptions_Impl : public ConfigItem
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
         ::std::list<Link> aList;
@@ -75,15 +75,15 @@ class SvtMenuOptions_Impl : public ConfigItem
         sal_Bool    m_bFollowMouse                      ;   /// cache "FollowMouse" of Menu section
         sal_Int16   m_nMenuIcons                        ;   /// cache "MenuIcons" of Menu section
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
 
          SvtMenuOptions_Impl();
         ~SvtMenuOptions_Impl();
@@ -91,9 +91,9 @@ class SvtMenuOptions_Impl : public ConfigItem
         void AddListenerLink( const Link& rLink );
         void RemoveListenerLink( const Link& rLink );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      called for notify of configmanager
@@ -126,9 +126,9 @@ class SvtMenuOptions_Impl : public ConfigItem
 
         virtual void Commit();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  public interface
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      access method to get internal values
@@ -179,9 +179,9 @@ class SvtMenuOptions_Impl : public ConfigItem
                         Commit();
                     }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 7ace27c351a7..dc3c390bc795 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -133,9 +133,9 @@ class SvtMiscOptions_Impl : public ConfigItem
 
         virtual void Commit();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  public interface
-        //---------------------------------------------------------------------------------------------------------
+
 
         inline sal_Bool UseSystemFileDialog() const
         { return m_bUseSystemFileDialog; }
@@ -243,9 +243,9 @@ class SvtMiscOptions_Impl : public ConfigItem
         void RemoveListenerLink( const Link& rLink );
         void CallListeners();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index e2cfa0edddbb..173bfbf43a40 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -32,9 +32,9 @@
 #include <vcl/settings.hxx>
 #include <rtl/instance.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::utl                   ;
 using namespace ::rtl                   ;
@@ -163,23 +163,23 @@ class SvtOptionsDrawinglayer_Impl : public ConfigItem
 {
 public:
 
-//---------------------------------------------------------------------------------------------------------
+
 //  constructor / destructor
-//---------------------------------------------------------------------------------------------------------
+
 
      SvtOptionsDrawinglayer_Impl();
     ~SvtOptionsDrawinglayer_Impl();
 
-//---------------------------------------------------------------------------------------------------------
+
 //  overloaded methods of baseclass
-//---------------------------------------------------------------------------------------------------------
+
 
     virtual void Commit();
     virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
 
-//---------------------------------------------------------------------------------------------------------
+
 //  public interface
-//---------------------------------------------------------------------------------------------------------
+
 
     sal_Bool    IsOverlayBuffer() const;
     sal_Bool    IsPaintBuffer() const;
@@ -227,17 +227,17 @@ public:
     void        SetTransparentSelection( sal_Bool bState );
     void        SetTransparentSelectionPercent( sal_uInt16 nPercent );
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private methods
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
 
     static Sequence< OUString > impl_GetPropertyNames();
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private member
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
 
diff --git a/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index f75866f38cc5..53fb5ef07cc8 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.cxx
@@ -100,9 +100,9 @@ public:
     void        SetConvertToGreyscales( sal_Bool bState ) ;
     void        SetPDFAsStandardPrintJobFormat( sal_Bool bState ) ;
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private API
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
     void impl_setValue (const OUString& sProp,
@@ -110,9 +110,9 @@ private:
     void impl_setValue (const OUString& sProp,
                               ::sal_Int16      nNew );
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private member
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
        css::uno::Reference< css::container::XNameAccess > m_xCfg;
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index 86ed9a82ec7b..bdac39865c5d 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.cxx
@@ -18,10 +18,10 @@
  */
 
 
-//_________________________________________________________________________________________________________________
+
 //  switches
 //  use it to enable test scenarios
-//_________________________________________________________________________________________________________________
+
 
 #define TEST_DYNAMICMENUOPTIONS
 
@@ -83,15 +83,15 @@ class TestApplication : public Application
 
 };  //  class TestApplication
 
-//_________________________________________________________________________________________________________________
+
 //  global variables
-//_________________________________________________________________________________________________________________
+
 
 TestApplication aTestApplication ;
 
-//_________________________________________________________________________________________________________________
+
 //  main
-//_________________________________________________________________________________________________________________
+
 
 void TestApplication::Main()
 {
diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index c07f55921f0e..5593be346927 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.cxx
@@ -79,7 +79,7 @@ namespace svt
     //====================================================================
     //= FileViewContentEnumerator
     //====================================================================
-    //--------------------------------------------------------------------
+
     FileViewContentEnumerator::FileViewContentEnumerator(
             const Reference< XCommandEnvironment >& _rxCommandEnv,
             ContentData& _rContentToFill, ::osl::Mutex& _rContentMutex,
@@ -94,12 +94,12 @@ namespace svt
     {
     }
 
-    //--------------------------------------------------------------------
+
     FileViewContentEnumerator::~FileViewContentEnumerator()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void FileViewContentEnumerator::cancel()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -110,7 +110,7 @@ namespace svt
         m_aFolder.sURL = "";
     }
 
-    //--------------------------------------------------------------------
+
     EnumerationResult FileViewContentEnumerator::enumerateFolderContentSync(
         const FolderDescriptor& _rFolder,
         const ::com::sun::star::uno::Sequence< OUString >& rBlackList )
@@ -124,7 +124,7 @@ namespace svt
         return enumerateFolderContent();
     }
 
-    //--------------------------------------------------------------------
+
     void FileViewContentEnumerator::enumerateFolderContent(
         const FolderDescriptor& _rFolder, IEnumerationResultHandler* _pResultHandler )
     {
@@ -142,7 +142,7 @@ namespace svt
             // atexit handlers
     }
 
-    //--------------------------------------------------------------------
+
     EnumerationResult FileViewContentEnumerator::enumerateFolderContent()
     {
         EnumerationResult eResult = ERROR;
@@ -349,7 +349,7 @@ namespace svt
         return eResult;
     }
 
-    //--------------------------------------------------------------------
+
 
     sal_Bool FileViewContentEnumerator::URLOnBlackList ( const OUString& sRealURL )
     {
@@ -364,7 +364,7 @@ namespace svt
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool FileViewContentEnumerator::implGetDocTitle( const OUString& _rTargetURL, OUString& _rRet ) const
     {
         sal_Bool bRet = sal_False;
@@ -398,7 +398,7 @@ namespace svt
         return bRet;
     }
 
-    //--------------------------------------------------------------------
+
     void FileViewContentEnumerator::execute()
     {
         enumerateFolderContent();
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 4dc16d761463..9e525f3ad1e5 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -126,7 +126,7 @@ namespace
         virtual void SAL_CALL onShot();
     };
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CallbackTimer::onShot()
     {
         OSL_ENSURE( m_pTimeoutHandler, "CallbackTimer::onShot: nobody interested in?" );
@@ -137,7 +137,7 @@ namespace
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void FilterMatch::createWildCardFilterList(const OUString& _rFilterList,::std::vector< WildCard >& _rFilters)
 {
@@ -627,9 +627,9 @@ OUString CreateExactSizeText( sal_Int64 nSize )
     return aSizeStr;
 }
 
-// -----------------------------------------------------------------------
+
 // class ViewTabListBox_Impl ---------------------------------------------
-// -----------------------------------------------------------------------
+
 
 ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin,
                                           SvtFileView_Impl* pParent,
@@ -698,7 +698,7 @@ ViewTabListBox_Impl::ViewTabListBox_Impl( Window* pParentWin,
     EnableContextMenuHandling();
 }
 
-// -----------------------------------------------------------------------
+
 
 ViewTabListBox_Impl::~ViewTabListBox_Impl()
 {
@@ -707,7 +707,7 @@ ViewTabListBox_Impl::~ViewTabListBox_Impl()
     delete mpHeaderBar;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl)
 {
@@ -719,7 +719,7 @@ IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ViewTabListBox_Impl::Resize()
 {
@@ -746,7 +746,7 @@ void ViewTabListBox_Impl::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt )
 {
@@ -783,7 +783,7 @@ void ViewTabListBox_Impl::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
 {
@@ -873,7 +873,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry )
 {
@@ -889,7 +889,7 @@ void ViewTabListBox_Impl::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEn
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ViewTabListBox_Impl::ClearAll()
 {
@@ -898,7 +898,7 @@ void ViewTabListBox_Impl::ClearAll()
     Clear();
 }
 
-// -----------------------------------------------------------------------
+
 void ViewTabListBox_Impl::DeleteEntries()
 {
     short eResult = svtools::QUERYDELETE_YES;
@@ -965,7 +965,7 @@ void ViewTabListBox_Impl::DeleteEntries()
     }
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
                                  const OUString& rNewText )
 {
@@ -1024,7 +1024,7 @@ sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1061,7 +1061,7 @@ void ViewTabListBox_Impl::DoQuickSearch( const sal_Unicode& rChar )
     maResetQuickSearch.Start();
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool ViewTabListBox_Impl::DoubleClickHdl()
 {
     SvHeaderTabListBox::DoubleClickHdl();
@@ -1103,7 +1103,7 @@ OUString ViewTabListBox_Impl::GetAccessibleObjectDescription( ::svt::AccessibleB
     return sRet;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
 {
     sal_Bool bRet = sal_True;
@@ -1130,9 +1130,9 @@ sal_Bool ViewTabListBox_Impl::Kill( const OUString& rContent )
 
 
 
-// -----------------------------------------------------------------------
+
 // class SvtFileView -----------------------------------------------------
-// -----------------------------------------------------------------------
+
 
 SvtFileView::SvtFileView( Window* pParent, const ResId& rResId,
                           sal_Bool bOnlyFolder, sal_Bool bMultiSelection ) :
@@ -1177,7 +1177,7 @@ SvtFileView::SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags
     pHeaderBar->SetEndDragHdl( LINK( this, SvtFileView, HeaderEndDrag_Impl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtFileView::~SvtFileView()
 {
@@ -1187,7 +1187,7 @@ SvtFileView::~SvtFileView()
     delete pTemp;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) const
 {
@@ -1197,7 +1197,7 @@ OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) const
     return aURL;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtFileView::GetCurrentURL() const
 {
@@ -1207,7 +1207,7 @@ OUString SvtFileView::GetCurrentURL() const
         aURL = ( (SvtContentEntry*)pEntry->GetUserData() )->maURL;
     return aURL;
 }
-// -----------------------------------------------------------------------------
+
 
 void SvtFileView::CreatedFolder( const OUString& rUrl, const OUString& rNewFolder )
 {
@@ -1218,7 +1218,7 @@ void SvtFileView::CreatedFolder( const OUString& rUrl, const OUString& rNewFolde
     mpImp->mpView->MakeVisible( pEntry );
 }
 
-// -----------------------------------------------------------------------
+
 
 FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDescriptor )
 {
@@ -1231,7 +1231,7 @@ FileViewResult SvtFileView::PreviousLevel( const FileViewAsyncAction* pAsyncDesc
     return eResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvtFileView::GetParentURL( OUString& rParentURL ) const
 {
@@ -1259,21 +1259,21 @@ sal_Bool SvtFileView::GetParentURL( OUString& rParentURL ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OString& SvtFileView::GetHelpId( ) const
 {
     return mpImp->mpView->GetHelpId( );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetHelpId( const OString& rHelpId )
 {
     mpImp->mpView->SetHelpId( rHelpId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetSizePixel( const Size& rNewSize )
 {
@@ -1281,7 +1281,7 @@ void SvtFileView::SetSizePixel( const Size& rNewSize )
     mpImp->mpView->SetSizePixel( rNewSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
 {
@@ -1289,7 +1289,7 @@ void SvtFileView::SetPosSizePixel( const Point& rNewPos, const Size& rNewSize )
     SetSizePixel( rNewSize );
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent, const OUString& rFilter  )
 {
     WaitObject aWaitCursor( this );
@@ -1311,7 +1311,7 @@ sal_Bool SvtFileView::Initialize( const ::com::sun::star::uno::Reference< ::com:
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 FileViewResult SvtFileView::Initialize(
     const OUString& rURL,
     const OUString& rFilter,
@@ -1342,7 +1342,7 @@ FileViewResult SvtFileView::Initialize(
     return eFailure;
 }
 
-// -----------------------------------------------------------------------
+
 FileViewResult SvtFileView::Initialize(
     const OUString& rURL,
     const OUString& rFilter,
@@ -1351,9 +1351,9 @@ FileViewResult SvtFileView::Initialize(
     return Initialize( rURL, rFilter, pAsyncDescriptor, ::com::sun::star::uno::Sequence< OUString >());
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 sal_Bool SvtFileView::Initialize( const Sequence< OUString >& aContents )
 {
     WaitObject aWaitCursor( this );
@@ -1373,7 +1373,7 @@ sal_Bool SvtFileView::Initialize( const Sequence< OUString >& aContents )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileViewAsyncAction* pAsyncDescriptor )
 {
@@ -1385,21 +1385,21 @@ FileViewResult SvtFileView::ExecuteFilter( const OUString& rFilter, const FileVi
     return eResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::CancelRunningAsyncAction()
 {
     mpImp->CancelRunningAsyncAction();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetNoSelection()
 {
     mpImp->mpView->SelectAll( sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::GetFocus()
 {
@@ -1408,74 +1408,74 @@ void SvtFileView::GetFocus()
         mpImp->mpView->GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetSelectHdl( const Link& rHdl )
 {
     mpImp->SetSelectHandler( rHdl );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetDoubleClickHdl( const Link& rHdl )
 {
     mpImp->mpView->SetDoubleClickHdl( rHdl );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong SvtFileView::GetSelectionCount() const
 {
     return mpImp->mpView->GetSelectionCount();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvtFileView::FirstSelected() const
 {
     return mpImp->mpView->FirstSelected();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvtFileView::NextSelected( SvTreeListEntry* pEntry ) const
 {
     return mpImp->mpView->NextSelected( pEntry );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::EnableAutoResize()
 {
     mpImp->mpView->EnableAutoResize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFileView::SetFocus()
 {
     mpImp->mpView->GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 const OUString& SvtFileView::GetViewURL() const
 {
     return mpImp->maViewURL;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView::SetOpenDoneHdl( const Link& rHdl )
 {
     mpImp->maOpenDoneLink = rHdl;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView::EnableContextMenu( sal_Bool bEnable )
 {
     mpImp->EnableContextMenu( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView::EnableDelete( sal_Bool bEnable )
 {
     mpImp->EnableDelete( bEnable );
@@ -1486,13 +1486,13 @@ void SvtFileView::EnableNameReplacing( sal_Bool bEnable )
     mpImp->EnableNameReplacing( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView::EndInplaceEditing( bool _bCancel )
 {
     return mpImp->EndEditing( _bCancel );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar )
 {
     DBG_ASSERT( pBar, "no headerbar" );
@@ -1535,7 +1535,7 @@ IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar )
 {
     if ( !pBar->IsItemMode() )
@@ -1556,7 +1556,7 @@ IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 OUString SvtFileView::GetConfigString() const
 {
     OUString sRet;
@@ -1585,7 +1585,7 @@ OUString SvtFileView::GetConfigString() const
     return sRet;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView::SetConfigString( const OUString& rCfgStr )
 {
     HeaderBar* pBar = mpImp->mpView->GetHeaderBar();
@@ -1618,7 +1618,7 @@ void SvtFileView::SetConfigString( const OUString& rCfgStr )
     HeaderEndDrag_Impl( pBar );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView::StateChanged( StateChangedType nStateChange )
 {
     if ( nStateChange == STATE_CHANGE_ENABLE )
@@ -1626,9 +1626,9 @@ void SvtFileView::StateChanged( StateChangedType nStateChange )
     Control::StateChanged( nStateChange );
 }
 
-// -----------------------------------------------------------------------
+
 // class NameTranslator_Impl
-// -----------------------------------------------------------------------
+
 
 NameTranslator_Impl::NameTranslator_Impl( const INetURLObject& rActualFolder )
 {
@@ -1679,9 +1679,9 @@ const OUString* NameTranslator_Impl::GetTransTableFileName() const
     return mpActFolder? &mpActFolder->GetTransTableFileName() : NULL;
 }
 
-// -----------------------------------------------------------------------
+
 // class SvtFileView_Impl
-// -----------------------------------------------------------------------
+
 
 SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommandEnvironment > xEnv, sal_Int16 nFlags, sal_Bool bOnlyFolder )
 
@@ -1706,7 +1706,7 @@ SvtFileView_Impl::SvtFileView_Impl( SvtFileView* pAntiImpl, Reference < XCommand
     mpView->EnableCellFocus();
 }
 
-// -----------------------------------------------------------------------
+
 SvtFileView_Impl::~SvtFileView_Impl()
 {
     Clear();
@@ -1717,7 +1717,7 @@ SvtFileView_Impl::~SvtFileView_Impl()
     delete pTemp;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::Clear()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -1733,7 +1733,7 @@ void SvtFileView_Impl::Clear()
         DELETEZ( mpNameTrans );
 }
 
-// -----------------------------------------------------------------------
+
 FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     const OUString& rFolder,
     const FileViewAsyncAction* pAsyncDescriptor,
@@ -1752,7 +1752,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     return GetFolderContent_Impl( aFolder, pAsyncDescriptor, rBlackList );
 }
 
-// -----------------------------------------------------------------------
+
 FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     const FolderDescriptor& _rFolder,
     const FileViewAsyncAction* pAsyncDescriptor,
@@ -1853,7 +1853,7 @@ FileViewResult SvtFileView_Impl::GetFolderContent_Impl(
     return eFailure;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter )
 {
     sal_Bool bHideTransFile = mbReplaceNames && mpNameTrans;
@@ -1948,13 +1948,13 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter )
     while ( aContentLoop != maContent.end() );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( SvtFileView_Impl, SelectionMultiplexer, void*, _pSource )
 {
     return mnSuspendSelectCallback ? 0L : m_aSelectHandler.Call( _pSource );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl )
 {
     m_aSelectHandler = _rHdl;
@@ -1966,7 +1966,7 @@ void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl )
     mpView->SetSelectHdl( aMasterHandler );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::InitSelection()
 {
     mpView->SelectAll( sal_False );
@@ -1975,7 +1975,7 @@ void SvtFileView_Impl::InitSelection()
         mpView->SetCursor( pFirst, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::OpenFolder_Impl()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2009,7 +2009,7 @@ void SvtFileView_Impl::OpenFolder_Impl()
     ResetCursor();
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::ResetCursor()
 {
     // deselect
@@ -2021,7 +2021,7 @@ void SvtFileView_Impl::ResetCursor()
     mpView->Update();
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::CancelRunningAsyncAction()
 {
     DBG_TESTSOLARMUTEX();
@@ -2039,7 +2039,7 @@ void SvtFileView_Impl::CancelRunningAsyncAction()
     m_pCancelAsyncTimer = NULL;
 }
 
-//-----------------------------------------------------------------------
+
 void SvtFileView_Impl::onTimeout( CallbackTimer* )
 {
     SolarMutexGuard aSolarGuard;
@@ -2057,7 +2057,7 @@ void SvtFileView_Impl::onTimeout( CallbackTimer* )
     }
 }
 
-//-----------------------------------------------------------------------
+
 void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult eResult )
 {
     SolarMutexGuard aSolarGuard;
@@ -2087,7 +2087,7 @@ void SvtFileView_Impl::enumerationDone( ::svt::EnumerationResult eResult )
     }
 }
 
-//-----------------------------------------------------------------------
+
 void SvtFileView_Impl::implEnumerationSuccess()
 {
     FilterFolderContent_Impl( maCurrentFilter );
@@ -2097,7 +2097,7 @@ void SvtFileView_Impl::implEnumerationSuccess()
     maOpenDoneLink.Call( mpAntiImpl );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue )
 {
     OUString aTab( "\t" );
@@ -2108,7 +2108,7 @@ void SvtFileView_Impl::ReplaceTabWithString( OUString& aValue )
        aValue = aValue.replaceAt( iPos, 1, aTabString );
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::CreateDisplayText_Impl()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2156,7 +2156,7 @@ void SvtFileView_Impl::CreateDisplayText_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 // this function converts the sequence of strings into a vector of SortingData
 // the string should have the form :
 // title \t type \t size \t date \t target url \t is folder \t image url
@@ -2244,7 +2244,7 @@ void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2283,7 +2283,7 @@ void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending )
         mbIsFirstResort = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 static sal_Bool                 gbAscending = sal_True;
 static sal_Int16                gnColumn = COLUMN_TITLE;
 static const CollatorWrapper*   pCollatorWrapper = NULL;
@@ -2366,7 +2366,7 @@ sal_Bool CompareSortingData_Impl( SortingData_Impl* const aOne, SortingData_Impl
     return gbAscending ? bRet : !bRet;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::SortFolderContent_Impl()
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2385,7 +2385,7 @@ void SvtFileView_Impl::SortFolderContent_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::EntryRemoved( const OUString& rURL )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2402,7 +2402,7 @@ void SvtFileView_Impl::EntryRemoved( const OUString& rURL )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::EntryRenamed( OUString& rURL,
                                      const OUString& rTitle )
 {
@@ -2432,7 +2432,7 @@ void SvtFileView_Impl::EntryRenamed( OUString& rURL,
     }
 }
 
-// -----------------------------------------------------------------------
+
 OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& rTitle )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2473,7 +2473,7 @@ OUString SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString&
     return aValue;
 }
 
-// -----------------------------------------------------------------------
+
 sal_uLong SvtFileView_Impl::GetEntryPos( const OUString& rURL )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2491,7 +2491,7 @@ sal_uLong SvtFileView_Impl::GetEntryPos( const OUString& rURL )
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SvtFileView_Impl::SearchNextEntry( sal_uInt32& nIndex, const OUString& rTitle, sal_Bool bWrapAround )
 {
     ::osl::MutexGuard aGuard( maMutex );
@@ -2521,7 +2521,7 @@ sal_Bool SvtFileView_Impl::SearchNextEntry( sal_uInt32& nIndex, const OUString&
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 void SvtFileView_Impl::SetActualFolder( const INetURLObject& rActualFolder )
 {
     if( mbReplaceNames )
diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 442141f1c3eb..4cf327205957 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -54,7 +54,7 @@ OUString SvxIconChoiceCtrlEntry::GetDisplayText() const
     return MnemonicGenerator::EraseAllMnemonicChars( aText );
 }
 
-// ----------------------------------------------------------------------------
+
 
 SvxIconChoiceCtrlColumnInfo::SvxIconChoiceCtrlColumnInfo( const SvxIconChoiceCtrlColumnInfo& rInfo )
     : aColText( rInfo.aColText ), aColImage( rInfo.aColImage )
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index ff8b5944277a..a0f54c0beb0f 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -3395,7 +3395,7 @@ void SvImpLBox::ShowFocusRect( const SvTreeListEntry* pEntry )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvImpLBox::implInitDefaultNodeImages()
 {
     if ( s_pDefCollapsed )
@@ -3406,28 +3406,28 @@ void SvImpLBox::implInitDefaultNodeImages()
     s_pDefExpanded   = new Image( SvtResId( RID_IMG_TREENODE_EXPANDED ) );
 }
 
-// -----------------------------------------------------------------------
+
 const Image& SvImpLBox::GetDefaultExpandedNodeImage( )
 {
     implInitDefaultNodeImages();
     return *s_pDefExpanded;
 }
 
-// -----------------------------------------------------------------------
+
 const Image& SvImpLBox::GetDefaultCollapsedNodeImage( )
 {
     implInitDefaultNodeImages();
     return *s_pDefCollapsed;
 }
 
-// -----------------------------------------------------------------------
+
 void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData )
 {
     if ( pView )
         pView->CallImplEventListeners( nEvent, pData);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos )
 {
@@ -3443,7 +3443,7 @@ bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry )
 {
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index feee0a46975f..5fc3f2724f81 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -526,14 +526,14 @@ SvHeaderTabListBox::SvHeaderTabListBox( Window* pParent, WinBits nWinStyle ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvHeaderTabListBox::~SvHeaderTabListBox()
 {
     delete m_pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvHeaderTabListBox::Paint( const Rectangle& rRect )
 {
@@ -545,7 +545,7 @@ void SvHeaderTabListBox::Paint( const Rectangle& rRect )
     SvTabListBox::Paint( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar )
 {
@@ -556,7 +556,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar )
     m_pImpl->m_pHeaderBar->SetCreateAccessibleHdl( LINK( this, SvHeaderTabListBox, CreateAccessibleHdl_Impl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
 {
@@ -572,7 +572,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16
     return ( eState == SV_BUTTON_CHECKED );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     const OUString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
@@ -582,7 +582,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     return pEntry;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     const OUString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
@@ -592,7 +592,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     return pEntry;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     const OUString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp,
@@ -604,7 +604,7 @@ SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
     return pEntry;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong SvHeaderTabListBox::Insert(
     SvTreeListEntry* pEnt, SvTreeListEntry* pPar, sal_uLong nPos )
@@ -614,7 +614,7 @@ sal_uLong SvHeaderTabListBox::Insert(
     return n;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos )
 {
@@ -623,7 +623,7 @@ sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPo
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry )
 {
@@ -631,7 +631,7 @@ void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry )
     m_aAccessibleChildren.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvHeaderTabListBox::Clear()
 {
@@ -639,7 +639,7 @@ void SvHeaderTabListBox::Clear()
     m_aAccessibleChildren.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl)
 {
@@ -647,7 +647,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl)
 {
@@ -666,7 +666,7 @@ IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvHeaderTabListBox::RecalculateAccessibleChildren()
 {
@@ -682,7 +682,7 @@ void SvHeaderTabListBox::RecalculateAccessibleChildren()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState )
 {
@@ -709,17 +709,17 @@ sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, Tr
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 long SvHeaderTabListBox::GetRowCount() const
 {
     return GetEntryCount();
 }
-// -----------------------------------------------------------------------
+
 sal_uInt16 SvHeaderTabListBox::GetColumnCount() const
 {
     return m_pImpl->m_pHeaderBar->GetItemCount();
 }
-// -----------------------------------------------------------------------
+
 sal_Int32 SvHeaderTabListBox::GetCurrRow() const
 {
     sal_Int32 nRet = -1;
@@ -739,33 +739,33 @@ sal_Int32 SvHeaderTabListBox::GetCurrRow() const
 
     return nRet;
 }
-// -----------------------------------------------------------------------
+
 sal_uInt16 SvHeaderTabListBox::GetCurrColumn() const
 {
     sal_uInt16 nPos = GetCurrentTabPos() - 1;
     return nPos;
 }
-// -----------------------------------------------------------------------
+
 OUString SvHeaderTabListBox::GetRowDescription( sal_Int32 _nRow ) const
 {
     return OUString( GetEntryText( _nRow ) );
 }
-// -----------------------------------------------------------------------
+
 OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const
 {
     return OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) );
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::HasRowHeader() const
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::IsCellFocusable() const
 {
     return IsCellFocusEnabled();
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
 {
     sal_Bool bRet = ( IsCellFocusEnabled() == sal_True );
@@ -778,72 +778,72 @@ sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
     }
     return bRet;
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::SetNoSelection()
 {
     SvTreeListBox::SelectAll(false);
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::SelectAll()
 {
     SvTreeListBox::SelectAll(true);
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::SelectAll( sal_Bool bSelect, sal_Bool bPaint )
 {
     // overwritten just to disambiguate the SelectAll() from the base' class SelectAll( BOOl, sal_Bool )
     SvTabListBox::SelectAll( bSelect, bPaint );
 }
 
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::SelectRow( long _nRow, sal_Bool _bSelect, sal_Bool )
 {
     Select( GetEntry( _nRow ), _bSelect );
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::SelectColumn( sal_uInt16, sal_Bool )
 {
 }
-// -----------------------------------------------------------------------
+
 sal_Int32 SvHeaderTabListBox::GetSelectedRowCount() const
 {
     return GetSelectionCount();
 }
-// -----------------------------------------------------------------------
+
 sal_Int32 SvHeaderTabListBox::GetSelectedColumnCount() const
 {
     return 0;
 }
-// -----------------------------------------------------------------------
+
 bool SvHeaderTabListBox::IsRowSelected( long _nRow ) const
 {
     SvTreeListEntry* pEntry = GetEntry( _nRow );
     return ( pEntry && IsSelected( pEntry ) );
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::IsColumnSelected( long ) const
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const
 {
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const
 {
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const
 {
     return sal_True;
 }
-// -----------------------------------------------------------------------
+
 OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const
 {
     return GetTabEntryText(_nRow, _nColumnPos);
 }
-// -----------------------------------------------------------------------
+
 Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen )
 {
     Rectangle aRect;
@@ -857,7 +857,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _
     }
     return aRect;
 }
-// -----------------------------------------------------------------------
+
 Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen )
 {
     Window* pParent = NULL;
@@ -867,7 +867,7 @@ Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen )
     Rectangle aRect( GetWindowExtentsRelative( pParent ) );
     return aRect;
 }
-// -----------------------------------------------------------------------
+
 Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen )
 {
     DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" );
@@ -892,7 +892,7 @@ Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16
 
     return aRect;
 }
-// -----------------------------------------------------------------------
+
 Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
 {
     OSL_ENSURE( m_pAccessible, "Invalid call: Accessible is null" );
@@ -933,13 +933,13 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR
 
     return xChild;
 }
-// -----------------------------------------------------------------------
+
 Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleRowHeader( sal_Int32 )
 {
     Reference< XAccessible > xHeader;
     return xHeader;
 }
-// -----------------------------------------------------------------------
+
 Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_uInt16 _nColumn )
 {
     // first call? -> initial list
@@ -968,38 +968,38 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleColumnHeader( sal_u
 
     return xChild;
 }
-// -----------------------------------------------------------------------
+
 sal_Int32 SvHeaderTabListBox::GetAccessibleControlCount() const
 {
     return -1;
 }
-// -----------------------------------------------------------------------
+
 Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleControl( sal_Int32 )
 {
     Reference< XAccessible > xControl;
     return xControl;
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::ConvertPointToControlIndex( sal_Int32&, const Point& )
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::ConvertPointToCellAddress( sal_Int32&, sal_uInt16&, const Point& )
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::ConvertPointToRowHeader( sal_Int32&, const Point& )
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& )
 {
     return sal_False;
 }
-// -----------------------------------------------------------------------
+
 OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
 {
     OUString aRetText;
@@ -1047,7 +1047,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBox
     }
     return aRetText;
 }
-// -----------------------------------------------------------------------
+
 OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
 {
     OUString aRetText;
@@ -1075,7 +1075,7 @@ OUString SvHeaderTabListBox::GetAccessibleObjectDescription( ::svt::AccessibleBr
 
     return aRetText;
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& _rStateSet, ::svt::AccessibleBrowseBoxObjType _eType ) const
 {
     switch( _eType )
@@ -1131,7 +1131,7 @@ void SvHeaderTabListBox::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper
             break;
     }
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumn ) const
 {
     _rStateSet.AddState( AccessibleStateType::SELECTABLE );
@@ -1152,42 +1152,42 @@ void SvHeaderTabListBox::FillAccessibleStateSetForCell( ::utl::AccessibleStateSe
     if ( IsEnabled() )
         _rStateSet.AddState( AccessibleStateType::ENABLED );
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::GrabTableFocus()
 {
     GrabFocus();
 }
-// -----------------------------------------------------------------------
+
 sal_Bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector )
 {
     return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector );
 }
-// -----------------------------------------------------------------------
+
 Rectangle SvHeaderTabListBox::GetWindowExtentsRelative( Window *pRelativeWindow ) const
 {
     return Control::GetWindowExtentsRelative( pRelativeWindow );
 }
-// -----------------------------------------------------------------------
+
 void SvHeaderTabListBox::GrabFocus()
 {
     Control::GrabFocus();
 }
-// -----------------------------------------------------------------------
+
 Reference< XAccessible > SvHeaderTabListBox::GetAccessible( sal_Bool bCreate )
 {
     return Control::GetAccessible( bCreate );
 }
-// -----------------------------------------------------------------------
+
 Window* SvHeaderTabListBox::GetAccessibleParentWindow() const
 {
     return Control::GetAccessibleParentWindow();
 }
-// -----------------------------------------------------------------------
+
 Window* SvHeaderTabListBox::GetWindowInstance()
 {
     return this;
 }
-// -----------------------------------------------------------------------
+
 Reference< XAccessible > SvHeaderTabListBox::CreateAccessible()
 {
     Window* pParent = GetAccessibleParentWindow();
@@ -1208,13 +1208,13 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessible()
     }
     return xAccessible;
 }
-// -----------------------------------------------------------------------------
+
 Rectangle SvHeaderTabListBox::GetFieldCharacterBounds(sal_Int32,sal_Int32,sal_Int32)
 {
     Rectangle aRect;
     return aRect;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)
 {
     OUString sText = GetAccessibleCellText( _nRow, static_cast< sal_uInt16 >( _nColumnPos ) );
@@ -1230,7 +1230,7 @@ sal_Int32 SvHeaderTabListBox::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nC
 
     return -1;
 }
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 7fda4016df9f..9349a3fce4e8 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -572,7 +572,7 @@ SvtDocInfoTable_Impl::SvtDocInfoTable_Impl() :
 
 {
 }
-// -----------------------------------------------------------------------
+
 
 OUString SvtDocInfoTable_Impl::GetString( long nId ) const
 {
@@ -837,7 +837,7 @@ SvtTemplateWindow::SvtTemplateWindow( Window* pParent ) :
     Application::PostUserEvent( LINK( this, SvtTemplateWindow, ResizeHdl_Impl ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 SvtTemplateWindow::~SvtTemplateWindow()
 {
@@ -855,7 +855,7 @@ SvtTemplateWindow::~SvtTemplateWindow()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl)
 {
@@ -871,7 +871,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , IconClickHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtTemplateWindow , FileSelectHdl_Impl)
 {
@@ -879,7 +879,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , FileSelectHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl)
 {
@@ -898,7 +898,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , FileDblClickHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl)
 {
@@ -913,7 +913,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , NewFolderHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtTemplateWindow , TimeoutHdl_Impl)
 {
@@ -935,7 +935,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , TimeoutHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK ( SvtTemplateWindow , ClickHdl_Impl, ToolBox *, pToolBox )
 {
@@ -943,7 +943,7 @@ IMPL_LINK ( SvtTemplateWindow , ClickHdl_Impl, ToolBox *, pToolBox )
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtTemplateWindow , ResizeHdl_Impl)
 {
@@ -951,7 +951,7 @@ IMPL_LINK_NOARG(SvtTemplateWindow , ResizeHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::PrintFile( const OUString& rURL )
 {
@@ -974,7 +974,7 @@ void SvtTemplateWindow::PrintFile( const OUString& rURL )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::AppendHistoryURL( const OUString& rURL, sal_uLong nGroup )
 {
@@ -995,7 +995,7 @@ void SvtTemplateWindow::AppendHistoryURL( const OUString& rURL, sal_uLong nGroup
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::OpenHistory()
 {
@@ -1009,7 +1009,7 @@ void SvtTemplateWindow::OpenHistory()
     delete pEntry;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::DoAction( sal_uInt16 nAction )
 {
@@ -1047,7 +1047,7 @@ void SvtTemplateWindow::DoAction( sal_uInt16 nAction )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::InitToolBoxes()
 {
@@ -1076,7 +1076,7 @@ void SvtTemplateWindow::InitToolBoxes()
     aFrameWinTB.SetClickHdl( aLink );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::InitToolBoxImages()
 {
@@ -1101,14 +1101,14 @@ void SvtTemplateWindow::InitToolBoxImages()
                : IMG_SVT_DOCTEMPLATE_PREVIEW_SMALL ) ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::UpdateIcons()
 {
     pIconWin->UpdateIcons();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt )
 {
@@ -1134,7 +1134,7 @@ bool SvtTemplateWindow::PreNotify( NotifyEvent& rNEvt )
     return nRet || Window::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1152,7 +1152,7 @@ void SvtTemplateWindow::DataChanged( const DataChangedEvent& rDCEvt )
         InitToolBoxImages();
     }
 }
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::Resize()
 {
@@ -1184,14 +1184,14 @@ void SvtTemplateWindow::Resize()
     aSplitWin.SetPosSizePixel( Point( 0, nToolBoxHeight  ), aSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SvtTemplateWindow::GetSelectedFile() const
 {
     return pFileWin->GetSelectedFile();
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool SvtTemplateWindow::IsFileSelected() const
 {
@@ -1200,7 +1200,7 @@ sal_Bool SvtTemplateWindow::IsFileSelected() const
     return bRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::OpenFile( sal_Bool bNotAsTemplate )
 {
@@ -1209,7 +1209,7 @@ void SvtTemplateWindow::OpenFile( sal_Bool bNotAsTemplate )
         pFrameWin->OpenFile( aURL, sal_False, pFileWin->IsTemplateFolder(), !bNotAsTemplate );
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SvtTemplateWindow::GetFolderTitle() const
 {
@@ -1222,7 +1222,7 @@ OUString SvtTemplateWindow::GetFolderTitle() const
     return sTitle;
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SvtTemplateWindow::GetFolderURL() const
 {
@@ -1230,7 +1230,7 @@ OUString SvtTemplateWindow::GetFolderURL() const
 }
 
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::SetFocus( sal_Bool bIconWin )
 {
@@ -1240,14 +1240,14 @@ void SvtTemplateWindow::SetFocus( sal_Bool bIconWin )
         pFileWin->SetFocus();
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::OpenTemplateRoot()
 {
     pFileWin->OpenFolder( pIconWin->GetTemplateRootURL() );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::SetPrevLevelButtonState( const OUString& rURL )
 {
@@ -1261,7 +1261,7 @@ void SvtTemplateWindow::SetPrevLevelButtonState( const OUString& rURL )
     aFileViewTB.EnableItem( TI_DOCTEMPLATE_PREV, bEnable );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::ClearHistory()
 {
@@ -1273,7 +1273,7 @@ void SvtTemplateWindow::ClearHistory()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 long SvtTemplateWindow::CalcHeight() const
 {
@@ -1286,7 +1286,7 @@ long SvtTemplateWindow::CalcHeight() const
     return nHeight;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::ReadViewSettings()
 {
@@ -1339,7 +1339,7 @@ void SvtTemplateWindow::ReadViewSettings()
         IconClickHdl_Impl( NULL );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtTemplateWindow::WriteViewSettings()
 {
@@ -1408,7 +1408,7 @@ SvtDocumentTemplateDialog::SvtDocumentTemplateDialog( Window* pParent ) :
     InitImpl( );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SvtDocumentTemplateDialog::InitImpl( )
 {
@@ -1501,14 +1501,14 @@ void SvtDocumentTemplateDialog::InitImpl( )
     UpdateHdl_Impl( NULL );
 }
 
-// ------------------------------------------------------------------------
+
 
 SvtDocumentTemplateDialog::~SvtDocumentTemplateDialog()
 {
     delete pImpl;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const
 {
@@ -1524,7 +1524,7 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const
     return bEnable;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SelectHdl_Impl)
 {
@@ -1533,7 +1533,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SelectHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtDocumentTemplateDialog , DoubleClickHdl_Impl)
 {
@@ -1544,7 +1544,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , DoubleClickHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtDocumentTemplateDialog , NewFolderHdl_Impl)
 {
@@ -1557,7 +1557,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , NewFolderHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SendFocusHdl_Impl)
 {
@@ -1576,7 +1576,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog , SendFocusHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK ( SvtDocumentTemplateDialog , OKHdl_Impl, PushButton *, pBtn )
 {
@@ -1590,7 +1590,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog , OKHdl_Impl, PushButton *, pBtn )
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtDocumentTemplateDialog , OrganizerHdl_Impl)
 {
@@ -1645,7 +1645,7 @@ IMPL_LINK_NOARG(SvtDocumentTemplateDialog, PackageHdl_Impl)
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
 {
@@ -1680,7 +1680,7 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
     return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvtDocumentTemplateDialog, OpenLinkHdl_Impl)
 {
diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index a222fb42dfc6..32c5bd810ed2 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.cxx
@@ -24,7 +24,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/svapp.hxx>
 
-//--------------------------------------------------------------------
+
 namespace svtools {
 
 void AsynchronLink::CreateMutex()
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index f9589b89bd4c..4f464caabe88 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -72,7 +72,7 @@ static void ImplCalendarSelectDate( IntDateSet* pTable, const Date& rDate, sal_B
         pTable->erase( rDate.GetDate() );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplCalendarSelectDateRange( IntDateSet* pTable,
                                          const Date& rStartDate,
@@ -112,7 +112,7 @@ static void ImplCalendarSelectDateRange( IntDateSet* pTable,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplCalendarUnSelectDateRange( IntDateSet* pTable,
                                            IntDateSet* pOldTable,
@@ -150,7 +150,7 @@ static void ImplCalendarUnSelectDateRange( IntDateSet* pTable,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 inline void ImplCalendarClearSelectDate( IntDateSet* pTable )
 {
@@ -225,7 +225,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplInitSettings()
 {
@@ -236,7 +236,7 @@ void Calendar::ImplInitSettings()
     SetBackground( Wallpaper( rStyleSettings.GetFieldColor() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 Calendar::Calendar( Window* pParent, WinBits nWinStyle ) :
     Control( pParent, nWinStyle & (WB_TABSTOP | WB_GROUP | WB_BORDER | WB_3DLOOK | WB_RANGESELECT | WB_MULTISELECT) ),
@@ -253,7 +253,7 @@ Calendar::Calendar( Window* pParent, WinBits nWinStyle ) :
     ImplInit( nWinStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 Calendar::~Calendar()
 {
@@ -266,7 +266,7 @@ Calendar::~Calendar()
     delete mpRestoreSelectTable;
 }
 
-// -----------------------------------------------------------------------
+
 
 DayOfWeek Calendar::ImplGetWeekStart() const
 {
@@ -303,7 +303,7 @@ DayOfWeek Calendar::ImplGetWeekStart() const
     return eDay;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplGetWeekFont( Font& rFont ) const
 {
@@ -315,7 +315,7 @@ void Calendar::ImplGetWeekFont( Font& rFont ) const
     rFont.SetWeight( WEIGHT_NORMAL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplFormat()
 {
@@ -494,7 +494,7 @@ void Calendar::ImplFormat()
     mbFormat = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const
 {
@@ -625,7 +625,7 @@ sal_uInt16 Calendar::ImplHitTest( const Point& rPos, Date& rDate ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect,
                                sal_Bool bPrev )
@@ -671,7 +671,7 @@ static void ImplDrawSpinArrow( OutputDevice* pDev, const Rectangle& rRect,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext )
 {
@@ -700,7 +700,7 @@ void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplDrawDate( long nX, long nY,
                              sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear,
@@ -799,7 +799,7 @@ void Calendar::ImplDrawDate( long nX, long nY,
         SetFont( aOldFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplDraw( sal_Bool bPaint )
 {
@@ -1042,7 +1042,7 @@ void Calendar::ImplDraw( sal_Bool bPaint )
         ImplDrawSpin();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplUpdateDate( const Date& rDate )
 {
@@ -1059,7 +1059,7 @@ void Calendar::ImplUpdateDate( const Date& rDate )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplUpdateSelection( IntDateSet* pOld )
 {
@@ -1086,7 +1086,7 @@ void Calendar::ImplUpdateSelection( IntDateSet* pOld )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
                                 sal_Bool bMove, sal_Bool bExpand, sal_Bool bExtended )
@@ -1199,7 +1199,7 @@ void Calendar::ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest,
     delete pOldSel;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplUpdate( sal_Bool bCalcNew )
 {
@@ -1225,7 +1225,7 @@ void Calendar::ImplUpdate( sal_Bool bCalcNew )
     mbFormat = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplInvertDropPos()
 {
@@ -1235,7 +1235,7 @@ void Calendar::ImplInvertDropPos()
     Invert( aRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplScroll( sal_Bool bPrev )
 {
@@ -1252,7 +1252,7 @@ void Calendar::ImplScroll( sal_Bool bPrev )
     mbDirect = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate )
 {
@@ -1317,7 +1317,7 @@ void Calendar::ImplShowMenu( const Point& rPos, const Date& rDate )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplTracking( const Point& rPos, sal_Bool bRepeat )
 {
@@ -1340,7 +1340,7 @@ void Calendar::ImplTracking( const Point& rPos, sal_Bool bRepeat )
         ImplMouseSelect( aTempDate, nHitTest, sal_True, sal_False, sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::ImplEndTracking( sal_Bool bCancel )
 {
@@ -1408,7 +1408,7 @@ void Calendar::ImplEndTracking( sal_Bool bCancel )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG )
 {
@@ -1423,7 +1423,7 @@ IMPL_STATIC_LINK( Calendar, ScrollHdl, Timer*, EMPTYARG )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -1486,7 +1486,7 @@ void Calendar::MouseButtonDown( const MouseEvent& rMEvt )
     Control::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -1496,7 +1496,7 @@ void Calendar::MouseButtonUp( const MouseEvent& rMEvt )
         Control::MouseButtonUp( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::MouseMove( const MouseEvent& rMEvt )
 {
@@ -1506,7 +1506,7 @@ void Calendar::MouseMove( const MouseEvent& rMEvt )
         Control::MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::Tracking( const TrackingEvent& rTEvt )
 {
@@ -1518,7 +1518,7 @@ void Calendar::Tracking( const TrackingEvent& rTEvt )
         ImplTracking( aMousePos, rTEvt.IsTrackingRepeat() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::KeyInput( const KeyEvent& rKEvt )
 {
@@ -1636,14 +1636,14 @@ void Calendar::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::Paint( const Rectangle& )
 {
     ImplDraw( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::GetFocus()
 {
@@ -1651,7 +1651,7 @@ void Calendar::GetFocus()
     Control::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::LoseFocus()
 {
@@ -1659,7 +1659,7 @@ void Calendar::LoseFocus()
     Control::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::Resize()
 {
@@ -1667,7 +1667,7 @@ void Calendar::Resize()
     Control::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -1716,7 +1716,7 @@ void Calendar::RequestHelp( const HelpEvent& rHEvt )
     Control::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::Command( const CommandEvent& rCEvt )
 {
@@ -1763,7 +1763,7 @@ void Calendar::Command( const CommandEvent& rCEvt )
     Control::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::StateChanged( StateChangedType nType )
 {
@@ -1773,7 +1773,7 @@ void Calendar::StateChanged( StateChangedType nType )
         ImplFormat();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1789,42 +1789,42 @@ void Calendar::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::SelectionChanging()
 {
     maSelectionChangingHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::DateRangeChanged()
 {
     maDateRangeChangedHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::RequestDateInfo()
 {
     maRequestDateInfoHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::DoubleClick()
 {
     maDoubleClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::Select()
 {
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::SelectDate( const Date& rDate, sal_Bool bSelect )
 {
@@ -1847,7 +1847,7 @@ void Calendar::SelectDate( const Date& rDate, sal_Bool bSelect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::SetNoSelection()
 {
@@ -1867,14 +1867,14 @@ void Calendar::SetNoSelection()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool Calendar::IsDateSelected( const Date& rDate ) const
 {
     return mpSelectTable->find( rDate.GetDate() ) != mpSelectTable->end();
 }
 
-// -----------------------------------------------------------------------
+
 
 Date Calendar::GetFirstSelectedDate() const
 {
@@ -1887,7 +1887,7 @@ Date Calendar::GetFirstSelectedDate() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::SetCurDate( const Date& rNewDate )
 {
@@ -1945,7 +1945,7 @@ void Calendar::SetCurDate( const Date& rNewDate )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::SetFirstDate( const Date& rNewFirstDate )
 {
@@ -1957,7 +1957,7 @@ void Calendar::SetFirstDate( const Date& rNewFirstDate )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Date Calendar::GetFirstMonth() const
 {
@@ -1972,7 +1972,7 @@ Date Calendar::GetFirstMonth() const
         return maFirstDate;
 }
 
-// -----------------------------------------------------------------------
+
 
 Date Calendar::GetLastMonth() const
 {
@@ -1984,7 +1984,7 @@ Date Calendar::GetLastMonth() const
     return aDate;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Calendar::GetMonthCount() const
 {
@@ -1994,7 +1994,7 @@ sal_uInt16 Calendar::GetMonthCount() const
         return (sal_uInt16)(mnMonthPerLine*mnLines);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool Calendar::GetDate( const Point& rPos, Date& rDate ) const
 {
@@ -2009,7 +2009,7 @@ sal_Bool Calendar::GetDate( const Point& rPos, Date& rDate ) const
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Calendar::GetDateRect( const Date& rDate ) const
 {
@@ -2111,7 +2111,7 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::StartSelection()
 {
@@ -2123,7 +2123,7 @@ void Calendar::StartSelection()
     mbSelection = sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Calendar::EndSelection()
 {
@@ -2141,7 +2141,7 @@ void Calendar::EndSelection()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Calendar::CalcWindowSizePixel( long nCalcMonthPerLine,
                                     long nCalcLines ) const
@@ -2225,7 +2225,7 @@ public:
     virtual bool    Notify( NotifyEvent& rNEvt );
 };
 
-// -----------------------------------------------------------------------
+
 
 ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) :
     FloatingWindow( pParent, WB_BORDER | WB_SYSTEMWINDOW | WB_NOSHADOW  )
@@ -2236,7 +2236,7 @@ ImplCFieldFloatWin::ImplCFieldFloatWin( Window* pParent ) :
     mpFixedLine = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplCFieldFloatWin::~ImplCFieldFloatWin()
 {
@@ -2245,7 +2245,7 @@ ImplCFieldFloatWin::~ImplCFieldFloatWin()
     delete mpFixedLine;
 }
 
-// -----------------------------------------------------------------------
+
 
 PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable )
 {
@@ -2277,7 +2277,7 @@ PushButton* ImplCFieldFloatWin::EnableTodayBtn( sal_Bool bEnable )
     return mpTodayBtn;
 }
 
-// -----------------------------------------------------------------------
+
 
 PushButton* ImplCFieldFloatWin::EnableNoneBtn( sal_Bool bEnable )
 {
@@ -2309,7 +2309,7 @@ PushButton* ImplCFieldFloatWin::EnableNoneBtn( sal_Bool bEnable )
     return mpNoneBtn;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplCFieldFloatWin::ArrangeButtons()
 {
@@ -2375,7 +2375,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
 {
@@ -2402,7 +2402,7 @@ CalendarField::CalendarField( Window* pParent, WinBits nWinStyle ) :
     mbNone          = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 CalendarField::~CalendarField()
 {
@@ -2413,7 +2413,7 @@ CalendarField::~CalendarField()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar )
 {
@@ -2434,7 +2434,7 @@ IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn )
 {
@@ -2466,7 +2466,7 @@ IMPL_LINK( CalendarField, ImplClickHdl, PushButton*, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl)
 {
@@ -2476,14 +2476,14 @@ IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void CalendarField::Select()
 {
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool CalendarField::ShowDropDown( sal_Bool bShow )
 {
@@ -2533,14 +2533,14 @@ bool CalendarField::ShowDropDown( sal_Bool bShow )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 Calendar* CalendarField::CreateCalendar( Window* pParent )
 {
     return new Calendar( pParent, mnCalendarStyle | WB_TABSTOP );
 }
 
-// -----------------------------------------------------------------------
+
 
 Calendar* CalendarField::GetCalendar()
 {
@@ -2556,7 +2556,7 @@ Calendar* CalendarField::GetCalendar()
     return mpCalendar;
 }
 
-// -----------------------------------------------------------------------
+
 
 void CalendarField::StateChanged( StateChangedType nStateChange )
 {
diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index cc2d73062955..c845b22657dc 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.cxx
@@ -22,11 +22,11 @@
 #include <svtools/svtools.hrc>
 #include <svtools/collatorres.hxx>
 
-// -------------------------------------------------------------------------
+
 //
 //  wrapper for locale specific translations data of collator algorithm
 //
-// -------------------------------------------------------------------------
+
 
 class CollatorResourceData
 {
@@ -54,11 +54,11 @@ class CollatorResourceData
         }
 };
 
-// -------------------------------------------------------------------------
+
 //
 //  implementation of the collator-algorithm-name translation
 //
-// -------------------------------------------------------------------------
+
 
 #define COLLATOR_RESOURCE_COUNT (STR_SVT_COLLATE_END - STR_SVT_COLLATE_START + 1)
 
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 5997da3ed221..3755003788db 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -66,9 +66,9 @@ using namespace ::com::sun::star;
 // ColorListBox
 // ========================================================================
 
-// --------------------
+
 // - ImplColorListData -
-// --------------------
+
 
 class ImplColorListData
 {
@@ -80,7 +80,7 @@ public:
                 ImplColorListData( const Color& rColor ) : aColor( rColor ) { bColor = sal_True; }
 };
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::ImplInit()
 {
@@ -92,7 +92,7 @@ void ColorListBox::ImplInit()
     SetUserItemSize( aImageSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::ImplDestroyColorEntries()
 {
@@ -101,7 +101,7 @@ void ColorListBox::ImplDestroyColorEntries()
     pColorList->clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) :
     ListBox( pParent, nWinStyle )
@@ -110,7 +110,7 @@ ColorListBox::ColorListBox( Window* pParent, WinBits nWinStyle ) :
     SetEdgeBlending(true);
 }
 
-// -----------------------------------------------------------------------
+
 
 ColorListBox::ColorListBox( Window* pParent, const ResId& rResId ) :
     ListBox( pParent, rResId )
@@ -131,7 +131,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeColorListBox(Window *pParen
     return pListBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 ColorListBox::~ColorListBox()
 {
@@ -139,7 +139,7 @@ ColorListBox::~ColorListBox()
     delete pColorList;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ColorListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos )
 {
@@ -162,7 +162,7 @@ sal_uInt16 ColorListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos )
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr,
                                 sal_uInt16 nPos )
@@ -186,7 +186,7 @@ sal_uInt16 ColorListBox::InsertEntry( const Color& rColor, const OUString& rStr,
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::InsertAutomaticEntryColor(const Color &rColor)
 {
@@ -194,7 +194,7 @@ void ColorListBox::InsertAutomaticEntryColor(const Color &rColor)
     InsertEntry( rColor, SVT_RESSTR(STR_SVT_AUTOMATIC_COLOR), 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::RemoveEntry( sal_uInt16 nPos )
 {
@@ -208,7 +208,7 @@ void ColorListBox::RemoveEntry( sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::Clear()
 {
@@ -216,7 +216,7 @@ void ColorListBox::Clear()
     ListBox::Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::CopyEntries( const ColorListBox& rBox )
 {
@@ -245,7 +245,7 @@ void ColorListBox::CopyEntries( const ColorListBox& rBox )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ColorListBox::GetEntryPos( const Color& rColor ) const
 {
@@ -258,7 +258,7 @@ sal_uInt16 ColorListBox::GetEntryPos( const Color& rColor ) const
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 Color ColorListBox::GetEntryColor( sal_uInt16 nPos ) const
 {
@@ -269,7 +269,7 @@ Color ColorListBox::GetEntryColor( sal_uInt16 nPos ) const
     return aColor;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColorListBox::UserDraw( const UserDrawEvent& rUDEvt )
 {
@@ -547,7 +547,7 @@ sal_uInt16 ImpLineListData::GetStyle( )
     return m_nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void lclDrawPolygon( OutputDevice& rDev, const basegfx::B2DPolygon& rPolygon, long nWidth, sal_uInt16 nDashing )
 {
@@ -735,7 +735,7 @@ void LineListBox::ImpGetLine( long nLine1, long nLine2, long nDistance,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineListBox::ImplInit()
 {
@@ -751,7 +751,7 @@ void LineListBox::ImplInit()
     UpdatePaintLineColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 LineListBox::LineListBox( Window* pParent, WinBits nWinStyle ) :
     ListBox( pParent, nWinStyle ),
@@ -775,7 +775,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLineListBox(Window *pParent
     return pListBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 LineListBox::~LineListBox()
 {
@@ -820,7 +820,7 @@ void LineListBox::SelectEntry( sal_uInt16 nStyle, sal_Bool bSelect )
         ListBox::SelectEntryPos( nPos, bSelect );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 LineListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos )
 {
@@ -837,7 +837,7 @@ sal_uInt16 LineListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos )
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineListBox::InsertEntry(
     BorderWidthImpl aWidthImpl, sal_uInt16 nStyle, long nMinWidth,
@@ -848,7 +848,7 @@ void LineListBox::InsertEntry(
     pLineList->push_back( pData );
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineListBox::RemoveEntry( sal_uInt16 nPos )
 {
@@ -862,7 +862,7 @@ void LineListBox::RemoveEntry( sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineListBox::Clear()
 {
@@ -876,7 +876,7 @@ void LineListBox::Clear()
     ListBox::Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
 {
@@ -896,7 +896,7 @@ sal_uInt16 LineListBox::GetEntryPos( sal_uInt16 nStyle ) const
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
 {
@@ -904,7 +904,7 @@ sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
     return ( pData ) ? pData->GetStyle() : table::BorderLineStyle::NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool LineListBox::UpdatePaintLineColor( void )
 {
@@ -964,7 +964,7 @@ void LineListBox::UpdateEntries( long nOldWidth )
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 Color LineListBox::GetColorLine1( sal_uInt16 nPos )
 {
@@ -1002,7 +1002,7 @@ Color LineListBox::GetColorDist( sal_uInt16 nPos )
     return rResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineListBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1025,7 +1025,7 @@ FontNameBox::FontNameBox( Window* pParent, WinBits nWinStyle ) :
     InitFontMRUEntriesFile();
 }
 
-// -------------------------------------------------------------------
+
 
 extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent, VclBuilder::stringmap &rMap)
 {
@@ -1039,7 +1039,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontNameBox(Window *pParent
     return pListBox;
 }
 
-// -------------------------------------------------------------------
+
 
 FontNameBox::~FontNameBox()
 {
@@ -1047,7 +1047,7 @@ FontNameBox::~FontNameBox()
     ImplDestroyFontList();
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep ) const
 {
@@ -1072,7 +1072,7 @@ void FontNameBox::SaveMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico
     aStream.WriteLine( OString() );
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unicode cSep )
 {
@@ -1095,7 +1095,7 @@ void FontNameBox::LoadMRUEntries( const OUString& aFontMRUEntriesFile, sal_Unico
     SetMRUEntries( aEntries, cSep );
 }
 
-// ------------------------------------------------------------------
+
 
 void FontNameBox::InitFontMRUEntriesFile()
 {
@@ -1109,14 +1109,14 @@ void FontNameBox::InitFontMRUEntriesFile()
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::ImplDestroyFontList()
 {
     delete mpFontList;
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::Fill( const FontList* pList )
 {
@@ -1159,7 +1159,7 @@ void FontNameBox::Fill( const FontList* pList )
         SetText( aOldText );
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::EnableWYSIWYG( sal_Bool bEnable )
 {
@@ -1171,7 +1171,7 @@ void FontNameBox::EnableWYSIWYG( sal_Bool bEnable )
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::ImplCalcUserItemSize()
 {
@@ -1213,7 +1213,7 @@ namespace
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
 {
@@ -1451,7 +1451,7 @@ FontStyleBox::~FontStyleBox()
 {
 }
 
-// -------------------------------------------------------------------
+
 
 void FontStyleBox::Select()
 {
@@ -1460,7 +1460,7 @@ void FontStyleBox::Select()
     ComboBox::Select();
 }
 
-// -------------------------------------------------------------------
+
 
 void FontStyleBox::LoseFocus()
 {
@@ -1469,7 +1469,7 @@ void FontStyleBox::LoseFocus()
     ComboBox::LoseFocus();
 }
 
-// -------------------------------------------------------------------
+
 
 void FontStyleBox::Modify()
 {
@@ -1496,7 +1496,7 @@ void FontStyleBox::Modify()
     ComboBox::Modify();
 }
 
-// -------------------------------------------------------------------
+
 
 void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
 {
@@ -1659,13 +1659,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeFontSizeBox(Window *pParent
     return pListBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 FontSizeBox::~FontSizeBox()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::ImplInit()
 {
@@ -1684,7 +1684,7 @@ void FontSizeBox::ImplInit()
     SetProminentEntryType( PROMINENT_MIDDLE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::Reformat()
 {
@@ -1702,7 +1702,7 @@ void FontSizeBox::Reformat()
     MetricBox::Reformat();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::Modify()
 {
@@ -1756,7 +1756,7 @@ void FontSizeBox::Modify()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
 {
@@ -1846,7 +1846,7 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
     SetSelection( aSelection );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt16 nStep )
 {
@@ -1857,7 +1857,7 @@ void FontSizeBox::EnableRelativeMode( sal_uInt16 nMin, sal_uInt16 nMax, sal_uInt
     SetUnit( FUNIT_POINT );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep )
 {
@@ -1868,7 +1868,7 @@ void FontSizeBox::EnablePtRelativeMode( short nMin, short nMax, short nStep )
     SetUnit( FUNIT_POINT );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::SetRelative( sal_Bool bNewRelative )
 {
@@ -1931,7 +1931,7 @@ void FontSizeBox::SetRelative( sal_Bool bNewRelative )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const
 {
@@ -1941,7 +1941,7 @@ OUString FontSizeBox::CreateFieldText( sal_Int64 nValue ) const
     return sRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
 {
@@ -1965,14 +1965,14 @@ void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
     MetricBox::SetValue( nNewValue, eInUnit );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeBox::SetValue( sal_Int64 nNewValue )
 {
     SetValue( nNewValue, FUNIT_NONE );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const
 {
@@ -1991,7 +1991,7 @@ sal_Int64 FontSizeBox::GetValue( sal_uInt16 nPos, FieldUnit eOutUnit ) const
     return nRetValue;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
 {
@@ -2006,7 +2006,7 @@ sal_Int64 FontSizeBox::GetValue( FieldUnit eOutUnit ) const
     return MetricBox::GetValue( eOutUnit );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int64 FontSizeBox::GetValue() const
 {
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index e3bb7a8ec889..5991af8378a3 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -71,9 +71,9 @@ static const sal_IntPtr aStdSizeAry[] =
 
 // =======================================================================
 
-// -----------------------------
+
 // - class ImplFontListFonInfo -
-// -----------------------------
+
 
 class ImplFontListFontInfo : public FontInfo
 {
@@ -94,9 +94,9 @@ public:
     OutputDevice*           GetDevice() const { return mpDevice; }
 };
 
-// ------------------------------
+
 // - class ImplFontListNameInfo -
-// ------------------------------
+
 
 class ImplFontListNameInfo
 {
@@ -152,7 +152,7 @@ static OUString ImplMakeSearchString(const OUString& rStr)
     return rStr.toAsciiLowerCase();
 }
 
-// -----------------------------------------------------------------------
+
 
 static OUString ImplMakeSearchStringFromName(const OUString& rStr)
 {
@@ -164,7 +164,7 @@ static OUString ImplMakeSearchStringFromName(const OUString& rStr)
     return ImplMakeSearchString(rStr.getToken( 0, ';' ));
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplFontListNameInfo* FontList::ImplFind(const OUString& rSearchName, sal_uLong* pIndex) const
 {
@@ -371,7 +371,7 @@ FontList::FontList( OutputDevice* pDevice, OutputDevice* pDevice2, sal_Bool bAll
         ImplInsertFonts( pDevice2, bAll, !bCompareWindow );
 }
 
-// -----------------------------------------------------------------------
+
 
 FontList::~FontList()
 {
@@ -392,7 +392,7 @@ FontList::~FontList()
         }
     }
 }
-// -----------------------------------------------------------------------
+
 FontList* FontList::Clone() const
 {
     FontList* pReturn = new FontList(
@@ -400,7 +400,7 @@ FontList* FontList::Clone() const
     return pReturn;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) const
 {
@@ -441,7 +441,7 @@ const OUString& FontList::GetStyleName(FontWeight eWeight, FontItalic eItalic) c
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString FontList::GetStyleName(const FontInfo& rInfo) const
 {
@@ -494,7 +494,7 @@ OUString FontList::GetStyleName(const FontInfo& rInfo) const
     return aStyleName;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString FontList::GetFontMapText( const FontInfo& rInfo ) const
 {
@@ -675,7 +675,7 @@ FontInfo FontList::Get(const OUString& rName, const OUString& rStyleName) const
     return aInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 FontInfo FontList::Get(const OUString& rName,
                         FontWeight eWeight, FontItalic eItalic) const
@@ -713,14 +713,14 @@ FontInfo FontList::Get(const OUString& rName,
     return aInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool FontList::IsAvailable(const OUString& rName) const
 {
     return (ImplFindByName( rName ) != 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
 {
@@ -729,7 +729,7 @@ const FontInfo& FontList::GetFontName( sal_uInt16 nFont ) const
     return *(maEntries[nFont].mpFirst);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const
 {
@@ -740,7 +740,7 @@ sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const
         return (sal_Handle)pData->mpFirst;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const
 {
@@ -748,7 +748,7 @@ sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const
     return (sal_Handle)(pInfo->mpNext);
 }
 
-// -----------------------------------------------------------------------
+
 
 const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
 {
@@ -756,7 +756,7 @@ const FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const
     return *pInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
 {
@@ -806,7 +806,7 @@ const sal_IntPtr* FontList::GetSizeAry( const FontInfo& rInfo ) const
     return mpSizeAry;
 }
 
-// -----------------------------------------------------------------------
+
 
 const sal_IntPtr* FontList::GetStdSizeAry()
 {
@@ -815,9 +815,9 @@ const sal_IntPtr* FontList::GetStdSizeAry()
 
 // =======================================================================
 
-// ---------------------------------
+
 // - FontSizeNames & FsizeNameItem -
-// ---------------------------------
+
 
 struct ImplFSNameItem
 {
@@ -825,7 +825,7 @@ struct ImplFSNameItem
     const char* mszUtf8Name;
 };
 
-//------------------------------------------------------------------------
+
 
 static const ImplFSNameItem aImplSimplifiedChinese[] =
 {
@@ -847,7 +847,7 @@ static const ImplFSNameItem aImplSimplifiedChinese[] =
     { 420, "\xe5\x88\x9d\xe5\x8f\xb7" }
 };
 
-//------------------------------------------------------------------------
+
 
 FontSizeNames::FontSizeNames( LanguageType eLanguage )
 {
@@ -869,7 +869,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 long FontSizeNames::Name2Size( const OUString& rName ) const
 {
@@ -887,7 +887,7 @@ long FontSizeNames::Name2Size( const OUString& rName ) const
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString FontSizeNames::Size2Name( long nValue ) const
 {
@@ -911,7 +911,7 @@ OUString FontSizeNames::Size2Name( long nValue ) const
     return aStr;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const
 {
@@ -923,7 +923,7 @@ OUString FontSizeNames::GetIndexName( sal_uLong nIndex ) const
     return aStr;
 }
 
-//------------------------------------------------------------------------
+
 
 long FontSizeNames::GetIndexSize( sal_uLong nIndex ) const
 {
diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index 75c38696eb86..810b17b3ba33 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.cxx
@@ -53,7 +53,7 @@ FileControl::FileControl( Window* pParent, WinBits nStyle, FileControlMode nFlag
     SetStyle( ImplInitStyle( GetStyle() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits FileControl::ImplInitStyle( WinBits nStyle )
 {
@@ -82,13 +82,13 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 FileControl::~FileControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FileControl::SetText( const OUString& rStr )
 {
@@ -97,14 +97,14 @@ void FileControl::SetText( const OUString& rStr )
         Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString FileControl::GetText() const
 {
     return maEdit.GetText();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FileControl::StateChanged( StateChangedType nType )
 {
@@ -144,7 +144,7 @@ void FileControl::StateChanged( StateChangedType nType )
     Window::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FileControl::Resize()
 {
@@ -180,7 +180,7 @@ void FileControl::Resize()
     mnInternalFlags &= ~FILECTRL_INRESIZE; //InResize = sal_False
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FileControl, ButtonHdl)
 {
@@ -189,14 +189,14 @@ IMPL_LINK_NOARG(FileControl, ButtonHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FileControl::GetFocus()
 {
     maEdit.GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 7b3c794fd78c..06e599189242 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -29,14 +29,14 @@ namespace svt
     //=====================================================================
     //= FileURLBox
     //=====================================================================
-    //---------------------------------------------------------------------
+
     FileURLBox::FileURLBox( Window* _pParent, WinBits _nStyle )
         :SvtURLBox( _pParent, _nStyle, INET_PROT_FILE )
     {
         DisableHistory();
     }
 
-    //---------------------------------------------------------------------
+
     void FileURLBox::DisplayURL( const OUString& _rURL )
     {
         OUString sOldText = GetText();
@@ -51,7 +51,7 @@ namespace svt
         UpdatePickList();
     }
 
-    //---------------------------------------------------------------------
+
     bool FileURLBox::PreNotify( NotifyEvent& _rNEvt )
     {
         switch ( _rNEvt.GetType() )
@@ -73,7 +73,7 @@ namespace svt
         return SvtURLBox::PreNotify(_rNEvt);
     }
 
-    //---------------------------------------------------------------------
+
     bool FileURLBox::Notify( NotifyEvent& _rNEvt )
     {
         switch ( _rNEvt.GetType() )
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index 7df2ec124bf0..91adad683423 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -101,7 +101,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
     ImplInitSettings( sal_True, sal_True, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) :
     Window( pParent, nWinStyle & WB_3DLOOK )
@@ -110,7 +110,7 @@ HeaderBar::HeaderBar( Window* pParent, WinBits nWinStyle ) :
     SetSizePixel( CalcWindowSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 HeaderBar::~HeaderBar()
 {
@@ -122,7 +122,7 @@ HeaderBar::~HeaderBar()
     delete mpItemList;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplInitSettings( sal_Bool bFont,
                                   sal_Bool bForeground, sal_Bool bBackground )
@@ -160,7 +160,7 @@ void HeaderBar::ImplInitSettings( sal_Bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long HeaderBar::ImplGetItemPos( sal_uInt16 nPos ) const
 {
@@ -170,7 +170,7 @@ long HeaderBar::ImplGetItemPos( sal_uInt16 nPos ) const
     return nX;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle HeaderBar::ImplGetItemRect( sal_uInt16 nPos ) const
 {
@@ -182,7 +182,7 @@ Rectangle HeaderBar::ImplGetItemRect( sal_uInt16 nPos ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos,
                                long& nMouseOff, sal_uInt16& nPos ) const
@@ -247,7 +247,7 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos,
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos )
 {
@@ -295,7 +295,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos )
     SetRasterOp( ROP_OVERPAINT );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplDrawItem( OutputDevice* pDev,
                               sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
@@ -656,7 +656,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
                               const Rectangle* pRect )
@@ -665,7 +665,7 @@ void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
     ImplDrawItem( this, nPos, bHigh, bDrag, aRect, pRect, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect )
 {
@@ -709,7 +709,7 @@ void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
 {
@@ -772,7 +772,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplDrag( const Point& rMousePos )
 {
@@ -879,7 +879,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
     Drag();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::ImplEndDrag( sal_Bool bCancel )
 {
@@ -940,7 +940,7 @@ void HeaderBar::ImplEndDrag( sal_Bool bCancel )
     mbItemDrag      = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -969,7 +969,7 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::MouseMove( const MouseEvent& rMEvt )
 {
@@ -984,7 +984,7 @@ void HeaderBar::MouseMove( const MouseEvent& rMEvt )
     SetPointer( aPtr );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Tracking( const TrackingEvent& rTEvt )
 {
@@ -996,7 +996,7 @@ void HeaderBar::Tracking( const TrackingEvent& rTEvt )
         ImplDrag( aMousePos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Paint( const Rectangle& rRect )
 {
@@ -1025,7 +1025,7 @@ void HeaderBar::Paint( const Rectangle& rRect )
         ImplDrawItem( i, (i == nCurItemPos) ? sal_True : sal_False, sal_False, &rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                       sal_uLong nFlags )
@@ -1081,7 +1081,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Resize()
 {
@@ -1092,7 +1092,7 @@ void HeaderBar::Resize()
     mnDY = aSize.Height();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Command( const CommandEvent& rCEvt )
 {
@@ -1105,7 +1105,7 @@ void HeaderBar::Command( const CommandEvent& rCEvt )
     Window::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -1160,7 +1160,7 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt )
     Window::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::StateChanged( StateChangedType nType )
 {
@@ -1186,7 +1186,7 @@ void HeaderBar::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1202,48 +1202,48 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::StartDrag()
 {
     maStartDragHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Drag()
 {
     maDragHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::EndDrag()
 {
     maEndDragHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Select()
 {
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::DoubleClick()
 {
     maDoubleClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::InsertItem( sal_uInt16 nItemId, const OUString& rText,
                             long nSize, HeaderBarItemBits nBits, sal_uInt16 nPos )
@@ -1270,7 +1270,7 @@ void HeaderBar::InsertItem( sal_uInt16 nItemId, const OUString& rText,
     ImplUpdate( nPos, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::RemoveItem( sal_uInt16 nItemId )
 {
@@ -1286,7 +1286,7 @@ void HeaderBar::RemoveItem( sal_uInt16 nItemId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos )
 {
@@ -1308,7 +1308,7 @@ void HeaderBar::MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::Clear()
 {
@@ -1321,7 +1321,7 @@ void HeaderBar::Clear()
     ImplUpdate( 0, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::SetOffset( long nNewOffset )
 {
@@ -1332,14 +1332,14 @@ void HeaderBar::SetOffset( long nNewOffset )
     Scroll( nDelta, 0, aRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 HeaderBar::GetItemCount() const
 {
     return (sal_uInt16)mpItemList->size();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 HeaderBar::GetItemPos( sal_uInt16 nItemId ) const
 {
@@ -1351,7 +1351,7 @@ sal_uInt16 HeaderBar::GetItemPos( sal_uInt16 nItemId ) const
     return HEADERBAR_ITEM_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const
 {
@@ -1362,7 +1362,7 @@ sal_uInt16 HeaderBar::GetItemId( sal_uInt16 nPos ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 HeaderBar::GetItemId( const Point& rPos ) const
 {
@@ -1374,7 +1374,7 @@ sal_uInt16 HeaderBar::GetItemId( const Point& rPos ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle HeaderBar::GetItemRect( sal_uInt16 nItemId ) const
 {
@@ -1385,7 +1385,7 @@ Rectangle HeaderBar::GetItemRect( sal_uInt16 nItemId ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::SetItemSize( sal_uInt16 nItemId, long nNewSize )
 {
@@ -1401,7 +1401,7 @@ void HeaderBar::SetItemSize( sal_uInt16 nItemId, long nNewSize )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long HeaderBar::GetItemSize( sal_uInt16 nItemId ) const
 {
@@ -1412,7 +1412,7 @@ long HeaderBar::GetItemSize( sal_uInt16 nItemId ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits )
 {
@@ -1428,7 +1428,7 @@ void HeaderBar::SetItemBits( sal_uInt16 nItemId, HeaderBarItemBits nNewBits )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 HeaderBarItemBits HeaderBar::GetItemBits( sal_uInt16 nItemId ) const
 {
@@ -1439,7 +1439,7 @@ HeaderBarItemBits HeaderBar::GetItemBits( sal_uInt16 nItemId ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HeaderBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1451,7 +1451,7 @@ void HeaderBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString HeaderBar::GetItemText( sal_uInt16 nItemId ) const
 {
@@ -1461,7 +1461,7 @@ OUString HeaderBar::GetItemText( sal_uInt16 nItemId ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const
 {
@@ -1482,7 +1482,7 @@ OUString HeaderBar::GetHelpText( sal_uInt16 nItemId ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const
 {
@@ -1493,7 +1493,7 @@ OString HeaderBar::GetHelpId( sal_uInt16 nItemId ) const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size HeaderBar::CalcWindowSizePixel() const
 {
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index b15ef3b61210..f31f1c934064 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -63,7 +63,7 @@ namespace svt
         HyperLabelImpl();
     };
 
-    //---------------------------------------------------------------------
+
     HyperLabelImpl::HyperLabelImpl()
     {
     }
@@ -209,7 +209,7 @@ namespace svt
     }
 
 
-    //------------------------------------------------------------------------------
+
     void HyperLabel::DataChanged( const DataChangedEvent& rDCEvt )
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index c80507f015a7..ac2b5ff7c16d 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.cxx
@@ -22,11 +22,11 @@
 #include <svtools/svtools.hrc>
 #include <svtools/indexentryres.hxx>
 
-// -------------------------------------------------------------------------
+
 //
 //  wrapper for locale specific translations data of indexentry algorithm
 //
-// -------------------------------------------------------------------------
+
 
 class IndexEntryResourceData
 {
@@ -54,11 +54,11 @@ class IndexEntryResourceData
         }
 };
 
-// -------------------------------------------------------------------------
+
 //
 //  implementation of the indexentry-algorithm-name translation
 //
-// -------------------------------------------------------------------------
+
 
 #define INDEXENTRY_RESOURCE_COUNT (STR_SVT_INDEXENTRY_END - STR_SVT_INDEXENTRY_START + 1)
 
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index ac0529c6399a..33bcf894b1b7 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -202,7 +202,7 @@ void SvtMatchContext_Impl::execute( )
     aLink.Call( this );
 }
 
-//-------------------------------------------------------------------------
+
 // This method is called via AsynchronLink, so it has the SolarMutex and
 // calling solar code ( VCL ... ) is safe. It is called when the thread is
 // terminated ( finished work or stopped ). Cancelling the thread via
@@ -285,7 +285,7 @@ IMPL_STATIC_LINK( SvtMatchContext_Impl, Select_Impl, void*, )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
                                    const OUString& rURL,
                                    sal_Bool bForce )
@@ -301,7 +301,7 @@ void SvtMatchContext_Impl::Insert( const OUString& rCompletion,
     aURLs.push_back(rURL);
 }
 
-//-------------------------------------------------------------------------
+
 void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
                                        const OUString& rMatch,
                                        sal_Bool bSmart )
@@ -468,7 +468,7 @@ void SvtMatchContext_Impl::ReadFolder( const OUString& rURL,
     }
 }
 
-//-------------------------------------------------------------------------
+
 OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUString& aWorkDir )
 {
     OUString aMatch;
@@ -552,7 +552,7 @@ OUString SvtURLBox::ParseSmart( OUString aText, OUString aBaseURL, const OUStrin
     return aMatch;
 }
 
-//-------------------------------------------------------------------------
+
 void SvtMatchContext_Impl::doExecute()
 {
     ::osl::MutexGuard aGuard( theSvtMatchContextMutex::get() );
@@ -831,7 +831,7 @@ void SvtURLBox::TryAutoComplete()
     }
 }
 
-//-------------------------------------------------------------------------
+
 SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelpID )
     :   ComboBox( pParent , WB_DROPDOWN | WB_AUTOSIZE | WB_AUTOHSCROLL ),
         eSmartProtocol( eSmart ),
@@ -850,7 +850,7 @@ SvtURLBox::SvtURLBox( Window* pParent, INetProtocol eSmart, bool bSetDefaultHelp
         SetSizePixel( Size( 225, 240 ) );
 }
 
-//-------------------------------------------------------------------------
+
 SvtURLBox::SvtURLBox( Window* pParent, WinBits _nStyle, INetProtocol eSmart,
     bool bSetDefaultHelpID )
     :   ComboBox( pParent, _nStyle ),
@@ -874,7 +874,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvtURLBox(Window *pParent,
     return pListBox;
 }
 
-//-------------------------------------------------------------------------
+
 SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart,
     bool bSetDefaultHelpID )
     :   ComboBox( pParent , _rResId ),
@@ -1006,7 +1006,7 @@ void SvtURLBox::UpdatePicklistForSmartProtocol_Impl()
     }
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
 {
     // every key input stops the current matching thread
@@ -1087,13 +1087,13 @@ sal_Bool SvtURLBox::ProcessKey( const KeyCode& rKey )
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SvtURLBox::Modify()
 {
     ComboBox::Modify();
 }
 
-//-------------------------------------------------------------------------
+
 bool SvtURLBox::PreNotify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetWindow() == GetSubEdit() && rNEvt.GetType() == EVENT_KEYINPUT )
@@ -1126,7 +1126,7 @@ bool SvtURLBox::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-//-------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl)
 {
     if ( GetSubEdit()->GetAutocompleteAction() == AUTOCOMPLETE_KEYINPUT )
@@ -1138,7 +1138,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl)
     return 0L;
 }
 
-//-------------------------------------------------------------------------
+
 bool SvtURLBox::Notify( NotifyEvent &rEvt )
 {
     if ( EVENT_GETFOCUS == rEvt.GetType() )
@@ -1163,14 +1163,14 @@ bool SvtURLBox::Notify( NotifyEvent &rEvt )
     return ComboBox::Notify( rEvt );
 }
 
-//-------------------------------------------------------------------------
+
 void SvtURLBox::Select()
 {
     ComboBox::Select();
     ClearModifyFlag();
 }
 
-//-------------------------------------------------------------------------
+
 void SvtURLBox::SetOnlyDirectories( sal_Bool bDir )
 {
     bOnlyDirectories = bDir;
@@ -1178,13 +1178,13 @@ void SvtURLBox::SetOnlyDirectories( sal_Bool bDir )
         Clear();
 }
 
-//-------------------------------------------------------------------------
+
 void SvtURLBox::SetNoURLSelection( sal_Bool bSet )
 {
     bNoSelection = bSet;
 }
 
-//-------------------------------------------------------------------------
+
 OUString SvtURLBox::GetURL()
 {
     // wait for end of autocompletion
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index dc4ea873e5d3..bdbb85ff168c 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -178,7 +178,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     void RoadmapImpl::initItemSize()
     {
         Size aLabelSize( m_rAntiImpl.GetOutputSizePixel() );
@@ -190,7 +190,7 @@ namespace svt
     //=====================================================================
     //= Roadmap
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ORoadmap::ORoadmap( Window* _pParent, WinBits _nWinStyle )
         :Control( _pParent, _nWinStyle )
         ,m_pImpl( new RoadmapImpl( *this ) )
@@ -199,7 +199,7 @@ namespace svt
         implInit();
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::implInit()
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -231,7 +231,7 @@ namespace svt
         EnableMapMode( false );
     }
 
-    //---------------------------------------------------------------------
+
     ORoadmap::~ORoadmap( )
     {
         HL_Vector aItemsCopy = m_pImpl->getHyperLabels();
@@ -262,7 +262,7 @@ namespace svt
     }
 
 
-       //---------------------------------------------------------------------
+
 
     RoadmapItem* ORoadmap::InsertHyperLabel( ItemIndex _Index, const OUString& _sLabel, ItemId _RMID, sal_Bool _bEnabled)
     {
@@ -292,7 +292,7 @@ namespace svt
         return pItem;
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::SetRoadmapBitmap( const BitmapEx& _rBmp, sal_Bool _bInvalidate )
     {
         m_pImpl->setPicture( _rBmp );
@@ -300,7 +300,7 @@ namespace svt
             Invalidate( );
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::SetRoadmapInteractive( sal_Bool _bInteractive )
     {
         m_pImpl->setInteractive( _bInteractive );
@@ -315,13 +315,13 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ORoadmap::IsRoadmapInteractive()
     {
         return m_pImpl->isInteractive();
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::SetRoadmapComplete( sal_Bool _bComplete )
     {
         sal_Bool bWasComplete = m_pImpl->isComplete();
@@ -338,7 +338,7 @@ namespace svt
             m_pImpl->InCompleteHyperLabel = InsertHyperLabel( m_pImpl->getItemCount(), OUString("..."), RMINCOMPLETE );
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::UpdatefollowingHyperLabels( ItemIndex _nIndex )
     {
         const HL_Vector& rItems = m_pImpl->getHyperLabels();
@@ -364,7 +364,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::ReplaceRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _RMID, sal_Bool _bEnabled )
     {
         RoadmapItem* pItem = GetByIndex( _Index);
@@ -376,13 +376,13 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapTypes::ItemIndex ORoadmap::GetItemCount() const
     {
         return m_pImpl->getItemCount();
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapTypes::ItemId ORoadmap::GetItemID( ItemIndex _nIndex ) const
     {
         const RoadmapItem* pHyperLabel = GetByIndex( _nIndex );
@@ -391,7 +391,7 @@ namespace svt
         return -1;
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::InsertRoadmapItem( ItemIndex _Index, const OUString& _RoadmapItem, ItemId _nUniqueId, sal_Bool _bEnabled )
     {
         InsertHyperLabel( _Index, _RoadmapItem, _nUniqueId, _bEnabled );
@@ -399,7 +399,7 @@ namespace svt
         UpdatefollowingHyperLabels( _Index + 1 );
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::DeleteRoadmapItem( ItemIndex _Index )
     {
         if ( m_pImpl->getItemCount() > 0 && ( _Index > -1)  &&  ( _Index < m_pImpl->getItemCount() ) )
@@ -409,13 +409,13 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ORoadmap::IsRoadmapComplete( ) const
     {
         return m_pImpl->isComplete();
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex )
     {
         RoadmapItem* pItem = GetByID( _nItemId, _nStartIndex );
@@ -423,7 +423,7 @@ namespace svt
             pItem->Enable( _bEnable );
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::ChangeRoadmapItemLabel( ItemId _nID, const OUString& _sLabel, ItemIndex _nStartIndex )
     {
         RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
@@ -442,7 +442,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::ChangeRoadmapItemID( ItemId _nID, ItemId _NewID, ItemIndex _nStartIndex )
     {
         RoadmapItem* pItem = GetByID( _nID, _nStartIndex );
@@ -450,7 +450,7 @@ namespace svt
             pItem->SetID( _NewID );
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapItem* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex)
     {
         ItemId nLocID = 0;
@@ -467,13 +467,13 @@ namespace svt
         return NULL;
     }
 
-    //---------------------------------------------------------------------
+
     const RoadmapItem* ORoadmap::GetByID( ItemId _nID, ItemIndex _nStartIndex  ) const
     {
         return const_cast< ORoadmap* >( this )->GetByID( _nID, _nStartIndex );
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapItem* ORoadmap::GetByIndex( ItemIndex _nItemIndex)
     {
         const HL_Vector& rItems = m_pImpl->getHyperLabels();
@@ -484,13 +484,13 @@ namespace svt
         return NULL;
     }
 
-    //---------------------------------------------------------------------
+
     const RoadmapItem* ORoadmap::GetByIndex( ItemIndex _nItemIndex ) const
     {
         return const_cast< ORoadmap* >( this )->GetByIndex( _nItemIndex );
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapTypes::ItemId ORoadmap::GetNextAvailableItemId( ItemIndex _nNewIndex )
     {
         RoadmapItem* pItem = NULL;
@@ -507,7 +507,7 @@ namespace svt
         return -1;
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapTypes::ItemId ORoadmap::GetPreviousAvailableItemId( ItemIndex _nNewIndex )
     {
         RoadmapItem* pItem = NULL;
@@ -523,7 +523,7 @@ namespace svt
         return -1;
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::DeselectOldRoadmapItems()
     {
         const HL_Vector& rItems = m_pImpl->getHyperLabels();
@@ -536,26 +536,26 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::SetItemSelectHdl( const Link& _rHdl )
     {
         m_pImpl->setSelectHdl( _rHdl );
     }
 
-    //---------------------------------------------------------------------
+
     Link ORoadmap::GetItemSelectHdl( ) const
     {
         return m_pImpl->getSelectHdl();
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::Select()
     {
         GetItemSelectHdl().Call( this );
         CallEventListeners( VCLEVENT_ROADMAP_ITEMSELECTED );
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::GetFocus()
     {
         RoadmapItem* pCurHyperLabel = GetByID( GetCurrentRoadmapItemID() );
@@ -563,7 +563,7 @@ namespace svt
             pCurHyperLabel->GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool ORoadmap::SelectRoadmapItemByID( ItemId _nNewID )
     {
         DeselectOldRoadmapItems();
@@ -585,7 +585,7 @@ namespace svt
         return sal_False;
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::Paint( const Rectangle& _rRect )
     {
         Control::Paint( _rRect );
@@ -608,7 +608,7 @@ namespace svt
         DrawHeadline();
     }
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::DrawHeadline()
     {
         Point aTextPos = LogicToPixel( Point( ROADMAP_INDENT_X, 8 ), MAP_APPFONT );
@@ -623,7 +623,7 @@ namespace svt
         SetTextColor(rStyleSettings.GetFieldTextColor());
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapItem* ORoadmap::GetByPointer(Window* pWindow)
     {
         const HL_Vector& rItems = m_pImpl->getHyperLabels();
@@ -638,7 +638,7 @@ namespace svt
         return NULL;
     }
 
-    //---------------------------------------------------------------------
+
     bool ORoadmap::PreNotify( NotifyEvent& _rNEvt )
     {
         // capture KeyEvents for taskpane cycling
@@ -675,7 +675,7 @@ namespace svt
         return Window::PreNotify( _rNEvt );
     }
 
-    //---------------------------------------------------------------------
+
       IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel)
     {
        return SelectRoadmapItemByID( _CurHyperLabel->GetID() );
@@ -683,7 +683,7 @@ namespace svt
 
 
 
-    //---------------------------------------------------------------------
+
     void ORoadmap::DataChanged( const DataChangedEvent& rDCEvt )
     {
         if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS )   ||
@@ -707,7 +707,7 @@ namespace svt
     }
 
 
-    //---------------------------------------------------------------------
+
     RoadmapItem::RoadmapItem( ORoadmap& _rParent, const Size& _rItemPlayground )
         :m_aItemPlayground( _rItemPlayground )
     {
@@ -718,40 +718,40 @@ namespace svt
         mpDescription->Show();
     }
 
-    //---------------------------------------------------------------------
+
     bool RoadmapItem::Contains( const Window* _pWindow ) const
     {
         return ( mpID == _pWindow ) || ( mpDescription == _pWindow );
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::GrabFocus()
     {
         if ( mpDescription )
             mpDescription->GrabFocus();
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::SetInteractive( sal_Bool _bInteractive )
     {
         if ( mpDescription )
         mpDescription->SetInteractive(_bInteractive);
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::SetID( sal_Int16 _ID )
     {
         if ( mpDescription )
             mpDescription->SetID(_ID);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int16 RoadmapItem::GetID() const
     {
         return mpDescription ? mpDescription->GetID() : sal_Int16(-1);
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::ImplUpdateIndex( const ItemIndex _nIndex )
     {
         if ( mpDescription )
@@ -767,19 +767,19 @@ namespace svt
         ImplUpdatePosSize();
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::SetIndex( ItemIndex _Index )
     {
         ImplUpdateIndex( _Index );
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapTypes::ItemIndex RoadmapItem::GetIndex() const
     {
         return mpDescription ? mpDescription->GetIndex() : ItemIndex(-1);
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::SetPosition( RoadmapItem* _pOldItem )
     {
         Point aIDPos;
@@ -801,20 +801,20 @@ namespace svt
         mpDescription->SetPosPixel( Point( nDescPos, aIDPos.Y() ) );
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::Enable( sal_Bool _bEnable)
     {
         mpID->Enable(_bEnable);
         mpDescription->Enable(_bEnable);
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool RoadmapItem::IsEnabled() const
     {
         return mpID->IsEnabled();
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::ToggleBackgroundColor( const Color& _rGBColor )
     {
         if (_rGBColor == COL_TRANSPARENT)
@@ -830,7 +830,7 @@ namespace svt
         mpDescription->ToggleBackgroundColor(_rGBColor);
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::ImplUpdatePosSize()
     {
         // calculate widths
@@ -850,7 +850,7 @@ namespace svt
         mpDescription->SetSizePixel( aDescriptionSize );
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::Update( ItemIndex _RMIndex, const OUString& _rText )
     {
         // update description label
@@ -860,7 +860,7 @@ namespace svt
         ImplUpdateIndex( _RMIndex );
     }
 
-    //---------------------------------------------------------------------
+
     RoadmapItem::~RoadmapItem( )
     {
         {
@@ -873,26 +873,26 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapItem::SetClickHdl( const Link& rLink )
     {
         if ( mpDescription )
             mpDescription->SetClickHdl( rLink);
     }
 
-    //---------------------------------------------------------------------
+
     IDLabel::IDLabel( Window* _pParent, WinBits _nWinStyle )
         :FixedText( _pParent, _nWinStyle )
     {
 
     }
 
-    //---------------------------------------------------------------------
+
     IDLabel::~IDLabel( )
     {
     }
 
-    //---------------------------------------------------------------------
+
     void IDLabel::DataChanged( const DataChangedEvent& rDCEvt )
     {
         const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
diff --git a/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 4975c83ba656..23e5d560ad69 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.cxx
@@ -32,7 +32,7 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 
 
-//_____________________________________________________________________________
+
 
 class SvtScriptedTextHelper_Impl
 {
@@ -307,7 +307,7 @@ void SvtScriptedTextHelper_Impl::DrawText( const Point& _rPos )
 }
 
 
-//_____________________________________________________________________________
+
 
 SvtScriptedTextHelper::SvtScriptedTextHelper( OutputDevice& _rOutDevice ) :
     mpImpl( new SvtScriptedTextHelper_Impl( _rOutDevice, NULL, NULL, NULL ) )
@@ -350,6 +350,6 @@ void SvtScriptedTextHelper::DrawText( const Point& _rPos )
 }
 
 
-//_____________________________________________________________________________
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 0c66ed7cd8dc..38c44b8445bc 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.cxx
@@ -38,7 +38,7 @@ void ScrollableWindow::ImpInitialize( ScrollableWindowFlags nFlags )
     nColumnPixW = nLinePixH = GetSettings().GetStyleSettings().GetScrollBarSize();
 }
 
-//-------------------------------------------------------------------
+
 
 ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits,
                                     ScrollableWindowFlags nFlags ) :
@@ -50,7 +50,7 @@ ScrollableWindow::ScrollableWindow( Window* pParent, WinBits nBits,
     ImpInitialize( nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ScrollableWindow::Command( const CommandEvent& rCEvt )
 {
@@ -75,7 +75,7 @@ void ScrollableWindow::Command( const CommandEvent& rCEvt )
     Window::Command( rCEvt );
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -89,7 +89,7 @@ void ScrollableWindow::DataChanged( const DataChangedEvent& rDCEvt )
     Window::DataChanged( rDCEvt );
 }
 
-//-------------------------------------------------------------------
+
 
 Size ScrollableWindow::GetOutputSizePixel() const
 {
@@ -103,7 +103,7 @@ Size ScrollableWindow::GetOutputSizePixel() const
     return aSz;
 }
 
-//-------------------------------------------------------------------
+
 
 IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
 {
@@ -129,7 +129,7 @@ IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll )
     return 0;
 }
 
-//-------------------------------------------------------------------
+
 
 IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll )
 {
@@ -150,7 +150,7 @@ IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll )
     return 0;
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::Resize()
 {
@@ -272,19 +272,19 @@ void ScrollableWindow::Resize()
     }
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::StartScroll()
 {
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::EndScroll( long, long )
 {
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode )
 {
@@ -293,7 +293,7 @@ void ScrollableWindow::SetMapMode( const MapMode& rNewMapMode )
     Window::SetMapMode( aMap );
 }
 
-//-------------------------------------------------------------------
+
 
 MapMode ScrollableWindow::GetMapMode() const
 {
@@ -302,7 +302,7 @@ MapMode ScrollableWindow::GetMapMode() const
     return aMap;
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::SetTotalSize( const Size& rNewSize )
 {
@@ -310,7 +310,7 @@ void ScrollableWindow::SetTotalSize( const Size& rNewSize )
     ScrollableWindow::Resize();
 }
 
-//-------------------------------------------------------------------
+
 
 void ScrollableWindow::Scroll( long nDeltaX, long nDeltaY, sal_uInt16 )
 {
diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx
index c966bebdba04..e73456b16682 100644
--- a/svtools/source/control/stdctrl.cxx
+++ b/svtools/source/control/stdctrl.cxx
@@ -27,7 +27,7 @@ FixedInfo::FixedInfo( Window* pParent, WinBits nWinStyle ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedInfo::FixedInfo( Window* pParent, const ResId& rResId ) :
     FixedText( pParent, rResId )
diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index a8c08377619d..34be090e5939 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.cxx
@@ -32,13 +32,13 @@ FontNameMenu::FontNameMenu()
     SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
 }
 
-// -----------------------------------------------------------------------
+
 
 FontNameMenu::~FontNameMenu()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontNameMenu::Select()
 {
@@ -46,7 +46,7 @@ void FontNameMenu::Select()
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontNameMenu::Highlight()
 {
@@ -56,7 +56,7 @@ void FontNameMenu::Highlight()
     maCurName = aTempName;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontNameMenu::Fill( const FontList* pList )
 {
@@ -87,7 +87,7 @@ void FontNameMenu::Fill( const FontList* pList )
     SetCurName( maCurName );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontNameMenu::SetCurName(const OUString& rName)
 {
@@ -124,7 +124,7 @@ FontSizeMenu::FontSizeMenu()
     SetMenuFlags( GetMenuFlags() | MENU_FLAG_NOAUTOMNEMONICS );
 }
 
-// -----------------------------------------------------------------------
+
 
 FontSizeMenu::~FontSizeMenu()
 {
@@ -132,7 +132,7 @@ FontSizeMenu::~FontSizeMenu()
         delete[] mpHeightAry;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeMenu::Select()
 {
@@ -141,7 +141,7 @@ void FontSizeMenu::Select()
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeMenu::Highlight()
 {
@@ -158,7 +158,7 @@ void FontSizeMenu::Highlight()
     mnCurHeight = nTempHeight;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
 {
@@ -226,7 +226,7 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList )
     SetCurHeight( mnCurHeight );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontSizeMenu::SetCurHeight( long nHeight )
 {
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 382ca95c879b..4e4ac1da29bb 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -93,9 +93,9 @@ struct ImplTabBarItem
 
 // =======================================================================
 
-// -----------------
+
 // - ImplTabButton -
-// -----------------
+
 
 class ImplTabButton : public PushButton
 {
@@ -146,9 +146,9 @@ bool ImplTabButton::PreNotify( NotifyEvent& rNEvt )
 
 // =======================================================================
 
-// ----------------
+
 // - ImplTabSizer -
-// ----------------
+
 
 class ImplTabSizer : public Window
 {
@@ -168,7 +168,7 @@ private:
     long            mnStartWidth;
 };
 
-// -----------------------------------------------------------------------
+
 
 ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits nWinStyle )
     : Window( pParent, nWinStyle & WB_3DLOOK )
@@ -178,7 +178,7 @@ ImplTabSizer::ImplTabSizer( TabBar* pParent, WinBits nWinStyle )
     SetSizePixel( Size( 7, 0 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTabSizer::ImplTrack( const Point& rScreenPos )
 {
@@ -191,7 +191,7 @@ void ImplTabSizer::ImplTrack( const Point& rScreenPos )
     pParent->Update();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTabSizer::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -209,7 +209,7 @@ void ImplTabSizer::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTabSizer::Tracking( const TrackingEvent& rTEvt )
 {
@@ -223,7 +223,7 @@ void ImplTabSizer::Tracking( const TrackingEvent& rTEvt )
         ImplTrack( OutputToScreenPixel( rTEvt.GetMouseEvent().GetPosPixel() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTabSizer::Paint( const Rectangle& )
 {
@@ -246,9 +246,9 @@ void ImplTabSizer::Paint( const Rectangle& )
 
 // Is not named Impl. as it may be called or overloaded
 
-// --------------
+
 // - TabBarEdit -
-// --------------
+
 
 class TabBarEdit : public Edit
 {
@@ -271,7 +271,7 @@ public:
     virtual void    LoseFocus();
 };
 
-// -----------------------------------------------------------------------
+
 
 TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) :
     Edit( pParent, nWinStyle )
@@ -279,7 +279,7 @@ TabBarEdit::TabBarEdit( TabBar* pParent, WinBits nWinStyle ) :
     mbPostEvt = sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool TabBarEdit::PreNotify( NotifyEvent& rNEvt )
 {
@@ -312,7 +312,7 @@ bool TabBarEdit::PreNotify( NotifyEvent& rNEvt )
     return Edit::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBarEdit::LoseFocus()
 {
@@ -325,7 +325,7 @@ void TabBarEdit::LoseFocus()
     Edit::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel )
 {
@@ -346,7 +346,7 @@ IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl)
 {
@@ -440,7 +440,7 @@ void TabBar::ImplInit( WinBits nWinStyle )
     ImplInitSettings( sal_True, sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 TabBar::TabBar( Window* pParent, WinBits nWinStyle ) :
     Window( pParent, (nWinStyle & WB_3DLOOK) | WB_CLIPCHILDREN )
@@ -449,7 +449,7 @@ TabBar::TabBar( Window* pParent, WinBits nWinStyle ) :
     maCurrentItemList = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 TabBar::~TabBar()
 {
@@ -472,7 +472,7 @@ TabBar::~TabBar()
     delete mpItemList;
 }
 
-// -----------------------------------------------------------------------
+
 ImplTabBarItem* TabBar::seek( size_t i )
 {
     if ( i < mpItemList->size() )
@@ -499,7 +499,7 @@ ImplTabBarItem* TabBar::next()
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplInitSettings( sal_Bool bFont, sal_Bool bBackground )
 {
@@ -536,7 +536,7 @@ void TabBar::ImplInitSettings( sal_Bool bFont, sal_Bool bBackground )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor,
                             Color& rSelectColor, Color& rSelectTextColor )
@@ -573,7 +573,7 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool TabBar::ImplCalcWidth()
 {
@@ -627,7 +627,7 @@ sal_Bool TabBar::ImplCalcWidth()
     return bChanged;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplFormat()
 {
@@ -675,7 +675,7 @@ void TabBar::ImplFormat()
     ImplEnableControls();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::ImplGetLastFirstPos()
 {
@@ -697,7 +697,7 @@ sal_uInt16 TabBar::ImplGetLastFirstPos()
     return nLastFirstPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplInitControls()
 {
@@ -765,7 +765,7 @@ void TabBar::ImplInitControls()
     mbHasInsertTab  = (mnWinStyle & WB_INSERTTAB);
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplEnableControls()
 {
@@ -792,7 +792,7 @@ void TabBar::SetScrollAlwaysEnabled(bool bScrollAlwaysEnabled)
     ImplEnableControls();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplShowPage( sal_uInt16 nPos )
 {
@@ -816,7 +816,7 @@ void TabBar::ImplShowPage( sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn )
 {
@@ -849,7 +849,7 @@ IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::MouseMove( const MouseEvent& rMEvt )
 {
@@ -859,7 +859,7 @@ void TabBar::MouseMove( const MouseEvent& rMEvt )
     Window::MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -1063,7 +1063,7 @@ void TabBar::MouseButtonDown( const MouseEvent& rMEvt )
     Window::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -1072,7 +1072,7 @@ void TabBar::MouseButtonUp( const MouseEvent& rMEvt )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 namespace {
 
@@ -1464,7 +1464,7 @@ void TabBar::Paint( const Rectangle& rect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void TabBar::Resize()
 {
     Size aNewSize = GetOutputSizePixel();
@@ -1557,7 +1557,7 @@ void TabBar::Resize()
     ImplEnableControls();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -1625,7 +1625,7 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt )
     Window::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::StateChanged( StateChangedType nType )
 {
@@ -1661,7 +1661,7 @@ void TabBar::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1677,7 +1677,7 @@ void TabBar::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplSelect()
 {
@@ -1686,28 +1686,28 @@ void TabBar::ImplSelect()
     CallEventListeners( VCLEVENT_TABBAR_PAGESELECTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::Select()
 {
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::DoubleClick()
 {
     maDoubleClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::Split()
 {
     maSplitHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ImplActivatePage()
 {
@@ -1716,14 +1716,14 @@ void TabBar::ImplActivatePage()
     CallEventListeners( VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId)) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::ActivatePage()
 {
     maActivatePageHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 long TabBar::ImplDeactivatePage()
 {
@@ -1810,7 +1810,7 @@ Rectangle TabBar::ImplGetInsertTabRect(ImplTabBarItem* pItem) const
     return Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 long TabBar::DeactivatePage()
 {
@@ -1820,7 +1820,7 @@ long TabBar::DeactivatePage()
         return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TabBar::StartRenaming()
 {
@@ -1830,7 +1830,7 @@ long TabBar::StartRenaming()
         return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TabBar::AllowRenaming()
 {
@@ -1840,21 +1840,21 @@ long TabBar::AllowRenaming()
         return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::EndRenaming()
 {
     maEndRenamingHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::Mirror()
 {
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::InsertPage( sal_uInt16 nPageId, const OUString& rText,
                          TabBarPageBits nBits, sal_uInt16 nPos )
@@ -1886,7 +1886,7 @@ void TabBar::InsertPage( sal_uInt16 nPageId, const OUString& rText,
     CallEventListeners( VCLEVENT_TABBAR_PAGEINSERTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId)) );
 }
 
-// -----------------------------------------------------------------------
+
 
 Color TabBar::GetTabBgColor( sal_uInt16 nPageId ) const
 {
@@ -1921,7 +1921,7 @@ void TabBar::SetTabBgColor( sal_uInt16 nPageId, const Color& aTabBgColor )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::RemovePage( sal_uInt16 nPageId )
 {
@@ -1951,7 +1951,7 @@ void TabBar::RemovePage( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::MovePage( sal_uInt16 nPageId, sal_uInt16 nNewPos )
 {
@@ -1988,7 +1988,7 @@ void TabBar::MovePage( sal_uInt16 nPageId, sal_uInt16 nNewPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::Clear()
 {
@@ -2011,7 +2011,7 @@ void TabBar::Clear()
     CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND)) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool TabBar::IsPageEnabled( sal_uInt16 nPageId ) const
 {
@@ -2023,7 +2023,7 @@ sal_Bool TabBar::IsPageEnabled( sal_uInt16 nPageId ) const
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetPageBits( sal_uInt16 nPageId, TabBarPageBits nBits )
 {
@@ -2044,7 +2044,7 @@ void TabBar::SetPageBits( sal_uInt16 nPageId, TabBarPageBits nBits )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TabBarPageBits TabBar::GetPageBits( sal_uInt16 nPageId ) const
 {
@@ -2056,21 +2056,21 @@ TabBarPageBits TabBar::GetPageBits( sal_uInt16 nPageId ) const
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::GetPageCount() const
 {
     return (sal_uInt16)mpItemList->size();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::GetPageId( sal_uInt16 nPos ) const
 {
     return ( nPos < mpItemList->size() ) ? (*mpItemList)[ nPos ]->mnId : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::GetPagePos( sal_uInt16 nPageId ) const
 {
@@ -2082,7 +2082,7 @@ sal_uInt16 TabBar::GetPagePos( sal_uInt16 nPageId ) const
     return PAGE_NOT_FOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::GetPageId( const Point& rPos, bool bCheckInsTab ) const
 {
@@ -2103,7 +2103,7 @@ sal_uInt16 TabBar::GetPageId( const Point& rPos, bool bCheckInsTab ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle TabBar::GetPageRect( sal_uInt16 nPageId ) const
 {
@@ -2115,7 +2115,7 @@ Rectangle TabBar::GetPageRect( sal_uInt16 nPageId ) const
         return Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetCurPageId( sal_uInt16 nPageId )
 {
@@ -2201,7 +2201,7 @@ void TabBar::SetCurPageId( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::MakeVisible( sal_uInt16 nPageId )
 {
@@ -2251,7 +2251,7 @@ void TabBar::MakeVisible( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetFirstPageId( sal_uInt16 nPageId )
 {
@@ -2285,7 +2285,7 @@ void TabBar::SetFirstPageId( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SelectPage( sal_uInt16 nPageId, sal_Bool bSelect )
 {
@@ -2306,7 +2306,7 @@ void TabBar::SelectPage( sal_uInt16 nPageId, sal_Bool bSelect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::GetSelectPageCount() const
 {
@@ -2321,7 +2321,7 @@ sal_uInt16 TabBar::GetSelectPageCount() const
     return nSelected;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool TabBar::IsPageSelected( sal_uInt16 nPageId ) const
 {
@@ -2332,7 +2332,7 @@ sal_Bool TabBar::IsPageSelected( sal_uInt16 nPageId ) const
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId )
 {
@@ -2399,7 +2399,7 @@ sal_Bool TabBar::StartEditMode( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::EndEditMode( sal_Bool bCancel )
 {
@@ -2442,7 +2442,7 @@ void TabBar::EndEditMode( sal_Bool bCancel )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetMirrored(bool bMirrored)
 {
@@ -2466,7 +2466,7 @@ bool TabBar::IsEffectiveRTL() const
     return IsMirrored() != Application::GetSettings().GetLayoutRTL();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetMaxPageWidth( long nMaxWidth )
 {
@@ -2481,7 +2481,7 @@ void TabBar::SetMaxPageWidth( long nMaxWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetPageText( sal_uInt16 nPageId, const OUString& rText )
 {
@@ -2499,7 +2499,7 @@ void TabBar::SetPageText( sal_uInt16 nPageId, const OUString& rText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString TabBar::GetPageText( sal_uInt16 nPageId ) const
 {
@@ -2509,7 +2509,7 @@ OUString TabBar::GetPageText( sal_uInt16 nPageId ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString TabBar::GetHelpText( sal_uInt16 nPageId ) const
 {
@@ -2529,7 +2529,7 @@ OUString TabBar::GetHelpText( sal_uInt16 nPageId ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 OString TabBar::GetHelpId( sal_uInt16 nPageId ) const
 {
@@ -2540,7 +2540,7 @@ OString TabBar::GetHelpId( sal_uInt16 nPageId ) const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
 {
@@ -2585,7 +2585,7 @@ sal_Bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabBar::ShowDropPos( const Point& rPos )
 {
@@ -2691,7 +2691,7 @@ sal_uInt16 TabBar::ShowDropPos( const Point& rPos )
     return mnDropPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::HideDropPos()
 {
@@ -2731,7 +2731,7 @@ void TabBar::HideDropPos()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool TabBar::SwitchPage( const Point& rPos )
 {
@@ -2771,7 +2771,7 @@ sal_Bool TabBar::SwitchPage( const Point& rPos )
     return bSwitch;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::EndSwitchPage()
 {
@@ -2779,7 +2779,7 @@ void TabBar::EndSwitchPage()
     mnSwitchId      = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabBar::SetStyle( WinBits nStyle )
 {
@@ -2790,7 +2790,7 @@ void TabBar::SetStyle( WinBits nStyle )
         Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size TabBar::CalcWindowSizePixel() const
 {
@@ -2809,20 +2809,20 @@ Size TabBar::CalcWindowSizePixel() const
 
     return Size( nWidth, GetSettings().GetStyleSettings().GetScrollBarSize() );
 }
-// -----------------------------------------------------------------------
+
 
 Rectangle TabBar::GetPageArea() const
 {
     return Rectangle( Point( mnOffX, mnOffY ), Size( mnLastOffX-mnOffX+1, GetSizePixel().Height()-mnOffY ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > TabBar::CreateAccessible()
 {
     return mpImpl->maAccessibleFactory.getFactory().createAccessibleTabBar( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index a6965112c8e8..270bff895259 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::accessibility;
 
 namespace svtools {
 
-// --------------------------------------------------------------------
+
 
 static Window* GetTopMostParentSystemWindow( Window* pWindow )
 {
@@ -64,7 +64,7 @@ static Window* GetTopMostParentSystemWindow( Window* pWindow )
     return NULL;
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits )
 {
@@ -79,7 +79,7 @@ void ToolbarMenuEntry::init( int nEntryId, MenuItemBits nBits )
     mpControl = NULL;
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUString& rText, MenuItemBits nBits )
 : mrMenu( rMenu )
@@ -90,7 +90,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const OUSt
     mbHasText = true;
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Image& rImage, const OUString& rText, MenuItemBits nBits )
 : mrMenu( rMenu )
@@ -104,7 +104,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, const Imag
     mbHasImage = true;
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* pControl, MenuItemBits nBits )
 : mrMenu( rMenu )
@@ -118,7 +118,7 @@ ToolbarMenuEntry::ToolbarMenuEntry( ToolbarMenu& rMenu, int nEntryId, Control* p
     }
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry::~ToolbarMenuEntry()
 {
@@ -132,7 +132,7 @@ ToolbarMenuEntry::~ToolbarMenuEntry()
     delete mpControl;
 }
 
-// --------------------------------------------------------------------
+
 
 const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCreate /* = false */ )
 {
@@ -151,7 +151,7 @@ const Reference< XAccessibleContext >& ToolbarMenuEntry::GetAccessible( bool bCr
     return mxAccContext;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -166,7 +166,7 @@ sal_Int32 ToolbarMenuEntry::getAccessibleChildCount() throw (RuntimeException)
     return 1;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -188,7 +188,7 @@ Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index )
     throw IndexOutOfBoundsException();
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
 : mrMenu( rMenu )
@@ -202,14 +202,14 @@ ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::
 {
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenu_Impl::~ToolbarMenu_Impl()
 {
     setAccessible( 0 );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible )
 {
@@ -222,7 +222,7 @@ void ToolbarMenu_Impl::setAccessible( ToolbarMenuAcc* pAccessible )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue )
 {
@@ -230,14 +230,14 @@ void ToolbarMenu_Impl::fireAccessibleEvent( short nEventId, const ::com::sun::st
         mxAccessible->FireAccessibleEvent( nEventId, rOldValue, rNewValue );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolbarMenu_Impl::hasAccessibleListeners()
 {
     return( mxAccessible.is() && mxAccessible->HasAccessibleListeners() );
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -262,7 +262,7 @@ sal_Int32 ToolbarMenu_Impl::getAccessibleChildCount() throw (RuntimeException)
     return nCount;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -284,7 +284,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( sal_Int32 index )
     throw IndexOutOfBoundsException();
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl, sal_Int32 childIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -301,7 +301,7 @@ Reference< XAccessible > ToolbarMenu_Impl::getAccessibleChild( Control* pControl
     throw IndexOutOfBoundsException();
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -332,7 +332,7 @@ void ToolbarMenu_Impl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (Ind
     throw IndexOutOfBoundsException();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -366,7 +366,7 @@ sal_Bool ToolbarMenu_Impl::isAccessibleChildSelected( sal_Int32 nChildIndex ) th
     throw IndexOutOfBoundsException();
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu_Impl::clearAccessibleSelection()
 {
@@ -378,7 +378,7 @@ void ToolbarMenu_Impl::clearAccessibleSelection()
 }
 
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu_Impl::notifyHighlightedEntry()
 {
@@ -415,7 +415,7 @@ void ToolbarMenu_Impl::notifyHighlightedEntry()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const
 {
@@ -426,7 +426,7 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const
 }
 
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK( ToolbarMenu, HighlightHdl, Control *, pControl )
 {
@@ -443,7 +443,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind
     implInit(rFrame);
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWindow, const ResId& rResId )
 : DockingWindow(pParentWindow, rResId)
@@ -451,7 +451,7 @@ ToolbarMenu::ToolbarMenu( const Reference< XFrame >& rFrame, Window* pParentWind
     implInit(rFrame);
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::implInit(const Reference< XFrame >& rFrame)
 {
@@ -467,7 +467,7 @@ void ToolbarMenu::implInit(const Reference< XFrame >& rFrame)
         ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenu::~ToolbarMenu()
 {
@@ -492,7 +492,7 @@ ToolbarMenu::~ToolbarMenu()
     delete mpImpl;
 }
 
-// --------------------------------------------------------------------
+
 
 int ToolbarMenu::getSelectedEntryId() const
 {
@@ -500,7 +500,7 @@ int ToolbarMenu::getSelectedEntryId() const
     return pEntry ? pEntry->mnEntryId : -1;
 }
 
-// --------------------------------------------------------------------
+
 
 int ToolbarMenu::getHighlightedEntryId() const
 {
@@ -508,7 +508,7 @@ int ToolbarMenu::getHighlightedEntryId() const
     return pEntry ? pEntry->mnEntryId : -1;
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::checkEntry( int nEntryId, bool bChecked )
 {
@@ -520,7 +520,7 @@ void ToolbarMenu::checkEntry( int nEntryId, bool bChecked )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::enableEntry( int nEntryId, bool bEnable )
 {
@@ -539,7 +539,7 @@ void ToolbarMenu::enableEntry( int nEntryId, bool bEnable )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr )
 {
@@ -553,7 +553,7 @@ void ToolbarMenu::setEntryText( int nEntryId, const OUString& rStr )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage )
 {
@@ -567,7 +567,7 @@ void ToolbarMenu::setEntryImage( int nEntryId, const Image& rImage )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::initWindow()
 {
@@ -582,7 +582,7 @@ void ToolbarMenu::initWindow()
     mpImpl->maSize = implCalcSize();
 }
 
-// --------------------------------------------------------------------
+
 
 static long ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth )
 {
@@ -765,14 +765,14 @@ Size ToolbarMenu::implCalcSize()
     return aSz;
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::highlightFirstEntry()
 {
     implChangeHighlightEntry( 0 );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::GetFocus()
 {
@@ -782,7 +782,7 @@ void ToolbarMenu::GetFocus()
     DockingWindow::GetFocus();
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::LoseFocus()
 {
@@ -792,28 +792,28 @@ void ToolbarMenu::LoseFocus()
     DockingWindow::LoseFocus();
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, MenuItemBits nItemBits )
 {
     appendEntry( new ToolbarMenuEntry( *this, nEntryId, rStr, nItemBits ) );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::appendEntry( int nEntryId, const OUString& rStr, const Image& rImage, MenuItemBits nItemBits )
 {
     appendEntry( new ToolbarMenuEntry( *this, nEntryId, rImage, rStr, nItemBits ) );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::appendEntry( int nEntryId, Control* pControl, MenuItemBits nItemBits )
 {
     appendEntry( new ToolbarMenuEntry( *this, nEntryId, pControl, nItemBits ) );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry )
 {
@@ -823,14 +823,14 @@ void ToolbarMenu::appendEntry( ToolbarMenuEntry* pEntry )
         Invalidate();
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::appendSeparator()
 {
     appendEntry( 0 );
 }
 
-// --------------------------------------------------------------------
+
 
 /** creates an empty ValueSet that is initialized and can be inserted with appendEntry. */
 ValueSet* ToolbarMenu::createEmptyValueSetControl()
@@ -842,14 +842,14 @@ ValueSet* ToolbarMenu::createEmptyValueSetControl()
     return pSet;
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry* ToolbarMenu::implGetEntry( int nEntry ) const
 {
     return mpImpl->implGetEntry( nEntry );
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const
 {
@@ -867,7 +867,7 @@ ToolbarMenuEntry* ToolbarMenu::implSearchEntry( int nEntryId ) const
     return NULL;
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight )
 {
@@ -962,7 +962,7 @@ void ToolbarMenu::implHighlightEntry( int nHighlightEntry, bool bHighlight )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::implSelectEntry( int nSelectedEntry )
 {
@@ -976,7 +976,7 @@ void ToolbarMenu::implSelectEntry( int nSelectedEntry )
         mpImpl->maSelectHdl.Call( this );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -985,13 +985,13 @@ void ToolbarMenu::MouseButtonDown( const MouseEvent& rMEvt )
     implSelectEntry( mpImpl->mnHighlightedEntry );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::MouseButtonUp( const MouseEvent& )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::MouseMove( const MouseEvent& rMEvt )
 {
@@ -1001,7 +1001,7 @@ void ToolbarMenu::MouseMove( const MouseEvent& rMEvt )
     implHighlightEntry( rMEvt, false );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool /*bMBDown*/ )
 {
@@ -1048,7 +1048,7 @@ void ToolbarMenu::implHighlightEntry( const MouseEvent& rMEvt, bool /*bMBDown*/
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::implChangeHighlightEntry( int nEntry )
 {
@@ -1068,7 +1068,7 @@ void ToolbarMenu::implChangeHighlightEntry( int nEntry )
     mpImpl->notifyHighlightedEntry();
 }
 
-// --------------------------------------------------------------------
+
 
 static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLastColumn )
 {
@@ -1098,7 +1098,7 @@ static bool implCheckSubControlCursorMove( Control* pControl, bool bUp, int& nLa
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd )
 {
@@ -1176,7 +1176,7 @@ ToolbarMenuEntry* ToolbarMenu::implCursorUpDown( bool bUp, bool bHomeEnd )
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl )
 {
@@ -1209,7 +1209,7 @@ void ToolbarMenu_Impl::implHighlightControl( sal_uInt16 nCode, Control* pControl
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::KeyInput( const KeyEvent& rKEvent )
 {
@@ -1288,7 +1288,7 @@ void ToolbarMenu::KeyInput( const KeyEvent& rKEvent )
 
 }
 
-// --------------------------------------------------------------------
+
 static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRect, bool i_bHighlight )
 {
     sal_Bool bNativeOk = sal_False;
@@ -1493,7 +1493,7 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::Paint( const Rectangle& )
 {
@@ -1505,14 +1505,14 @@ void ToolbarMenu::Paint( const Rectangle& )
         implHighlightEntry( mpImpl->mnHighlightedEntry, true );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::RequestHelp( const HelpEvent& rHEvt )
 {
     DockingWindow::RequestHelp( rHEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::StateChanged( StateChangedType nType )
 {
@@ -1525,7 +1525,7 @@ void ToolbarMenu::StateChanged( StateChangedType nType )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1541,7 +1541,7 @@ void ToolbarMenu::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::Command( const CommandEvent& rCEvt )
 {
@@ -1555,7 +1555,7 @@ void ToolbarMenu::Command( const CommandEvent& rCEvt )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAccessible()
 {
@@ -1563,7 +1563,7 @@ Reference< ::com::sun::star::accessibility::XAccessible > ToolbarMenu::CreateAcc
     return Reference< XAccessible >( mpImpl->mxAccessible.get() );
 }
 
-// --------------------------------------------------------------------
+
 
 // todo: move to new base class that will replace SfxPopupWindo
 void ToolbarMenu::AddStatusListener( const OUString& rCommandURL )
@@ -1572,14 +1572,14 @@ void ToolbarMenu::AddStatusListener( const OUString& rCommandURL )
     mpImpl->mxStatusListener->addStatusListener( rCommandURL );
 }
 
-// --------------------------------------------------------------------
+
 
 // XStatusListener (subclasses must override this one to get the status updates
 void SAL_CALL ToolbarMenu::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& /*Event*/ ) throw ( ::com::sun::star::uno::RuntimeException )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 class ToolbarMenuStatusListener : public svt::FrameStatusListener
 {
@@ -1593,7 +1593,7 @@ public:
     ToolbarMenu* mpMenu;
 };
 
-// --------------------------------------------------------------------
+
 
 ToolbarMenuStatusListener::ToolbarMenuStatusListener(
     const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
@@ -1603,7 +1603,7 @@ ToolbarMenuStatusListener::ToolbarMenuStatusListener(
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuStatusListener::dispose() throw (::com::sun::star::uno::RuntimeException)
 {
@@ -1611,7 +1611,7 @@ void SAL_CALL ToolbarMenuStatusListener::dispose() throw (::com::sun::star::uno:
     svt::FrameStatusListener::dispose();
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuStatusListener::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
@@ -1619,7 +1619,7 @@ void SAL_CALL ToolbarMenuStatusListener::statusChanged( const ::com::sun::star::
         mpMenu->statusChanged( Event );
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::initStatusListener()
 {
@@ -1627,35 +1627,35 @@ void ToolbarMenu::initStatusListener()
         mpImpl->mxStatusListener.set( new ToolbarMenuStatusListener( mpImpl->mxFrame, *this ) );
 }
 
-// --------------------------------------------------------------------
+
 
 bool ToolbarMenu::IsInPopupMode()
 {
     return GetDockingManager()->IsInPopupMode(this);
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::EndPopupMode()
 {
     GetDockingManager()->EndPopupMode(this);
 }
 
-// --------------------------------------------------------------------
+
 
 const Size& ToolbarMenu::getMenuSize() const
 {
     return mpImpl->maSize;
 }
 
-// --------------------------------------------------------------------
+
 
 void ToolbarMenu::SetSelectHdl( const Link& rLink )
 {
     mpImpl->maSelectHdl = rLink;
 }
 
-// --------------------------------------------------------------------
+
 
 }
 
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index 0a9036614c27..398d38aaa086 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -39,9 +39,9 @@ using namespace ::com::sun::star::accessibility;
 
 namespace svtools {
 
-// ------------------
+
 // - ToolbarMenuAcc -
-// ------------------
+
 
 ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent )
 : ToolbarMenuAccComponentBase(m_aMutex)
@@ -51,7 +51,7 @@ ToolbarMenuAcc::ToolbarMenuAcc( ToolbarMenu_Impl& rParent )
     mpParent->mrMenu.AddEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ToolbarMenuAcc::~ToolbarMenuAcc()
 {
@@ -59,7 +59,7 @@ ToolbarMenuAcc::~ToolbarMenuAcc()
         mpParent->mrMenu.RemoveEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclSimpleEvent*, pEvent )
 {
@@ -80,7 +80,7 @@ IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclSimpleEvent*, pEvent )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -117,7 +117,7 @@ void ToolbarMenuAcc::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue, const Any& rNewValue )
 {
@@ -145,7 +145,7 @@ void ToolbarMenuAcc::FireAccessibleEvent( short nEventId, const Any& rOldValue,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext() throw (RuntimeException)
 {
@@ -153,7 +153,7 @@ Reference< XAccessibleContext > SAL_CALL ToolbarMenuAcc::getAccessibleContext()
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -163,7 +163,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleChildCount() throw (RuntimeExcep
     return mpParent->getAccessibleChildCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -173,7 +173,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleChild( sal_Int32
     return mpParent->getAccessibleChild(i);
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (RuntimeException)
 {
@@ -189,7 +189,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleParent() throw (R
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeException)
 {
@@ -209,7 +209,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getAccessibleIndexInParent() throw (RuntimeEx
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException)
 {
@@ -217,7 +217,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole() throw (RuntimeException)
     return AccessibleRole::LIST;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeException)
 {
@@ -225,7 +225,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription() throw (RuntimeExcep
     return OUString( "ToolbarMenu" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException)
 {
@@ -246,7 +246,7 @@ OUString SAL_CALL ToolbarMenuAcc::getAccessibleName() throw (RuntimeException)
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelationSet() throw (RuntimeException)
 {
@@ -254,7 +254,7 @@ Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuAcc::getAccessibleRelati
     return Reference< XAccessibleRelationSet >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet() throw (RuntimeException)
 {
@@ -274,7 +274,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuAcc::getAccessibleStateSet(
     return pStateSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -295,7 +295,7 @@ Locale SAL_CALL ToolbarMenuAcc::getLocale() throw (IllegalAccessibleComponentSta
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -320,7 +320,7 @@ void SAL_CALL ToolbarMenuAcc::addAccessibleEventListener( const Reference< XAcce
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -335,7 +335,7 @@ void SAL_CALL ToolbarMenuAcc::removeAccessibleEventListener( const Reference< XA
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -347,7 +347,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::containsPoint( const awt::Point& aPoint ) thro
     return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -379,7 +379,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getAccessibleAtPoint( const aw
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException)
 {
@@ -397,7 +397,7 @@ awt::Rectangle SAL_CALL ToolbarMenuAcc::getBounds() throw (RuntimeException)
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException)
 {
@@ -407,7 +407,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocation() throw (RuntimeException)
     return awt::Point( aOutPos.X(), aOutPos.Y() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()  throw (RuntimeException)
 {
@@ -417,7 +417,7 @@ awt::Point SAL_CALL ToolbarMenuAcc::getLocationOnScreen()  throw (RuntimeExcepti
     return awt::Point( aScreenPos.X(), aScreenPos.Y() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException)
 {
@@ -427,7 +427,7 @@ awt::Size SAL_CALL ToolbarMenuAcc::getSize() throw (RuntimeException)
     return awt::Size( aOutSize.Width(), aOutSize.Height() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException)
 {
@@ -436,7 +436,7 @@ void SAL_CALL ToolbarMenuAcc::grabFocus() throw (RuntimeException)
     mpParent->mrMenu.GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL ToolbarMenuAcc::getAccessibleKeyBinding() throw (RuntimeException)
 {
@@ -444,7 +444,7 @@ Any SAL_CALL ToolbarMenuAcc::getAccessibleKeyBinding() throw (RuntimeException)
     return Any();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException)
 {
@@ -453,7 +453,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getForeground() throw (RuntimeException)
     return static_cast<sal_Int32>(nColor);
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException)
 {
@@ -462,7 +462,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getBackground() throw (RuntimeException)
     return static_cast<sal_Int32>(nColor);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -472,7 +472,7 @@ void SAL_CALL ToolbarMenuAcc::selectAccessibleChild( sal_Int32 nChildIndex ) thr
     mpParent->selectAccessibleChild( nChildIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -481,7 +481,7 @@ sal_Bool SAL_CALL ToolbarMenuAcc::isAccessibleChildSelected( sal_Int32 nChildInd
     return mpParent->isAccessibleChildSelected( nChildIndex );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException)
 {
@@ -490,7 +490,7 @@ void SAL_CALL ToolbarMenuAcc::clearAccessibleSelection() throw (RuntimeException
     mpParent->clearAccessibleSelection();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeException)
 {
@@ -498,7 +498,7 @@ void SAL_CALL ToolbarMenuAcc::selectAllAccessibleChildren() throw (RuntimeExcept
     // unsupported due to single selection only
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (RuntimeException)
 {
@@ -508,7 +508,7 @@ sal_Int32 SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChildCount() throw (Runt
     return mpParent->mnHighlightedEntry != -1 ? 1 : 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -533,7 +533,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuAcc::getSelectedAccessibleChild( sa
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -545,7 +545,7 @@ void SAL_CALL ToolbarMenuAcc::deselectAccessibleChild( sal_Int32 nChildIndex ) t
         mpParent->clearAccessibleSelection();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuAcc::disposing (void)
 {
@@ -589,9 +589,9 @@ void ToolbarMenuAcc::ThrowIfDisposed (void) throw (DisposedException)
     }
 }
 
-// -----------------------
+
 // - ToolbarMenuEntryAcc -
-// -----------------------
+
 
 ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent )
 : ToolbarMenuEntryAccBase( m_aMutex )
@@ -599,13 +599,13 @@ ToolbarMenuEntryAcc::ToolbarMenuEntryAcc( ToolbarMenuEntry* pParent )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ToolbarMenuEntryAcc::~ToolbarMenuEntryAcc()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuEntryAcc::disposing (void)
 {
@@ -640,28 +640,28 @@ void SAL_CALL ToolbarMenuEntryAcc::disposing (void)
         ++aListenerIterator;
     }
 }
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > SAL_CALL ToolbarMenuEntryAcc::getAccessibleContext() throw (RuntimeException)
 {
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleChildCount() throw (RuntimeException)
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() throw (RuntimeException)
 {
@@ -674,7 +674,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleParent() thr
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (RuntimeException)
 {
@@ -706,21 +706,21 @@ sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getAccessibleIndexInParent() throw (Runt
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ToolbarMenuEntryAcc::getAccessibleRole() throw (RuntimeException)
 {
     return AccessibleRole::LIST_ITEM;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleDescription() throw (RuntimeException)
 {
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeException)
 {
@@ -741,14 +741,14 @@ OUString SAL_CALL ToolbarMenuEntryAcc::getAccessibleName() throw (RuntimeExcepti
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleRelationSet() throw (RuntimeException)
 {
     return Reference< XAccessibleRelationSet >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStateSet() throw (RuntimeException)
 {
@@ -775,7 +775,7 @@ Reference< XAccessibleStateSet > SAL_CALL ToolbarMenuEntryAcc::getAccessibleStat
     return pStateSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -794,7 +794,7 @@ Locale SAL_CALL ToolbarMenuEntryAcc::getLocale() throw (IllegalAccessibleCompone
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -813,7 +813,7 @@ void SAL_CALL ToolbarMenuEntryAcc::addAccessibleEventListener( const Reference<
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& rxListener ) throw (RuntimeException)
 {
@@ -827,7 +827,7 @@ void SAL_CALL ToolbarMenuEntryAcc::removeAccessibleEventListener( const Referenc
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint ) throw (RuntimeException)
 {
@@ -838,7 +838,7 @@ sal_Bool SAL_CALL ToolbarMenuEntryAcc::containsPoint( const awt::Point& aPoint )
     return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
@@ -846,7 +846,7 @@ Reference< XAccessible > SAL_CALL ToolbarMenuEntryAcc::getAccessibleAtPoint( con
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException)
 {
@@ -870,7 +870,7 @@ awt::Rectangle SAL_CALL ToolbarMenuEntryAcc::getBounds() throw (RuntimeException
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException)
 {
@@ -878,7 +878,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocation() throw (RuntimeException)
     return awt::Point( aRect.X, aRect.Y );
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeException)
 {
@@ -896,7 +896,7 @@ awt::Point SAL_CALL ToolbarMenuEntryAcc::getLocationOnScreen() throw (RuntimeExc
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException)
 {
@@ -909,28 +909,28 @@ awt::Size SAL_CALL ToolbarMenuEntryAcc::getSize() throw (RuntimeException)
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ToolbarMenuEntryAcc::grabFocus() throw (RuntimeException)
 {
     // nothing to do
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL ToolbarMenuEntryAcc::getAccessibleKeyBinding() throw (RuntimeException)
 {
     return Any();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getForeground(  ) throw (RuntimeException)
 {
     return static_cast<sal_Int32>(Application::GetSettings().GetStyleSettings().GetMenuTextColor().GetColor());
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ToolbarMenuEntryAcc::getBackground(  )  throw (RuntimeException)
 {
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index d526a68e2e1a..ab11ade6263e 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -30,7 +30,7 @@ namespace svt
     //=====================================================================
     //= OFileURLControl
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OFileURLControl::OFileURLControl(Window* _pParent, const ResId& _rId)
         : SvtURLBox(_pParent, _rId, INET_PROT_FILE)
     {
@@ -52,7 +52,7 @@ namespace svt
         return pListBox;
     }
 
-    //---------------------------------------------------------------------
+
     bool OFileURLControl::PreNotify( NotifyEvent& _rNEvt )
     {
         if (GetSubEdit() == _rNEvt.GetWindow())
@@ -64,7 +64,7 @@ namespace svt
         return SvtURLBox::PreNotify(_rNEvt);
     }
 
-    //---------------------------------------------------------------------
+
     bool OFileURLControl::Notify( NotifyEvent& _rNEvt )
     {
         if (GetSubEdit() == _rNEvt.GetWindow())
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 098ee4b58fb6..fdcdec9f9cd2 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -31,9 +31,9 @@
 
 using namespace ::com::sun::star;
 
-// ----------------
+
 // - ValueSetItem -
-// ----------------
+
 
 ValueSetItem::ValueSetItem( ValueSet& rParent )
     : mrParent(rParent)
@@ -46,7 +46,7 @@ ValueSetItem::ValueSetItem( ValueSet& rParent )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ValueSetItem::~ValueSetItem()
 {
@@ -57,7 +57,7 @@ ValueSetItem::~ValueSetItem()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled )
 {
@@ -67,9 +67,9 @@ uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool b
     return *mpxAcc;
 }
 
-// ---------------
+
 // - ValueSetAcc -
-// ---------------
+
 
 ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled ) :
     ValueSetAccComponentBase (m_aMutex),
@@ -79,13 +79,13 @@ ValueSetAcc::ValueSetAcc( ValueSet* pParent, bool bIsTransientChildrenDisabled )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ValueSetAcc::~ValueSetAcc()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSetAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue )
 {
@@ -123,7 +123,7 @@ const uno::Sequence< sal_Int8 >& ValueSetAcc::getUnoTunnelId()
     return theValueSetAccUnoTunnelId::get().getSeq();
 }
 
-// -----------------------------------------------------------------------------
+
 
 ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData )
     throw()
@@ -140,7 +140,7 @@ ValueSetAcc* ValueSetAcc::getImplementation( const uno::Reference< uno::XInterfa
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void ValueSetAcc::GetFocus (void)
 {
@@ -154,7 +154,7 @@ void ValueSetAcc::GetFocus (void)
         aOldState, aNewState);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ValueSetAcc::LoseFocus (void)
 {
@@ -168,7 +168,7 @@ void ValueSetAcc::LoseFocus (void)
         aOldState, aNewState);
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAccessibleContext()
     throw (uno::RuntimeException)
@@ -177,7 +177,7 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueSetAcc::getAcc
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
     throw (uno::RuntimeException)
@@ -191,7 +191,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleChildCount()
     return nCount;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleChild( sal_Int32 i )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -209,7 +209,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleParent()
     throw (uno::RuntimeException)
@@ -225,7 +225,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
@@ -252,7 +252,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getAccessibleIndexInParent()
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
     throw (uno::RuntimeException)
@@ -265,7 +265,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
             : accessibility::AccessibleRole::LIST );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
     throw (uno::RuntimeException)
@@ -277,7 +277,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ValueSetAcc::getAccessibleName()
     throw (uno::RuntimeException)
@@ -304,7 +304,7 @@ OUString SAL_CALL ValueSetAcc::getAccessibleName()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::getAccessibleRelationSet()
     throw (uno::RuntimeException)
@@ -337,7 +337,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueSetAcc::ge
     return xRelSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAccessibleStateSet()
     throw (uno::RuntimeException)
@@ -359,7 +359,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueSetAcc::getAc
     return pStateSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 lang::Locale SAL_CALL ValueSetAcc::getLocale()
     throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
@@ -381,7 +381,7 @@ lang::Locale SAL_CALL ValueSetAcc::getLocale()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -407,7 +407,7 @@ void SAL_CALL ValueSetAcc::addAccessibleEventListener( const uno::Reference< acc
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -425,7 +425,7 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( const uno::Reference<
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint )
     throw (uno::RuntimeException)
@@ -438,7 +438,7 @@ sal_Bool SAL_CALL ValueSetAcc::containsPoint( const awt::Point& aPoint )
     return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessibleAtPoint( const awt::Point& aPoint )
     throw (uno::RuntimeException)
@@ -462,7 +462,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getAccessible
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
     throw (uno::RuntimeException)
@@ -481,7 +481,7 @@ awt::Rectangle SAL_CALL ValueSetAcc::getBounds()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ValueSetAcc::getLocation()
     throw (uno::RuntimeException)
@@ -496,7 +496,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocation()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
     throw (uno::RuntimeException)
@@ -512,7 +512,7 @@ awt::Point SAL_CALL ValueSetAcc::getLocationOnScreen()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Size SAL_CALL ValueSetAcc::getSize()
     throw (uno::RuntimeException)
@@ -527,7 +527,7 @@ awt::Size SAL_CALL ValueSetAcc::getSize()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::grabFocus()
     throw (uno::RuntimeException)
@@ -537,7 +537,7 @@ void SAL_CALL ValueSetAcc::grabFocus()
     mpParent->GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding()
     throw (uno::RuntimeException)
@@ -546,7 +546,7 @@ uno::Any SAL_CALL ValueSetAcc::getAccessibleKeyBinding()
     return uno::Any();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueSetAcc::getForeground(  )
     throw (uno::RuntimeException)
@@ -556,7 +556,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getForeground(  )
     return static_cast<sal_Int32>(nColor);
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueSetAcc::getBackground(  )
     throw (uno::RuntimeException)
@@ -566,7 +566,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getBackground(  )
     return static_cast<sal_Int32>(nColor);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -584,7 +584,7 @@ void SAL_CALL ValueSetAcc::selectAccessibleChild( sal_Int32 nChildIndex )
         throw lang::IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -602,7 +602,7 @@ sal_Bool SAL_CALL ValueSetAcc::isAccessibleChildSelected( sal_Int32 nChildIndex
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::clearAccessibleSelection()
     throw (uno::RuntimeException)
@@ -612,7 +612,7 @@ void SAL_CALL ValueSetAcc::clearAccessibleSelection()
     mpParent->SetNoSelection();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::selectAllAccessibleChildren()
     throw (uno::RuntimeException)
@@ -621,7 +621,7 @@ void SAL_CALL ValueSetAcc::selectAllAccessibleChildren()
     // unsupported due to single selection only
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
     throw (uno::RuntimeException)
@@ -641,7 +641,7 @@ sal_Int32 SAL_CALL ValueSetAcc::getSelectedAccessibleChildCount()
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -661,7 +661,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueSetAcc::getSelectedAc
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -674,7 +674,7 @@ void SAL_CALL ValueSetAcc::deselectAccessibleChild( sal_Int32 nChildIndex )
         mpParent->SetNoSelection();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL ValueSetAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
 {
@@ -787,9 +787,9 @@ bool ValueSetAcc::HasNoneField (void) const
 
 
 
-// ----------------
+
 // - ValueItemAcc -
-// ----------------
+
 
 ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool bIsTransientChildrenDisabled ) :
     mpParent( pParent ),
@@ -797,13 +797,13 @@ ValueItemAcc::ValueItemAcc( ValueSetItem* pParent, bool bIsTransientChildrenDisa
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ValueItemAcc::~ValueItemAcc()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValue, const uno::Any& rNewValue )
 {
@@ -825,7 +825,7 @@ void ValueItemAcc::FireAccessibleEvent( short nEventId, const uno::Any& rOldValu
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ValueItemAcc::ParentDestroyed()
 {
@@ -843,7 +843,7 @@ const uno::Sequence< sal_Int8 >& ValueItemAcc::getUnoTunnelId()
     return theValueItemAccUnoTunnelId::get().getSeq();
 }
 
-// -----------------------------------------------------------------------------
+
 
 ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInterface >& rxData )
     throw()
@@ -859,7 +859,7 @@ ValueItemAcc* ValueItemAcc::getImplementation( const uno::Reference< uno::XInter
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAccessibleContext()
     throw (uno::RuntimeException)
@@ -867,7 +867,7 @@ uno::Reference< accessibility::XAccessibleContext > SAL_CALL ValueItemAcc::getAc
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount()
     throw (uno::RuntimeException)
@@ -875,7 +875,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleChildCount()
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleChild( sal_Int32 )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -883,7 +883,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
     throw lang::IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleParent()
     throw (uno::RuntimeException)
@@ -897,7 +897,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
     throw (uno::RuntimeException)
@@ -948,7 +948,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getAccessibleIndexInParent()
     return nIndexInParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole()
     throw (uno::RuntimeException)
@@ -956,7 +956,7 @@ sal_Int16 SAL_CALL ValueItemAcc::getAccessibleRole()
     return accessibility::AccessibleRole::LIST_ITEM;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ValueItemAcc::getAccessibleDescription()
     throw (uno::RuntimeException)
@@ -964,7 +964,7 @@ OUString SAL_CALL ValueItemAcc::getAccessibleDescription()
     return OUString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL ValueItemAcc::getAccessibleName()
     throw (uno::RuntimeException)
@@ -987,7 +987,7 @@ OUString SAL_CALL ValueItemAcc::getAccessibleName()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::getAccessibleRelationSet()
     throw (uno::RuntimeException)
@@ -995,7 +995,7 @@ uno::Reference< accessibility::XAccessibleRelationSet > SAL_CALL ValueItemAcc::g
     return uno::Reference< accessibility::XAccessibleRelationSet >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getAccessibleStateSet()
     throw (uno::RuntimeException)
@@ -1027,7 +1027,7 @@ uno::Reference< accessibility::XAccessibleStateSet > SAL_CALL ValueItemAcc::getA
     return pStateSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 lang::Locale SAL_CALL ValueItemAcc::getLocale()
     throw (accessibility::IllegalAccessibleComponentStateException, uno::RuntimeException)
@@ -1048,7 +1048,7 @@ lang::Locale SAL_CALL ValueItemAcc::getLocale()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -1073,7 +1073,7 @@ void SAL_CALL ValueItemAcc::addAccessibleEventListener( const uno::Reference< ac
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference< accessibility::XAccessibleEventListener >& rxListener )
     throw (uno::RuntimeException)
@@ -1090,7 +1090,7 @@ void SAL_CALL ValueItemAcc::removeAccessibleEventListener( const uno::Reference<
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint )
     throw (uno::RuntimeException)
@@ -1102,7 +1102,7 @@ sal_Bool SAL_CALL ValueItemAcc::containsPoint( const awt::Point& aPoint )
     return Rectangle( aNullPoint, aSize ).IsInside( aTestPoint );
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibleAtPoint( const awt::Point& )
     throw (uno::RuntimeException)
@@ -1111,7 +1111,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL ValueItemAcc::getAccessibl
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL ValueItemAcc::getBounds()
     throw (uno::RuntimeException)
@@ -1136,7 +1136,7 @@ awt::Rectangle SAL_CALL ValueItemAcc::getBounds()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ValueItemAcc::getLocation()
     throw (uno::RuntimeException)
@@ -1150,7 +1150,7 @@ awt::Point SAL_CALL ValueItemAcc::getLocation()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen()
     throw (uno::RuntimeException)
@@ -1170,7 +1170,7 @@ awt::Point SAL_CALL ValueItemAcc::getLocationOnScreen()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 awt::Size SAL_CALL ValueItemAcc::getSize()
     throw (uno::RuntimeException)
@@ -1184,7 +1184,7 @@ awt::Size SAL_CALL ValueItemAcc::getSize()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL ValueItemAcc::grabFocus()
     throw (uno::RuntimeException)
@@ -1192,7 +1192,7 @@ void SAL_CALL ValueItemAcc::grabFocus()
     // nothing to do
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL ValueItemAcc::getAccessibleKeyBinding()
     throw (uno::RuntimeException)
@@ -1200,7 +1200,7 @@ uno::Any SAL_CALL ValueItemAcc::getAccessibleKeyBinding()
     return uno::Any();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueItemAcc::getForeground(  )
     throw (uno::RuntimeException)
@@ -1209,7 +1209,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getForeground(  )
     return static_cast<sal_Int32>(nColor);
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL ValueItemAcc::getBackground(  )
     throw (uno::RuntimeException)
@@ -1222,7 +1222,7 @@ sal_Int32 SAL_CALL ValueItemAcc::getBackground(  )
     return static_cast<sal_Int32>(nColor);
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL ValueItemAcc::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw( uno::RuntimeException )
 {
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index c661b268189e..dde15796c616 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -50,9 +50,9 @@ enum {
 
 }
 
-// ------------
+
 // - ValueSet -
-// ------------
+
 
 void ValueSet::ImplInit()
 {
@@ -92,7 +92,7 @@ void ValueSet::ImplInit()
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 ValueSet::ValueSet( Window* pParent, WinBits nWinStyle, bool bDisableTransientChildren ) :
     Control( pParent, nWinStyle ),
@@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeValueSet(Window *pParent, V
     return new ValueSet(pParent, nWinBits);
 }
 
-// -----------------------------------------------------------------------
+
 
 ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransientChildren ) :
     Control( pParent, rResId ),
@@ -125,7 +125,7 @@ ValueSet::ValueSet( Window* pParent, const ResId& rResId, bool bDisableTransient
     mbIsTransientChildrenDisabled = bDisableTransientChildren;
 }
 
-// -----------------------------------------------------------------------
+
 
 ValueSet::~ValueSet()
 {
@@ -140,7 +140,7 @@ ValueSet::~ValueSet()
     ImplDeleteItems();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplDeleteItems()
 {
@@ -163,7 +163,7 @@ void ValueSet::ImplDeleteItems()
     mItemList.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 {
@@ -204,7 +204,7 @@ void ValueSet::ImplInitSettings( bool bFont, bool bForeground, bool bBackground
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplInitScrollBar()
 {
@@ -224,7 +224,7 @@ void ValueSet::ImplInitScrollBar()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplFormatItem( ValueSetItem* pItem, Rectangle aRect )
 {
@@ -352,14 +352,14 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem, Rectangle aRect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ValueSet::CreateAccessible()
 {
     return new ValueSetAcc( this, mbIsTransientChildrenDisabled );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Format()
 {
@@ -688,7 +688,7 @@ void ValueSet::Format()
     delete pDelScrBar;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplDrawItemText(const OUString& rText)
 {
@@ -716,7 +716,7 @@ void ValueSet::ImplDrawItemText(const OUString& rText)
     DrawText( Point( (aWinSize.Width()-nTxtWidth) / 2, nTxtOffset+(NAME_OFFSET/2) ), rText );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplDrawSelect()
 {
@@ -739,7 +739,7 @@ void ValueSet::ImplDrawSelect()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel )
 {
@@ -900,7 +900,7 @@ void ValueSet::ImplDrawSelect( sal_uInt16 nItemId, const bool bFocus, const bool
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplHideSelect( sal_uInt16 nItemId )
 {
@@ -930,7 +930,7 @@ void ValueSet::ImplHideSelect( sal_uInt16 nItemId )
     DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection )
 {
@@ -951,7 +951,7 @@ void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, bool bIsSelection )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplDraw()
 {
@@ -1008,7 +1008,7 @@ void ValueSet::ImplDraw()
     ImplDrawSelect();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ValueSet::ImplScroll( const Point& rPos )
 {
@@ -1043,7 +1043,7 @@ bool ValueSet::ImplScroll( const Point& rPos )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 size_t ValueSet::ImplGetItem( const Point& rPos, bool bMove ) const
 {
@@ -1089,7 +1089,7 @@ size_t ValueSet::ImplGetItem( const Point& rPos, bool bMove ) const
     return VALUESET_ITEM_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 ValueSetItem* ValueSet::ImplGetItem( size_t nPos )
 {
@@ -1099,14 +1099,14 @@ ValueSetItem* ValueSet::ImplGetItem( size_t nPos )
         return ( nPos < mItemList.size() ) ? mItemList[nPos] : NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ValueSetItem* ValueSet::ImplGetFirstItem()
 {
     return mItemList.size() ? mItemList[0] : NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ValueSet::ImplGetVisibleItemCount() const
 {
@@ -1122,7 +1122,7 @@ sal_uInt16 ValueSet::ImplGetVisibleItemCount() const
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue )
 {
@@ -1132,7 +1132,7 @@ void ValueSet::ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::
         pAcc->FireAccessibleEvent( nEventId, rOldValue, rNewValue );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ValueSet::ImplHasAccessibleListeners()
 {
@@ -1140,7 +1140,7 @@ bool ValueSet::ImplHasAccessibleListeners()
     return( pAcc && pAcc->HasAccessibleListeners() );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
 {
@@ -1154,7 +1154,7 @@ IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ValueSet, ImplTimerHdl)
 {
@@ -1162,7 +1162,7 @@ IMPL_LINK_NOARG(ValueSet, ImplTimerHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplTracking( const Point& rPos, bool bRepeat )
 {
@@ -1196,7 +1196,7 @@ void ValueSet::ImplTracking( const Point& rPos, bool bRepeat )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplEndTracking( const Point& rPos, bool bCancel )
 {
@@ -1225,7 +1225,7 @@ void ValueSet::ImplEndTracking( const Point& rPos, bool bCancel )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -1265,7 +1265,7 @@ void ValueSet::MouseButtonDown( const MouseEvent& rMEvt )
     Control::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -1276,7 +1276,7 @@ void ValueSet::MouseButtonUp( const MouseEvent& rMEvt )
         Control::MouseButtonUp( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::MouseMove( const MouseEvent& rMEvt )
 {
@@ -1286,7 +1286,7 @@ void ValueSet::MouseMove( const MouseEvent& rMEvt )
     Control::MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Tracking( const TrackingEvent& rTEvt )
 {
@@ -1298,7 +1298,7 @@ void ValueSet::Tracking( const TrackingEvent& rTEvt )
         ImplTracking( aMousePos, rTEvt.IsTrackingRepeat() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::KeyInput( const KeyEvent& rKEvt )
 {
@@ -1457,7 +1457,7 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Command( const CommandEvent& rCEvt )
 {
@@ -1472,7 +1472,7 @@ void ValueSet::Command( const CommandEvent& rCEvt )
     Control::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Paint( const Rectangle& )
 {
@@ -1489,7 +1489,7 @@ void ValueSet::Paint( const Rectangle& )
     ImplDraw();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::GetFocus()
 {
@@ -1503,7 +1503,7 @@ void ValueSet::GetFocus()
         pAcc->GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::LoseFocus()
 {
@@ -1520,7 +1520,7 @@ void ValueSet::LoseFocus()
         pAcc->LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Resize()
 {
@@ -1530,7 +1530,7 @@ void ValueSet::Resize()
     Control::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -1555,7 +1555,7 @@ void ValueSet::RequestHelp( const HelpEvent& rHEvt )
     Control::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::StateChanged( StateChangedType nType )
 {
@@ -1603,7 +1603,7 @@ void ValueSet::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1621,27 +1621,27 @@ void ValueSet::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Select()
 {
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::DoubleClick()
 {
     maDoubleClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos )
 {
@@ -1652,7 +1652,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos
     ImplInsertItem( pItem, nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos )
 {
@@ -1663,7 +1663,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos
     ImplInsertItem( pItem, nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
                            const OUString& rText, size_t nPos )
@@ -1676,7 +1676,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
     ImplInsertItem( pItem, nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor,
                            const OUString& rText, size_t nPos )
@@ -1689,7 +1689,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor,
     ImplInsertItem( pItem, nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos )
 {
@@ -1699,7 +1699,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, size_t nPos )
     ImplInsertItem( pItem, nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::ImplInsertItem( ValueSetItem *const pItem, const size_t nPos )
 {
@@ -1722,7 +1722,7 @@ void ValueSet::ImplInsertItem( ValueSetItem *const pItem, const size_t nPos )
         Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ValueSet::ImplGetItemRect( size_t nPos ) const
 {
@@ -1744,7 +1744,7 @@ Rectangle ValueSet::ImplGetItemRect( size_t nPos ) const
     return Rectangle( Point(x, y), Size(mnItemWidth, mnItemHeight) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::RemoveItem( sal_uInt16 nItemId )
 {
@@ -1776,7 +1776,7 @@ void ValueSet::RemoveItem( sal_uInt16 nItemId )
         Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::Clear()
 {
@@ -1794,14 +1794,14 @@ void ValueSet::Clear()
         Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 size_t ValueSet::GetItemCount() const
 {
     return mItemList.size();
 }
 
-// -----------------------------------------------------------------------
+
 
 size_t ValueSet::GetItemPos( sal_uInt16 nItemId ) const
 {
@@ -1813,14 +1813,14 @@ size_t ValueSet::GetItemPos( sal_uInt16 nItemId ) const
     return VALUESET_ITEM_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ValueSet::GetItemId( size_t nPos ) const
 {
     return ( nPos < mItemList.size() ) ? mItemList[nPos]->mnId : 0 ;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ValueSet::GetItemId( const Point& rPos ) const
 {
@@ -1831,7 +1831,7 @@ sal_uInt16 ValueSet::GetItemId( const Point& rPos ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ValueSet::GetItemRect( sal_uInt16 nItemId ) const
 {
@@ -1843,14 +1843,14 @@ Rectangle ValueSet::GetItemRect( sal_uInt16 nItemId ) const
     return Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::EnableFullItemMode( bool bFullMode )
 {
     mbFullMode = bFullMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetColCount( sal_uInt16 nNewCols )
 {
@@ -1864,7 +1864,7 @@ void ValueSet::SetColCount( sal_uInt16 nNewCols )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetLineCount( sal_uInt16 nNewLines )
 {
@@ -1878,7 +1878,7 @@ void ValueSet::SetLineCount( sal_uInt16 nNewLines )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetItemWidth( long nNewItemWidth )
 {
@@ -1905,7 +1905,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const OUString& rText, size_t nPo
     ImplInsertItem( pItem, nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetItemHeight( long nNewItemHeight )
 {
@@ -1919,7 +1919,7 @@ void ValueSet::SetItemHeight( long nNewItemHeight )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SelectItem( sal_uInt16 nItemId )
 {
@@ -2040,7 +2040,7 @@ void ValueSet::SelectItem( sal_uInt16 nItemId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetNoSelection()
 {
@@ -2052,7 +2052,7 @@ void ValueSet::SetNoSelection()
         ImplDraw();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
 {
@@ -2075,7 +2075,7 @@ void ValueSet::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
         mbFormat = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 Image ValueSet::GetItemImage( sal_uInt16 nItemId ) const
 {
@@ -2087,7 +2087,7 @@ Image ValueSet::GetItemImage( sal_uInt16 nItemId ) const
         return Image();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor )
 {
@@ -2110,7 +2110,7 @@ void ValueSet::SetItemColor( sal_uInt16 nItemId, const Color& rColor )
         mbFormat = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 Color ValueSet::GetItemColor( sal_uInt16 nItemId ) const
 {
@@ -2122,7 +2122,7 @@ Color ValueSet::GetItemColor( sal_uInt16 nItemId ) const
         return Color();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData )
 {
@@ -2147,7 +2147,7 @@ void ValueSet::SetItemData( sal_uInt16 nItemId, void* pData )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void* ValueSet::GetItemData( sal_uInt16 nItemId ) const
 {
@@ -2159,7 +2159,7 @@ void* ValueSet::GetItemData( sal_uInt16 nItemId ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText)
 {
@@ -2202,7 +2202,7 @@ void ValueSet::SetItemText(sal_uInt16 nItemId, const OUString& rText)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ValueSet::GetItemText( sal_uInt16 nItemId ) const
 {
@@ -2214,7 +2214,7 @@ OUString ValueSet::GetItemText( sal_uInt16 nItemId ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetColor( const Color& rColor )
 {
@@ -2224,7 +2224,7 @@ void ValueSet::SetColor( const Color& rColor )
         ImplDraw();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing )
 {
@@ -2239,7 +2239,7 @@ void ValueSet::SetExtraSpacing( sal_uInt16 nNewSpacing )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::StartSelection()
 {
@@ -2248,7 +2248,7 @@ void ValueSet::StartSelection()
     mnHighItemId    = mnSelItemId;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::EndSelection()
 {
@@ -2263,7 +2263,7 @@ void ValueSet::EndSelection()
     mbSelection = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
 {
@@ -2303,7 +2303,7 @@ bool ValueSet::StartDrag( const CommandEvent& rCEvt, Region& rRegion )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCols,
                                     sal_uInt16 nDesireLines ) const
@@ -2381,7 +2381,7 @@ Size ValueSet::CalcWindowSizePixel( const Size& rItemSize, sal_uInt16 nDesireCol
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ValueSet::CalcItemSizePixel( const Size& rItemSize, bool bOut ) const
 {
@@ -2412,7 +2412,7 @@ Size ValueSet::CalcItemSizePixel( const Size& rItemSize, bool bOut ) const
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ValueSet::GetScrollWidth() const
 {
@@ -2425,7 +2425,7 @@ long ValueSet::GetScrollWidth() const
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetHighlightHdl( const Link& rLink )
 {
@@ -2456,7 +2456,7 @@ Size ValueSet::GetOptimalSize() const
     return CalcWindowSizePixel(aLargestItemSize);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ValueSet::SetEdgeBlending(bool bNew)
 {
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx b/svtools/source/control/vclxaccessibleheaderbar.cxx
index e610875c7eae..e46512f7a1fe 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -58,36 +58,36 @@ VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar( VCLXWindow* pVCLWindow )
     m_pHeadBar = static_cast< HeaderBar* >( GetWindow() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleHeaderBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
     VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleHeaderBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
     VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet );
 }
 
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 ::rtl::OUString VCLXAccessibleHeaderBar::getImplementationName() throw (RuntimeException)
 {
     return ::rtl::OUString::createFromAscii( "com.sun.star.comp.toolkit.AccessibleHeaderBar" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< ::rtl::OUString > VCLXAccessibleHeaderBar::getSupportedServiceNames() throw (RuntimeException)
 {
diff --git a/svtools/source/control/vclxaccessibleheaderbaritem.cxx b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
index 7b7a24320320..6e293146986f 100644
--- a/svtools/source/control/vclxaccessibleheaderbaritem.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbaritem.cxx
@@ -56,7 +56,7 @@ VCLXAccessibleHeaderBarItem::VCLXAccessibleHeaderBarItem( HeaderBar*    pHeadBar
     m_pExternalLock = static_cast< VCLExternalSolarLock* >( getExternalLock() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem()
 {
@@ -64,13 +64,13 @@ VCLXAccessibleHeaderBarItem::~VCLXAccessibleHeaderBarItem()
     m_pExternalLock = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleHeaderBarItem::ProcessWindowEvent( const VclWindowEvent& )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet )
 {
@@ -88,9 +88,9 @@ void VCLXAccessibleHeaderBarItem::FillAccessibleStateSet( utl::AccessibleStateSe
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // OCommonAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeException)
 {
@@ -105,21 +105,21 @@ awt::Rectangle VCLXAccessibleHeaderBarItem::implGetBounds() throw (RuntimeExcept
     return aBounds;
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleHeaderBarItem, AccessibleExtendedComponentHelper_BASE, VCLXAccessibleHeaderBarItem_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleHeaderBarItem, AccessibleExtendedComponentHelper_BASE, VCLXAccessibleHeaderBarItem_BASE )
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void VCLXAccessibleHeaderBarItem::disposing()
 {
@@ -152,9 +152,9 @@ Reference< XAccessibleContext > VCLXAccessibleHeaderBarItem::getAccessibleContex
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleContext
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeException)
 {
@@ -163,7 +163,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleChildCount() throw (RuntimeE
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -175,7 +175,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleChild( sal_In
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() throw (RuntimeException)
 {
@@ -190,7 +190,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleParent() thro
     return xParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (RuntimeException)
 {
@@ -198,7 +198,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getAccessibleIndexInParent() throw (Runti
     return m_nIndexInParent - 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeException)
 {
@@ -207,7 +207,7 @@ sal_Int16 VCLXAccessibleHeaderBarItem::getAccessibleRole() throw (RuntimeExcepti
     return AccessibleRole::COLUMN_HEADER;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeException)
 {
@@ -216,7 +216,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleDescription() throw (RuntimeE
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeException)
 {
@@ -228,7 +228,7 @@ OUString VCLXAccessibleHeaderBarItem::getAccessibleName() throw (RuntimeExceptio
     return sName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
@@ -239,7 +239,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleHeaderBarItem::getAccessibleRe
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleStateSet(  ) throw (RuntimeException)
 {
@@ -260,7 +260,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleHeaderBarItem::getAccessibleState
     return xSet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 com::sun::star::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException)
 {
@@ -269,9 +269,9 @@ com::sun::star::lang::Locale VCLXAccessibleHeaderBarItem::getLocale() throw (Ill
     return Application::GetSettings().GetLanguageTag().getLocale();
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException)
 {
@@ -280,7 +280,7 @@ Reference< XAccessible > VCLXAccessibleHeaderBarItem::getAccessibleAtPoint( cons
     return Reference< XAccessible >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException)
 {
@@ -290,7 +290,7 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getForeground() throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException)
 {
@@ -300,9 +300,9 @@ sal_Int32 VCLXAccessibleHeaderBarItem::getBackground() throw (RuntimeException)
     return nColor;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// -----------------------------------------------------------------------------
+
 
 Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeException)
 {
@@ -312,7 +312,7 @@ Reference< awt::XFont > VCLXAccessibleHeaderBarItem::getFont() throw (RuntimeExc
     return xFont;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeException)
 {
@@ -322,7 +322,7 @@ OUString VCLXAccessibleHeaderBarItem::getTitledBorderText() throw (RuntimeExcept
     return sText;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleHeaderBarItem::getToolTipText() throw (RuntimeException)
 {
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index c623be09debe..2c0d731bb6d8 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -124,7 +124,7 @@ namespace svt
         virtual void    setCommand(const OUString& _rCommand) = 0;
     };
 
-    // -------------------------------------------------------------------
+
     IAssigmentData::~IAssigmentData()
     {
     }
@@ -162,7 +162,7 @@ public:
         virtual void    setCommand(const OUString& _rCommand);
     };
 
-    // -------------------------------------------------------------------
+
     AssigmentTransientData::AssigmentTransientData( const Reference< XDataSource >& _rxDataSource,
             const OUString& _rDataSourceName, const OUString& _rTableName,
             const Sequence< AliasProgrammaticPair >& _rFields )
@@ -204,25 +204,25 @@ public:
         }
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssigmentTransientData::getDatasourceName() const
     {
         return m_sDSName;
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssigmentTransientData::getCommand() const
     {
         return m_sTableName;
     }
 
-    // -------------------------------------------------------------------
+
     sal_Int32 AssigmentTransientData::getCommandType() const
     {
         return CommandType::TABLE;
     }
 
-    // -------------------------------------------------------------------
+
     sal_Bool AssigmentTransientData::hasFieldAssignment(const OUString& _rLogicalName)
     {
         MapString2String::const_iterator aPos = m_aAliases.find( _rLogicalName );
@@ -230,7 +230,7 @@ public:
             &&  ( !aPos->second.isEmpty() );
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssigmentTransientData::getFieldAssignment(const OUString& _rLogicalName)
     {
         OUString sReturn;
@@ -241,13 +241,13 @@ public:
         return sReturn;
     }
 
-    // -------------------------------------------------------------------
+
     void AssigmentTransientData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment)
     {
         m_aAliases[ _rLogicalName ] = _rAssignment;
     }
 
-    // -------------------------------------------------------------------
+
     void AssigmentTransientData::clearFieldAssignment(const OUString& _rLogicalName)
     {
         MapString2String::iterator aPos = m_aAliases.find( _rLogicalName );
@@ -255,13 +255,13 @@ public:
             m_aAliases.erase( aPos );
     }
 
-    // -------------------------------------------------------------------
+
     void AssigmentTransientData::setDatasourceName(const OUString&)
     {
         OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" );
     }
 
-    // -------------------------------------------------------------------
+
     void AssigmentTransientData::setCommand(const OUString&)
     {
         OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" );
@@ -320,7 +320,7 @@ void AssignmentPersistentData::Commit()
 {
 }
 
-    // -------------------------------------------------------------------
+
     AssignmentPersistentData::AssignmentPersistentData()
         :ConfigItem( OUString( "Office.DataAccess/AddressBook" ))
     {
@@ -330,18 +330,18 @@ void AssignmentPersistentData::Commit()
             m_aStoredFields.insert(*pStoredNames);
     }
 
-    // -------------------------------------------------------------------
+
     AssignmentPersistentData::~AssignmentPersistentData()
     {
     }
 
-    // -------------------------------------------------------------------
+
     sal_Bool AssignmentPersistentData::hasFieldAssignment(const OUString& _rLogicalName)
     {
         return (m_aStoredFields.end() != m_aStoredFields.find(_rLogicalName));
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssignmentPersistentData::getFieldAssignment(const OUString& _rLogicalName)
     {
         OUString sAssignment;
@@ -355,13 +355,13 @@ void AssignmentPersistentData::Commit()
         return sAssignment;
     }
 
-    // -------------------------------------------------------------------
+
     Any AssignmentPersistentData::getProperty(const sal_Char* _pLocalName) const
     {
         return getProperty(OUString::createFromAscii(_pLocalName));
     }
 
-    // -------------------------------------------------------------------
+
     Any AssignmentPersistentData::getProperty(const OUString& _rLocalName) const
     {
         Sequence< OUString > aProperties(&_rLocalName, 1);
@@ -370,7 +370,7 @@ void AssignmentPersistentData::Commit()
         return aValues[0];
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssignmentPersistentData::getStringProperty(const OUString& _rLocalName) const
     {
         OUString sReturn;
@@ -378,7 +378,7 @@ void AssignmentPersistentData::Commit()
         return sReturn;
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssignmentPersistentData::getStringProperty(const sal_Char* _pLocalName) const
     {
         OUString sReturn;
@@ -386,7 +386,7 @@ void AssignmentPersistentData::Commit()
         return sReturn;
     }
 
-    // -------------------------------------------------------------------
+
     sal_Int32 AssignmentPersistentData::getInt32Property(const sal_Char* _pLocalName) const
     {
         sal_Int32 nReturn = 0;
@@ -394,7 +394,7 @@ void AssignmentPersistentData::Commit()
         return nReturn;
     }
 
-    // -------------------------------------------------------------------
+
     void AssignmentPersistentData::setStringProperty(const sal_Char* _pLocalName, const OUString& _rValue)
     {
         Sequence< OUString > aNames(1);
@@ -404,7 +404,7 @@ void AssignmentPersistentData::Commit()
         PutProperties(aNames, aValues);
     }
 
-    // -------------------------------------------------------------------
+
     void AssignmentPersistentData::setFieldAssignment(const OUString& _rLogicalName, const OUString& _rAssignment)
     {
         if (_rAssignment.isEmpty())
@@ -441,7 +441,7 @@ void AssignmentPersistentData::Commit()
         DBG_ASSERT(bSuccess, "AssignmentPersistentData::setFieldAssignment: could not commit the changes a field!");
     }
 
-    // -------------------------------------------------------------------
+
     void AssignmentPersistentData::clearFieldAssignment(const OUString& _rLogicalName)
     {
         if (!hasFieldAssignment(_rLogicalName))
@@ -453,31 +453,31 @@ void AssignmentPersistentData::Commit()
         ClearNodeElements(sDescriptionNodePath, aNames);
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssignmentPersistentData::getDatasourceName() const
     {
         return getStringProperty( "DataSourceName" );
     }
 
-    // -------------------------------------------------------------------
+
     OUString AssignmentPersistentData::getCommand() const
     {
         return getStringProperty( "Command" );
     }
 
-    // -------------------------------------------------------------------
+
     void AssignmentPersistentData::setDatasourceName(const OUString& _rName)
     {
         setStringProperty( "DataSourceName", _rName );
     }
 
-    // -------------------------------------------------------------------
+
     void AssignmentPersistentData::setCommand(const OUString& _rCommand)
     {
         setStringProperty( "Command", _rCommand );
     }
 
-    // -------------------------------------------------------------------
+
     sal_Int32 AssignmentPersistentData::getCommandType() const
     {
         return getInt32Property( "CommandType" );
@@ -545,7 +545,7 @@ void AssignmentPersistentData::Commit()
     // = AddressBookSourceDialog
     // ===================================================================
 
-    // -------------------------------------------------------------------
+
     AddressBookSourceDialog::AddressBookSourceDialog(Window* _pParent,
             const Reference< XComponentContext >& _rxORB )
         : ModalDialog(_pParent, "AddressTemplateDialog", "svt/ui/addresstemplatedialog.ui")
@@ -556,7 +556,7 @@ void AssignmentPersistentData::Commit()
         implConstruct();
     }
 
-    // -------------------------------------------------------------------
+
     AddressBookSourceDialog::AddressBookSourceDialog( Window* _pParent, const Reference< XComponentContext >& _rxORB,
         const Reference< XDataSource >& _rxTransientDS, const OUString& _rDataSourceName,
         const OUString& _rTable, const Sequence< AliasProgrammaticPair >& _rMapping )
@@ -568,7 +568,7 @@ void AssignmentPersistentData::Commit()
         implConstruct();
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::implConstruct()
     {
         get(m_pDatasource, "datasource");
@@ -714,7 +714,7 @@ void AssignmentPersistentData::Commit()
         }
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::getFieldMapping(Sequence< AliasProgrammaticPair >& _rMapping) const
     {
         _rMapping.realloc( m_pImpl->aLogicalFieldNames.size() );
@@ -739,7 +739,7 @@ void AssignmentPersistentData::Commit()
         _rMapping.realloc( pPair - _rMapping.getArray() );
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::loadConfiguration()
     {
         OUString sName = m_pImpl->pConfigData->getDatasourceName();
@@ -767,13 +767,13 @@ void AssignmentPersistentData::Commit()
             *aAssignment = m_pImpl->pConfigData->getFieldAssignment(*aLogical);
     }
 
-    // -------------------------------------------------------------------
+
     AddressBookSourceDialog::~AddressBookSourceDialog()
     {
         delete m_pImpl;
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::initializeDatasources()
     {
         if (!m_xDatabaseContext.is())
@@ -812,14 +812,14 @@ void AssignmentPersistentData::Commit()
             m_pDatasource->InsertEntry(*pDatasourceNames);
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar)
     {
         implScrollFields( _pScrollBar->GetThumbPos(), sal_True, sal_True );
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::resetTables()
     {
         if (!m_xDatabaseContext.is())
@@ -925,7 +925,7 @@ void AssignmentPersistentData::Commit()
         resetFields();
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::resetFields()
     {
         WaitObject aWaitCursor(this);
@@ -1006,7 +1006,7 @@ void AssignmentPersistentData::Commit()
                     (*aAdjust) = "";
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK(AddressBookSourceDialog, OnFieldSelect, ListBox*, _pListbox)
     {
         // the index of the affected list box in our array
@@ -1025,7 +1025,7 @@ void AssignmentPersistentData::Commit()
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::implScrollFields(sal_Int32 _nPos, sal_Bool _bAdjustFocus, sal_Bool _bAdjustScrollbar)
     {
         if (_nPos == m_pImpl->nFieldScrollPos)
@@ -1122,7 +1122,7 @@ void AssignmentPersistentData::Commit()
             m_pFieldScroller->SetThumbPos(m_pImpl->nFieldScrollPos);
     }
 
-    // -------------------------------------------------------------------
+
     void AddressBookSourceDialog::implSelectField(ListBox* _pBox, const OUString& _rText)
     {
         if (!_rText.isEmpty())
@@ -1133,7 +1133,7 @@ void AssignmentPersistentData::Commit()
             _pBox->SelectEntryPos(0);
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize)
     {
         // load the initial data from the configuration
@@ -1148,7 +1148,7 @@ void AssignmentPersistentData::Commit()
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK(AddressBookSourceDialog, OnComboSelect, ComboBox*, _pBox)
     {
         if (_pBox == m_pDatasource)
@@ -1158,14 +1158,14 @@ void AssignmentPersistentData::Commit()
         return 0;
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK(AddressBookSourceDialog, OnComboGetFocus, ComboBox*, _pBox)
     {
         _pBox->SaveValue();
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox)
     {
         if (_pBox->GetSavedValue() != _pBox->GetText())
@@ -1178,7 +1178,7 @@ void AssignmentPersistentData::Commit()
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked)
     {
         OUString sSelectedDS = lcl_getSelectedDataSource(*m_pDatasource);
@@ -1205,7 +1205,7 @@ void AssignmentPersistentData::Commit()
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources)
     {
         // create the dialog object
@@ -1260,7 +1260,7 @@ void AssignmentPersistentData::Commit()
         return 0L;
     }
 
-    // -------------------------------------------------------------------
+
     bool AddressBookSourceDialog::PreNotify( NotifyEvent& _rNEvt )
     {
         switch (_rNEvt.GetType())
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 2cc7f72734e1..a25ccac6972e 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -35,9 +35,9 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::ui::dialogs;
 
-// ---------------
+
 // - ColorDialog -
-// ---------------
+
 
 SvColorDialog::SvColorDialog( Window* pWindow )
 : mpParent( pWindow )
@@ -54,21 +54,21 @@ void SvColorDialog::SetColor( const Color& rColor )
     maColor = rColor;
 }
 
-// -----------------------------------------------------------------------
+
 
 const Color& SvColorDialog::GetColor() const
 {
     return maColor;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvColorDialog::SetMode( sal_Int16 eMode )
 {
     meMode = eMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 short SvColorDialog::Execute()
 {
diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index e312e6af09f9..615c96922d1b 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -34,11 +34,11 @@
 
 using namespace ::com::sun::star;
 
-//---------------------------------------------
+
 // this struct conforms to the Microsoft
 // OBJECTDESCRIPTOR -> see oleidl.h
 // (MS platform sdk)
-//---------------------------------------------
+
 
 struct OleObjectDescriptor
 {
@@ -91,7 +91,7 @@ void SvObjectServerList::Remove( const SvGlobalName & rName )
     }
 }
 
-//---------------------------------------------------------------------
+
 void SvObjectServerList::FillInsertObjects()
 /* [Description]
 
@@ -282,7 +282,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotFormatStringId nId )
 
     return aUIName;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rData, OUString& _rName, OUString& _rSource, SotFormatStringId& _nFormat)
 {
     sal_Bool bRet = sal_False;
@@ -339,6 +339,6 @@ sal_Bool SvPasteObjectHelper::GetEmbeddedName(const TransferableDataHelper& rDat
     }
     return bRet;
 }
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index 16551a55140c..5a3548665dec 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.cxx
@@ -20,7 +20,7 @@
 
 #include <mcvmath.hxx>
 
-// ---------------------------------------------------------------------
+
 // die folgenden Tabellen enthalten     sin(phi) * 2**14
 // fuer phi= 360Grad*2**-32 bis 360 Grad
 // def. fuer x: phi=360Grad * 2**(x-16)
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index a493c719e94e..a378b92d2adf 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -42,7 +42,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
     pPropBtn->Show( pPrinter->HasSupport( SUPPORT_SETUPDIALOG ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear )
 {
@@ -50,7 +50,7 @@ void ImplFreePrnDlgListBox( ListBox* pBox, sal_Bool bClear )
         pBox->Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
                                   Printer* pPrinter, Printer* pTempPrinter )
@@ -89,7 +89,7 @@ Printer* ImplPrnDlgListBoxSelect( ListBox* pBox, PushButton* pPropBtn,
     return pTempPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter )
 {
@@ -109,7 +109,7 @@ Printer* ImplPrnDlgUpdatePrinter( Printer* pPrinter, Printer* pTempPrinter )
     return pTempPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo )
 {
@@ -121,7 +121,7 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo& rInfo )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddStr)
 {
@@ -131,14 +131,14 @@ static OUString ImplPrnDlgAddString(const OUString& rStr, const OUString& rAddSt
     return aStr + rAddStr;
 }
 
-// -----------------------------------------------------------------------
+
 
 static OUString ImplPrnDlgAddResString(const OUString& rStr, sal_uInt16 nResId)
 {
     return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId));
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplPrnDlgGetStatusText( const QueueInfo& rInfo )
 {
@@ -241,7 +241,7 @@ PrinterSetupDialog::PrinterSetupDialog(Window* pParent)
     m_pLbName->SetSelectHdl( LINK( this, PrinterSetupDialog, ImplChangePrinterHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 PrinterSetupDialog::~PrinterSetupDialog()
 {
@@ -249,7 +249,7 @@ PrinterSetupDialog::~PrinterSetupDialog()
     delete mpTempPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 void PrinterSetupDialog::SetOptionsHdl( const Link& rLink )
 {
@@ -277,7 +277,7 @@ void PrinterSetupDialog::ImplSetInfo()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl)
 {
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl)
 {
@@ -299,7 +299,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl)
 {
@@ -309,7 +309,7 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
 {
@@ -319,7 +319,7 @@ bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
     return ModalDialog::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -338,7 +338,7 @@ void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt )
     ModalDialog::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 short PrinterSetupDialog::Execute()
 {
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index b1d86bf20049..20800aef3e8c 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -85,7 +85,7 @@ namespace svt
         sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS );
     };
 
-    //--------------------------------------------------------------------
+
     sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath )
     {
         sal_Int32 nStateIndexInPath = 0;
@@ -98,7 +98,7 @@ namespace svt
         return nStateIndexInPath;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 RoadmapWizardImpl::getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId )
     {
         sal_Int32 nStateIndexInPath = -1;
@@ -108,7 +108,7 @@ namespace svt
         return nStateIndexInPath;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 RoadmapWizardImpl::getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS )
     {
         sal_Int32 nMinLength = ::std::min( _rLHS.size(), _rRHS.size() );
@@ -124,14 +124,14 @@ namespace svt
     //= RoadmapWizard
     //====================================================================
     DBG_NAME( RoadmapWizard )
-    //--------------------------------------------------------------------
+
 #ifdef DBG_UTIL
     const char* CheckInvariants( const void* pVoid )
     {
         return static_cast< const RoadmapWizard* >( pVoid )->checkInvariants();
     }
 
-    //--------------------------------------------------------------------
+
     const sal_Char* RoadmapWizard::checkInvariants() const
     {
         // all paths have to start with the same state
@@ -166,7 +166,7 @@ namespace svt
     }
 #endif
 
-    //--------------------------------------------------------------------
+
     RoadmapWizard::RoadmapWizard( Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags )
         :OWizardMachine( _pParent, _rRes, _nButtonFlags )
         ,m_pImpl( new RoadmapWizardImpl )
@@ -175,7 +175,7 @@ namespace svt
         impl_construct();
     }
 
-    //--------------------------------------------------------------------
+
     RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
         :OWizardMachine( _pParent, i_nStyle, _nButtonFlags )
         ,m_pImpl( new RoadmapWizardImpl )
@@ -184,7 +184,7 @@ namespace svt
         impl_construct();
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::impl_construct()
     {
         SetLeftAlignedButtonCount( 1 );
@@ -209,26 +209,26 @@ namespace svt
         m_pImpl->pRoadmap->Show();
     }
 
-    //--------------------------------------------------------------------
+
     RoadmapWizard::~RoadmapWizard()
     {
         delete m_pImpl;
         DBG_DTOR( RoadmapWizard, CheckInvariants );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::SetRoadmapHelpId( const OString& _rId )
     {
         m_pImpl->pRoadmap->SetHelpId( _rId );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::SetRoadmapInteractive( sal_Bool _bInteractive )
     {
         m_pImpl->pRoadmap->SetRoadmapInteractive( _bInteractive );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::declarePath( PathId _nPathId, const WizardPath& _lWizardStates)
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -242,7 +242,7 @@ namespace svt
             implUpdateRoadmap( );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::declarePath( PathId _nPathId, WizardState _nFirstState, ... )
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -272,7 +272,7 @@ namespace svt
         declarePath( _nPathId, aNewPath );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::describeState( WizardState _nState, const OUString& _rStateDisplayName, RoadmapPageFactory _pPageFactory )
     {
         OSL_ENSURE( m_pImpl->aStateDescriptors.find( _nState ) == m_pImpl->aStateDescriptors.end(),
@@ -280,7 +280,7 @@ namespace svt
         m_pImpl->aStateDescriptors[ _nState ] = StateDescriptions::mapped_type( _rStateDisplayName, _pPageFactory );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::activatePath( PathId _nPathId, bool _bDecideForIt )
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -325,7 +325,7 @@ namespace svt
         implUpdateRoadmap( );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::implUpdateRoadmap( )
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -432,7 +432,7 @@ namespace svt
         m_pImpl->pRoadmap->SetRoadmapComplete( !bIncompletePath );
     }
 
-    //--------------------------------------------------------------------
+
     WizardTypes::WizardState RoadmapWizard::determineNextState( WizardState _nCurrentState ) const
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -463,7 +463,7 @@ namespace svt
         return aActivePathPos->second[ nNextStateIndex ];
     }
 
-    //---------------------------------------------------------------------
+
     bool RoadmapWizard::canAdvance() const
     {
         if ( !m_pImpl->bActivePathIsDefinite )
@@ -500,7 +500,7 @@ namespace svt
         return true;
     }
 
-    //---------------------------------------------------------------------
+
     void RoadmapWizard::updateTravelUI()
     {
         OWizardMachine::updateTravelUI();
@@ -523,7 +523,7 @@ namespace svt
         implUpdateRoadmap();
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected)
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -568,7 +568,7 @@ namespace svt
         return 1L;
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::enterState( WizardState _nState )
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -580,7 +580,7 @@ namespace svt
         m_pImpl->pRoadmap->SelectRoadmapItemByID( getCurrentState() );
     }
 
-    //--------------------------------------------------------------------
+
     OUString RoadmapWizard::getStateDisplayName( WizardState _nState ) const
     {
         OUString sDisplayName;
@@ -594,7 +594,7 @@ namespace svt
         return sDisplayName;
     }
 
-    //--------------------------------------------------------------------
+
     TabPage* RoadmapWizard::createPage( WizardState _nState )
     {
         TabPage* pPage( NULL );
@@ -611,7 +611,7 @@ namespace svt
         return pPage;
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::enableState( WizardState _nState, bool _bEnable )
     {
         DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
@@ -629,7 +629,7 @@ namespace svt
         m_pImpl->pRoadmap->EnableRoadmapItem( (RoadmapTypes::ItemId)_nState, _bEnable );
     }
 
-    //--------------------------------------------------------------------
+
     bool RoadmapWizard::knowsState( WizardState i_nState ) const
     {
         for (   Paths::const_iterator path = m_pImpl->aPaths.begin();
@@ -649,13 +649,13 @@ namespace svt
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     bool RoadmapWizard::isStateEnabled( WizardState _nState ) const
     {
         return m_pImpl->aDisabledStates.find( _nState ) == m_pImpl->aDisabledStates.end();
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::Resize()
     {
         OWizardMachine::Resize();
@@ -665,7 +665,7 @@ namespace svt
     }
 
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::StateChanged( StateChangedType nType )
     {
         WizardDialog::StateChanged( nType );
@@ -674,7 +674,7 @@ namespace svt
             ResizeFixedLine();
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::ResizeFixedLine()
     {
         Size aSize( m_pImpl->pRoadmap->GetSizePixel() );
@@ -682,7 +682,7 @@ namespace svt
         m_pImpl->pFixedLine->SetSizePixel( aSize );
     }
 
-    //--------------------------------------------------------------------
+
     void RoadmapWizard::updateRoadmapItemLabel( WizardState _nState )
     {
         const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] );
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 84467ab8b12a..d05030fa517e 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -56,25 +56,25 @@ namespace svt
     {
     }
 
-    //---------------------------------------------------------------------
+
     OWizardPage::~OWizardPage()
     {
         delete m_pImpl;
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardPage::initializePage()
     {
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardPage::ActivatePage()
     {
         TabPage::ActivatePage();
         updateDialogTravelUI();
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardPage::updateDialogTravelUI()
     {
         OWizardMachine* pWizardMachine = dynamic_cast< OWizardMachine* >( GetParent() );
@@ -82,13 +82,13 @@ namespace svt
             pWizardMachine->updateTravelUI();
     }
 
-    //---------------------------------------------------------------------
+
     bool OWizardPage::canAdvance() const
     {
         return true;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
     {
         return sal_True;
@@ -121,7 +121,7 @@ namespace svt
     //=====================================================================
     //= OWizardMachine
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OWizardMachine::OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags )
         :WizardDialog( _pParent, _rRes )
         ,m_pFinish(NULL)
@@ -134,7 +134,7 @@ namespace svt
         implConstruct( _nButtonFlags );
     }
 
-    //---------------------------------------------------------------------
+
     OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
         :WizardDialog( _pParent, i_nStyle )
         ,m_pFinish(NULL)
@@ -147,7 +147,7 @@ namespace svt
         implConstruct( _nButtonFlags );
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::implConstruct( const sal_uInt32 _nButtonFlags )
     {
         m_pImpl->sTitleBase = GetText();
@@ -216,7 +216,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     OWizardMachine::~OWizardMachine()
     {
         delete m_pFinish;
@@ -231,7 +231,7 @@ namespace svt
         delete m_pImpl;
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::implUpdateTitle()
     {
         OUString sCompleteTitle(m_pImpl->sTitleBase);
@@ -246,14 +246,14 @@ namespace svt
         SetText(sCompleteTitle);
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::setTitleBase(const OUString& _rTitleBase)
     {
         m_pImpl->sTitleBase = _rTitleBase;
         implUpdateTitle();
     }
 
-    //---------------------------------------------------------------------
+
     TabPage* OWizardMachine::GetOrCreatePage( const WizardState i_nState )
     {
         if ( NULL == GetPage( i_nState ) )
@@ -281,7 +281,7 @@ namespace svt
         return GetPage( i_nState );
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::ActivatePage()
     {
         WizardDialog::ActivatePage();
@@ -292,7 +292,7 @@ namespace svt
         enterState( nCurrentLevel );
     }
 
-    //---------------------------------------------------------------------
+
     long OWizardMachine::DeactivatePage()
     {
         WizardState nCurrentState = getCurrentState();
@@ -301,7 +301,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::defaultButton(sal_uInt32 _nWizardButtonFlags)
     {
         // the new default button
@@ -323,7 +323,7 @@ namespace svt
             implResetDefault( this );
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::implResetDefault(Window* _pWindow)
     {
         Window* pChildLoop = _pWindow->GetWindow(WINDOW_FIRSTCHILD);
@@ -353,7 +353,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::defaultButton(PushButton* _pNewDefButton)
     {
         // loop through all (direct and indirect) descendants which participate in our tabbing order, and
@@ -365,7 +365,7 @@ namespace svt
             _pNewDefButton->SetStyle(_pNewDefButton->GetStyle() | WB_DEFBUTTON);
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::enableButtons(sal_uInt32 _nWizardButtonFlags, sal_Bool _bEnable)
     {
         if (m_pFinish && (_nWizardButtonFlags & WZB_FINISH))
@@ -380,7 +380,7 @@ namespace svt
             m_pCancel->Enable(_bEnable);
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::enterState(WizardState _nState)
     {
         // tell the page
@@ -398,7 +398,7 @@ namespace svt
         implUpdateTitle();
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::leaveState(WizardState)
     {
         // no need to ask the page here.
@@ -408,13 +408,13 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::onFinish()
     {
         return Finnish( RET_OK );
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OWizardMachine, OnFinish)
     {
         if ( isTravelingSuspended() )
@@ -427,13 +427,13 @@ namespace svt
         return onFinish() ? 1L : 0L;
     }
 
-    //---------------------------------------------------------------------
+
     OWizardMachine::WizardState OWizardMachine::determineNextState( WizardState _nCurrentState ) const
     {
         return _nCurrentState + 1;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::prepareLeaveCurrentState( CommitPageReason _eReason )
     {
         IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
@@ -441,7 +441,7 @@ namespace svt
         return pController->commitPage( _eReason );
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState )
     {
         // alowed to leave the current page?
@@ -468,7 +468,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::skipUntil( WizardState _nTargetState )
     {
         WizardState nCurrentState = getCurrentState();
@@ -508,7 +508,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::skip(sal_Int32 _nSteps)
     {
         DBG_ASSERT(_nSteps > 0, "OWizardMachine::skip: invalid number of steps!");
@@ -548,7 +548,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::travelNext()
     {
         // allowed to leave the current page?
@@ -573,7 +573,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool OWizardMachine::travelPrevious()
     {
         DBG_ASSERT(m_pImpl->aStateHistory.size() > 0, "OWizardMachine::travelPrevious: have no previous page!");
@@ -598,7 +598,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     void  OWizardMachine::removePageFromHistory( WizardState nToRemove )
     {
 
@@ -619,19 +619,19 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::enableAutomaticNextButtonState( bool _bEnable )
     {
         m_pImpl->m_bAutoNextButtonState = _bEnable;
     }
 
-    //---------------------------------------------------------------------
+
     bool OWizardMachine::isAutomaticNextButtonStateEnabled() const
     {
         return m_pImpl->m_bAutoNextButtonState;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OWizardMachine, OnPrevPage)
     {
         if ( isTravelingSuspended() )
@@ -641,7 +641,7 @@ namespace svt
         return nRet;
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK_NOARG(OWizardMachine, OnNextPage)
     {
         if ( isTravelingSuspended() )
@@ -651,14 +651,14 @@ namespace svt
         return nRet;
     }
 
-    //---------------------------------------------------------------------
+
     IWizardPageController* OWizardMachine::getPageController( TabPage* _pCurrentPage ) const
     {
         IWizardPageController* pController = dynamic_cast< IWizardPageController* >( _pCurrentPage );
         return pController;
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::getStateHistory( ::std::vector< WizardState >& _out_rHistory )
     {
         ::std::stack< WizardState > aHistoryCopy( m_pImpl->aStateHistory );
@@ -669,13 +669,13 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     bool OWizardMachine::canAdvance() const
     {
         return WZS_INVALID_STATE != determineNextState( getCurrentState() );
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::updateTravelUI()
     {
         const IWizardPageController* pController = getPageController( GetPage( getCurrentState() ) );
@@ -687,20 +687,20 @@ namespace svt
         enableButtons( WZB_NEXT, bCanAdvance );
     }
 
-    //---------------------------------------------------------------------
+
     bool OWizardMachine::isTravelingSuspended() const
     {
         return m_pImpl->m_bTravelingSuspended;
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::suspendTraveling( AccessGuard )
     {
         DBG_ASSERT( !m_pImpl->m_bTravelingSuspended, "OWizardMachine::suspendTraveling: already suspended!" );
        m_pImpl->m_bTravelingSuspended = true;
     }
 
-    //---------------------------------------------------------------------
+
     void OWizardMachine::resumeTraveling( AccessGuard )
     {
         DBG_ASSERT( m_pImpl->m_bTravelingSuspended, "OWizardMachine::resumeTraveling: nothing to resume!" );
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 48440f2fefb6..de29f6ba5f85 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -37,7 +37,7 @@ struct ImplWizPageData
     TabPage*            mpPage;
 };
 
-// -----------------------------------------------------------------------
+
 
 struct ImplWizButtonData
 {
@@ -66,20 +66,20 @@ void WizardDialog::ImplInitData()
     maWizardLayoutTimer.SetTimeoutHdl( LINK( this, WizardDialog, ImplHandleWizardLayoutTimerHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 void WizardDialog::SetLeftAlignedButtonCount( sal_Int16 _nCount )
 {
     mnLeftAlignCount = _nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::SetEmptyViewMargin()
 {
     mbEmptyViewMargin = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::ImplCalcSize( Size& rSize )
 {
@@ -258,7 +258,7 @@ long WizardDialog::LogicalCoordinateToPixel(int iCoordinate){
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::ImplPosTabPage()
 {
@@ -316,7 +316,7 @@ void WizardDialog::ImplPosTabPage()
     mpCurTabPage->SetPosSizePixel( aPos, aDlgSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::ImplShowTabPage( TabPage* pTabPage )
 {
@@ -339,7 +339,7 @@ void WizardDialog::ImplShowTabPage( TabPage* pTabPage )
         pOldTabPage->Hide();
 }
 
-// -----------------------------------------------------------------------
+
 
 TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const
 {
@@ -367,7 +367,7 @@ WizardDialog::WizardDialog( Window* pParent, WinBits nStyle ) :
     ImplInitData();
 }
 
-// -----------------------------------------------------------------------
+
 
 WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) :
     ModalDialog( pParent, rResId )
@@ -375,7 +375,7 @@ WizardDialog::WizardDialog( Window* pParent, const ResId& rResId ) :
     ImplInitData();
 }
 
-// -----------------------------------------------------------------------
+
 
 WizardDialog::~WizardDialog()
 {
@@ -392,7 +392,7 @@ WizardDialog::~WizardDialog()
         RemovePage( mpFirstPage->mpPage );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::Resize()
 {
@@ -405,7 +405,7 @@ void WizardDialog::Resize()
     Dialog::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::StateChanged( StateChangedType nType )
 {
@@ -443,7 +443,7 @@ void WizardDialog::StateChanged( StateChangedType nType )
     Dialog::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WizardDialog::Notify( NotifyEvent& rNEvt )
 {
@@ -489,14 +489,14 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt )
     return Dialog::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::ActivatePage()
 {
     maActivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 long WizardDialog::DeactivatePage()
 {
@@ -506,14 +506,14 @@ long WizardDialog::DeactivatePage()
         return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool WizardDialog::ShowNextPage()
 {
     return ShowPage( mnCurLevel+1 );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool WizardDialog::ShowPrevPage()
 {
@@ -522,7 +522,7 @@ sal_Bool WizardDialog::ShowPrevPage()
     return ShowPage( mnCurLevel-1 );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel )
 {
@@ -537,7 +537,7 @@ sal_Bool WizardDialog::ShowPage( sal_uInt16 nLevel )
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool WizardDialog::Finnish( long nResult )
 {
@@ -556,7 +556,7 @@ sal_Bool WizardDialog::Finnish( long nResult )
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::AddPage( TabPage* pPage )
 {
@@ -575,7 +575,7 @@ void WizardDialog::AddPage( TabPage* pPage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::RemovePage( TabPage* pPage )
 {
@@ -602,7 +602,7 @@ void WizardDialog::RemovePage( TabPage* pPage )
     OSL_FAIL( "WizardDialog::RemovePage() - Page not in list" );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage )
 {
@@ -625,7 +625,7 @@ void WizardDialog::SetPage( sal_uInt16 nLevel, TabPage* pPage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const
 {
@@ -643,7 +643,7 @@ TabPage* WizardDialog::GetPage( sal_uInt16 nLevel ) const
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::AddButton( Button* pButton, long nOffset )
 {
@@ -663,7 +663,7 @@ void WizardDialog::AddButton( Button* pButton, long nOffset )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::RemoveButton( Button* pButton )
 {
@@ -688,7 +688,7 @@ void WizardDialog::RemoveButton( Button* pButton )
     OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WizardDialog::ShowButtonFixedLine( sal_Bool bVisible )
 {
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 0893e64c5f9a..481b135622f0 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -121,20 +121,20 @@ SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XCompon
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvFilterOptionsDialog::~SvFilterOptionsDialog()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SvFilterOptionsDialog::acquire() throw()
 {
     OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SvFilterOptionsDialog::release() throw()
 {
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 3642591fc154..572412c95252 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star;
 
 namespace unographic {
 
-// ---------------------
+
 // - GraphicDescriptor -
-// ---------------------
+
 
 GraphicDescriptor::GraphicDescriptor() :
     ::comphelper::PropertySetHelper( createPropertySetInfo(), SAL_NO_ACQUIRE ),
@@ -62,14 +62,14 @@ GraphicDescriptor::GraphicDescriptor() :
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 GraphicDescriptor::~GraphicDescriptor()
     throw()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicDescriptor::init( const ::Graphic& rGraphic )
     throw()
@@ -77,7 +77,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic )
     mpGraphic = &rGraphic;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicDescriptor::init( const OUString& rURL )
     throw()
@@ -91,7 +91,7 @@ void GraphicDescriptor::init( const OUString& rURL )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL )
     throw()
@@ -105,7 +105,7 @@ void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm,
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
 {
@@ -171,7 +171,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString GraphicDescriptor::getImplementationName_Static()
     throw()
@@ -179,7 +179,7 @@ OUString GraphicDescriptor::getImplementationName_Static()
     return OUString( "com.sun.star.comp.graphic.GraphicDescriptor"  );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static()
     throw(  )
@@ -191,7 +191,7 @@ uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static()
     return aSeq;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -214,7 +214,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType )
     return aAny;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -222,7 +222,7 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType )
     return OWeakAggObject::queryInterface( rType );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GraphicDescriptor::acquire()
     throw()
@@ -230,7 +230,7 @@ void SAL_CALL GraphicDescriptor::acquire()
     OWeakAggObject::acquire();
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GraphicDescriptor::release()
     throw()
@@ -238,7 +238,7 @@ void SAL_CALL GraphicDescriptor::release()
     OWeakAggObject::release();
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString SAL_CALL GraphicDescriptor::getImplementationName()
     throw( uno::RuntimeException )
@@ -252,7 +252,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam
     return cppu::supportsService(this, ServiceName);
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames()
     throw( uno::RuntimeException )
@@ -260,7 +260,7 @@ uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames()
     return getSupportedServiceNames_Static();
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
     throw( uno::RuntimeException )
@@ -289,7 +289,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
     return theGraphicDescriptorUnoTunnelId::get().getSeq();
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo()
 {
@@ -315,7 +315,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
     return pRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ )
     throw( beans::UnknownPropertyException,
@@ -326,7 +326,7 @@ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry**
     // we only have readonly attributes
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
     throw( beans::UnknownPropertyException, lang::WrappedTargetException )
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 6cfabaa6d545..bc8546e199a3 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -37,7 +37,7 @@ Graphic::Graphic() :
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 Graphic::~Graphic()
     throw()
@@ -45,7 +45,7 @@ Graphic::~Graphic()
     delete mpGraphic;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void Graphic::init( const ::Graphic& rGraphic )
     throw()
@@ -55,7 +55,7 @@ void Graphic::init( const ::Graphic& rGraphic )
     ::unographic::GraphicDescriptor::init( *mpGraphic );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
     throw( uno::RuntimeException )
@@ -73,7 +73,7 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
     return aAny ;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -84,7 +84,7 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType )
     return aReturn;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Graphic::acquire()
     throw()
@@ -92,14 +92,14 @@ void SAL_CALL Graphic::acquire()
     ::unographic::GraphicDescriptor::acquire();
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL Graphic::release() throw()
 {
     ::unographic::GraphicDescriptor::release();
 }
 
-// ------------------------------------------------------------------------------
+
 
 namespace
 {
@@ -112,7 +112,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static()
     return theGraphicUnoTunnelId::get().getSeq();
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString Graphic::getImplementationName_Static()
     throw()
@@ -120,7 +120,7 @@ OUString Graphic::getImplementationName_Static()
     return OUString( "com.sun.star.comp.graphic.Graphic" );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static()
     throw()
@@ -172,7 +172,7 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
     return aRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
     throw(uno::RuntimeException)
@@ -180,7 +180,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
     return getImplementationId_Static();
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::sal_Int8 SAL_CALL Graphic::getType()
      throw (uno::RuntimeException)
@@ -193,9 +193,9 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
     return cRet;
 }
 
-//----------------------------------------------------------------------
+
 // XBitmap
-//----------------------------------------------------------------------
+
 
 awt::Size SAL_CALL Graphic::getSize(  ) throw (uno::RuntimeException)
 {
@@ -208,7 +208,7 @@ awt::Size SAL_CALL Graphic::getSize(  ) throw (uno::RuntimeException)
     return awt::Size( aVclSize.Width(), aVclSize.Height() );
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB(  ) throw (uno::RuntimeException)
 {
@@ -227,7 +227,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB(  ) throw (uno::RuntimeExce
     }
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB(  ) throw (uno::RuntimeException)
 {
@@ -246,7 +246,7 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB(  ) throw (uno::Runtime
     }
 }
 
-//----------------------------------------------------------------------
+
 const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterface >& rxIFace )
     throw()
 {
@@ -254,7 +254,7 @@ const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterfa
     return( xTunnel.is() ? reinterpret_cast< ::Graphic* >( xTunnel->getSomething( getImplementationId_Static() ) ) : NULL );
 }
 
-//----------------------------------------------------------------------
+
 sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId )
     throw( uno::RuntimeException )
 {
diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index a98e534bf9cc..d8057c1b8198 100644
--- a/svtools/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.cxx
@@ -21,9 +21,9 @@
 #include <tools/vcompat.hxx>
 #include <svtools/grfmgr.hxx>
 
-// ---------------
+
 // - GraphicAttr -
-// ---------------
+
 
 GraphicAttr::GraphicAttr() :
     mfGamma         ( 1.0 ),
@@ -44,13 +44,13 @@ GraphicAttr::GraphicAttr() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 GraphicAttr::~GraphicAttr()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
 {
@@ -71,7 +71,7 @@ sal_Bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const
             ( meDrawMode == rAttr.meDrawMode ) );
 }
 
-// ------------------------------------------------------------------------
+
 
 SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr )
 {
@@ -98,7 +98,7 @@ SvStream& ReadGraphicAttr( SvStream& rIStm, GraphicAttr& rAttr )
     return rIStm;
 }
 
-// ------------------------------------------------------------------------
+
 
 SvStream& WriteGraphicAttr( SvStream& rOStm, const GraphicAttr& rAttr )
 {
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index ea953e9ea18b..55eb718f07df 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -30,17 +30,17 @@
 #include "grfcache.hxx"
 #include <svtools/grfmgr.hxx>
 
-// -----------
+
 // - defines -
-// -----------
+
 
 #define WATERMARK_LUM_OFFSET        50
 #define WATERMARK_CON_OFFSET        -70
 #define MAP( cVal0, cVal1, nFrac )  ((sal_uInt8)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L))
 
-// ------------------
+
 // - GraphicManager -
-// ------------------
+
 
 GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) :
         mpCache( new GraphicCache( nCacheSize, nMaxObjCacheSize ) )
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index f4030333ff78..aa8d4665457a 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -102,7 +102,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
     return theGraphicProviderUnoTunnelId::get().getSeq();
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) const
 {
@@ -144,7 +144,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) const
 {
@@ -165,7 +165,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage(
 }
 
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) const
 {
@@ -195,7 +195,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) const
 {
@@ -229,7 +229,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) const
 {
@@ -309,7 +309,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties )
     throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -382,7 +382,7 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties )
     throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -727,7 +727,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties )
     throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 1577ba747c64..d57823f85acf 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -47,14 +47,14 @@ GraphicRendererVCL::GraphicRendererVCL() :
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 GraphicRendererVCL::~GraphicRendererVCL()
     throw()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -79,7 +79,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType
     return aAny;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -87,7 +87,7 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType )
     return OWeakAggObject::queryInterface( rType );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GraphicRendererVCL::acquire()
     throw()
@@ -95,7 +95,7 @@ void SAL_CALL GraphicRendererVCL::acquire()
     OWeakAggObject::acquire();
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GraphicRendererVCL::release()
     throw()
@@ -103,7 +103,7 @@ void SAL_CALL GraphicRendererVCL::release()
     OWeakAggObject::release();
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString SAL_CALL GraphicRendererVCL::getImplementationName()
     throw( uno::RuntimeException )
@@ -117,7 +117,7 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceNa
     return cppu::supportsService(this, ServiceName);
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames()
     throw( uno::RuntimeException )
@@ -127,7 +127,7 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames(
     return aSeq;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
     throw( uno::RuntimeException )
@@ -157,7 +157,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
     return theGraphicRendererVCLUnoTunnelId::get().getSeq();
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo()
 {
@@ -178,7 +178,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
     return pRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
     throw( beans::UnknownPropertyException,
@@ -233,7 +233,7 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry*
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues )
     throw( beans::UnknownPropertyException, lang::WrappedTargetException )
@@ -272,7 +272,7 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry*
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic )
     throw (uno::RuntimeException)
diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 30f07c7af197..cf05cc2cfbda 100644
--- a/svtools/source/graphic/transformer.cxx
+++ b/svtools/source/graphic/transformer.cxx
@@ -38,21 +38,21 @@ using namespace com::sun::star;
 
 namespace unographic {
 
-// ----------------------
+
 // - GraphicTransformer -
-// ----------------------
+
 
 GraphicTransformer::GraphicTransformer()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 GraphicTransformer::~GraphicTransformer()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo )
 {
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index b4ffcc917473..45b2eaef9ca6 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -82,7 +82,7 @@ class MainThreadFrameCloserRequest
         static void Start( MainThreadFrameCloserRequest* pRequest );
 };
 
-// --------------------------------------------------------
+
 void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTRequest )
 {
     if ( pMTRequest )
@@ -97,7 +97,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque
     }
 }
 
-// --------------------------------------------------------
+
 IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, MainThreadFrameCloserRequest*, pMTRequest )
 {
     (void) pThis; // unused
@@ -167,7 +167,7 @@ ODocumentCloser::ODocumentCloser(const css::uno::Sequence< css::uno::Any >& aArg
                 0 );
 }
 
-// --------------------------------------------------------
+
 ODocumentCloser::~ODocumentCloser()
 {
     if ( m_pListenersContainer )
@@ -178,7 +178,7 @@ ODocumentCloser::~ODocumentCloser()
 }
 
 // XComponent
-// --------------------------------------------------------
+
 void SAL_CALL ODocumentCloser::dispose()
     throw (uno::RuntimeException)
 {
@@ -202,7 +202,7 @@ void SAL_CALL ODocumentCloser::dispose()
     m_bDisposed = sal_True;
 }
 
-// --------------------------------------------------------
+
 void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw (uno::RuntimeException)
 {
@@ -216,7 +216,7 @@ void SAL_CALL ODocumentCloser::addEventListener( const uno::Reference< lang::XEv
     m_pListenersContainer->addInterface( xListener );
 }
 
-// --------------------------------------------------------
+
 void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
     throw (uno::RuntimeException)
 {
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 92237e2a0f85..36c0457ffe1a 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -43,11 +43,11 @@ namespace svt
 {
 
 
-//-----------------------------------------------
+
 class SVT_DLLPRIVATE AsyncAccelExec
 {
     public:
-        //---------------------------------------
+
         /** creates a new instance of this class, which can be used
             one times only!
 
@@ -60,7 +60,7 @@ class SVT_DLLPRIVATE AsyncAccelExec
         void execAsync();
 
     private:
-        //---------------------------------------
+
         /** @short  allow creation of instances of this class
                     by using our factory only!
          */
@@ -75,14 +75,14 @@ class SVT_DLLPRIVATE AsyncAccelExec
         css::util::URL m_aURL;
 };
 
-//-----------------------------------------------
+
 AcceleratorExecute::AcceleratorExecute()
     : TMutexInit      (                                                     )
     , m_aAsyncCallback(LINK(this, AcceleratorExecute, impl_ts_asyncCallback))
 {
 }
 
-//-----------------------------------------------
+
 AcceleratorExecute::AcceleratorExecute(const AcceleratorExecute&)
     : TMutexInit      (                                                     )
     , m_aAsyncCallback(LINK(this, AcceleratorExecute, impl_ts_asyncCallback))
@@ -91,20 +91,20 @@ AcceleratorExecute::AcceleratorExecute(const AcceleratorExecute&)
     // but we need this ctor to init our async callback ...
 }
 
-//-----------------------------------------------
+
 AcceleratorExecute::~AcceleratorExecute()
 {
     // does nothing real
 }
 
-//-----------------------------------------------
+
 AcceleratorExecute* AcceleratorExecute::createAcceleratorHelper()
 {
     AcceleratorExecute* pNew = new AcceleratorExecute();
     return pNew;
 }
 
-//-----------------------------------------------
+
 void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                               const css::uno::Reference< css::frame::XFrame >&              xEnv )
 {
@@ -168,14 +168,14 @@ void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentCon
     // <- SAFE ----------------------------------
 }
 
-//-----------------------------------------------
+
 sal_Bool AcceleratorExecute::execute(const KeyCode& aVCLKey)
 {
     css::awt::KeyEvent aAWTKey = AcceleratorExecute::st_VCLKey2AWTKey(aVCLKey);
     return execute(aAWTKey);
 }
 
-//-----------------------------------------------
+
 sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
 {
     OUString sCommand = impl_ts_findCommand(aAWTKey);
@@ -211,7 +211,7 @@ sal_Bool AcceleratorExecute::execute(const css::awt::KeyEvent& aAWTKey)
     return bRet;
 }
 
-//-----------------------------------------------
+
 css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey)
 {
     css::awt::KeyEvent aAWTKey;
@@ -229,7 +229,7 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey)
     return aAWTKey;
 }
 
-//-----------------------------------------------
+
 KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
 {
     sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
@@ -240,12 +240,12 @@ KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
 
     return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
 }
-//-----------------------------------------------
+
 OUString AcceleratorExecute::findCommand(const css::awt::KeyEvent& aKey)
 {
     return impl_ts_findCommand(aKey);
 }
-//-----------------------------------------------
+
 OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
 {
     // SAFE -> ----------------------------------
@@ -363,7 +363,7 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
     return OUString();
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st_openModuleConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                                                                    const css::uno::Reference< css::frame::XFrame >&              xFrame)
 {
@@ -394,7 +394,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st
     return xAccCfg;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st_openDocConfig(const css::uno::Reference< css::frame::XModel >& xModel)
 {
     css::uno::Reference< css::ui::XAcceleratorConfiguration >       xAccCfg;
@@ -407,7 +407,7 @@ css::uno::Reference< css::ui::XAcceleratorConfiguration > AcceleratorExecute::st
     return xAccCfg;
 }
 
-//-----------------------------------------------
+
 css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_getURLParser()
 {
     // SAFE -> ----------------------------------
@@ -431,14 +431,14 @@ css::uno::Reference< css::util::XURLTransformer > AcceleratorExecute::impl_ts_ge
     return xParser;
 }
 
-//-----------------------------------------------
+
 IMPL_LINK_NOARG(AcceleratorExecute, impl_ts_asyncCallback)
 {
     // replaced by AsyncAccelExec!
     return 0;
 }
 
-//-----------------------------------------------
+
 AsyncAccelExec::AsyncAccelExec(const css::uno::Reference< css::frame::XDispatch >& xDispatch,
                                const css::util::URL&                               aURL     )
     : m_aAsyncCallback(LINK(this, AsyncAccelExec, impl_ts_asyncCallback))
@@ -447,7 +447,7 @@ AsyncAccelExec::AsyncAccelExec(const css::uno::Reference< css::frame::XDispatch
 {
 }
 
-//-----------------------------------------------
+
 AsyncAccelExec* AsyncAccelExec::createOnShotInstance(const css::uno::Reference< css::frame::XDispatch >& xDispatch,
                                                      const css::util::URL&                               aURL     )
 {
@@ -455,13 +455,13 @@ AsyncAccelExec* AsyncAccelExec::createOnShotInstance(const css::uno::Reference<
     return pExec;
 }
 
-//-----------------------------------------------
+
 void AsyncAccelExec::execAsync()
 {
     m_aAsyncCallback.Post(0);
 }
 
-//-----------------------------------------------
+
 IMPL_LINK(AsyncAccelExec, impl_ts_asyncCallback, void*,)
 {
     if (! m_xDispatch.is())
diff --git a/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index a0ef4e0a4076..bcd5395e2125 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.cxx
@@ -29,7 +29,7 @@
 
 using namespace ::com::sun::star;
 
-// -----------------------------------------------------------------------------
+
 
 TransferableClipboardListener::TransferableClipboardListener( const Link& rCallback ) :
     aLink( rCallback )
diff --git a/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index b08fe017a949..8f3eb8513d37 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.cxx
@@ -31,7 +31,7 @@ namespace svt
     //=====================================================================
     //= DialogClosedListener
     //=====================================================================
-    //---------------------------------------------------------------------
+
     DialogClosedListener::DialogClosedListener()
     {
     }
diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index e89a97ca0307..b8c06b137193 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.cxx
@@ -31,7 +31,7 @@ namespace svt
     //=====================================================================
     //= IWindowOperator
     //=====================================================================
-    //---------------------------------------------------------------------
+
     IWindowOperator::~IWindowOperator()
     {
     }
@@ -39,7 +39,7 @@ namespace svt
     //=====================================================================
     //= IWindowEventFilter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     IWindowEventFilter::~IWindowEventFilter()
     {
     }
@@ -65,7 +65,7 @@ namespace svt
     //=====================================================================
     //= DialogController
     //=====================================================================
-    //---------------------------------------------------------------------
+
     DialogController::DialogController( Window& _rInstigator, const PWindowEventFilter& _pEventFilter,
             const PWindowOperator& _pOperator )
         :m_pImpl( new DialogController_Data( _rInstigator, _pEventFilter, _pOperator ) )
@@ -76,13 +76,13 @@ namespace svt
         m_pImpl->rInstigator.AddEventListener( LINK( this, DialogController, OnWindowEvent ) );
     }
 
-    //---------------------------------------------------------------------
+
     DialogController::~DialogController()
     {
         reset();
     }
 
-    //---------------------------------------------------------------------
+
     void DialogController::reset()
     {
         m_pImpl->rInstigator.RemoveEventListener( LINK( this, DialogController, OnWindowEvent ) );
@@ -91,7 +91,7 @@ namespace svt
         m_pImpl->pOperator.reset();
     }
 
-    //---------------------------------------------------------------------
+
     void DialogController::addDependentWindow( Window& _rWindow )
     {
         m_pImpl->aConcernedWindows.push_back( &_rWindow );
@@ -100,7 +100,7 @@ namespace svt
         impl_update( aEvent, _rWindow );
     }
 
-    //---------------------------------------------------------------------
+
     IMPL_LINK( DialogController, OnWindowEvent, const VclWindowEvent*, _pEvent )
     {
         if ( m_pImpl->pEventFilter->payAttentionTo( *_pEvent ) )
@@ -108,7 +108,7 @@ namespace svt
         return 0L;
     }
 
-    //---------------------------------------------------------------------
+
     void DialogController::impl_updateAll( const VclWindowEvent& _rTriggerEvent )
     {
         for ( ::std::vector< Window* >::iterator loop = m_pImpl->aConcernedWindows.begin();
@@ -118,7 +118,7 @@ namespace svt
             impl_update( _rTriggerEvent, *(*loop) );
     }
 
-    //---------------------------------------------------------------------
+
     void DialogController::impl_update( const VclWindowEvent& _rTriggerEvent, Window& _rWindow )
     {
         m_pImpl->pOperator->operateOn( _rTriggerEvent, _rWindow );
@@ -135,18 +135,18 @@ namespace svt
     //=====================================================================
     //= ControlDependencyManager
     //=====================================================================
-    //---------------------------------------------------------------------
+
     ControlDependencyManager::ControlDependencyManager()
         :m_pImpl( new ControlDependencyManager_Data )
     {
     }
 
-    //---------------------------------------------------------------------
+
     ControlDependencyManager::~ControlDependencyManager()
     {
     }
 
-    //---------------------------------------------------------------------
+
     namespace
     {
         struct ResetDialogController : public ::std::unary_function< const PDialogController&, void >
@@ -158,21 +158,21 @@ namespace svt
         };
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::clear()
     {
         ::std::for_each( m_pImpl->aControllers.begin(), m_pImpl->aControllers.end(), ResetDialogController() );
         m_pImpl->aControllers.clear();
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::addController( const PDialogController& _pController )
     {
         OSL_ENSURE( _pController.get() != NULL, "ControlDependencyManager::addController: invalid controller, this will crash, sooner or later!" );
         m_pImpl->aControllers.push_back( _pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow )
     {
         PDialogController pController( new RadioDependentEnabler( _rRadio ) );
@@ -180,7 +180,7 @@ namespace svt
         m_pImpl->aControllers.push_back( pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2 )
     {
         PDialogController pController( new RadioDependentEnabler( _rRadio ) );
@@ -189,7 +189,7 @@ namespace svt
         m_pImpl->aControllers.push_back( pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3 )
     {
         PDialogController pController( new RadioDependentEnabler( _rRadio ) );
@@ -199,7 +199,7 @@ namespace svt
         m_pImpl->aControllers.push_back( pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnRadioCheck( RadioButton& _rRadio, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4, Window& _rDependentWindow5 )
     {
         PDialogController pController( new RadioDependentEnabler( _rRadio ) );
@@ -211,7 +211,7 @@ namespace svt
         m_pImpl->aControllers.push_back( pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow )
     {
         PDialogController pController( new RadioDependentEnabler( _rBox ) );
@@ -219,7 +219,7 @@ namespace svt
         m_pImpl->aControllers.push_back( pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2 )
     {
         PDialogController pController( new RadioDependentEnabler( _rBox ) );
@@ -228,7 +228,7 @@ namespace svt
         m_pImpl->aControllers.push_back( pController );
     }
 
-    //---------------------------------------------------------------------
+
     void ControlDependencyManager::enableOnCheckMark( CheckBox& _rBox, Window& _rDependentWindow1, Window& _rDependentWindow2, Window& _rDependentWindow3, Window& _rDependentWindow4 )
     {
         PDialogController pController( new RadioDependentEnabler( _rBox ) );
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 48719a369d7f..338d74584e01 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -142,7 +142,7 @@ static sal_uInt16 aWndFunc(
     return nRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) :
 
@@ -156,14 +156,14 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxErrorHandler::~SfxErrorHandler()
 {
     delete pFreeMgr;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxErrorHandler::CreateString(
     const ErrorInfo *pErr, OUString &rStr, sal_uInt16& nFlags) const
@@ -210,7 +210,7 @@ bool SfxErrorHandler::CreateString(
     return false;
 }
 
-//-------------------------------------------------------------------------
+
 
 class ResString: public OUString
 
@@ -229,7 +229,7 @@ class ResString: public OUString
     ResString( ResId &rId);
 };
 
-//-------------------------------------------------------------------------
+
 
 ResString::ResString(ResId & rId):
     OUString(rId.SetAutoRelease(false).toString()),
@@ -243,7 +243,7 @@ ResString::ResString(ResId & rId):
     pResMgr->PopContext();
 }
 
-//-------------------------------------------------------------------------
+
 
 struct ErrorResource_Impl : private Resource
 
@@ -293,7 +293,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con
     return bRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxErrorHandler::GetMessageString(
     sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
@@ -323,7 +323,7 @@ sal_Bool SfxErrorHandler::GetMessageString(
     return bRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SfxErrorHandler::GetErrorString(
     sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const
@@ -371,7 +371,7 @@ sal_Bool SfxErrorHandler::GetErrorString(
     return bRet;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxErrorContext::SfxErrorContext(
     sal_uInt16 nCtxIdP, Window *pWindow, sal_uInt16 nResIdP, ResMgr *pMgrP)
@@ -381,7 +381,7 @@ SfxErrorContext::SfxErrorContext(
         nResId=RID_ERRCTX;
 }
 
-//-------------------------------------------------------------------------
+
 
 SfxErrorContext::SfxErrorContext(
     sal_uInt16 nCtxIdP, const OUString &aArg1P, Window *pWindow,
@@ -393,7 +393,7 @@ SfxErrorContext::SfxErrorContext(
         nResId=RID_ERRCTX;
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
 
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 45e621dd7b09..ee9a77eb51ad 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -54,7 +54,7 @@ SvEmbedTransferHelper::SvEmbedTransferHelper( const uno::Reference< embed::XEmbe
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvEmbedTransferHelper::~SvEmbedTransferHelper()
 {
@@ -65,7 +65,7 @@ SvEmbedTransferHelper::~SvEmbedTransferHelper()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SvEmbedTransferHelper::AddSupportedFormats()
 {
@@ -74,7 +74,7 @@ void SvEmbedTransferHelper::AddSupportedFormats()
     AddFormat( FORMAT_GDIMETAFILE );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
 {
@@ -181,7 +181,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SvEmbedTransferHelper::ObjectReleased()
 {
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index af24eab18539..713b195b5976 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.cxx
@@ -70,7 +70,7 @@ namespace svt
         virtual ::sal_Int64 SAL_CALL getLength(  ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
     };
 
-    //--------------------------------------------------------------------
+
     StreamSupplier::StreamSupplier( const Reference< XInputStream >& _rxInput, const Reference< XOutputStream >& _rxOutput )
         :m_xInput( _rxInput )
         ,m_xOutput( _rxOutput )
@@ -81,19 +81,19 @@ namespace svt
         OSL_ENSURE( m_xSeekable.is(), "StreamSupplier::StreamSupplier: at least one of both must be seekable!" );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInputStream > SAL_CALL StreamSupplier::getInputStream(  ) throw (RuntimeException)
     {
         return m_xInput;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XOutputStream > SAL_CALL StreamSupplier::getOutputStream(  ) throw (RuntimeException)
     {
         return m_xOutput;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL StreamSupplier::seek( ::sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException)
     {
         if ( !m_xSeekable.is() )
@@ -102,7 +102,7 @@ namespace svt
         m_xSeekable->seek( location );
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int64 SAL_CALL StreamSupplier::getPosition(  ) throw (IOException, RuntimeException)
     {
         if ( !m_xSeekable.is() )
@@ -111,7 +111,7 @@ namespace svt
         return m_xSeekable->getPosition();
     }
 
-    //--------------------------------------------------------------------
+
     ::sal_Int64 SAL_CALL StreamSupplier::getLength(  ) throw (IOException, RuntimeException)
     {
         if ( !m_xSeekable.is() )
@@ -123,7 +123,7 @@ namespace svt
     //====================================================================
     //= GraphicAccess
     //====================================================================
-    //--------------------------------------------------------------------
+
     bool GraphicAccess::isSupportedURL( const OUString& _rURL )
     {
         if  (  _rURL.startsWith( "private:resource/" )
@@ -136,7 +136,7 @@ namespace svt
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     SvStream* GraphicAccess::getImageStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL )
     {
         SvStream* pReturn = NULL;
@@ -180,7 +180,7 @@ namespace svt
         return pReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL )
     {
         return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), true );   // take ownership
diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 9a20be97284c..bc1260b7e310 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.cxx
@@ -30,7 +30,7 @@
 
 DBG_NAME(SfxItemDesruptor_Impl);
 
-// -----------------------------------------------------------------------
+
 
 class SfxItemDesruptor_Impl
 {
@@ -47,7 +47,7 @@ public:
     ~SfxItemDesruptor_Impl();
 };
 
-// ------------------------------------------------------------------------
+
 SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ):
     pItem(pItemToDesrupt),
     aLink( LINK(this, SfxItemDesruptor_Impl, Delete) )
@@ -64,7 +64,7 @@ void SfxItemDesruptor_Impl::LaunchDeleteOnIdle()
     GetpApp()->InsertIdleHdl( aLink, 1 );
 }
 
-// ------------------------------------------------------------------------
+
 SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
 {
     DBG_DTOR(SfxItemDesruptor_Impl, 0);
@@ -78,7 +78,7 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl()
     delete pItem;
 }
 
-// ------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(SfxItemDesruptor_Impl, Delete)
 {
     {DBG_CHKTHIS(SfxItemDesruptor_Impl, 0);}
diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index 7ddf25fcad6c..fe1480bf7499 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -35,7 +35,7 @@
 
 using namespace ::com::sun::star;
 
-//------------------------------------------------------------------------
+
 
 SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText )
 {
@@ -112,7 +112,7 @@ SVT_DLLPUBLIC const OUString ApplyLreOrRleEmbedding( const OUString &rText )
     return aRes;
 }
 
-//------------------------------------------------------------------------
+
 
 namespace {
     BOOST_STATIC_ASSERT(
@@ -125,13 +125,13 @@ SvtLanguageTable::SvtLanguageTable() :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvtLanguageTable::~SvtLanguageTable()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString SvtLanguageTable::GetString( const LanguageType eType, bool bUserInterfaceSelection ) const
 {
@@ -156,7 +156,7 @@ OUString SvtLanguageTable::GetLanguageString( const LanguageType eType )
     return aLangTable.GetString( eType );
 }
 
-//------------------------------------------------------------------------
+
 
 LanguageType SvtLanguageTable::GetType( const OUString& rStr ) const
 {
@@ -174,14 +174,14 @@ LanguageType SvtLanguageTable::GetType( const OUString& rStr ) const
     return eType;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt32 SvtLanguageTable::GetEntryCount() const
 {
     return Count();
 }
 
-//------------------------------------------------------------------------
+
 
 LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const
 {
@@ -191,6 +191,6 @@ LanguageType SvtLanguageTable::GetTypeAtIndex( sal_uInt32 nIndex ) const
     return nType;
 }
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 5286a7e25546..c739afcc2a2a 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -45,7 +45,7 @@ OpenFileDropTargetListener::OpenFileDropTargetListener( const css::uno::Referenc
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 OpenFileDropTargetListener::~OpenFileDropTargetListener()
 {
@@ -55,7 +55,7 @@ OpenFileDropTargetListener::~OpenFileDropTargetListener()
     m_pFormats = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException )
 {
@@ -63,7 +63,7 @@ void SAL_CALL OpenFileDropTargetListener::disposing( const css::lang::EventObjec
     m_xContext.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::DropTargetDropEvent& dtde ) throw( css::uno::RuntimeException )
 {
@@ -98,7 +98,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dnd::DropTargetDragEnterEvent& dtdee ) throw( css::uno::RuntimeException )
 {
@@ -113,7 +113,7 @@ void SAL_CALL OpenFileDropTargetListener::dragEnter( const css::datatransfer::dn
     dragOver( dtdee );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd::DropTargetEvent& ) throw( css::uno::RuntimeException )
 {
@@ -126,7 +126,7 @@ void SAL_CALL OpenFileDropTargetListener::dragExit( const css::datatransfer::dnd
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd::DropTargetDragEvent& dtde ) throw( css::uno::RuntimeException )
 {
@@ -145,7 +145,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL OpenFileDropTargetListener::dropActionChanged( const css::datatransfer::dnd::DropTargetDragEvent& ) throw( css::uno::RuntimeException )
 {
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index 579a9998d2e7..19d90ec82143 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.cxx
@@ -30,20 +30,20 @@ namespace svt
     //====================================================================
     //= OStringTransferable
     //====================================================================
-    //--------------------------------------------------------------------
+
     OStringTransferable::OStringTransferable(const OUString& _rContent)
         :TransferableHelper()
         ,m_sContent( _rContent )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OStringTransferable::AddSupportedFormats()
     {
         AddFormat(SOT_FORMAT_STRING);
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OStringTransferable::GetData( const DataFlavor& _rFlavor )
     {
         sal_uInt32 nFormat = SotExchange::GetFormat( _rFlavor );
@@ -56,7 +56,7 @@ namespace svt
     //====================================================================
     //= OStringTransfer
     //====================================================================
-    //--------------------------------------------------------------------
+
     void OStringTransfer::CopyString( const OUString& _rContent, Window* _pWindow )
     {
         OStringTransferable* pTransferable = new OStringTransferable( _rContent );
@@ -64,7 +64,7 @@ namespace svt
         pTransferable->CopyToClipboard( _pWindow );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OStringTransfer::PasteString( OUString& _rContent, Window* _pWindow )
     {
         TransferableDataHelper aClipboardData = TransferableDataHelper::CreateFromSystemClipboard( _pWindow );
@@ -88,7 +88,7 @@ namespace svt
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     void OStringTransfer::StartStringDrag( const OUString& _rContent, Window* _pWindow, sal_Int8 _nDragSourceActions )
     {
         OStringTransferable* pTransferable = new OStringTransferable( _rContent );
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 86b81037b5b9..4370aebffbff 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -220,23 +220,23 @@ namespace svt
             }
         };
 
-        //----------------------------------------------------------------
+
         AccessibleDummyFactory::AccessibleDummyFactory()
         {
         }
 
-        //----------------------------------------------------------------
+
         AccessibleDummyFactory::~AccessibleDummyFactory()
         {
         }
 
-        //----------------------------------------------------------------
+
         oslInterlockedCount SAL_CALL AccessibleDummyFactory::acquire()
         {
             return osl_atomic_increment( &m_refCount );
         }
 
-        //----------------------------------------------------------------
+
         oslInterlockedCount SAL_CALL AccessibleDummyFactory::release()
         {
             if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -251,13 +251,13 @@ namespace svt
     //====================================================================
     //= AccessibleFactoryAccess
     //====================================================================
-    //--------------------------------------------------------------------
+
     AccessibleFactoryAccess::AccessibleFactoryAccess()
         :m_bInitialized( false )
     {
     }
 
-    //--------------------------------------------------------------------
+
 #ifndef DISABLE_DYNLOADING
     extern "C" { static void SAL_CALL thisModule() {} }
 #else
@@ -315,7 +315,7 @@ namespace svt
         m_bInitialized = true;
     }
 
-    //--------------------------------------------------------------------
+
     AccessibleFactoryAccess::~AccessibleFactoryAccess()
     {
         if ( m_bInitialized )
@@ -337,7 +337,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     IAccessibleFactory& AccessibleFactoryAccess::getFactory()
     {
         ensureInitialized();
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 6a49d9dbbad7..55b6db900864 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -55,7 +55,7 @@ namespace svt
     //=====================================================================
     //= helpers
     //=====================================================================
-    //---------------------------------------------------------------------
+
     SvStream& WriteDateTime( SvStream& _rStorage, const util::DateTime& _rDate )
     {
         sal_uInt16 hundredthSeconds = static_cast< sal_uInt16 >( _rDate.NanoSeconds / Time::nanoPerCenti );
@@ -71,7 +71,7 @@ namespace svt
         return _rStorage;
     }
 
-    //---------------------------------------------------------------------
+
     SvStream& operator >> ( SvStream& _rStorage, util::DateTime& _rDate )
     {
         sal_uInt16 hundredthSeconds;
@@ -88,7 +88,7 @@ namespace svt
         return _rStorage;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool operator == ( const util::DateTime& _rLHS, const util::DateTime& _rRHS )
     {
         return  _rLHS.NanoSeconds == _rRHS.NanoSeconds
@@ -101,7 +101,7 @@ namespace svt
             &&  _rLHS.IsUTC     == _rRHS.IsUTC;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool operator != ( const util::DateTime& _rLHS, const util::DateTime& _rRHS )
     {
         return !( _rLHS == _rRHS );
@@ -158,10 +158,10 @@ namespace svt
                                                         { m_aSubContents.push_back( _rxNewElement ); }
     };
 
-    //---------------------------------------------------------------------
+
     DBG_NAME( TemplateContent )
 
-    //---------------------------------------------------------------------
+
     TemplateContent::TemplateContent( const INetURLObject& _rURL )
         :m_aURL( _rURL )
     {
@@ -171,7 +171,7 @@ namespace svt
         implResetDate();
     }
 
-    //---------------------------------------------------------------------
+
     TemplateContent::~TemplateContent()
     {
         DBG_DTOR( TemplateContent, NULL );
@@ -180,7 +180,7 @@ namespace svt
     //=====================================================================
     //= stl helpers
     //=====================================================================
-    //---------------------------------------------------------------------
+
     /// compares two TemplateContent by URL
     struct TemplateContentURLLess
         :public ::std::binary_function  <   ::rtl::Reference< TemplateContent >
@@ -196,7 +196,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     /// sorts the sib contents of a TemplateFolderContent
     struct SubContentSort : public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
     {
@@ -225,7 +225,7 @@ namespace svt
             }
         }
     };
-    //---------------------------------------------------------------------
+
     /** does a deep compare of two template contents
     */
     struct TemplateContentEqual
@@ -270,7 +270,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     /// base class for functors which act an an SvStream
     struct StorageHelper
     {
@@ -279,7 +279,7 @@ namespace svt
         StorageHelper( SvStream& _rStorage ) : m_rStorage( _rStorage ) { }
     };
 
-    //---------------------------------------------------------------------
+
     /// functor which allows storing a string
     struct StoreString
             :public ::std::unary_function< OUString, void >
@@ -293,7 +293,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     /// functor which stores the local name of a TemplateContent
     struct StoreLocalContentName
             :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
@@ -310,7 +310,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     struct StoreContentURL
             :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
             ,public StoreString
@@ -334,7 +334,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     /// functor which stores the complete content of a TemplateContent
     struct StoreFolderContent
             :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
@@ -382,7 +382,7 @@ namespace svt
         }
     };
 
-    //---------------------------------------------------------------------
+
     /// functor which reads a complete TemplateContent instance
     struct ReadFolderContent
             :public ::std::unary_function< ::rtl::Reference< TemplateContent >, void >
@@ -488,7 +488,7 @@ namespace svt
         uno::Reference< util::XOfficeInstallationDirectories > getOfficeInstDirs();
     };
 
-    //---------------------------------------------------------------------
+
     TemplateFolderCacheImpl::TemplateFolderCacheImpl( sal_Bool _bAutoStoreState )
         :m_pCacheStream         ( NULL )
         ,m_bNeedsUpdate         ( sal_True )
@@ -498,7 +498,7 @@ namespace svt
     {
     }
 
-    //---------------------------------------------------------------------
+
     TemplateFolderCacheImpl::~TemplateFolderCacheImpl( )
     {
         // store the current state if possible and required
@@ -508,7 +508,7 @@ namespace svt
         closeCacheStream( );
     }
 
-    //---------------------------------------------------------------------
+
     sal_Int32 TemplateFolderCacheImpl::getMagicNumber()
     {
         sal_Int32 nMagic = 0;
@@ -519,20 +519,20 @@ namespace svt
         return nMagic;
     }
 
-    //---------------------------------------------------------------------
+
     OUString TemplateFolderCacheImpl::getCacheFileName()
     {
         return OUString(".templdir.cache");
     }
 
 
-    //---------------------------------------------------------------------
+
     void TemplateFolderCacheImpl::normalize( TemplateFolderContent& _rState )
     {
         SubContentSort()( _rState );
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCacheImpl::equalStates( const TemplateFolderContent& _rLHS, const TemplateFolderContent& _rRHS )
     {
         if ( _rLHS.size() != _rRHS.size() )
@@ -551,7 +551,7 @@ namespace svt
         return aFirstDifferent.first == _rLHS.end();
     }
 
-    //---------------------------------------------------------------------
+
     void TemplateFolderCacheImpl::storeState( sal_Bool _bForceRetrieval )
     {
         if ( !m_bValidCurrentState || _bForceRetrieval )
@@ -580,7 +580,7 @@ namespace svt
         }
     }
 
-    //---------------------------------------------------------------------
+
     OUString TemplateFolderCacheImpl::implParseSmart( const OUString& _rPath )
     {
         INetURLObject aParser;
@@ -595,13 +595,13 @@ namespace svt
         return aParser.GetMainURL( INetURLObject::DECODE_TO_IURI );
     }
 
-    //---------------------------------------------------------------------
+
     void TemplateFolderCacheImpl::closeCacheStream( )
     {
         DELETEZ( m_pCacheStream );
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCacheImpl::implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot )
     {
         try
@@ -672,7 +672,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCacheImpl::readCurrentState()
     {
         // reset
@@ -718,7 +718,7 @@ namespace svt
         return m_bValidCurrentState;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCacheImpl::readPreviousState()
     {
         DBG_ASSERT( m_pCacheStream, "TemplateFolderCacheImpl::readPreviousState: not to be called without stream!" );
@@ -765,7 +765,7 @@ namespace svt
         return sal_True;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCacheImpl::openCacheStream( sal_Bool _bForRead )
     {
         // close any old stream instance
@@ -798,7 +798,7 @@ namespace svt
         return NULL != m_pCacheStream;
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCacheImpl::needsUpdate( sal_Bool _bForceCheck )
     {
         if ( m_bKnowState && !_bForceCheck )
@@ -825,7 +825,7 @@ namespace svt
         return m_bNeedsUpdate;
     }
 
-    //---------------------------------------------------------------------
+
     uno::Reference< util::XOfficeInstallationDirectories >
     TemplateFolderCacheImpl::getOfficeInstDirs()
     {
@@ -845,25 +845,25 @@ namespace svt
     //=====================================================================
     //= TemplateFolderCache
     //=====================================================================
-    //---------------------------------------------------------------------
+
     TemplateFolderCache::TemplateFolderCache( sal_Bool _bAutoStoreState )
         :m_pImpl( new TemplateFolderCacheImpl( _bAutoStoreState ) )
     {
     }
 
-    //---------------------------------------------------------------------
+
     TemplateFolderCache::~TemplateFolderCache( )
     {
         DELETEZ( m_pImpl );
     }
 
-    //---------------------------------------------------------------------
+
     sal_Bool TemplateFolderCache::needsUpdate( sal_Bool _bForceCheck )
     {
         return m_pImpl->needsUpdate( _bForceCheck );
     }
 
-    //---------------------------------------------------------------------
+
     void TemplateFolderCache::storeState( sal_Bool _bForceRetrieval )
     {
         m_pImpl->storeState( _bForceRetrieval );
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 2d56c4a37df3..65de5d70cd6d 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -59,9 +59,9 @@
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
 
-// --------------
+
 // - Namespaces -
-// --------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -71,9 +71,9 @@ using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::datatransfer::dnd;
 
-// --------------------------------
+
 // - TransferableObjectDescriptor -
-// --------------------------------
+
 
 #define TOD_SIG1 0x01234567
 #define TOD_SIG2 0x89abcdef
@@ -112,7 +112,7 @@ SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc )
     return rIStm;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc )
 {
@@ -140,7 +140,7 @@ SvStream& WriteTransferableObjectDescriptor( SvStream& rOStm, const Transferable
     return rOStm;
 }
 
-// -----------------------------------------------------------------------------
+
 // the reading of the parameter is done using the special service ::com::sun::star::datatransfer::MimeContentType,
 // a similar approach should be implemented for creation of the mimetype string;
 // for now the set of acceptable characters has to be hardcoded, in future it should be part of the service that creates the mimetype
@@ -211,7 +211,7 @@ static OUString ImplGetParameterString( const TransferableObjectDescriptor& rObj
     return aParams;
 }
 
-// -----------------------------------------------------------------------------
+
 
 static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, const DataFlavorEx& rFlavorEx )
 {
@@ -282,43 +282,43 @@ static void ImplSetParameterString( TransferableObjectDescriptor& rObjDesc, cons
     }
 }
 
-// -----------------------------------------
+
 // - TransferableHelper::TerminateListener -
-// -----------------------------------------
+
 
 TransferableHelper::TerminateListener::TerminateListener( TransferableHelper& rTransferableHelper ) :
     mrParent( rTransferableHelper )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableHelper::TerminateListener::~TerminateListener()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::TerminateListener::disposing( const EventObject& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::TerminateListener::queryTermination( const EventObject& ) throw( TerminationVetoException, RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::TerminateListener::notifyTermination( const EventObject& ) throw( RuntimeException )
 {
     mrParent.ImplFlush();
 }
 
-// ----------------------
+
 // - TransferableHelper -
-// ----------------------
+
 
 TransferableHelper::TransferableHelper() :
     mpFormats( new DataFlavorExVector ),
@@ -326,7 +326,7 @@ TransferableHelper::TransferableHelper() :
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableHelper::~TransferableHelper()
 {
@@ -334,7 +334,7 @@ TransferableHelper::~TransferableHelper()
     delete mpFormats;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) throw( UnsupportedFlavorException, IOException, RuntimeException )
 {
@@ -453,7 +453,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th
     return maAny;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() throw( RuntimeException )
 {
@@ -480,7 +480,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException )
 {
@@ -508,7 +508,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw( RuntimeException )
 {
@@ -531,13 +531,13 @@ void SAL_CALL TransferableHelper::lostOwnership( const Reference< XClipboard >&,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::disposing( const EventObject& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE ) throw( RuntimeException )
 {
@@ -553,31 +553,31 @@ void SAL_CALL TransferableHelper::dragDropEnd( const DragSourceDropEvent& rDSDE
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::dragEnter( const DragSourceDragEvent& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::dragExit( const DragSourceEvent& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::dragOver( const DragSourceDragEvent& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableHelper::dropActionChanged( const DragSourceDragEvent& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >& rId ) throw( RuntimeException )
 {
@@ -594,7 +594,7 @@ sal_Int64 SAL_CALL TransferableHelper::getSomething( const Sequence< sal_Int8 >&
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::ImplFlush()
 {
@@ -617,7 +617,7 @@ void TransferableHelper::ImplFlush()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::AddFormat( SotFormatStringId nFormat )
 {
@@ -627,7 +627,7 @@ void TransferableHelper::AddFormat( SotFormatStringId nFormat )
         AddFormat( aFlavor );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::AddFormat( const DataFlavor& rFlavor )
 {
@@ -685,7 +685,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::RemoveFormat( SotFormatStringId nFormat )
 {
@@ -695,7 +695,7 @@ void TransferableHelper::RemoveFormat( SotFormatStringId nFormat )
         RemoveFormat( aFlavor );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor )
 {
@@ -710,7 +710,7 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat )
 {
@@ -728,7 +728,7 @@ sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat )
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::ClearFormats()
 {
@@ -736,7 +736,7 @@ void TransferableHelper::ClearFormats()
     maAny.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& )
 {
@@ -744,7 +744,7 @@ sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& )
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor )
 {
@@ -767,7 +767,7 @@ sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavo
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor )
 {
@@ -807,7 +807,7 @@ sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataF
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& )
 {
@@ -822,7 +822,7 @@ sal_Bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const Data
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& )
 {
@@ -839,7 +839,7 @@ sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlav
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& )
 {
@@ -852,7 +852,7 @@ sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::su
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc,
                                                               const ::com::sun::star::datatransfer::DataFlavor& )
@@ -867,7 +867,7 @@ sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const Transferable
     return( maAny.hasValue() );
  }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
                                               const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
@@ -957,7 +957,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk,
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg,
                                            const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
@@ -972,7 +972,7 @@ sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg,
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const DataFlavor& rFlavor )
 {
@@ -1003,7 +1003,7 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec
     return( maAny.hasValue() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& )
 {
@@ -1011,19 +1011,19 @@ sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt3
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::DragFinished( sal_Int8 )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::ObjectReleased()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDesc )
 {
@@ -1034,7 +1034,7 @@ void TransferableHelper::PrepareOLE( const TransferableObjectDescriptor& rObjDes
         AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::CopyToClipboard( Window *pWindow ) const
 {
@@ -1067,7 +1067,7 @@ void TransferableHelper::CopyToClipboard( Window *pWindow ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::CopyToSelection( Window *pWindow ) const
 {
@@ -1097,7 +1097,7 @@ void TransferableHelper::CopyToSelection( Window *pWindow ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
                                     sal_Int32 nDnDPointer, sal_Int32 nDnDImage )
@@ -1146,7 +1146,7 @@ void TransferableHelper::StartDrag( Window* pWindow, sal_Int8 nDnDSourceActions,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableHelper::ClearSelection( Window *pWindow )
 {
@@ -1157,7 +1157,7 @@ void TransferableHelper::ClearSelection( Window *pWindow )
         xSelection->setContents( NULL, NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XClipboard> TransferableHelper::GetSystemClipboard()
 {
@@ -1179,9 +1179,9 @@ const Sequence< sal_Int8 >& TransferableHelper::getUnoTunnelId()
     return theTransferableHelperUnoTunnelId::get().getSeq();
 }
 
-// ---------------------------------
+
 // - TransferableClipboardNotifier -
-// ---------------------------------
+
 
 class TransferableClipboardNotifier : public ::cppu::WeakImplHelper1< XClipboardListener >
 {
@@ -1210,7 +1210,7 @@ public:
     void    dispose();
 };
 
-// -----------------------------------------------------------------------------
+
 
 TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< XClipboard >& _rxClipboard, TransferableDataHelper& _rListener, ::osl::Mutex& _rMutex )
     :mrMutex( _rMutex )
@@ -1228,7 +1228,7 @@ TransferableClipboardNotifier::TransferableClipboardNotifier( const Reference< X
     osl_atomic_decrement( &m_refCount );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::ClipboardEvent& event ) throw (RuntimeException)
 {
@@ -1242,7 +1242,7 @@ void SAL_CALL TransferableClipboardNotifier::changedContents( const clipboard::C
         mpListener->Rebind( event.Contents );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) throw (RuntimeException)
 {
@@ -1250,7 +1250,7 @@ void SAL_CALL TransferableClipboardNotifier::disposing( const EventObject& ) thr
     dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableClipboardNotifier::dispose()
 {
@@ -1265,9 +1265,9 @@ void TransferableClipboardNotifier::dispose()
     mpListener = NULL;
 }
 
-// -------------------------------
+
 // - TransferableDataHelper_Impl -
-// -------------------------------
+
 
 struct TransferableDataHelper_Impl
 {
@@ -1280,9 +1280,9 @@ struct TransferableDataHelper_Impl
     }
 };
 
-// --------------------------
+
 // - TransferableDataHelper -
-// --------------------------
+
 
 TransferableDataHelper::TransferableDataHelper() :
     mpFormats( new DataFlavorExVector ),
@@ -1291,7 +1291,7 @@ TransferableDataHelper::TransferableDataHelper() :
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableDataHelper::TransferableDataHelper( const Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) :
     mxTransfer( rxTransferable ),
@@ -1302,7 +1302,7 @@ TransferableDataHelper::TransferableDataHelper( const Reference< ::com::sun::sta
     InitFormats();
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rDataHelper ) :
     mxTransfer( rDataHelper.mxTransfer ),
@@ -1313,7 +1313,7 @@ TransferableDataHelper::TransferableDataHelper( const TransferableDataHelper& rD
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDataHelper& rDataHelper )
 {
@@ -1338,7 +1338,7 @@ TransferableDataHelper& TransferableDataHelper::operator=( const TransferableDat
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableDataHelper::~TransferableDataHelper()
 {
@@ -1351,7 +1351,7 @@ TransferableDataHelper::~TransferableDataHelper()
     delete mpImpl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor >& rDataFlavorSeq,
                                                      DataFlavorExVector& rDataFlavorExVector )
@@ -1446,7 +1446,7 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableDataHelper::InitFormats()
 {
@@ -1471,7 +1471,7 @@ void TransferableDataHelper::InitFormats()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const
 {
@@ -1492,7 +1492,7 @@ sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const
 {
@@ -1513,7 +1513,7 @@ sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt32 TransferableDataHelper::GetFormatCount() const
 {
@@ -1521,7 +1521,7 @@ sal_uInt32 TransferableDataHelper::GetFormatCount() const
     return mpFormats->size();
 }
 
-// -----------------------------------------------------------------------------
+
 
 
 SotFormatStringId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const
@@ -1531,7 +1531,7 @@ SotFormatStringId TransferableDataHelper::GetFormat( sal_uInt32 nFormat ) const
     return( ( nFormat < mpFormats->size() ) ? (*mpFormats)[ nFormat ].mnSotId : 0 );
 }
 
-// -----------------------------------------------------------------------------
+
 
 DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) const
 {
@@ -1546,7 +1546,7 @@ DataFlavor TransferableDataHelper::GetFormatDataFlavor( sal_uInt32 nFormat ) con
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XTransferable > TransferableDataHelper::GetXTransferable() const
 {
@@ -1571,7 +1571,7 @@ Reference< XTransferable > TransferableDataHelper::GetXTransferable() const
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const
 {
@@ -1585,7 +1585,7 @@ Any TransferableDataHelper::GetAny( SotFormatStringId nFormat ) const
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const
 {
@@ -1622,7 +1622,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr )
 {
@@ -1630,7 +1630,7 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString&
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetString( aFlavor, rStr ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr )
 {
@@ -1666,7 +1666,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString&
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmpEx )
 {
@@ -1688,7 +1688,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapE
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetBitmapEx( aFlavor, rBmpEx ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx )
 {
@@ -1775,7 +1775,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapE
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf )
 {
@@ -1783,7 +1783,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( SotFormatStringId nFormat, GDIM
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetGDIMetaFile( aFlavor, rMtf ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf )
 {
@@ -1828,7 +1828,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic )
 {
@@ -1850,7 +1850,7 @@ sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic&
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetGraphic( aFlavor, rGraphic ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic )
 {
@@ -1896,7 +1896,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap )
 {
@@ -1904,7 +1904,7 @@ sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMa
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetImageMap( aFlavor, rIMap ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap )
 {
@@ -1920,7 +1920,7 @@ sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransf
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc )
 {
@@ -1928,7 +1928,7 @@ sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStrin
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( aFlavor, rDesc ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc )
 {
@@ -1936,7 +1936,7 @@ sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::s
     return true;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk )
 {
@@ -1944,7 +1944,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INe
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetINetBookmark( aFlavor, rBmk ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk )
 {
@@ -2083,7 +2083,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat,
                                                 INetImage& rINtImg )
@@ -2092,7 +2092,7 @@ sal_Bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat,
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetINetImage( aFlavor, rINtImg ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetINetImage(
         const ::com::sun::star::datatransfer::DataFlavor& rFlavor,
@@ -2106,7 +2106,7 @@ sal_Bool TransferableDataHelper::GetINetImage(
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat,
                                                 FileList& rFileList )
@@ -2115,7 +2115,7 @@ sal_Bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat,
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetFileList( aFlavor, rFileList ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetFileList(
             const ::com::sun::star::datatransfer::DataFlavor&,
@@ -2151,7 +2151,7 @@ sal_Bool TransferableDataHelper::GetFileList(
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequence< sal_Int8 >& rSeq )
 {
@@ -2159,7 +2159,7 @@ sal_Bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequenc
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetSequence( aFlavor, rSeq ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequence< sal_Int8 >& rSeq )
 {
@@ -2171,7 +2171,7 @@ sal_Bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequenc
     return( aAny.hasValue() && ( aAny >>= rSeq ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rxStream )
 {
@@ -2179,7 +2179,7 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat,
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetSotStorageStream( aFlavor, rxStream ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream )
 {
@@ -2202,7 +2202,7 @@ sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Refe
     return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetInputStream( aFlavor, rxStream ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream )
 {
@@ -2215,7 +2215,7 @@ sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Refe
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewContent )
 {
@@ -2223,7 +2223,7 @@ void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewCon
     InitFormats();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferableDataHelper::StartClipboardListening( )
 {
@@ -2237,7 +2237,7 @@ sal_Bool TransferableDataHelper::StartClipboardListening( )
     return mpImpl->mpClipboardListener->isListening();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferableDataHelper::StopClipboardListening( )
 {
@@ -2251,7 +2251,7 @@ void TransferableDataHelper::StopClipboardListening( )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window * pWindow )
 {
@@ -2285,7 +2285,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSystemClipboard( Window
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWindow )
 {
@@ -2321,7 +2321,7 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWin
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor,
                                           const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor,
                                           sal_Bool )
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index eb282c13f6b6..2b27f9c0f0e5 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.cxx
@@ -33,9 +33,9 @@
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
 
-// --------------
+
 // - Namespaces -
-// --------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -44,28 +44,28 @@ using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::datatransfer::dnd;
 
-// -----------------------------------------
+
 // - DragSourceHelper::DragGestureListener -
-// -----------------------------------------
+
 
 DragSourceHelper::DragGestureListener::DragGestureListener( DragSourceHelper& rDragSourceHelper ) :
     mrParent( rDragSourceHelper )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 DragSourceHelper::DragGestureListener::~DragGestureListener()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DragSourceHelper::DragGestureListener::disposing( const EventObject& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( const DragGestureEvent& rDGE ) throw( RuntimeException )
 {
@@ -75,9 +75,9 @@ void SAL_CALL DragSourceHelper::DragGestureListener::dragGestureRecognized( cons
     mrParent.StartDrag( rDGE.DragAction, aPtPixel );
 }
 
-// --------------------
+
 // - DragSourceHelper -
-// --------------------
+
 
 DragSourceHelper::DragSourceHelper( Window* pWindow ) :
     mxDragGestureRecognizer( pWindow->GetDragGestureRecognizer() )
@@ -89,7 +89,7 @@ DragSourceHelper::DragSourceHelper( Window* pWindow ) :
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 DragSourceHelper::~DragSourceHelper()
 {
@@ -97,15 +97,15 @@ DragSourceHelper::~DragSourceHelper()
         mxDragGestureRecognizer->removeDragGestureListener( mxDragGestureListener );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void DragSourceHelper::StartDrag( sal_Int8, const Point& )
 {
 }
 
-// ----------------------------------------
+
 // - DropTargetHelper::DropTargetListener -
-// ----------------------------------------
+
 
 DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDropTargetHelper ) :
     mrParent( rDropTargetHelper ),
@@ -113,20 +113,20 @@ DropTargetHelper::DropTargetListener::DropTargetListener( DropTargetHelper& rDro
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 DropTargetHelper::DropTargetListener::~DropTargetListener()
 {
     delete mpLastDragOverEvent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DropTargetHelper::DropTargetListener::disposing( const EventObject& ) throw( RuntimeException )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEvent& rDTDE ) throw( RuntimeException )
 {
@@ -176,7 +176,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetDragEnterEvent& rDTDEE ) throw( RuntimeException )
 {
@@ -193,7 +193,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragEnter( const DropTargetD
     dragOver( rDTDEE );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDragEvent& rDTDE ) throw( RuntimeException )
 {
@@ -219,7 +219,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragOver( const DropTargetDr
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEvent& ) throw( RuntimeException )
 {
@@ -243,15 +243,15 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL DropTargetHelper::DropTargetListener::dropActionChanged( const DropTargetDragEvent& ) throw( RuntimeException )
 {
 }
 
-// --------------------
+
 // - DropTargetHelper -
-// --------------------
+
 
 DropTargetHelper::DropTargetHelper( Window* pWindow ) :
     mxDropTarget( pWindow->GetDropTarget() ),
@@ -260,7 +260,7 @@ DropTargetHelper::DropTargetHelper( Window* pWindow ) :
     ImplConstruct();
 }
 
-// -----------------------------------------------------------------------------
+
 
 DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget ) :
     mxDropTarget( rxDropTarget ),
@@ -269,7 +269,7 @@ DropTargetHelper::DropTargetHelper( const Reference< XDropTarget >& rxDropTarget
     ImplConstruct();
 }
 
-// -----------------------------------------------------------------------------
+
 
 DropTargetHelper::~DropTargetHelper()
 {
@@ -279,7 +279,7 @@ DropTargetHelper::~DropTargetHelper()
     delete mpFormats;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void DropTargetHelper::ImplConstruct()
 {
@@ -291,7 +291,7 @@ void DropTargetHelper::ImplConstruct()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDataFlavors )
 {
@@ -299,28 +299,28 @@ void DropTargetHelper::ImplBeginDrag( const Sequence< DataFlavor >& rSupportedDa
     TransferableDataHelper::FillDataFlavorExVector( rSupportedDataFlavors, *mpFormats );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void DropTargetHelper::ImplEndDrag()
 {
     mpFormats->clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int8 DropTargetHelper::AcceptDrop( const AcceptDropEvent& )
 {
     return( DNDConstants::ACTION_NONE );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& )
 {
     return( DNDConstants::ACTION_NONE );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat )
 {
@@ -339,7 +339,7 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat )
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor )
 {
@@ -358,9 +358,9 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor )
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 // TransferDataContainer
-// -----------------------------------------------------------------------------
+
 
 struct TDataCntnrEntry_Impl
 {
@@ -368,11 +368,11 @@ struct TDataCntnrEntry_Impl
     SotFormatStringId nId;
 };
 
-// -----------------------------------------------------------------------------
+
 
 typedef ::std::list< TDataCntnrEntry_Impl > TDataCntnrEntryList;
 
-// -----------------------------------------------------------------------------
+
 
 struct TransferDataContainer_Impl
 {
@@ -393,27 +393,27 @@ struct TransferDataContainer_Impl
     }
 };
 
-// -----------------------------------------------------------------------------
+
 
 TransferDataContainer::TransferDataContainer()
     : pImpl( new TransferDataContainer_Impl )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TransferDataContainer::~TransferDataContainer()
 {
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::AddSupportedFormats()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferDataContainer::GetData( const
             ::com::sun::star::datatransfer::DataFlavor& rFlavor )
@@ -460,7 +460,7 @@ sal_Bool TransferDataContainer::GetData( const
     return bFnd;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk )
 {
@@ -477,7 +477,7 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk )
      AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyAnyData( sal_uLong nFormatId,
                                         const sal_Char* pData, sal_uLong nLen )
@@ -495,7 +495,7 @@ void TransferDataContainer::CopyAnyData( sal_uLong nFormatId,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyByteString( sal_uLong nFormatId,
                                             const OString& rStr )
@@ -503,7 +503,7 @@ void TransferDataContainer::CopyByteString( sal_uLong nFormatId,
     CopyAnyData( nFormatId, rStr.getStr(), rStr.getLength() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyINetImage( const INetImage& rINtImg )
 {
@@ -514,7 +514,7 @@ void TransferDataContainer::CopyINetImage( const INetImage& rINtImg )
                     aMemStm.Seek( STREAM_SEEK_TO_END ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap )
 {
@@ -525,7 +525,7 @@ void TransferDataContainer::CopyImageMap( const ImageMap& rImgMap )
                     aMemStm.Seek( STREAM_SEEK_TO_END ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyGraphic( const Graphic& rGrf )
 {
@@ -551,7 +551,7 @@ void TransferDataContainer::CopyGraphic( const Graphic& rGrf )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyString( sal_uInt16 nFmt, const OUString& rStr )
 {
@@ -566,14 +566,14 @@ void TransferDataContainer::CopyString( sal_uInt16 nFmt, const OUString& rStr )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyString( const OUString& rStr )
 {
     CopyString( SOT_FORMAT_STRING, rStr );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::CopyAny( sal_uInt16 nFmt,
                                     const ::com::sun::star::uno::Any& rAny )
@@ -585,7 +585,7 @@ void TransferDataContainer::CopyAny( sal_uInt16 nFmt,
     AddFormat( aEntry.nId );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool TransferDataContainer::HasAnyData() const
 {
@@ -593,7 +593,7 @@ sal_Bool TransferDataContainer::HasAnyData() const
             0 != pImpl->pBookmk;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::StartDrag(
         Window* pWindow, sal_Int8 nDragSourceActions,
@@ -604,7 +604,7 @@ void TransferDataContainer::StartDrag(
                                     nDragPointer, nDragImage );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TransferDataContainer::DragFinished( sal_Int8 nDropAction )
 {
diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
index 1694ab9ac752..af3c2375cfa1 100644
--- a/svtools/source/misc/unitconv.cxx
+++ b/svtools/source/misc/unitconv.cxx
@@ -19,7 +19,7 @@
 
 #include <svtools/unitconv.hxx>
 
-// -----------------------------------------------------------------------
+
 
 void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll )
 {
@@ -79,7 +79,7 @@ void SetFieldUnit( MetricField& rField, FieldUnit eUnit, sal_Bool bAll )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll )
 {
@@ -116,7 +116,7 @@ void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, sal_Bool bAll )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit )
 {
     sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, (MapUnit)eUnit, MAP_100TH_MM );
@@ -125,7 +125,7 @@ void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit )
 {
@@ -151,7 +151,7 @@ long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit )
     return static_cast<long>(nUnitVal);
 }
 
-// -----------------------------------------------------------------------
+
 
 long CalcToUnit( float nIn, SfxMapUnit eUnit )
 {
@@ -183,7 +183,7 @@ long CalcToUnit( float nIn, SfxMapUnit eUnit )
 //! return (long)(nTmp * 20);
 }
 
-// -----------------------------------------------------------------------
+
 
 long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl )
 {
@@ -240,14 +240,14 @@ long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl )
     return nOut;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem )
 {
     return ItemToControl( nIn, eItem, eCtrl );
 }
 
-// -----------------------------------------------------------------------
+
 
 FieldUnit MapToFieldUnit( const SfxMapUnit eUnit )
 {
@@ -277,7 +277,7 @@ FieldUnit MapToFieldUnit( const SfxMapUnit eUnit )
     return FUNIT_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor )
 {
@@ -316,7 +316,7 @@ long CalcToPoint( long nIn, SfxMapUnit eUnit, sal_uInt16 nFactor )
     return nRet * nFactor / 20;
 }
 
-// -----------------------------------------------------------------------
+
 
 long CMToTwips( long nIn )
 {
@@ -327,7 +327,7 @@ long CMToTwips( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long MMToTwips( long nIn )
 {
@@ -338,7 +338,7 @@ long MMToTwips( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long InchToTwips( long nIn )
 {
@@ -349,7 +349,7 @@ long InchToTwips( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PointToTwips( long nIn )
 {
@@ -360,7 +360,7 @@ long PointToTwips( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PicaToTwips( long nIn )
 {
@@ -371,7 +371,7 @@ long PicaToTwips( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TwipsToCM( long nIn )
 {
@@ -379,7 +379,7 @@ long TwipsToCM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long InchToCM( long nIn )
 {
@@ -390,7 +390,7 @@ long InchToCM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long MMToCM( long nIn )
 {
@@ -398,7 +398,7 @@ long MMToCM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PointToCM( long nIn )
 {
@@ -409,7 +409,7 @@ long PointToCM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PicaToCM( long nIn)
 {
@@ -420,7 +420,7 @@ long PicaToCM( long nIn)
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TwipsToMM( long nIn )
 {
@@ -431,7 +431,7 @@ long TwipsToMM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long CMToMM( long nIn )
 {
@@ -442,7 +442,7 @@ long CMToMM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long InchToMM( long nIn )
 {
@@ -453,7 +453,7 @@ long InchToMM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PointToMM( long nIn )
 {
@@ -464,7 +464,7 @@ long PointToMM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PicaToMM( long nIn )
 {
@@ -475,7 +475,7 @@ long PicaToMM( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TwipsToInch( long nIn )
 {
@@ -483,7 +483,7 @@ long TwipsToInch( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long CMToInch( long nIn )
 {
@@ -494,7 +494,7 @@ long CMToInch( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long MMToInch( long nIn )
 {
@@ -505,7 +505,7 @@ long MMToInch( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PointToInch( long nIn )
 {
@@ -513,7 +513,7 @@ long PointToInch( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PicaToInch( long nIn )
 {
@@ -521,7 +521,7 @@ long PicaToInch( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TwipsToPoint( long nIn )
 {
@@ -529,7 +529,7 @@ long TwipsToPoint( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long InchToPoint( long nIn )
 {
@@ -540,7 +540,7 @@ long InchToPoint( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long CMToPoint( long nIn )
 {
@@ -551,7 +551,7 @@ long CMToPoint( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long MMToPoint( long nIn )
 {
@@ -562,7 +562,7 @@ long MMToPoint( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PicaToPoint( long nIn )
 {
@@ -570,7 +570,7 @@ long PicaToPoint( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TwipsToPica( long nIn )
 {
@@ -578,7 +578,7 @@ long TwipsToPica( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long InchToPica( long nIn )
 {
@@ -589,7 +589,7 @@ long InchToPica( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long PointToPica( long nIn )
 {
@@ -600,7 +600,7 @@ long PointToPica( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long CMToPica( long nIn )
 {
@@ -611,7 +611,7 @@ long CMToPica( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long MMToPica( long nIn )
 {
@@ -622,7 +622,7 @@ long MMToPica( long nIn )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Nothing( long nIn )
 {
@@ -641,7 +641,7 @@ FUNC_CONVERT ConvertTable[6][6] =
     { TwipsToCM,    TwipsToMM,  TwipsToInch, TwipsToPoint,TwipsToPica, Nothing }
 };
 
-// -----------------------------------------------------------------------
+
 
 long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
 {
diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx
index 06cb0759ec24..2aba8a64c362 100644
--- a/svtools/source/table/cellvalueconversion.cxx
+++ b/svtools/source/table/cellvalueconversion.cxx
@@ -64,7 +64,7 @@ namespace svt
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         double lcl_convertDateToDays( long const i_day, long const i_month, long const i_year )
         {
             long const nNullDateDays = ::Date::DateToDays( 1, 1, 1900 );
@@ -73,7 +73,7 @@ namespace svt
             return nValueDateDays - nNullDateDays;
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         double lcl_convertTimeToDays( long const i_hours, long const i_minutes, long const i_seconds, long const i_100thSeconds )
         {
             return Time( i_hours, i_minutes, i_seconds, i_100thSeconds ).GetTimeInDays();
@@ -312,7 +312,7 @@ namespace svt
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         bool lcl_ensureNumberFormatter( CellValueConversion_Data & io_data )
         {
             if ( io_data.bAttemptedFormatterCreation )
@@ -350,7 +350,7 @@ namespace svt
             return io_data.xNumberFormatter.is();
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         bool lcl_getValueNormalizer( CellValueConversion_Data & io_data, Type const & i_valueType,
             PValueNormalization & o_formatter )
         {
@@ -411,18 +411,18 @@ namespace svt
     //==================================================================================================================
     //= CellValueConversion
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     CellValueConversion::CellValueConversion()
         :m_pData( new CellValueConversion_Data )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     CellValueConversion::~CellValueConversion()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString CellValueConversion::convertToString( const Any& i_value )
     {
         OUString sStringValue;
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index ff098f243180..14ce3e8d1b56 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -43,7 +43,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= DefaultInputHandler
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultInputHandler::DefaultInputHandler()
         :m_pImpl( new DefaultInputHandler_Impl )
     {
@@ -52,12 +52,12 @@ namespace svt { namespace table
         m_pImpl->aMouseFunctions.push_back( new ColumnSortHandler );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultInputHandler::~DefaultInputHandler()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         bool lcl_delegateMouseEvent( DefaultInputHandler_Impl& i_impl, ITableControl& i_control, const MouseEvent& i_event,
@@ -115,25 +115,25 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::MouseMove( ITableControl& i_tableControl, const MouseEvent& i_event )
     {
         return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseMove );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::MouseButtonDown( ITableControl& i_tableControl, const MouseEvent& i_event )
     {
         return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseDown );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::MouseButtonUp( ITableControl& i_tableControl, const MouseEvent& i_event )
     {
         return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseUp );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::KeyInput( ITableControl& _rControl, const KeyEvent& rKEvt )
     {
         bool bHandled = false;
@@ -182,21 +182,21 @@ namespace svt { namespace table
         return bHandled;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::GetFocus( ITableControl& _rControl )
     {
         _rControl.showCursor();
         return false;   // continue processing
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::LoseFocus( ITableControl& _rControl )
     {
         _rControl.hideCursor();
         return false;   // continue processing
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::RequestHelp( ITableControl& _rControl, const HelpEvent& _rHEvt )
     {
         (void)_rControl;
@@ -205,7 +205,7 @@ namespace svt { namespace table
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::Command( ITableControl& _rControl, const CommandEvent& _rCEvt )
     {
         (void)_rControl;
@@ -214,7 +214,7 @@ namespace svt { namespace table
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::PreNotify( ITableControl& _rControl, NotifyEvent& _rNEvt )
     {
         (void)_rControl;
@@ -223,7 +223,7 @@ namespace svt { namespace table
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DefaultInputHandler::Notify( ITableControl& _rControl, NotifyEvent& _rNEvt )
     {
         (void)_rControl;
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 97bdd43ebe4d..dce27c49cf74 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -74,7 +74,7 @@ namespace svt { namespace table
         BitmapEx    m_sortDescending;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     BitmapEx const & CachedSortIndicator::getBitmapFor( OutputDevice const & i_device, long const i_headerHeight,
         StyleSettings const & i_style, bool const i_sortAscending )
     {
@@ -179,30 +179,30 @@ namespace svt { namespace table
     //==================================================================================================================
     //= GridTableRenderer
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     GridTableRenderer::GridTableRenderer( ITableModel& _rModel )
         :m_pImpl( new GridTableRenderer_Impl( _rModel ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     GridTableRenderer::~GridTableRenderer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool GridTableRenderer::useGridLines() const
     {
         return m_pImpl->bUseGridLines;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::useGridLines( bool const i_use )
     {
         m_pImpl->bUseGridLines = i_use;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         Color lcl_getEffectiveColor(
@@ -217,7 +217,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::PaintHeaderArea(
         OutputDevice& _rDevice, const Rectangle& _rArea, bool _bIsColHeaderArea, bool _bIsRowHeaderArea,
         const StyleSettings& _rStyle )
@@ -245,7 +245,7 @@ namespace svt { namespace table
         (void)_bIsRowHeaderArea;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::PaintColumnHeader( ColPos _nCol, bool _bActive, bool _bSelected,
         OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle )
     {
@@ -313,7 +313,7 @@ namespace svt { namespace table
         // selection for column header not yet implemented
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::PrepareRow( RowPos _nRow, bool i_hasControlFocus, bool _bSelected,
         OutputDevice& _rDevice, const Rectangle& _rRowArea, const StyleSettings& _rStyle )
     {
@@ -380,7 +380,7 @@ namespace svt { namespace table
         _rDevice.Pop();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::PaintRowHeader( bool i_hasControlFocus, bool _bSelected, OutputDevice& _rDevice, const Rectangle& _rArea,
         const StyleSettings& _rStyle )
     {
@@ -411,7 +411,7 @@ namespace svt { namespace table
         _rDevice.Pop();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     struct GridTableRenderer::CellRenderContext
     {
         OutputDevice&           rDevice;
@@ -433,7 +433,7 @@ namespace svt { namespace table
         }
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::PaintCell( ColPos const i_column, bool _bSelected, bool i_hasControlFocus,
         OutputDevice& _rDevice, const Rectangle& _rArea, const StyleSettings& _rStyle )
     {
@@ -464,7 +464,7 @@ namespace svt { namespace table
         _rDevice.Pop();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::impl_paintCellImage( CellRenderContext const & i_context, Image const & i_image )
     {
         Point imagePos( Point( i_context.aContentArea.Left(), i_context.aContentArea.Top() ) );
@@ -509,7 +509,7 @@ namespace svt { namespace table
         i_context.rDevice.DrawImage( imagePos, imageSize, i_image, nStyle );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::impl_paintCellContent( CellRenderContext const & i_context )
     {
         Any aCellContent;
@@ -534,7 +534,7 @@ namespace svt { namespace table
         impl_paintCellText( i_context, sText );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::impl_paintCellText( CellRenderContext const & i_context, OUString const & i_text )
     {
         if ( i_context.bSelected )
@@ -557,20 +557,20 @@ namespace svt { namespace table
         i_context.rDevice.DrawText( textRect, i_text, nDrawTextFlags );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::ShowCellCursor( Window& _rView, const Rectangle& _rCursorRect)
     {
         _rView.ShowFocus( _rCursorRect );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridTableRenderer::HideCellCursor( Window& _rView, const Rectangle& _rCursorRect)
     {
         (void)_rCursorRect;
         _rView.HideFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool GridTableRenderer::FitsIntoCell( Any const & i_cellContent, ColPos const i_colPos, RowPos const i_rowPos,
         bool const i_active, bool const i_selected, OutputDevice& i_targetDevice, Rectangle const & i_targetArea ) const
     {
@@ -613,7 +613,7 @@ namespace svt { namespace table
         return true;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool GridTableRenderer::GetFormattedCellString( Any const & i_cellValue, ColPos const i_colPos, RowPos const i_rowPos, OUString & o_cellString ) const
     {
         o_cellString = m_pImpl->aStringConverter.convertToString( i_cellValue );
diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx
index 1fe94b84d005..a015a82de44f 100644
--- a/svtools/source/table/mousefunction.cxx
+++ b/svtools/source/table/mousefunction.cxx
@@ -32,13 +32,13 @@ namespace svt { namespace table
     //==================================================================================================================
     //= MouseFunction
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     oslInterlockedCount MouseFunction::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     oslInterlockedCount MouseFunction::release()
     {
         oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
@@ -53,7 +53,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= ColumnResize
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult ColumnResize::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         Point const aPoint = i_event.GetPosPixel();
@@ -103,7 +103,7 @@ namespace svt { namespace table
         return ContinueFunction;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult ColumnResize::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         if ( m_nResizingColumn != COL_INVALID )
@@ -128,7 +128,7 @@ namespace svt { namespace table
         return SkipFunction;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult ColumnResize::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         if ( m_nResizingColumn == COL_INVALID )
@@ -183,7 +183,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= RowSelection
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult RowSelection::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         OSL_UNUSED( i_tableControl );
@@ -191,7 +191,7 @@ namespace svt { namespace table
         return SkipFunction;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult RowSelection::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         bool handled = false;
@@ -215,7 +215,7 @@ namespace svt { namespace table
         return handled ? ActivateFunction : SkipFunction;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult RowSelection::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         TableCell const tableCell = i_tableControl.hitTest( i_event.GetPosPixel() );
@@ -237,7 +237,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= ColumnSortHandler
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult ColumnSortHandler::handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         OSL_UNUSED( i_tableControl );
@@ -245,7 +245,7 @@ namespace svt { namespace table
         return SkipFunction;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult ColumnSortHandler::handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         if ( m_nActiveColumn != COL_INVALID )
@@ -268,7 +268,7 @@ namespace svt { namespace table
         return ActivateFunction;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FunctionResult ColumnSortHandler::handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event )
     {
         if ( m_nActiveColumn == COL_INVALID )
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index fe5b9d1595be..e874cfdb7231 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -45,7 +45,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= TableControl
     //==================================================================================================================
-    // -----------------------------------------------------------------------------------------------------------------
+
     TableControl::TableControl( Window* _pParent, WinBits _nStyle )
         :Control( _pParent, _nStyle )
         ,m_pImpl( new TableControl_Impl( *this ) )
@@ -61,7 +61,7 @@ namespace svt { namespace table
         SetCompoundControl( true );
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     TableControl::~TableControl()
     {
         ImplCallEventListeners( VCLEVENT_OBJECT_DYING );
@@ -71,21 +71,21 @@ namespace svt { namespace table
         m_pImpl.reset();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::GetFocus()
     {
         if ( !m_pImpl->getInputHandler()->GetFocus( *m_pImpl ) )
             Control::GetFocus();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::LoseFocus()
     {
         if ( !m_pImpl->getInputHandler()->LoseFocus( *m_pImpl ) )
             Control::LoseFocus();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::KeyInput( const KeyEvent& rKEvt )
     {
         if ( !m_pImpl->getInputHandler()->KeyInput( *m_pImpl, rKEvt ) )
@@ -114,7 +114,7 @@ namespace svt { namespace table
     }
 
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::StateChanged( StateChangedType i_nStateChange )
     {
         Control::StateChanged( i_nStateChange );
@@ -149,68 +149,68 @@ namespace svt { namespace table
         }
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::Resize()
     {
         Control::Resize();
         m_pImpl->onResize();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::SetModel( PTableModel _pModel )
     {
         m_pImpl->setModel( _pModel );
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     PTableModel TableControl::GetModel() const
     {
         return m_pImpl->getModel();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     sal_Int32 TableControl::GetCurrentRow() const
     {
         return m_pImpl->getCurrentRow();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     sal_Int32 TableControl::GetCurrentColumn() const
     {
         return m_pImpl->getCurrentColumn();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     bool TableControl::GoTo( ColPos _nColumn, RowPos _nRow )
     {
         return m_pImpl->goTo( _nColumn, _nRow );
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     sal_Bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos)
     {
         return m_pImpl->goTo( _nColPos, _nRowPos );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int32 TableControl::GetSelectedRowCount() const
     {
         return sal_Int32( m_pImpl->getSelectedRowCount() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int32 TableControl::GetSelectedRowIndex( sal_Int32 const i_selectionIndex ) const
     {
         return sal_Int32( m_pImpl->getSelectedRowIndex( i_selectionIndex ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableControl::IsRowSelected( sal_Int32 const i_rowIndex ) const
     {
         return m_pImpl->isRowSelected( i_rowIndex );
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::SelectRow( RowPos const i_rowIndex, bool const i_select )
     {
         ENSURE_OR_RETURN_VOID( ( i_rowIndex >= 0 ) && ( i_rowIndex < m_pImpl->getModel()->getRowCount() ),
@@ -231,7 +231,7 @@ namespace svt { namespace table
         Select();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     void TableControl::SelectAllRows( bool const i_select )
     {
         if ( i_select )
@@ -253,25 +253,25 @@ namespace svt { namespace table
         Select();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     ITableControl& TableControl::getTableControlInterface()
     {
         return *m_pImpl;
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     SelectionEngine* TableControl::getSelEngine()
     {
         return m_pImpl->getSelEngine();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     Window& TableControl::getDataWindow()
     {
         return m_pImpl->getDataWindow();
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > TableControl::CreateAccessible()
     {
         Window* pParent = GetAccessibleParentWindow();
@@ -280,7 +280,7 @@ namespace svt { namespace table
         return m_pImpl->getAccessible( *pParent );
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     Reference<XAccessible> TableControl::CreateAccessibleControl( sal_Int32 _nIndex )
     {
         (void)_nIndex;
@@ -288,7 +288,7 @@ namespace svt { namespace table
         return NULL;
     }
 
-    // -----------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetAccessibleObjectName( AccessibleTableControlObjType eObjType, sal_Int32 _nRow, sal_Int32 _nCol) const
     {
         OUString aRetText;
@@ -332,7 +332,7 @@ namespace svt { namespace table
         return aRetText;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetAccessibleObjectDescription( AccessibleTableControlObjType eObjType, sal_Int32 ) const
     {
         OUString aRetText;
@@ -372,14 +372,14 @@ namespace svt { namespace table
         return aRetText;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetRowDescription( sal_Int32 _nRow) const
     {
         (void)_nRow;
         return OUString( "row description" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetRowName( sal_Int32 _nIndex) const
     {
         OUString sRowName;
@@ -387,20 +387,20 @@ namespace svt { namespace table
         return sRowName;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetColumnDescription( sal_uInt16 _nColumn) const
     {
         (void)_nColumn;
         return OUString( "col description" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetColumnName( sal_Int32 _nIndex) const
     {
         return GetModel()->getColumnModel(_nIndex)->getName();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::com::sun::star::uno::Any TableControl::GetCellContent( sal_Int32 _nRowPos, sal_Int32 _nColPos ) const
     {
         Any aCellContent;
@@ -408,13 +408,13 @@ namespace svt { namespace table
         return aCellContent;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString TableControl::GetAccessibleCellText( sal_Int32 _nRowPos, sal_Int32 _nColPos) const
     {
         return m_pImpl->getCellContentAsString( _nRowPos, _nColPos );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl::FillAccessibleStateSet(
             ::utl::AccessibleStateSetHelper& rStateSet,
             AccessibleTableControlObjType eObjType ) const
@@ -485,63 +485,63 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl::commitCellEventIfAccessibleAlive( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue )
     {
         if ( m_pImpl->isAccessibleAlive() )
             m_pImpl->commitCellEvent( i_eventID, i_newValue, i_oldValue );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl::commitTableEventIfAccessibleAlive( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue )
     {
         if ( m_pImpl->isAccessibleAlive() )
             m_pImpl->commitTableEvent( i_eventID, i_newValue, i_oldValue );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl::GetWindowExtentsRelative( Window *pRelativeWindow ) const
     {
         return Control::GetWindowExtentsRelative( pRelativeWindow );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl::GrabFocus()
     {
         Control::GrabFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > TableControl::GetAccessible( sal_Bool bCreate )
     {
         return Control::GetAccessible( bCreate );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Window* TableControl::GetAccessibleParentWindow() const
     {
         return Control::GetAccessibleParentWindow();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Window* TableControl::GetWindowInstance()
     {
         return this;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool TableControl::HasRowHeader()
     {
         return GetModel()->hasRowHeaders();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool TableControl::HasColHeader()
     {
         return GetModel()->hasColumnHeaders();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int32 TableControl::GetAccessibleControlCount() const
     {
         // TC_TABLE is always defined, no matter whether empty or not
@@ -553,7 +553,7 @@ namespace svt { namespace table
         return count;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool TableControl::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )
     {
         sal_Int32 nRow = m_pImpl->getRowAtPoint( _rPoint );
@@ -562,25 +562,25 @@ namespace svt { namespace table
         return nRow >= 0 ? sal_True : sal_False;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     long TableControl::GetRowCount() const
     {
         return GetModel()->getRowCount();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     long TableControl::GetColumnCount() const
     {
         return GetModel()->getColumnCount();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool TableControl::HasRowHeader() const
     {
         return GetModel()->hasRowHeaders();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool TableControl::ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )
     {
         _rnRow = m_pImpl->getRowAtPoint( _rPoint );
@@ -588,7 +588,7 @@ namespace svt { namespace table
         return _rnRow >= 0 ? sal_True : sal_False;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl::FillAccessibleStateSetForCell( ::utl::AccessibleStateSetHelper& _rStateSet, sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const
     {
         if ( IsRowSelected( _nRow ) )
@@ -607,7 +607,7 @@ namespace svt { namespace table
         (void)_nColumnPos;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex)
     {
         (void)_nRow;
@@ -615,7 +615,7 @@ namespace svt { namespace table
         return GetCharacterBounds(nIndex);
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int32 TableControl::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint)
     {
         (void)_nRow;
@@ -623,40 +623,40 @@ namespace svt { namespace table
         return GetIndexForPoint(_rPoint);
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen)
     {
         (void)_bOnScreen;
         return m_pImpl->calcHeaderRect( _bIsColumnBar ? false : true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl::calcHeaderCellRect( sal_Bool _bIsColumnBar, sal_Int32 nPos )
     {
         return m_pImpl->calcHeaderCellRect( _bIsColumnBar, nPos );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl::calcTableRect(sal_Bool _bOnScreen)
     {
         (void)_bOnScreen;
         return m_pImpl->calcTableRect();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl::calcCellRect( sal_Int32 _nRowPos, sal_Int32 _nColPos )
     {
         return m_pImpl->calcCellRect( _nRowPos, _nColPos );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(TableControl, ImplSelectHdl)
     {
         Select();
         return 1;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl::Select()
     {
         ImplCallEventListenersAndHandler( VCLEVENT_TABLEROW_SELECT, m_pImpl->getSelectHandler(), this );
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 81334babb123..e1437e05258a 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -294,7 +294,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     const sal_Char* TableControl_Impl::impl_checkInvariants() const
     {
         if ( !m_pModel )
@@ -426,7 +426,7 @@ namespace svt { namespace table
 #define DBG_CHECK_ME() \
     DBG_CHKTHIS( TableControl_Impl, TableControl_Impl_checkInvariants )
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableControl_Impl::TableControl_Impl( TableControl& _rAntiImpl )
         :m_rAntiImpl            ( _rAntiImpl                    )
         ,m_pModel               ( new EmptyTableModel           )
@@ -462,7 +462,7 @@ namespace svt { namespace table
         m_pDataWindow->Show();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableControl_Impl::~TableControl_Impl()
     {
         DBG_DTOR( TableControl_Impl, TableControl_Impl_checkInvariants );
@@ -474,7 +474,7 @@ namespace svt { namespace table
         DELETEZ( m_pSelEngine );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::setModel( PTableModel _pModel )
     {
         DBG_CHECK_ME();
@@ -505,7 +505,7 @@ namespace svt { namespace table
         if ( m_nColumnCount ) m_nCurColumn = 0;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         bool lcl_adjustSelectedRows( ::std::vector< RowPos >& io_selectionIndexes, RowPos const i_firstAffectedRowIndex, TableSize const i_offset )
@@ -525,7 +525,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::rowsInserted( RowPos i_first, RowPos i_last )
     {
         DBG_CHECK_ME();
@@ -563,7 +563,7 @@ namespace svt { namespace table
             m_rAntiImpl.Select();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::rowsRemoved( RowPos i_first, RowPos i_last )
     {
         sal_Int32 firstRemovedRow = i_first;
@@ -639,7 +639,7 @@ namespace svt { namespace table
             m_rAntiImpl.Select();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::columnInserted( ColPos const i_colIndex )
     {
         m_nColumnCount = m_pModel->getColumnCount();
@@ -650,7 +650,7 @@ namespace svt { namespace table
         OSL_UNUSED( i_colIndex );
    }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::columnRemoved( ColPos const i_colIndex )
     {
         m_nColumnCount = m_pModel->getColumnCount();
@@ -671,7 +671,7 @@ namespace svt { namespace table
         OSL_UNUSED( i_colIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::allColumnsRemoved()
     {
         m_nColumnCount = m_pModel->getColumnCount();
@@ -680,7 +680,7 @@ namespace svt { namespace table
         m_rAntiImpl.Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::cellsUpdated( ColPos const i_firstCol, ColPos i_lastCol, RowPos const i_firstRow, RowPos const i_lastRow )
     {
         invalidateRowRange( i_firstRow, i_lastRow );
@@ -689,7 +689,7 @@ namespace svt { namespace table
         OSL_UNUSED( i_lastCol );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::tableMetricsChanged()
     {
         impl_ni_updateCachedTableMetrics();
@@ -697,7 +697,7 @@ namespace svt { namespace table
         m_rAntiImpl.Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_invalidateColumn( ColPos const i_column )
     {
         DBG_CHECK_ME();
@@ -709,7 +709,7 @@ namespace svt { namespace table
             m_rAntiImpl.Invalidate( aColumn.getRect() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::columnChanged( ColPos const i_column, ColumnAttributeGroup const i_attributeGroup )
     {
         ColumnAttributeGroup nGroup( i_attributeGroup );
@@ -734,7 +734,7 @@ namespace svt { namespace table
             "TableControl_Impl::columnChanged: don't know how to handle this change!" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl_Impl::impl_getAllVisibleCellsArea() const
     {
         DBG_CHECK_ME();
@@ -772,7 +772,7 @@ namespace svt { namespace table
         return aArea;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle TableControl_Impl::impl_getAllVisibleDataCellArea() const
     {
         DBG_CHECK_ME();
@@ -783,7 +783,7 @@ namespace svt { namespace table
         return aArea;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_ni_updateCachedTableMetrics()
     {
         m_nRowHeightPixel = m_rAntiImpl.LogicToPixel( Size( 0, m_pModel->getRowHeight() ), MAP_APPFONT ).Height();
@@ -797,7 +797,7 @@ namespace svt { namespace table
             m_nRowHeaderWidthPixel = m_rAntiImpl.LogicToPixel( Size( m_pModel->getRowHeaderWidth(), 0 ), MAP_APPFONT).Width();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_ni_updateCachedModelValues()
     {
         m_pInputHandler = m_pModel->getInputHandler();
@@ -815,7 +815,7 @@ namespace svt { namespace table
         impl_ni_updateCachedTableMetrics();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         //..............................................................................................................
@@ -923,7 +923,7 @@ namespace svt { namespace table
 
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     long TableControl_Impl::impl_ni_calculateColumnWidths( ColPos const i_assumeInflexibleColumnsUpToIncluding,
         bool const i_assumeVerticalScrollbar, ::std::vector< long >& o_newColWidthsPixel ) const
     {
@@ -1176,7 +1176,7 @@ namespace svt { namespace table
         return gridWidthPixel;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_ni_relayout( ColPos const i_assumeInflexibleColumnsUpToIncluding )
     {
         ENSURE_OR_RETURN_VOID( !m_bUpdatingColWidths, "TableControl_Impl::impl_ni_relayout: recursive call detected!" );
@@ -1310,7 +1310,7 @@ namespace svt { namespace table
         impl_ni_positionChildWindows( aDataCellPlayground, bNeedVerticalScrollbar, bNeedHorizontalScrollbar );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_ni_positionChildWindows( Rectangle const & i_dataCellPlayground,
         bool const i_verticalScrollbar, bool const i_horizontalScrollbar )
     {
@@ -1403,7 +1403,7 @@ namespace svt { namespace table
         ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::onResize()
     {
         DBG_CHECK_ME();
@@ -1412,7 +1412,7 @@ namespace svt { namespace table
         checkCursorPosition();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::doPaintContent( const Rectangle& _rUpdateRect )
     {
         DBG_CHECK_ME();
@@ -1536,7 +1536,7 @@ namespace svt { namespace table
             }
         }
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::hideCursor()
     {
         DBG_CHECK_ME();
@@ -1545,7 +1545,7 @@ namespace svt { namespace table
             impl_ni_doSwitchCursor( false );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::showCursor()
     {
         DBG_CHECK_ME();
@@ -1555,7 +1555,7 @@ namespace svt { namespace table
             impl_ni_doSwitchCursor( true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableControl_Impl::dispatchAction( TableControlAction _eAction )
     {
         DBG_CHECK_ME();
@@ -1929,7 +1929,7 @@ namespace svt { namespace table
         return bSuccess;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_ni_doSwitchCursor( bool _bShow )
     {
         PTableRenderer pRenderer = !!m_pModel ? m_pModel->getRenderer() : PTableRenderer();
@@ -1944,7 +1944,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_getCellRect( ColPos _nColumn, RowPos _nRow, Rectangle& _rCellRect ) const
     {
         DBG_CHECK_ME();
@@ -1962,21 +1962,21 @@ namespace svt { namespace table
         _rCellRect = aCell.getRect();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     RowPos TableControl_Impl::getRowAtPoint( const Point& rPoint ) const
     {
         DBG_CHECK_ME();
         return impl_getRowForAbscissa( rPoint.Y() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ColPos TableControl_Impl::getColAtPoint( const Point& rPoint ) const
     {
         DBG_CHECK_ME();
         return impl_getColumnForOrdinate( rPoint.X() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableCell TableControl_Impl::hitTest( Point const & i_point ) const
     {
         TableCell aCell( getColAtPoint( i_point ), getRowAtPoint( i_point ) );
@@ -1995,7 +1995,7 @@ namespace svt { namespace table
         return aCell;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ColumnMetrics TableControl_Impl::getColumnMetrics( ColPos const i_column ) const
     {
         DBG_CHECK_ME();
@@ -2005,50 +2005,50 @@ namespace svt { namespace table
         return (ColumnMetrics const &)m_aColumnWidths[ i_column ];
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PTableModel TableControl_Impl::getModel() const
     {
         return m_pModel;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     RowPos TableControl_Impl::getCurrentColumn() const
     {
         return m_nCurColumn;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     RowPos TableControl_Impl::getCurrentRow() const
     {
         return m_nCurRow;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::Size TableControl_Impl::getTableSizePixel() const
     {
         return m_pDataWindow->GetOutputSizePixel();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::setPointer( Pointer const & i_pointer )
     {
         DBG_CHECK_ME();
         m_pDataWindow->SetPointer( i_pointer );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::captureMouse()
     {
         m_pDataWindow->CaptureMouse();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::releaseMouse()
     {
         m_pDataWindow->ReleaseMouse();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::invalidate( TableArea const i_what )
     {
         switch ( i_what )
@@ -2072,38 +2072,38 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     long TableControl_Impl::pixelWidthToAppFont( long const i_pixels ) const
     {
         return m_pDataWindow->PixelToLogic( Size( i_pixels, 0 ), MAP_APPFONT ).Width();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     long TableControl_Impl::appFontWidthToPixel( long const i_appFontUnits ) const
     {
         return m_pDataWindow->LogicToPixel( Size( i_appFontUnits, 0 ), MAP_APPFONT ).Width();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::hideTracking()
     {
         m_pDataWindow->HideTracking();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::showTracking( Rectangle const & i_location, sal_uInt16 const i_flags )
     {
         m_pDataWindow->ShowTracking( i_location, i_flags );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableControl_Impl::activateCell( ColPos const i_col, RowPos const i_row )
     {
         DBG_CHECK_ME();
         return goTo( i_col, i_row );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::invalidateSelectedRegion( RowPos _nPrevRow, RowPos _nCurRow )
     {
         DBG_CHECK_ME();
@@ -2149,7 +2149,7 @@ namespace svt { namespace table
             m_pDataWindow->GetControlBackground().GetTransparency() ? INVALIDATE_TRANSPARENT : 0 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::invalidateSelectedRows()
     {
         for (   ::std::vector< RowPos >::iterator selRow = m_aSelectedRows.begin();
@@ -2161,7 +2161,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::invalidateRowRange( RowPos const i_firstRow, RowPos const i_lastRow )
     {
         RowPos const firstRow = i_firstRow < m_nTopRow ? m_nTopRow : i_firstRow;
@@ -2184,7 +2184,7 @@ namespace svt { namespace table
         invalidateRect(aInvalidateRect);
     }
 
-    //------------------------------------------------------------------------------
+
     void TableControl_Impl::checkCursorPosition()
     {
         DBG_CHECK_ME();
@@ -2216,7 +2216,7 @@ namespace svt { namespace table
         m_pDataWindow->Invalidate();
     }
 
-    //--------------------------------------------------------------------
+
     TableSize TableControl_Impl::impl_getVisibleRows( bool _bAcceptPartialRow ) const
     {
         DBG_CHECK_ME();
@@ -2230,7 +2230,7 @@ namespace svt { namespace table
         );
     }
 
-    //--------------------------------------------------------------------
+
     TableSize TableControl_Impl::impl_getVisibleColumns( bool _bAcceptPartialCol ) const
     {
         DBG_CHECK_ME();
@@ -2245,7 +2245,7 @@ namespace svt { namespace table
         );
     }
 
-    //--------------------------------------------------------------------
+
     bool TableControl_Impl::goTo( ColPos _nColumn, RowPos _nRow )
     {
         DBG_CHECK_ME();
@@ -2269,7 +2269,7 @@ namespace svt { namespace table
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void TableControl_Impl::ensureVisible( ColPos _nColumn, RowPos _nRow, bool _bAcceptPartialVisibility )
     {
         DBG_CHECK_ME();
@@ -2302,7 +2302,7 @@ namespace svt { namespace table
         }
     }
 
-    //--------------------------------------------------------------------
+
     OUString TableControl_Impl::getCellContentAsString( RowPos const i_row, ColPos const i_col )
     {
         Any aCellValue;
@@ -2314,7 +2314,7 @@ namespace svt { namespace table
         return sCellStringContent;
     }
 
-    //--------------------------------------------------------------------
+
     TableSize TableControl_Impl::impl_ni_ScrollRows( TableSize _nRowDelta )
     {
         // compute new top row
@@ -2373,14 +2373,14 @@ namespace svt { namespace table
         return (TableSize)( m_nTopRow - nOldTopRow );
     }
 
-    //--------------------------------------------------------------------
+
     TableSize TableControl_Impl::impl_scrollRows( TableSize const i_rowDelta )
     {
         DBG_CHECK_ME();
         return impl_ni_ScrollRows( i_rowDelta );
     }
 
-    //--------------------------------------------------------------------
+
     TableSize TableControl_Impl::impl_ni_ScrollColumns( TableSize _nColumnDelta )
     {
         // compute new left column
@@ -2447,38 +2447,38 @@ namespace svt { namespace table
         return (TableSize)( m_nLeftColumn - nOldLeftColumn );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableSize TableControl_Impl::impl_scrollColumns( TableSize const i_columnDelta )
     {
         DBG_CHECK_ME();
         return impl_ni_ScrollColumns( i_columnDelta );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SelectionEngine* TableControl_Impl::getSelEngine()
     {
         return m_pSelEngine;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ScrollBar* TableControl_Impl::getHorzScrollbar()
     {
         return m_pHScroll;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ScrollBar* TableControl_Impl::getVertScrollbar()
     {
         return m_pVScroll;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableControl_Impl::isRowSelected( RowPos i_row ) const
     {
         return ::std::find( m_aSelectedRows.begin(), m_aSelectedRows.end(), i_row ) != m_aSelectedRows.end();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     RowPos TableControl_Impl::getSelectedRowIndex( size_t const i_selectionIndex ) const
     {
         if ( i_selectionIndex < m_aSelectedRows.size() )
@@ -2486,7 +2486,7 @@ namespace svt { namespace table
         return ROW_INVALID;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     int TableControl_Impl::getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current)
     {
         std::vector<RowPos>::const_iterator it = ::std::find(selectedRows.begin(),selectedRows.end(),current);
@@ -2497,7 +2497,7 @@ namespace svt { namespace table
         return -1;
     }
 
-    //--------------------------------------------------------------------
+
     ColPos TableControl_Impl::impl_getColumnForOrdinate( long const i_ordinate ) const
     {
         DBG_CHECK_ME();
@@ -2525,7 +2525,7 @@ namespace svt { namespace table
         return lowerBound - m_aColumnWidths.begin();
     }
 
-    //--------------------------------------------------------------------
+
     RowPos TableControl_Impl::impl_getRowForAbscissa( long const i_abscissa ) const
     {
         DBG_CHECK_ME();
@@ -2541,7 +2541,7 @@ namespace svt { namespace table
         return row < m_pModel->getRowCount() ? row : ROW_INVALID;
     }
 
-    //--------------------------------------------------------------------
+
     bool TableControl_Impl::markRowAsDeselected( RowPos const i_rowIndex )
     {
         DBG_CHECK_ME();
@@ -2554,7 +2554,7 @@ namespace svt { namespace table
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool TableControl_Impl::markRowAsSelected( RowPos const i_rowIndex )
     {
         DBG_CHECK_ME();
@@ -2586,7 +2586,7 @@ namespace svt { namespace table
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool TableControl_Impl::markAllRowsAsDeselected()
     {
         if ( m_aSelectedRows.empty() )
@@ -2596,7 +2596,7 @@ namespace svt { namespace table
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     bool TableControl_Impl::markAllRowsAsSelected()
     {
         DBG_CHECK_ME();
@@ -2623,13 +2623,13 @@ namespace svt { namespace table
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void TableControl_Impl::commitAccessibleEvent( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue )
     {
         impl_commitAccessibleEvent( i_eventID, i_newValue, i_oldValue );
     }
 
-    //--------------------------------------------------------------------
+
     void TableControl_Impl::commitCellEvent( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue )
     {
         DBG_CHECK_ME();
@@ -2637,7 +2637,7 @@ namespace svt { namespace table
              m_pAccessibleTable->commitCellEvent( i_eventID, i_newValue, i_oldValue );
     }
 
-    //--------------------------------------------------------------------
+
     void TableControl_Impl::commitTableEvent( sal_Int16 const i_eventID, const Any& i_newValue, const Any& i_oldValue )
     {
         DBG_CHECK_ME();
@@ -2645,7 +2645,7 @@ namespace svt { namespace table
              m_pAccessibleTable->commitTableEvent( i_eventID, i_newValue, i_oldValue );
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle TableControl_Impl::calcHeaderRect(bool bColHeader)
     {
         Rectangle const aRectTableWithHeaders( impl_getAllVisibleCellsArea() );
@@ -2656,7 +2656,7 @@ namespace svt { namespace table
             return Rectangle( aRectTableWithHeaders.TopLeft(), Size( m_nRowHeaderWidthPixel, aSizeTableWithHeaders.Height() ) );
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle TableControl_Impl::calcHeaderCellRect( bool bColHeader, sal_Int32 nPos )
     {
         Rectangle const aHeaderRect = calcHeaderRect( bColHeader );
@@ -2668,13 +2668,13 @@ namespace svt { namespace table
         return aGeometry.getRect();
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle TableControl_Impl::calcTableRect()
     {
         return impl_getAllVisibleDataCellArea();
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle TableControl_Impl::calcCellRect( sal_Int32 nRow, sal_Int32 nCol )
     {
         Rectangle aCellRect;
@@ -2682,7 +2682,7 @@ namespace svt { namespace table
         return aCellRect;
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( TableControl_Impl, OnUpdateScrollbars, void*, /**/ )
     {
         DBG_CHECK_ME();
@@ -2692,7 +2692,7 @@ namespace svt { namespace table
         return 1L;
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar )
     {
         DBG_ASSERT( ( _pScrollbar == m_pVScroll ) || ( _pScrollbar == m_pHScroll ),
@@ -2706,7 +2706,7 @@ namespace svt { namespace table
         return 0L;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > TableControl_Impl::getAccessible( Window& i_parentWindow )
     {
         DBG_TESTSOLARMUTEX();
@@ -2727,7 +2727,7 @@ namespace svt { namespace table
         return xAccessible;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::disposeAccessible()
     {
         if ( m_pAccessibleTable )
@@ -2735,14 +2735,14 @@ namespace svt { namespace table
         m_pAccessibleTable = NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableControl_Impl::impl_isAccessibleAlive() const
     {
         DBG_CHECK_ME();
         return ( NULL != m_pAccessibleTable ) && m_pAccessibleTable->isAlive();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableControl_Impl::impl_commitAccessibleEvent( sal_Int16 const i_eventID, Any const & i_newValue, Any const & i_oldValue )
     {
         DBG_CHECK_ME();
@@ -2753,33 +2753,33 @@ namespace svt { namespace table
     //==================================================================================================================
     //= TableFunctionSet
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TableFunctionSet::TableFunctionSet(TableControl_Impl* _pTableControl)
         :m_pTableControl( _pTableControl)
         ,m_nCurrentRow( ROW_INVALID )
     {
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     TableFunctionSet::~TableFunctionSet()
     {
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableFunctionSet::BeginDrag()
     {
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableFunctionSet::CreateAnchor()
     {
         m_pTableControl->setAnchor( m_pTableControl->getCurRow() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableFunctionSet::DestroyAnchor()
     {
         m_pTableControl->setAnchor( ROW_INVALID );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableFunctionSet::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelectAtCursor)
     {
         sal_Bool bHandled = sal_False;
@@ -2857,7 +2857,7 @@ namespace svt { namespace table
         m_pTableControl->goTo( newCol, newRow );
         return bHandled;
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableFunctionSet::IsSelectionAtPoint( const Point& rPoint )
     {
         m_pTableControl->getSelEngine()->AddAlways(false);
@@ -2872,7 +2872,7 @@ namespace svt { namespace table
             return selected;
         }
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableFunctionSet::DeselectAtPoint( const Point& rPoint )
     {
         (void)rPoint;
@@ -2880,7 +2880,7 @@ namespace svt { namespace table
         m_pTableControl->markRowAsDeselected( m_nCurrentRow );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableFunctionSet::DeselectAll()
     {
         if ( m_pTableControl->hasRowSelection() )
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 91280fe857cc..e9c8a981321c 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -37,7 +37,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= TableDataWindow
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TableDataWindow::TableDataWindow( TableControl_Impl& _rTableControl )
         :Window( &_rTableControl.getAntiImpl() )
         ,m_rTableControl( _rTableControl )
@@ -49,34 +49,34 @@ namespace svt { namespace table
         SetFillColor( aWindowColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableDataWindow::~TableDataWindow()
     {
         impl_hideTipWindow();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::Paint( const Rectangle& rUpdateRect )
     {
         m_rTableControl.doPaintContent( rUpdateRect );
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::SetBackground( const Wallpaper& rColor )
     {
         Window::SetBackground( rColor );
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::SetControlBackground( const Color& rColor )
     {
         Window::SetControlBackground( rColor );
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::SetControlBackground()
     {
         Window::SetControlBackground();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::RequestHelp( const HelpEvent& rHEvt )
     {
         sal_uInt16 const nHelpMode = rHEvt.GetMode();
@@ -155,7 +155,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::impl_hideTipWindow()
     {
         if ( m_nTipWindowHandle != 0 )
@@ -165,7 +165,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::MouseMove( const MouseEvent& rMEvt )
     {
         if ( rMEvt.IsLeaveWindow() )
@@ -176,7 +176,7 @@ namespace svt { namespace table
             Window::MouseMove( rMEvt );
         }
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::MouseButtonDown( const MouseEvent& rMEvt )
     {
         impl_hideTipWindow();
@@ -200,7 +200,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableDataWindow::MouseButtonUp( const MouseEvent& rMEvt )
     {
         if ( !m_rTableControl.getInputHandler()->MouseButtonUp( m_rTableControl, rMEvt ) )
@@ -209,7 +209,7 @@ namespace svt { namespace table
         m_rTableControl.getAntiImpl().GrabFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableDataWindow::Notify(NotifyEvent& rNEvt )
     {
         bool nDone = false;
diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx
index 98749e567d6d..e47928309fae 100644
--- a/svtools/source/table/tablegeometry.cxx
+++ b/svtools/source/table/tablegeometry.cxx
@@ -29,7 +29,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= TableRowGeometry
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TableRowGeometry::TableRowGeometry( TableControl_Impl const & _rControl, Rectangle const & _rBoundaries,
             RowPos const _nRow, bool const i_allowVirtualRows )
         :TableGeometry( _rControl, _rBoundaries )
@@ -47,7 +47,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableRowGeometry::impl_initRect()
     {
         if ( ( m_nRowPos >= m_rControl.m_nTopRow ) && impl_isValidRow( m_nRowPos ) )
@@ -59,13 +59,13 @@ namespace svt { namespace table
             m_aRect.SetEmpty();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableRowGeometry::impl_isValidRow( RowPos const i_row ) const
     {
         return m_bAllowVirtualRows || ( i_row < m_rControl.m_pModel->getRowCount() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableRowGeometry::moveDown()
     {
         if ( m_nRowPos == ROW_COL_HEADERS )
@@ -86,7 +86,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= TableColumnGeometry
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TableColumnGeometry::TableColumnGeometry( TableControl_Impl const & _rControl, Rectangle const & _rBoundaries,
             ColPos const _nCol, bool const i_allowVirtualColumns )
         :TableGeometry( _rControl, _rBoundaries )
@@ -104,7 +104,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TableColumnGeometry::impl_initRect()
     {
         ColPos nLeftColumn = m_rControl.m_nLeftColumn;
@@ -121,13 +121,13 @@ namespace svt { namespace table
             m_aRect.SetEmpty();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableColumnGeometry::impl_isValidColumn( ColPos const i_column ) const
     {
         return m_bAllowVirtualColumns || ( i_column < ColPos( m_rControl.m_aColumnWidths.size() ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TableColumnGeometry::moveRight()
     {
         if ( m_nColPos == COL_ROW_HEADERS )
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index ce92da80cc72..1a023bf9a8fd 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -37,7 +37,7 @@ namespace svt
     //==================================================================================================================
     //= DrawerDeckLayouter
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     DrawerDeckLayouter::DrawerDeckLayouter( ::Window& i_rParentWindow, IToolPanelDeck& i_rPanels )
         :m_rParentWindow( i_rParentWindow )
         ,m_rPanelDeck( i_rPanels )
@@ -51,15 +51,15 @@ namespace svt
             PanelInserted( m_rPanelDeck.GetPanel( i ), i );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DrawerDeckLayouter::~DrawerDeckLayouter()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPLEMENT_IREFERENCE( DrawerDeckLayouter )
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle DrawerDeckLayouter::Layout( const Rectangle& i_rDeckPlayground )
     {
         const size_t nPanelCount( m_rPanelDeck.GetPanelCount() );
@@ -102,7 +102,7 @@ namespace svt
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::Destroy()
     {
         while ( !m_aDrawers.empty() )
@@ -110,7 +110,7 @@ namespace svt
         m_rPanelDeck.RemoveListener( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::SetFocusToPanelSelector()
     {
         const size_t nPanelCount( m_rPanelDeck.GetPanelCount() );
@@ -124,13 +124,13 @@ namespace svt
         m_aDrawers[ *aActivePanel ]->GrabFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     size_t DrawerDeckLayouter::GetAccessibleChildCount() const
     {
         return m_aDrawers.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessible > DrawerDeckLayouter::GetAccessibleChild( const size_t i_nChildIndex, const Reference< XAccessible >& i_rParentAccessible )
     {
         ENSURE_OR_RETURN( i_nChildIndex < m_aDrawers.size(), "illegal index", NULL );
@@ -149,7 +149,7 @@ namespace svt
         return xItemAccessible;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         OSL_PRECOND( i_nPosition <= m_aDrawers.size(), "DrawerDeckLayouter::PanelInserted: inconsistency!" );
@@ -173,14 +173,14 @@ namespace svt
         impl_triggerRearrange();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::PanelRemoved( const size_t i_nPosition )
     {
         impl_removeDrawer( i_nPosition );
         impl_triggerRearrange();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::impl_triggerRearrange() const
     {
         // this is somewhat hacky, it assumes that the parent of our panels is a tool panel deck, which, in its
@@ -188,7 +188,7 @@ namespace svt
         m_rParentWindow.Resize();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         if ( !!i_rOldActive )
@@ -206,14 +206,14 @@ namespace svt
         impl_triggerRearrange();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::LayouterChanged( const PDeckLayouter& i_rNewLayouter )
     {
         // not interested in
         (void)i_rNewLayouter;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     size_t DrawerDeckLayouter::impl_getPanelPositionFromWindow( const Window* i_pDrawerWindow ) const
     {
         for (   ::std::vector< PToolPanelDrawer >::const_iterator drawerPos = m_aDrawers.begin();
@@ -227,7 +227,7 @@ namespace svt
         return m_aDrawers.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::impl_removeDrawer( const size_t i_nPosition )
     {
         OSL_PRECOND( i_nPosition < m_aDrawers.size(), "DrawerDeckLayouter::impl_removeDrawer: invalid panel position!" );
@@ -236,7 +236,7 @@ namespace svt
         m_aDrawers.erase( m_aDrawers.begin() + i_nPosition );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( DrawerDeckLayouter, OnWindowEvent, VclSimpleEvent*, i_pEvent )
     {
         const VclWindowEvent* pWindowEvent = PTR_CAST( VclWindowEvent, i_pEvent );
@@ -284,7 +284,7 @@ namespace svt
         return 0L;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerDeckLayouter::Dying()
     {
         Destroy();
diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx
index 9be075276538..3a8ca8677333 100644
--- a/svtools/source/toolpanel/dummypanel.cxx
+++ b/svtools/source/toolpanel/dummypanel.cxx
@@ -31,63 +31,63 @@ namespace svt
     //====================================================================
     //= DummyPanel
     //====================================================================
-    //--------------------------------------------------------------------
+
     DummyPanel::DummyPanel()
     {
     }
 
-    //--------------------------------------------------------------------
+
     DummyPanel::~DummyPanel()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_IREFERENCE( DummyPanel )
 
-    //--------------------------------------------------------------------
+
     void DummyPanel::Activate( Window& )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void DummyPanel::Deactivate()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void DummyPanel::SetSizePixel( const Size& )
     {
     }
 
-    //--------------------------------------------------------------------
+
     OUString DummyPanel::GetDisplayName() const
     {
         return OUString();
     }
 
-    //--------------------------------------------------------------------
+
     Image DummyPanel::GetImage() const
     {
         return Image();
     }
 
-    //--------------------------------------------------------------------
+
     OString DummyPanel::GetHelpID() const
     {
         return OString();
     }
 
-    //--------------------------------------------------------------------
+
     void DummyPanel::GrabFocus()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void DummyPanel::Dispose()
     {
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > DummyPanel::CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible )
     {
         (void)i_rParentAccessible;
diff --git a/svtools/source/toolpanel/paneldecklisteners.cxx b/svtools/source/toolpanel/paneldecklisteners.cxx
index d16d6d05ddb7..ae1c90f94cf8 100644
--- a/svtools/source/toolpanel/paneldecklisteners.cxx
+++ b/svtools/source/toolpanel/paneldecklisteners.cxx
@@ -29,17 +29,17 @@ namespace svt
     //====================================================================
     //= PanelDeckListeners
     //====================================================================
-    //--------------------------------------------------------------------
+
     PanelDeckListeners::PanelDeckListeners()
     {
     }
 
-    //--------------------------------------------------------------------
+
     PanelDeckListeners::~PanelDeckListeners()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners );
@@ -52,7 +52,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::PanelRemoved( const size_t i_nPosition )
     {
         ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners );
@@ -65,7 +65,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners );
@@ -78,7 +78,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::LayouterChanged( const PDeckLayouter& i_rNewLayouter )
     {
         ::std::vector< IToolPanelDeckListener* > aListeners( m_aListeners );
@@ -91,7 +91,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::Dying()
     {
         while ( !m_aListeners.empty() )
@@ -102,13 +102,13 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::AddListener( IToolPanelDeckListener& i_rListener )
     {
         m_aListeners.push_back( &i_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void PanelDeckListeners::RemoveListener( IToolPanelDeckListener& i_rListener )
     {
         for (   ::std::vector< IToolPanelDeckListener* >::iterator lookup = m_aListeners.begin();
diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx
index f041b33057f3..3a19a335bcc0 100644
--- a/svtools/source/toolpanel/paneltabbar.cxx
+++ b/svtools/source/toolpanel/paneltabbar.cxx
@@ -127,13 +127,13 @@ namespace svt
     //==================================================================================================================
     //= VCLItemRenderer - implementation
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     void VCLItemRenderer::renderBackground() const
     {
         getTargetDevice().DrawRect( Rectangle( Point(), getTargetDevice().GetOutputSizePixel() ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle VCLItemRenderer::calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const
     {
         (void)i_nItemFlags;
@@ -141,14 +141,14 @@ namespace svt
         return i_rContentArea;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void VCLItemRenderer::preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const
     {
         (void)i_rContentRect;
         (void)i_nItemFlags;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void VCLItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const
     {
         const bool bActive = ( ( i_nItemFlags & ITEM_STATE_ACTIVE ) != 0 );
@@ -202,13 +202,13 @@ namespace svt
     //==================================================================================================================
     //= NWFToolboxItemRenderer - implementation
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     void NWFToolboxItemRenderer::renderBackground() const
     {
         getTargetDevice().DrawRect( Rectangle( Point(), getTargetDevice().GetOutputSizePixel() ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle NWFToolboxItemRenderer::calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const
     {
         // don't ask GetNativeControlRegion, this will not deliver proper results in all cases.
@@ -228,7 +228,7 @@ namespace svt
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void NWFToolboxItemRenderer::preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const
     {
         const ControlState nState = lcl_ItemToControlState( i_nItemFlags );
@@ -242,7 +242,7 @@ namespace svt
             // IsNativeControlSupported returned true, previously, otherwise we would not be here ...
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void NWFToolboxItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const
     {
         (void)i_rActualWindow;
@@ -279,7 +279,7 @@ namespace svt
     //==================================================================================================================
     //= NWFTabItemRenderer - implementation
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     void NWFTabItemRenderer::renderBackground() const
     {
         Rectangle aBackground( Point(), getTargetDevice().GetOutputSizePixel() );
@@ -290,7 +290,7 @@ namespace svt
             CTRL_STATE_ENABLED, ImplControlValue(), OUString() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle NWFTabItemRenderer::calculateDecorations( const Rectangle& i_rContentArea, const ItemFlags i_nItemFlags ) const
     {
         const ControlState nState( lcl_ItemToControlState( i_nItemFlags ) );
@@ -310,7 +310,7 @@ namespace svt
         return aBoundingRegion;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void NWFTabItemRenderer::preRenderItem( const Rectangle& i_rContentRect, const ItemFlags i_nItemFlags ) const
     {
         const ControlState nState = lcl_ItemToControlState( i_nItemFlags );
@@ -328,7 +328,7 @@ namespace svt
             // IsNativeControlSupported returned true, previously, otherwise we would not be here ...
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void NWFTabItemRenderer::postRenderItem( Window& i_rActualWindow, const Rectangle& i_rItemRect, const ItemFlags i_nItemFlags ) const
     {
         (void)i_rActualWindow;
@@ -435,7 +435,7 @@ namespace svt
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
     #if OSL_DEBUG_LEVEL > 0
         static void lcl_checkConsistency( const PanelTabBar_Impl& i_rImpl )
         {
@@ -464,7 +464,7 @@ namespace svt
             (void)data;
     #endif
 
-        //--------------------------------------------------------------------------------------------------------------
+
         class ClipItemRegion
         {
         public:
@@ -491,7 +491,7 @@ namespace svt
     //==================================================================================================================
     //= PanelTabBar_Impl - implementation
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelTabBar_Impl::PanelTabBar_Impl( PanelTabBar& i_rTabBar, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent )
         :m_rTabBar( i_rTabBar )
         ,m_aGeometry( i_eItemContent )
@@ -539,7 +539,7 @@ namespace svt
         m_aScrollForward.SetAccessibleName( m_aScrollForward.GetAccessibleDescription() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::impl_calcItemRects()
     {
         m_aItems.resize(0);
@@ -579,7 +579,7 @@ namespace svt
         m_bItemsDirty = false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Size PanelTabBar_Impl::impl_calculateItemContentSize( const PToolPanel& i_pPanel, const TabItemContent i_eItemContent ) const
     {
         // calculate the size needed for the content
@@ -623,7 +623,7 @@ namespace svt
         return aItemContentSize;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::impl_renderItemContent( const PToolPanel& i_pPanel, const Rectangle& i_rContentArea, const TabItemContent i_eItemContent ) const
     {
         OSL_ENSURE( i_eItemContent != TABITEM_AUTO, "PanelTabBar_Impl::impl_renderItemContent: illegal TabItemContent value!" );
@@ -706,7 +706,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::CopyFromRenderDevice( const Rectangle& i_rLogicalRect ) const
     {
         BitmapEx aBitmap( m_aRenderDevice.GetBitmapEx(
@@ -731,7 +731,7 @@ namespace svt
         m_rTabBar.DrawBitmapEx( aActualRect.TopLeft(), aBitmap );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::InvalidateItem( const size_t i_nItemIndex, const ItemFlags i_nAdditionalItemFlags ) const
     {
         const ItemDescriptor& rItem( m_aItems[ i_nItemIndex ] );
@@ -744,7 +744,7 @@ namespace svt
         m_rTabBar.Invalidate( aActualBounds );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ItemFlags PanelTabBar_Impl::impl_getItemFlags( const size_t i_nItemIndex ) const
     {
         ItemFlags nItemFlags( ITEM_STATE_NORMAL );
@@ -770,7 +770,7 @@ namespace svt
         return nItemFlags;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::DrawItem( const size_t i_nItemIndex, const Rectangle& i_rBoundaries ) const
     {
         const ItemDescriptor& rItem( m_aItems[ i_nItemIndex ] );
@@ -809,7 +809,7 @@ namespace svt
         m_rTabBar.SetUpdateMode( true );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::EnsureItemsCache()
     {
         if ( m_bItemsDirty == false )
@@ -822,7 +822,7 @@ namespace svt
         DBG_CHECK( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::Relayout()
     {
         EnsureItemsCache();
@@ -862,7 +862,7 @@ namespace svt
         UpdateScrollButtons();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< size_t > PanelTabBar_Impl::FindItemForPoint( const Point& i_rPoint ) const
     {
         Point aPoint( IsVertical() ? i_rPoint.Y() : i_rPoint.X(), IsVertical() ? i_rPoint.X() : i_rPoint.Y() );
@@ -885,7 +885,7 @@ namespace svt
         return ::boost::optional< size_t >();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle PanelTabBar_Impl::GetItemScreenRect( const size_t i_nItemPos ) const
     {
         ENSURE_OR_RETURN( i_nItemPos < m_aItems.size(), "PanelTabBar_Impl::GetItemScreenRect: invalid item pos!", Rectangle() );
@@ -901,7 +901,7 @@ namespace svt
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::FocusItem( const ::boost::optional< size_t >& i_rItemPos )
     {
         // reset old focus item
@@ -917,7 +917,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( PanelTabBar_Impl, OnScroll, const PushButton*, i_pButton )
     {
         if ( i_pButton == &m_aScrollBack )
@@ -938,7 +938,7 @@ namespace svt
         return 0L;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle PanelTabBar_Impl::GetActualLogicalItemRect( const Rectangle& i_rLogicalItemRect ) const
     {
         // care for the offset imposed by our geometry, i.e. whether or not we have scroll buttons
@@ -960,7 +960,7 @@ namespace svt
     //==================================================================================================================
     //= PanelTabBar_Impl
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         EnsureItemsCache();
@@ -971,14 +971,14 @@ namespace svt
             InvalidateItem( *i_rNewActive );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::LayouterChanged( const PDeckLayouter& i_rNewLayouter )
     {
         // not interested in
         (void)i_rNewLayouter;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar_Impl::Dying()
     {
         // not interested in - the notifier is a member of this instance here, so we're dying ourself at the moment
@@ -987,7 +987,7 @@ namespace svt
     //==================================================================================================================
     //= PanelTabBar
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelTabBar::PanelTabBar( Window& i_rParentWindow, IToolPanelDeck& i_rPanelDeck, const TabAlignment i_eAlignment, const TabItemContent i_eItemContent )
         :Control( &i_rParentWindow, 0 )
         ,m_pImpl( new PanelTabBar_Impl( *this, i_rPanelDeck, i_eAlignment, i_eItemContent ) )
@@ -995,18 +995,18 @@ namespace svt
         DBG_CHECK( *m_pImpl );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelTabBar::~PanelTabBar()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TabItemContent PanelTabBar::GetTabItemContent() const
     {
         return m_pImpl->m_aGeometry.getItemContent();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::SetTabItemContent( const TabItemContent& i_eItemContent )
     {
         m_pImpl->m_aGeometry.setItemContent( i_eItemContent );
@@ -1014,14 +1014,14 @@ namespace svt
         Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IToolPanelDeck& PanelTabBar::GetPanelDeck() const
     {
         DBG_CHECK( *m_pImpl );
         return m_pImpl->m_rPanelDeck;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Size PanelTabBar::GetOptimalSize() const
     {
         m_pImpl->EnsureItemsCache();
@@ -1031,14 +1031,14 @@ namespace svt
         return aOptimalSize;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::Resize()
     {
         Control::Resize();
         m_pImpl->Relayout();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::Paint( const Rectangle& i_rRect )
     {
         m_pImpl->EnsureItemsCache();
@@ -1089,7 +1089,7 @@ namespace svt
             m_pImpl->DrawItem( *aHoveredPanel, aLogicalPaintRect );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::MouseMove( const MouseEvent& i_rMouseEvent )
     {
         m_pImpl->EnsureItemsCache();
@@ -1117,7 +1117,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::MouseButtonDown( const MouseEvent& i_rMouseEvent )
     {
         Control::MouseButtonDown( i_rMouseEvent );
@@ -1137,7 +1137,7 @@ namespace svt
         m_pImpl->InvalidateItem( *aHitItem );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::MouseButtonUp( const MouseEvent& i_rMouseEvent )
     {
         Control::MouseButtonUp( i_rMouseEvent );
@@ -1160,7 +1160,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::RequestHelp( const HelpEvent& i_rHelpEvent )
     {
         m_pImpl->EnsureItemsCache();
@@ -1181,7 +1181,7 @@ namespace svt
             Help::ShowQuickHelp( this, rItem.GetCurrentRect(), sItemText );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::GetFocus()
     {
         Control::GetFocus();
@@ -1189,7 +1189,7 @@ namespace svt
             m_pImpl->FocusItem( m_pImpl->m_rPanelDeck.GetActivePanel() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::LoseFocus()
     {
         Control::LoseFocus();
@@ -1202,7 +1202,7 @@ namespace svt
         m_pImpl->m_aFocusedItem.reset();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     class KeyInputHandler
     {
     public:
@@ -1230,7 +1230,7 @@ namespace svt
         bool            m_bHandled;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::KeyInput( const KeyEvent& i_rKeyEvent )
     {
         KeyInputHandler aKeyInputHandler( *this, i_rKeyEvent );
@@ -1291,7 +1291,7 @@ namespace svt
         aKeyInputHandler.setHandled();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::DataChanged( const DataChangedEvent& i_rDataChanedEvent )
     {
         Control::DataChanged( i_rDataChanedEvent );
@@ -1304,25 +1304,25 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool PanelTabBar::IsVertical() const
     {
         return m_pImpl->IsVertical();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PushButton& PanelTabBar::GetScrollButton( const bool i_bForward )
     {
         return i_bForward ? m_pImpl->m_aScrollForward : m_pImpl->m_aScrollBack;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< size_t > PanelTabBar::GetFocusedPanelItem() const
     {
         return m_pImpl->m_aFocusedItem;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void PanelTabBar::FocusPanelItem( const size_t i_nItemPos )
     {
         ENSURE_OR_RETURN_VOID( i_nItemPos < m_pImpl->m_rPanelDeck.GetPanelCount(), "PanelTabBar::FocusPanelItem: illegal item pos!" );
@@ -1337,13 +1337,13 @@ namespace svt
         m_pImpl->m_aFocusedItem.reset( i_nItemPos );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle PanelTabBar::GetItemScreenRect( const size_t i_nItemPos ) const
     {
         return m_pImpl->GetItemScreenRect( i_nItemPos );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWindowPeer > PanelTabBar::GetComponentInterface( sal_Bool i_bCreate )
     {
         Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) );
diff --git a/svtools/source/toolpanel/paneltabbarpeer.cxx b/svtools/source/toolpanel/paneltabbarpeer.cxx
index 31c307476f46..d265d0ecf63a 100644
--- a/svtools/source/toolpanel/paneltabbarpeer.cxx
+++ b/svtools/source/toolpanel/paneltabbarpeer.cxx
@@ -48,19 +48,19 @@ namespace svt
     //==================================================================================================================
     //= PanelTabBarPeer
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelTabBarPeer::PanelTabBarPeer( PanelTabBar& i_rTabBar )
         :VCLXWindow()
         ,m_pTabBar( &i_rTabBar )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PanelTabBarPeer::~PanelTabBarPeer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessibleContext > PanelTabBarPeer::CreateAccessibleContext()
     {
         SolarMutexGuard aSolarGuard;
@@ -75,7 +75,7 @@ namespace svt
         return m_aAccessibleFactory.getFactory().createAccessibleToolPanelTabBar( xAccessibleParent, m_pTabBar->GetPanelDeck(), *m_pTabBar );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL PanelTabBarPeer::dispose() throw(RuntimeException)
     {
         {
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
index 92a85224d0a9..a1de1d738e33 100644
--- a/svtools/source/toolpanel/refbase.cxx
+++ b/svtools/source/toolpanel/refbase.cxx
@@ -28,13 +28,13 @@ namespace svt
     //====================================================================
     //= RefBase
     //====================================================================
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL RefBase::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL RefBase::release()
     {
         oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
diff --git a/svtools/source/toolpanel/tabbargeometry.cxx b/svtools/source/toolpanel/tabbargeometry.cxx
index 43036233ed90..15934dd36c64 100644
--- a/svtools/source/toolpanel/tabbargeometry.cxx
+++ b/svtools/source/toolpanel/tabbargeometry.cxx
@@ -55,7 +55,7 @@ namespace svt
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         static void lcl_transform( Rectangle& io_rRect, const ::basegfx::B2DHomMatrix& i_rTransformation )
         {
             ::basegfx::B2DRange aRect( io_rRect.Left(), io_rRect.Top(), io_rRect.Right(), io_rRect.Bottom() );
@@ -66,7 +66,7 @@ namespace svt
             io_rRect.Bottom() = long( aRect.getMaxY() );
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         /** transforms the given, possible rotated playground,
         */
         void lcl_rotate( const Rectangle& i_rReference, Rectangle& io_rArea, const bool i_bRight )
@@ -92,7 +92,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void lcl_mirrorHorizontally( const Rectangle& i_rReferenceArea, Rectangle& io_rArea )
     {
         io_rArea.Left() = i_rReferenceArea.Left() + i_rReferenceArea.Right() - io_rArea.Left();
@@ -100,7 +100,7 @@ namespace svt
         ::std::swap( io_rArea.Left(), io_rArea.Right() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void lcl_mirrorVertically( const Rectangle& i_rReferenceArea, Rectangle& io_rArea )
     {
         io_rArea.Top() = i_rReferenceArea.Top() + i_rReferenceArea.Bottom() - io_rArea.Top();
@@ -111,19 +111,19 @@ namespace svt
     //==================================================================================================================
     //= NormalizedArea
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     NormalizedArea::NormalizedArea()
         :m_aReference()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     NormalizedArea::NormalizedArea( const Rectangle& i_rReference, const bool i_bIsVertical )
         :m_aReference( i_bIsVertical ? Rectangle( i_rReference.TopLeft(), Size( i_rReference.GetHeight(), i_rReference.GetWidth() ) ) : i_rReference )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle NormalizedArea::getTransformed( const Rectangle& i_rArea, const TabAlignment i_eTargetAlignment ) const
     {
         Rectangle aResult( i_rArea );
@@ -149,7 +149,7 @@ namespace svt
         return aResult;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle NormalizedArea::getNormalized( const Rectangle& i_rArea, const TabAlignment i_eTargetAlignment ) const
     {
         Rectangle aResult( i_rArea );
@@ -178,7 +178,7 @@ namespace svt
     //==================================================================================================================
     //= TabBarGeometry
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     TabBarGeometry::TabBarGeometry( const TabItemContent i_eItemContent )
         :m_eTabItemContent( i_eItemContent )
         ,m_aItemsInset()
@@ -192,12 +192,12 @@ namespace svt
         m_aItemsInset.Bottom() = ITEMS_INSET_BOTTOM;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TabBarGeometry::~TabBarGeometry()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool TabBarGeometry::impl_fitItems( ItemDescriptors& io_rItems ) const
     {
         if ( io_rItems.empty() )
@@ -253,7 +253,7 @@ namespace svt
             &&  aFitInto.Right() >= aLastItemBottomRight.X();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Size TabBarGeometry::getOptimalSize(ItemDescriptors& io_rItems) const
     {
         if ( io_rItems.empty() )
@@ -270,7 +270,7 @@ namespace svt
                 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void TabBarGeometry::relayout( const Size& i_rActualOutputSize, ItemDescriptors& io_rItems )
     {
         // assume all items fit
@@ -307,7 +307,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Point TabBarGeometry::getFirstItemPosition() const
     {
         return Point( m_aItemsInset.Left(), m_aItemsInset.Top() );
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index 2d7cafa89a44..818aa48e2a3e 100644
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -79,22 +79,22 @@ namespace svt
     //====================================================================
     //= TabDeckLayouter
     //====================================================================
-    //--------------------------------------------------------------------
+
     TabDeckLayouter::TabDeckLayouter( Window& i_rParent, IToolPanelDeck& i_rPanels,
             const TabAlignment i_eAlignment, const TabItemContent i_eItemContent )
         :m_pData( new TabDeckLayouter_Data( i_rParent, i_rPanels, i_eAlignment, i_eItemContent ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     TabDeckLayouter::~TabDeckLayouter()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_IREFERENCE( TabDeckLayouter )
 
-    //--------------------------------------------------------------------
+
     TabItemContent TabDeckLayouter::GetTabItemContent() const
     {
         if ( lcl_checkDisposed( *m_pData ) )
@@ -102,7 +102,7 @@ namespace svt
         return m_pData->pTabBar->GetTabItemContent();
     }
 
-    //--------------------------------------------------------------------
+
     void TabDeckLayouter::SetTabItemContent( const TabItemContent& i_eItemContent )
     {
         if ( lcl_checkDisposed( *m_pData ) )
@@ -110,7 +110,7 @@ namespace svt
         m_pData->pTabBar->SetTabItemContent( i_eItemContent );
     }
 
-    //--------------------------------------------------------------------
+
     TabAlignment TabDeckLayouter::GetTabAlignment() const
     {
         if ( lcl_checkDisposed( *m_pData ) )
@@ -118,7 +118,7 @@ namespace svt
         return m_pData->eAlignment;
     }
 
-    //--------------------------------------------------------------------
+
     Rectangle TabDeckLayouter::Layout( const Rectangle& i_rDeckPlayground )
     {
         if ( lcl_checkDisposed( *m_pData ) )
@@ -169,13 +169,13 @@ namespace svt
         return aPanelRect;
     }
 
-    //--------------------------------------------------------------------
+
     void TabDeckLayouter::Destroy()
     {
         m_pData->pTabBar.reset();
     }
 
-    //--------------------------------------------------------------------
+
     void TabDeckLayouter::SetFocusToPanelSelector()
     {
         if ( lcl_checkDisposed( *m_pData ) )
@@ -183,7 +183,7 @@ namespace svt
         m_pData->pTabBar->GrabFocus();
     }
 
-    //--------------------------------------------------------------------
+
     size_t TabDeckLayouter::GetAccessibleChildCount() const
     {
         if ( lcl_checkDisposed( *m_pData ) )
@@ -192,7 +192,7 @@ namespace svt
         return 1;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > TabDeckLayouter::GetAccessibleChild( const size_t i_nChildIndex, const Reference< XAccessible >& i_rParentAccessible )
     {
         (void)i_nChildIndex;
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index 02024f24ad9a..c52997390002 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -28,17 +28,17 @@ namespace svt
     //====================================================================
     //= ToolPanelBase
     //====================================================================
-    //--------------------------------------------------------------------
+
     ToolPanelBase::ToolPanelBase()
     {
     }
 
-    //--------------------------------------------------------------------
+
     ToolPanelBase::~ToolPanelBase()
     {
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_IREFERENCE( ToolPanelBase )
 
 //........................................................................
diff --git a/svtools/source/toolpanel/toolpanelcollection.cxx b/svtools/source/toolpanel/toolpanelcollection.cxx
index 616a04e18af0..c96d51838788 100644
--- a/svtools/source/toolpanel/toolpanelcollection.cxx
+++ b/svtools/source/toolpanel/toolpanelcollection.cxx
@@ -43,31 +43,31 @@ namespace svt
     //====================================================================
     //= ToolPanelCollection
     //====================================================================
-    //--------------------------------------------------------------------
+
     ToolPanelCollection::ToolPanelCollection()
         :m_pData( new ToolPanelCollection_Data )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ToolPanelCollection::~ToolPanelCollection()
     {
         m_pData->aListeners.Dying();
     }
 
-    //--------------------------------------------------------------------
+
     size_t ToolPanelCollection::GetPanelCount() const
     {
         return m_pData->aPanels.size();
     }
 
-    //--------------------------------------------------------------------
+
     ::boost::optional< size_t > ToolPanelCollection::GetActivePanel() const
     {
         return m_pData->aActivePanel;
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelCollection::ActivatePanel( const ::boost::optional< size_t >& i_rPanel )
     {
         if ( !!i_rPanel )
@@ -87,7 +87,7 @@ namespace svt
         m_pData->aListeners.ActivePanelChanged( aOldPanel, m_pData->aActivePanel );
     }
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelCollection::GetPanel( const size_t i_nPos ) const
     {
         OSL_ENSURE( i_nPos < m_pData->aPanels.size(), "ToolPanelCollection::GetPanel: illegal position!" );
@@ -96,7 +96,7 @@ namespace svt
         return m_pData->aPanels[ i_nPos ];
     }
 
-    //--------------------------------------------------------------------
+
     size_t ToolPanelCollection::InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         OSL_ENSURE( i_pPanel.get(), "ToolPanelCollection::InsertPanel: illegal panel!" );
@@ -120,7 +120,7 @@ namespace svt
         return position;
     }
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelCollection::RemovePanel( const size_t i_nPosition )
     {
         OSL_ENSURE( i_nPosition < m_pData->aPanels.size(), "ToolPanelCollection::RemovePanel: illegal position!" );
@@ -168,13 +168,13 @@ namespace svt
         return pRemovedPanel;
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelCollection::AddListener( IToolPanelDeckListener& i_rListener )
     {
         m_pData->aListeners.AddListener( i_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelCollection::RemoveListener( IToolPanelDeckListener& i_rListener )
     {
         m_pData->aListeners.RemoveListener( i_rListener );
diff --git a/svtools/source/toolpanel/toolpaneldeck.cxx b/svtools/source/toolpanel/toolpaneldeck.cxx
index 8564c1f457f9..a991618d872e 100644
--- a/svtools/source/toolpanel/toolpaneldeck.cxx
+++ b/svtools/source/toolpanel/toolpaneldeck.cxx
@@ -139,7 +139,7 @@ namespace svt
         bool                m_bInDtor;
     };
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelDeck_Impl::GetActiveOrDummyPanel_Impl()
     {
         ::boost::optional< size_t > aActivePanel( m_aPanels.GetActivePanel() );
@@ -148,7 +148,7 @@ namespace svt
         return m_aPanels.GetPanel( *aActivePanel );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::SetLayouter( const PDeckLayouter& i_pNewLayouter )
     {
         ENSURE_OR_RETURN_VOID( i_pNewLayouter.get(), "invalid layouter" );
@@ -163,43 +163,43 @@ namespace svt
         m_aListeners.LayouterChanged( m_pLayouter );
     }
 
-    //--------------------------------------------------------------------
+
     size_t ToolPanelDeck_Impl::GetPanelCount() const
     {
         return m_aPanels.GetPanelCount();
     }
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelDeck_Impl::GetPanel( const size_t i_nPos ) const
     {
         return m_aPanels.GetPanel( i_nPos );
     }
 
-    //--------------------------------------------------------------------
+
     ::boost::optional< size_t > ToolPanelDeck_Impl::GetActivePanel() const
     {
         return m_aPanels.GetActivePanel();
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::ActivatePanel( const ::boost::optional< size_t >& i_rPanel )
     {
         m_aPanels.ActivatePanel( i_rPanel );
     }
 
-    //--------------------------------------------------------------------
+
     size_t ToolPanelDeck_Impl::InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         return m_aPanels.InsertPanel( i_pPanel, i_nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelDeck_Impl::RemovePanel( const size_t i_nPosition )
     {
         return m_aPanels.RemovePanel( i_nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::ImplDoLayout()
     {
         const Rectangle aDeckPlayground( Point(), m_rDeck.GetOutputSizePixel() );
@@ -218,19 +218,19 @@ namespace svt
         pActive->SetSizePixel( m_aPanelAnchor.GetOutputSizePixel() );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::AddListener( IToolPanelDeckListener& i_rListener )
     {
         m_aListeners.AddListener( i_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::RemoveListener( IToolPanelDeckListener& i_rListener )
     {
         m_aListeners.RemoveListener( i_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::DoAction( const DeckAction i_eAction )
     {
         const size_t nPanelCount( m_aPanels.GetPanelCount() );
@@ -276,7 +276,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ToolPanelDeck_Impl::FocusActivePanel()
     {
         ::boost::optional< size_t > aActivePanel( m_aPanels.GetActivePanel() );
@@ -288,21 +288,21 @@ namespace svt
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::PanelInserted( const PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         // multiplex to our own listeners
         m_aListeners.PanelInserted( i_pPanel, i_nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::PanelRemoved( const size_t i_nPosition )
     {
         // multiplex to our own listeners
         m_aListeners.PanelRemoved( i_nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive )
     {
         // hide the old panel
@@ -324,14 +324,14 @@ namespace svt
         m_aListeners.ActivePanelChanged( i_rOldActive, i_rNewActive );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::LayouterChanged( const PDeckLayouter& i_rNewLayouter )
     {
         // not interested in
         (void)i_rNewLayouter;
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck_Impl::Dying()
     {
         // not interested in. Since the ToolPanelCollection is our member, this just means we ourself
@@ -341,7 +341,7 @@ namespace svt
     //====================================================================
     //= ToolPanelDeck
     //====================================================================
-    //--------------------------------------------------------------------
+
     ToolPanelDeck::ToolPanelDeck( Window& i_rParent, const WinBits i_nStyle )
         :Control( &i_rParent, i_nStyle )
         ,m_pImpl( new ToolPanelDeck_Impl( *this ) )
@@ -351,7 +351,7 @@ namespace svt
         SetLayouter( PDeckLayouter( new DrawerDeckLayouter( *this, *this ) ) );
     }
 
-    //--------------------------------------------------------------------
+
     ToolPanelDeck::~ToolPanelDeck()
     {
         m_pImpl->NotifyDying();
@@ -365,86 +365,86 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     size_t ToolPanelDeck::GetPanelCount() const
     {
         return m_pImpl->GetPanelCount();
     }
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelDeck::GetPanel( const size_t i_nPos ) const
     {
         return m_pImpl->GetPanel( i_nPos );
     }
 
-    //--------------------------------------------------------------------
+
     ::boost::optional< size_t > ToolPanelDeck::GetActivePanel() const
     {
         return m_pImpl->GetActivePanel();
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck::ActivatePanel( const ::boost::optional< size_t >& i_rPanel )
     {
         m_pImpl->ActivatePanel( i_rPanel );
     }
 
-    //--------------------------------------------------------------------
+
     size_t ToolPanelDeck::InsertPanel( const PToolPanel& i_pPanel, const size_t i_nPosition )
     {
         return m_pImpl->InsertPanel( i_pPanel, i_nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     PToolPanel ToolPanelDeck::RemovePanel( const size_t i_nPosition )
     {
         return m_pImpl->RemovePanel( i_nPosition );
     }
 
-    //--------------------------------------------------------------------
+
     PDeckLayouter ToolPanelDeck::GetLayouter() const
     {
         return m_pImpl->GetLayouter();
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck::SetLayouter( const PDeckLayouter& i_pNewLayouter )
     {
         return m_pImpl->SetLayouter( i_pNewLayouter );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck::AddListener( IToolPanelDeckListener& i_rListener )
     {
         m_pImpl->AddListener( i_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck::RemoveListener( IToolPanelDeckListener& i_rListener )
     {
         m_pImpl->RemoveListener( i_rListener );
     }
 
-    //--------------------------------------------------------------------
+
     Window& ToolPanelDeck::GetPanelWindowAnchor()
     {
         return m_pImpl->GetPanelWindowAnchor();
     }
 
-    //--------------------------------------------------------------------
+
     const Window& ToolPanelDeck::GetPanelWindowAnchor() const
     {
         return m_pImpl->GetPanelWindowAnchor();
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck::Resize()
     {
         Control::Resize();
         m_pImpl->LayoutAll();
     }
 
-    //--------------------------------------------------------------------
+
     bool ToolPanelDeck::Notify( NotifyEvent& i_rNotifyEvent )
     {
         bool bHandled = false;
@@ -490,7 +490,7 @@ namespace svt
         return Control::Notify( i_rNotifyEvent );
     }
 
-    //--------------------------------------------------------------------
+
     void ToolPanelDeck::GetFocus()
     {
         Control::GetFocus();
@@ -504,7 +504,7 @@ namespace svt
         }
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XWindowPeer > ToolPanelDeck::GetComponentInterface( sal_Bool i_bCreate )
     {
         Reference< XWindowPeer > xWindowPeer( Control::GetComponentInterface( sal_False ) );
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.cxx b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
index f5a18d039272..5ac3b3d9265e 100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.cxx
@@ -48,19 +48,19 @@ namespace svt
     //==================================================================================================================
     //= ToolPanelDeckPeer
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelDeckPeer::ToolPanelDeckPeer( ToolPanelDeck& i_rDeck )
         :VCLXWindow()
         ,m_pDeck( &i_rDeck )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelDeckPeer::~ToolPanelDeckPeer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessibleContext > ToolPanelDeckPeer::CreateAccessibleContext()
     {
         SolarMutexGuard aSolarGuard;
@@ -73,7 +73,7 @@ namespace svt
         return m_aAccessibleFactory.getFactory().createAccessibleToolPanelDeck( xAccessibleParent, *m_pDeck );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL ToolPanelDeckPeer::dispose() throw(RuntimeException)
     {
         {
diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx
index bd1fef83d577..06f1c7fd48f5 100644
--- a/svtools/source/toolpanel/toolpaneldrawer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawer.cxx
@@ -45,7 +45,7 @@ namespace svt
     //==================================================================================================================
     //= DrawerVisualization
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     DrawerVisualization::DrawerVisualization( ToolPanelDrawer& i_rParent )
         :Window( &i_rParent )
         ,m_rDrawer( i_rParent )
@@ -55,12 +55,12 @@ namespace svt
         SetAccessibleRole( AccessibleRole::LABEL );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DrawerVisualization::~DrawerVisualization()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DrawerVisualization::Paint( const Rectangle& i_rBoundingBox )
     {
         Window::Paint( i_rBoundingBox );
@@ -70,7 +70,7 @@ namespace svt
     //==================================================================================================================
     //= ToolPanelDrawer
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelDrawer::ToolPanelDrawer( Window& i_rParent, const OUString& i_rTitle )
         :Window( &i_rParent, WB_TABSTOP )
         ,m_pPaintDevice( new VirtualDevice( *this ) )
@@ -92,19 +92,19 @@ namespace svt
         m_aVisualization.SetAccessibleDescription( i_rTitle );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelDrawer::~ToolPanelDrawer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     long ToolPanelDrawer::GetPreferredHeightPixel() const
     {
         Rectangle aTitleBarBox( impl_calcTitleBarBox( impl_calcTextBoundingBox() ) );
         return aTitleBarBox.GetHeight();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::Paint()
     {
         m_pPaintDevice->SetMapMode( GetMapMode() );
@@ -130,7 +130,7 @@ namespace svt
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle ToolPanelDrawer::impl_paintExpansionIndicator( const Rectangle& i_rTextBox )
     {
         Rectangle aExpansionIndicatorArea;
@@ -175,7 +175,7 @@ namespace svt
         return nBasicStyle | TEXT_DRAW_DISABLE;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::impl_paintBackground( const Rectangle& i_rTitleBarBox )
     {
         m_pPaintDevice->SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() );
@@ -191,7 +191,7 @@ namespace svt
         m_pPaintDevice->DrawLine( i_rTitleBarBox.TopRight(), i_rTitleBarBox.BottomRight() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::impl_paintFocusIndicator( const Rectangle& i_rTextBox )
     {
         if ( m_bFocused )
@@ -221,28 +221,28 @@ namespace svt
             HideFocus();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::GetFocus()
     {
         m_bFocused = true;
         Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::LoseFocus()
     {
         m_bFocused = false;
         Invalidate();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::Resize()
     {
         Window::Resize();
         m_aVisualization.SetPosSizePixel( Point(), GetOutputSizePixel() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::MouseButtonDown( const MouseEvent& i_rMouseEvent )
     {
         // consume this event, and do not forward to the base class - it would sent a NotifyEvent, which in turn, when
@@ -250,7 +250,7 @@ namespace svt
         (void)i_rMouseEvent;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::DataChanged( const DataChangedEvent& i_rEvent )
     {
         Window::DataChanged( i_rEvent );
@@ -291,7 +291,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWindowPeer > ToolPanelDrawer::GetComponentInterface( sal_Bool i_bCreate )
     {
         Reference< XWindowPeer > xWindowPeer( Window::GetComponentInterface( sal_False ) );
@@ -303,7 +303,7 @@ namespace svt
         return xWindowPeer;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle ToolPanelDrawer::impl_calcTextBoundingBox() const
     {
         Font aFont( GetFont() );
@@ -328,7 +328,7 @@ namespace svt
         return aTextBox;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Rectangle ToolPanelDrawer::impl_calcTitleBarBox( const Rectangle& i_rTextBox ) const
     {
         Rectangle aTitleBarBox( i_rTextBox );
@@ -343,7 +343,7 @@ namespace svt
         return aTitleBarBox;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawer::SetExpanded( const bool i_bExpanded )
     {
         if ( m_bExpanded != i_bExpanded )
diff --git a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
index 8c9c27150ef4..cb9be0b023aa 100644
--- a/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
+++ b/svtools/source/toolpanel/toolpaneldrawerpeer.cxx
@@ -71,7 +71,7 @@ namespace svt
         }
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawerContext::ProcessWindowEvent( const VclWindowEvent& i_rVclWindowEvent )
     {
         VCLXAccessibleComponent::ProcessWindowEvent( i_rVclWindowEvent );
@@ -87,7 +87,7 @@ namespace svt
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ToolPanelDrawerContext::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet )
     {
         VCLXAccessibleComponent::FillAccessibleStateSet( i_rStateSet );
@@ -109,18 +109,18 @@ namespace svt
     //==================================================================================================================
     //= ToolPanelDrawerPeer
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelDrawerPeer::ToolPanelDrawerPeer()
         :VCLXWindow()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ToolPanelDrawerPeer::~ToolPanelDrawerPeer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XAccessibleContext > ToolPanelDrawerPeer::CreateAccessibleContext()
     {
         SolarMutexGuard aSolarGuard;
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 85706cf350cc..65f20900e9ea 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -78,7 +78,7 @@ namespace {
         virtual void executedDialog(sal_Int16 _nExecutionResult);
     };
 
-    //-------------------------------------------------------------------------
+
     OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XComponentContext >& _rxORB)
         :OGenericUnoDialog(_rxORB)
     {
@@ -86,20 +86,20 @@ namespace {
             &m_aAliases, getCppuType(&m_aAliases));
     }
 
-    //-------------------------------------------------------------------------
+
     Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId(  ) throw(RuntimeException)
     {
         static ::cppu::OImplementationId aId;
         return aId.getImplementationId();
     }
 
-    //-------------------------------------------------------------------------
+
     OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException)
     {
         return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" );
     }
 
-    //-------------------------------------------------------------------------
+
     ::comphelper::StringSequence SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException)
     {
         ::comphelper::StringSequence aSupported(1);
@@ -107,20 +107,20 @@ namespace {
         return aSupported;
     }
 
-    //-------------------------------------------------------------------------
+
     Reference<XPropertySetInfo>  SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo() throw(RuntimeException)
     {
         Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //-------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& OAddressBookSourceDialogUno::getInfoHelper()
     {
         return *getArrayHelper();
     }
 
-    //------------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OAddressBookSourceDialogUno::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -128,7 +128,7 @@ namespace {
         return new ::cppu::OPropertyArrayHelper(aProps);
     }
 
-    //------------------------------------------------------------------------------
+
     void OAddressBookSourceDialogUno::executedDialog(sal_Int16 _nExecutionResult)
     {
         OAddressBookSourceDialogUnoBase::executedDialog(_nExecutionResult);
@@ -137,7 +137,7 @@ namespace {
             if ( m_pDialog )
                 static_cast< AddressBookSourceDialog* >( m_pDialog )->getFieldMapping( m_aAliases );
     }
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OAddressBookSourceDialogUno::initialize(const Sequence< Any >& rArguments) throw(Exception, RuntimeException)
     {
         if( rArguments.getLength() == 5 )
@@ -172,7 +172,7 @@ namespace {
         }
         OGenericUnoDialog::initialize(rArguments);
     }
-    //------------------------------------------------------------------------------
+
     void OAddressBookSourceDialogUno::implInitialize(const com::sun::star::uno::Any& _rValue)
     {
         PropertyValue aVal;
@@ -212,7 +212,7 @@ namespace {
         OAddressBookSourceDialogUnoBase::implInitialize( _rValue );
     }
 
-    //------------------------------------------------------------------------------
+
     Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent)
     {
         if ( m_xDataSource.is() && !m_sTable.isEmpty() )
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 2e821bf42937..3f225cd7a591 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -45,7 +45,7 @@ namespace svt
 {
 //.........................................................................
 
-//-------------------------------------------------------------------------
+
 OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxContext)
         :OPropertyContainer(GetBroadcastHelper())
         ,m_pDialog(NULL)
@@ -62,7 +62,7 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo
         &m_xParent, getCppuType(&m_xParent));
 }
 
-//-------------------------------------------------------------------------
+
 OGenericUnoDialog::~OGenericUnoDialog()
 {
     if ( m_pDialog )
@@ -74,7 +74,7 @@ OGenericUnoDialog::~OGenericUnoDialog()
     }
 }
 
-//-------------------------------------------------------------------------
+
 Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = OGenericUnoDialogBase::queryInterface(_rType);
@@ -89,7 +89,7 @@ Any SAL_CALL OGenericUnoDialog::queryInterface(const Type& _rType) throw (Runtim
     return aReturn;
 }
 
-//-------------------------------------------------------------------------
+
 Sequence<Type> SAL_CALL OGenericUnoDialog::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -103,7 +103,7 @@ sal_Bool SAL_CALL OGenericUnoDialog::supportsService(const OUString& ServiceName
     return cppu::supportsService(this, ServiceName);
 }
 
-//-------------------------------------------------------------------------
+
 void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw(Exception)
 {
     // TODO : need some handling if we're currently executing ...
@@ -120,7 +120,7 @@ void OGenericUnoDialog::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, con
     }
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw(IllegalArgumentException)
 {
     switch (nHandle)
@@ -141,7 +141,7 @@ sal_Bool OGenericUnoDialog::convertFastPropertyValue( Any& rConvertedValue, Any&
     return OPropertyContainer::convertFastPropertyValue(rConvertedValue, rOldValue, nHandle, rValue);
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(RuntimeException)
 {
     UnoDialogEntryGuard aGuard( *this );
@@ -162,7 +162,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const OUString& _rTitle ) throw(Runti
     }
 }
 
-//-------------------------------------------------------------------------
+
 bool OGenericUnoDialog::impl_ensureDialog_lck()
 {
     if ( m_pDialog )
@@ -197,7 +197,7 @@ bool OGenericUnoDialog::impl_ensureDialog_lck()
     return true;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException)
 {
     // both creation and execution of the dialog must be guarded with the SolarMutex, so be generous here
@@ -248,7 +248,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute(  ) throw(RuntimeException)
 }
 
 #ifdef AWT_DIALOG
-//-------------------------------------------------------------------------
+
 void SAL_CALL OGenericUnoDialog::endExecute(  ) throw(RuntimeException)
 {
     UnoDialogEntryGuard aGuard( *this );
@@ -275,7 +275,7 @@ void SAL_CALL OGenericUnoDialog::endExecute(  ) throw(RuntimeException)
 }
 #endif
 
-//-------------------------------------------------------------------------
+
 void OGenericUnoDialog::implInitialize(const Any& _rValue)
 {
     try
@@ -297,7 +297,7 @@ void OGenericUnoDialog::implInitialize(const Any& _rValue)
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -311,14 +311,14 @@ void SAL_CALL OGenericUnoDialog::initialize( const Sequence< Any >& aArguments )
     m_bInitialized = true;
 }
 
-//-------------------------------------------------------------------------
+
 void OGenericUnoDialog::destroyDialog()
 {
     delete m_pDialog;
     m_pDialog = NULL;
 }
 
-//-------------------------------------------------------------------------
+
 IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent*, _pEvent )
 {
     OSL_ENSURE( _pEvent->GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" );
diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx
index 772577aa4f25..3b8d1ce77b81 100644
--- a/svtools/source/uno/popupwindowcontroller.cxx
+++ b/svtools/source/uno/popupwindowcontroller.cxx
@@ -120,7 +120,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclSimpleEvent*, pEve
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK( PopupWindowControllerImpl, AsyncDeleteWindowHdl, Window*, pWindow )
 {
diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 261bd72855bf..2074eb22c0fc 100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.cxx
@@ -75,7 +75,7 @@ using namespace ::svt::table;
 
 typedef ::com::sun::star::util::Color   UnoColor;
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 SVTXGridControl::SVTXGridControl()
     :m_pTableModel( new UnoControlTableModel() )
     ,m_bTableModelInitCompleted( false )
@@ -83,33 +83,33 @@ SVTXGridControl::SVTXGridControl()
 {
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 SVTXGridControl::~SVTXGridControl()
 {
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::SetWindow( Window* pWindow )
 {
     SVTXGridControl_Base::SetWindow( pWindow );
     impl_checkTableModelInit();
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::impl_checkColumnIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_columnIndex ) const
 {
     if ( ( i_columnIndex < 0 ) || ( i_columnIndex >= i_table.GetColumnCount() ) )
         throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::impl_checkRowIndex_throw( ::svt::table::TableControl const & i_table, sal_Int32 const i_rowIndex ) const
 {
     if ( ( i_rowIndex < 0 ) || ( i_rowIndex >= i_table.GetRowCount() ) )
         throw IndexOutOfBoundsException( OUString(), *const_cast< SVTXGridControl* >( this ) );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -121,7 +121,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y)
     return ( tableCell.nRow >= 0 ) ? tableCell.nRow : -1;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -133,7 +133,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32
     return ( tableCell.nColumn >= 0 ) ? tableCell.nColumn : -1;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentColumn(  ) throw (RuntimeException
     return ( nColumn >= 0 ) ? nColumn : -1;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow(  ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -157,7 +157,7 @@ sal_Int32 SAL_CALL SVTXGridControl::getCurrentRow(  ) throw (RuntimeException)
     return ( nRow >= 0 ) ? nRow : -1;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException)
 {
     SolarMutexGuard aGuard;
@@ -171,19 +171,19 @@ void SAL_CALL SVTXGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32
     pTable->GoTo( i_columnIndex, i_rowIndex );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::addSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException)
 {
     m_aSelectionListeners.addInterface(listener);
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::removeSelectionListener(const Reference< XGridSelectionListener > & listener) throw (RuntimeException)
 {
     m_aSelectionListeners.removeInterface(listener);
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -601,22 +601,22 @@ Any SVTXGridControl::getProperty( const OUString& PropertyName ) throw(RuntimeEx
     return aPropertyValue;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
     m_pTableModel->notifyRowsInserted( i_event );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
-void SAL_CALL//----------------------------------------------------------------------------------------------------------------------
+
+void SAL_CALL
  SVTXGridControl::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
     m_pTableModel->notifyRowsRemoved( i_event );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -630,7 +630,7 @@ void SAL_CALL SVTXGridControl::dataChanged( const GridDataEvent& i_event ) throw
     pTable->getTableControlInterface().invalidate( TableAreaColumnHeaders );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -643,7 +643,7 @@ void SAL_CALL SVTXGridControl::rowHeadingChanged( const GridDataEvent& i_event )
     pTable->getTableControlInterface().invalidate( TableAreaRowHeaders );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -655,7 +655,7 @@ void SAL_CALL SVTXGridControl::elementInserted( const ContainerEvent& i_event )
     m_pTableModel->insertColumn( nIndex, xGridColumn );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -665,7 +665,7 @@ void SAL_CALL SVTXGridControl::elementRemoved( const ContainerEvent& i_event ) t
     m_pTableModel->removeColumn( nIndex );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException)
 {
     OSL_ENSURE( false, "SVTXGridControl::elementReplaced: not implemented!" );
@@ -675,13 +675,13 @@ void SAL_CALL SVTXGridControl::elementReplaced( const ContainerEvent& i_event )
 }
 
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::disposing( const EventObject& Source ) throw(RuntimeException)
 {
     VCLXWindow::disposing( Source );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException )
 {
     SolarMutexGuard aGuard;
@@ -694,7 +694,7 @@ void SAL_CALL SVTXGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (Runtim
     pTable->SelectRow( i_rowIndex, true );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -705,7 +705,7 @@ void SAL_CALL SVTXGridControl::selectAllRows() throw (RuntimeException)
     pTable->SelectAllRows( true );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException )
 {
     SolarMutexGuard aGuard;
@@ -718,7 +718,7 @@ void SAL_CALL SVTXGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (Runt
     pTable->SelectRow( i_rowIndex, false );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -729,7 +729,7 @@ void SAL_CALL SVTXGridControl::deselectAllRows() throw (RuntimeException)
     pTable->SelectAllRows( false );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -744,7 +744,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti
     return selectedRows;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL SVTXGridControl::hasSelectedRows() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -755,7 +755,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti
     return pTable->GetSelectedRowCount() > 0;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL SVTXGridControl::isRowSelected( ::sal_Int32 index ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -766,7 +766,7 @@ Sequence< ::sal_Int32 > SAL_CALL SVTXGridControl::getSelectedRows() throw (Runti
     return pTable->IsRowSelected( index );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::dispose() throw(RuntimeException)
 {
     EventObject aObj;
@@ -775,7 +775,7 @@ void SVTXGridControl::dispose() throw(RuntimeException)
     VCLXWindow::dispose();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
     SolarMutexGuard aGuard;
@@ -852,7 +852,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
         VCLXWindow::ProcessWindowEvent( rVclWindowEvent );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -867,7 +867,7 @@ void SVTXGridControl::setEnable( sal_Bool bEnable ) throw(::com::sun::star::uno:
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::ImplCallItemListeners()
 {
     TableControl* pTable = dynamic_cast< TableControl* >( GetWindow() );
@@ -886,7 +886,7 @@ void SVTXGridControl::ImplCallItemListeners()
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SVTXGridControl::impl_updateColumnsFromModel_nothrow()
 {
     Reference< XGridColumnModel > const xColumnModel( m_pTableModel->getColumnModel() );
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index 7b8f9af6c1c8..9b33040067ea 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -707,19 +707,19 @@ void ToolboxController::dispatchCommand( const OUString& sCommandURL, const Sequ
 }
 
 //
-//-------------------------------------------------------------------------
+
 com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo >  SAL_CALL ToolboxController::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException)
 {
     Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
-//-------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& ToolboxController::getInfoHelper()
 {
         return *const_cast<ToolboxController*>(this)->getArrayHelper();
 }
 
-//------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* ToolboxController::createArrayHelper( ) const
 {
         com::sun::star::uno::Sequence< Property > aProps;
@@ -769,7 +769,7 @@ throw( com::sun::star::uno::Exception)
     }
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK_NOINSTANCE( ToolboxController, ExecuteHdl_Impl, DispatchInfo*, pDispatchInfo )
 {
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 12f2f206a6b3..4557c2443674 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -67,7 +67,7 @@ public:
 };
 
 
-// --------------------------------------------------------------------
+
 
 class ImplContextGraphicItem : public SvLBoxContextBmp
 {
@@ -79,7 +79,7 @@ public:
     OUString msCollapsedGraphicURL;
 };
 
-// --------------------------------------------------------------------
+
 
 class UnoTreeListBoxImpl : public SvTreeListBox
 {
@@ -102,7 +102,7 @@ private:
     rtl::Reference< TreeControlPeer > mxPeer;
 };
 
-// --------------------------------------------------------------------
+
 
 class UnoTreeListItem : public SvLBoxString
 {
@@ -125,7 +125,7 @@ private:
     Image           maImage;
 };
 
-// --------------------------------------------------------------------
+
 
 class UnoTreeListEntry : public SvTreeListEntry
 {
@@ -148,7 +148,7 @@ TreeControlPeer::TreeControlPeer()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 TreeControlPeer::~TreeControlPeer()
 {
@@ -157,7 +157,7 @@ TreeControlPeer::~TreeControlPeer()
     delete mpTreeNodeMap;
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry )
 {
@@ -172,7 +172,7 @@ void TreeControlPeer::addEntry( UnoTreeListEntry* pEntry )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry )
 {
@@ -186,7 +186,7 @@ void TreeControlPeer::removeEntry( UnoTreeListEntry* pEntry )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode, bool bThrow /* = true */ ) throw( IllegalArgumentException )
 {
@@ -203,7 +203,7 @@ UnoTreeListEntry* TreeControlPeer::getEntry( const Reference< XTreeNode >& xNode
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 Window* TreeControlPeer::createVclControl( Window* pParent, sal_Int64 nWinStyle )
 {
@@ -211,7 +211,7 @@ Window* TreeControlPeer::createVclControl( Window* pParent, sal_Int64 nWinStyle
     return mpTreeImpl;
 }
 
-// --------------------------------------------------------------------
+
 
 /** called from the UnoTreeListBoxImpl when it gets deleted */
 void TreeControlPeer::disposeControl()
@@ -221,14 +221,14 @@ void TreeControlPeer::disposeControl()
     mpTreeImpl = 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::SetWindow( Window* pWindow )
 {
     VCLXWindow::SetWindow( pWindow );
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = LIST_APPEND */ )
 {
@@ -267,7 +267,7 @@ UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xN
     return pEntry;
 }
 
-// --------------------------------------------------------------------
+
 
 bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
 {
@@ -335,7 +335,7 @@ bool TreeControlPeer::updateEntry( UnoTreeListEntry* pEntry )
     return bChanged;
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::onSelectionChanged()
 {
@@ -344,7 +344,7 @@ void TreeControlPeer::onSelectionChanged()
     maSelectionListeners.selectionChanged( aEvent );
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode )
 {
@@ -359,7 +359,7 @@ void TreeControlPeer::onRequestChildNodes( const Reference< XTreeNode >& xNode )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bExpanding )
 {
@@ -383,7 +383,7 @@ bool TreeControlPeer::onExpanding( const Reference< XTreeNode >& xNode, bool bEx
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExpanding )
 {
@@ -406,7 +406,7 @@ void TreeControlPeer::onExpanded( const Reference< XTreeNode >& xNode, bool bExp
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTreeDataModel >& xDataModel )
 {
@@ -431,7 +431,7 @@ void TreeControlPeer::fillTree( UnoTreeListBoxImpl& rTree, const Reference< XTre
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParentEntry )
 {
@@ -444,7 +444,7 @@ void TreeControlPeer::addNode( UnoTreeListBoxImpl& rTree, const Reference< XTree
     }
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (RuntimeException )
 {
@@ -453,7 +453,7 @@ UnoTreeListBoxImpl& TreeControlPeer::getTreeListBoxOrThrow() const throw (Runtim
     return *mpTreeImpl;
 }
 
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect, bool bSetSelection ) throw( RuntimeException, IllegalArgumentException )
 {
@@ -512,9 +512,9 @@ void TreeControlPeer::ChangeNodesSelection( const Any& rSelection, bool bSelect,
     }
 }
 
-// -------------------------------------------------------------------
+
 // ::com::sun::star::view::XSelectionSupplier
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -523,7 +523,7 @@ sal_Bool SAL_CALL TreeControlPeer::select( const Any& rSelection ) throw (Illega
     return sal_True;
 }
 
-// -------------------------------------------------------------------
+
 
 Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException)
 {
@@ -559,23 +559,23 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException)
     return aRet;
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException)
 {
     maSelectionListeners.addInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException)
 {
     maSelectionListeners.addInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 // ::com::sun::star::view::XMultiSelectionSupplier
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -583,14 +583,14 @@ sal_Bool SAL_CALL TreeControlPeer::addSelection( const Any& rSelection ) throw (
     return sal_True;
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     ChangeNodesSelection( rSelection, false, false );
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
 {
@@ -598,7 +598,7 @@ void SAL_CALL TreeControlPeer::clearSelection() throw (RuntimeException)
     getTreeListBoxOrThrow().SelectAll( sal_False );
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException)
 {
@@ -606,7 +606,7 @@ sal_Int32 SAL_CALL TreeControlPeer::getSelectionCount() throw (RuntimeException)
     return getTreeListBoxOrThrow().GetSelectionCount();
 }
 
-// -------------------------------------------------------------------
+
 
 class TreeSelectionEnumeration : public ::cppu::WeakImplHelper1< XEnumeration >
 {
@@ -619,7 +619,7 @@ public:
     std::list< Any >::iterator maIter;
 };
 
-// -------------------------------------------------------------------
+
 
 TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection )
 {
@@ -627,14 +627,14 @@ TreeSelectionEnumeration::TreeSelectionEnumeration( std::list< Any >& rSelection
     maIter = maSelection.begin();
 }
 
-// -------------------------------------------------------------------
+
 
 ::sal_Bool SAL_CALL TreeSelectionEnumeration::hasMoreElements() throw (RuntimeException)
 {
     return maIter != maSelection.end();
 }
 
-// -------------------------------------------------------------------
+
 
 Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -644,7 +644,7 @@ Any SAL_CALL TreeSelectionEnumeration::nextElement() throw (NoSuchElementExcepti
     return (*maIter++);
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration() throw (RuntimeException)
 {
@@ -668,7 +668,7 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createSelectionEnumeration()
     return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumeration() throw (RuntimeException)
 {
@@ -692,9 +692,9 @@ Reference< XEnumeration > SAL_CALL TreeControlPeer::createReverseSelectionEnumer
     return Reference< XEnumeration >( new TreeSelectionEnumeration( aSelection ) );
 }
 
-// --------------------------------------------------------------------
+
 // ::com::sun::star::awt::XTreeControl
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
 {
@@ -702,7 +702,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultExpandedGraphicURL() throw (::com::
     return msDefaultExpandedGraphicURL;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDefaultExpandedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -732,7 +732,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const OUString& sDe
     }
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com::sun::star::uno::RuntimeException)
 {
@@ -740,7 +740,7 @@ OUString SAL_CALL TreeControlPeer::getDefaultCollapsedGraphicURL() throw (::com:
     return msDefaultCollapsedGraphicURL;
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sDefaultCollapsedGraphicURL ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -770,7 +770,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const OUString& sD
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
@@ -781,7 +781,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeExpanded( const Reference< XTreeNode >&
     return ( pEntry && rTree.IsExpanded( pEntry ) ) ? sal_True : sal_False;
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
@@ -789,7 +789,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeCollapsed( const Reference< XTreeNode >
     return !isNodeExpanded( xNode );
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
@@ -801,7 +801,7 @@ void SAL_CALL TreeControlPeer::makeNodeVisible( const Reference< XTreeNode >& xN
         rTree.MakeVisible( pEntry );
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
@@ -812,7 +812,7 @@ sal_Bool SAL_CALL TreeControlPeer::isNodeVisible( const Reference< XTreeNode >&
     return ( pEntry && rTree.IsEntryVisible( pEntry ) ) ? sal_True : sal_False;
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
@@ -824,7 +824,7 @@ void SAL_CALL TreeControlPeer::expandNode( const Reference< XTreeNode >& xNode )
         rTree.Expand( pEntry );
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
@@ -836,21 +836,21 @@ void SAL_CALL TreeControlPeer::collapseNode( const Reference< XTreeNode >& xNode
         rTree.Collapse( pEntry );
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException)
 {
     maTreeExpansionListeners.addInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException)
 {
     maTreeExpansionListeners.removeInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
@@ -868,7 +868,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getNodeForLocation( sal_Int32 x
     return xNode;
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
@@ -886,7 +886,7 @@ Reference< XTreeNode > SAL_CALL TreeControlPeer::getClosestNodeForLocation( sal_
     return xNode;
 }
 
-// -------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode >& i_Node ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -899,7 +899,7 @@ awt::Rectangle SAL_CALL TreeControlPeer::getNodeRect( const Reference< XTreeNode
     return VCLUnoHelper::ConvertToAWTRect( aEntryRect );
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
 {
@@ -909,7 +909,7 @@ sal_Bool SAL_CALL TreeControlPeer::isEditing(  ) throw (RuntimeException)
     return rTree.IsEditingActive() ? sal_True : sal_False;
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
 {
@@ -927,7 +927,7 @@ sal_Bool SAL_CALL TreeControlPeer::stopEditing() throw (RuntimeException)
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException)
 {
@@ -937,7 +937,7 @@ void SAL_CALL TreeControlPeer::cancelEditing(  ) throw (RuntimeException)
     rTree.EndEditing(false);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -1004,9 +1004,9 @@ bool TreeControlPeer::onEditedEntry( UnoTreeListEntry* pEntry, const OUString& r
     return true;
 }
 
-// --------------------------------------------------------------------
+
 // ::com::sun::star::awt::tree::TreeDataModelListener
-// --------------------------------------------------------------------
+
 
 void SAL_CALL TreeControlPeer::treeNodesChanged( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent ) throw (RuntimeException)
 {
@@ -1234,9 +1234,9 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
         mxDataModel->addTreeDataModelListener( xListener );
 }
 
-// --------------------------------------------------------------------
+
 // ::com::sun::star::awt::XLayoutConstrains
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Size TreeControlPeer::getMinimumSize() throw(RuntimeException)
 {
@@ -1269,9 +1269,9 @@ void TreeControlPeer::onChangeDataModel( UnoTreeListBoxImpl& rTree, const Refere
     return aSz;
 }
 
-// --------------------------------------------------------------------
+
 // ::com::sun::star::awt::XVclWindowPeer
-// --------------------------------------------------------------------
+
 
 void TreeControlPeer::setProperty( const OUString& PropertyName, const Any& aValue) throw(RuntimeException)
 {
@@ -1492,7 +1492,7 @@ UnoTreeListBoxImpl::UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent,
 
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListBoxImpl::~UnoTreeListBoxImpl()
 {
@@ -1500,7 +1500,7 @@ UnoTreeListBoxImpl::~UnoTreeListBoxImpl()
         mxPeer->disposeControl();
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl)
 {
@@ -1509,7 +1509,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl)
 {
@@ -1522,7 +1522,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl)
 {
@@ -1534,7 +1534,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl)
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos )
 {
@@ -1544,7 +1544,7 @@ sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry*
         return SvTreeListBox::Insert( pEntry, nPos );
 }
 
-// --------------------------------------------------------------------
+
 
 void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent )
 {
@@ -1553,14 +1553,14 @@ void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent )
         mxPeer->onRequestChildNodes( pEntry->mxNode );
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& )
 {
     return mxPeer.is() ? mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ) : false;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
 {
@@ -1576,20 +1576,20 @@ UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry )
 {
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListItem::UnoTreeListItem()
 : SvLBoxString()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListItem::~UnoTreeListItem()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 void UnoTreeListItem::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
@@ -1618,14 +1618,14 @@ void UnoTreeListItem::Paint(
     }
 }
 
-// --------------------------------------------------------------------
+
 
 SvLBoxItem* UnoTreeListItem::Create() const
 {
     return new UnoTreeListItem;
 }
 
-// --------------------------------------------------------------------
+
 
 void UnoTreeListItem::Clone( SvLBoxItem* pSource )
 {
@@ -1637,28 +1637,28 @@ void UnoTreeListItem::Clone( SvLBoxItem* pSource )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void UnoTreeListItem::SetImage( const Image& rImage )
 {
     maImage = rImage;
 }
 
-// --------------------------------------------------------------------
+
 
 OUString UnoTreeListItem::GetGraphicURL() const
 {
     return maGraphicURL;
 }
 
-// --------------------------------------------------------------------
+
 
 void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL )
 {
     maGraphicURL = rGraphicURL;
 }
 
-// --------------------------------------------------------------------
+
 
 void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
 {
@@ -1680,7 +1680,7 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry
     }
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer )
 : SvTreeListEntry()
@@ -1691,7 +1691,7 @@ UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeCon
         mpPeer->addEntry( this );
 }
 
-// --------------------------------------------------------------------
+
 
 UnoTreeListEntry::~UnoTreeListEntry()
 {
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index bf0836254f08..0e596489dc53 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -132,7 +132,7 @@ namespace svt { namespace table
         return static_cast< const UnoControlTableModel* >( _pInstance )->checkInvariants();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     const char* UnoControlTableModel::checkInvariants() const
     {
         Reference< XGridDataModel > const xDataModel( m_pImpl->m_aDataModel );
@@ -149,7 +149,7 @@ namespace svt { namespace table
     DBG_TESTSOLARMUTEX(); \
     DBG_CHKTHIS( UnoControlTableModel, UnoControlTableModel_checkInvariants )
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DBG_NAME( UnoControlTableModel )
     UnoControlTableModel::UnoControlTableModel()
         :m_pImpl( new UnoControlTableModel_Impl )
@@ -162,21 +162,21 @@ namespace svt { namespace table
         m_pImpl->pInputHandler.reset( new DefaultInputHandler );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UnoControlTableModel::~UnoControlTableModel()
     {
         DBG_DTOR( UnoControlTableModel, UnoControlTableModel_checkInvariants );
         DELETEZ( m_pImpl );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableSize UnoControlTableModel::getColumnCount() const
     {
         DBG_CHECK_ME();
         return (TableSize)m_pImpl->aColumns.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableSize UnoControlTableModel::getRowCount() const
     {
         DBG_CHECK_ME();
@@ -195,21 +195,21 @@ namespace svt { namespace table
         return nRowCount;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoControlTableModel::hasColumnHeaders() const
     {
         DBG_CHECK_ME();
         return m_pImpl->bHasColumnHeaders;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoControlTableModel::hasRowHeaders() const
     {
         DBG_CHECK_ME();
         return m_pImpl->bHasRowHeaders;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setRowHeaders(bool _bRowHeaders)
     {
         DBG_CHECK_ME();
@@ -220,7 +220,7 @@ namespace svt { namespace table
         impl_notifyTableMetricsChanged();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setColumnHeaders(bool _bColumnHeaders)
     {
         DBG_CHECK_ME();
@@ -231,7 +231,7 @@ namespace svt { namespace table
         impl_notifyTableMetricsChanged();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoControlTableModel::isCellEditable( ColPos col, RowPos row ) const
     {
         DBG_CHECK_ME();
@@ -240,7 +240,7 @@ namespace svt { namespace table
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PColumnModel UnoControlTableModel::getColumnModel( ColPos column )
     {
         DBG_CHECK_ME();
@@ -249,14 +249,14 @@ namespace svt { namespace table
         return m_pImpl->aColumns[ column ];
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::appendColumn( Reference< XGridColumn > const & i_column )
     {
         DBG_CHECK_ME();
         insertColumn( m_pImpl->aColumns.size(), i_column );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::insertColumn( ColPos const i_position, Reference< XGridColumn > const & i_column )
     {
         DBG_CHECK_ME();
@@ -277,7 +277,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::removeColumn( ColPos const i_position )
     {
         DBG_CHECK_ME();
@@ -306,7 +306,7 @@ namespace svt { namespace table
             pColumnImpl->dispose();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::removeAllColumns()
     {
         DBG_CHECK_ME();
@@ -341,7 +341,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::impl_notifyTableMetricsChanged() const
     {
         ModellListeners aListeners( m_pImpl->m_aListeners );
@@ -354,28 +354,28 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PTableRenderer UnoControlTableModel::getRenderer() const
     {
         DBG_CHECK_ME();
         return m_pImpl->pRenderer;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PTableInputHandler UnoControlTableModel::getInputHandler() const
     {
         DBG_CHECK_ME();
         return m_pImpl->pInputHandler;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableMetrics UnoControlTableModel::getRowHeight() const
     {
         DBG_CHECK_ME();
         return m_pImpl->nRowHeight;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setRowHeight(TableMetrics _nRowHeight)
     {
         DBG_CHECK_ME();
@@ -386,7 +386,7 @@ namespace svt { namespace table
         impl_notifyTableMetricsChanged();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableMetrics UnoControlTableModel::getColumnHeaderHeight() const
     {
         DBG_CHECK_ME();
@@ -394,14 +394,14 @@ namespace svt { namespace table
         return m_pImpl->nColumnHeaderHeight;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableMetrics UnoControlTableModel::getRowHeaderWidth() const
     {
         DBG_CHECK_ME();
         DBG_ASSERT( hasRowHeaders(), "DefaultTableModel::getRowHeaderWidth: invalid call!" );
         return m_pImpl->nRowHeaderWidth;
     }
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setColumnHeaderHeight(TableMetrics _nHeight)
     {
         DBG_CHECK_ME();
@@ -412,7 +412,7 @@ namespace svt { namespace table
         impl_notifyTableMetricsChanged();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setRowHeaderWidth(TableMetrics _nWidth)
     {
         DBG_CHECK_ME();
@@ -423,21 +423,21 @@ namespace svt { namespace table
         impl_notifyTableMetricsChanged();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ScrollbarVisibility UnoControlTableModel::getVerticalScrollbarVisibility() const
     {
         DBG_CHECK_ME();
         return m_pImpl->eVScrollMode;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ScrollbarVisibility UnoControlTableModel::getHorizontalScrollbarVisibility() const
     {
         DBG_CHECK_ME();
         return m_pImpl->eHScrollMode;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::addTableModelListener( const PTableModelListener& i_listener )
     {
         DBG_CHECK_ME();
@@ -445,7 +445,7 @@ namespace svt { namespace table
         m_pImpl->m_aListeners.push_back( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::removeTableModelListener( const PTableModelListener& i_listener )
     {
         DBG_CHECK_ME();
@@ -463,21 +463,21 @@ namespace svt { namespace table
         OSL_ENSURE( false, "UnoControlTableModel::removeTableModelListener: listener is not registered - sure you're doing the right thing here?" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setVerticalScrollbarVisibility( ScrollbarVisibility const i_visibility ) const
     {
         DBG_CHECK_ME();
         m_pImpl->eVScrollMode = i_visibility;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setHorizontalScrollbarVisibility( ScrollbarVisibility const i_visibility ) const
     {
         DBG_CHECK_ME();
         m_pImpl->eHScrollMode = i_visibility;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setDataModel( Reference< XGridDataModel > const & i_gridDataModel )
     {
         DBG_CHECK_ME();
@@ -486,40 +486,40 @@ namespace svt { namespace table
         // own listeners
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XGridDataModel > UnoControlTableModel::getDataModel() const
     {
         Reference< XGridDataModel > const xDataModel( m_pImpl->m_aDataModel );
         return xDataModel;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoControlTableModel::hasDataModel() const
     {
         return getDataModel().is();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setColumnModel( Reference< XGridColumnModel > const & i_gridColumnModel )
     {
         DBG_CHECK_ME();
         m_pImpl->m_aColumnModel = i_gridColumnModel;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XGridColumnModel > UnoControlTableModel::getColumnModel() const
     {
         Reference< XGridColumnModel > const xColumnModel( m_pImpl->m_aColumnModel );
         return xColumnModel;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoControlTableModel::hasColumnModel() const
     {
         return getColumnModel().is();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::getCellContent( ColPos const i_col, RowPos const i_row, Any& o_cellContent )
     {
         DBG_CHECK_ME();
@@ -559,7 +559,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::getCellToolTip( ColPos const i_col, RowPos const i_row, Any& o_cellToolTip )
     {
         DBG_CHECK_ME();
@@ -576,7 +576,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any UnoControlTableModel::getRowHeading( RowPos const i_rowPos ) const
     {
         DBG_CHECK_ME();
@@ -597,7 +597,7 @@ namespace svt { namespace table
         return aRowHeading;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         void lcl_setColor( Any const & i_color, ::boost::optional< ::Color > & o_convertedColor )
@@ -619,140 +619,140 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getLineColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aGridLineColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setLineColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aGridLineColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getHeaderBackgroundColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aHeaderBackgroundColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setHeaderBackgroundColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aHeaderBackgroundColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getHeaderTextColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aHeaderTextColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getActiveSelectionBackColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aActiveSelectionBackColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getInactiveSelectionBackColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aInactiveSelectionBackColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getActiveSelectionTextColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aActiveSelectionTextColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getInactiveSelectionTextColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aInactiveSelectionTextColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setHeaderTextColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aHeaderTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setActiveSelectionBackColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aActiveSelectionBackColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setInactiveSelectionBackColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aInactiveSelectionBackColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setActiveSelectionTextColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aActiveSelectionTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setInactiveSelectionTextColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aInactiveSelectionTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getTextColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aTextColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setTextColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::Color > UnoControlTableModel::getTextLineColor() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aTextColor;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setTextLineColor( Any const & i_color )
     {
         DBG_CHECK_ME();
         lcl_setColor( i_color, m_pImpl->m_aTextLineColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::boost::optional< ::std::vector< ::Color > > UnoControlTableModel::getRowBackgroundColors() const
     {
         DBG_CHECK_ME();
         return m_pImpl->m_aRowColors;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setRowBackgroundColors( ::com::sun::star::uno::Any const & i_APIValue )
     {
         DBG_CHECK_ME();
@@ -770,21 +770,21 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     VerticalAlignment UnoControlTableModel::getVerticalAlign() const
     {
         DBG_CHECK_ME();
         return  m_pImpl->m_eVerticalAlign;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setVerticalAlign( VerticalAlignment _xAlign )
     {
         DBG_CHECK_ME();
         m_pImpl->m_eVerticalAlign = _xAlign;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ColPos UnoControlTableModel::getColumnPos( UnoGridColumnFacade const & i_column ) const
     {
         DBG_CHECK_ME();
@@ -800,7 +800,7 @@ namespace svt { namespace table
         return COL_INVALID;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ITableDataSort* UnoControlTableModel::getSortAdapter()
     {
         DBG_CHECK_ME();
@@ -811,21 +811,21 @@ namespace svt { namespace table
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoControlTableModel::isEnabled() const
     {
         DBG_CHECK_ME();
         return m_pImpl->bEnabled;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::setEnabled( bool _bEnabled )
     {
         DBG_CHECK_ME();
         m_pImpl->bEnabled = _bEnabled;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::sortByColumn( ColPos const i_column, ColumnSortDirection const i_sortDirection )
     {
         DBG_CHECK_ME();
@@ -841,7 +841,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ColumnSort UnoControlTableModel::getCurrentSortOrder() const
     {
         DBG_CHECK_ME();
@@ -861,7 +861,7 @@ namespace svt { namespace table
         return currentSort;
     }
 
-    //--------------------------------------------------------------------
+
     void UnoControlTableModel::notifyColumnChange( ColPos const i_columnPos, ColumnAttributeGroup const i_attributeGroup ) const
     {
         DBG_CHECK_ME();
@@ -878,7 +878,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::notifyRowsInserted( GridDataEvent const & i_event ) const
     {
         // check sanity of the event
@@ -915,7 +915,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::notifyRowsRemoved( GridDataEvent const & i_event ) const
     {
         ModellListeners aListeners( m_pImpl->m_aListeners );
@@ -928,7 +928,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::notifyDataChanged( ::com::sun::star::awt::grid::GridDataEvent const & i_event ) const
     {
         ColPos const firstCol = i_event.FirstColumn == -1 ? 0 : i_event.FirstColumn;
@@ -946,7 +946,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoControlTableModel::notifyAllDataChanged() const
     {
         ModellListeners aListeners( m_pImpl->m_aListeners );
diff --git a/svtools/source/uno/unogridcolumnfacade.cxx b/svtools/source/uno/unogridcolumnfacade.cxx
index 3c63cbcb2c3d..626792c3431f 100644
--- a/svtools/source/uno/unogridcolumnfacade.cxx
+++ b/svtools/source/uno/unogridcolumnfacade.cxx
@@ -53,7 +53,7 @@ namespace svt { namespace table
     using ::com::sun::star::style::HorizontalAlignment_LEFT;
     using ::com::sun::star::style::HorizontalAlignment;
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         template< class ATTRIBUTE_TYPE >
@@ -112,25 +112,25 @@ namespace svt { namespace table
         UnoGridColumnFacade* m_pColumnImplementation;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ColumnChangeMultiplexer::ColumnChangeMultiplexer( UnoGridColumnFacade& i_colImpl )
         :m_pColumnImplementation( &i_colImpl )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ColumnChangeMultiplexer::~ColumnChangeMultiplexer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ColumnChangeMultiplexer::dispose()
     {
         DBG_TESTSOLARMUTEX();
         m_pColumnImplementation = NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL ColumnChangeMultiplexer::columnChanged( const GridColumnEvent& i_event ) throw (RuntimeException)
     {
         if ( i_event.AttributeName == "DataColumnIndex" )
@@ -163,7 +163,7 @@ namespace svt { namespace table
             m_pColumnImplementation->columnChanged( nChangedAttributes );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL ColumnChangeMultiplexer::disposing( const EventObject& i_event ) throw (RuntimeException)
     {
         OSL_UNUSED( i_event );
@@ -172,7 +172,7 @@ namespace svt { namespace table
     //==================================================================================================================
     //= UnoGridColumnFacade
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     UnoGridColumnFacade::UnoGridColumnFacade( UnoControlTableModel const & i_owner, Reference< XGridColumn > const & i_gridColumn )
         :m_pOwner( &i_owner )
         ,m_nDataColumnIndex( -1 )
@@ -183,12 +183,12 @@ namespace svt { namespace table
         impl_updateDataColumnIndex_nothrow();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UnoGridColumnFacade::~UnoGridColumnFacade()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::dispose()
     {
         DBG_TESTSOLARMUTEX();
@@ -201,7 +201,7 @@ namespace svt { namespace table
         m_pOwner = NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::impl_updateDataColumnIndex_nothrow()
     {
         m_nDataColumnIndex = -1;
@@ -216,7 +216,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::dataColumnIndexChanged()
     {
         DBG_TESTSOLARMUTEX();
@@ -225,7 +225,7 @@ namespace svt { namespace table
             m_pOwner->notifyAllDataChanged();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::columnChanged( ColumnAttributeGroup const i_attributeGroup )
     {
         DBG_TESTSOLARMUTEX();
@@ -233,7 +233,7 @@ namespace svt { namespace table
             m_pOwner->notifyColumnChange( m_pOwner->getColumnPos( *this ), i_attributeGroup );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any UnoGridColumnFacade::getID() const
     {
         Any aID;
@@ -249,7 +249,7 @@ namespace svt { namespace table
         return aID;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setID( const Any& i_ID )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
@@ -263,7 +263,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString UnoGridColumnFacade::getName() const
     {
         OUString sName;
@@ -279,7 +279,7 @@ namespace svt { namespace table
         return sName;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setName( const OUString& _rName )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
@@ -293,7 +293,7 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString UnoGridColumnFacade::getHelpText() const
     {
         OUString sHelpText;
@@ -309,7 +309,7 @@ namespace svt { namespace table
         return sHelpText;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setHelpText( const OUString& i_helpText )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
@@ -323,84 +323,84 @@ namespace svt { namespace table
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool UnoGridColumnFacade::isResizable() const
     {
         ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", false );
         return lcl_get( m_xGridColumn, &XGridColumn::getResizeable );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setResizable( bool i_resizable )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
         lcl_set( m_xGridColumn, &XGridColumn::setResizeable, sal_Bool( i_resizable ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int32 UnoGridColumnFacade::getFlexibility() const
     {
         ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 1 );
         return lcl_get( m_xGridColumn, &XGridColumn::getFlexibility );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setFlexibility( sal_Int32 const i_flexibility )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
         lcl_set( m_xGridColumn, &XGridColumn::setFlexibility, i_flexibility );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableMetrics UnoGridColumnFacade::getWidth() const
     {
         ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 0 );
         return lcl_get( m_xGridColumn, &XGridColumn::getColumnWidth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setWidth( TableMetrics _nWidth )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
         lcl_set( m_xGridColumn, &XGridColumn::setColumnWidth, _nWidth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableMetrics UnoGridColumnFacade::getMinWidth() const
     {
         ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 0 );
         return lcl_get( m_xGridColumn, &XGridColumn::getMinWidth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setMinWidth( TableMetrics _nMinWidth )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
         lcl_set( m_xGridColumn, &XGridColumn::setMinWidth, _nMinWidth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TableMetrics UnoGridColumnFacade::getMaxWidth() const
     {
         ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", 0 );
         return lcl_get( m_xGridColumn, &XGridColumn::getMaxWidth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setMaxWidth( TableMetrics _nMaxWidth )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
         lcl_set( m_xGridColumn, &XGridColumn::setMinWidth, _nMaxWidth );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::com::sun::star::style::HorizontalAlignment UnoGridColumnFacade::getHorizontalAlign()
     {
         ENSURE_OR_RETURN( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!", HorizontalAlignment_LEFT );
         return lcl_get( m_xGridColumn, &XGridColumn::getHorizontalAlign );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void UnoGridColumnFacade::setHorizontalAlign( com::sun::star::style::HorizontalAlignment _align )
     {
         ENSURE_OR_RETURN_VOID( m_xGridColumn.is(), "UnoGridColumnFacade: already disposed!" );
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index ae3270b6ccb0..597e43a71806 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -804,7 +804,7 @@ void VCLXFileControl::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 //  ----------------------------------------------------
 //  class SVTXFormattedField
 //  ----------------------------------------------------
-// --------------------------------------------------------------------------------------
+
 SVTXFormattedField::SVTXFormattedField()
     :m_pCurrentSupplier(NULL)
     ,bIsStandardSupplier(sal_True)
@@ -812,7 +812,7 @@ SVTXFormattedField::SVTXFormattedField()
 {
 }
 
-// --------------------------------------------------------------------------------------
+
 SVTXFormattedField::~SVTXFormattedField()
 {
     if (m_pCurrentSupplier)
@@ -822,7 +822,7 @@ SVTXFormattedField::~SVTXFormattedField()
     }
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::SetWindow( Window* _pWindow )
 {
     VCLXSpinField::SetWindow(_pWindow);
@@ -830,7 +830,7 @@ void SVTXFormattedField::SetWindow( Window* _pWindow )
         GetFormattedField()->SetAutoColor(sal_True);
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -955,7 +955,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
         VCLXSpinField::setProperty( PropertyName, Value );
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXFormattedField::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -1023,7 +1023,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
     return aReturn;
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXFormattedField::convertEffectiveValue(const ::com::sun::star::uno::Any& rValue)
 {
     ::com::sun::star::uno::Any aReturn;
@@ -1083,7 +1083,7 @@ void SVTXFormattedField::setProperty( const OUString& PropertyName, const ::com:
     return aReturn;
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
 {
     FormattedField* pField = GetFormattedField();
@@ -1112,7 +1112,7 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
     }
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXFormattedField::GetMinValue()
 {
     FormattedField* pField = GetFormattedField();
@@ -1124,7 +1124,7 @@ void SVTXFormattedField::SetMinValue(const ::com::sun::star::uno::Any& rValue)
     return aReturn;
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
 {
     FormattedField* pField = GetFormattedField();
@@ -1152,7 +1152,7 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
     }
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXFormattedField::GetMaxValue()
 {
     FormattedField* pField = GetFormattedField();
@@ -1164,7 +1164,7 @@ void SVTXFormattedField::SetMaxValue(const ::com::sun::star::uno::Any& rValue)
     return aReturn;
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValue)
 {
     FormattedField* pField = GetFormattedField();
@@ -1197,7 +1197,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu
     }
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXFormattedField::GetDefaultValue()
 {
     FormattedField* pField = GetFormattedField();
@@ -1212,7 +1212,7 @@ void SVTXFormattedField::SetDefaultValue(const ::com::sun::star::uno::Any& rValu
     return aReturn;
 }
 
-// --------------------------------------------------------------------------------------
+
 sal_Bool SVTXFormattedField::GetTreatAsNumber()
 {
     FormattedField* pField = GetFormattedField();
@@ -1222,7 +1222,7 @@ sal_Bool SVTXFormattedField::GetTreatAsNumber()
     return sal_True;
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet)
 {
     FormattedField* pField = GetFormattedField();
@@ -1230,7 +1230,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet)
         pField->TreatAsNumber(bSet);
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXFormattedField::GetValue()
 {
     FormattedField* pField = GetFormattedField();
@@ -1252,7 +1252,7 @@ void SVTXFormattedField::SetTreatAsNumber(sal_Bool bSet)
     return aReturn;
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
 {
     FormattedField* pField = GetFormattedField();
@@ -1286,13 +1286,13 @@ void SVTXFormattedField::SetValue(const ::com::sun::star::uno::Any& rValue)
 //  NotifyTextListeners();
 }
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  SVTXFormattedField::getFormatsSupplier(void) const
 {
     return ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > ((::com::sun::star::util::XNumberFormatsSupplier*)m_pCurrentSupplier);
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xSupplier)
 {
     FormattedField* pField = GetFormattedField();
@@ -1334,14 +1334,14 @@ void SVTXFormattedField::setFormatsSupplier(const ::com::sun::star::uno::Referen
     }
 }
 
-// --------------------------------------------------------------------------------------
+
 sal_Int32 SVTXFormattedField::getFormatKey(void) const
 {
     FormattedField* pField = GetFormattedField();
     return pField ? pField->GetFormatKey() : 0;
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::setFormatKey(sal_Int32 nKey)
 {
     FormattedField* pField = GetFormattedField();
@@ -1360,7 +1360,7 @@ void SVTXFormattedField::setFormatKey(sal_Int32 nKey)
     }
 }
 
-// --------------------------------------------------------------------------------------
+
 void SVTXFormattedField::NotifyTextListeners()
 {
     if ( GetTextListeners().getLength() )
@@ -1402,12 +1402,12 @@ void SVTXFormattedField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 
 using namespace svt;
 
-// --------------------------------------------------------------------------------------
+
 SVTXRoadmap::SVTXRoadmap() : maItemListeners( *this )
 {
 }
 
-// --------------------------------------------------------------------------------------
+
 SVTXRoadmap::~SVTXRoadmap()
 {
 }
@@ -1552,7 +1552,7 @@ void SVTXRoadmap::elementReplaced( const ::com::sun::star::container::ContainerE
 
 
 
-// --------------------------------------------------------------------------------------
+
 void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -1607,7 +1607,7 @@ void SVTXRoadmap::setProperty( const OUString& PropertyName, const ::com::sun::s
 }
 
 
-// --------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Any SVTXRoadmap::getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index ee1961955cde..a92815518134 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -737,9 +737,9 @@ sal_Bool SvUnoImageMap::fillImageMap( ImageMap& rMap ) const
     return sal_True;
 }
 
-// -------------------------------------------------------------------
+
 // factory helper methods
-// -------------------------------------------------------------------
+
 
 Reference< XInterface > SvUnoImageMapRectangleObject_createInstance( const SvEventDescription* pSupportedMacroItems )
 {
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index ae2d96b9b526..5f5faaf9033e 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -69,7 +69,7 @@ namespace {
 
     namespace WizardButton = ::com::sun::star::ui::dialogs::WizardButton;
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         sal_uInt32 lcl_convertWizardButtonToWZB( const sal_Int16 i_nWizardButton )
@@ -150,7 +150,7 @@ namespace {
     {
     }
 
-    //--------------------------------------------------------------------
+
     Wizard::~Wizard()
     {
         // we do this here cause the base class' call to destroyDialog won't reach us anymore : we're within an dtor,
@@ -163,7 +163,7 @@ namespace {
         }
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         static void lcl_checkPaths( const Sequence< Sequence< sal_Int16 > >& i_rPaths, const Reference< XInterface >& i_rContext )
@@ -212,7 +212,7 @@ namespace {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL Wizard::initialize( const Sequence< Any >& i_Arguments ) throw (Exception, RuntimeException)
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -254,7 +254,7 @@ namespace {
             return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
     }
 
-    //------------------------------------------------------------------------
+
     static OUString lcl_getHelpURL( const OString& sHelpId )
     {
         OUStringBuffer aBuffer;
@@ -267,7 +267,7 @@ namespace {
         return aBuffer.makeStringAndClear();
     }
 
-    //--------------------------------------------------------------------
+
     Dialog* Wizard::createDialog( Window* i_pParent )
     {
         WizardShell* pDialog( new WizardShell( i_pParent, this, m_xController, m_aWizardSteps ) );
@@ -276,7 +276,7 @@ namespace {
         return pDialog;
     }
 
-    //--------------------------------------------------------------------
+
     void Wizard::destroyDialog()
     {
         if ( m_pDialog )
@@ -285,13 +285,13 @@ namespace {
         Wizard_Base::destroyDialog();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL Wizard::getImplementationName() throw(RuntimeException)
     {
         return OUString("com.sun.star.comp.svtools.uno.Wizard");
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL Wizard::getSupportedServiceNames() throw(RuntimeException)
     {
         Sequence< OUString > aServices(1);
@@ -299,19 +299,19 @@ namespace {
         return aServices;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > SAL_CALL Wizard::getPropertySetInfo() throw(RuntimeException)
     {
         return createPropertySetInfo( getInfoHelper() );
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL Wizard::getInfoHelper()
     {
         return *const_cast< Wizard* >( this )->getArrayHelper();
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* Wizard::createArrayHelper( ) const
     {
         Sequence< Property > aProps;
@@ -319,7 +319,7 @@ namespace {
         return new ::cppu::OPropertyArrayHelper( aProps );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL Wizard::getHelpURL() throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -331,7 +331,7 @@ namespace {
         return lcl_getHelpURL( m_pDialog->GetHelpId() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::setHelpURL( const OUString& i_HelpURL ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -343,7 +343,7 @@ namespace {
             m_pDialog->SetHelpId( lcl_getHelpId( i_HelpURL ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWindow > SAL_CALL Wizard::getDialogWindow() throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -353,7 +353,7 @@ namespace {
         return Reference< XWindow >( m_pDialog->GetComponentInterface(), UNO_QUERY );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::enableButton( ::sal_Int16 i_WizardButton, ::sal_Bool i_Enable ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -365,7 +365,7 @@ namespace {
         pWizardImpl->enableButtons( lcl_convertWizardButtonToWZB( i_WizardButton ), i_Enable );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::setDefaultButton( ::sal_Int16 i_WizardButton ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -377,7 +377,7 @@ namespace {
         pWizardImpl->defaultButton( lcl_convertWizardButtonToWZB( i_WizardButton ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool SAL_CALL Wizard::travelNext(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -389,7 +389,7 @@ namespace {
         return pWizardImpl->travelNext();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool SAL_CALL Wizard::travelPrevious(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -401,7 +401,7 @@ namespace {
         return pWizardImpl->travelPrevious();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::enablePage( ::sal_Int16 i_PageID, ::sal_Bool i_Enable ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -419,7 +419,7 @@ namespace {
         pWizardImpl->enablePage( i_PageID, i_Enable );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::updateTravelUI(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -431,7 +431,7 @@ namespace {
         pWizardImpl->updateTravelUI();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL Wizard::advanceTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -443,7 +443,7 @@ namespace {
         return pWizardImpl->advanceTo( i_PageId );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL Wizard::goBackTo( ::sal_Int16 i_PageId ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -455,7 +455,7 @@ namespace {
         return pWizardImpl->goBackTo( i_PageId );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWizardPage > SAL_CALL Wizard::getCurrentPage(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -467,7 +467,7 @@ namespace {
         return pWizardImpl->getCurrentWizardPage();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::activatePath( ::sal_Int16 i_PathIndex, ::sal_Bool i_Final ) throw (NoSuchElementException, InvalidStateException, RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -482,14 +482,14 @@ namespace {
         pWizardImpl->activatePath( i_PathIndex, i_Final );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Wizard::setTitle( const OUString& i_Title ) throw (RuntimeException)
     {
         // simply disambiguate
         Wizard_Base::OGenericUnoDialog::setTitle( i_Title );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL Wizard::execute(  ) throw (RuntimeException)
     {
         return Wizard_Base::OGenericUnoDialog::execute();
diff --git a/svtools/source/uno/wizard/wizardpagecontroller.cxx b/svtools/source/uno/wizard/wizardpagecontroller.cxx
index 105c75bb035b..1a1cd17b5a69 100644
--- a/svtools/source/uno/wizard/wizardpagecontroller.cxx
+++ b/svtools/source/uno/wizard/wizardpagecontroller.cxx
@@ -53,7 +53,7 @@ namespace svt { namespace uno
     //==================================================================================================================
     //= WizardPageController
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     WizardPageController::WizardPageController( WizardShell& i_rParent, const Reference< XWizardController >& i_rController,
             const sal_Int16 i_nPageId )
         :m_xController( i_rController )
@@ -81,7 +81,7 @@ namespace svt { namespace uno
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     WizardPageController::~WizardPageController()
     {
         try
@@ -95,7 +95,7 @@ namespace svt { namespace uno
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TabPage* WizardPageController::getTabPage() const
     {
         ENSURE_OR_RETURN( m_xWizardPage.is(), "WizardPageController::getTabPage: no external wizard page!", NULL );
@@ -122,7 +122,7 @@ namespace svt { namespace uno
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void WizardPageController::initializePage()
     {
         if ( !m_xWizardPage.is() )
@@ -138,7 +138,7 @@ namespace svt { namespace uno
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool WizardPageController::commitPage( WizardTypes::CommitPageReason i_eReason )
     {
         if ( !m_xWizardPage.is() )
@@ -156,7 +156,7 @@ namespace svt { namespace uno
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool WizardPageController::canAdvance() const
     {
         if ( !m_xWizardPage.is() )
diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx
index 8054e4bf86fe..6223e77a7040 100644
--- a/svtools/source/uno/wizard/wizardshell.cxx
+++ b/svtools/source/uno/wizard/wizardshell.cxx
@@ -52,7 +52,7 @@ namespace svt { namespace uno
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         sal_Int16 lcl_determineFirstPageID( const Sequence< Sequence< sal_Int16 > >& i_rPaths )
         {
             ENSURE_OR_THROW( ( i_rPaths.getLength() > 0 ) && ( i_rPaths[0].getLength() > 0 ), "illegal paths" );
@@ -63,7 +63,7 @@ namespace svt { namespace uno
     //==================================================================================================================
     //= WizardShell
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     WizardShell::WizardShell( Window* i_pParent, const Reference< XWizard >& i_rWizard, const Reference< XWizardController >& i_rController,
             const Sequence< Sequence< sal_Int16 > >& i_rPaths )
         :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE )
@@ -93,19 +93,19 @@ namespace svt { namespace uno
         enableAutomaticNextButtonState();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     WizardShell::~WizardShell()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     short WizardShell::Execute()
     {
         ActivatePage();
         return WizardShell_Base::Execute();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int16 WizardShell::convertCommitReasonToTravelType( const CommitPageReason i_eReason )
     {
         switch ( i_eReason )
@@ -126,7 +126,7 @@ namespace svt { namespace uno
         return WizardTravelType::FINISH;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void WizardShell::enterState( WizardState i_nState )
     {
         WizardShell_Base::enterState( i_nState );
@@ -144,7 +144,7 @@ namespace svt { namespace uno
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool WizardShell::leaveState( WizardState i_nState )
     {
         if ( !WizardShell_Base::leaveState( i_nState ) )
@@ -165,7 +165,7 @@ namespace svt { namespace uno
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     PWizardPageController WizardShell::impl_getController( TabPage* i_pPage ) const
     {
         Page2ControllerMap::const_iterator pos = m_aPageControllers.find( i_pPage );
@@ -173,7 +173,7 @@ namespace svt { namespace uno
         return pos->second;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XWizardPage > WizardShell::getCurrentWizardPage() const
     {
         const WizardState eState = getCurrentState();
@@ -184,13 +184,13 @@ namespace svt { namespace uno
         return pController->getWizardPage();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void WizardShell::enablePage( const sal_Int16 i_nPageID, const sal_Bool i_bEnable )
     {
         enableState( impl_pageIdToState( i_nPageID ), i_bEnable );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     TabPage* WizardShell::createPage( WizardState i_nState )
     {
         ENSURE_OR_RETURN( m_xController.is(), "WizardShell::createPage: no WizardController!", NULL );
@@ -209,13 +209,13 @@ namespace svt { namespace uno
         return pPage;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IWizardPageController* WizardShell::getPageController( TabPage* i_pCurrentPage ) const
     {
         return impl_getController( i_pCurrentPage ).get();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString WizardShell::getStateDisplayName( WizardState i_nState ) const
     {
         try
@@ -231,7 +231,7 @@ namespace svt { namespace uno
         return OUString::number(i_nState);
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool WizardShell::canAdvance() const
     {
         try
@@ -247,7 +247,7 @@ namespace svt { namespace uno
         return WizardShell_Base::canAdvance();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool WizardShell::onFinish()
     {
         try
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index e16dfafd2f55..03d5799dda80 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -18,11 +18,11 @@
  */
 
 
-//------------------------------------------------------------------------
+
 //
 // Global header
 //
-//------------------------------------------------------------------------
+
 #include <svl/itemset.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outliner.hxx>
@@ -30,11 +30,11 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpool.hxx>
 
-//------------------------------------------------------------------------
+
 //
 // Project-local header
 //
-//------------------------------------------------------------------------
+
 
 #include "AccessibleEmptyEditSource.hxx"
 #include <svx/unoshtxt.hxx>
@@ -173,9 +173,9 @@ namespace accessibility
 
     };
 
-    // -------------------------------------------------------------------------
+
     // Implementing AccessibleProxyEditSource_Impl
-    // -------------------------------------------------------------------------
+
 
     AccessibleProxyEditSource_Impl::AccessibleProxyEditSource_Impl( SdrObject&      rObj,
                                                                     SdrView&        rView,
@@ -219,9 +219,9 @@ namespace accessibility
     }
 
 
-    // -------------------------------------------------------------------------
+
     // Implementing AccessibleEmptyEditSource
-    // -------------------------------------------------------------------------
+
 
     AccessibleEmptyEditSource::AccessibleEmptyEditSource( SdrObject&    rObj,
                                                           SdrView&      rView,
@@ -345,6 +345,6 @@ namespace accessibility
 
 } // end of namespace accessibility
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 6a920a7e6c53..c9f37a67c7ac 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -89,14 +89,14 @@ AccFrameSelector::AccFrameSelector( FrameSelector& rFrameSel, FrameBorderType eB
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 AccFrameSelector::~AccFrameSelector()
 {
     RemoveFrameSelEventListener();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::RemoveFrameSelEventListener()
 {
@@ -106,7 +106,7 @@ void AccFrameSelector::RemoveFrameSelEventListener()
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext(  )
     throw (RuntimeException)
@@ -114,7 +114,7 @@ Reference< XAccessibleContext > AccFrameSelector::getAccessibleContext(  )
     return this;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int32 AccFrameSelector::getAccessibleChildCount(  ) throw (RuntimeException)
 {
@@ -123,7 +123,7 @@ sal_Int32 AccFrameSelector::getAccessibleChildCount(  ) throw (RuntimeException)
     return (meBorder == FRAMEBORDER_NONE) ? mpFrameSel->GetEnabledBorderCount() : 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i )
     throw (RuntimeException)
@@ -138,7 +138,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleChild( sal_Int32 i )
     return xRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccFrameSelector::getAccessibleParent(  )
     throw (RuntimeException)
@@ -153,7 +153,7 @@ Reference< XAccessible > AccFrameSelector::getAccessibleParent(  )
     return xRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int32 AccFrameSelector::getAccessibleIndexInParent(  )
     throw (RuntimeException)
@@ -178,14 +178,14 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent(  )
     return nIdx;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int16 AccFrameSelector::getAccessibleRole(  ) throw (RuntimeException)
 {
     return meBorder == FRAMEBORDER_NONE ? AccessibleRole::OPTION_PANE : AccessibleRole::CHECK_BOX;
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString AccFrameSelector::getAccessibleDescription(  )
     throw (RuntimeException)
@@ -195,7 +195,7 @@ OUString AccFrameSelector::getAccessibleDescription(  )
     return maDescriptions.GetString(meBorder);
 }
 
-// ----------------------------------------------------------------------------
+
 
 OUString AccFrameSelector::getAccessibleName(  )
     throw (RuntimeException)
@@ -205,7 +205,7 @@ OUString AccFrameSelector::getAccessibleName(  )
     return maNames.GetString(meBorder);
 }
 
-// ----------------------------------------------------------------------------
+
 
 Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(  )
     throw (RuntimeException)
@@ -239,7 +239,7 @@ Reference< XAccessibleRelationSet > AccFrameSelector::getAccessibleRelationSet(
     return xRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet(  )
     throw (RuntimeException)
@@ -285,7 +285,7 @@ Reference< XAccessibleStateSet > AccFrameSelector::getAccessibleStateSet(  )
     return xRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 Locale AccFrameSelector::getLocale(  )
     throw (IllegalAccessibleComponentStateException, RuntimeException)
@@ -293,7 +293,7 @@ Locale AccFrameSelector::getLocale(  )
     return Application::GetSettings().GetUILanguageTag().getLocale();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::addPropertyChangeListener(
     const Reference< XPropertyChangeListener >& xListener )
@@ -302,7 +302,7 @@ void AccFrameSelector::addPropertyChangeListener(
     maPropertyListeners.addInterface( xListener );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyChangeListener >& xListener )
     throw (RuntimeException)
@@ -310,7 +310,7 @@ void AccFrameSelector::removePropertyChangeListener( const Reference< XPropertyC
     maPropertyListeners.removeInterface( xListener );
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt )
     throw (RuntimeException)
@@ -321,7 +321,7 @@ sal_Bool AccFrameSelector::containsPoint( const AwtPoint& aPt )
     return mpFrameSel->ContainsClickPoint( Point( aPt.X, aPt.Y ) );
 }
 
-// ----------------------------------------------------------------------------
+
 
 Reference< XAccessible > AccFrameSelector::getAccessibleAtPoint(
     const AwtPoint& aPt )
@@ -358,7 +358,7 @@ AwtRectangle AccFrameSelector::getBounds(  ) throw (RuntimeException)
     return aRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 AwtPoint AccFrameSelector::getLocation(  ) throw (RuntimeException)
 {
@@ -378,7 +378,7 @@ AwtPoint AccFrameSelector::getLocation(  ) throw (RuntimeException)
     return aRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 AwtPoint AccFrameSelector::getLocationOnScreen(  ) throw (RuntimeException)
 {
@@ -399,7 +399,7 @@ AwtPoint AccFrameSelector::getLocationOnScreen(  ) throw (RuntimeException)
     return aRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 AwtSize AccFrameSelector::getSize(  ) throw (RuntimeException)
 {
@@ -419,7 +419,7 @@ AwtSize AccFrameSelector::getSize(  ) throw (RuntimeException)
     return aRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Bool AccFrameSelector::isShowing(  ) throw (RuntimeException)
 {
@@ -428,7 +428,7 @@ sal_Bool AccFrameSelector::isShowing(  ) throw (RuntimeException)
     return sal_True;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Bool AccFrameSelector::isVisible(  ) throw (RuntimeException)
 {
@@ -437,7 +437,7 @@ sal_Bool AccFrameSelector::isVisible(  ) throw (RuntimeException)
     return sal_True;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Bool AccFrameSelector::isFocusTraversable(  ) throw (RuntimeException)
 {
@@ -446,21 +446,21 @@ sal_Bool AccFrameSelector::isFocusTraversable(  ) throw (RuntimeException)
     return sal_True;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::addFocusListener( const Reference< XFocusListener >& xListener ) throw (RuntimeException)
 {
     maFocusListeners.addInterface( xListener );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::removeFocusListener( const Reference< XFocusListener >& xListener ) throw (RuntimeException)
 {
     maFocusListeners.removeInterface( xListener );
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::grabFocus(  ) throw (RuntimeException)
 {
@@ -469,7 +469,7 @@ void AccFrameSelector::grabFocus(  ) throw (RuntimeException)
     mpFrameSel->GrabFocus();
 }
 
-// ----------------------------------------------------------------------------
+
 
 Any AccFrameSelector::getAccessibleKeyBinding(  ) throw (RuntimeException)
 {
@@ -505,7 +505,7 @@ Any AccFrameSelector::getAccessibleKeyBinding(  ) throw (RuntimeException)
     return aRet;
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int32 AccFrameSelector::getForeground(  )
         throw (RuntimeException)
@@ -515,7 +515,7 @@ sal_Int32 AccFrameSelector::getForeground(  )
     return mpFrameSel->GetControlForeground().GetColor();
 }
 
-// ----------------------------------------------------------------------------
+
 
 sal_Int32 AccFrameSelector::getBackground(  )
         throw (RuntimeException)
@@ -525,7 +525,7 @@ sal_Int32 AccFrameSelector::getBackground(  )
     return mpFrameSel->GetControlBackground().GetColor();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
@@ -541,7 +541,7 @@ void AccFrameSelector::addAccessibleEventListener( const Reference< XAccessibleE
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException)
 {
@@ -627,7 +627,7 @@ void    AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 IMPL_LINK( AccFrameSelector, WindowEventListener, VclSimpleEvent*, pEvent )
 {
@@ -646,7 +646,7 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclSimpleEvent*, pEvent )
     return 0;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
 {
@@ -679,7 +679,7 @@ void AccFrameSelector::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId,
     const Any& _rOldValue, const Any& _rNewValue )
@@ -692,7 +692,7 @@ void AccFrameSelector::NotifyAccessibleEvent( const sal_Int16 _nEventId,
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 void AccFrameSelector::Invalidate()
 {
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 2eee09be2c6e..6f0de34fd2a0 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -887,13 +887,13 @@ void SAL_CALL
 //=====  XAccessibleSelection  ============================================
 //
 
-//--------------------------------------------------------------------------------
+
 void SAL_CALL AccessibleShape::selectAccessibleChild( sal_Int32 )
 throw ( IndexOutOfBoundsException, RuntimeException )
 {
 }
 
-//----------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL AccessibleShape::isAccessibleChildSelected( sal_Int32 nChildIndex )
 throw ( IndexOutOfBoundsException,
        RuntimeException )
@@ -936,19 +936,19 @@ throw ( IndexOutOfBoundsException,
     return sal_False;
 }
 
-//---------------------------------------------------------------------
+
 void SAL_CALL AccessibleShape::clearAccessibleSelection(  )
 throw ( RuntimeException )
 {
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL AccessibleShape::selectAllAccessibleChildren(  )
 throw ( RuntimeException )
 {
 }
 
-//----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL AccessibleShape::getSelectedAccessibleChildCount()
 throw ( RuntimeException )
 {
@@ -960,7 +960,7 @@ throw ( RuntimeException )
     return nCount;
 }
 
-//--------------------------------------------------------------------------------------
+
 Reference<XAccessible> SAL_CALL AccessibleShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
 throw ( IndexOutOfBoundsException, RuntimeException)
 {
@@ -977,7 +977,7 @@ throw ( IndexOutOfBoundsException, RuntimeException)
     return Reference<XAccessible>();
 }
 
-//----------------------------------------------------------------------------------
+
 void SAL_CALL AccessibleShape::deselectAccessibleChild( sal_Int32 )
                                                             throw ( IndexOutOfBoundsException,
                                                             RuntimeException )
@@ -1154,7 +1154,7 @@ const uno::Sequence< sal_Int8 >&
     return theAccessibleShapeImplementationId::get().getSeq();
 }
 
-//------------------------------------------------------------------------------
+
 AccessibleShape*
     AccessibleShape::getImplementation( const uno::Reference< uno::XInterface >& rxIFace )
     throw()
@@ -1168,7 +1168,7 @@ AccessibleShape*
     return( pReturn );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL
     AccessibleShape::getSomething( const uno::Sequence< sal_Int8 >& rIdentifier )
     throw(uno::RuntimeException)
diff --git a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
index e316e93fc084..d900820c0ae7 100644
--- a/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
+++ b/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx
@@ -78,16 +78,16 @@ void VCLXAccessibleSvxFindReplaceDialog::FillAccessibleRelationSet( utl::Accessi
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------------
+
 
 OUString VCLXAccessibleSvxFindReplaceDialog::getImplementationName() throw (RuntimeException)
 {
     return OUString( "VCLXAccessibleSvxFindReplaceDialog" );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< OUString > VCLXAccessibleSvxFindReplaceDialog::getSupportedServiceNames() throw (RuntimeException)
 {
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index fe6cd4797422..a75e534c9b0d 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -32,11 +32,11 @@
 
 namespace accessibility
 {
-    //------------------------------------------------------------------------
+
     //
     // EventQueue implementation
     //
-    //------------------------------------------------------------------------
+
 
     AccessibleTextEventQueue::AccessibleTextEventQueue()
     {
@@ -90,6 +90,6 @@ namespace accessibility
 
 } // end of namespace accessibility
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 342131a2efcc..8236579d465f 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -18,11 +18,11 @@
  */
 
 
-//------------------------------------------------------------------------
+
 //
 // Global header
 //
-//------------------------------------------------------------------------
+
 
 #include <limits.h>
 #include <memory>
@@ -48,11 +48,11 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 
-//------------------------------------------------------------------------
+
 //
 // Project-local header
 //
-//------------------------------------------------------------------------
+
 #include "AccessibleTextEventQueue.hxx"
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshape.hxx>
@@ -77,11 +77,11 @@ using namespace ::com::sun::star::accessibility;
 namespace accessibility
 {
 
-//------------------------------------------------------------------------
+
 //
 // AccessibleTextHelper_Impl declaration
 //
-//------------------------------------------------------------------------
+
 
     DBG_NAME( AccessibleTextHelper_Impl )
 
@@ -254,11 +254,11 @@ namespace accessibility
         int mnNotifierClientId;
     };
 
-    //------------------------------------------------------------------------
+
     //
     // AccessibleTextHelper_Impl implementation
     //
-    //------------------------------------------------------------------------
+
 
     AccessibleTextHelper_Impl::AccessibleTextHelper_Impl() :
         mxFrontEnd( NULL ),
@@ -1732,11 +1732,11 @@ namespace accessibility
         return NULL;
     }
 
-    //------------------------------------------------------------------------
+
     //
     // AccessibleTextHelper implementation (simply forwards to impl)
     //
-    //------------------------------------------------------------------------
+
 
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     AccessibleTextHelper::AccessibleTextHelper( ::std::auto_ptr< SvxEditSource > pEditSource ) :
@@ -2072,6 +2072,6 @@ namespace accessibility
 
 } // end of namespace accessibility
 
-//------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 89d647e9f9e6..2326463e858a 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -1143,14 +1143,14 @@ AccessibleShape* ChildDescriptor::GetAccessibleShape (void) const
 {
     return static_cast<AccessibleShape*> (mxAccessibleShape.get());
 }
-// -----------------------------------------------------------------------------
+
 void ChildDescriptor::setIndexAtAccessibleShape(sal_Int32 _nIndex)
 {
     AccessibleShape* pShape = GetAccessibleShape();
     if ( pShape )
         pShape->setIndexInParent(_nIndex);
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index ebb713fb3399..7314cf18b002 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -123,7 +123,7 @@ SvxGraphCtrlAccessibleContext::SvxGraphCtrlAccessibleContext(
     maTreeInfo.SetViewForwarder( const_cast<SvxGraphCtrlAccessibleContext*>(this) );
 }
 
-//-----------------------------------------------------------------------------
+
 
 /** on destruction, this component is disposed and all dispose listeners
     are called, except if this component was already disposed */
@@ -132,7 +132,7 @@ SvxGraphCtrlAccessibleContext::~SvxGraphCtrlAccessibleContext()
     disposing();
 }
 
-//-----------------------------------------------------------------------------
+
 
 /** returns the XAccessible interface for a given SdrObject.
     Multiple calls for the same SdrObject return the same XAccessible.
@@ -197,7 +197,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::containsPoint( const awt::Point
         && (rPoint.Y < aSize.Height);
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAtPoint( const awt::Point& rPoint ) throw( RuntimeException )
 {
@@ -228,7 +228,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleAt
     return xAccessible;
 }
 
-//-----------------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( RuntimeException )
 {
@@ -242,7 +242,7 @@ awt::Rectangle SAL_CALL SvxGraphCtrlAccessibleContext::getBounds() throw( Runtim
     return aBounds;
 }
 
-//-----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeException )
 {
@@ -251,7 +251,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocation() throw( RuntimeE
     return awt::Point( aRect.getX(), aRect.getY() );
 }
 
-//-----------------------------------------------------------------------------
+
 
 awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw( RuntimeException )
 {
@@ -260,7 +260,7 @@ awt::Point SAL_CALL SvxGraphCtrlAccessibleContext::getLocationOnScreen() throw(
     return awt::Point( aRect.getX(), aRect.getY() );
 }
 
-//-----------------------------------------------------------------------------
+
 
 awt::Size SAL_CALL SvxGraphCtrlAccessibleContext::getSize() throw( RuntimeException )
 {
@@ -282,7 +282,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChildCount( void
     return mpPage->GetObjCount();
 }
 
-//-----------------------------------------------------------------------------
+
 
 /** returns the SdrObject at index nIndex from the model of this graph */
 SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex )
@@ -299,7 +299,7 @@ SdrObject* SvxGraphCtrlAccessibleContext::getSdrObject( sal_Int32 nIndex )
     return mpPage->GetObj( nIndex );
 }
 
-//-----------------------------------------------------------------------------
+
 
 /** sends an AccessibleEventObject to all added XAccessibleEventListeners */
 void SvxGraphCtrlAccessibleContext::CommitChange (
@@ -323,7 +323,7 @@ void SvxGraphCtrlAccessibleContext::FireEvent (const AccessibleEventObject& aEve
         comphelper::AccessibleEventNotifier::addEvent( mnClientId, aEvent );
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
     throw( RuntimeException, lang::IndexOutOfBoundsException )
@@ -333,14 +333,14 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleCh
     return getAccessible( getSdrObject( nIndex ) );
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleParent( void ) throw( RuntimeException )
 {
     return mxParent;
 }
 
-//-----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( void ) throw( RuntimeException )
 {
@@ -372,14 +372,14 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleIndexInParent( vo
    return -1;
 }
 
-//-----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleRole( void ) throw( RuntimeException )
 {
     return AccessibleRole::PANEL;
 }
 
-//-----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void ) throw( RuntimeException )
 {
@@ -387,7 +387,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleDescription( void
     return msDescription;
 }
 
-//-----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw( RuntimeException )
 {
@@ -395,7 +395,7 @@ OUString SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleName( void ) throw
     return msName;
 }
 
-//-----------------------------------------------------------------------------
+
 
 /** Return empty reference to indicate that the relation set is not
     supported.
@@ -405,7 +405,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SvxGraphCtrlAccessibleContext::getA
     return Reference< XAccessibleRelationSet >();
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleStateSet( void ) throw( RuntimeException )
 {
@@ -430,7 +430,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxGraphCtrlAccessibleContext::getAcce
     return pStateSetHelper;
 }
 
-//-----------------------------------------------------------------------------
+
 
 lang::Locale SAL_CALL SvxGraphCtrlAccessibleContext::getLocale( void ) throw( IllegalAccessibleComponentStateException, RuntimeException )
 {
@@ -461,7 +461,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addAccessibleEventListener( const R
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
     throw( RuntimeException )
@@ -483,7 +483,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeAccessibleEventListener( cons
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference< awt::XFocusListener >& xListener )
     throw( RuntimeException )
@@ -498,7 +498,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::addFocusListener( const Reference<
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Reference< awt::XFocusListener >& xListener )
     throw (RuntimeException)
@@ -513,7 +513,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::removeFocusListener( const Referenc
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException )
 {
@@ -525,7 +525,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::grabFocus() throw( RuntimeException
     mpControl->GrabFocus();
 }
 
-//-----------------------------------------------------------------------------
+
 
 Any SAL_CALL SvxGraphCtrlAccessibleContext::getAccessibleKeyBinding() throw( RuntimeException )
 {
@@ -607,7 +607,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAccessibleChild( sal_Int32 nI
         mpView->MarkObj( pObj, mpView->GetSdrPageView());
 }
 
-//-----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
 {
@@ -619,7 +619,7 @@ sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::isAccessibleChildSelected( sal_
     return mpView->IsObjMarked( getSdrObject( nIndex ) );
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( RuntimeException )
 {
@@ -631,7 +631,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::clearAccessibleSelection() throw( R
     mpView->UnmarkAllObj();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw( RuntimeException )
 {
@@ -643,7 +643,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::selectAllAccessibleChildren() throw
     mpView->MarkAllObj();
 }
 
-//-----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCount() throw( RuntimeException )
 {
@@ -656,7 +656,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChildCoun
     return rList.GetMarkCount();
 }
 
-//-----------------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAccessibleChild( sal_Int32 nIndex )
     throw( lang::IndexOutOfBoundsException, RuntimeException )
@@ -675,7 +675,7 @@ Reference< XAccessible > SAL_CALL SvxGraphCtrlAccessibleContext::getSelectedAcce
     return xAccessible;
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::deselectAccessibleChild( sal_Int32 nIndex ) throw( lang::IndexOutOfBoundsException, RuntimeException )
 {
@@ -746,7 +746,7 @@ void SvxGraphCtrlAccessibleContext::setModelAndView (
 
 
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
 {
@@ -785,7 +785,7 @@ void SAL_CALL SvxGraphCtrlAccessibleContext::disposing()
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( RuntimeException )
 {
@@ -800,7 +800,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBoxOnScreen( void ) throw( R
         mpControl->GetSizePixel() );
 }
 
-//-----------------------------------------------------------------------------
+
 
 /** Calculate the relative coordinates of the bounding box as difference
     between the absolute coordinates of the bounding boxes of this control
@@ -829,7 +829,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeEx
     return aBounds;
 }
 
-//-----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void )
 {
@@ -847,7 +847,7 @@ Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void )
     return pId->getImplementationId();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
@@ -904,7 +904,7 @@ bool SvxGraphCtrlAccessibleContext::IsValid (void) const
     return true;
 }
 
-//-----------------------------------------------------------------------------
+
 
 Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const
 {
@@ -919,7 +919,7 @@ Rectangle SvxGraphCtrlAccessibleContext::GetVisibleArea (void) const
     return aVisArea;
 }
 
-//-----------------------------------------------------------------------------
+
 
 Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const
 {
@@ -934,7 +934,7 @@ Point SvxGraphCtrlAccessibleContext::LogicToPixel (const Point& rPoint) const
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const
 {
@@ -944,7 +944,7 @@ Size SvxGraphCtrlAccessibleContext::LogicToPixel (const Size& rSize) const
         return rSize;
 }
 
-//-----------------------------------------------------------------------------
+
 
 Point SvxGraphCtrlAccessibleContext::PixelToLogic (const Point& rPoint) const
 {
@@ -954,7 +954,7 @@ Point SvxGraphCtrlAccessibleContext::PixelToLogic (const Point& rPoint) const
         return rPoint;
 }
 
-//-----------------------------------------------------------------------------
+
 
 Size SvxGraphCtrlAccessibleContext::PixelToLogic (const Size& rSize) const
 {
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 44ea57bbfe87..18c68d275868 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -39,9 +39,9 @@ namespace svx
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::accessibility;
 
-// ----------------
+
 // - SvxShowCharSetVirtualAcc -
-// ----------------
+
 SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock())
 ,mpParent( pParent )
 ,m_pTable(NULL)
@@ -53,14 +53,14 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) :
     osl_atomic_decrement(&m_refCount);
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvxShowCharSetVirtualAcc::~SvxShowCharSetVirtualAcc()
 {
     ensureDisposed();
     delete getExternalLock();
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetVirtualAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 )
 
@@ -73,14 +73,14 @@ void SAL_CALL SvxShowCharSetVirtualAcc::fireEvent(
     if ( m_pTable )
         m_pTable->fireEvent(_nEventId,_rOldValue,_rNewValue);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChildCount(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return ( mpParent->getScrollBar()->IsVisible() ) ? 2 : 1;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleAtPoint( const awt::Point& aPoint )
     throw (uno::RuntimeException)
 {
@@ -107,13 +107,13 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtual
     }
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleKeyBinding()
     throw (uno::RuntimeException)
 {
     return uno::Any();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus()
     throw (uno::RuntimeException)
 {
@@ -123,7 +123,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::grabFocus()
 }
 
 
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -142,7 +142,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleChild(
         throw IndexOutOfBoundsException();
     return m_xAcc;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -155,7 +155,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent(
 
     return xRet;
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetVirtualAcc::implGetBounds(  ) throw (RuntimeException)
 {
     ::com::sun::star::awt::Rectangle aBounds ( 0, 0, 0, 0 );
@@ -175,29 +175,29 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleParent(
     }
     return aBounds;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRole(  ) throw (RuntimeException)
 {
     return css::accessibility::AccessibleRole::SCROLL_PANE;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleDescription(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION);
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleName(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC);
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleRelationSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
     return Reference< XAccessibleRelationSet >();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibleStateSet(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -223,7 +223,7 @@ Reference< XAccessibleStateSet > SAL_CALL SvxShowCharSetVirtualAcc::getAccessibl
 
     return pStateSet;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
 {
     OAccessibleContextHelper::disposing();
@@ -231,10 +231,10 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
         m_pTable->dispose();
     m_pTable = NULL;
 }
-// -----------------------------------------------------------------------------
-// ----------------
+
+
 // - SvxShowCharSetItem -
-// ----------------
+
 
 SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc*  _pParent,sal_uInt16 _nPos ) :
     mrParent( rParent )
@@ -243,7 +243,7 @@ SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAc
     ,m_pParent(_pParent)
 {
 }
-// -----------------------------------------------------------------------
+
 
 SvxShowCharSetItem::~SvxShowCharSetItem()
 {
@@ -254,7 +254,7 @@ SvxShowCharSetItem::~SvxShowCharSetItem()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessible()
 {
@@ -267,7 +267,7 @@ uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessi
     return m_xAcc;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxShowCharSetItem::ClearAccessible()
 {
@@ -279,9 +279,9 @@ void SvxShowCharSetItem::ClearAccessible()
 }
 
 
-// ---------------
+
 // - SvxShowCharSetAcc -
-// ---------------
+
 
 SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock())
   ,m_pParent( _pParent )
@@ -293,14 +293,14 @@ SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAc
     osl_atomic_decrement(&m_refCount);
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvxShowCharSetAcc::~SvxShowCharSetAcc()
 {
     ensureDisposed();
     delete getExternalLock();
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxShowCharSetAcc::disposing()
 {
     OAccessibleSelectionHelper::disposing();
@@ -313,16 +313,16 @@ void SAL_CALL SvxShowCharSetAcc::disposing()
     m_pParent = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, OAccessibleHelper_Base )
-// -----------------------------------------------------------------------
+
 bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
 {
     return m_pParent && m_pParent->getCharSetControl()->IsSelected(
         sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex));
 }
-// -----------------------------------------------------------------------------
+
         // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
 void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bSelect ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -334,7 +334,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS
             m_pParent->getCharSetControl()->DeSelect();
     }
 }
-// -----------------------------------------------------------------------------
+
 ::com::sun::star::awt::Rectangle SAL_CALL SvxShowCharSetAcc::implGetBounds(  ) throw (RuntimeException)
 {
     const Point   aOutPos;//( m_pParent->getCharSetControl()->GetPosPixel() );
@@ -354,7 +354,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS
 
     return aRet;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount()
     throw (uno::RuntimeException)
 {
@@ -363,7 +363,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleChildCount()
     return m_pParent->getCharSetControl()->getMaxCharCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleChild( sal_Int32 i )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -385,7 +385,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleParent()
     throw (uno::RuntimeException)
@@ -395,7 +395,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge
     return m_pParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole()
     throw (uno::RuntimeException)
@@ -403,7 +403,7 @@ sal_Int16 SAL_CALL SvxShowCharSetAcc::getAccessibleRole()
     return css::accessibility::AccessibleRole::TABLE;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription()
     throw (uno::RuntimeException)
@@ -412,7 +412,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleDescription()
     return SVX_RESSTR( RID_SVXSTR_CHARACTER_SELECTION );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName()
     throw (uno::RuntimeException)
@@ -422,7 +422,7 @@ OUString SAL_CALL SvxShowCharSetAcc::getAccessibleName()
     return SVX_RESSTR( RID_SVXSTR_CHAR_SEL_DESC );
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetAcc::getAccessibleRelationSet()
     throw (uno::RuntimeException)
@@ -430,7 +430,7 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha
     return uno::Reference< css::accessibility::XAccessibleRelationSet >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetAcc::getAccessibleStateSet()
     throw (uno::RuntimeException)
@@ -460,7 +460,7 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe
 
     return pStateSet;
 }
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleAtPoint( const awt::Point& aPoint )
     throw (uno::RuntimeException)
@@ -480,8 +480,8 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::ge
     return xRet;
 }
 
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
+
+
 
 void SAL_CALL SvxShowCharSetAcc::grabFocus()
     throw (uno::RuntimeException)
@@ -491,54 +491,54 @@ void SAL_CALL SvxShowCharSetAcc::grabFocus()
     m_pParent->getCharSetControl()->GrabFocus();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShowCharSetAcc::getAccessibleKeyBinding()
     throw (uno::RuntimeException)
 {
     return uno::Any();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowCount(  ) throw (RuntimeException)
 {
     return ((getAccessibleChildCount()-1) / COLUMN_COUNT) + 1;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnCount(  ) throw (RuntimeException)
 {
     return COLUMN_COUNT;
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL SvxShowCharSetAcc::getAccessibleRowDescription( sal_Int32 /*nRow*/ ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 OUString SAL_CALL SvxShowCharSetAcc::getAccessibleColumnDescription( sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return OUString();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRowExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return 1;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumnExtentAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return 1;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleRowHeaders(  ) throw (RuntimeException)
 {
     return Reference< XAccessibleTable >();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessibleTable > SAL_CALL SvxShowCharSetAcc::getAccessibleColumnHeaders(  ) throw (RuntimeException)
 {
     return Reference< XAccessibleTable >();
 }
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -547,7 +547,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows(  )
     aSel[0] = m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId());
     return aSel;
 }
-// -----------------------------------------------------------------------------
+
 Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -556,21 +556,21 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns(
     aSel[0] = m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId());
     return aSel;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn;
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -581,48 +581,48 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In
         throw IndexOutOfBoundsException();
     return pItem->GetAccessible();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCaption(  ) throw (RuntimeException)
 {
     return Reference< XAccessible >();
 }
-// -----------------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleSummary(  ) throw (RuntimeException)
 {
     return Reference< XAccessible >();
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return m_pParent->getCharSetControl()->GetSelectIndexId() == getAccessibleIndex(nRow,nColumn);
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return (nRow*COLUMN_COUNT) + nColumn;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     OExternalLockGuard aGuard( this );
     ensureAlive();
     return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
 }
-// -----------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------------
-// ----------------
+
+
+
 // - SvxShowCharSetItemAcc -
-// ----------------
+
 
 SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OAccessibleComponentHelper(new VCLExternalSolarLock())
 ,mpParent( pParent )
@@ -635,17 +635,17 @@ SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OA
     osl_atomic_decrement(&m_refCount);
 }
 
-// -----------------------------------------------------------------------------
+
 
 SvxShowCharSetItemAcc::~SvxShowCharSetItemAcc()
 {
     ensureDisposed();
     delete getExternalLock();
 }
-// -----------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetItemAcc, OAccessibleComponentHelper, OAccessibleHelper_Base_2 )
-// -----------------------------------------------------------------------------
+
 
 void SvxShowCharSetItemAcc::ParentDestroyed()
 {
@@ -653,7 +653,7 @@ void SvxShowCharSetItemAcc::ParentDestroyed()
     mpParent = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount()
     throw (uno::RuntimeException)
@@ -661,7 +661,7 @@ sal_Int32 SAL_CALL SvxShowCharSetItemAcc::getAccessibleChildCount()
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleChild( sal_Int32 /*i*/ )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -669,7 +669,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc
     throw lang::IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleParent()
     throw (uno::RuntimeException)
@@ -679,7 +679,7 @@ uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc
     return mpParent->m_pParent;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
     throw (uno::RuntimeException)
@@ -687,7 +687,7 @@ sal_Int16 SAL_CALL SvxShowCharSetItemAcc::getAccessibleRole()
     return css::accessibility::AccessibleRole::TABLE_CELL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
     throw (uno::RuntimeException)
@@ -715,7 +715,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleDescription()
     return sDescription;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName()
     throw (uno::RuntimeException)
@@ -735,7 +735,7 @@ OUString SAL_CALL SvxShowCharSetItemAcc::getAccessibleName()
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleRelationSet()
     throw (uno::RuntimeException)
@@ -743,7 +743,7 @@ uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL SvxShowCha
     return uno::Reference< css::accessibility::XAccessibleRelationSet >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSetItemAcc::getAccessibleStateSet()
     throw (uno::RuntimeException)
@@ -780,21 +780,21 @@ uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL SvxShowCharSe
     return pStateSet;
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxShowCharSetItemAcc::grabFocus()
     throw (uno::RuntimeException)
 {
     // nothing to do
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShowCharSetItemAcc::getAccessibleKeyBinding()
     throw (uno::RuntimeException)
 {
     return uno::Any();
 }
-// -----------------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL SvxShowCharSetItemAcc::implGetBounds(  ) throw (RuntimeException)
 {
     awt::Rectangle      aRet;
@@ -815,13 +815,13 @@ awt::Rectangle SAL_CALL SvxShowCharSetItemAcc::implGetBounds(  ) throw (RuntimeE
 
     return aRet;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< css::accessibility::XAccessible > SAL_CALL SvxShowCharSetItemAcc::getAccessibleAtPoint( const awt::Point& /*aPoint*/ )
     throw (uno::RuntimeException)
 {
     return uno::Reference< css::accessibility::XAccessible >();
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -844,7 +844,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getForeground(  ) throw (RuntimeExc
 
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this  );
@@ -859,7 +859,7 @@ sal_Int32 SAL_CALL SvxShowCharSetVirtualAcc::getBackground(  ) throw (RuntimeExc
 
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this );
@@ -869,7 +869,7 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getForeground(  ) throw (RuntimeException)
         nColor = m_pParent->getForeground();
     return nColor;
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground(  ) throw (RuntimeException)
 {
     OExternalLockGuard aGuard( this  );
@@ -878,11 +878,11 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getBackground(  ) throw (RuntimeException)
         nColor = m_pParent->getBackground();
     return nColor;
 }
-// -----------------------------------------------------------------------------
 
-// -----------------------------------------------------------------------------
+
+
 } // namespace svx
-// -----------------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index b7db7f4e3944..527d2cff5f24 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -383,9 +383,9 @@ uno::Sequence< OUString > SvxPixelCtlAccessible::getSupportedServiceNames(  )
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleSelection
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -397,7 +397,7 @@ void SAL_CALL SvxPixelCtlAccessible::selectAccessibleChild( sal_Int32 nChildInde
     long nIndex = pPixelCtl->ShowPosition(pPixelCtl->IndexToPoint(nChildIndex));
     NotifyChild(nIndex,sal_True,sal_False);
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -406,7 +406,7 @@ sal_Bool SAL_CALL SvxPixelCtlAccessible::isAccessibleChildSelected( sal_Int32 nC
 
     return pPixelCtl->GetFoucsPosIndex() == nChildIndex;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -414,7 +414,7 @@ void SAL_CALL SvxPixelCtlAccessible::clearAccessibleSelection(  ) throw (Runtime
     IsValid();
 
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -422,7 +422,7 @@ void SAL_CALL SvxPixelCtlAccessible::selectAllAccessibleChildren(  ) throw (Runt
     IsValid();
 
 }
-// -----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -431,7 +431,7 @@ sal_Int32 SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChildCount(  ) th
 
     return 1;
 }
-// -----------------------------------------------------------------------------
+
 uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
@@ -451,7 +451,7 @@ uno::Reference< XAccessible > SAL_CALL SvxPixelCtlAccessible::getSelectedAccessi
     }
     return xChild;
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL SvxPixelCtlAccessible::deselectAccessibleChild( sal_Int32 ) throw (lang::IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard   aGuard( m_aMutex );
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 63c464669e93..4a716e26f8fb 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -792,7 +792,7 @@ void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::
         throw lang::DisposedException();
 }
 
-// -------------------------------------------------------------------------------------------------
+
 
 
 DBG_NAME( SvxRectCtlChildAccessibleContext )
@@ -1096,9 +1096,9 @@ Any SAL_CALL SvxRectCtlChildAccessibleContext::getMinimumValue() throw( RuntimeE
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 // XAccessibleAction
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (RuntimeException)
 {
@@ -1107,7 +1107,7 @@ sal_Int32 SvxRectCtlChildAccessibleContext::getAccessibleActionCount( ) throw (R
     return 1;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -1123,7 +1123,7 @@ sal_Bool SvxRectCtlChildAccessibleContext::doAccessibleAction ( sal_Int32 nIndex
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -1135,7 +1135,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_
     return OUString("select");
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XAccessibleKeyBinding > SvxRectCtlChildAccessibleContext::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index 20b9b3ea407c..01c7d3988184 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -21,7 +21,7 @@
 #include "svx/EnhancedCustomShape2d.hxx"
 #include "svx/unoapi.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xCustomShape, sal_uInt32 nIndex ) :
     mnIndex     ( nIndex ),
@@ -29,20 +29,20 @@ EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( com::sun::star::uno::Refer
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 EnhancedCustomShapeHandle::~EnhancedCustomShapeHandle()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL EnhancedCustomShapeHandle::acquire() throw()
 {
     OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL EnhancedCustomShapeHandle::release() throw()
 {
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 836a314a453f..5ab94e236467 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -126,7 +126,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
 {
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 80d2bfe80460..5d4a38625143 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -34,13 +34,13 @@
 #include <bmpmask.hrc>
 #include <svx/svxids.hrc>
 
-//-------------------------------------------------------------------------
+
 
 #define BMP_RESID(nId)  ResId(nId, DIALOG_MGR())
 #define TRANSP_COL      (Color( 252, 252, 252 ))
 #define OWN_CALLMODE    SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD
 
-//-------------------------------------------------------------------------
+
 
 #define TEST_COLS()                                                 \
 {                                                                   \
@@ -56,11 +56,11 @@
     }                                                               \
 }
 
-// -------------------------------------------------------------------------
+
 
 SFX_IMPL_DOCKINGWINDOW_WITHID( SvxBmpMaskChildWindow, SID_BMPMASK )
 
-// -------------------------------------------------------------------------
+
 
 class ColorWindow : public Control
 {
@@ -86,7 +86,7 @@ public:
     virtual void Paint( const Rectangle& rRect );
 };
 
-//-------------------------------------------------------------------------
+
 
 class MaskSet : public ValueSet
 {
@@ -103,7 +103,7 @@ public:
     void onEditColor();
 };
 
-//-------------------------------------------------------------------------
+
 
 MaskSet::MaskSet( SvxBmpMask* pParent, const ResId& rId ) :
             ValueSet        ( pParent, rId ),
@@ -111,7 +111,7 @@ MaskSet::MaskSet( SvxBmpMask* pParent, const ResId& rId ) :
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 void MaskSet::Select()
 {
@@ -163,7 +163,7 @@ void MaskSet::onEditColor()
     delete pColorDlg;
 }
 
-//-------------------------------------------------------------------------
+
 
 class MaskData
 {
@@ -186,7 +186,7 @@ public:
                 DECL_LINK(ExecHdl, void *);
 };
 
-//-------------------------------------------------------------------------
+
 
 MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) :
 
@@ -198,7 +198,7 @@ MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) :
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( MaskData, PipetteHdl, ToolBox*, pTbx )
 {
@@ -210,7 +210,7 @@ IMPL_LINK( MaskData, PipetteHdl, ToolBox*, pTbx )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx )
 {
@@ -246,7 +246,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( MaskData, CbxTransHdl, CheckBox*, pCbx )
 {
@@ -309,7 +309,7 @@ IMPL_LINK( MaskData, CbxTransHdl, CheckBox*, pCbx )
     return 0L;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
 {
@@ -322,7 +322,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
     return 0;
 }
 
-//-------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MaskData, ExecHdl)
 {
@@ -332,7 +332,7 @@ IMPL_LINK_NOARG(MaskData, ExecHdl)
     return 0L;
 }
 
-//-------------------------------------------------------------------------
+
 
 void ColorWindow::Paint( const Rectangle &/*Rect*/ )
 {
@@ -348,7 +348,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ )
     SetFillColor( rOldFillColor );
 }
 
-//-------------------------------------------------------------------------
+
 
 SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask,
                                             SfxBindings& rBindings ) :
@@ -357,7 +357,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask,
 {
 }
 
-//-------------------------------------------------------------------------
+
 
 void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
                                          const SfxPoolItem* pItem )
@@ -372,7 +372,7 @@ void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId,
                                               SfxBindings* pBindings,
@@ -388,7 +388,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId,
     pDlg->Initialize( pInfo );
 }
 
-//-------------------------------------------------------------------------
+
 
 SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
                         SfxChildWindow *pCW,
@@ -534,7 +534,7 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx,
     aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ );
 }
 
-//-------------------------------------------------------------------------
+
 
 SvxBmpMask::~SvxBmpMask()
 {
@@ -546,7 +546,7 @@ SvxBmpMask::~SvxBmpMask()
     delete pData;
 }
 
-//-------------------------------------------------------------------------
+
 
 /** is called by a MaskSet when it is selected */
 void SvxBmpMask::onSelect( MaskSet* pSet )
@@ -565,7 +565,7 @@ void SvxBmpMask::onSelect( MaskSet* pSet )
         pQSet4->SelectItem( 0 );
 }
 
-//-------------------------------------------------------------------------
+
 
 bool SvxBmpMask::Close()
 {
@@ -575,14 +575,14 @@ bool SvxBmpMask::Close()
     return SfxDockingWindow::Close();
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SvxBmpMask::NeedsColorList() const
 {
     return ( aLbColor1.GetEntryCount() == 0 );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SvxBmpMask::SetColorList( const XColorListRef &pList )
 {
@@ -613,7 +613,7 @@ void SvxBmpMask::SetColorList( const XColorListRef &pList )
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 void SvxBmpMask::SetColor( const Color& rColor )
 {
@@ -621,7 +621,7 @@ void SvxBmpMask::SetColor( const Color& rColor )
     pCtlPipette->SetColor( aPipetteColor );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SvxBmpMask::PipetteClicked()
 {
@@ -654,7 +654,7 @@ void SvxBmpMask::PipetteClicked()
     pData->PipetteHdl( &aTbxPipette );
 }
 
-//-------------------------------------------------------------------------
+
 
 void SvxBmpMask::SetExecState( sal_Bool bEnable )
 {
@@ -666,7 +666,7 @@ void SvxBmpMask::SetExecState( sal_Bool bEnable )
         aBtnExec.Disable();
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols )
 {
@@ -703,7 +703,7 @@ sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uI
     return nCount;
 }
 
-//-------------------------------------------------------------------------
+
 
 Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap )
 {
@@ -720,7 +720,7 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap )
     return aBitmap;
 }
 
-//-------------------------------------------------------------------------
+
 
 BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color& rColor, const long nTol )
 {
@@ -738,7 +738,7 @@ BitmapEx SvxBmpMask::ImpMaskTransparent( const BitmapEx& rBitmapEx, const Color&
     return aBmpEx;
 }
 
-//-------------------------------------------------------------------------
+
 
 Animation SvxBmpMask::ImpMask( const Animation& rAnimation )
 {
@@ -759,7 +759,7 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation )
     return aAnimation;
 }
 
-//-------------------------------------------------------------------------
+
 
 GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
 {
@@ -1026,7 +1026,7 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
     return aMtf;
 }
 
-//-------------------------------------------------------------------------
+
 
 BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color& rColor )
 {
@@ -1040,7 +1040,7 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color
         return rBmpEx;
 }
 
-//-------------------------------------------------------------------------
+
 
 Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor )
 {
@@ -1057,7 +1057,7 @@ Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Colo
     return aAnimation;
 }
 
-//-------------------------------------------------------------------------
+
 
 GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const Color& rColor )
 {
@@ -1091,7 +1091,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
     return aMtf;
 }
 
-//-------------------------------------------------------------------------
+
 
 Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
 {
@@ -1197,7 +1197,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
     return aGraphic;
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_Bool SvxBmpMask::IsEyedropping() const
 {
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index b47b53c2badb..2ac7ec8e83ab 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -47,7 +47,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxCheckListBox(Window *pPa
     return new SvxCheckListBox(pParent, nWinStyle);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) :
 
@@ -57,7 +57,7 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId ) :
     Init_Impl();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId,
                                   const Image& rNormalStaticImage )
@@ -68,14 +68,14 @@ SvxCheckListBox::SvxCheckListBox( Window* pParent, const ResId& rResId,
     pCheckButton->aBmps[SV_BMP_STATICIMAGE] = rNormalStaticImage;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxCheckListBox::~SvxCheckListBox()
 {
     delete pCheckButton;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::Init_Impl()
 {
@@ -83,7 +83,7 @@ void SvxCheckListBox::Init_Impl()
     EnableCheckButton( pCheckButton );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos,
                                    void* pUserData,
@@ -93,7 +93,7 @@ void SvxCheckListBox::InsertEntry( const OUString& rStr, sal_uInt16 nPos,
                                 eButtonKind );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
 {
@@ -101,7 +101,7 @@ void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
         SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
 {
@@ -109,7 +109,7 @@ void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
         Select( GetEntry( nPos ), bSelect );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const
 {
@@ -120,7 +120,7 @@ sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxCheckListBox::GetText( sal_uInt16 nPos ) const
 {
@@ -131,7 +131,7 @@ OUString SvxCheckListBox::GetText( sal_uInt16 nPos ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
 {
@@ -146,7 +146,7 @@ sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
     return nCheckCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
 {
@@ -156,7 +156,7 @@ void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
                                        SvButtonState( SV_BUTTON_UNCHECKED ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
 {
@@ -166,7 +166,7 @@ sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
         return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData )
 {
@@ -180,7 +180,7 @@ void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData )
     return pOld;
 }
 
-// -----------------------------------------------------------------------
+
 
 void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const
 {
@@ -190,7 +190,7 @@ void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry )
 {
@@ -203,7 +203,7 @@ void SvxCheckListBox::ToggleCheckButton( SvTreeListEntry* pEntry )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -243,7 +243,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
     SvTreeListBox::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 {
@@ -265,7 +265,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
         SvTreeListBox::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvTreeListEntry* SvxCheckListBox::InsertEntry( const OUString& rText, SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
 {
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 0057afc771e3..04ac00b2f226 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -37,7 +37,7 @@
 
 //============================================================================
 //  Local Defines and Function
-//----------------------------------------------------------------------------
+
 
 static long nStaticTabs[]=
 {
@@ -60,7 +60,7 @@ RedlinData::~RedlinData()
 
 //============================================================================
 //  class SvxRedlinEntry (Entries for list)
-//----------------------------------------------------------------------------
+
 
 SvxRedlinEntry::SvxRedlinEntry()
     : SvTreeListEntry()
@@ -125,7 +125,7 @@ void SvLBoxColorString::Paint(
 
 //============================================================================
 //  class SvxRedlinTable
-//----------------------------------------------------------------------------
+
 
 SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits)
     : SvSimpleTable(rParent,nBits)
@@ -390,7 +390,7 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr,
 
 //============================================================================
 //  class SvxTPView
-//----------------------------------------------------------------------------
+
 
 SvxTPView::SvxTPView(Window * pParent)
     : TabPage(pParent, "RedlineViewPage", "svx/ui/redlineviewpage.ui")
@@ -551,7 +551,7 @@ IMPL_LINK( SvxTPView, PbClickHdl, PushButton*, pPushB )
 
 //============================================================================
 //  class SvxTPFilter
-//----------------------------------------------------------------------------
+
 
 SvxTPFilter::SvxTPFilter( Window * pParent)
     : TabPage(pParent, "RedlineFilterPage", "svx/ui/redlinefilterpage.ui")
@@ -1091,7 +1091,7 @@ IMPL_LINK( SvxTPFilter, RefHandle, PushButton*, pRef )
 
 //============================================================================
 //  class SvxAcceptChgCtr
-//----------------------------------------------------------------------------
+
 
 SvxAcceptChgCtr::SvxAcceptChgCtr(Window* pParent)
     : TabControl(pParent, WB_TABSTOP | WB_DIALOGCONTROL)
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index f7e7c1bfc304..7f2aa04ce3ce 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -26,7 +26,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/objsh.hxx>
 
-// -----------------------------------------------------------------------
+
 
 FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet )
 {
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index 6b83afb9cb26..87c76972d374 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -85,7 +85,7 @@ void Cell::MirrorSelfX( bool bMirrorStyles, bool bSwapDiag )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 
 void lclRecalcCoordVec( LongVec& rCoords, const LongVec& rSizes )
@@ -112,7 +112,7 @@ void lclSetMergedRange( CellVec& rCells, size_t nWidth, size_t nFirstCol, size_t
     rCells[ nFirstRow * nWidth + nFirstCol ].mbMergeOrig = true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 static const Style OBJ_STYLE_NONE;
 static const Cell OBJ_CELL_NONE;
@@ -356,7 +356,7 @@ private:
     size_t              mnRow;
 };
 
-// ----------------------------------------------------------------------------
+
 
 MergedCellIterator::MergedCellIterator( const Array& rArray, size_t nCol, size_t nRow )
 {
@@ -386,13 +386,13 @@ MergedCellIterator& MergedCellIterator::operator++()
 #define DBG_FRAME_CHECK_COL_1( col, funcname )          DBG_FRAME_CHECK( (col) <= GetColCount(), funcname, "invalid column index" )
 #define DBG_FRAME_CHECK_ROW_1( row, funcname )          DBG_FRAME_CHECK( (row) <= GetRowCount(), funcname, "invalid row index" )
 
-// ----------------------------------------------------------------------------
+
 
 #define CELL( col, row )        mxImpl->GetCell( col, row )
 #define CELLACC( col, row )     mxImpl->GetCellAcc( col, row )
 #define ORIGCELL( col, row )    mxImpl->GetMergedOriginCell( col, row )
 
-// ----------------------------------------------------------------------------
+
 
 Array::Array()
 {
@@ -1336,13 +1336,13 @@ void Array::DrawArray( OutputDevice& rDev, const Color* pForceColor ) const
         DrawRange( rDev, 0, 0, mxImpl->mnWidth - 1, mxImpl->mnHeight - 1, pForceColor );
 }
 
-// ----------------------------------------------------------------------------
+
 
 #undef ORIGCELL
 #undef CELLACC
 #undef CELL
 
-// ----------------------------------------------------------------------------
+
 
 #undef DBG_FRAME_CHECK_ROW_1
 #undef DBG_FRAME_CHECK_COL_1
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index b0769c9131b8..07a7c4a1c7ca 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -29,9 +29,9 @@
 #include <svx/dialogs.hrc>
 #include <svx/svxdlg.hxx>
 
-// --------------------
+
 // - SvxGraphicFilter -
-// --------------------
+
 
 sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
 {
@@ -281,7 +281,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SvxGraphicFilter::DisableGraphicFilterSlots( SfxItemSet& rSet )
 {
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 9b2032248e64..9b90df4cdc9f 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -112,28 +112,28 @@ sal_uInt16* SvxHeaderPage::GetRanges()
     return pRanges;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxHeaderPage( pParent, rSet );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16* SvxFooterPage::GetRanges()
 {
     return pRanges;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet& rSet )
 {
     return new SvxFooterPage( pParent, rSet );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) :
 
@@ -142,7 +142,7 @@ SvxHeaderPage::SvxHeaderPage( Window* pParent, const SfxItemSet& rAttr ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
 
@@ -151,7 +151,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) :
 
@@ -206,14 +206,14 @@ SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId
     SetFieldUnit( *m_pRMEdit, eFUnit );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxHFPage::~SvxHFPage()
 {
     delete pBBSet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
 {
@@ -248,7 +248,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
     SfxMapUnit          eUnit       = pPool->GetMetric( nWSize );
     SfxItemSet          aSet        ( *pPool, aWhichTab );
 
-    //--------------------------------------------------------------------
+
 
     aSet.Put( SfxBoolItem( nWOn,      m_pTurnOnBox->IsChecked() ) );
     aSet.Put( SfxBoolItem( nWDynamic, m_pHeightDynBtn->IsChecked() ) );
@@ -318,7 +318,7 @@ sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 void SvxHFPage::Reset( const SfxItemSet& rSet )
 {
     ActivatePage( rSet );
@@ -570,7 +570,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
 
     if ( svx::ShowBorderBackgroundDlg( this, pBBSet, bEnableBackgroundSelector ) )
     {
-        //----------------------------------------------------------------
+
 
         sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
 
@@ -583,7 +583,7 @@ IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl)
                 m_pBspWin->SetFtColor( rItem.GetColor() );
         }
 
-        //----------------------------------------------------------------
+
 
         nWhich = GetWhich( SID_ATTR_BORDER_OUTER );
 
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index bd024f4a9585..ae705862eedd 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -140,7 +140,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxLanguageBox(Window *pPar
     return pListBox;
 }
 
-//------------------------------------------------------------------------
+
 void SvxLanguageBox::Init()
 {
     m_pLangTable = new SvtLanguageTable;
@@ -175,7 +175,7 @@ void SvxLanguageBox::Init()
         m_nLangList = LANG_LIST_ALL;
     }
 }
-//------------------------------------------------------------------------
+
 
 SvxLanguageBox::~SvxLanguageBox()
 {
@@ -183,7 +183,7 @@ SvxLanguageBox::~SvxLanguageBox()
     delete m_pLangTable;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_uInt16 nPos, bool bChecked )
 {
@@ -195,7 +195,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const OUString& rEntry, sal_uInt1
     return nRet;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
         sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail )
@@ -318,14 +318,14 @@ void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
     }
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos )
 {
     return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType )
 {
@@ -381,21 +381,21 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
     return nAt;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos )
 {
     return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageBox::InsertSystemLanguage( sal_uInt16 nPos )
 {
     return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
         sal_Bool bCheckEntry, sal_uInt16 nPos )
@@ -421,7 +421,7 @@ sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
     return nAt;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
 {
@@ -431,7 +431,7 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
         RemoveEntry( nAt );
 }
 
-//------------------------------------------------------------------------
+
 
 LanguageType SvxLanguageBox::GetSelectLanguage() const
 {
@@ -443,7 +443,7 @@ LanguageType SvxLanguageBox::GetSelectLanguage() const
         return LanguageType( LANGUAGE_DONTKNOW );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect )
 {
@@ -460,7 +460,7 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSel
         SelectEntryPos( nAt, bSelect );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
 {
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index f32e662e09ef..539fc65499f4 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -182,14 +182,14 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
         LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 {
     return ( new SvxGridTabPage( pParent, rAttrSet ) );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
@@ -216,7 +216,7 @@ sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
     return bAttrModified;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxGridTabPage::Reset( const SfxItemSet& rSet )
 {
@@ -295,7 +295,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet )
         FillItemSet( *_pSet );
     return( LEAVE_PAGE );
 }
-//------------------------------------------------------------------------
+
 IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
 {
     bAttrModified = sal_True;
@@ -308,7 +308,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
     }
     return 0;
 }
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl)
 {
@@ -320,7 +320,7 @@ IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
 {
@@ -334,7 +334,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
     }
     return 0;
 }
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl)
 {
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index be2986331e6d..14ffd752a4d8 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -52,7 +52,7 @@ struct OrientationHelper_Impl
     DECL_LINK( ClickHdl, void* );
 };
 
-// ----------------------------------------------------------------------------
+
 
 OrientationHelper_Impl::OrientationHelper_Impl( DialControl& rCtrlDial, CheckBox& rCbStacked ) :
     mrCtrlDial( rCtrlDial ),
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index eaf6ffb7cff3..c10815dd8bf5 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -98,7 +98,7 @@ SvxPageWindow::SvxPageWindow( Window* pParent ) :
     SetBackground();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPageWindow::~SvxPageWindow()
 {
@@ -113,7 +113,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window *pPare
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageWindow::Paint( const Rectangle& )
 {
@@ -167,7 +167,7 @@ void SvxPageWindow::Paint( const Rectangle& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -353,7 +353,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageWindow::SetBorder( const SvxBoxItem& rNew )
 {
@@ -361,7 +361,7 @@ void SvxPageWindow::SetBorder( const SvxBoxItem& rNew )
     pImpl->pBorder = new SvxBoxItem( rNew );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageWindow::SetBitmap( Bitmap* pBmp )
 {
@@ -374,14 +374,14 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp )
         pImpl->bBitmap = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxPageWindow::SetHdBorder( const SvxBoxItem& rNew )
 {
     delete pHdBorder;
     pHdBorder = new SvxBoxItem( rNew );
 }
-// -----------------------------------------------------------------------
+
 
 void SvxPageWindow::SetFtBorder( const SvxBoxItem& rNew )
 {
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index 1a0cb57875e9..e05f029f1d52 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -57,14 +57,14 @@ Size SvxParaPrevWindow::GetOptimalSize() const
     return getParagraphPreviewOptimalSize(this);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxParaPrevWindow::Paint( const Rectangle& )
 {
     DrawParagraph( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 #define DEF_MARGIN  120
 
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 25b2314a4388..9c84e195ada8 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -55,7 +55,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl)
 {
@@ -72,7 +72,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPasswordDialog::SvxPasswordDialog(Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword)
     : SfxModalDialog(pParent, "PasswordDialog", "svx/ui/passwd.ui")
@@ -100,13 +100,13 @@ SvxPasswordDialog::SvxPasswordDialog(Window* pParent, sal_Bool bAllowEmptyPasswo
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPasswordDialog::~SvxPasswordDialog()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 37a68e8e2eeb..0ada39affbb4 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -20,7 +20,7 @@
 #include "svx/relfld.hxx"
 #include "vcl/builder.hxx"
 
-// -----------------------------------------------------------------------
+
 
 SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nBits)
     : MetricField( pParent, nBits)
@@ -42,7 +42,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxRelativeField(Window *pP
 {
     return new SvxRelativeField(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_LEFT | WB_GROUP);
 }
-// -----------------------------------------------------------------------
+
 
 void SvxRelativeField::Modify()
 {
@@ -81,7 +81,7 @@ void SvxRelativeField::Modify()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
                                            sal_uInt16 nMax, sal_uInt16 nStep )
@@ -93,7 +93,7 @@ void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
     SetUnit( FUNIT_CM );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
 {
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 2bcd6b9d9c2c..04c0c8f57f64 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -123,16 +123,16 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (RuntimeException);
 
 };
-//-----------------------------------------------------------------------------
+
 SvxRubyData_Impl::SvxRubyData_Impl() :
     bHasSelectionChanged(false)
 {
 }
-//-----------------------------------------------------------------------------
+
 SvxRubyData_Impl::~SvxRubyData_Impl()
 {
 }
-//-----------------------------------------------------------------------------
+
 void    SvxRubyData_Impl::SetController(Reference<XController> xCtrl)
 {
     if(xCtrl.get() != xController.get())
@@ -154,12 +154,12 @@ void    SvxRubyData_Impl::SetController(Reference<XController> xCtrl)
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 void SvxRubyData_Impl::selectionChanged( const EventObject& ) throw (RuntimeException)
 {
     bHasSelectionChanged = true;
 }
-//-----------------------------------------------------------------------------
+
 void SvxRubyData_Impl::disposing( const EventObject&) throw (RuntimeException)
 {
     try
@@ -173,7 +173,7 @@ void SvxRubyData_Impl::disposing( const EventObject&) throw (RuntimeException)
     }
     xController = 0;
 }
-//-----------------------------------------------------------------------------
+
 void  SvxRubyData_Impl::AssertOneEntry()
 {
     //create one entry
@@ -400,7 +400,7 @@ void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
     rLeft.SaveValue();
     rRight.SaveValue();
 }
-//-----------------------------------------------------------------------------
+
 void SvxRubyDialog::GetRubyText()
 {
     long nTempLastPos = GetLastPos();
@@ -425,7 +425,7 @@ void SvxRubyDialog::GetRubyText()
         }
     }
 }
-//-----------------------------------------------------------------------------
+
 void SvxRubyDialog::Update()
 {
     const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
@@ -715,7 +715,7 @@ void SvxRubyDialog::AssertOneEntry()
     pImpl->AssertOneEntry();
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SvxRubyDialog::UpdateColors( void )
 {
@@ -737,7 +737,7 @@ void SvxRubyDialog::UpdateColors( void )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 void SvxRubyDialog::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 2e4254136841..479a165ef287 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -40,7 +40,7 @@ SvxSearchController::SvxSearchController
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                         const SfxPoolItem* pState )
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 43465e18ffc5..8c490febd7cd 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -74,7 +74,7 @@ using namespace com::sun::star::accessibility;
 using namespace com::sun::star;
 using namespace comphelper;
 
-// -----------------------------------------------------------------------
+
 
 #define REMEMBER_SIZE       10
 
@@ -163,14 +163,14 @@ SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
             (*this)[i].pItem = (*this)[i].pItem->Clone();
 }
 
-// -----------------------------------------------------------------------
+
 
 SearchAttrItemList::~SearchAttrItemList()
 {
     Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchAttrItemList::Put( const SfxItemSet& rSet )
 {
@@ -206,7 +206,7 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
 {
@@ -220,7 +220,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
     return rSet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SearchAttrItemList::Clear()
 {
@@ -230,7 +230,7 @@ void SearchAttrItemList::Clear()
     SrchAttrItemList::clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 // Deletes the pointer to the items
 void SearchAttrItemList::Remove(size_t nPos, size_t nLen)
@@ -341,7 +341,7 @@ SvxSearchDialog::SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, Sf
     Construct_Impl();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxSearchDialog::~SvxSearchDialog()
 {
@@ -492,7 +492,7 @@ void SvxSearchDialog::Construct_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxSearchDialog::Close()
 {
@@ -521,7 +521,7 @@ bool SvxSearchDialog::Close()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 SvxSearchDialog::GetTransliterationFlags() const
 {
@@ -541,7 +541,7 @@ void SvxSearchDialog::SetSaveToModule(bool b)
     pImpl->bSaveToModule = b;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
 {
@@ -552,7 +552,7 @@ void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
     m_pJapMatchFullHalfWidthCB->Check( !bVal );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::Activate()
 {
@@ -565,7 +565,7 @@ void SvxSearchDialog::Activate()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::InitControls_Impl()
 {
@@ -688,7 +688,7 @@ void SvxSearchDialog::ShowOptionalControls_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 namespace {
 
@@ -990,7 +990,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
                                          const SfxItemSet* pRSet )
@@ -1050,7 +1050,7 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
 {
@@ -1170,7 +1170,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
 {
@@ -1335,7 +1335,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
 {
@@ -1377,7 +1377,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl)
 {
@@ -1465,7 +1465,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch )
 {
@@ -1494,7 +1494,7 @@ void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch )
     pListBox->InsertEntry(rStr, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
 {
@@ -1534,7 +1534,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags )
 {
@@ -1650,7 +1650,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags )
                    ( !pSearchList || !pSearchList->Count() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::EnableControl_Impl( Control* pCtrl )
 {
@@ -1740,7 +1740,7 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem )
 {
@@ -1753,7 +1753,7 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
 {
@@ -1814,7 +1814,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl)
 {
@@ -1822,7 +1822,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
 {
@@ -1918,7 +1918,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
 {
@@ -1959,7 +1959,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl)
 {
@@ -1978,7 +1978,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
 {
@@ -1999,7 +1999,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
                                              sal_Bool bSrchFlag ) const
@@ -2070,7 +2070,7 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
     return rStr;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::PaintAttrText_Impl()
 {
@@ -2092,7 +2092,7 @@ void SvxSearchDialog::PaintAttrText_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
 {
@@ -2130,7 +2130,7 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
         nModifyFlag |= MODIFY_ALLTABLES;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSearchDialog::SaveToModule_Impl()
 {
@@ -2208,7 +2208,7 @@ void SvxSearchDialog::SaveToModule_Impl()
 
 SFX_IMPL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper, SID_SEARCH_DLG);
 
-// -----------------------------------------------------------------------
+
 
 SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId,
                                                 SfxBindings* pBindings,
@@ -2236,7 +2236,7 @@ SvxSearchDialog *SvxSearchDialogWrapper::getDialog ()
     return dialog;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const
 {
diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx
index 40a1390ad2cf..f850b443d061 100644
--- a/svx/source/dialog/stddlg.cxx
+++ b/svx/source/dialog/stddlg.cxx
@@ -35,7 +35,7 @@ short SvxStandardDialog::Execute()
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId )
     : SfxModalDialog( pParent, rResId )
@@ -47,7 +47,7 @@ SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxStandardDialog::~SvxStandardDialog()
 {
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index bfa69a5f6352..144ca2b378da 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -23,7 +23,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strarray.hxx>
 
-//------------------------------------------------------------------------
+
 
 SvxStringArray::SvxStringArray( sal_uInt32 nResId ) :
 
@@ -32,7 +32,7 @@ SvxStringArray::SvxStringArray( sal_uInt32 nResId ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvxStringArray::SvxStringArray( const ResId& rResId ) :
     ResStringArray( rResId )
@@ -40,13 +40,13 @@ SvxStringArray::SvxStringArray( const ResId& rResId ) :
 }
 
 
-//------------------------------------------------------------------------
+
 
 SvxStringArray::~SvxStringArray()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString SvxStringArray::GetStringByPos( sal_uInt32 nPos ) const
 {
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 2308b0f492e6..e7e8aae81114 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -58,14 +58,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxTextEncodingBox(Window *
     return pListBox;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextEncodingBox::~SvxTextEncodingBox()
 {
     delete m_pEncTable;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
 {
@@ -78,7 +78,7 @@ sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEncodingBox::FillFromTextEncodingTable(
         sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
@@ -128,7 +128,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEncodingBox::FillFromDbTextEncodingMap(
         sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
@@ -189,7 +189,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
 #endif
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEncodingBox::FillWithMimeAndSelectBest()
 {
@@ -198,7 +198,7 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
     SelectTextEncoding( nEnc );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
             const OUString& rEntry, sal_uInt16 nPos )
@@ -207,7 +207,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
     SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos )
 {
@@ -218,7 +218,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uI
         SAL_WARN( "svx.dialog", "SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) );
 }
 
-//------------------------------------------------------------------------
+
 
 rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
 {
@@ -230,7 +230,7 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
         return RTL_TEXTENCODING_DONTKNOW;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
 {
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 8a36e72eccc1..a2de927cac1d 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -23,7 +23,7 @@
 #include "svx/txenctab.hxx"
 #include <tools/shl.hxx>
 
-//------------------------------------------------------------------------
+
 
 SvxTextEncodingTable::SvxTextEncodingTable()
     :
@@ -31,13 +31,13 @@ SvxTextEncodingTable::SvxTextEncodingTable()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextEncodingTable::~SvxTextEncodingTable()
 {
 }
 
-//------------------------------------------------------------------------
+
 
 const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc ) const
 {
@@ -49,7 +49,7 @@ const OUString SvxTextEncodingTable::GetTextString( const rtl_TextEncoding nEnc
     return OUString();
 }
 
-//------------------------------------------------------------------------
+
 
 rtl_TextEncoding SvxTextEncodingTable::GetTextEncoding( const OUString& rStr ) const
 {
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 57cadf6c009f..d659b7eb7baf 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -430,7 +430,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
     aBtnSpecularColor.SetAccessibleRelationMemberOf(&aFLMatSpecular);
 }
 
-// -----------------------------------------------------------------------
+
 Svx3DWin::~Svx3DWin()
 {
     delete p3DView;
@@ -446,7 +446,7 @@ Svx3DWin::~Svx3DWin()
     delete mpImpl;
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::Construct()
 {
     aBtnGeo.Check();
@@ -455,7 +455,7 @@ void Svx3DWin::Construct()
     aCtlLightPreview.Hide();
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::Reset()
 {
     // Various initializations, default is AllAttributes
@@ -480,7 +480,7 @@ void Svx3DWin::SetUILightState( ImageButton& aBtn, bool bState )
     aBtn.SetModeImage( bState ? aImgLightOn : aImgLightOff );
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::Update( SfxItemSet& rAttrs )
 {
     // remember 2d attributes
@@ -1708,7 +1708,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
     aBtnLatheObject.Enable(pConvertTo3DLatheItem->GetState());
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
 {
     // get remembered 2d attributes from the dialog
@@ -2218,7 +2218,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
         rAttrs.InvalidateItem(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY);
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::Resize()
 {
     if ( !IsFloatingMode() ||
@@ -2311,7 +2311,7 @@ void Svx3DWin::Resize()
     SfxDockingWindow::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl)
 {
     bUpdate = !aBtnUpdate.IsChecked();
@@ -2335,7 +2335,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl)
 {
     SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
@@ -2349,7 +2349,7 @@ IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
 {
@@ -2612,7 +2612,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
 {
     bool bUpdatePreview = false;
@@ -2771,7 +2771,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn )
 {
@@ -2801,7 +2801,7 @@ IMPL_LINK( Svx3DWin, ClickColorHdl, PushButton *, pBtn )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
 {
     if( p )
@@ -2903,7 +2903,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField )
 {
     if( pField )
@@ -2934,7 +2934,7 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField )
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Svx3DWin::ClickLight(PushButton& rBtn)
 {
@@ -2962,7 +2962,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn)
     aCtlLightPreview.CheckSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl)
 {
@@ -2970,7 +2970,7 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeLightCallbackHdl)
 }
 
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl)
 {
@@ -3041,10 +3041,10 @@ IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl)
     return( 0L );
 }
 
-// -----------------------------------------------------------------------
+
 // Method to ensure that the LB is also associated with a color
 // returns true if color was added
-// -----------------------------------------------------------------------
+
 sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
 {
     sal_Bool bRet = sal_False;
@@ -3070,7 +3070,7 @@ sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
     return( bRet );
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::UpdatePreview()
 {
     if( pModel == NULL )
@@ -3107,7 +3107,7 @@ void Svx3DWin::DocumentReload()
     mpRemember2DAttributes = 0L;
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DWin::InitColorLB( const SdrModel* pDoc )
 {
     aLbLight1.Fill( pDoc->GetColorList() );
@@ -3140,7 +3140,7 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc )
     aLbMatSpecular.SelectEntry( aColWhite );
 }
 
-// -----------------------------------------------------------------------
+
 sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
 {
     sal_uInt16 nLight = 8;
@@ -3186,7 +3186,7 @@ sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
     return( nLight );
 };
 
-// -----------------------------------------------------------------------
+
 ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
 {
     ColorLB* pLb = NULL;
@@ -3254,7 +3254,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId,
 {
 }
 
-// -----------------------------------------------------------------------
+
 void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
                         SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ )
 {
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index ff0e74f6584e..b36d6e6557d9 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -46,7 +46,7 @@ namespace svx
     //====================================================================
     //= OColumnTransferable
     //====================================================================
-    //--------------------------------------------------------------------
+
     OColumnTransferable::OColumnTransferable(const OUString& _rDatasource
                                             ,const OUString& _rConnectionResource
                                             ,const sal_Int32        _nCommandType
@@ -58,7 +58,7 @@ namespace svx
         implConstruct(_rDatasource,_rConnectionResource,_nCommandType, _rCommand, _rFieldName);
     }
 
-    //--------------------------------------------------------------------
+
     OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, sal_Int32 _nFormats )
         :m_nFormatFlags(_nFormats)
     {
@@ -86,7 +86,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     OColumnTransferable::OColumnTransferable(const Reference< XPropertySet >& _rxForm,
             const OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn,
             const Reference< XConnection >& _rxConnection, sal_Int32 _nFormats)
@@ -152,7 +152,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt32 OColumnTransferable::getDescriptorFormatId()
     {
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -164,7 +164,7 @@ namespace svx
         return s_nFormat;
     }
 
-    //--------------------------------------------------------------------
+
     void OColumnTransferable::implConstruct( const OUString& _rDatasource
                                             ,const OUString& _rConnectionResource
                                             ,const sal_Int32 _nCommandType
@@ -210,7 +210,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OColumnTransferable::AddSupportedFormats()
     {
         if (CTF_CONTROL_EXCHANGE & m_nFormatFlags)
@@ -223,7 +223,7 @@ namespace svx
             AddFormat(getDescriptorFormatId());
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OColumnTransferable::GetData( const DataFlavor& _rFlavor )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
@@ -239,7 +239,7 @@ namespace svx
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats)
     {
         sal_Bool bFieldFormat       = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR);
@@ -261,7 +261,7 @@ namespace svx
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData)
     {
         if (_rData.HasFormat(getDescriptorFormatId()))
@@ -312,7 +312,7 @@ namespace svx
         return aDescriptor;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData
                                             ,OUString& _rDatasource
                                             ,OUString& _rDatabaseLocation
@@ -358,7 +358,7 @@ namespace svx
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     void OColumnTransferable::addDataToContainer( TransferDataContainer* _pContainer )
     {
         OSL_ENSURE( _pContainer, "OColumnTransferable::addDataToContainer: invalid container!" );
@@ -392,7 +392,7 @@ namespace svx
     {
         construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand);
     }
-    //--------------------------------------------------------------------
+
     ODataAccessObjectTransferable::ODataAccessObjectTransferable(
                     const OUString&  _rDatasource
                     ,const OUString& _rConnectionResource
@@ -404,7 +404,7 @@ namespace svx
         construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,_rxConnection,(CommandType::COMMAND == _nCommandType),_rCommand);
     }
 
-    // -----------------------------------------------------------------------------
+
     ODataAccessObjectTransferable::ODataAccessObjectTransferable(const Reference< XPropertySet >& _rxLivingForm)
     {
         // collect some properties of the form
@@ -446,7 +446,7 @@ namespace svx
                     ,sCompleteStatement);
     }
 
-    // -----------------------------------------------------------------------------
+
     void ODataAccessObjectTransferable::AddSupportedFormats()
     {
         sal_Int32 nObjectType = CommandType::COMMAND;
@@ -468,7 +468,7 @@ namespace svx
             AddFormat(SOT_FORMATSTR_ID_SBA_DATAEXCHANGE);
     }
 
-    // -----------------------------------------------------------------------------
+
     sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
     {
         sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
@@ -485,7 +485,7 @@ namespace svx
         return sal_False;
     }
 
-    // -----------------------------------------------------------------------------
+
     sal_Bool ODataAccessObjectTransferable::canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors)
     {
         for (   DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
@@ -503,7 +503,7 @@ namespace svx
         return sal_False;
     }
 
-    // -----------------------------------------------------------------------------
+
     ODataAccessDescriptor ODataAccessObjectTransferable::extractObjectDescriptor(const TransferableDataHelper& _rData)
     {
         sal_Int32 nKnownFormatId = 0;
@@ -542,7 +542,7 @@ namespace svx
         return ODataAccessDescriptor();
     }
 
-    // -----------------------------------------------------------------------------
+
     void ODataAccessObjectTransferable::addCompatibleSelectionDescription( const Sequence< Any >& _rSelRows )
     {
         const sal_Unicode       cSeparator(11);
@@ -560,12 +560,12 @@ namespace svx
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void ODataAccessObjectTransferable::ObjectReleased()
     {
         m_aDescriptor.clear();
     }
-    // -----------------------------------------------------------------------------
+
     void ODataAccessObjectTransferable::construct(  const OUString&  _rDatasource
                                                     ,const OUString& _rConnectionResource
                                                     ,const sal_Int32        _nCommandType
@@ -623,11 +623,11 @@ namespace svx
         m_sCompatibleObjectDescription += sSeparator;
     }
 
-    //--------------------------------------------------------------------
+
     OMultiColumnTransferable::OMultiColumnTransferable(const Sequence< PropertyValue >& _aDescriptors) : m_aDescriptors(_aDescriptors)
     {
     }
-    //--------------------------------------------------------------------
+
     sal_uInt32 OMultiColumnTransferable::getDescriptorFormatId()
     {
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -638,12 +638,12 @@ namespace svx
         }
         return s_nFormat;
     }
-    //--------------------------------------------------------------------
+
     void OMultiColumnTransferable::AddSupportedFormats()
     {
         AddFormat(getDescriptorFormatId());
     }
-    //--------------------------------------------------------------------
+
     sal_Bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
@@ -655,7 +655,7 @@ namespace svx
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors)
     {
         DataFlavorExVector::const_iterator aCheck = _rFlavors.begin();
@@ -668,7 +668,7 @@ namespace svx
         return aCheck == _rFlavors.end();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyValue > OMultiColumnTransferable::extractDescriptor(const TransferableDataHelper& _rData)
     {
         Sequence< PropertyValue > aList;
@@ -686,7 +686,7 @@ namespace svx
         } // if (_rData.HasFormat(getDescriptorFormatId()))
         return aList;
     }
-    // -----------------------------------------------------------------------------
+
     void OMultiColumnTransferable::ObjectReleased()
     {
         m_aDescriptors.realloc(0);
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 2d5be88f04b0..815a1a2a1542 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -46,7 +46,7 @@ namespace svx
     //====================================================================
     //= OComponentTransferable
     //====================================================================
-    //--------------------------------------------------------------------
+
     OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation
             ,const Reference< XContent>& _xContent)
     {
@@ -55,7 +55,7 @@ namespace svx
     }
 
 
-    //--------------------------------------------------------------------
+
     sal_uInt32 OComponentTransferable::getDescriptorFormatId(sal_Bool _bExtractForm)
     {
         static sal_uInt32 s_nReportFormat = (sal_uInt32)-1;
@@ -73,7 +73,7 @@ namespace svx
         return _bExtractForm ? s_nFormFormat : s_nReportFormat;
     }
 
-    //--------------------------------------------------------------------
+
     void OComponentTransferable::AddSupportedFormats()
     {
         sal_Bool bForm = sal_True;
@@ -89,7 +89,7 @@ namespace svx
         AddFormat(getDescriptorFormatId(bForm));
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OComponentTransferable::GetData( const DataFlavor& _rFlavor )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor);
@@ -99,7 +99,7 @@ namespace svx
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OComponentTransferable::canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors,sal_Bool _bForm )
     {
         DataFlavorExVector::const_iterator aEnd = _rFlavors.end();
@@ -115,7 +115,7 @@ namespace svx
         return sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData)
     {
         sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(sal_True));
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index f0404f09d287..659739661a3d 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -78,7 +78,7 @@ using ::com::sun::star::sdb::XRowSetSupplier;
 using ::com::sun::star::awt::XVclWindowPeer;
 
 
-//------------------------------------------------------------------
+
 ::com::sun::star::awt::FontDescriptor ImplCreateFontDescriptor( const Font& rFont )
 {
     ::com::sun::star::awt::FontDescriptor aFD;
@@ -101,7 +101,7 @@ using ::com::sun::star::awt::XVclWindowPeer;
     return aFD;
 }
 
-//------------------------------------------------------------------
+
 Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr )
 {
     Font aFont;
@@ -125,14 +125,14 @@ Font ImplCreateFont( const ::com::sun::star::awt::FontDescriptor& rDescr )
 //==================================================================
 //= FmXModifyMultiplexer
 //==================================================================
-//------------------------------------------------------------------
+
 FmXModifyMultiplexer::FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex )
                     :OWeakSubObject( rSource )
                     ,OInterfaceContainerHelper( _rMutex )
 {
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn;
@@ -147,12 +147,12 @@ Any SAL_CALL FmXModifyMultiplexer::queryInterface(const Type& _rType) throw (Run
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 void FmXModifyMultiplexer::disposing(const EventObject& ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------
+
 void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeException )
 {
     EventObject aMulti( e);
@@ -163,14 +163,14 @@ void FmXModifyMultiplexer::modified(const EventObject& e) throw( RuntimeExceptio
 //==================================================================
 //= FmXUpdateMultiplexer
 //==================================================================
-//------------------------------------------------------------------
+
 FmXUpdateMultiplexer::FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex )
                     :OWeakSubObject( rSource )
                     ,OInterfaceContainerHelper( _rMutex )
 {
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn;
@@ -185,12 +185,12 @@ Any SAL_CALL FmXUpdateMultiplexer::queryInterface(const Type& _rType) throw (Run
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 void FmXUpdateMultiplexer::disposing(const EventObject& ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------
+
 sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( RuntimeException )
 {
     EventObject aMulti( e );
@@ -207,7 +207,7 @@ sal_Bool FmXUpdateMultiplexer::approveUpdate(const EventObject &e) throw( Runtim
     return bResult;
 }
 
-//------------------------------------------------------------------
+
 void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException )
 {
     EventObject aMulti( e );
@@ -219,14 +219,14 @@ void FmXUpdateMultiplexer::updated(const EventObject &e) throw( RuntimeException
 //==================================================================
 //= FmXSelectionMultiplexer
 //==================================================================
-//------------------------------------------------------------------
+
 FmXSelectionMultiplexer::FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex )
     :OWeakSubObject( rSource )
     ,OInterfaceContainerHelper( _rMutex )
 {
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn;
@@ -241,12 +241,12 @@ Any SAL_CALL FmXSelectionMultiplexer::queryInterface(const Type& _rType) throw (
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 void FmXSelectionMultiplexer::disposing(const EventObject& ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEvent ) throw (RuntimeException)
 {
     EventObject aMulti(_rEvent);
@@ -257,14 +257,14 @@ void SAL_CALL FmXSelectionMultiplexer::selectionChanged( const EventObject& _rEv
 //==================================================================
 //= FmXContainerMultiplexer
 //==================================================================
-//------------------------------------------------------------------
+
 FmXContainerMultiplexer::FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex )
                         :OWeakSubObject( rSource )
                         ,OInterfaceContainerHelper( _rMutex )
 {
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn;
@@ -279,11 +279,11 @@ Any SAL_CALL FmXContainerMultiplexer::queryInterface(const Type& _rType) throw (
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 void FmXContainerMultiplexer::disposing(const EventObject& ) throw( RuntimeException )
 {
 }
-//------------------------------------------------------------------
+
 void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( RuntimeException )
 {
     ContainerEvent aMulti( e );
@@ -291,7 +291,7 @@ void FmXContainerMultiplexer::elementInserted(const ContainerEvent& e) throw( Ru
     notifyEach( &XContainerListener::elementInserted, aMulti );
 }
 
-//------------------------------------------------------------------
+
 void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( RuntimeException )
 {
     ContainerEvent aMulti( e );
@@ -300,7 +300,7 @@ void FmXContainerMultiplexer::elementRemoved(const ContainerEvent& e) throw( Run
 }
 
 
-//------------------------------------------------------------------
+
 void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( RuntimeException )
 {
     ContainerEvent aMulti( e );
@@ -311,14 +311,14 @@ void FmXContainerMultiplexer::elementReplaced(const ContainerEvent& e) throw( Ru
 //==================================================================
 //= FmXGridControlMultiplexer
 //==================================================================
-//------------------------------------------------------------------
+
 FmXGridControlMultiplexer::FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& _rMutex )
     :OWeakSubObject( rSource )
     ,OInterfaceContainerHelper( _rMutex )
 {
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn;
@@ -332,12 +332,12 @@ Any SAL_CALL FmXGridControlMultiplexer::queryInterface(const Type& _rType) throw
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 void FmXGridControlMultiplexer::disposing( const EventObject& ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _event ) throw (RuntimeException)
 {
     EventObject aForwardedEvent( _event );
@@ -349,13 +349,13 @@ void SAL_CALL FmXGridControlMultiplexer::columnChanged( const EventObject& _even
 //= FmXGridControl
 //==================================================================
 
-//------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference< XMultiServiceFactory>& _rxFactory)
 {
     return *(new FmXGridControl( comphelper::getComponentContext(_rxFactory) ));
 }
 DBG_NAME(FmXGridControl )
-//------------------------------------------------------------------------------
+
 FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext)
                :UnoControl()
                ,m_aModifyListeners(*this, GetMutex())
@@ -370,13 +370,13 @@ FmXGridControl::FmXGridControl(const Reference< XComponentContext >& _rxContext)
     DBG_CTOR(FmXGridControl ,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 FmXGridControl::~FmXGridControl()
 {
     DBG_DTOR(FmXGridControl ,NULL);
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = FmXGridControl_BASE::queryInterface(_rType);
@@ -386,13 +386,13 @@ Any SAL_CALL FmXGridControl::queryAggregation(const Type& _rType) throw (Runtime
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 Sequence< Type> SAL_CALL FmXGridControl::getTypes(  ) throw(RuntimeException)
 {
     return comphelper::concatSequences(UnoControl::getTypes(),FmXGridControl_BASE::getTypes());
 }
 
-//------------------------------------------------------------------
+
 Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId(  ) throw(RuntimeException)
 {
     static ::cppu::OImplementationId* pId = 0;
@@ -427,7 +427,7 @@ OUString SAL_CALL FmXGridControl::getImplementationName() throw()
     return aServiceNames;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -441,14 +441,14 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
     UnoControl::dispose();
 }
 
-//------------------------------------------------------------------------------
+
 OUString FmXGridControl::GetComponentServiceName()
 {
     OUString aName("DBGrid");
     return aName;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::awt::XControlModel >& rModel) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -465,7 +465,7 @@ sal_Bool SAL_CALL FmXGridControl::setModel(const Reference< ::com::sun::star::aw
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent)
 {
     FmXGridPeer* pReturn = new FmXGridPeer(m_xContext);
@@ -490,7 +490,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent)
     return pReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit >& /*rToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer >& rParentPeer) throw( RuntimeException )
 {
     if ( !mxModel.is() )
@@ -647,7 +647,7 @@ void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt:
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException )
 {
     m_aModifyListeners.addInterface( l );
@@ -658,7 +658,7 @@ void FmXGridControl::addModifyListener(const Reference< ::com::sun::star::util::
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -666,7 +666,7 @@ sal_Bool SAL_CALL FmXGridControl::select( const Any& _rSelection ) throw (Illega
     return xPeer->select(_rSelection);
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL FmXGridControl::getSelection(  ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -674,7 +674,7 @@ Any SAL_CALL FmXGridControl::getSelection(  ) throw (RuntimeException)
     return xPeer->getSelection();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
 {
     m_aSelectionListeners.addInterface( _rxListener );
@@ -685,7 +685,7 @@ void SAL_CALL FmXGridControl::addSelectionChangeListener( const Reference< XSele
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
 {
     if( getPeer().is() && 1 == m_aSelectionListeners.getLength() )
@@ -696,7 +696,7 @@ void SAL_CALL FmXGridControl::removeSelectionChangeListener( const Reference< XS
     m_aSelectionListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xType ) throw(RuntimeException)
 {
     if (getPeer().is())
@@ -709,7 +709,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridControl::queryFieldDataType( const Type& xT
     return Sequence<sal_Bool>();
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException)
 {
     if (getPeer().is())
@@ -722,7 +722,7 @@ Sequence< Any > SAL_CALL FmXGridControl::queryFieldData( sal_Int32 nRow, const T
     return Sequence< Any>();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException )
 {
     if( getPeer().is() && m_aModifyListeners.getLength() == 1 )
@@ -733,7 +733,7 @@ void SAL_CALL FmXGridControl::removeModifyListener(const Reference< ::com::sun::
     m_aModifyListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -742,7 +742,7 @@ void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeExc
     m_bInDraw = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeException )
 {
     ::com::sun::star::util::ModeChangeEvent aModeChangeEvent;
@@ -794,7 +794,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
 }
 
 // XBoundComponent
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException )
 {
     m_aUpdateListeners.addInterface( l );
@@ -805,7 +805,7 @@ void SAL_CALL FmXGridControl::addUpdateListener(const Reference< XUpdateListener
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException )
 {
     if( getPeer().is() && m_aUpdateListeners.getLength() == 1 )
@@ -816,7 +816,7 @@ void SAL_CALL FmXGridControl::removeUpdateListener(const Reference< XUpdateListe
     m_aUpdateListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException )
 {
     Reference< XBoundComponent >  xBound(getPeer(), UNO_QUERY);
@@ -827,7 +827,7 @@ sal_Bool SAL_CALL FmXGridControl::commit() throw( RuntimeException )
 }
 
 // XContainer
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException )
 {
     m_aContainerListeners.addInterface( l );
@@ -838,7 +838,7 @@ void SAL_CALL FmXGridControl::addContainerListener(const Reference< XContainerLi
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException )
 {
     if( getPeer().is() && m_aContainerListeners.getLength() == 1 )
@@ -849,7 +849,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine
     m_aContainerListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
@@ -859,7 +859,7 @@ Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL FmXGridControl::queryD
         return Reference< ::com::sun::star::frame::XDispatch > ();
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridControl::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
@@ -869,7 +869,7 @@ Sequence< Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL FmXGridCont
         return Sequence< Reference< ::com::sun::star::frame::XDispatch > >();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatchProviderInterception >  xPeerInterception(getPeer(), UNO_QUERY);
@@ -877,7 +877,7 @@ void SAL_CALL FmXGridControl::registerDispatchProviderInterceptor(const Referenc
         xPeerInterception->registerDispatchProviderInterceptor(_xInterceptor);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatchProviderInterception >  xPeerInterception(getPeer(), UNO_QUERY);
@@ -885,7 +885,7 @@ void SAL_CALL FmXGridControl::releaseDispatchProviderInterceptor(const Reference
         xPeerInterception->releaseDispatchProviderInterceptor(_xInterceptor);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
@@ -899,7 +899,7 @@ void SAL_CALL FmXGridControl::addGridControlListener( const Reference< XGridCont
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( GetMutex() );
@@ -914,14 +914,14 @@ void SAL_CALL FmXGridControl::removeGridControlListener( const Reference< XGridC
     m_aGridControlListeners.removeInterface( _listener );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXGridControl::getCurrentColumnPosition() throw( RuntimeException )
 {
     Reference< XGridControl > xGrid( getPeer(), UNO_QUERY );
     return xGrid.is() ? xGrid->getCurrentColumnPosition() : -1;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException )
 {
     Reference< XGridControl > xGrid( getPeer(), UNO_QUERY );
@@ -933,21 +933,21 @@ void SAL_CALL FmXGridControl::setCurrentColumnPosition(sal_Int16 nPos) throw( Ru
 }
 
 // XElementAccess
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXGridControl::hasElements() throw( RuntimeException )
 {
     Reference< XElementAccess >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->hasElements() : 0;
 }
 
-//------------------------------------------------------------------------------
+
 Type SAL_CALL FmXGridControl::getElementType(  ) throw(RuntimeException)
 {
     return ::getCppuType((const Reference< ::com::sun::star::awt::XTextComponent >*)NULL);
 }
 
 // XEnumerationAccess
-//------------------------------------------------------------------------------
+
 Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration() throw( RuntimeException )
 {
     Reference< XEnumerationAccess >  xPeer(getPeer(), UNO_QUERY);
@@ -958,14 +958,14 @@ Reference< XEnumeration >  SAL_CALL FmXGridControl::createEnumeration() throw( R
 }
 
 // XIndexAccess
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL FmXGridControl::getCount() throw( RuntimeException )
 {
     Reference< XIndexAccess >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getCount() : 0;
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     Reference< XIndexAccess >  xPeer(getPeer(), UNO_QUERY);
@@ -976,7 +976,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun
 }
 
 // ::com::sun::star::util::XModeSelector
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
@@ -986,21 +986,21 @@ void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportExce
     xPeer->setMode(Mode);
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getMode() : OUString();
 }
 
-//------------------------------------------------------------------------------
+
 ::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedModes() throw( RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->getSupportedModes() : ::comphelper::StringSequence();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
@@ -1025,7 +1025,7 @@ protected:
     virtual void columnChanged();
 };
 
-//------------------------------------------------------------------
+
 FmXGridPeer::GridListenerDelegator::GridListenerDelegator(FmXGridPeer* _pPeer)
     :m_pPeer(_pPeer)
 {
@@ -1036,20 +1036,20 @@ FmXGridPeer::GridListenerDelegator::~GridListenerDelegator()
 {
 }
 
-//------------------------------------------------------------------
+
 void FmXGridPeer::GridListenerDelegator::selectionChanged()
 {
     m_pPeer->selectionChanged();
 }
 
-//------------------------------------------------------------------
+
 void FmXGridPeer::GridListenerDelegator::columnChanged()
 {
     m_pPeer->columnChanged();
 }
 
 //==============================================================================
-//------------------------------------------------------------------
+
 Reference< XInterface >  FmXGridPeer_CreateInstance(const Reference< XMultiServiceFactory>& _rxFactory)
 {
     FmXGridPeer* pNewObject = new FmXGridPeer( comphelper::getComponentContext(_rxFactory) );
@@ -1057,13 +1057,13 @@ Reference< XInterface >  FmXGridPeer_CreateInstance(const Reference< XMultiServi
     return *pNewObject;
 }
 
-//------------------------------------------------------------------
+
 Sequence< Type> SAL_CALL FmXGridPeer::getTypes(  ) throw(RuntimeException)
 {
     return comphelper::concatSequences( VCLXWindow::getTypes(), FmXGridPeer_BASE::getTypes() );
 }
 
-//------------------------------------------------------------------
+
 Sequence<sal_Int8> SAL_CALL FmXGridPeer::getImplementationId(  ) throw(RuntimeException)
 {
     static ::cppu::OImplementationId* pId = 0;
@@ -1079,7 +1079,7 @@ Sequence<sal_Int8> SAL_CALL FmXGridPeer::getImplementationId(  ) throw(RuntimeEx
     return pId->getImplementationId();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException)
 {
     Any aReturn = FmXGridPeer_BASE::queryInterface(_rType);
@@ -1090,7 +1090,7 @@ Any SAL_CALL FmXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExcep
     return aReturn;
 }
 
-//------------------------------------------------------------------
+
 void FmXGridPeer::selectionChanged()
 {
     EventObject aSource;
@@ -1098,14 +1098,14 @@ void FmXGridPeer::selectionChanged()
     m_aSelectionListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aSource);
 }
 
-//------------------------------------------------------------------
+
 void FmXGridPeer::columnChanged()
 {
     EventObject aEvent( *this );
     m_aGridControlListeners.notifyEach( &XGridControlListener::columnChanged, aEvent );
 }
 
-//------------------------------------------------------------------
+
 namespace fmgridif
 {
     const OUString getDataModeIdentifier()
@@ -1115,7 +1115,7 @@ namespace fmgridif
 }
 using namespace fmgridif;
 
-//------------------------------------------------------------------
+
 FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext)
             :m_aModifyListeners(m_aMutex)
             ,m_aUpdateListeners(m_aMutex)
@@ -1134,13 +1134,13 @@ FmXGridPeer::FmXGridPeer(const Reference< XComponentContext >& _rxContext)
     m_pGridListener = new GridListenerDelegator( this );
 }
 
-//------------------------------------------------------------------------------
+
 FmGridControl* FmXGridPeer::imp_CreateControl(Window* pParent, WinBits nStyle)
 {
     return new FmGridControl(m_xContext, pParent, this, nStyle);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::Create(Window* pParent, WinBits nStyle)
 {
     FmGridControl* pWin = imp_CreateControl(pParent, nStyle);
@@ -1159,7 +1159,7 @@ void FmXGridPeer::Create(Window* pParent, WinBits nStyle)
     getSupportedURLs();
 }
 
-//------------------------------------------------------------------------------
+
 FmXGridPeer::~FmXGridPeer()
 {
     setRowSet(Reference< XRowSet > ());
@@ -1178,7 +1178,7 @@ const Sequence< sal_Int8 >& FmXGridPeer::getUnoTunnelImplementationId() throw()
     return theFmXGridPeerImplementationId::get().getSeq();
 }
 
-//------------------------------------------------------------------------------
+
 FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxIFace ) throw()
 {
     FmXGridPeer* pReturn = NULL;
@@ -1189,7 +1189,7 @@ FmXGridPeer* FmXGridPeer::getImplementation( const Reference< XInterface >& _rxI
     return pReturn;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException)
 {
     sal_Int64 nReturn(0);
@@ -1207,7 +1207,7 @@ sal_Int64 SAL_CALL FmXGridPeer::getSomething( const Sequence< sal_Int8 >& _rIden
 }
 
 // XEventListener
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::disposing(const EventObject& e) throw( RuntimeException )
 {
 using namespace ::com::sun::star::util;
@@ -1249,19 +1249,19 @@ using namespace ::com::sun::star::util;
         VCLXWindow::disposing(e);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::addModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException )
 {
     m_aModifyListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::removeModifyListener(const Reference< ::com::sun::star::util::XModifyListener >& l) throw( RuntimeException )
 {
     m_aModifyListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 #define LAST_KNOWN_TYPE     FormComponentType::PATTERNFIELD
 Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType ) throw(RuntimeException)
 {
@@ -1358,7 +1358,7 @@ Sequence< sal_Bool > SAL_CALL FmXGridPeer::queryFieldDataType( const Type& xType
     return aReturnSequence;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type& xType ) throw(RuntimeException)
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -1438,7 +1438,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
     return aReturnSequence;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::CellModified()
 {
     EventObject aEvt;
@@ -1447,7 +1447,7 @@ void FmXGridPeer::CellModified()
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -1560,19 +1560,19 @@ void FmXGridPeer::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeE
 }
 
 // XBoundComponent
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::addUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException )
 {
     m_aUpdateListeners.addInterface(l);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::removeUpdateListener(const Reference< XUpdateListener >& l) throw( RuntimeException )
 {
     m_aUpdateListeners.removeInterface(l);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmXGridPeer::commit() throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -1595,7 +1595,7 @@ sal_Bool FmXGridPeer::commit() throw( RuntimeException )
 }
 
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -1605,7 +1605,7 @@ void FmXGridPeer::cursorMoved(const EventObject& _rEvent) throw( RuntimeExceptio
         pGrid->positioned(_rEvent);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -1618,7 +1618,7 @@ void FmXGridPeer::rowChanged(const EventObject& _rEvent) throw( RuntimeException
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
     // not interested in ...
@@ -1626,46 +1626,46 @@ void FmXGridPeer::rowSetChanged(const EventObject& /*event*/) throw( RuntimeExce
 }
 
 // XLoadListener
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::loaded(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
     updateGrid(m_xCursor);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
     updateGrid( Reference< XRowSet > (NULL) );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     // empty the grid
     updateGrid( Reference< XRowSet > (NULL) );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     // empty the grid
     updateGrid( Reference< XRowSet > (NULL) );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     updateGrid(m_xCursor);
 }
 
 // XGridPeer
-//------------------------------------------------------------------------------
+
 Reference< XIndexContainer >  FmXGridPeer::getColumns() throw( RuntimeException )
 {
     return m_xColumns;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
 {
     static const OUString aPropsListenedTo[] =
@@ -1690,7 +1690,7 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
 {
     // the same props as in addColumnListeners ... linux has problems with global static UStrings, so
@@ -1706,7 +1706,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
             xCol->removePropertyChangeListener(aPropsListenedTo[i], this);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -1763,7 +1763,7 @@ void FmXGridPeer::setColumns(const Reference< XIndexContainer >& Columns) throw(
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException )
 {
     if (bOn != isDesignMode())
@@ -1779,7 +1779,7 @@ void FmXGridPeer::setDesignMode(sal_Bool bOn) throw( RuntimeException )
         UpdateDispatches(); // will connect if not already connected and just update else
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException )
 {
     Window* pWin = GetWindow();
@@ -1789,7 +1789,7 @@ sal_Bool FmXGridPeer::isDesignMode() throw( RuntimeException )
         return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -1823,7 +1823,7 @@ void FmXGridPeer::elementInserted(const ContainerEvent& evt) throw( RuntimeExcep
     FormControlFactory( m_xContext ).initializeTextFieldLineEnds( xNewColumn );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -1879,7 +1879,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep
         pGrid->ActivateCell();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -1897,7 +1897,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept
     removeColumnListeners(xOldColumn);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -2081,7 +2081,7 @@ void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) t
         VCLXWindow::setProperty( PropertyName, Value );
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
 {
     Reference< XAccessibleContext > xContext;
@@ -2110,7 +2110,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
     return xContext;
 }
 
-//------------------------------------------------------------------------------
+
 Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException )
 {
     Any aProp;
@@ -2159,7 +2159,7 @@ Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeExc
     return aProp;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::dispose() throw( RuntimeException )
 {
     EventObject aEvt;
@@ -2191,19 +2191,19 @@ void FmXGridPeer::dispose() throw( RuntimeException )
 }
 
 // XContainer
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::addContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException )
 {
     m_aContainerListeners.addInterface( l );
 }
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::removeContainerListener(const Reference< XContainerListener >& l) throw( RuntimeException )
 {
     m_aContainerListeners.removeInterface( l );
 }
 
 // ::com::sun::star::data::XDatabaseCursorSupplier
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::startCursorListening()
 {
     if (!m_nCursorListening)
@@ -2227,7 +2227,7 @@ void FmXGridPeer::startCursorListening()
     m_nCursorListening++;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::stopCursorListening()
 {
     if (!--m_nCursorListening)
@@ -2249,7 +2249,7 @@ void FmXGridPeer::stopCursorListening()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor)
 {
     FmGridControl* pGrid = (FmGridControl*)GetWindow();
@@ -2257,13 +2257,13 @@ void FmXGridPeer::updateGrid(const Reference< XRowSet >& _rxCursor)
         pGrid->setDataSource(_rxCursor);
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XRowSet >  FmXGridPeer::getRowSet() throw( RuntimeException )
 {
     return m_xCursor;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2300,26 +2300,26 @@ void FmXGridPeer::setRowSet(const Reference< XRowSet >& _rDatabaseCursor) throw(
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridPeer::addGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException )
 {
     m_aGridControlListeners.addInterface( _listener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridPeer::removeGridControlListener( const Reference< XGridControlListener >& _listener ) throw( RuntimeException )
 {
     m_aGridControlListeners.removeInterface( _listener );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 FmXGridPeer::getCurrentColumnPosition() throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
     return pGrid ? pGrid->GetViewColumnPos(pGrid->GetCurColumnId()) : -1;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2327,7 +2327,7 @@ void FmXGridPeer::setCurrentColumnPosition(sal_Int16 nPos) throw( RuntimeExcepti
         pGrid->GoToColumnId(pGrid->GetColumnIdFromViewPos(nPos));
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -2377,27 +2377,27 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti
 }
 
 // XElementAccess
-//------------------------------------------------------------------------------
+
 sal_Bool FmXGridPeer::hasElements() throw( RuntimeException )
 {
     return getCount() != 0;
 }
 
-//------------------------------------------------------------------------------
+
 Type SAL_CALL FmXGridPeer::getElementType(  ) throw(RuntimeException)
 {
     return ::getCppuType((Reference< ::com::sun::star::awt::XControl> *)NULL);
 }
 
 // XEnumerationAccess
-//------------------------------------------------------------------------------
+
 Reference< XEnumeration >  FmXGridPeer::createEnumeration() throw( RuntimeException )
 {
     return new ::comphelper::OEnumerationByIndex(this);
 }
 
 // XIndexAccess
-//------------------------------------------------------------------------------
+
 sal_Int32 FmXGridPeer::getCount() throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2407,7 +2407,7 @@ sal_Int32 FmXGridPeer::getCount() throw( RuntimeException )
         return 0;
 }
 
-//------------------------------------------------------------------------------
+
 Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2432,7 +2432,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException,
 }
 
 // ::com::sun::star::util::XModeSelector
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException )
 {
     if (!supportsMode(Mode))
@@ -2453,13 +2453,13 @@ void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, Runti
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString FmXGridPeer::getMode() throw( RuntimeException )
 {
     return m_aMode;
 }
 
-//------------------------------------------------------------------------------
+
 ::comphelper::StringSequence FmXGridPeer::getSupportedModes() throw( RuntimeException )
 {
     static ::comphelper::StringSequence aModes;
@@ -2473,7 +2473,7 @@ OUString FmXGridPeer::getMode() throw( RuntimeException )
     return aModes;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException )
 {
     ::comphelper::StringSequence aModes(getSupportedModes());
@@ -2486,7 +2486,7 @@ sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::columnVisible(DbGridColumn* pColumn)
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2501,7 +2501,7 @@ void FmXGridPeer::columnVisible(DbGridColumn* pColumn)
     m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvt );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::columnHidden(DbGridColumn* pColumn)
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2516,7 +2516,7 @@ void FmXGridPeer::columnHidden(DbGridColumn* pColumn)
     m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvt );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
 {
     FmGridControl* pGrid = (FmGridControl*) GetWindow();
@@ -2528,7 +2528,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
     pGrid->SetBrowserFlags(nOldFlags);
 }
 
-//------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::frame::XDispatch >  FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatch >  xResult;
@@ -2547,7 +2547,7 @@ Reference< ::com::sun::star::frame::XDispatch >  FmXGridPeer::queryDispatch(cons
     return xResult;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Reference< ::com::sun::star::frame::XDispatch > > FmXGridPeer::queryDispatches(const Sequence< ::com::sun::star::frame::DispatchDescriptor>& aDescripts) throw( RuntimeException )
 {
     if (m_xFirstDispatchInterceptor.is())
@@ -2557,7 +2557,7 @@ Sequence< Reference< ::com::sun::star::frame::XDispatch > > FmXGridPeer::queryDi
     return Sequence< Reference< ::com::sun::star::frame::XDispatch > >();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException )
 {
     if (_xInterceptor.is())
@@ -2586,7 +2586,7 @@ void FmXGridPeer::registerDispatchProviderInterceptor(const Reference< ::com::su
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& _xInterceptor) throw( RuntimeException )
 {
     if (!_xInterceptor.is())
@@ -2640,7 +2640,7 @@ void FmXGridPeer::releaseDispatchProviderInterceptor(const Reference< ::com::sun
         UpdateDispatches();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( RuntimeException )
 {
     DBG_ASSERT(m_pStateCache, "FmXGridPeer::statusChanged : invalid call !");
@@ -2668,13 +2668,13 @@ void FmXGridPeer::statusChanged(const ::com::sun::star::frame::FeatureStateEvent
     DBG_ASSERT(i<aUrls.getLength(), "FmXGridPeer::statusChanged : got a call for an unknown url !");
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmXGridPeer::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     Sequence< Any > aBookmarks;
@@ -2692,7 +2692,7 @@ sal_Bool SAL_CALL FmXGridPeer::select( const Any& _rSelection ) throw (IllegalAr
     // deal with selection at all.
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL FmXGridPeer::getSelection(  ) throw (RuntimeException)
 {
     FmGridControl* pVclControl = static_cast<FmGridControl*>(GetWindow());
@@ -2700,19 +2700,19 @@ Any SAL_CALL FmXGridPeer::getSelection(  ) throw (RuntimeException)
     return makeAny(aSelectionBookmarks);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridPeer::addSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
 {
     m_aSelectionListeners.addInterface( _rxListener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXGridPeer::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& _rxListener ) throw (RuntimeException)
 {
     m_aSelectionListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException )
 {
     if (m_xColumns == rEvent.Source)
@@ -2733,7 +2733,7 @@ void FmXGridPeer::resetted(const EventObject& rEvent) throw( RuntimeException )
     }
 }
 
-//------------------------------------------------------------------------------
+
 Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots()
 {
     static Sequence<sal_uInt16> aSupported;
@@ -2755,7 +2755,7 @@ Sequence<sal_uInt16>& FmXGridPeer::getSupportedGridSlots()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs()
 {
     static Sequence< ::com::sun::star::util::URL> aSupported;
@@ -2787,7 +2787,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs()
     return aSupported;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::UpdateDispatches()
 {
     if (!m_pStateCache)
@@ -2824,7 +2824,7 @@ void FmXGridPeer::UpdateDispatches()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::ConnectToDispatcher()
 {
     DBG_ASSERT((m_pStateCache != NULL) == (m_pDispatchers != NULL), "FmXGridPeer::ConnectToDispatcher : inconsistent !");
@@ -2862,7 +2862,7 @@ void FmXGridPeer::ConnectToDispatcher()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridPeer::DisConnectFromDispatcher()
 {
     if (!m_pStateCache || !m_pDispatchers)
@@ -2883,7 +2883,7 @@ void FmXGridPeer::DisConnectFromDispatcher()
     m_pDispatchers = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot)
 {
     if (!m_pStateCache)
@@ -2908,7 +2908,7 @@ IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, void*, pSlot)
     return  -1;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, void*, pSlot)
 {
     if (!m_pDispatchers)
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index b27532adfcab..ad402ddc863d 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -132,10 +132,10 @@ namespace
 //==================================================================
 //= DbGridColumn
 //==================================================================
-//------------------------------------------------------------------------------
+
 CellControllerRef DbGridColumn::s_xEmptyController;
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::sun::star::beans::XPropertySet >& xField, sal_Int32 nTypeId)
 {
     Clear();
@@ -236,7 +236,7 @@ void DbGridColumn::CreateControl(sal_Int32 _nFieldPos, const Reference< ::com::s
         m_xController = pCellControl->CreateController();
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::impl_toggleScriptManager_nothrow( bool _bAttach )
 {
     try
@@ -259,7 +259,7 @@ void DbGridColumn::impl_toggleScriptManager_nothrow( bool _bAttach )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter)
 {
     if (m_pCell && m_pCell->ISA(FmXFilterCell))
@@ -270,7 +270,7 @@ void DbGridColumn::UpdateFromField(const DbGridRow* pRow, const Reference< XNumb
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbGridColumn::Commit()
 {
     sal_Bool bResult = sal_True;
@@ -292,13 +292,13 @@ sal_Bool DbGridColumn::Commit()
     return bResult;
 }
 
-//------------------------------------------------------------------------------
+
 DbGridColumn::~DbGridColumn()
 {
     Clear();
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::setModel(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  _xModel)
 {
     if ( m_pCell )
@@ -310,7 +310,7 @@ void DbGridColumn::setModel(::com::sun::star::uno::Reference< ::com::sun::star::
         impl_toggleScriptManager_nothrow( true );
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::Clear()
 {
     if ( m_pCell )
@@ -332,7 +332,7 @@ void DbGridColumn::Clear()
     m_nFieldType = DataType::OTHER;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 DbGridColumn::SetAlignment(sal_Int16 _nAlign)
 {
     if (_nAlign == -1)
@@ -377,7 +377,7 @@ sal_Int16 DbGridColumn::SetAlignment(sal_Int16 _nAlign)
     return m_nAlign;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 DbGridColumn::SetAlignmentFromModel(sal_Int16 nStandardAlign)
 {
     Any aAlign( m_xModel->getPropertyValue(FM_PROP_ALIGN));
@@ -390,7 +390,7 @@ sal_Int16 DbGridColumn::SetAlignmentFromModel(sal_Int16 nStandardAlign)
     return SetAlignment(nStandardAlign);
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::setLock(sal_Bool _bLock)
 {
     if (m_bLocked == _bLock)
@@ -408,7 +408,7 @@ void DbGridColumn::setLock(sal_Bool _bLock)
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumberFormatter >& xFormatter) const
 {
     OUString aText;
@@ -424,7 +424,7 @@ OUString DbGridColumn::GetCellText(const DbGridRow* pRow, const Reference< XNumb
     return aText;
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColumn >& xField, const Reference< XNumberFormatter >& xFormatter) const
 {
     OUString aText;
@@ -439,7 +439,7 @@ OUString DbGridColumn::GetCellText(const Reference< ::com::sun::star::sdb::XColu
     return aText;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::sdb::XColumn >  DbGridColumn::GetCurrentFieldValue() const
 {
     Reference< ::com::sun::star::sdb::XColumn >  xField;
@@ -451,7 +451,7 @@ Reference< ::com::sun::star::sdb::XColumn >  DbGridColumn::GetCurrentFieldValue(
     return xField;
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::Paint(OutputDevice& rDev,
                          const Rectangle& rRect,
                          const DbGridRow* pRow,
@@ -518,7 +518,7 @@ void DbGridColumn::Paint(OutputDevice& rDev,
         static_cast< FmXFilterCell* >( m_pCell )->PaintCell( rDev, rRect );
 }
 
-//------------------------------------------------------------------------------
+
 void DbGridColumn::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat )
 {
     if ( m_pCell )
@@ -543,7 +543,7 @@ TYPEINIT1( DbCurrencyField, DbSpinField )
 TYPEINIT1( DbNumericField, DbSpinField )
 TYPEINIT1( DbFilterField, DbCellControl )
 
-//------------------------------------------------------------------------------
+
 DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
     :OPropertyChangeListener(m_aMutex)
     ,m_pModelChangeBroadcaster(NULL)
@@ -596,7 +596,7 @@ DbCellControl::DbCellControl( DbGridColumn& _rColumn, sal_Bool /*_bText*/ )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_Bool _bWarnIfNotExistent)
 {
     try
@@ -620,12 +620,12 @@ void DbCellControl::implDoPropertyListening(const OUString& _rPropertyName, sal_
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::doPropertyListening(const OUString& _rPropertyName)
 {
     implDoPropertyListening( _rPropertyName );
 }
-//------------------------------------------------------------------------------
+
 static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBroadcaster)
 {
     if ( _pBroadcaster )
@@ -636,7 +636,7 @@ static void lcl_clearBroadCaster(::comphelper::OPropertyChangeMultiplexer*& _pBr
         // no delete, this is done implicitly
     }
 }
-//------------------------------------------------------------------------------
+
 DbCellControl::~DbCellControl()
 {
     lcl_clearBroadCaster(m_pModelChangeBroadcaster);
@@ -646,7 +646,7 @@ DbCellControl::~DbCellControl()
     delete m_pPainter;
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::implValuePropertyChanged( )
 {
     OSL_ENSURE( !isValuePropertyLocked(),
@@ -659,13 +659,13 @@ void DbCellControl::implValuePropertyChanged( )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::implAdjustGenericFieldSetting( const Reference< XPropertySet >& /*_rxModel*/ )
 {
     // nothing to to here
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -702,7 +702,7 @@ void DbCellControl::_propertyChanged(const PropertyChangeEvent& _rEvent) throw(R
         implAdjustGenericFieldSetting( xSourceProps );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbCellControl::Commit()
 {
     // lock the listening for value property changes
@@ -723,7 +723,7 @@ sal_Bool DbCellControl::Commit()
     return bReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eInitWhat )
 {
     Window* pWindows[] = { m_pPainter, m_pWindow };
@@ -829,7 +829,7 @@ void DbCellControl::ImplInitWindow( Window& rParent, const InitWindowFacet _eIni
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxModel,bool i_bReadOnly )
 {
     DBG_ASSERT( m_pWindow, "DbCellControl::implAdjustReadOnly: not to be called without window!" );
@@ -849,7 +849,7 @@ void DbCellControl::implAdjustReadOnly( const Reference< XPropertySet >& _rxMode
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbCellControl::implAdjustEnabled: not to be called without window!" );
@@ -862,7 +862,7 @@ void DbCellControl::implAdjustEnabled( const Reference< XPropertySet >& _rxModel
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor )
 {
     ImplInitWindow( rParent, InitAll );
@@ -919,7 +919,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
     m_xCursor = _rxCursor;
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::SetTextLineColor()
 {
     if (m_pWindow)
@@ -928,7 +928,7 @@ void DbCellControl::SetTextLineColor()
         m_pPainter->SetTextLineColor();
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::SetTextLineColor(const Color& _rColor)
 {
     if (m_pWindow)
@@ -947,7 +947,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::AlignControl(sal_Int16 nAlignment)
 {
     WinBits nAlignmentBit = 0;
@@ -968,7 +968,7 @@ void DbCellControl::AlignControl(sal_Int16 nAlignment)
         lcl_implAlign( m_pPainter, nAlignmentBit );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
 {
     if ( m_pPainter->GetParent() == &_rDev )
@@ -995,14 +995,14 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
         m_pPainter->Draw( &_rDev, _rRect.TopLeft(), _rRect.GetSize(), 0 );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
 {
     m_pPainter->SetText( GetFormatText( _rxField, _rxFormatter ) );
     PaintCell( _rDev, _rRect );
 }
 
-//------------------------------------------------------------------------------
+
 double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const
 {
     double fValue = 0;
@@ -1035,7 +1035,7 @@ double DbCellControl::GetValue(const Reference< ::com::sun::star::sdb::XColumn >
     return fValue;
 }
 
-//------------------------------------------------------------------------------
+
 void DbCellControl::invalidatedController()
 {
     m_rColumn.GetParent().refreshController(m_rColumn.GetId(), DbGridControl::GrantControlAccess());
@@ -1048,14 +1048,14 @@ void DbCellControl::invalidatedController()
 //==============================================================================
 //= DbLimitedLengthField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbLimitedLengthField::DbLimitedLengthField( DbGridColumn& _rColumn )
     :DbCellControl( _rColumn )
 {
     doPropertyListening( FM_PROP_MAXTEXTLEN );
 }
 
-//------------------------------------------------------------------------------
+
 void DbLimitedLengthField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbLimitedLengthField::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -1068,7 +1068,7 @@ void DbLimitedLengthField::implAdjustGenericFieldSetting( const Reference< XProp
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
 {
     dynamic_cast< Edit* >( m_pWindow )->SetMaxTextLen( _nMaxLen );
@@ -1079,7 +1079,7 @@ void DbLimitedLengthField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
 //==============================================================================
 //= DbTextField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbTextField::DbTextField(DbGridColumn& _rColumn)
             :DbLimitedLengthField(_rColumn)
             ,m_pEdit( NULL )
@@ -1089,14 +1089,14 @@ DbTextField::DbTextField(DbGridColumn& _rColumn)
 {
 }
 
-//------------------------------------------------------------------------------
+
 DbTextField::~DbTextField( )
 {
     DELETEZ( m_pPainterImplementation );
     DELETEZ( m_pEdit );
 }
 
-//------------------------------------------------------------------------------
+
 void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
 {
     sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1);
@@ -1167,13 +1167,13 @@ void DbTextField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
     DbLimitedLengthField::Init( rParent, xCursor );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbTextField::CreateController() const
 {
     return new EditCellController( m_pEdit );
 }
 
-//------------------------------------------------------------------------------
+
 void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect, const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
 {
     if ( m_pPainterImplementation )
@@ -1182,7 +1182,7 @@ void DbTextField::PaintFieldToCell( OutputDevice& _rDev, const Rectangle& _rRect
     DbLimitedLengthField::PaintFieldToCell( _rDev, _rRect, _rxField, _rxFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/)
 {
     OUString aString;
@@ -1199,14 +1199,14 @@ OUString DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const
     return aString;
 }
 
-//------------------------------------------------------------------------------
+
 void DbTextField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter)
 {
     m_pEdit->SetText( GetFormatText( _rxField, xFormatter ) );
     m_pEdit->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) );
 }
 
-//------------------------------------------------------------------------------
+
 void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbTextField::updateFromModel: invalid call!" );
@@ -1226,7 +1226,7 @@ void DbTextField::updateFromModel( Reference< XPropertySet > _rxModel )
     m_pEdit->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbTextField::commitControl()
 {
     OUString aText( m_pEdit->GetText( getModelLineEndSetting( m_rColumn.getModel() ) ) );
@@ -1244,7 +1244,7 @@ sal_Bool DbTextField::commitControl()
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
 {
     if ( m_pEdit )
@@ -1257,7 +1257,7 @@ void DbTextField::implSetEffectiveMaxTextLen( sal_Int32 _nMaxLen )
 //= DbFormattedField
 //==============================================================================
 DBG_NAME(DbFormattedField);
-//------------------------------------------------------------------------------
+
 DbFormattedField::DbFormattedField(DbGridColumn& _rColumn)
     :DbLimitedLengthField(_rColumn)
     ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED)
@@ -1268,13 +1268,13 @@ DbFormattedField::DbFormattedField(DbGridColumn& _rColumn)
     doPropertyListening( FM_PROP_FORMATKEY );
 }
 
-//------------------------------------------------------------------------------
+
 DbFormattedField::~DbFormattedField()
 {
     DBG_DTOR(DbFormattedField,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
 {
     sal_Int16 nAlignment = m_rColumn.SetAlignmentFromModel(-1);
@@ -1484,13 +1484,13 @@ void DbFormattedField::Init( Window& rParent, const Reference< XRowSet >& xCurso
     DbLimitedLengthField::Init( rParent, xCursor );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbFormattedField::CreateController() const
 {
     return new ::svt::FormattedFieldCellController( static_cast< FormattedField* >( m_pWindow ) );
 }
 
-//------------------------------------------------------------------------------
+
 void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
     if (_rEvent.PropertyName == FM_PROP_FORMATKEY )
@@ -1510,7 +1510,7 @@ void DbFormattedField::_propertyChanged( const PropertyChangeEvent& _rEvent ) th
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** ppColor)
 {
     // defaultmaessig keine Farb-Angabe
@@ -1558,7 +1558,7 @@ OUString DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb:
     return aText;
 }
 
-//------------------------------------------------------------------------------
+
 void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/)
 {
     try
@@ -1597,7 +1597,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFormattedField::updateFromModel: invalid call!" );
@@ -1619,7 +1619,7 @@ void DbFormattedField::updateFromModel( Reference< XPropertySet > _rxModel )
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbFormattedField::commitControl()
 {
     Any aNewVal;
@@ -1641,7 +1641,7 @@ sal_Bool DbFormattedField::commitControl()
 //==============================================================================
 //= DbCheckBox
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbCheckBox::DbCheckBox( DbGridColumn& _rColumn )
     :DbCellControl( _rColumn, sal_True )
 {
@@ -1663,7 +1663,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
 {
     setTransparent( sal_True );
@@ -1699,12 +1699,12 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
     DbCellControl::Init( rParent, xCursor );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbCheckBox::CreateController() const
 {
     return new CheckBoxCellController((CheckBoxControl*)m_pWindow);
 }
-//------------------------------------------------------------------------------
+
 static void lcl_setCheckBoxState(   const Reference< ::com::sun::star::sdb::XColumn >& _rxField,
                         CheckBoxControl* _pCheckBoxControl )
 {
@@ -1725,13 +1725,13 @@ static void lcl_setCheckBoxState(   const Reference< ::com::sun::star::sdb::XCol
     _pCheckBoxControl->GetBox().SetState(eState);
 }
 
-//------------------------------------------------------------------------------
+
 void DbCheckBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/)
 {
     lcl_setCheckBoxState( _rxField, static_cast<CheckBoxControl*>(m_pWindow) );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
                           const Reference< ::com::sun::star::sdb::XColumn >& _rxField,
                           const Reference< XNumberFormatter >& xFormatter)
@@ -1740,7 +1740,7 @@ void DbCheckBox::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
     DbCellControl::PaintFieldToCell( rDev, rRect, _rxField, xFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCheckBox::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCheckBox::updateFromModel: invalid call!" );
@@ -1750,7 +1750,7 @@ void DbCheckBox::updateFromModel( Reference< XPropertySet > _rxModel )
     static_cast< CheckBoxControl* >( m_pWindow )->GetBox().SetState( static_cast< TriState >( nState ) );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbCheckBox::commitControl()
 {
     m_rColumn.getModel()->setPropertyValue( FM_PROP_STATE,
@@ -1758,7 +1758,7 @@ sal_Bool DbCheckBox::commitControl()
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
     return OUString();
@@ -1766,7 +1766,7 @@ OUString DbCheckBox::GetFormatText(const Reference< XColumn >& /*_rxField*/, con
 
 //==============================================================================
 //= DbPatternField
-//------------------------------------------------------------------------------
+
 DbPatternField::DbPatternField( DbGridColumn& _rColumn, const Reference<XComponentContext>& _rContext )
     :DbCellControl( _rColumn )
     ,m_xContext( _rContext )
@@ -1776,7 +1776,7 @@ DbPatternField::DbPatternField( DbGridColumn& _rColumn, const Reference<XCompone
     doPropertyListening( FM_PROP_STRICTFORMAT );
 }
 
-//------------------------------------------------------------------------------
+
 void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbPatternField::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -1800,7 +1800,7 @@ void DbPatternField::implAdjustGenericFieldSetting( const Reference< XPropertySe
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbPatternField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
 {
     m_rColumn.SetAlignmentFromModel(-1);
@@ -1814,13 +1814,13 @@ void DbPatternField::Init( Window& rParent, const Reference< XRowSet >& xCursor)
     DbCellControl::Init( rParent, xCursor );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbPatternField::CreateController() const
 {
     return new SpinCellController( static_cast< PatternField* >( m_pWindow ) );
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbPatternField::impl_formatText( const OUString& _rText )
 {
     m_pPainter->SetText( _rText );
@@ -1828,7 +1828,7 @@ OUString DbPatternField::impl_formatText( const OUString& _rText )
     return m_pPainter->GetText();
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
     bool bIsForPaint = _rxField != m_rColumn.GetField();
@@ -1854,14 +1854,14 @@ OUString DbPatternField::GetFormatText(const Reference< ::com::sun::star::sdb::X
     return impl_formatText( sText );
 }
 
-//------------------------------------------------------------------------------
+
 void DbPatternField::UpdateFromField( const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
 {
     static_cast< Edit* >( m_pWindow )->SetText( GetFormatText( _rxField, _rxFormatter ) );
     static_cast< Edit* >( m_pWindow )->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) );
 }
 
-//------------------------------------------------------------------------------
+
 void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbPatternField::updateFromModel: invalid call!" );
@@ -1873,7 +1873,7 @@ void DbPatternField::updateFromModel( Reference< XPropertySet > _rxModel )
     static_cast< Edit* >( m_pWindow )->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbPatternField::commitControl()
 {
     OUString aText(m_pWindow->GetText());
@@ -1884,14 +1884,14 @@ sal_Bool DbPatternField::commitControl()
 //==============================================================================
 //= DbSpinField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbSpinField::DbSpinField( DbGridColumn& _rColumn, sal_Int16 _nStandardAlign )
     :DbCellControl( _rColumn )
     ,m_nStandardAlign( _nStandardAlign )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void DbSpinField::Init( Window& _rParent, const Reference< XRowSet >& _rxCursor )
 {
     m_rColumn.SetAlignmentFromModel( m_nStandardAlign );
@@ -1913,7 +1913,7 @@ void DbSpinField::Init( Window& _rParent, const Reference< XRowSet >& _rxCursor
     DbCellControl::Init( _rParent, _rxCursor );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbSpinField::CreateController() const
 {
     return new SpinCellController( static_cast< SpinField* >( m_pWindow ) );
@@ -1922,7 +1922,7 @@ CellControllerRef DbSpinField::CreateController() const
 //==============================================================================
 //= DbNumericField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbNumericField::DbNumericField( DbGridColumn& _rColumn )
     :DbSpinField( _rColumn )
 {
@@ -1934,7 +1934,7 @@ DbNumericField::DbNumericField( DbGridColumn& _rColumn )
     doPropertyListening( FM_PROP_SHOWTHOUSANDSEP );
 }
 
-//------------------------------------------------------------------------------
+
 void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbNumericField::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -1989,7 +1989,7 @@ void DbNumericField::implAdjustGenericFieldSetting( const Reference< XPropertySe
     }
 }
 
-//------------------------------------------------------------------------------
+
 SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/  )
 {
     return new DoubleNumericField( _pParent, _nFieldStyle );
@@ -1997,7 +1997,7 @@ SpinField* DbNumericField::createField( Window* _pParent, WinBits _nFieldStyle,
 
 namespace
 {
-    //--------------------------------------------------------------------------
+
     static OUString lcl_setFormattedNumeric_nothrow( DoubleNumericField& _rField, const DbCellControl& _rControl,
         const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
     {
@@ -2022,19 +2022,19 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbNumericField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/)
 {
     return lcl_setFormattedNumeric_nothrow( *dynamic_cast< DoubleNumericField* >( m_pPainter ), *this, _rxField, _rxFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 void DbNumericField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter)
 {
     lcl_setFormattedNumeric_nothrow( *dynamic_cast< DoubleNumericField* >( m_pWindow ), *this, _rxField, _rxFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 void DbNumericField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbNumericField::updateFromModel: invalid call!" );
@@ -2046,7 +2046,7 @@ void DbNumericField::updateFromModel( Reference< XPropertySet > _rxModel )
         m_pWindow->SetText( OUString() );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbNumericField::commitControl()
 {
     OUString aText( m_pWindow->GetText());
@@ -2064,7 +2064,7 @@ sal_Bool DbNumericField::commitControl()
 //==============================================================================
 //= DbCurrencyField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn)
     :DbSpinField( _rColumn )
     ,m_nScale( 0 )
@@ -2078,7 +2078,7 @@ DbCurrencyField::DbCurrencyField(DbGridColumn& _rColumn)
     doPropertyListening( FM_PROP_CURRENCYSYMBOL );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbCurrencyField::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -2114,13 +2114,13 @@ void DbCurrencyField::implAdjustGenericFieldSetting( const Reference< XPropertyS
     }
 }
 
-//------------------------------------------------------------------------------
+
 SpinField* DbCurrencyField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/  )
 {
     return new LongCurrencyField( _pParent, _nFieldStyle );
 }
 
-//------------------------------------------------------------------------------
+
 double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter) const
 {
     double fValue = GetValue(_rxField, xFormatter);
@@ -2135,7 +2135,7 @@ double DbCurrencyField::GetCurrency(const Reference< ::com::sun::star::sdb::XCol
 
 namespace
 {
-    //--------------------------------------------------------------------------
+
     static OUString lcl_setFormattedCurrency_nothrow( LongCurrencyField& _rField, const DbCurrencyField& _rControl,
         const Reference< XColumn >& _rxField, const Reference< XNumberFormatter >& _rxFormatter )
     {
@@ -2160,19 +2160,19 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbCurrencyField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, Color** /*ppColor*/)
 {
     return lcl_setFormattedCurrency_nothrow( dynamic_cast< LongCurrencyField& >( *m_pPainter ), *this, _rxField, _rxFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCurrencyField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter)
 {
     lcl_setFormattedCurrency_nothrow( dynamic_cast< LongCurrencyField& >( *m_pWindow ), *this, _rxField, _rxFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbCurrencyField::updateFromModel: invalid call!" );
@@ -2192,7 +2192,7 @@ void DbCurrencyField::updateFromModel( Reference< XPropertySet > _rxModel )
         m_pWindow->SetText( OUString() );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbCurrencyField::commitControl()
 {
     OUString aText(m_pWindow->GetText());
@@ -2213,7 +2213,7 @@ sal_Bool DbCurrencyField::commitControl()
 //==============================================================================
 //= DbDateField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbDateField::DbDateField( DbGridColumn& _rColumn )
     :DbSpinField( _rColumn )
 {
@@ -2224,7 +2224,7 @@ DbDateField::DbDateField( DbGridColumn& _rColumn )
     doPropertyListening( FM_PROP_DATE_SHOW_CENTURY );
 }
 
-//------------------------------------------------------------------------------
+
 SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& _rxModel  )
 {
     // check if there is a DropDown property set to TRUE
@@ -2241,7 +2241,7 @@ SpinField* DbDateField::createField( Window* _pParent, WinBits _nFieldStyle, con
     return pField;
 }
 
-//------------------------------------------------------------------------------
+
 void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbDateField::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -2280,7 +2280,7 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
 
 namespace
 {
-    //--------------------------------------------------------------------------
+
     static OUString lcl_setFormattedDate_nothrow( DateField& _rField, const Reference< XColumn >& _rxField )
     {
         OUString sDate;
@@ -2305,19 +2305,19 @@ namespace
         return sDate;
     }
 }
-//------------------------------------------------------------------------------
+
 OUString DbDateField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
      return lcl_setFormattedDate_nothrow( *dynamic_cast< DateField* >( m_pPainter ), _rxField );
 }
 
-//------------------------------------------------------------------------------
+
 void DbDateField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/)
 {
     lcl_setFormattedDate_nothrow( *dynamic_cast< DateField* >( m_pWindow ), _rxField );
 }
 
-//------------------------------------------------------------------------------
+
 void DbDateField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbDateField::updateFromModel: invalid call!" );
@@ -2329,7 +2329,7 @@ void DbDateField::updateFromModel( Reference< XPropertySet > _rxModel )
         static_cast< DateField* >( m_pWindow )->SetText( OUString() );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbDateField::commitControl()
 {
     OUString aText(m_pWindow->GetText());
@@ -2346,7 +2346,7 @@ sal_Bool DbDateField::commitControl()
 //==============================================================================
 //= DbTimeField
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbTimeField::DbTimeField( DbGridColumn& _rColumn )
     :DbSpinField( _rColumn, ::com::sun::star::awt::TextAlign::LEFT )
 {
@@ -2356,13 +2356,13 @@ DbTimeField::DbTimeField( DbGridColumn& _rColumn )
     doPropertyListening( FM_PROP_STRICTFORMAT );
 }
 
-//------------------------------------------------------------------------------
+
 SpinField* DbTimeField::createField( Window* _pParent, WinBits _nFieldStyle, const Reference< XPropertySet >& /*_rxModel*/ )
 {
     return new TimeField( _pParent, _nFieldStyle );
 }
 
-//------------------------------------------------------------------------------
+
 void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbTimeField::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -2392,7 +2392,7 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
 
 namespace
 {
-    //--------------------------------------------------------------------------
+
     static OUString lcl_setFormattedTime_nothrow( TimeField& _rField, const Reference< XColumn >& _rxField )
     {
         OUString sTime;
@@ -2417,19 +2417,19 @@ namespace
         return sTime;
     }
 }
-//------------------------------------------------------------------------------
+
 OUString DbTimeField::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< ::com::sun::star::util::XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
     return lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pPainter ), _rxField );
 }
 
-//------------------------------------------------------------------------------
+
 void DbTimeField::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/)
 {
     lcl_setFormattedTime_nothrow( *static_cast< TimeField* >( m_pWindow ), _rxField );
 }
 
-//------------------------------------------------------------------------------
+
 void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbTimeField::updateFromModel: invalid call!" );
@@ -2441,7 +2441,7 @@ void DbTimeField::updateFromModel( Reference< XPropertySet > _rxModel )
         static_cast< TimeField* >( m_pWindow )->SetText( OUString() );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbTimeField::commitControl()
 {
     OUString aText(m_pWindow->GetText());
@@ -2458,7 +2458,7 @@ sal_Bool DbTimeField::commitControl()
 //==============================================================================
 //= DbComboBox
 //==============================================================================
-//------------------------------------------------------------------------------
+
 DbComboBox::DbComboBox(DbGridColumn& _rColumn)
            :DbCellControl(_rColumn)
            ,m_nKeyType(::com::sun::star::util::NumberFormat::UNDEFINED)
@@ -2469,7 +2469,7 @@ DbComboBox::DbComboBox(DbGridColumn& _rColumn)
     doPropertyListening( FM_PROP_LINECOUNT );
 }
 
-//------------------------------------------------------------------------------
+
 void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
     if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) )
@@ -2482,7 +2482,7 @@ void DbComboBox::_propertyChanged( const PropertyChangeEvent& _rEvent ) throw( R
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbComboBox::SetList(const Any& rItems)
 {
     ComboBoxControl* pField = (ComboBoxControl*)m_pWindow;
@@ -2501,7 +2501,7 @@ void DbComboBox::SetList(const Any& rItems)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbComboBox::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -2513,7 +2513,7 @@ void DbComboBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >&
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
 {
     m_rColumn.SetAlignmentFromModel(::com::sun::star::awt::TextAlign::LEFT);
@@ -2539,13 +2539,13 @@ void DbComboBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
     DbCellControl::Init( rParent, xCursor );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbComboBox::CreateController() const
 {
     return new ComboBoxCellController((ComboBoxControl*)m_pWindow);
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter, Color** /*ppColor*/)
 {
     OUString aString;
@@ -2561,13 +2561,13 @@ OUString DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColu
     return aString;
 }
 
-//------------------------------------------------------------------------------
+
 void DbComboBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter)
 {
     m_pWindow->SetText(GetFormatText(_rxField, xFormatter));
 }
 
-//------------------------------------------------------------------------------
+
 void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbComboBox::updateFromModel: invalid call!" );
@@ -2579,7 +2579,7 @@ void DbComboBox::updateFromModel( Reference< XPropertySet > _rxModel )
     static_cast< ComboBox* >( m_pWindow )->SetSelection( Selection( SELECTION_MAX, SELECTION_MIN ) );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbComboBox::commitControl()
 {
     OUString aText( m_pWindow->GetText());
@@ -2587,7 +2587,7 @@ sal_Bool DbComboBox::commitControl()
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 DbListBox::DbListBox(DbGridColumn& _rColumn)
           :DbCellControl(_rColumn)
           ,m_bBound(sal_False)
@@ -2598,7 +2598,7 @@ DbListBox::DbListBox(DbGridColumn& _rColumn)
     doPropertyListening( FM_PROP_LINECOUNT );
 }
 
-//------------------------------------------------------------------------------
+
 void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw( RuntimeException )
 {
     if ( _rEvent.PropertyName.equals( FM_PROP_STRINGITEMLIST ) )
@@ -2611,7 +2611,7 @@ void DbListBox::_propertyChanged( const ::com::sun::star::beans::PropertyChangeE
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbListBox::SetList(const Any& rItems)
 {
     ListBoxControl* pField = (ListBoxControl*)m_pWindow;
@@ -2638,7 +2638,7 @@ void DbListBox::SetList(const Any& rItems)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbListBox::Init( Window& rParent, const Reference< XRowSet >& xCursor)
 {
     m_rColumn.SetAlignment(::com::sun::star::awt::TextAlign::LEFT);
@@ -2653,7 +2653,7 @@ void DbListBox::Init( Window& rParent, const Reference< XRowSet >& xCursor)
     DbCellControl::Init( rParent, xCursor );
 }
 
-//------------------------------------------------------------------------------
+
 void DbListBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& _rxModel )
 {
     DBG_ASSERT( m_pWindow, "DbListBox::implAdjustGenericFieldSetting: not to be called without window!" );
@@ -2665,13 +2665,13 @@ void DbListBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >&
     }
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbListBox::CreateController() const
 {
     return new ListBoxCellController((ListBoxControl*)m_pWindow);
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
     OUString sText;
@@ -2697,7 +2697,7 @@ OUString DbListBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColum
     return sText;
 }
 
-//------------------------------------------------------------------------------
+
 void DbListBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn >& _rxField, const Reference< XNumberFormatter >& xFormatter)
 {
     OUString sFormattedText( GetFormatText( _rxField, xFormatter ) );
@@ -2707,7 +2707,7 @@ void DbListBox::UpdateFromField(const Reference< ::com::sun::star::sdb::XColumn
         static_cast< ListBox* >( m_pWindow )->SetNoSelection();
 }
 
-//------------------------------------------------------------------------------
+
 void DbListBox::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbListBox::updateFromModel: invalid call!" );
@@ -2727,7 +2727,7 @@ void DbListBox::updateFromModel( Reference< XPropertySet > _rxModel )
         pListBox->SetNoSelection( );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbListBox::commitControl()
 {
     Any aVal;
@@ -2758,7 +2758,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG
     setAlignedController( sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 DbFilterField::~DbFilterField()
 {
     if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX)
@@ -2767,7 +2767,7 @@ DbFilterField::~DbFilterField()
     DBG_DTOR(DbFilterField,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect)
 {
     static sal_uInt16 nStyle = TEXT_DRAW_CLIP | TEXT_DRAW_VCENTER | TEXT_DRAW_LEFT;
@@ -2784,7 +2784,7 @@ void DbFilterField::PaintCell(OutputDevice& rDev, const Rectangle& rRect)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::SetList(const Any& rItems, sal_Bool bComboBox)
 {
     ::comphelper::StringSequence aTest;
@@ -2811,7 +2811,7 @@ void DbFilterField::SetList(const Any& rItems, sal_Bool bComboBox)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::star::beans::XPropertySet >& xModel)
 {
     switch (m_nControlClass)
@@ -2868,7 +2868,7 @@ void DbFilterField::CreateControl(Window* pParent, const Reference< ::com::sun::
     }
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor )
 {
     Reference< ::com::sun::star::beans::XPropertySet >  xModel(m_rColumn.getModel());
@@ -2907,7 +2907,7 @@ void DbFilterField::Init( Window& rParent, const Reference< XRowSet >& xCursor )
         pAsEdit->SetReadOnly( sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 CellControllerRef DbFilterField::CreateController() const
 {
     CellControllerRef xController;
@@ -2931,7 +2931,7 @@ CellControllerRef DbFilterField::CreateController() const
     return xController;
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel )
 {
     OSL_ENSURE( _rxModel.is() && m_pWindow, "DbFilterField::updateFromModel: invalid call!" );
@@ -2942,7 +2942,7 @@ void DbFilterField::updateFromModel( Reference< XPropertySet > _rxModel )
     // remember: updateFromModel should be some kind of opposite of commitControl
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool DbFilterField::commitControl()
 {
     OUString aText(m_aText);
@@ -3019,7 +3019,7 @@ sal_Bool DbFilterField::commitControl()
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::SetText(const OUString& rText)
 {
     m_aText = rText;
@@ -3054,7 +3054,7 @@ void DbFilterField::SetText(const OUString& rText)
     m_rColumn.GetParent().RowModified(0,m_rColumn.GetId());
 }
 
-//------------------------------------------------------------------------------
+
 void DbFilterField::Update()
 {
     // should we fill the combobox with a filter proposal?
@@ -3172,19 +3172,19 @@ void DbFilterField::Update()
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString DbFilterField::GetFormatText(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/, Color** /*ppColor*/)
 {
     return OUString();
 }
 
-//------------------------------------------------------------------
+
 void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, const Reference< XNumberFormatter >& /*xFormatter*/)
 {
     OSL_FAIL( "DbFilterField::UpdateFromField: cannot update a filter control from a field!" );
 }
 
-//------------------------------------------------------------------
+
 IMPL_LINK_NOARG(DbFilterField, OnClick)
 {
     TriState eState = ((CheckBoxControl*)m_pWindow)->GetBox().GetState();
@@ -3215,7 +3215,7 @@ TYPEINIT0(FmXGridCell);
 
 
 DBG_NAME(FmXGridCell);
-//-----------------------------------------------------------------------------
+
 FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl )
             :OComponentHelper(m_aMutex)
             ,m_pColumn(pColumn)
@@ -3229,7 +3229,7 @@ FmXGridCell::FmXGridCell( DbGridColumn* pColumn, DbCellControl* _pControl )
     DBG_CTOR(FmXGridCell,NULL);
 }
 
-//-----------------------------------------------------------------------------
+
 void FmXGridCell::init()
 {
     Window* pEventWindow( getEventWindow() );
@@ -3237,7 +3237,7 @@ void FmXGridCell::init()
         pEventWindow->AddEventListener( LINK( this, FmXGridCell, OnWindowEvent ) );
 }
 
-//-----------------------------------------------------------------------------
+
 Window* FmXGridCell::getEventWindow() const
 {
     if ( m_pCellControl )
@@ -3245,7 +3245,7 @@ Window* FmXGridCell::getEventWindow() const
     return NULL;
 }
 
-//-----------------------------------------------------------------------------
+
 FmXGridCell::~FmXGridCell()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -3257,14 +3257,14 @@ FmXGridCell::~FmXGridCell()
     DBG_DTOR(FmXGridCell,NULL);
 }
 
-//------------------------------------------------------------------
+
 void FmXGridCell::SetTextLineColor()
 {
     if (m_pCellControl)
         m_pCellControl->SetTextLineColor();
 }
 
-//------------------------------------------------------------------
+
 void FmXGridCell::SetTextLineColor(const Color& _rColor)
 {
     if (m_pCellControl)
@@ -3272,7 +3272,7 @@ void FmXGridCell::SetTextLineColor(const Color& _rColor)
 }
 
 // XTypeProvider
-//------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) throw (RuntimeException)
 {
     Sequence< uno::Type > aTypes = ::comphelper::concatSequences(
@@ -3287,11 +3287,11 @@ Sequence< Type > SAL_CALL FmXGridCell::getTypes( ) throw (RuntimeException)
     return aTypes;
 }
 
-//------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXGridCell )
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void FmXGridCell::disposing()
 {
     lang::EventObject aEvent( *this );
@@ -3306,7 +3306,7 @@ void FmXGridCell::disposing()
     DELETEZ(m_pCellControl);
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXGridCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = OComponentHelper::queryAggregation( _rType );
@@ -3321,26 +3321,26 @@ Any SAL_CALL FmXGridCell::queryAggregation( const ::com::sun::star::uno::Type& _
 }
 
 // ::com::sun::star::awt::XControl
-//-----------------------------------------------------------------------------
+
 Reference< XInterface >  FmXGridCell::getContext() throw( RuntimeException )
 {
     return Reference< XInterface > ();
 }
 
-//-----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::awt::XControlModel >  FmXGridCell::getModel() throw( ::com::sun::star::uno::RuntimeException )
 {
     return Reference< ::com::sun::star::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY);
 }
 
 // ::com::sun::star::form::XBoundControl
-//------------------------------------------------------------------
+
 sal_Bool FmXGridCell::getLock() throw( RuntimeException )
 {
     return m_pColumn->isLocked();
 }
 
-//------------------------------------------------------------------
+
 void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException )
 {
     if (getLock() == _bLock)
@@ -3352,7 +3352,7 @@ void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException )
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_Int32 _Width, ::sal_Int32 _Height, ::sal_Int16 _Flags ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::setPosSize: not implemented" );
@@ -3364,14 +3364,14 @@ void SAL_CALL FmXGridCell::setPosSize( ::sal_Int32 _XX, ::sal_Int32 _Y, ::sal_In
     // not allowed to tamper with this for a grid cell
 }
 
-//------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL FmXGridCell::getPosSize(  ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::getPosSize: not implemented" );
     return awt::Rectangle();
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::setVisible: not implemented" );
@@ -3379,7 +3379,7 @@ void SAL_CALL FmXGridCell::setVisible( ::sal_Bool _Visible ) throw (RuntimeExcep
     // not allowed to tamper with this for a grid cell
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::setEnable: not implemented" );
@@ -3387,88 +3387,88 @@ void SAL_CALL FmXGridCell::setEnable( ::sal_Bool _Enable ) throw (RuntimeExcepti
     // not allowed to tamper with this for a grid cell
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::setFocus(  ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::setFocus: not implemented" );
     // not allowed to tamper with this for a grid cell
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException)
 {
     m_aWindowListeners.addInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException)
 {
     m_aWindowListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException)
 {
     m_aFocusListeners.addInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException)
 {
     m_aFocusListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException)
 {
     m_aKeyListeners.addInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException)
 {
     m_aKeyListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException)
 {
     m_aMouseListeners.addInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException)
 {
     m_aMouseListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException)
 {
     m_aMouseMotionListeners.addInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException)
 {
     m_aMouseMotionListeners.removeInterface( _rxListener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::addPaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::addPaintListener: not implemented" );
     (void)_rxListener;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintListener >& _rxListener ) throw (RuntimeException)
 {
     OSL_FAIL( "FmXGridCell::removePaintListener: not implemented" );
     (void)_rxListener;
 }
 
-//------------------------------------------------------------------
+
 IMPL_LINK( FmXGridCell, OnWindowEvent, VclWindowEvent*, _pEvent )
 {
     ENSURE_OR_THROW( _pEvent, "illegal event pointer" );
@@ -3477,19 +3477,19 @@ IMPL_LINK( FmXGridCell, OnWindowEvent, VclWindowEvent*, _pEvent )
     return 1L;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridCell::onFocusGained( const awt::FocusEvent& _rEvent )
 {
     m_aFocusListeners.notifyEach( &awt::XFocusListener::focusGained, _rEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
 {
     m_aFocusListeners.notifyEach( &awt::XFocusListener::focusLost, _rEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
@@ -3579,7 +3579,7 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi
 
 /*************************************************************************/
 TYPEINIT1(FmXDataCell, FmXGridCell);
-//------------------------------------------------------------------------------
+
 void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
                         const Reference< ::com::sun::star::sdb::XColumn >& _rxField,
                         const Reference< XNumberFormatter >& xFormatter)
@@ -3587,7 +3587,7 @@ void FmXDataCell::PaintFieldToCell(OutputDevice& rDev, const Rectangle& rRect,
     m_pCellControl->PaintFieldToCell( rDev, rRect, _rxField, xFormatter );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXDataCell::UpdateFromColumn()
 {
     Reference< ::com::sun::star::sdb::XColumn >  xField(m_pColumn->GetCurrentFieldValue());
@@ -3604,7 +3604,7 @@ FmXTextCell::FmXTextCell( DbGridColumn* pColumn, DbCellControl& _rControl )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
                         const Rectangle& rRect,
                         const Reference< ::com::sun::star::sdb::XColumn >& _rxField,
@@ -3649,7 +3649,7 @@ void FmXTextCell::PaintFieldToCell(OutputDevice& rDev,
 /*************************************************************************/
 
 DBG_NAME(FmXEditCell);
-//------------------------------------------------------------------------------
+
 FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
             :FmXTextCell( pColumn, _rControl )
             ,m_aTextListeners(m_aMutex)
@@ -3674,7 +3674,7 @@ FmXEditCell::FmXEditCell( DbGridColumn* pColumn, DbCellControl& _rControl )
     }
 }
 
-//------------------------------------------------------------------
+
 FmXEditCell::~FmXEditCell()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -3688,7 +3688,7 @@ FmXEditCell::~FmXEditCell()
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void FmXEditCell::disposing()
 {
     ::com::sun::star::lang::EventObject aEvt(*this);
@@ -3703,7 +3703,7 @@ void FmXEditCell::disposing()
     FmXDataCell::disposing();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXEditCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = FmXTextCell::queryAggregation( _rType );
@@ -3714,7 +3714,7 @@ Any SAL_CALL FmXEditCell::queryAggregation( const ::com::sun::star::uno::Type& _
     return aReturn;
 }
 
-//-------------------------------------------------------------------------
+
 Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXEditCell::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -3723,23 +3723,23 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXEditCell::getTypes(  ) throw
     );
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXEditCell )
 
 // ::com::sun::star::awt::XTextComponent
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::addTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException )
 {
     m_aTextListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::removeTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException )
 {
     m_aTextListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3754,7 +3754,7 @@ void SAL_CALL FmXEditCell::setText( const OUString& aText ) throw( RuntimeExcept
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rSel, const OUString& aText) throw(RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3766,7 +3766,7 @@ void SAL_CALL FmXEditCell::insertText(const ::com::sun::star::awt::Selection& rS
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3790,7 +3790,7 @@ OUString SAL_CALL FmXEditCell::getText() throw( RuntimeException )
     return aText;
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3804,7 +3804,7 @@ OUString SAL_CALL FmXEditCell::getSelectedText( void ) throw( RuntimeException )
     return aText;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection& aSelection ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3813,7 +3813,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection&
         m_pEditImplementation->SetSelection( Selection( aSelection.Min, aSelection.Max ) );
 }
 
-//------------------------------------------------------------------------------
+
 ::com::sun::star::awt::Selection SAL_CALL FmXEditCell::getSelection( void ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3825,7 +3825,7 @@ void SAL_CALL FmXEditCell::setSelection( const ::com::sun::star::awt::Selection&
     return ::com::sun::star::awt::Selection(aSel.Min(), aSel.Max());
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3833,7 +3833,7 @@ sal_Bool SAL_CALL FmXEditCell::isEditable( void ) throw( RuntimeException )
     return ( m_pEditImplementation && !m_pEditImplementation->IsReadOnly() && m_pEditImplementation->GetControl().IsEnabled() ) ? sal_True : sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3842,7 +3842,7 @@ void SAL_CALL FmXEditCell::setEditable( sal_Bool bEditable ) throw( RuntimeExcep
         m_pEditImplementation->SetReadOnly( !bEditable );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3850,7 +3850,7 @@ sal_Int16 SAL_CALL FmXEditCell::getMaxTextLen() throw( RuntimeException )
     return m_pEditImplementation ? m_pEditImplementation->GetMaxTextLen() : 0;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3859,19 +3859,19 @@ void SAL_CALL FmXEditCell::setMaxTextLen( sal_Int16 nLen ) throw( RuntimeExcepti
         m_pEditImplementation->SetMaxTextLen( nLen );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::addChangeListener( const Reference< form::XChangeListener >& _Listener ) throw (RuntimeException)
 {
     m_aChangeListeners.addInterface( _Listener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXEditCell::removeChangeListener( const Reference< form::XChangeListener >& _Listener ) throw (RuntimeException)
 {
     m_aChangeListeners.removeInterface( _Listener );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXEditCell::onTextChanged()
 {
     ::com::sun::star::awt::TextEvent aEvent;
@@ -3879,14 +3879,14 @@ void FmXEditCell::onTextChanged()
     m_aTextListeners.notifyEach( &awt::XTextListener::textChanged, aEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXEditCell::onFocusGained( const awt::FocusEvent& _rEvent )
 {
     FmXTextCell::onFocusGained( _rEvent );
     m_sValueOnEnter = getText();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
 {
     FmXTextCell::onFocusLost( _rEvent );
@@ -3898,7 +3898,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
@@ -3916,7 +3916,7 @@ void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWi
 
 /*************************************************************************/
 DBG_NAME(FmXCheckBoxCell);
-//------------------------------------------------------------------------------
+
 FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl )
                 :FmXDataCell( pColumn, _rControl )
                 ,m_aItemListeners(m_aMutex)
@@ -3926,7 +3926,7 @@ FmXCheckBoxCell::FmXCheckBoxCell( DbGridColumn* pColumn, DbCellControl& _rContro
     DBG_CTOR(FmXCheckBoxCell,NULL);
 }
 
-//------------------------------------------------------------------
+
 FmXCheckBoxCell::~FmXCheckBoxCell()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -3939,7 +3939,7 @@ FmXCheckBoxCell::~FmXCheckBoxCell()
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void FmXCheckBoxCell::disposing()
 {
     ::com::sun::star::lang::EventObject aEvt(*this);
@@ -3952,7 +3952,7 @@ void FmXCheckBoxCell::disposing()
     FmXDataCell::disposing();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXCheckBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = FmXDataCell::queryAggregation( _rType );
@@ -3963,7 +3963,7 @@ Any SAL_CALL FmXCheckBoxCell::queryAggregation( const ::com::sun::star::uno::Typ
     return aReturn;
 }
 
-//-------------------------------------------------------------------------
+
 Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -3972,22 +3972,22 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXCheckBoxCell::getTypes(  ) t
     );
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXCheckBoxCell )
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::addItemListener( const Reference< ::com::sun::star::awt::XItemListener >& l ) throw( RuntimeException )
 {
     m_aItemListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::removeItemListener( const Reference< ::com::sun::star::awt::XItemListener >& l ) throw( RuntimeException )
 {
     m_aItemListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3999,7 +3999,7 @@ void SAL_CALL FmXCheckBoxCell::setState( short n ) throw( RuntimeException )
     }
 }
 
-//------------------------------------------------------------------
+
 short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4012,7 +4012,7 @@ short SAL_CALL FmXCheckBoxCell::getState() throw( RuntimeException )
     return STATE_DONTKNOW;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4021,19 +4021,19 @@ void SAL_CALL FmXCheckBoxCell::enableTriState( sal_Bool b ) throw( RuntimeExcept
         m_pBox->EnableTriState( b );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::addActionListener( const Reference< awt::XActionListener >& _Listener ) throw (RuntimeException)
 {
     m_aActionListeners.addInterface( _Listener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::removeActionListener( const Reference< awt::XActionListener >& _Listener ) throw (RuntimeException)
 {
     m_aActionListeners.removeInterface( _Listener );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& _Label ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -4044,19 +4044,19 @@ void SAL_CALL FmXCheckBoxCell::setLabel( const OUString& _Label ) throw (Runtime
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXCheckBoxCell::setActionCommand( const OUString& _Command ) throw (RuntimeException)
 {
     m_aActionCommand = _Command;
 }
 
-//------------------------------------------------------------------
+
 Window* FmXCheckBoxCell::getEventWindow() const
 {
     return m_pBox;
 }
 
-//------------------------------------------------------------------
+
 void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     switch ( _nEventId )
@@ -4096,7 +4096,7 @@ void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window&
 /*************************************************************************/
 
 DBG_NAME(FmXListBoxCell);
-//------------------------------------------------------------------------------
+
 FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl)
                :FmXTextCell( pColumn, _rControl )
                ,m_aItemListeners(m_aMutex)
@@ -4108,7 +4108,7 @@ FmXListBoxCell::FmXListBoxCell(DbGridColumn* pColumn, DbCellControl& _rControl)
     m_pBox->SetDoubleClickHdl( LINK( this, FmXListBoxCell, OnDoubleClick ) );
 }
 
-//------------------------------------------------------------------
+
 FmXListBoxCell::~FmXListBoxCell()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -4121,7 +4121,7 @@ FmXListBoxCell::~FmXListBoxCell()
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void FmXListBoxCell::disposing()
 {
     ::com::sun::star::lang::EventObject aEvt(*this);
@@ -4135,7 +4135,7 @@ void FmXListBoxCell::disposing()
     FmXTextCell::disposing();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXListBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = FmXTextCell::queryAggregation(_rType);
@@ -4146,7 +4146,7 @@ Any SAL_CALL FmXListBoxCell::queryAggregation( const ::com::sun::star::uno::Type
     return aReturn;
 }
 
-//-------------------------------------------------------------------------
+
 Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXListBoxCell::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -4155,34 +4155,34 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXListBoxCell::getTypes(  ) th
     );
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXListBoxCell )
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::addItemListener(const Reference< ::com::sun::star::awt::XItemListener >& l) throw( RuntimeException )
 {
     m_aItemListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::removeItemListener(const Reference< ::com::sun::star::awt::XItemListener >& l) throw( RuntimeException )
 {
     m_aItemListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::addActionListener(const Reference< ::com::sun::star::awt::XActionListener >& l) throw( RuntimeException )
 {
     m_aActionListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::removeActionListener(const Reference< ::com::sun::star::awt::XActionListener >& l) throw( RuntimeException )
 {
     m_aActionListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4190,7 +4190,7 @@ void SAL_CALL FmXListBoxCell::addItem(const OUString& aItem, sal_Int16 nPos) thr
         m_pBox->InsertEntry( aItem, nPos );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItems, sal_Int16 nPos) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4206,7 +4206,7 @@ void SAL_CALL FmXListBoxCell::addItems(const ::comphelper::StringSequence& aItem
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4217,20 +4217,20 @@ void SAL_CALL FmXListBoxCell::removeItems(sal_Int16 nPos, sal_Int16 nCount) thro
     }
 }
 
-//------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXListBoxCell::getItemCount() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pBox ? m_pBox->GetEntryCount() : 0;
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pBox ? OUString(m_pBox->GetEntry(nPos)) : OUString();
 }
-//------------------------------------------------------------------
+
 ::comphelper::StringSequence SAL_CALL FmXListBoxCell::getItems() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4249,7 +4249,7 @@ OUString SAL_CALL FmXListBoxCell::getItem(sal_Int16 nPos) throw( RuntimeExceptio
     return aSeq;
 }
 
-//------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4261,7 +4261,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getSelectedItemPos() throw( RuntimeException
     return 0;
 }
 
-//------------------------------------------------------------------
+
 Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4277,7 +4277,7 @@ Sequence< sal_Int16 > SAL_CALL FmXListBoxCell::getSelectedItemsPos() throw( Runt
     }
     return aSeq;
 }
-//------------------------------------------------------------------
+
 OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4293,7 +4293,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException )
     return aItem;
 }
 
-//------------------------------------------------------------------
+
 ::comphelper::StringSequence SAL_CALL FmXListBoxCell::getSelectedItems() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4311,7 +4311,7 @@ OUString SAL_CALL FmXListBoxCell::getSelectedItem() throw( RuntimeException )
     return aSeq;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4320,7 +4320,7 @@ void SAL_CALL FmXListBoxCell::selectItemPos(sal_Int16 nPos, sal_Bool bSelect) th
         m_pBox->SelectEntryPos( nPos, bSelect );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPositions, sal_Bool bSelect) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4332,7 +4332,7 @@ void SAL_CALL FmXListBoxCell::selectItemsPos(const Sequence< sal_Int16 >& aPosit
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4341,7 +4341,7 @@ void SAL_CALL FmXListBoxCell::selectItem(const OUString& aItem, sal_Bool bSelect
         m_pBox->SelectEntry( aItem, bSelect );
 }
 
-//------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4352,7 +4352,7 @@ sal_Bool SAL_CALL FmXListBoxCell::isMutipleMode() throw( RuntimeException )
     return bMulti;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4361,7 +4361,7 @@ void SAL_CALL FmXListBoxCell::setMultipleMode(sal_Bool bMulti) throw( RuntimeExc
         m_pBox->EnableMultiSelection( bMulti );
 }
 
-//------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4373,7 +4373,7 @@ sal_Int16 SAL_CALL FmXListBoxCell::getDropDownLineCount() throw( RuntimeExceptio
     return nLines;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4382,7 +4382,7 @@ void SAL_CALL FmXListBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Runt
         m_pBox->SetDropDownLineCount( nLines );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4391,7 +4391,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept
         m_pBox->SetTopEntry( nEntry );
 }
 
-//------------------------------------------------------------------
+
 void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
     if  (   ( &_rWindow == m_pBox )
@@ -4416,7 +4416,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _
 }
 
 
-//------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick)
 {
     if (m_pBox)
@@ -4438,7 +4438,7 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick)
 
 DBG_NAME( FmXComboBoxCell );
 
-//------------------------------------------------------------------------------
+
 FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl )
     :FmXTextCell( pColumn, _rControl )
     ,m_aItemListeners( m_aMutex )
@@ -4448,7 +4448,7 @@ FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rContro
     DBG_CTOR( FmXComboBoxCell, NULL );
 }
 
-//------------------------------------------------------------------------------
+
 FmXComboBoxCell::~FmXComboBoxCell()
 {
     if ( !OComponentHelper::rBHelper.bDisposed )
@@ -4460,7 +4460,7 @@ FmXComboBoxCell::~FmXComboBoxCell()
     DBG_DTOR( FmXComboBoxCell, NULL );
 }
 
-//-----------------------------------------------------------------------------
+
 void FmXComboBoxCell::disposing()
 {
     ::com::sun::star::lang::EventObject aEvt(*this);
@@ -4470,7 +4470,7 @@ void FmXComboBoxCell::disposing()
     FmXTextCell::disposing();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXComboBoxCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = FmXTextCell::queryAggregation(_rType);
@@ -4481,7 +4481,7 @@ Any SAL_CALL FmXComboBoxCell::queryAggregation( const ::com::sun::star::uno::Typ
     return aReturn;
 }
 
-//-------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -4490,34 +4490,34 @@ Sequence< Type > SAL_CALL FmXComboBoxCell::getTypes(  ) throw(RuntimeException)
     );
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXComboBoxCell )
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::addItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException )
 {
     m_aItemListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::removeItemListener(const Reference< awt::XItemListener >& l) throw( RuntimeException )
 {
     m_aItemListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::addActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException )
 {
     m_aActionListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::removeActionListener(const Reference< awt::XActionListener >& l) throw( RuntimeException )
 {
     m_aActionListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::addItem( const OUString& _Item, sal_Int16 _Pos ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4525,7 +4525,7 @@ void SAL_CALL FmXComboBoxCell::addItem( const OUString& _Item, sal_Int16 _Pos )
         m_pComboBox->InsertEntry( _Item, _Pos );
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal_Int16 _Pos ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4541,7 +4541,7 @@ void SAL_CALL FmXComboBoxCell::addItems( const Sequence< OUString >& _Items, sal
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4552,20 +4552,20 @@ void SAL_CALL FmXComboBoxCell::removeItems( sal_Int16 _Pos, sal_Int16 _Count ) t
     }
 }
 
-//------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXComboBoxCell::getItemCount() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pComboBox ? m_pComboBox->GetEntryCount() : 0;
 }
 
-//------------------------------------------------------------------
+
 OUString SAL_CALL FmXComboBoxCell::getItem( sal_Int16 _Pos ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_pComboBox ? OUString(m_pComboBox->GetEntry(_Pos)) : OUString();
 }
-//------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4582,7 +4582,7 @@ Sequence< OUString > SAL_CALL FmXComboBoxCell::getItems() throw( RuntimeExceptio
     return aItems;
 }
 
-//------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4594,7 +4594,7 @@ sal_Int16 SAL_CALL FmXComboBoxCell::getDropDownLineCount() throw( RuntimeExcepti
     return nLines;
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4602,7 +4602,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run
         m_pComboBox->SetDropDownLineCount( nLines );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
 {
 
@@ -4631,14 +4631,14 @@ void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window&
 /*************************************************************************/
 TYPEINIT1(FmXFilterCell, FmXGridCell);
 
-//------------------------------------------------------------------------------
+
 Reference< XInterface >  FmXFilterCell_CreateInstance(const Reference< ::com::sun::star::lang::XMultiServiceFactory >& /*_rxFactory*/)
 {
     return *new FmXFilterCell();
 }
 
 DBG_NAME(FmXFilterCell);
-//------------------------------------------------------------------------------
+
 FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl )
               :FmXGridCell( pColumn, pControl )
               ,m_aTextListeners(m_aMutex)
@@ -4649,7 +4649,7 @@ FmXFilterCell::FmXFilterCell(DbGridColumn* pColumn, DbCellControl* pControl )
     static_cast< DbFilterField* >( m_pCellControl )->SetCommitHdl( LINK( this, FmXFilterCell, OnCommit ) );
 }
 
-//------------------------------------------------------------------
+
 FmXFilterCell::~FmXFilterCell()
 {
     if (!OComponentHelper::rBHelper.bDisposed)
@@ -4662,7 +4662,7 @@ FmXFilterCell::~FmXFilterCell()
 }
 
 // XUnoTunnel
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL FmXFilterCell::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw(RuntimeException)
 {
     sal_Int64 nReturn(0);
@@ -4687,14 +4687,14 @@ const Sequence<sal_Int8>& FmXFilterCell::getUnoTunnelId()
     return theFmXFilterCellUnoTunnelId::get().getSeq();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFilterCell::PaintCell( OutputDevice& rDev, const Rectangle& rRect )
 {
     static_cast< DbFilterField* >( m_pCellControl )->PaintCell( rDev, rRect );
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void FmXFilterCell::disposing()
 {
     ::com::sun::star::lang::EventObject aEvt(*this);
@@ -4705,7 +4705,7 @@ void FmXFilterCell::disposing()
     FmXGridCell::disposing();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXFilterCell::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException)
 {
     Any aReturn = FmXGridCell::queryAggregation(_rType);
@@ -4716,7 +4716,7 @@ Any SAL_CALL FmXFilterCell::queryAggregation( const ::com::sun::star::uno::Type&
     return aReturn;
 }
 
-//-------------------------------------------------------------------------
+
 Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXFilterCell::getTypes(  ) throw(RuntimeException)
 {
     return ::comphelper::concatSequences(
@@ -4725,81 +4725,81 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL FmXFilterCell::getTypes(  ) thr
     );
 }
 
-//------------------------------------------------------------------------------
+
 IMPLEMENT_GET_IMPLEMENTATION_ID( FmXFilterCell )
 
 // ::com::sun::star::awt::XTextComponent
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::addTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException )
 {
     m_aTextListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::removeTextListener(const Reference< ::com::sun::star::awt::XTextListener >& l) throw( RuntimeException )
 {
     m_aTextListeners.removeInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::setText( const OUString& aText ) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     ((DbFilterField*)m_pCellControl)->SetText(aText);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::insertText( const ::com::sun::star::awt::Selection& /*rSel*/, const OUString& /*aText*/ ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL FmXFilterCell::getText() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return ((DbFilterField*)m_pCellControl)->GetText();
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL FmXFilterCell::getSelectedText( void ) throw( RuntimeException )
 {
     return getText();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::setSelection( const ::com::sun::star::awt::Selection& /*aSelection*/ ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 ::com::sun::star::awt::Selection SAL_CALL FmXFilterCell::getSelection( void ) throw( RuntimeException )
 {
     return ::com::sun::star::awt::Selection();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FmXFilterCell::isEditable( void ) throw( RuntimeException )
 {
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::setEditable( sal_Bool /*bEditable*/ ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL FmXFilterCell::getMaxTextLen() throw( RuntimeException )
 {
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FmXFilterCell, OnCommit)
 {
     ::cppu::OInterfaceIteratorHelper aIt( m_aTextListeners );
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 17b565f87fa3..02b11a909522 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -24,7 +24,7 @@
 #include "svx/fmtools.hxx"
 using namespace ::com::sun::star::uno;
 
-//------------------------------------------------------------------------------
+
 const ::comphelper::StringSequence& getColumnTypes()
 {
     static ::comphelper::StringSequence aColumnTypes(10);
@@ -45,7 +45,7 @@ const ::comphelper::StringSequence& getColumnTypes()
     return aColumnTypes;
 }
 
-//------------------------------------------------------------------
+
 // Vergleichen von PropertyInfo
 extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond)
 {
@@ -54,7 +54,7 @@ extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond)
 
 namespace
 {
-    //------------------------------------------------------------------------------
+
     sal_Int32 lcl_findPos(const OUString& aStr, const Sequence< OUString>& rList)
     {
         const OUString* pStrList = rList.getConstArray();
@@ -68,7 +68,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
 {
     const OUString aModelPrefix("com.sun.star.form.component.");
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index fecc0e6f158f..41930be3ea2c 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -32,17 +32,17 @@ namespace svx
     //====================================================================
     //= OXFormsTransferable
     //====================================================================
-    //--------------------------------------------------------------------
+
     OXFormsTransferable::OXFormsTransferable( const OXFormsDescriptor &rhs ) :
         m_aDescriptor(rhs)
     {
     }
-    //--------------------------------------------------------------------
+
     void OXFormsTransferable::AddSupportedFormats()
     {
         AddFormat( SOT_FORMATSTR_ID_XFORMS );
     }
-    //--------------------------------------------------------------------
+
     sal_Bool OXFormsTransferable::GetData( const DataFlavor& _rFlavor )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor );
@@ -52,7 +52,7 @@ namespace svx
         }
         return sal_False;
     }
-    //--------------------------------------------------------------------
+
     const OXFormsDescriptor &OXFormsTransferable::extractDescriptor( const TransferableDataHelper &_rData ) {
 
         using namespace ::com::sun::star::uno;
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 37ca31537606..787542d8b9df 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -36,7 +36,7 @@ using namespace ::connectivity;
 //= OSystemParseContext
 //==========================================================================
 DBG_NAME(OSystemParseContext)
-//-----------------------------------------------------------------------------
+
 OSystemParseContext::OSystemParseContext() : IParseContext()
 {
     DBG_CTOR(OSystemParseContext,NULL);
@@ -46,19 +46,19 @@ OSystemParseContext::OSystemParseContext() : IParseContext()
     aKeywords.get( m_aLocalizedKeywords );
 }
 
-//-----------------------------------------------------------------------------
+
 OSystemParseContext::~OSystemParseContext()
 {
     DBG_DTOR(OSystemParseContext,NULL);
 }
 
-//-----------------------------------------------------------------------------
+
 ::com::sun::star::lang::Locale OSystemParseContext::getPreferredLocale( ) const
 {
     return SvtSysLocale().GetLanguageTag().getLocale();
 }
 
-//-----------------------------------------------------------------------------
+
 OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
 {
     OUString aMsg;
@@ -82,7 +82,7 @@ OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
     return aMsg;
 }
 
-//-----------------------------------------------------------------------------
+
 OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
 {
     size_t nIndex = 0;
@@ -125,7 +125,7 @@ OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) con
     return sKeyword;
 }
 
-// -----------------------------------------------------------------------------
+
 IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OString& rToken) const
 {
     static const IParseContext::InternationalKeyCode Intl_TokenID[] =
@@ -155,19 +155,19 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OS
 // =============================================================================
 namespace
 {
-    // -----------------------------------------------------------------------------
+
     ::osl::Mutex& getSafteyMutex()
     {
         static ::osl::Mutex s_aSafety;
         return s_aSafety;
     }
-    // -----------------------------------------------------------------------------
+
     oslInterlockedCount& getCounter()
     {
         static oslInterlockedCount s_nCounter;
         return s_nCounter;
     }
-    // -----------------------------------------------------------------------------
+
     OSystemParseContext* getSharedContext(OSystemParseContext* _pContext = NULL,sal_Bool _bSet = sal_False)
     {
         static OSystemParseContext* s_pSharedContext = NULL;
@@ -184,9 +184,9 @@ namespace
         }
         return s_pSharedContext;
     }
-    // -----------------------------------------------------------------------------
+
 }
-// -----------------------------------------------------------------------------
+
 OParseContextClient::OParseContextClient()
 {
     ::osl::MutexGuard aGuard( getSafteyMutex() );
@@ -196,7 +196,7 @@ OParseContextClient::OParseContextClient()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 OParseContextClient::~OParseContextClient()
 {
     {
@@ -205,12 +205,12 @@ OParseContextClient::~OParseContextClient()
             delete getSharedContext(NULL,sal_True);
     }
 }
-// -----------------------------------------------------------------------------
+
 const OSystemParseContext* OParseContextClient::getParseContext() const
 {
     return getSharedContext();
 }
-// -----------------------------------------------------------------------------
+
 
 
 
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index 5c80ac6d159f..00db0c691c38 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -80,14 +80,14 @@ namespace svx
         static PropertyMapEntry const *         getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos );
     };
 
-    //--------------------------------------------------------------------
+
     ODADescriptorImpl::ODADescriptorImpl()
         :m_bSetOutOfDate(sal_True)
         ,m_bSequenceOutOfDate(sal_True)
     {
     }
 
-    //--------------------------------------------------------------------
+
     ODADescriptorImpl::ODADescriptorImpl(const ODADescriptorImpl& _rSource)
         :m_bSetOutOfDate( _rSource.m_bSetOutOfDate )
         ,m_bSequenceOutOfDate( _rSource.m_bSequenceOutOfDate )
@@ -99,7 +99,7 @@ namespace svx
             m_aAsSequence = _rSource.m_aAsSequence;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool ODADescriptorImpl::buildFrom( const Sequence< PropertyValue >& _rValues )
     {
         const MapString2PropertyEntry& rProperties = getPropertyMap();
@@ -133,7 +133,7 @@ namespace svx
         return bValidPropsOnly;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool ODADescriptorImpl::buildFrom( const Reference< XPropertySet >& _rxValues )
     {
         Reference< XPropertySetInfo > xPropInfo;
@@ -171,14 +171,14 @@ namespace svx
         return bValidPropsOnly;
     }
 
-    //--------------------------------------------------------------------
+
     void ODADescriptorImpl::invalidateExternRepresentations()
     {
         m_bSetOutOfDate = sal_True;
         m_bSequenceOutOfDate = sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     const ODADescriptorImpl::MapString2PropertyEntry& ODADescriptorImpl::getPropertyMap( )
     {
         // the properties we know
@@ -215,7 +215,7 @@ namespace svx
         return s_aProperties;
     }
 
-    //--------------------------------------------------------------------
+
     PropertyMapEntry const * ODADescriptorImpl::getPropertyMapEntry( const DescriptorValues::const_iterator& _rPos )
     {
         const MapString2PropertyEntry& rProperties = getPropertyMap();
@@ -233,7 +233,7 @@ namespace svx
         throw RuntimeException();
     }
 
-    //--------------------------------------------------------------------
+
     PropertyValue ODADescriptorImpl::buildPropertyValue( const DescriptorValues::const_iterator& _rPos )
     {
         // the map entry
@@ -250,7 +250,7 @@ namespace svx
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void ODADescriptorImpl::updateSequence()
     {
         if (!m_bSequenceOutOfDate)
@@ -275,19 +275,19 @@ namespace svx
     //====================================================================
     //= ODataAccessDescriptor
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor::ODataAccessDescriptor()
         :m_pImpl(new ODADescriptorImpl)
     {
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor::ODataAccessDescriptor( const ODataAccessDescriptor& _rSource )
         :m_pImpl(new ODADescriptorImpl(*_rSource.m_pImpl))
     {
     }
 
-    //--------------------------------------------------------------------
+
     const ODataAccessDescriptor& ODataAccessDescriptor::operator=(const ODataAccessDescriptor& _rSource)
     {
         delete m_pImpl;
@@ -295,14 +295,14 @@ namespace svx
         return *this;
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor::ODataAccessDescriptor( const Reference< XPropertySet >& _rValues )
         :m_pImpl(new ODADescriptorImpl)
     {
         m_pImpl->buildFrom(_rValues);
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor::ODataAccessDescriptor( const Any& _rValues )
         :m_pImpl(new ODADescriptorImpl)
     {
@@ -315,26 +315,26 @@ namespace svx
             m_pImpl->buildFrom( xValues );
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor::ODataAccessDescriptor( const Sequence< PropertyValue >& _rValues )
         :m_pImpl(new ODADescriptorImpl)
     {
         m_pImpl->buildFrom(_rValues);
     }
 
-    //--------------------------------------------------------------------
+
     ODataAccessDescriptor::~ODataAccessDescriptor()
     {
         delete m_pImpl;
     }
 
-    //--------------------------------------------------------------------
+
     void ODataAccessDescriptor::clear()
     {
         m_pImpl->m_aValues.clear();
     }
 
-    //--------------------------------------------------------------------
+
     void ODataAccessDescriptor::erase(DataAccessDescriptorProperty _eWhich)
     {
         OSL_ENSURE(has(_eWhich), "ODataAccessDescriptor::erase: invalid call!");
@@ -342,13 +342,13 @@ namespace svx
             m_pImpl->m_aValues.erase(_eWhich);
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const
     {
         return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end();
     }
 
-    //--------------------------------------------------------------------
+
     const Any& ODataAccessDescriptor::operator [] ( DataAccessDescriptorProperty _eWhich ) const
     {
         if (!has(_eWhich))
@@ -361,14 +361,14 @@ namespace svx
         return m_pImpl->m_aValues[_eWhich];
     }
 
-    //--------------------------------------------------------------------
+
     Any& ODataAccessDescriptor::operator[] ( DataAccessDescriptorProperty _eWhich )
     {
         m_pImpl->invalidateExternRepresentations();
         return m_pImpl->m_aValues[_eWhich];
     }
 
-    //--------------------------------------------------------------------
+
     void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear)
     {
         if (_bClear)
@@ -376,14 +376,14 @@ namespace svx
         m_pImpl->buildFrom(_rValues);
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< PropertyValue > ODataAccessDescriptor::createPropertyValueSequence()
     {
         m_pImpl->updateSequence();
         return m_pImpl->m_aAsSequence;
     }
 
-    //--------------------------------------------------------------------
+
     OUString ODataAccessDescriptor::getDataSource() const
     {
         OUString sDataSourceName;
@@ -393,7 +393,7 @@ namespace svx
             (*this)[daDatabaseLocation] >>= sDataSourceName;
         return sDataSourceName;
     }
-    //--------------------------------------------------------------------
+
     void ODataAccessDescriptor::setDataSource(const OUString& _sDataSourceNameOrLocation)
     {
         if ( !_sDataSourceNameOrLocation.isEmpty() )
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 1661cd8f5370..2e566a3282f3 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -84,7 +84,7 @@ namespace svx
         bool                                    m_bNeedExistenceCheck;
     };
 
-    //--------------------------------------------------------------------
+
     DatabaseLocationInputController_Impl::DatabaseLocationInputController_Impl( const Reference<XComponentContext>& _rContext,
             ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton )
         :m_xContext( _rContext )
@@ -112,14 +112,14 @@ namespace svx
         m_rLocationInput.AddEventListener( LINK( this, DatabaseLocationInputController_Impl, OnControlAction ) );
     }
 
-    //--------------------------------------------------------------------
+
     DatabaseLocationInputController_Impl::~DatabaseLocationInputController_Impl()
     {
         m_rBrowseButton.RemoveEventListener( LINK( this, DatabaseLocationInputController_Impl, OnControlAction ) );
         m_rLocationInput.RemoveEventListener( LINK( this, DatabaseLocationInputController_Impl, OnControlAction ) );
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseLocationInputController_Impl::prepareCommit()
     {
         OUString sURL( impl_getCurrentURL() );
@@ -140,20 +140,20 @@ namespace svx
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void DatabaseLocationInputController_Impl::setURL( const OUString& _rURL )
     {
         ::svt::OFileNotation aTransformer( _rURL );
         m_rLocationInput.SetText( aTransformer.get( ::svt::OFileNotation::N_SYSTEM ) );
     }
 
-    //--------------------------------------------------------------------
+
     OUString DatabaseLocationInputController_Impl::getURL() const
     {
         return impl_getCurrentURL();
     }
 
-    //--------------------------------------------------------------------
+
     void DatabaseLocationInputController_Impl::impl_initFilterProperties_nothrow()
     {
         try
@@ -198,7 +198,7 @@ namespace svx
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     IMPL_LINK( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent*, _pEvent )
     {
         if  (   ( _pEvent->GetWindow() == &m_rBrowseButton )
@@ -218,7 +218,7 @@ namespace svx
         return 0L;
     }
 
-    // -----------------------------------------------------------------------------
+
     OUString DatabaseLocationInputController_Impl::impl_getCurrentURL() const
     {
         OUString sCurrentFile( m_rLocationInput.GetText() );
@@ -230,7 +230,7 @@ namespace svx
         return sCurrentFile;
     }
 
-    // -----------------------------------------------------------------------------
+
     void DatabaseLocationInputController_Impl::impl_onBrowseButtonClicked()
     {
         ::sfx2::FileDialogHelper aFileDlg(
@@ -257,7 +257,7 @@ namespace svx
         }
     }
 
-    // -----------------------------------------------------------------------------
+
     void DatabaseLocationInputController_Impl::impl_onLocationModified()
     {
         m_bNeedExistenceCheck = true;
@@ -266,31 +266,31 @@ namespace svx
     //====================================================================
     //= DatabaseLocationInputController
     //====================================================================
-    //--------------------------------------------------------------------
+
     DatabaseLocationInputController::DatabaseLocationInputController( const Reference<XComponentContext>& _rContext,
             ::svt::OFileURLControl& _rLocationInput, PushButton& _rBrowseButton )
         :m_pImpl( new DatabaseLocationInputController_Impl( _rContext, _rLocationInput, _rBrowseButton ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     DatabaseLocationInputController::~DatabaseLocationInputController()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool DatabaseLocationInputController::prepareCommit()
     {
         return m_pImpl->prepareCommit();
     }
 
-    //--------------------------------------------------------------------
+
     void DatabaseLocationInputController::setURL( const OUString& _rURL )
     {
         m_pImpl->setURL( _rURL );
     }
 
-    //--------------------------------------------------------------------
+
     OUString DatabaseLocationInputController::getURL() const
     {
         return m_pImpl->getURL();
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 6437cfe6d3a6..688489036221 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -330,23 +330,23 @@ namespace svxform
         m_aItemList.Show();
         ItemSelectHdl( &m_aItemList );
     }
-    //------------------------------------------------------------------------
+
     XFormsPage::~XFormsPage()
     {
     }
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl)
     {
         DoToolBoxAction( m_aToolBox.GetCurItemId() );
         return 0;
     }
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl)
     {
         EnableMenuItems( NULL );
         return 0;
     }
-    //------------------------------------------------------------------------
+
     void XFormsPage::AddChildren(
         SvTreeListEntry* _pParent, const ImageList& _rImgLst,
         const Reference< css::xml::dom::XNode >& _xNode )
@@ -416,7 +416,7 @@ namespace svxform
             DBG_UNHANDLED_EXCEPTION();
         }
     }
-    //------------------------------------------------------------------------
+
     bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) {
 
         bool bHandled = false;
@@ -745,7 +745,7 @@ namespace svxform
         return bHandled;
     }
 
-    //------------------------------------------------------------------------
+
     SvTreeListEntry* XFormsPage::AddEntry( ItemNode* _pNewNode, bool _bIsElement )
     {
         SvTreeListEntry* pParent = m_aItemList.FirstSelected();
@@ -766,7 +766,7 @@ namespace svxform
             sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode );
     }
 
-    //------------------------------------------------------------------------
+
     SvTreeListEntry* XFormsPage::AddEntry( const Reference< XPropertySet >& _rEntry )
     {
         SvTreeListEntry* pEntry = NULL;
@@ -837,7 +837,7 @@ namespace svxform
         return pEntry;
     }
 
-    //------------------------------------------------------------------------
+
     void XFormsPage::EditEntry( const Reference< XPropertySet >& _rEntry )
     {
         SvTreeListEntry* pEntry = NULL;
@@ -894,7 +894,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     bool XFormsPage::RemoveEntry()
     {
         bool bRet = false;
@@ -986,7 +986,7 @@ namespace svxform
         return bRet;
     }
 
-    //------------------------------------------------------------------------
+
     bool XFormsPage::Notify( NotifyEvent& rNEvt )
     {
         bool nHandled = false;
@@ -1005,7 +1005,7 @@ namespace svxform
 
         return nHandled || Window::Notify( rNEvt );
     }
-    //------------------------------------------------------------------------
+
     void XFormsPage::Resize()
     {
         Size aSize = GetOutputSizePixel();
@@ -1016,7 +1016,7 @@ namespace svxform
         aSize.Height() -= ( 4 + aTbxSize.Height() );
         m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize );
     }
-    //------------------------------------------------------------------------
+
     OUString XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos )
     {
         DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" );
@@ -1161,13 +1161,13 @@ namespace svxform
 
         return sRet;
     }
-    //------------------------------------------------------------------------
+
     void XFormsPage::ClearModel()
     {
         m_bHasModel = false;
         m_aItemList.DeleteAndClear();
     }
-    //------------------------------------------------------------------------
+
     OUString XFormsPage::LoadInstance(
         const Sequence< PropertyValue >& _xPropSeq, const ImageList& _rImgLst )
     {
@@ -1216,13 +1216,13 @@ namespace svxform
         return sRet;
     }
 
-    //------------------------------------------------------------------------
+
     bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID )
     {
         return DoToolBoxAction( _nMenuID );
     }
 
-    //------------------------------------------------------------------------
+
     void XFormsPage::EnableMenuItems( Menu* _pMenu )
     {
         sal_Bool bEnableAdd = sal_False;
@@ -1399,7 +1399,7 @@ namespace svxform
         // load xforms models of the current document
         LoadModels();
     }
-    //------------------------------------------------------------------------
+
     DataNavigatorWindow::~DataNavigatorWindow()
     {
         SvtViewOptions aViewOpt( E_TABDIALOG, CFGNAME_DATANAVIGATOR );
@@ -1422,7 +1422,7 @@ namespace svxform
         m_xDataListener.clear();
     }
 
-    // -----------------------------------------------------------------------
+
     IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox )
     {
         sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos();
@@ -1437,7 +1437,7 @@ namespace svxform
 
         return 0;
     }
-    // -----------------------------------------------------------------------
+
     IMPL_LINK( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn )
     {
         bool bIsDocModified = false;
@@ -1750,7 +1750,7 @@ namespace svxform
             SetDocModified();
         return 0;
     }
-    // -----------------------------------------------------------------------
+
     IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn )
     {
         Menu* pMenu = pBtn->GetPopupMenu();
@@ -1774,7 +1774,7 @@ namespace svxform
         }
         return 0;
     }
-    // -----------------------------------------------------------------------
+
     IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl)
     {
         sal_uInt16 nId = 0;
@@ -1788,13 +1788,13 @@ namespace svxform
 
         return 0;
     }
-    // -----------------------------------------------------------------------
+
     IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl)
     {
         ModelSelectHdl( NULL );
         return 0;
     }
-    // -----------------------------------------------------------------------
+
     XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId )
     {
         rCurId = m_aTabCtrl.GetCurPageId();
@@ -1842,7 +1842,7 @@ namespace svxform
 
         return pPage;
     }
-    // -----------------------------------------------------------------------
+
     void DataNavigatorWindow::LoadModels()
     {
         if ( !m_xFrameModel.is() )
@@ -1898,7 +1898,7 @@ namespace svxform
             ModelSelectHdl( &m_aModelsBox );
         }
     }
-    // -----------------------------------------------------------------------
+
     void DataNavigatorWindow::SetPageModel()
     {
         OUString sModel( m_aModelsBox.GetSelectEntry() );
@@ -1931,7 +1931,7 @@ namespace svxform
             SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
         }
     }
-    // -----------------------------------------------------------------------
+
     void DataNavigatorWindow::InitPages()
     {
         OUString sModel( m_aModelsBox.GetSelectEntry() );
@@ -1980,7 +1980,7 @@ namespace svxform
             SAL_WARN( "svx.form", "DataNavigatorWindow::SetPageModel(): unexpected exception" );
         }
     }
-    // -----------------------------------------------------------------------
+
     void DataNavigatorWindow::ClearAllPageModels( bool bClearPages )
     {
         if ( m_pInstPage )
@@ -2006,7 +2006,7 @@ namespace svxform
                 m_aTabCtrl.RemovePage( m_aTabCtrl.GetPageId( 1 ) );
         }
     }
-    // -----------------------------------------------------------------------
+
     void DataNavigatorWindow::CreateInstancePage( const Sequence< PropertyValue >& _xPropSeq )
     {
         OUString sInstName;
@@ -2033,13 +2033,13 @@ namespace svxform
         m_aTabCtrl.InsertPage( nPageId, sInstName, m_aTabCtrl.GetPageCount() - 2 );
     }
 
-    //------------------------------------------------------------------------
+
     bool DataNavigatorWindow::HasFirstInstancePage() const
     {
         return ( m_aTabCtrl.GetPageId( 0 ) == TID_INSTANCE );
     }
 
-    //------------------------------------------------------------------------
+
     sal_uInt16 DataNavigatorWindow::GetNewPageId() const
     {
         sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
@@ -2051,7 +2051,7 @@ namespace svxform
         return ( nMax + 1 );
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigatorWindow::Resize()
     {
         Window::Resize();
@@ -2080,7 +2080,7 @@ namespace svxform
         m_aInstanceBtn.SetPosPixel( aPos );
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigatorWindow::SetDocModified()
     {
         SfxObjectShell* pCurrentDoc = SfxObjectShell::Current();
@@ -2089,7 +2089,7 @@ namespace svxform
             pCurrentDoc->SetModified();
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigatorWindow::NotifyChanges( bool _bLoadAll )
     {
         if ( !m_bIsNotifyDisabled )
@@ -2110,7 +2110,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigatorWindow::AddContainerBroadcaster( const XContainer_ref& xContainer )
     {
         Reference< XContainerListener > xListener(
@@ -2119,7 +2119,7 @@ namespace svxform
         m_aContainerList.push_back( xContainer );
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigatorWindow::AddEventBroadcaster( const XEventTarget_ref& xTarget )
     {
         Reference< XEventListener > xListener(
@@ -2131,7 +2131,7 @@ namespace svxform
         m_aEventTargetList.push_back( xTarget );
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigatorWindow::RemoveBroadcaster()
     {
         Reference< XContainerListener > xContainerListener(
@@ -2155,7 +2155,7 @@ namespace svxform
     // class DataNavigator
     //========================================================================
     DBG_NAME(DataNavigator)
-    //------------------------------------------------------------------------
+
     DataNavigator::DataNavigator( SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent ) :
 
         SfxDockingWindow( _pBindings, _pMgr, _pParent,
@@ -2177,17 +2177,17 @@ namespace svxform
         m_aDataWin.Show();
     }
 
-    //------------------------------------------------------------------------
+
     DataNavigator::~DataNavigator()
     {
         DBG_DTOR(DataNavigator,NULL);
     }
 
-    //-----------------------------------------------------------------------
+
     void DataNavigator::Update( FmFormShell* /*pFormShell*/ )
     {
     }
-    //-----------------------------------------------------------------------
+
     void DataNavigator::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
     {
         if ( !pState  || SID_FM_DATANAVIGATOR_CONTROL != nSID )
@@ -2202,20 +2202,20 @@ namespace svxform
             Update( NULL );
     }
 
-    //-----------------------------------------------------------------------
+
     void DataNavigator::GetFocus()
     {
         SfxDockingWindow::GetFocus();
     }
 
-    //-----------------------------------------------------------------------
+
     bool DataNavigator::Close()
     {
         Update( NULL );
         return SfxDockingWindow::Close();
     }
 
-    //-----------------------------------------------------------------------
+
     Size DataNavigator::CalcDockingSize( SfxChildAlignment eAlign )
     {
         if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) )
@@ -2224,7 +2224,7 @@ namespace svxform
         return SfxDockingWindow::CalcDockingSize( eAlign );
     }
 
-    //-----------------------------------------------------------------------
+
     SfxChildAlignment DataNavigator::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign )
     {
         switch ( eAlign )
@@ -2239,7 +2239,7 @@ namespace svxform
         return eActAlign;
     }
 
-    //------------------------------------------------------------------------
+
     void DataNavigator::Resize()
     {
         SfxDockingWindow::Resize();
@@ -2260,10 +2260,10 @@ namespace svxform
     // class NavigatorFrameManager
     //========================================================================
 
-    //-----------------------------------------------------------------------
+
     SFX_IMPL_DOCKINGWINDOW( DataNavigatorManager, SID_FM_SHOW_DATANAVIGATOR )
 
-    //-----------------------------------------------------------------------
+
     DataNavigatorManager::DataNavigatorManager(
         Window* _pParent, sal_uInt16 _nId, SfxBindings* _pBindings, SfxChildWinInfo* _pInfo ) :
 
@@ -2319,7 +2319,7 @@ namespace svxform
         CheckHdl( NULL );
     }
 
-    //------------------------------------------------------------------------
+
     AddDataItemDialog::~AddDataItemDialog()
     {
         if ( m_xTempBinding.is() )
@@ -2346,7 +2346,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( AddDataItemDialog, CheckHdl, CheckBox *, pBox )
     {
         // Condition buttons are only enable if their check box is checked
@@ -2381,7 +2381,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn )
     {
         OUString sTemp, sPropName;
@@ -2460,7 +2460,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddDataItemDialog, OKHdl)
     {
         bool bIsHandleBinding = ( DITBinding == m_eItemType );
@@ -2524,7 +2524,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     void AddDataItemDialog::InitDialog()
     {
         // set handler
@@ -2546,7 +2546,7 @@ namespace svxform
         m_pOKBtn->SetClickHdl( LINK( this, AddDataItemDialog, OKHdl ) );
     }
 
-    //------------------------------------------------------------------------
+
     void AddDataItemDialog::InitFromNode()
     {
         if ( m_pItemNode )
@@ -2690,7 +2690,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void AddDataItemDialog::InitDataTypeBox()
     {
         if ( m_eItemType != DITText )
@@ -2818,7 +2818,7 @@ namespace svxform
         ResultHdl( &m_aResultTimer );
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddConditionDialog, EditHdl)
     {
         Reference< XNameContainer > xNameContnr;
@@ -2843,7 +2843,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddConditionDialog, OKHdl)
     {
 /*!!!
@@ -2861,14 +2861,14 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl)
     {
         m_aResultTimer.Start();
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddConditionDialog, ResultHdl)
     {
         OUString sCondition = comphelper::string::strip(m_pConditionED->GetText(), ' ');
@@ -2932,13 +2932,13 @@ namespace svxform
         SelectHdl( m_pNamespacesList );
     }
 
-    //------------------------------------------------------------------------
+
     NamespaceItemDialog::~NamespaceItemDialog()
     {
         delete m_pNamespacesList;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( NamespaceItemDialog, SelectHdl, SvSimpleTable *,  EMPTYARG )
     {
         sal_Bool bEnable = ( m_pNamespacesList->FirstSelected() != NULL );
@@ -2948,7 +2948,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( NamespaceItemDialog, ClickHdl, PushButton *, pBtn )
     {
         if ( m_pAddNamespaceBtn == pBtn )
@@ -2998,7 +2998,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl)
     {
         try
@@ -3030,7 +3030,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     void NamespaceItemDialog::LoadNamespaces()
     {
         try
@@ -3080,7 +3080,7 @@ namespace svxform
         m_pOKBtn->SetClickHdl( LINK( this, ManageNamespaceDialog, OKHdl ) );
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl)
     {
         OUString sPrefix = m_pPrefixED->GetText();
@@ -3133,7 +3133,7 @@ namespace svxform
         m_pOKBtn->SetClickHdl( LINK( this, AddSubmissionDialog, OKHdl ) );
     }
 
-    //------------------------------------------------------------------------
+
     AddSubmissionDialog::~AddSubmissionDialog()
     {
         // #i38991# if we have added a binding, we need to remove it as well.
@@ -3141,7 +3141,7 @@ namespace svxform
             m_xUIHelper->removeBindingIfUseless( m_xCreatedBinding );
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl)
     {
         AddConditionDialog aDlg( this, PN_BINDING_EXPR, m_xTempBinding );
@@ -3152,7 +3152,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl)
     {
         OUString sName(m_pNameED->GetText());
@@ -3216,7 +3216,7 @@ namespace svxform
         return 0;
     }
 
-    //------------------------------------------------------------------------
+
     void AddSubmissionDialog::FillAllBoxes()
     {
         // method box
@@ -3366,7 +3366,7 @@ namespace svxform
         m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString();
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl)
     {
         ::sfx2::FileDialogHelper aDlg(
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index 7d2c3f376892..355d2ceac6e8 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -27,12 +27,12 @@ namespace svxform
     //====================================================================
     //= ODataAccessCharsetHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     ODataAccessCharsetHelper::ODataAccessCharsetHelper( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool ODataAccessCharsetHelper::ensureLoaded() const
     {
         if ( !ODbtoolsClient::ensureLoaded() )
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index f1a31da37a69..ebdc7521205f 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -54,13 +54,13 @@ namespace svxform
     createDataAccessToolsFactoryFunction
                     ODbtoolsClient::s_pFactoryCreationFunc = NULL;
 
-    //--------------------------------------------------------------------
+
     ODbtoolsClient::ODbtoolsClient()
     {
         m_bCreateAlready = sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     bool ODbtoolsClient::ensureLoaded() const
     {
         if ( !m_bCreateAlready )
@@ -84,7 +84,7 @@ namespace svxform
         return m_xDataAccessFactory.is();
     }
 
-    //--------------------------------------------------------------------
+
     ODbtoolsClient::~ODbtoolsClient()
     {
         // clear the factory _before_ revoking the client
@@ -95,7 +95,7 @@ namespace svxform
             revokeClient();
     }
 
-    //--------------------------------------------------------------------
+
 
 #ifndef DISABLE_DYNLOADING
 
@@ -144,7 +144,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ODbtoolsClient::revokeClient()
     {
         ::osl::MutexGuard aGuard(theODbtoolsClientMutex::get());
@@ -164,12 +164,12 @@ namespace svxform
     //====================================================================
     //= OStaticDataAccessTools
     //====================================================================
-    //--------------------------------------------------------------------
+
     OStaticDataAccessTools::OStaticDataAccessTools()
     {
     }
 
-    //--------------------------------------------------------------------
+
 
     bool OStaticDataAccessTools::ensureLoaded() const
     {
@@ -179,7 +179,7 @@ namespace svxform
         return m_xDataAccessTools.is();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XNumberFormatsSupplier > OStaticDataAccessTools::getNumberFormats(const Reference< XConnection>& _rxConn, sal_Bool _bAllowDefault) const
     {
         Reference< XNumberFormatsSupplier > xReturn;
@@ -188,7 +188,7 @@ namespace svxform
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 OStaticDataAccessTools::getDefaultNumberFormat( const Reference< XPropertySet >& _xColumn, const Reference< XNumberFormatTypes >& _xTypes, const Locale& _rLocale )
     {
         sal_Int32 nReturn = 0;
@@ -197,7 +197,7 @@ namespace svxform
         return nReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName,
         const OUString& _rUser, const OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const
             SAL_THROW ( (SQLException) )
@@ -208,7 +208,7 @@ namespace svxform
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XConnection > OStaticDataAccessTools::connectRowset( const Reference< XRowSet >& _rxRowSet,
         const Reference< XComponentContext >& _rxContext, sal_Bool _bSetAsActiveConnection ) const
         SAL_THROW ( ( SQLException, WrappedTargetException, RuntimeException ) )
@@ -219,7 +219,7 @@ namespace svxform
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XConnection > OStaticDataAccessTools::getRowSetConnection(const Reference< XRowSet >& _rxRowSet) const SAL_THROW ( (RuntimeException) )
     {
         Reference< XConnection > xReturn;
@@ -228,7 +228,7 @@ namespace svxform
         return xReturn;
     }
 
-    //--------------------------------------------------------------------
+
     void OStaticDataAccessTools::TransferFormComponentProperties(const Reference< XPropertySet>& _rxOld,
         const Reference< XPropertySet>& _rxNew, const Locale& _rLocale) const
     {
@@ -236,7 +236,7 @@ namespace svxform
             m_xDataAccessTools->TransferFormComponentProperties(_rxOld, _rxNew, _rLocale);
     }
 
-    //--------------------------------------------------------------------
+
     OUString OStaticDataAccessTools::quoteName(const OUString& _rQuote, const OUString& _rName) const
     {
         OUString sReturn;
@@ -245,7 +245,7 @@ namespace svxform
         return sReturn;
     }
 
-    // ------------------------------------------------
+
     OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const
     {
         OUString sReturn;
@@ -254,7 +254,7 @@ namespace svxform
         return sReturn;
     }
 
-    //----------------------------------------------------------------
+
     Reference< XDataSource > OStaticDataAccessTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const
     {
         Reference< XDataSource > xReturn;
@@ -263,7 +263,7 @@ namespace svxform
         return xReturn;
     }
 
-    //----------------------------------------------------------------
+
     sal_Bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const
     {
         sal_Bool bRet = sal_False;
@@ -272,7 +272,7 @@ namespace svxform
         return bRet;
     }
 
-    //----------------------------------------------------------------
+
     sal_Bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const
     {
         sal_Bool bRet = sal_False;
@@ -281,7 +281,7 @@ namespace svxform
         return bRet;
     }
 
-    //----------------------------------------------------------------
+
     Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
         const sal_Int32 _nCommandType, const OUString& _rCommand,
             Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
@@ -294,7 +294,7 @@ namespace svxform
         return aFields;
     }
 
-    //----------------------------------------------------------------
+
     bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Reference< XConnection >& _rxActualConnection )
     {
         bool bReturn = false;
@@ -303,7 +303,7 @@ namespace svxform
         return bReturn;
     }
 
-    //----------------------------------------------------------------
+
     bool OStaticDataAccessTools::isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent )
     {
         bool bReturn = false;
@@ -318,17 +318,17 @@ namespace svxform
     //====================================================================
     //= DBToolsObjectFactory
     //====================================================================
-    //----------------------------------------------------------------
+
     DBToolsObjectFactory::DBToolsObjectFactory()
     {
     }
 
-    //----------------------------------------------------------------
+
     DBToolsObjectFactory::~DBToolsObjectFactory()
     {
     }
 
-    //----------------------------------------------------------------
+
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::dbtools::FormattedColumnValue > DBToolsObjectFactory::createFormattedColumnValue(
         const Reference<XComponentContext>& _rContext, const Reference< XRowSet >& _rxRowSet, const Reference< XPropertySet >& _rxColumn )
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index 667abec6d0d5..2804c2b6ec3c 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -31,7 +31,7 @@ namespace svxform
     //====================================================================
     //= DelayedEvent
     //====================================================================
-    //--------------------------------------------------------------------
+
     void DelayedEvent::Call( void* _pArg )
     {
         CancelPendingCall();
@@ -40,7 +40,7 @@ namespace svxform
         m_nEventId = Application::PostUserEvent( LINK( this, DelayedEvent, OnCall ), _pArg );
     }
 
-    //--------------------------------------------------------------------
+
     void DelayedEvent::CancelPendingCall()
     {
         if ( m_nEventId )
@@ -48,7 +48,7 @@ namespace svxform
         m_nEventId = 0;
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( DelayedEvent, OnCall, void*, _pArg )
     {
         m_nEventId = 0;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 5a4583c43b17..c28932817f4d 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -111,13 +111,13 @@ OFilterItemExchange::OFilterItemExchange()
 {
 }
 
-//------------------------------------------------------------------------
+
 void OFilterItemExchange::AddSupportedFormats()
 {
     AddFormat(getFormatId());
 }
 
-//------------------------------------------------------------------------
+
 sal_uInt32 OFilterItemExchange::getFormatId()
 {
     static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -129,7 +129,7 @@ sal_uInt32 OFilterItemExchange::getFormatId()
     return s_nFormat;
 }
 
-//------------------------------------------------------------------------
+
 OLocalExchange* OFilterExchangeHelper::createExchange() const
 {
     return new OFilterItemExchange;
@@ -144,7 +144,7 @@ Image FmFilterData::GetImage() const
 
 //========================================================================
 TYPEINIT1(FmParentData, FmFilterData);
-//------------------------------------------------------------------------
+
 FmParentData::~FmParentData()
 {
     for (::std::vector<FmFilterData*>::const_iterator i = m_aChildren.begin();
@@ -154,7 +154,7 @@ FmParentData::~FmParentData()
 
 //========================================================================
 TYPEINIT1(FmFormItem, FmParentData);
-//------------------------------------------------------------------------
+
 Image FmFormItem::GetImage() const
 {
     static Image aImage;
@@ -169,7 +169,7 @@ Image FmFormItem::GetImage() const
 
 //========================================================================
 TYPEINIT1(FmFilterItems, FmParentData);
-//------------------------------------------------------------------------
+
 FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) const
 {
     for (   ::std::vector< FmFilterData* >::const_iterator i = m_aChildren.begin();
@@ -185,7 +185,7 @@ FmFilterItem* FmFilterItems::Find( const ::sal_Int32 _nFilterComponentIndex ) co
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 Image FmFilterItems::GetImage() const
 {
     static Image aImage;
@@ -200,7 +200,7 @@ Image FmFilterItems::GetImage() const
 
 //========================================================================
 TYPEINIT1(FmFilterItem, FmFilterData);
-//------------------------------------------------------------------------
+
 FmFilterItem::FmFilterItem( FmFilterItems* pParent,
                             const OUString& aFieldName,
                             const OUString& aText,
@@ -211,7 +211,7 @@ FmFilterItem::FmFilterItem( FmFilterItems* pParent,
 {
 }
 
-//------------------------------------------------------------------------
+
 Image FmFilterItem::GetImage() const
 {
     static Image aImage;
@@ -322,7 +322,7 @@ public:
         const OUString& rText);
 };
 
-//------------------------------------------------------------------------
+
 FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexAccess >& xControllers)
     :m_pModel( pModel )
     ,m_xControllers( xControllers )
@@ -330,13 +330,13 @@ FmFilterAdapter::FmFilterAdapter(FmFilterModel* pModel, const Reference< XIndexA
     AddOrRemoveListener( m_xControllers, true );
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterAdapter::dispose() throw( RuntimeException )
 {
     AddOrRemoveListener( m_xControllers, false );
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd )
 {
     for (sal_Int32 i = 0, nLen = _rxControllers->getCount(); i < nLen; ++i)
@@ -359,7 +359,7 @@ void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxC
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterAdapter::setText(sal_Int32 nRowPos,
                               const FmFilterItem* pFilterItem,
                               const OUString& rText)
@@ -379,12 +379,12 @@ void FmFilterAdapter::setText(sal_Int32 nRowPos,
 
 
 // XEventListener
-//------------------------------------------------------------------------
+
 void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------
+
 namespace
 {
     OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl )
@@ -419,7 +419,7 @@ namespace
 }
 
 // XFilterControllerListener
-//------------------------------------------------------------------------
+
 void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
@@ -469,7 +469,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
     m_pModel->EnsureEmptyFilterRows( *pFormItem );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -504,7 +504,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermRemoved( const FilterEvent& _Event
     m_pModel->EnsureEmptyFilterRows( *pFormItem );
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -536,7 +536,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event )
 // class FmFilterModel
 //========================================================================
 TYPEINIT1(FmFilterModel, FmParentData);
-//------------------------------------------------------------------------
+
 FmFilterModel::FmFilterModel()
               :FmParentData(NULL, OUString())
               ,OSQLParserClient(comphelper::getProcessComponentContext())
@@ -545,13 +545,13 @@ FmFilterModel::FmFilterModel()
 {
 }
 
-//------------------------------------------------------------------------
+
 FmFilterModel::~FmFilterModel()
 {
     Clear();
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Clear()
 {
     // notify
@@ -577,7 +577,7 @@ void FmFilterModel::Clear()
     m_aChildren.clear();
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent)
 {
     if ( xCurrent == m_xController )
@@ -610,7 +610,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, const
         SetCurrentController(xCurrent);
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmParentData* pParent)
 {
     try
@@ -678,7 +678,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
     }
 }
 
-//------------------------------------------------------------------------
+
 FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XFormController > & xController) const
 {
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
@@ -700,7 +700,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, const Reference< XForm >& xForm) const
 {
     for (::std::vector<FmFilterData*>::const_iterator i = rItems.begin();
@@ -722,7 +722,7 @@ FmFormItem* FmFilterModel::Find(const ::std::vector<FmFilterData*>& rItems, cons
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::SetCurrentController(const Reference< XFormController > & xCurrent)
 {
     if ( xCurrent == m_xController )
@@ -749,7 +749,7 @@ void FmFilterModel::SetCurrentController(const Reference< XFormController > & xC
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem )
 {
     // insert the condition behind the last filter items
@@ -777,7 +777,7 @@ void FmFilterModel::AppendFilterItems( FmFormItem& _rFormItem )
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, FmFilterData* pData)
 {
     ::std::vector<FmFilterData*>& rItems = pData->GetParent()->GetChildren();
@@ -789,7 +789,7 @@ void FmFilterModel::Insert(const ::std::vector<FmFilterData*>::iterator& rPos, F
     Broadcast( aInsertedHint );
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Remove(FmFilterData* pData)
 {
     FmParentData* pParent = pData->GetParent();
@@ -853,7 +853,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos )
 {
     // remove from parent's child list
@@ -867,7 +867,7 @@ void FmFilterModel::Remove( const ::std::vector<FmFilterData*>::iterator& rPos )
     delete pData;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUString& rErrorMsg) const
 {
     FmFormItem* pFormItem = PTR_CAST( FmFormItem, pItem->GetParent()->GetParent() );
@@ -912,13 +912,13 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr
     return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem)
 {
     Insert(pItems->GetChildren().end(), pFilterItem);
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText)
 {
     ::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChildren();
@@ -938,7 +938,7 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
 {
     if (m_pCurrentItems == pCurrent)
@@ -983,7 +983,7 @@ void FmFilterModel::SetCurrentItems(FmFilterItems* pCurrent)
     Broadcast( aHint );
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterModel::EnsureEmptyFilterRows( FmParentData& _rItem )
 {
     // checks whether for each form there's one free level for input
@@ -1033,7 +1033,7 @@ public:
 };
 
 const int nxDBmp = 12;
-//------------------------------------------------------------------------
+
 void FmFilterItemsString::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* pEntry)
 {
@@ -1067,7 +1067,7 @@ void FmFilterItemsString::Paint(
     rDev.DrawText( Point(rPos.X() + nxDBmp, rPos.Y()), GetText() );
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
 {
     if( !pViewData )
@@ -1099,7 +1099,7 @@ public:
 
 const int nxD = 4;
 
-//------------------------------------------------------------------------
+
 void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
 {
     if( !pViewData )
@@ -1116,7 +1116,7 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
     pViewData->maSize = aSize;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterString::Paint(
     const Point& rPos, SvTreeListBox& rDev, const SvViewDataEntry* /*pView*/, const SvTreeListEntry* /*pEntry*/)
 {
@@ -1166,14 +1166,14 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent )
     m_aDropActionTimer.SetTimeoutHdl(LINK(this, FmFilterNavigator, OnDropActionTimer));
 }
 
-//------------------------------------------------------------------------
+
 FmFilterNavigator::~FmFilterNavigator()
 {
     EndListening( *m_pModel );
     delete m_pModel;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControllers, const Reference< XFormController > & xCurrent)
 {
     if (xCurrent == m_pModel->GetCurrentController())
@@ -1200,7 +1200,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl
     }
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection )
 {
     m_pEditingCurrently = pEntry;
@@ -1210,7 +1210,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rS
     return pEntry && ((FmFilterData*)pEntry->GetUserData())->ISA(FmFilterItem);
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
 {
     DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!");
@@ -1257,7 +1257,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry )
 {
     // now remove the entry
@@ -1265,7 +1265,7 @@ IMPL_LINK( FmFilterNavigator, OnRemove, SvTreeListEntry*, pEntry )
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer)
 {
     if (--m_aTimerCounter > 0)
@@ -1299,7 +1299,7 @@ IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer)
 }
 
 
-//------------------------------------------------------------------------
+
 sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
 {
     Point aDropPos = rEvt.maPosPixel;
@@ -1391,7 +1391,7 @@ sal_Int8 FmFilterNavigator::AcceptDrop( const AcceptDropEvent& rEvt )
 
     return rEvt.mnAction;
 }
-// -----------------------------------------------------------------------------
+
 namespace
 {
     FmFilterItems* getTargetItems(SvTreeListEntry* _pTarget)
@@ -1405,7 +1405,7 @@ namespace
         return pTargetItems;
     }
 }
-//------------------------------------------------------------------------
+
 sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
     // ware schlecht, wenn nach dem Droppen noch gescrollt wird ...
@@ -1434,7 +1434,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
                                   const OUString& rStr,
                                   const Image& rImg1,
@@ -1453,7 +1453,7 @@ void FmFilterNavigator::InitEntry(SvTreeListEntry* pEntry,
         pEntry->ReplaceItem( pString, 1 );
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
 {
     if (bSelect == IsSelected(pEntry))  // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
@@ -1488,7 +1488,7 @@ sal_Bool FmFilterNavigator::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
         return sal_False;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if (rHint.ISA(FmFilterInsertedHint))
@@ -1521,7 +1521,7 @@ void FmFilterNavigator::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     }
 }
 
-//------------------------------------------------------------------------
+
 SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
 {
     SvTreeListEntry* pEntry = NULL;
@@ -1537,7 +1537,7 @@ SvTreeListEntry* FmFilterNavigator::FindEntry(const FmFilterData* pItem) const
     return pEntry;
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos)
 {
     const FmParentData* pParent = pItem->GetParent() ? pItem->GetParent() : GetFilterModel();
@@ -1549,7 +1549,7 @@ void FmFilterNavigator::Insert(FmFilterData* pItem, sal_uLong nPos)
         Expand( pParentEntry );
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterNavigator::Remove(FmFilterData* pItem)
 {
     // der Entry zu den Daten
@@ -1562,7 +1562,7 @@ void FmFilterNavigator::Remove(FmFilterData* pItem)
     if (pEntry)
         GetModel()->Remove( pEntry );
 }
-// -----------------------------------------------------------------------------
+
 FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem*>& _rItemList)
 {
     // be sure that the data is only used within only one form!
@@ -1596,7 +1596,7 @@ FmFormItem* FmFilterNavigator::getSelectedFilterItems(::std::vector<FmFilterItem
         pFirstItem = NULL;
     return pFirstItem;
 }
-// -----------------------------------------------------------------------------
+
 void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rFilterList,FmFilterItems* _pTargetItems,sal_Bool _bCopy)
 {
     ::std::vector<FmFilterItem*>::const_iterator aEnd = _rFilterList.end();
@@ -1627,7 +1627,7 @@ void FmFilterNavigator::insertFilterItem(const ::std::vector<FmFilterItem*>& _rF
     m_pModel->EnsureEmptyFilterRows( *_pTargetItems->GetParent() );
 }
 
-//------------------------------------------------------------------------------
+
 void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
 {
     EndSelection();
@@ -1644,7 +1644,7 @@ void FmFilterNavigator::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmFilterNavigator::Command( const CommandEvent& rEvt )
 {
     sal_Bool bHandled = sal_False;
@@ -1746,7 +1746,7 @@ void FmFilterNavigator::Command( const CommandEvent& rEvt )
     if (!bHandled)
         SvTreeListBox::Command( rEvt );
 }
-// -----------------------------------------------------------------------------
+
 SvTreeListEntry* FmFilterNavigator::getNextEntry(SvTreeListEntry* _pStartWith)
 {
     SvTreeListEntry* pEntry = _pStartWith ? _pStartWith : LastSelected();
@@ -1756,7 +1756,7 @@ SvTreeListEntry* FmFilterNavigator::getNextEntry(SvTreeListEntry* _pStartWith)
         pEntry = Next(pEntry);
     return pEntry;
 }
-// -----------------------------------------------------------------------------
+
 SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith)
 {
     SvTreeListEntry* pEntry = _pStartWith ? _pStartWith : FirstSelected();
@@ -1771,7 +1771,7 @@ SvTreeListEntry* FmFilterNavigator::getPrevEntry(SvTreeListEntry* _pStartWith)
     }
     return pEntry;
 }
-//------------------------------------------------------------------------
+
 void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
 {
     const KeyCode&  rKeyCode = rKEvt.GetKeyCode();
@@ -1855,7 +1855,7 @@ void FmFilterNavigator::KeyInput(const KeyEvent& rKEvt)
     SvTreeListBox::KeyInput(rKEvt);
 }
 
-//------------------------------------------------------------------------------
+
 void FmFilterNavigator::DeleteSelection()
 {
     // to avoid the deletion of an entry twice (e.g. deletion of a parent and afterward
@@ -1884,7 +1884,7 @@ void FmFilterNavigator::DeleteSelection()
         m_pModel->Remove((FmFilterData*)(*i)->GetUserData());
     }
 }
-// -----------------------------------------------------------------------------
+
 
 //========================================================================
 // class FmFilterNavigatorWin
@@ -1902,13 +1902,13 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin
     SfxDockingWindow::SetFloatingSize( Size(200,200) );
 }
 
-//------------------------------------------------------------------------
+
 FmFilterNavigatorWin::~FmFilterNavigatorWin()
 {
     delete m_pNavigator;
 }
 
-//-----------------------------------------------------------------------
+
 void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell)
 {
     if (!pFormShell)
@@ -1932,7 +1932,7 @@ void FmFilterNavigatorWin::UpdateContent(FmFormShell* pFormShell)
     }
 }
 
-//-----------------------------------------------------------------------
+
 void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if( !pState  || SID_FM_FILTER_NAVIGATOR_CONTROL != nSID )
@@ -1947,7 +1947,7 @@ void FmFilterNavigatorWin::StateChanged( sal_uInt16 nSID, SfxItemState eState, c
         UpdateContent( NULL );
 }
 
-//-----------------------------------------------------------------------
+
 bool FmFilterNavigatorWin::Close()
 {
     if ( m_pNavigator && m_pNavigator->IsEditingActive() )
@@ -1961,14 +1961,14 @@ bool FmFilterNavigatorWin::Close()
     return SfxDockingWindow::Close();
 }
 
-//-----------------------------------------------------------------------
+
 void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const
 {
     SfxDockingWindow::FillInfo( rInfo );
     rInfo.bVisible = sal_False;
 }
 
-//-----------------------------------------------------------------------
+
 Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign )
 {
     if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) )
@@ -1977,7 +1977,7 @@ Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign )
     return SfxDockingWindow::CalcDockingSize( eAlign );
 }
 
-//-----------------------------------------------------------------------
+
 SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign )
 {
     switch (eAlign)
@@ -1993,7 +1993,7 @@ SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAl
     return (eActAlign);
 }
 
-//------------------------------------------------------------------------
+
 void FmFilterNavigatorWin::Resize()
 {
     SfxDockingWindow::Resize();
@@ -2008,14 +2008,14 @@ void FmFilterNavigatorWin::Resize()
 
     m_pNavigator->SetPosSizePixel( aExplPos, aExplSize );
 }
-// -----------------------------------------------------------------------------
+
 void FmFilterNavigatorWin::GetFocus()
 {
     // oj #97405#
     if ( m_pNavigator )
         m_pNavigator->GrabFocus();
 }
-// -----------------------------------------------------------------------------
+
 
 
 //========================================================================
@@ -2023,7 +2023,7 @@ void FmFilterNavigatorWin::GetFocus()
 //========================================================================
 SFX_IMPL_DOCKINGWINDOW( FmFilterNavigatorWinMgr, SID_FM_FILTER_NAVIGATOR )
 
-//-----------------------------------------------------------------------
+
 FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( Window *_pParent, sal_uInt16 _nId,
                                     SfxBindings *_pBindings, SfxChildWinInfo* _pInfo )
                  :SfxChildWindow( _pParent, _nId )
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 1c24dbc2da06..db0fc3a19738 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -78,10 +78,10 @@ using ::com::sun::star::awt::XWindow;
 //========================================================================
 //= FmPropBrwMgr
 //========================================================================
-//-----------------------------------------------------------------------
+
 SFX_IMPL_FLOATINGWINDOW(FmPropBrwMgr, SID_FM_SHOW_PROPERTIES)
 
-//-----------------------------------------------------------------------
+
 FmPropBrwMgr::FmPropBrwMgr( Window* _pParent, sal_uInt16 _nId,
                             SfxBindings* _pBindings, SfxChildWinInfo* _pInfo)
               :SfxChildWindow(_pParent, _nId)
@@ -190,7 +190,7 @@ OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
 // class FmPropBrw
 //========================================================================
 DBG_NAME(FmPropBrw);
-//------------------------------------------------------------------------
+
 FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings* _pBindings,
             SfxChildWindow* _pMgr, Window* _pParent, const SfxChildWinInfo* _pInfo )
     :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_3DLOOK|WB_ROLLABLE) )
@@ -240,7 +240,7 @@ FmPropBrw::FmPropBrw( const Reference< XComponentContext >& _xORB, SfxBindings*
         m_sLastActivePage = _pInfo->aExtraString;
 }
 
-//------------------------------------------------------------------------
+
 void FmPropBrw::Resize()
 {
     SfxFloatingWindow::Resize();
@@ -259,7 +259,7 @@ void FmPropBrw::Resize()
     }
 }
 
-//------------------------------------------------------------------------
+
 FmPropBrw::~FmPropBrw()
 {
     if (m_xBrowserController.is())
@@ -287,7 +287,7 @@ FmPropBrw::~FmPropBrw()
     DBG_DTOR(FmPropBrw,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 OUString FmPropBrw::getCurrentPage() const
 {
     OUString sCurrentPage;
@@ -308,7 +308,7 @@ OUString FmPropBrw::getCurrentPage() const
     return sCurrentPage;
 }
 
-//-----------------------------------------------------------------------
+
 void FmPropBrw::implDetachController()
 {
     m_sLastActivePage = getCurrentPage();
@@ -336,7 +336,7 @@ void FmPropBrw::implDetachController()
     m_xMeAsFrame.clear();
 }
 
-//-----------------------------------------------------------------------
+
 bool FmPropBrw::Close()
 {
     // suspend the controller (it is allowed to veto)
@@ -375,7 +375,7 @@ bool FmPropBrw::Close()
     return bClose;
 }
 
-//-----------------------------------------------------------------------
+
 bool FmPropBrw::implIsReadOnlyModel() const
 {
     try
@@ -391,7 +391,7 @@ bool FmPropBrw::implIsReadOnlyModel() const
     return true;
 }
 
-//-----------------------------------------------------------------------
+
 void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
 {
     if ( m_xBrowserController.is() )
@@ -482,14 +482,14 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
     }
 }
 
-//-----------------------------------------------------------------------
+
 void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 {
     rInfo.bVisible = sal_False;
     rInfo.aExtraString = getCurrentPage();
 }
 
-//-----------------------------------------------------------------------
+
 IMPL_LINK( FmPropBrw, OnAsyncGetFocus, void*, /*NOTINTERESTEDIN*/ )
 {
     if (m_xBrowserComponentWindow.is())
@@ -497,7 +497,7 @@ IMPL_LINK( FmPropBrw, OnAsyncGetFocus, void*, /*NOTINTERESTEDIN*/ )
     return 0L;
 }
 
-//-----------------------------------------------------------------------
+
 namespace
 {
     static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext )
@@ -513,7 +513,7 @@ namespace
         return bEnabled;
     }
 }
-//-----------------------------------------------------------------------
+
 void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
 {
     // the document in which we live
@@ -595,7 +595,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
     }
 }
 
-//-----------------------------------------------------------------------
+
 void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell )
 {
     // the document in which we live
@@ -628,7 +628,7 @@ void FmPropBrw::impl_ensurePropertyBrowser_nothrow( FmFormShell* _pFormShell )
     m_xLastKnownDocument = xDocument;
 }
 
-//-----------------------------------------------------------------------
+
 void FmPropBrw::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState)
 {
     if (!pState  || SID_FM_PROPERTY_CONTROL != nSID)
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index df4a49bbeaaf..45e0bc23f792 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -39,7 +39,7 @@ namespace svxform
     //====================================================================
     //= helper
     //====================================================================
-    //--------------------------------------------------------------------
+
     static void setUnderline( const Reference< XVclWindowPeer >& _rxPeer, const UnderlineDescriptor& _rUnderline )
     {
         OSL_ENSURE( _rxPeer.is(), "setUnderline: invalid peer!" );
@@ -53,7 +53,7 @@ namespace svxform
         _rxPeer->setProperty( FM_PROP_TEXTLINECOLOR, makeAny( _rUnderline.nUnderlineColor ) );
     }
 
-    //--------------------------------------------------------------------
+
     static void getUnderline( const Reference< XVclWindowPeer >& _rxPeer, UnderlineDescriptor& _rUnderline )
     {
         OSL_ENSURE( _rxPeer.is(), "getUnderline: invalid peer!" );
@@ -65,7 +65,7 @@ namespace svxform
         OSL_VERIFY( _rxPeer->getProperty( FM_PROP_TEXTLINECOLOR ) >>= _rUnderline.nUnderlineColor );
     }
 
-    //--------------------------------------------------------------------
+
     static void getBorder( const Reference< XVclWindowPeer >& _rxPeer, BorderDescriptor& _rBoder )
     {
         OSL_ENSURE( _rxPeer.is(), "getBorder: invalid peer!" );
@@ -74,7 +74,7 @@ namespace svxform
         OSL_VERIFY( _rxPeer->getProperty( FM_PROP_BORDERCOLOR ) >>= _rBoder.nBorderColor );
     }
 
-    //--------------------------------------------------------------------
+
     static void setBorder( const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rBoder )
     {
         OSL_ENSURE( _rxPeer.is(), "setBorder: invalid peer!" );
@@ -86,7 +86,7 @@ namespace svxform
     //====================================================================
     //= ControlBorderManager
     //====================================================================
-    //--------------------------------------------------------------------
+
     ControlBorderManager::ControlBorderManager()
         :m_nFocusColor    ( 0x000000FF )
         ,m_nMouseHoveColor( 0x007098BE )
@@ -95,12 +95,12 @@ namespace svxform
     {
     }
 
-    //--------------------------------------------------------------------
+
     ControlBorderManager::~ControlBorderManager()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool ControlBorderManager::canColorBorder( const Reference< XVclWindowPeer >& _rxPeer )
     {
         OSL_PRECOND( _rxPeer.is(), "ControlBorderManager::canColorBorder: invalid peer!" );
@@ -135,7 +135,7 @@ namespace svxform
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     ControlStatus ControlBorderManager::getControlStatus( const Reference< XControl >& _rxControl ) SAL_THROW(())
     {
         ControlStatus nStatus = CONTROL_STATUS_NONE;
@@ -152,7 +152,7 @@ namespace svxform
         return nStatus;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 ControlBorderManager::getControlColorByStatus( ControlStatus _nStatus )
     {
         // "invalid" is ranked highest
@@ -171,7 +171,7 @@ namespace svxform
         return 0x00000000;
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::updateBorderStyle( const Reference< XControl >& _rxControl, const Reference< XVclWindowPeer >& _rxPeer, const BorderDescriptor& _rFallback ) SAL_THROW(())
     {
         OSL_PRECOND( _rxControl.is() && _rxPeer.is(), "ControlBorderManager::updateBorderStyle: invalid parameters!" );
@@ -187,7 +187,7 @@ namespace svxform
         setBorder( _rxPeer, aBorder );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::determineOriginalBorderStyle( const Reference< XControl >& _rxControl, BorderDescriptor& _rData ) const
     {
         _rData = ControlData();
@@ -214,7 +214,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::controlStatusGained( const Reference< XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(())
     {
         if ( _rxControl == _rControlData.xControl )
@@ -247,7 +247,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::controlStatusLost( const Reference< XInterface >& _rxControl, ControlData& _rControlData ) SAL_THROW(())
     {
         if ( _rxControl != _rControlData.xControl )
@@ -271,20 +271,20 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::enableDynamicBorderColor( )
     {
         m_bDynamicBorderColors = true;
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::disableDynamicBorderColor( )
     {
         m_bDynamicBorderColors = false;
         restoreAll();
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::setStatusColor( ControlStatus _nStatus, sal_Int32 _nColor )
     {
         switch ( _nStatus )
@@ -303,7 +303,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::restoreAll()
     {
         if ( m_aFocusControl.xControl.is() )
@@ -329,35 +329,35 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::focusGained( const Reference< XInterface >& _rxControl ) SAL_THROW(())
     {
         if ( m_bDynamicBorderColors )
             controlStatusGained( _rxControl, m_aFocusControl );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::focusLost( const Reference< XInterface >& _rxControl ) SAL_THROW(())
     {
         if ( m_bDynamicBorderColors )
             controlStatusLost( _rxControl, m_aFocusControl );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::mouseEntered( const Reference< XInterface >& _rxControl ) SAL_THROW(())
     {
         if ( m_bDynamicBorderColors )
             controlStatusGained( _rxControl, m_aMouseHoverControl );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::mouseExited( const Reference< XInterface >& _rxControl ) SAL_THROW(())
     {
         if ( m_bDynamicBorderColors )
             controlStatusLost( _rxControl, m_aMouseHoverControl );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlBorderManager::validityChanged( const Reference< XControl >& _rxControl, const Reference< XValidatableFormComponent >& _rxValidatable ) SAL_THROW(())
     {
         try
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 1a2a3b8fe449..215ffa838aa3 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -70,7 +70,7 @@ namespace svxform
     namespace VisualEffect = ::com::sun::star::awt::VisualEffect;
     namespace ScriptType = ::com::sun::star::i18n::ScriptType;
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //....................................................................
@@ -193,7 +193,7 @@ namespace svxform
     //====================================================================
     //= ControlLayouter
     //====================================================================
-    //--------------------------------------------------------------------
+
     Reference< XPropertySet > ControlLayouter::getDefaultDocumentTextStyle( const Reference< XPropertySet >& _rxModel )
     {
         // the style family collection
@@ -210,7 +210,7 @@ namespace svxform
         return Reference< XPropertySet >( xStyleFamily->getByName( sStyleName ), UNO_QUERY_THROW );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlLayouter::initializeControlLayout( const Reference< XPropertySet >& _rxControlModel, DocumentType _eDocType )
     {
         DBG_ASSERT( _rxControlModel.is(), "ControlLayouter::initializeControlLayout: invalid model!" );
@@ -279,7 +279,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     ::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType )
     {
         OUString sConfigName = "/org.openoffice.Office.Common/Forms/ControlLayout/";
@@ -289,7 +289,7 @@ namespace svxform
             sConfigName );
     }
 
-    //--------------------------------------------------------------------
+
     bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType )
     {
         OConfigurationNode aConfig = getLayoutSettings( _eDocType );
@@ -299,7 +299,7 @@ namespace svxform
         return bDynamicBorderColor;
     }
 
-    //--------------------------------------------------------------------
+
     bool ControlLayouter::useDocumentReferenceDevice( DocumentType _eDocType )
     {
         if ( _eDocType == eUnknownDocumentType )
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 6012e9c2009d..d1403f689ff9 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -27,7 +27,7 @@
 
 using namespace ::svxform;
 
-//-----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SvxFmMSFactory::createInstance(const OUString& rServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xRet;
@@ -46,7 +46,7 @@ using namespace ::svxform;
     return xRet;
 }
 
-//-----------------------------------------------------------------------------
+
 
 // Encapsulation violation: We *know* that
 // SvxUnoDrawMSFactory::createInstanceWithArguments() always throws.
@@ -60,7 +60,7 @@ SAL_WNOUNREACHABLE_CODE_PUSH
 
 SAL_WNOUNREACHABLE_CODE_POP
 
-//-----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
 {
     static const OUString aSvxComponentServiceNameList[] =
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index 35a6f7bba458..cbdcd6e0ad79 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -78,14 +78,14 @@ namespace svxform
     //====================================================================
     namespace
     {
-        //----------------------------------------------------------------
+
         struct ModuleInfo
         {
             const sal_Char* pAsciiModuleOrServiceName;
             DocumentType    eType;
         };
 
-        //----------------------------------------------------------------
+
         const ModuleInfo* lcl_getModuleInfo()
         {
             static const ModuleInfo aModuleInfo[] =
@@ -108,7 +108,7 @@ namespace svxform
     //====================================================================
     //= DocumentClassification
     //====================================================================
-    //--------------------------------------------------------------------
+
     DocumentType DocumentClassification::classifyDocument( const Reference< XModel >& _rxDocumentModel ) SAL_THROW(())
     {
         DocumentType eType( eUnknownDocumentType );
@@ -147,7 +147,7 @@ namespace svxform
         return eType;
     }
 
-    //--------------------------------------------------------------------
+
     DocumentType DocumentClassification::classifyHostDocument( const Reference< XInterface >& _rxFormComponent ) SAL_THROW(())
     {
         DocumentType eType( eUnknownDocumentType );
@@ -167,7 +167,7 @@ namespace svxform
         return eType;
     }
 
-    //--------------------------------------------------------------------
+
     DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const OUString& _rModuleIdentifier )
     {
         const ModuleInfo* pModuleInfo = lcl_getModuleInfo();
@@ -180,7 +180,7 @@ namespace svxform
         return eUnknownDocumentType;
     }
 
-    //--------------------------------------------------------------------
+
     OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType )
     {
         const ModuleInfo* pModuleInfo = lcl_getModuleInfo();
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index c137183caf2f..ca1e27c06846 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -39,14 +39,14 @@ namespace svxform
     //====================================================================
     //= OLocalExchange
     //====================================================================
-    //--------------------------------------------------------------------
+
     OLocalExchange::OLocalExchange( )
         :m_bDragging( sal_False )
         ,m_bClipboardOwner( sal_False )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchange::copyToClipboard( Window* _pWindow, const GrantAccess& )
     {
         if ( m_bClipboardOwner )
@@ -59,7 +59,7 @@ namespace svxform
         CopyToClipboard( _pWindow );
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchange::clear()
     {
         if ( isClipboardOwner() )
@@ -78,7 +78,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OLocalExchange::lostOwnership( const Reference< clipboard::XClipboard >& _rxClipboard, const Reference< XTransferable >& _rxTrans ) throw(RuntimeException)
     {
         TransferableHelper::implCallOwnLostOwnership( _rxClipboard, _rxTrans );
@@ -88,21 +88,21 @@ namespace svxform
             m_aClipboardListener.Call( this );
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchange::startDrag( Window* _pWindow, sal_Int8 _nDragSourceActions, const GrantAccess& )
     {
         m_bDragging = sal_True;
         StartDrag( _pWindow, _nDragSourceActions );
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchange::DragFinished( sal_Int8 nDropAction )
     {
         TransferableHelper::DragFinished( nDropAction );
         m_bDragging = sal_False;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OLocalExchange::hasFormat( const DataFlavorExVector& _rFormats, sal_uInt32 _nFormatId )
     {
         DataFlavorExVector::const_iterator aSearch;
@@ -114,7 +114,7 @@ namespace svxform
         return aSearch != _rFormats.end();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OLocalExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& /*_rFlavor*/ )
     {
         return sal_False;   // do not have any formats by default
@@ -123,13 +123,13 @@ namespace svxform
     //====================================================================
     //= OControlTransferData
     //====================================================================
-    //--------------------------------------------------------------------
+
     OControlTransferData::OControlTransferData( )
         :m_pFocusEntry( NULL )
     {
     }
 
-    //--------------------------------------------------------------------
+
     OControlTransferData::OControlTransferData( const Reference< XTransferable >& _rxTransferable )
         :m_pFocusEntry( NULL )
     {
@@ -161,14 +161,14 @@ namespace svxform
         updateFormats( );
     }
 
-    //--------------------------------------------------------------------
+
     static sal_Bool lcl_fillDataFlavorEx( SotFormatStringId nId, DataFlavorEx& _rFlavor )
     {
         _rFlavor.mnSotId = nId;
         return SotExchange::GetFormatDataFlavor( _rFlavor.mnSotId, _rFlavor );
     }
 
-    //--------------------------------------------------------------------
+
     void OControlTransferData::updateFormats( )
     {
         m_aCurrentFormats.clear();
@@ -195,32 +195,32 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     size_t OControlTransferData::onEntryRemoved( SvTreeListEntry* _pEntry )
     {
         m_aSelectedEntries.erase( _pEntry );
         return m_aSelectedEntries.size();
     }
 
-    //--------------------------------------------------------------------
+
     void OControlTransferData::addSelectedEntry( SvTreeListEntry* _pEntry )
     {
         m_aSelectedEntries.insert( _pEntry );
     }
 
-    //--------------------------------------------------------------------
+
     void OControlTransferData::setFocusEntry( SvTreeListEntry* _pFocusEntry )
     {
         m_pFocusEntry = _pFocusEntry;
     }
 
-    //------------------------------------------------------------------------
+
     void OControlTransferData::addHiddenControlsFormat(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > > seqInterfaces)
     {
         m_aHiddenControlModels = seqInterfaces;
     }
 
-    //------------------------------------------------------------------------
+
     void OControlTransferData::buildPathFormat(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot)
     {
         m_aControlPaths.realloc(0);
@@ -261,7 +261,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OControlTransferData::buildListFromPath(SvTreeListBox* pTreeBox, SvTreeListEntry* pRoot)
     {
         ListBoxEntrySet aEmpty;
@@ -284,12 +284,12 @@ namespace svxform
     //====================================================================
     //= OControlExchange
     //====================================================================
-    //--------------------------------------------------------------------
+
     OControlExchange::OControlExchange( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool OControlExchange::GetData( const DataFlavor& _rFlavor )
     {
         const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor );
@@ -315,7 +315,7 @@ namespace svxform
         return sal_True;
     }
 
-    //--------------------------------------------------------------------
+
     void OControlExchange::AddSupportedFormats()
     {
         if (m_pFocusEntry && !m_aSelectedEntries.empty())
@@ -328,7 +328,7 @@ namespace svxform
             AddFormat(getHiddenControlModelsFormatId());
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt32 OControlExchange::getControlPathFormatId()
     {
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -340,7 +340,7 @@ namespace svxform
         return s_nFormat;
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt32 OControlExchange::getHiddenControlModelsFormatId()
     {
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -352,7 +352,7 @@ namespace svxform
         return s_nFormat;
     }
 
-    //--------------------------------------------------------------------
+
     sal_uInt32 OControlExchange::getFieldExchangeFormatId()
     {
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
@@ -375,34 +375,34 @@ namespace svxform
     //====================================================================
     //= OLocalExchangeHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     OLocalExchangeHelper::OLocalExchangeHelper(Window* _pDragSource)
         :m_pDragSource(_pDragSource)
         ,m_pTransferable(NULL)
     {
     }
 
-    //--------------------------------------------------------------------
+
     OLocalExchangeHelper::~OLocalExchangeHelper()
     {
         implReset();
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchangeHelper::startDrag( sal_Int8 nDragSourceActions )
     {
         DBG_ASSERT(m_pTransferable, "OLocalExchangeHelper::startDrag: not prepared!");
         m_pTransferable->startDrag( m_pDragSource, nDragSourceActions, OLocalExchange::GrantAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchangeHelper::copyToClipboard( ) const
     {
         DBG_ASSERT( m_pTransferable, "OLocalExchangeHelper::copyToClipboard: not prepared!" );
         m_pTransferable->copyToClipboard( m_pDragSource, OLocalExchange::GrantAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchangeHelper::implReset()
     {
         if (m_pTransferable)
@@ -413,7 +413,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void OLocalExchangeHelper::prepareDrag( )
     {
         DBG_ASSERT(!m_pTransferable || !m_pTransferable->isDragging(), "OLocalExchangeHelper::prepareDrag: recursive DnD?");
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 3a6076ad15a8..610060d0335f 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -76,7 +76,7 @@ using namespace ::com::sun::star::container;
 //========================================================================
 TYPEINIT1( FmNavInsertedHint, SfxHint );
 DBG_NAME(FmNavInsertedHint);
-//------------------------------------------------------------------------
+
 FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt32 nRelPos )
     :pEntryData( pInsertedEntryData )
     ,nPos( nRelPos )
@@ -85,7 +85,7 @@ FmNavInsertedHint::FmNavInsertedHint( FmEntryData* pInsertedEntryData, sal_uInt3
     DBG_CTOR(FmNavInsertedHint,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmNavInsertedHint::~FmNavInsertedHint()
 {
     DBG_DTOR(FmNavInsertedHint,NULL);
@@ -97,14 +97,14 @@ FmNavInsertedHint::~FmNavInsertedHint()
 //========================================================================
 TYPEINIT1( FmNavModelReplacedHint, SfxHint );
 DBG_NAME(FmNavModelReplacedHint);
-//------------------------------------------------------------------------
+
 FmNavModelReplacedHint::FmNavModelReplacedHint( FmEntryData* pAffectedEntryData )
     :pEntryData( pAffectedEntryData )
 {
     DBG_CTOR(FmNavModelReplacedHint,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmNavModelReplacedHint::~FmNavModelReplacedHint()
 {
     DBG_DTOR(FmNavModelReplacedHint,NULL);
@@ -115,14 +115,14 @@ FmNavModelReplacedHint::~FmNavModelReplacedHint()
 //========================================================================
 TYPEINIT1( FmNavRemovedHint, SfxHint );
 DBG_NAME(FmNavRemovedHint);
-//------------------------------------------------------------------------
+
 FmNavRemovedHint::FmNavRemovedHint( FmEntryData* pRemovedEntryData )
     :pEntryData( pRemovedEntryData )
 {
     DBG_CTOR(FmNavRemovedHint,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmNavRemovedHint::~FmNavRemovedHint()
 {
     DBG_DTOR(FmNavRemovedHint,NULL);
@@ -134,7 +134,7 @@ FmNavRemovedHint::~FmNavRemovedHint()
 //========================================================================
 TYPEINIT1( FmNavNameChangedHint, SfxHint );
 DBG_NAME(FmNavNameChangedHint);
-//------------------------------------------------------------------------
+
 FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName )
     :pEntryData( pData )
     ,aNewName( rNewName )
@@ -142,7 +142,7 @@ FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString&
     DBG_CTOR(FmNavNameChangedHint,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmNavNameChangedHint::~FmNavNameChangedHint()
 {
     DBG_DTOR(FmNavNameChangedHint,NULL);
@@ -153,13 +153,13 @@ FmNavNameChangedHint::~FmNavNameChangedHint()
 //========================================================================
 TYPEINIT1( FmNavClearedHint, SfxHint );
 DBG_NAME(FmNavClearedHint);
-//------------------------------------------------------------------------
+
 FmNavClearedHint::FmNavClearedHint()
 {
     DBG_CTOR(FmNavClearedHint,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmNavClearedHint::~FmNavClearedHint()
 {
     DBG_DTOR(FmNavClearedHint,NULL);
@@ -179,19 +179,19 @@ TYPEINIT1(FmNavViewMarksChanged, SfxHint);
 // class FmEntryDataList
 //========================================================================
 DBG_NAME(FmEntryDataList);
-//------------------------------------------------------------------------
+
 FmEntryDataList::FmEntryDataList()
 {
     DBG_CTOR(FmEntryDataList,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmEntryDataList::~FmEntryDataList()
 {
     DBG_DTOR(FmEntryDataList,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmEntryData* FmEntryDataList::remove( FmEntryData* pItem )
 {
     for ( FmEntryDataBaseList::iterator it = maEntryDataList.begin();
@@ -208,7 +208,7 @@ FmEntryData* FmEntryDataList::remove( FmEntryData* pItem )
     return pItem;
 }
 
-//------------------------------------------------------------------------
+
 void FmEntryDataList::insert( FmEntryData* pItem, size_t Index )
 {
     if ( Index < maEntryDataList.size() )
@@ -221,7 +221,7 @@ void FmEntryDataList::insert( FmEntryData* pItem, size_t Index )
         maEntryDataList.push_back( pItem );
 }
 
-//------------------------------------------------------------------------
+
 void FmEntryDataList::clear()
 {
     for ( size_t i = 0, n = maEntryDataList.size(); i < n; ++i )
@@ -234,7 +234,7 @@ void FmEntryDataList::clear()
 //========================================================================
 TYPEINIT0( FmEntryData );
 DBG_NAME(FmEntryData);
-//------------------------------------------------------------------------
+
 FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface >& _rxIFace )
     :pParent( pParentData )
 {
@@ -244,7 +244,7 @@ FmEntryData::FmEntryData( FmEntryData* pParentData, const Reference< XInterface
     newObject( _rxIFace );
 }
 
-//------------------------------------------------------------------------
+
 FmEntryData::~FmEntryData()
 {
     Clear();
@@ -252,7 +252,7 @@ FmEntryData::~FmEntryData()
     DBG_DTOR(FmEntryData,NULL);
 }
 
-//------------------------------------------------------------------------
+
 void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace )
 {
     // do not just copy, normalize it
@@ -261,7 +261,7 @@ void FmEntryData::newObject( const ::com::sun::star::uno::Reference< ::com::sun:
     m_xChild = m_xChild.query( m_xNormalizedIFace );
 }
 
-//------------------------------------------------------------------------
+
 FmEntryData::FmEntryData( const FmEntryData& rEntryData )
 {
     pChildList = new FmEntryDataList();
@@ -283,13 +283,13 @@ FmEntryData::FmEntryData( const FmEntryData& rEntryData )
     m_xChild = rEntryData.m_xChild;
 }
 
-//------------------------------------------------------------------------
+
 void FmEntryData::Clear()
 {
     GetChildList()->clear();
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 {
     if(this == pEntryData)
@@ -322,7 +322,7 @@ sal_Bool FmEntryData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 //========================================================================
 TYPEINIT1( FmFormData, FmEntryData );
 DBG_NAME(FmFormData);
-//------------------------------------------------------------------------
+
 FmFormData::FmFormData(
     const Reference< XForm >& _rxForm,
     const ImageList& _rNormalImages,
@@ -352,13 +352,13 @@ FmFormData::FmFormData(
         SetText( OUString() );
 }
 
-//------------------------------------------------------------------------
+
 FmFormData::~FmFormData()
 {
     DBG_DTOR(FmEntryData,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmFormData::FmFormData( const FmFormData& rFormData )
     :FmEntryData( rFormData )
 {
@@ -366,13 +366,13 @@ FmFormData::FmFormData( const FmFormData& rFormData )
     m_xForm = rFormData.GetFormIface();
 }
 
-//------------------------------------------------------------------------
+
 FmEntryData* FmFormData::Clone()
 {
     return new FmFormData( *this );
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 {
     if(this == pEntryData)
@@ -392,7 +392,7 @@ sal_Bool FmFormData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 //========================================================================
 TYPEINIT1( FmControlData, FmEntryData );
 DBG_NAME(FmControlData);
-//------------------------------------------------------------------------
+
 FmControlData::FmControlData(
     const Reference< XFormComponent >& _rxComponent,
     const ImageList& _rNormalImages,
@@ -415,13 +415,13 @@ FmControlData::FmControlData(
     }
 }
 
-//------------------------------------------------------------------------
+
 FmControlData::~FmControlData()
 {
     DBG_DTOR(FmControlData,NULL);
 }
 
-//------------------------------------------------------------------------
+
 FmControlData::FmControlData( const FmControlData& rControlData )
     :FmEntryData( rControlData )
 {
@@ -429,13 +429,13 @@ FmControlData::FmControlData( const FmControlData& rControlData )
     m_xFormComponent = rControlData.GetFormComponent();
 }
 
-//------------------------------------------------------------------------
+
 FmEntryData* FmControlData::Clone()
 {
     return new FmControlData( *this );
 }
 
-//------------------------------------------------------------------------
+
 Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
 {
     //////////////////////////////////////////////////////////////////////
@@ -543,7 +543,7 @@ Image FmControlData::GetImage(const ImageList& ilNavigatorImages) const
     return aImage;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
 {
     if(this == pEntryData)
@@ -559,7 +559,7 @@ sal_Bool FmControlData::IsEqualWithoutChildren( FmEntryData* pEntryData )
     return FmEntryData::IsEqualWithoutChildren( pControlData );
 }
 
-//------------------------------------------------------------------------
+
 void FmControlData::ModelReplaced(
     const Reference< XFormComponent >& _rxNew,
     const ImageList& _rNormalImages
@@ -581,7 +581,7 @@ namespace svxform
     // class NavigatorFrame
     //========================================================================
     DBG_NAME(NavigatorFrame)
-    //------------------------------------------------------------------------
+
     NavigatorFrame::NavigatorFrame( SfxBindings* _pBindings, SfxChildWindow* _pMgr,
                                   Window* _pParent )
       :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) )
@@ -596,20 +596,20 @@ namespace svxform
         SfxDockingWindow::SetFloatingSize( Size(200,200) );
     }
 
-    //------------------------------------------------------------------------
+
     NavigatorFrame::~NavigatorFrame()
     {
         delete m_pNavigatorTree;
         DBG_DTOR(NavigatorFrame,NULL);
     }
 
-    //-----------------------------------------------------------------------
+
     void NavigatorFrame::UpdateContent( FmFormShell* pFormShell )
     {
         m_pNavigatorTree->UpdateContent( pFormShell );
     }
 
-    //-----------------------------------------------------------------------
+
     void NavigatorFrame::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
     {
         if( !pState  || SID_FM_FMEXPLORER_CONTROL != nSID )
@@ -624,7 +624,7 @@ namespace svxform
             UpdateContent( NULL );
     }
 
-    //-----------------------------------------------------------------------
+
     void NavigatorFrame::GetFocus()
     {
         if ( m_pNavigatorTree )
@@ -633,21 +633,21 @@ namespace svxform
             SfxDockingWindow::GetFocus();
     }
 
-    //-----------------------------------------------------------------------
+
     bool NavigatorFrame::Close()
     {
         UpdateContent( NULL );
         return SfxDockingWindow::Close();
     }
 
-    //-----------------------------------------------------------------------
+
     void NavigatorFrame::FillInfo( SfxChildWinInfo& rInfo ) const
     {
         SfxDockingWindow::FillInfo( rInfo );
         rInfo.bVisible = sal_False;
     }
 
-    //-----------------------------------------------------------------------
+
     Size NavigatorFrame::CalcDockingSize( SfxChildAlignment eAlign )
     {
         if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) )
@@ -656,7 +656,7 @@ namespace svxform
         return SfxDockingWindow::CalcDockingSize( eAlign );
     }
 
-    //-----------------------------------------------------------------------
+
     SfxChildAlignment NavigatorFrame::CheckAlignment( SfxChildAlignment _eActAlign, SfxChildAlignment _eAlign )
     {
         if ( ( _eAlign == SFX_ALIGN_LEFT ) || ( _eAlign == SFX_ALIGN_RIGHT ) || ( _eAlign == SFX_ALIGN_NOALIGNMENT ) )
@@ -664,7 +664,7 @@ namespace svxform
         return _eActAlign;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorFrame::Resize()
     {
         SfxDockingWindow::Resize();
@@ -685,10 +685,10 @@ namespace svxform
     // class NavigatorFrameManager
     //========================================================================
 
-    //-----------------------------------------------------------------------
+
     SFX_IMPL_DOCKINGWINDOW( NavigatorFrameManager, SID_FM_SHOW_FMEXPLORER )
 
-    //-----------------------------------------------------------------------
+
     NavigatorFrameManager::NavigatorFrameManager( Window* _pParent, sal_uInt16 _nId,
                                         SfxBindings* _pBindings, SfxChildWinInfo* _pInfo )
                      :SfxChildWindow( _pParent, _nId )
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 6759276e582a..c46e421b7bfd 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -27,27 +27,27 @@
 //========================================================================
 TYPEINIT1(FmInterfaceItem, SfxPoolItem);
 
-//------------------------------------------------------------------------------
+
 bool FmInterfaceItem::operator==( const SfxPoolItem& rAttr ) const
 {
     DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" );
     return( xInterface == ((FmInterfaceItem&)rAttr).GetInterface() );
 }
 
-//------------------------------------------------------------------------------
+
 SfxPoolItem* FmInterfaceItem::Clone( SfxItemPool* ) const
 {
     return new FmInterfaceItem( *this );
 }
 
-//------------------------------------------------------------------------------
+
 SvStream& FmInterfaceItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
 {
     OSL_FAIL( "FmInterfaceItem::Store: not implemented!" );
     return rStrm;
 }
 
-//------------------------------------------------------------------------------
+
 SfxPoolItem* FmInterfaceItem::Create( SvStream& /*rStrm*/, sal_uInt16 ) const
 {
     OSL_FAIL( "FmInterfaceItem::Create: not implemented!" );
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index ce67f0f16d6b..f05aa25c969c 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -218,13 +218,13 @@ SdrPage* FmFormModel::RemoveMasterPage(sal_uInt16 nPgNum)
     return pPage;
 }
 
-//------------------------------------------------------------------------
+
 SdrLayerID FmFormModel::GetControlExportLayerId( const SdrObject& rObj ) const
 {
     return rObj.GetLayer();
 }
 
-//------------------------------------------------------------------------
+
 void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _bForce )
 {
     if( ( _bOpenDesignMode != m_bOpenInDesignMode ) || _bForce )
@@ -238,19 +238,19 @@ void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _
     m_pImpl->bOpenInDesignIsDefaulted = sal_False;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormModel::SetOpenInDesignMode( sal_Bool bOpenDesignMode )
 {
     implSetOpenInDesignMode( bOpenDesignMode, sal_False );
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFormModel::OpenInDesignModeIsDefaulted( )
 {
     return m_pImpl->bOpenInDesignIsDefaulted;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFormModel::ControlsUseRefDevice() const
 {
     if ( !m_pImpl->aControlsUseRefDevice )
@@ -263,7 +263,7 @@ sal_Bool FmFormModel::ControlsUseRefDevice() const
     return *m_pImpl->aControlsUseRefDevice;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus )
 {
     if( _bAutoControlFocus != m_bAutoControlFocus )
@@ -273,7 +273,7 @@ void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus )
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormModel::SetObjectShell( SfxObjectShell* pShell )
 {
     if (pShell == m_pObjShell)
@@ -298,7 +298,7 @@ void FmFormModel::SetObjectShell( SfxObjectShell* pShell )
     }
 }
 
-//------------------------------------------------------------------------
+
 FmXUndoEnvironment& FmFormModel::GetUndoEnv()
 {
     return *m_pImpl->pUndoEnv;
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index f4321fb62a41..da83d8549301 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -58,7 +58,7 @@ using namespace ::svxform;
 
 TYPEINIT1(FmFormObj, SdrUnoObj);
 DBG_NAME(FmFormObj);
-//------------------------------------------------------------------
+
 FmFormObj::FmFormObj(const OUString& rModelName)
           :SdrUnoObj                ( rModelName    )
           ,m_nPos                   ( -1            )
@@ -71,7 +71,7 @@ FmFormObj::FmFormObj(const OUString& rModelName)
     impl_checkRefDevice_nothrow( true );
 }
 
-//------------------------------------------------------------------
+
 FmFormObj::FmFormObj()
           :SdrUnoObj                ( ""  )
           ,m_nPos                   ( -1        )
@@ -80,7 +80,7 @@ FmFormObj::FmFormObj()
     DBG_CTOR(FmFormObj, NULL);
 }
 
-//------------------------------------------------------------------
+
 FmFormObj::~FmFormObj()
 {
     DBG_DTOR(FmFormObj, NULL);
@@ -92,7 +92,7 @@ FmFormObj::~FmFormObj()
     m_aEventsHistory.realloc(0);
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::SetObjEnv(const Reference< XIndexContainer > & xForm, const sal_Int32 nIdx,
                           const Sequence< ScriptEventDescriptor >& rEvts)
 {
@@ -101,7 +101,7 @@ void FmFormObj::SetObjEnv(const Reference< XIndexContainer > & xForm, const sal_
     m_nPos    = nIdx;
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::ClearObjEnv()
 {
     m_xParent.clear();
@@ -109,7 +109,7 @@ void FmFormObj::ClearObjEnv()
     m_nPos = -1;
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
 {
     const FmFormModel* pFormModel = PTR_CAST( FmFormModel, GetModel() );
@@ -148,7 +148,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
     }
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::impl_isolateControlModel_nothrow()
 {
     try
@@ -170,7 +170,7 @@ void FmFormObj::impl_isolateControlModel_nothrow()
     }
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::SetPage(SdrPage* _pNewPage)
 {
     if ( GetPage() == _pNewPage )
@@ -328,19 +328,19 @@ void FmFormObj::SetPage(SdrPage* _pNewPage)
         pNewFormPage->GetImpl().formObjectInserted( *this );
 }
 
-//------------------------------------------------------------------
+
 sal_uInt32 FmFormObj::GetObjInventor()   const
 {
     return FmFormInventor;
 }
 
-//------------------------------------------------------------------
+
 sal_uInt16 FmFormObj::GetObjIdentifier() const
 {
     return OBJ_UNO;
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::clonedFrom(const FmFormObj* _pSource)
 {
     DBG_ASSERT(_pSource != NULL, "FmFormObj::clonedFrom : invalid source !");
@@ -363,7 +363,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
         // if we we're clone there was a call to operator=, so aEvts are excatly the events we need here ...
 }
 
-//------------------------------------------------------------------
+
 FmFormObj* FmFormObj::Clone() const
 {
     FmFormObj* pFormObject = CloneHelper< FmFormObj >();
@@ -374,14 +374,14 @@ FmFormObj* FmFormObj::Clone() const
     return pFormObject;
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::NbcReformatText()
 {
     impl_checkRefDevice_nothrow( false );
     SdrUnoObj::NbcReformatText();
 }
 
-//------------------------------------------------------------------
+
 FmFormObj& FmFormObj::operator= (const FmFormObj& rObj)
 {
     if( this == &rObj )
@@ -407,7 +407,7 @@ FmFormObj& FmFormObj::operator= (const FmFormObj& rObj)
     return *this;
 }
 
-//------------------------------------------------------------------
+
 namespace
 {
     OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
@@ -445,7 +445,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------
+
 Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const Reference<css::form::XForms>& _rTopLevelDestContainer)
 {
     Reference< XInterface >  xTopLevelSouce;
@@ -589,14 +589,14 @@ Reference< XInterface >  FmFormObj::ensureModelEnv(const Reference< XInterface >
     return xDestContainer;
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::SetModel( SdrModel* _pNewModel )
 {
     SdrUnoObj::SetModel( _pNewModel );
     impl_checkRefDevice_nothrow();
 }
 
-//------------------------------------------------------------------
+
 FmFormObj* FmFormObj::GetFormObject( SdrObject* _pSdrObject )
 {
     FmFormObj* pFormObject = dynamic_cast< FmFormObj* >( _pSdrObject );
@@ -609,7 +609,7 @@ FmFormObj* FmFormObj::GetFormObject( SdrObject* _pSdrObject )
     return pFormObject;
 }
 
-//------------------------------------------------------------------
+
 const FmFormObj* FmFormObj::GetFormObject( const SdrObject* _pSdrObject )
 {
     const FmFormObj* pFormObject = dynamic_cast< const FmFormObj* >( _pSdrObject );
@@ -622,7 +622,7 @@ const FmFormObj* FmFormObj::GetFormObject( const SdrObject* _pSdrObject )
     return pFormObject;
 }
 
-//------------------------------------------------------------------
+
 void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XControlModel >& _rxModel )
 {
     SdrUnoObj::SetUnoControlModel( _rxModel );
@@ -634,7 +634,7 @@ void FmFormObj::SetUnoControlModel( const Reference< com::sun::star::awt::XContr
     impl_checkRefDevice_nothrow( true );
 }
 
-//------------------------------------------------------------------
+
 bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
 {
     bool bResult = SdrUnoObj::EndCreate(rStat, eCmd);
@@ -677,14 +677,14 @@ bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
     return bResult;
 }
 
-//------------------------------------------------------------------------------
+
 void FmFormObj::BrkCreate( SdrDragStat& rStat )
 {
     SdrUnoObj::BrkCreate( rStat );
     impl_isolateControlModel_nothrow();
 }
 
-// -----------------------------------------------------------------------------
+
 // #i70852# overload Layer interface to force to FormColtrol layer
 
 SdrLayerID FmFormObj::GetLayer() const
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 4906f554d6f9..644c4ecf11e3 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -55,14 +55,14 @@ using com::sun::star::container::XNameContainer;
 
 TYPEINIT1(FmFormPage, SdrPage);
 
-//------------------------------------------------------------------
+
 FmFormPage::FmFormPage(FmFormModel& rModel, bool bMasterPage)
            :SdrPage(rModel, bMasterPage)
            ,m_pImpl( new FmFormPageImpl( *this ) )
 {
 }
 
-//------------------------------------------------------------------
+
 FmFormPage::FmFormPage(const FmFormPage& rPage)
            :SdrPage(rPage)
            ,m_pImpl(new FmFormPageImpl( *this ) )
@@ -71,13 +71,13 @@ FmFormPage::FmFormPage(const FmFormPage& rPage)
     m_sPageName = rPage.m_sPageName;
 }
 
-//------------------------------------------------------------------
+
 FmFormPage::~FmFormPage()
 {
     delete m_pImpl;
 }
 
-//------------------------------------------------------------------
+
 void FmFormPage::SetModel(SdrModel* pNewModel)
 {
     /* #35055# */
@@ -111,14 +111,14 @@ void FmFormPage::SetModel(SdrModel* pNewModel)
     }
 }
 
-//------------------------------------------------------------------
+
 SdrPage* FmFormPage::Clone() const
 {
     return new FmFormPage(*this);
     // hier fehlt noch ein kopieren der Objekte
 }
 
-//------------------------------------------------------------------
+
 void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
                               const SdrInsertReason* pReason)
 {
@@ -127,7 +127,7 @@ void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos,
         ((FmFormModel*)GetModel())->GetUndoEnv().Inserted(pObj);
 }
 
-//------------------------------------------------------------------
+
 const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate ) const
 {
     const SdrPage& rMasterPage( *this );
@@ -139,7 +139,7 @@ const Reference< css::form::XForms > & FmFormPage::GetForms( bool _bForceCreate
     return pFormPage->m_pImpl->getForms( _bForceCreate );
 }
 
-//------------------------------------------------------------------
+
 sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
                               const HelpEvent& rEvt )
 {
@@ -205,7 +205,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView,
     return sal_True;
 }
 
-//------------------------------------------------------------------
+
 SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum)
 {
     SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 86842ed7959a..e46f288f52d6 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -66,7 +66,7 @@ using ::com::sun::star::drawing::XControlShape;
 using namespace ::svxform;
 
 DBG_NAME(FmFormPageImpl)
-//------------------------------------------------------------------------------
+
 FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage )
                :m_rPage( _rPage )
                ,m_bFirstActivation( sal_True )
@@ -76,7 +76,7 @@ FmFormPageImpl::FmFormPageImpl( FmFormPage& _rPage )
     DBG_CTOR(FmFormPageImpl,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     typedef Reference< XInterface > FormComponent;
@@ -154,7 +154,7 @@ namespace
     };
 }
 
-//------------------------------------------------------------------------------
+
 void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl )
 {
     // clone the Forms collection
@@ -229,7 +229,7 @@ void FmFormPageImpl::initFrom( FmFormPageImpl& i_foreignImpl )
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XMap > FmFormPageImpl::getControlToShapeMap()
 {
     Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY );
@@ -241,7 +241,7 @@ Reference< XMap > FmFormPageImpl::getControlToShapeMap()
     return xControlShapeMap;
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     static void lcl_insertFormObject_throw( const FmFormObj& _object, const Reference< XMap >& _map )
@@ -284,7 +284,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XMap > FmFormPageImpl::impl_createControlShapeMap_nothrow()
 {
     Reference< XMap > xMap;
@@ -314,7 +314,7 @@ Reference< XMap > FmFormPageImpl::impl_createControlShapeMap_nothrow()
     return xMap;
 }
 
-//------------------------------------------------------------------------------
+
 const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCreate )
 {
     if ( m_xForms.is() || !_bForceCreate )
@@ -346,7 +346,7 @@ const Reference< css::form::XForms >& FmFormPageImpl::getForms( bool _bForceCrea
     return m_xForms;
 }
 
-//------------------------------------------------------------------------------
+
 FmFormPageImpl::~FmFormPageImpl()
 {
     xCurrentForm = NULL;
@@ -355,7 +355,7 @@ FmFormPageImpl::~FmFormPageImpl()
     DBG_DTOR(FmFormPageImpl,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 bool FmFormPageImpl::validateCurForm()
 {
     if ( !xCurrentForm.is() )
@@ -369,13 +369,13 @@ bool FmFormPageImpl::validateCurForm()
     return xCurrentForm.is();
 }
 
-//------------------------------------------------------------------------------
+
 void FmFormPageImpl::setCurForm(Reference< ::com::sun::star::form::XForm >  xForm)
 {
     xCurrentForm = xForm;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XForm >  FmFormPageImpl::getDefaultForm()
 {
     Reference< XForm > xForm;
@@ -459,7 +459,7 @@ Reference< XForm >  FmFormPageImpl::getDefaultForm()
     return xForm;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< ::com::sun::star::form::XForm >  FmFormPageImpl::findPlaceInFormComponentHierarchy(
     const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase,
     const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType )
@@ -553,7 +553,7 @@ Reference< ::com::sun::star::form::XForm >  FmFormPageImpl::findPlaceInFormCompo
     return xForm;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XForm >  FmFormPageImpl::findFormForDataSource(
         const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase,
         const OUString& _rCursorSource, sal_Int32 nCommandType)
@@ -635,7 +635,7 @@ Reference< XForm >  FmFormPageImpl::findFormForDataSource(
     return xResultForm;
 }
 
-//------------------------------------------------------------------------------
+
 OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls)
 {
 #if OSL_DEBUG_LEVEL > 0
@@ -676,7 +676,7 @@ OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xForm
     return sName;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void FmFormPageImpl::formModelAssigned( const FmFormObj& _object )
 {
     Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY );
@@ -695,7 +695,7 @@ void FmFormPageImpl::formModelAssigned( const FmFormObj& _object )
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void FmFormPageImpl::formObjectInserted( const FmFormObj& _object )
 {
     Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY );
@@ -713,7 +713,7 @@ void FmFormPageImpl::formObjectInserted( const FmFormObj& _object )
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void FmFormPageImpl::formObjectRemoved( const FmFormObj& _object )
 {
     Reference< XMap > xControlShapeMap( m_aControlShapeMap.get(), UNO_QUERY );
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 3e4374f25ee6..ef746cc93c12 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -180,18 +180,18 @@ namespace svxform
     //====================================================================
     //= FormScriptListener
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormScriptListener::FormScriptListener( FormScriptingEnvironment* pScriptExecutor )
         :m_pScriptExecutor( pScriptExecutor )
     {
     }
 
-    //--------------------------------------------------------------------
+
     FormScriptListener::~FormScriptListener()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const
     {
         // This used to be implemented as:
@@ -728,7 +728,7 @@ namespace svxform
         return delayed_event_listeners.find(k) != delayed_event_listeners.end();
     }
 
-    //--------------------------------------------------------------------
+
     void FormScriptListener::impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSyncronousResult )
     {
         OSL_PRECOND( m_pScriptExecutor, "FormScriptListener::impl_doFireScriptEvent_nothrow: this will crash!" );
@@ -737,7 +737,7 @@ namespace svxform
         m_pScriptExecutor->doFireScriptEvent( _rEvent, _pSyncronousResult );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -758,7 +758,7 @@ namespace svxform
         Application::PostUserEvent( LINK( this, FormScriptListener, OnAsyncScriptEvent ), new ScriptEvent( _rEvent ) );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL FormScriptListener::approveFiring( const ScriptEvent& _rEvent ) throw (InvocationTargetException, RuntimeException)
     {
         Any aResult;
@@ -770,20 +770,20 @@ namespace svxform
         return aResult;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormScriptListener::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormScriptListener::dispose()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         m_pScriptExecutor = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, ScriptEvent*, _pEvent )
     {
         OSL_PRECOND( _pEvent != NULL, "FormScriptListener::OnAsyncScriptEvent: invalid event!" );
@@ -806,7 +806,7 @@ namespace svxform
     //====================================================================
     //= FormScriptingEnvironment
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormScriptingEnvironment::FormScriptingEnvironment( FmFormModel& _rModel )
         :m_refCount( 0 )
         ,m_pScriptListener( NULL )
@@ -818,12 +818,12 @@ namespace svxform
         // This cycle is broken up when our instance is disposed.
     }
 
-    //--------------------------------------------------------------------
+
     FormScriptingEnvironment::~FormScriptingEnvironment()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void FormScriptingEnvironment::impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister )
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -847,25 +847,25 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FormScriptingEnvironment::registerEventAttacherManager( const Reference< XEventAttacherManager >& _rxManager )
     {
         impl_registerOrRevoke_throw( _rxManager, true );
     }
 
-    //--------------------------------------------------------------------
+
     void FormScriptingEnvironment::revokeEventAttacherManager( const Reference< XEventAttacherManager >& _rxManager )
     {
         impl_registerOrRevoke_throw( _rxManager, false );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL FormScriptingEnvironment::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL FormScriptingEnvironment::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -876,12 +876,12 @@ namespace svxform
         return m_refCount;
     }
 
-    //--------------------------------------------------------------------
+
     IFormScriptingEnvironment::~IFormScriptingEnvironment()
     {
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -936,7 +936,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FormScriptingEnvironment::doFireScriptEvent( const ScriptEvent& _rEvent, Any* _pSyncronousResult )
     {
 #ifdef DISABLE_SCRIPTING
@@ -1022,7 +1022,7 @@ namespace svxform
 #endif
     }
 
-    //--------------------------------------------------------------------
+
     void FormScriptingEnvironment::dispose()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -1030,7 +1030,7 @@ namespace svxform
         m_pScriptListener->dispose();
     }
 
-    //--------------------------------------------------------------------
+
     PFormScriptingEnvironment createDefaultFormScriptingEnvironment( FmFormModel& _rModel )
     {
         return new FormScriptingEnvironment( _rModel );
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index bac1280cd1d4..670c26e83fea 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -24,7 +24,7 @@
 
 using namespace com::sun::star;
 
-// ------------------------------------------------------------------------
+
 #define DECL_SERVICE(ImplName)                      \
 uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::Exception );
 
@@ -42,17 +42,17 @@ uno::Reference< uno::XInterface > SAL_CALL ImplName##_NewInstance_Impl(const uno
     DECL_SERVICE( LegacyFormController )
 
 
-// ------------------------------------------------------------------------
+
 namespace svxform
 {
 
-    // ------------------------------------------------------------------------
+
     // declare selfaware service
     uno::Reference< uno::XInterface > SAL_CALL OAddConditionDialog_Create( const uno::Reference< lang::XMultiServiceFactory >& );
     OUString SAL_CALL OAddConditionDialog_GetImplementationName();
     uno::Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames();
 
-    // ------------------------------------------------------------------------
+
     void ImplSmartRegisterUnoServices()
     {
         uno::Reference< lang::XMultiServiceFactory >  xServiceFactory(::comphelper::getProcessServiceFactory(), uno::UNO_QUERY);
@@ -64,12 +64,12 @@ namespace svxform
 
         OUString sString;
 
-        // ------------------------------------------------------------------------
+
         // FormController
         REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) );
         REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) );
 
-        // ------------------------------------------------------------------------
+
         // FormController - register selfaware service
         xSingleFactory = ::cppu::createSingleFactory( xServiceFactory,
                              OAddConditionDialog_GetImplementationName(),
@@ -79,7 +79,7 @@ namespace svxform
         if ( xSingleFactory.is() )
             xSet->insert( uno::makeAny( xSingleFactory ) );
 
-        // ------------------------------------------------------------------------
+
         // DBGridControl
         REGISTER_SERVICE(FmXGridControl, FM_CONTROL_GRID);  // compatibility
         REGISTER_SERVICE(FmXGridControl, FM_CONTROL_GRIDCONTROL);
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 02e1a88f9696..a53998860c79 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -150,13 +150,13 @@ using namespace ::svxform;
 //========================================================================
 TYPEINIT1( FmDesignModeChangedHint, SfxHint );
 
-//------------------------------------------------------------------------
+
 FmDesignModeChangedHint::FmDesignModeChangedHint( sal_Bool bDesMode )
     :m_bDesignMode( bDesMode )
 {
 }
 
-//------------------------------------------------------------------------
+
 FmDesignModeChangedHint::~FmDesignModeChangedHint()
 {
 }
@@ -210,7 +210,7 @@ SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL))
 //========================================================================
 TYPEINIT1(FmFormShell,SfxShell)
 
-//------------------------------------------------------------------------
+
 FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
             :SfxShell(_pParent)
             ,m_pImpl(new FmXFormShell(*this, _pParent->GetViewFrame()))
@@ -228,7 +228,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
     SetView(m_pFormView);
 }
 
-//------------------------------------------------------------------------
+
 FmFormShell::~FmFormShell()
 {
     if ( m_pFormView )
@@ -239,14 +239,14 @@ FmFormShell::~FmFormShell()
     m_pImpl = NULL;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
 {
     FmNavViewMarksChanged aChangeNotification(pWhichView);
     Broadcast(aChangeNotification);
 }
 
-//------------------------------------------------------------------------
+
 bool FmFormShell::PrepareClose(sal_Bool bUI)
 {
     if ( GetImpl()->didPrepareClose() )
@@ -299,7 +299,7 @@ bool FmFormShell::PrepareClose(sal_Bool bUI)
     return bResult;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::impl_setDesignMode(sal_Bool bDesign)
 {
     if (m_pFormView)
@@ -320,7 +320,7 @@ void FmFormShell::impl_setDesignMode(sal_Bool bDesign)
     GetViewShell()->GetViewFrame()->GetBindings().Invalidate(ControllerSlotMap);
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature )
 {
     sal_Bool bResult = sal_False;
@@ -369,7 +369,7 @@ sal_Bool FmFormShell::HasUIFeature( sal_uInt32 nFeature )
     return bResult;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::Execute(SfxRequest &rReq)
 {
     sal_uInt16 nSlot = rReq.GetSlot();
@@ -830,7 +830,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::GetState(SfxItemSet &rSet)
 {
     SfxWhichIter aIter( rSet );
@@ -1086,7 +1086,7 @@ void FmFormShell::GetState(SfxItemSet &rSet)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich)
 {
     if  (   !GetImpl()->getNavController().is()
@@ -1186,7 +1186,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich)
     }
 }
 
-//------------------------------------------------------------------------
+
 FmFormPage* FmFormShell::GetCurPage() const
 {
     FmFormPage* pP = NULL;
@@ -1195,7 +1195,7 @@ FmFormPage* FmFormShell::GetCurPage() const
     return pP;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::SetView( FmFormView* _pView )
 {
     if ( m_pFormView )
@@ -1225,7 +1225,7 @@ void FmFormShell::SetView( FmFormView* _pView )
         GetImpl()->viewActivated( *m_pFormView );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::DetermineForms(sal_Bool bInvalidate)
 {
     // Existieren Formulare auf der aktuellen Page
@@ -1238,19 +1238,19 @@ void FmFormShell::DetermineForms(sal_Bool bInvalidate)
     }
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFormShell::GetY2KState(sal_uInt16& nReturn)
 {
     return GetImpl()->GetY2KState(nReturn);
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::SetY2KState(sal_uInt16 n)
 {
     GetImpl()->SetY2KState(n);
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::Activate(sal_Bool bMDI)
 {
     SfxShell::Activate(bMDI);
@@ -1259,7 +1259,7 @@ void FmFormShell::Activate(sal_Bool bMDI)
         GetImpl()->viewActivated( *m_pFormView, sal_True );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::Deactivate(sal_Bool bMDI)
 {
     SfxShell::Deactivate(bMDI);
@@ -1268,37 +1268,37 @@ void FmFormShell::Deactivate(sal_Bool bMDI)
         GetImpl()->viewDeactivated( *m_pFormView, sal_False );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::ExecuteTextAttribute( SfxRequest& _rReq )
 {
     m_pImpl->ExecuteTextAttribute( _rReq );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::GetTextAttributeState( SfxItemSet& _rSet )
 {
     m_pImpl->GetTextAttributeState( _rSet );
 }
 
-//------------------------------------------------------------------------
+
 bool FmFormShell::IsActiveControl() const
 {
     return m_pImpl->IsActiveControl();
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::ForgetActiveControl()
 {
     m_pImpl->ForgetActiveControl();
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::SetControlActivationHandler( const Link& _rHdl )
 {
     m_pImpl->SetControlActivationHandler( _rHdl );
 }
 
-//------------------------------------------------------------------------
+
 namespace
 {
     SdrUnoObj* lcl_findUnoObject( const SdrObjList& _rObjList, const Reference< XControlModel >& _rxModel )
@@ -1322,7 +1322,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrView& i_rView, OutputDevice& i_rDevice ) const
 {
     try
@@ -1354,7 +1354,7 @@ void FmFormShell::ToggleControlFocus( const SdrUnoObj& i_rUnoObject, const SdrVi
     }
 }
 
-//------------------------------------------------------------------------
+
 namespace
 {
     class FocusableControlsFilter : public ::svx::ISdrObjectFilter
@@ -1383,7 +1383,7 @@ namespace
     };
 }
 
-//------------------------------------------------------------------------
+
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
 {
@@ -1396,7 +1396,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 }
 SAL_WNODEPRECATED_DECLARATIONS_POP
 
-//------------------------------------------------------------------------
+
 SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxModel, const SdrView& _rView, const OutputDevice& _rDevice, Reference< XControl >& _out_rxControl ) const
 {
     if ( !_rxModel.is() )
@@ -1439,7 +1439,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const
 {
     const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView );
@@ -1449,7 +1449,7 @@ Reference< runtime::XFormController > FmFormShell::GetFormController( const Refe
     return pFormView->GetFormController( _rxForm, _rDevice );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormShell::SetDesignMode( bool _bDesignMode )
 {
     if ( _bDesignMode == m_bDesignMode )
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index d05c8b6ca25d..7dd6351bc362 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -447,7 +447,7 @@ namespace
         xEventManager->registerScriptEvents(nIndex, aTransferable);
     }
 
-    //------------------------------------------------------------------------------
+
     OUString getServiceNameByControlType(sal_Int16 nType)
     {
         switch (nType)
@@ -480,7 +480,7 @@ namespace
 
 }
 
-//------------------------------------------------------------------------------
+
 // check if the control has one of the interfaces we can use for searching
 // *_pCurrentText will be filled with the current text of the control (as used when searching this control)
 sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl,
@@ -523,7 +523,7 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const
 {
     if (_rContainer == m_xStartingPoint)
@@ -533,7 +533,7 @@ bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rC
     return Reference< XControlModel>(_rContainer, UNO_QUERY).is();
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement)
 {
     if (!_rElement.is())
@@ -557,7 +557,7 @@ bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>
     return aVal.hasValue();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool isControlList(const SdrMarkList& rMarkList)
 {
     // enthaelt die liste nur Controls und mindestens ein control
@@ -600,7 +600,7 @@ sal_Bool isControlList(const SdrMarkList& rMarkList)
     return bControlList && bHadAnyLeafs;
 }
 
-//------------------------------------------------------------------------
+
 Reference< XForm > GetForm(const Reference< XInterface>& _rxElement)
 {
     Reference< XForm > xForm( _rxElement, UNO_QUERY );
@@ -637,7 +637,7 @@ void SAL_CALL FmXFormShell_Base_Disambiguation::disposing()
 // class FmXFormShell
 //========================================================================
 DBG_NAME(FmXFormShell);
-//------------------------------------------------------------------------
+
 FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
         :FmXFormShell_BASE(m_aMutex)
         ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
@@ -681,14 +681,14 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
     EnableNotification(aNames);
 }
 
-//------------------------------------------------------------------------
+
 FmXFormShell::~FmXFormShell()
 {
     delete m_pTextShell;
     DBG_DTOR(FmXFormShell,NULL);
 }
 
-//------------------------------------------------------------------
+
 Reference< XModel > FmXFormShell::getContextDocument() const
 {
     Reference< XModel > xModel;
@@ -709,13 +709,13 @@ Reference< XModel > FmXFormShell::getContextDocument() const
     return xModel;
 }
 
-//------------------------------------------------------------------
+
 bool FmXFormShell::isEnhancedForm() const
 {
     return getDocumentType() == eEnhancedForm;
 }
 
-//------------------------------------------------------------------
+
 bool FmXFormShell::impl_checkDisposed() const
 {
     if ( !m_pShell )
@@ -726,7 +726,7 @@ bool FmXFormShell::impl_checkDisposed() const
     return false;
 }
 
-//------------------------------------------------------------------
+
 ::svxform::DocumentType FmXFormShell::getDocumentType() const
 {
     if ( m_eDocumentType != eUnknownDocumentType )
@@ -746,7 +746,7 @@ bool FmXFormShell::impl_checkDisposed() const
     return m_eDocumentType;
 }
 
-//------------------------------------------------------------------
+
 bool FmXFormShell::IsReadonlyDoc() const
 {
     if ( impl_checkDisposed() )
@@ -758,17 +758,17 @@ bool FmXFormShell::IsReadonlyDoc() const
     return true;
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException )
 {
     return FmXFormShell_BASE::queryInterface(type);
 }
-//------------------------------------------------------------------------------
+
 Sequence< Type > SAL_CALL FmXFormShell::getTypes(  ) throw(RuntimeException)
 {
     return FmXFormShell_BASE::getTypes();
 }
-//------------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException)
 {
     static ::cppu::OImplementationId* pId = 0;
@@ -784,7 +784,7 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE
     return pId->getImplementationId();
 }
 //  EventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException )
 {
     impl_checkDisposed();
@@ -823,7 +823,7 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( impl_checkDisposed() )
@@ -859,7 +859,7 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw
     LockSlotInvalidation(sal_False);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures )
 {
     if ( impl_checkDisposed() )
@@ -888,7 +888,7 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( RuntimeException )
 {
     if ( impl_checkDisposed() )
@@ -899,7 +899,7 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt
     setActiveController( xController );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( RuntimeException )
 {
     if ( impl_checkDisposed() )
@@ -909,7 +909,7 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru
     m_pTextShell->formDeactivated( xController );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::disposing()
 {
     impl_checkDisposed();
@@ -985,7 +985,7 @@ void FmXFormShell::disposing()
     m_aNavControllerFeatures.dispose();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::UpdateSlot( sal_Int16 _nId )
 {
     if ( impl_checkDisposed() )
@@ -1006,7 +1006,7 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
 {
     if ( impl_checkDisposed() )
@@ -1025,7 +1025,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
             m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
 {
     if ( impl_checkDisposed() )
@@ -1044,7 +1044,7 @@ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock)
     }
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
 {
     if ( impl_checkDisposed() )
@@ -1064,7 +1064,7 @@ IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots)
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
 {
     if ( impl_checkDisposed() )
@@ -1085,7 +1085,7 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
     }
 }
 
-//------------------------------------------------------------------------------
+
 PopupMenu* FmXFormShell::GetConversionMenu()
 {
 
@@ -1101,7 +1101,7 @@ PopupMenu* FmXFormShell::GetConversionMenu()
     return pNewMenu;
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
 {
     for ( size_t i = 0; i < sizeof (nConvertSlots) / sizeof (nConvertSlots[0]); ++i )
@@ -1110,7 +1110,7 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId )
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId )
 {
     OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" );
@@ -1121,7 +1121,7 @@ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId )
     return executeControlConversionSlot( Reference< XFormComponent >( *aSelectedElement, UNO_QUERY ), _nSlotId );
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent >& _rxObject, sal_uInt16 _nSlotId )
 {
     if ( impl_checkDisposed() )
@@ -1328,7 +1328,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot )
 {
     if ( m_aCurrentSelection.empty() )
@@ -1366,7 +1366,7 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo
     return true;    // all other slots: assume "yes"
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu )
 {
     for (sal_Int16 i=0; i<rMenu.GetItemCount(); ++i)
@@ -1374,7 +1374,7 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu )
         rMenu.EnableItem( rMenu.GetItemId(i), canConvertCurrentSelectionToControl( rMenu.GetItemId( i ) ) );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::LoopGrids(sal_Int16 nWhat)
 {
     if ( impl_checkDisposed() )
@@ -1443,7 +1443,7 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat)
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControlContainer > FmXFormShell::getControlContainerForView()
 {
     if ( impl_checkDisposed() )
@@ -1460,7 +1460,7 @@ Reference< XControlContainer > FmXFormShell::getControlContainerForView()
     return xControlContainer;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >& _rxForForm )
 {
     if ( impl_checkDisposed() )
@@ -1489,7 +1489,7 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::ExecuteSearch()
 {
     if ( impl_checkDisposed() )
@@ -1635,7 +1635,7 @@ void FmXFormShell::ExecuteSearch()
         // da ich in OnFoundData (fals ich dort war) Controls markiert habe
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
 {
     if ( impl_checkDisposed() )
@@ -1674,7 +1674,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::SetY2KState(sal_uInt16 n)
 {
     if ( impl_checkDisposed() )
@@ -1748,7 +1748,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::CloseExternalFormViewer()
 {
     if ( impl_checkDisposed() )
@@ -1769,7 +1769,7 @@ void FmXFormShell::CloseExternalFormViewer()
     m_xExternalDisplayedForm    = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const
 {
     if ( impl_checkDisposed() )
@@ -1784,7 +1784,7 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet
     return _xForm;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const
 {
     if ( impl_checkDisposed() )
@@ -1799,7 +1799,7 @@ Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm)
     return _xForm;
 }
 
-//------------------------------------------------------------------------
+
 namespace
 {
     static bool lcl_isNavigationRelevant( sal_Int32 _nWhich )
@@ -1812,7 +1812,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState )
 {
     const ::svx::ControllerFeatures& rController =
@@ -1827,7 +1827,7 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete
     return _pCompleteState->Enabled;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot )
 {
     const ::svx::ControllerFeatures& rController =
@@ -1862,7 +1862,7 @@ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
 {
     Reference< XComponent> xComp( m_xActiveController, UNO_QUERY );
@@ -1875,7 +1875,7 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen )
         xComp->removeEventListener( (XFormControllerListener*)this );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent )
 {
     if ( impl_checkDisposed() )
@@ -1983,13 +1983,13 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const
 {
     _rSelection = m_aCurrentSelection;
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList )
 {
     m_aLastKnownMarkedControls.clear();
@@ -2000,13 +2000,13 @@ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList )
     return setCurrentSelection( m_aLastKnownMarkedControls );
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::selectLastMarkedControls()
 {
     return setCurrentSelection( m_aLastKnownMarkedControls );
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
 {
     if ( impl_checkDisposed() )
@@ -2087,13 +2087,13 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection )
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::isSolelySelected( const Reference< XInterface >& _rxObject )
 {
     return ( m_aCurrentSelection.size() == 1 ) && ( *m_aCurrentSelection.begin() == _rxObject );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::forgetCurrentForm()
 {
     if ( !m_xCurrentForm.is() )
@@ -2107,7 +2107,7 @@ void FmXFormShell::forgetCurrentForm()
     impl_defaultCurrentForm_nothrow();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurForm )
 {
     if ( impl_checkDisposed() )
@@ -2125,7 +2125,7 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo
         InvalidateSlot( DlgSlotMap[i], sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::startListening()
 {
     if ( impl_checkDisposed() )
@@ -2204,7 +2204,7 @@ void FmXFormShell::startListening()
     m_xNavigationController = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::stopListening()
 {
     if ( impl_checkDisposed() )
@@ -2227,7 +2227,7 @@ void FmXFormShell::stopListening()
     m_xNavigationController = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::ShowSelectionProperties( sal_Bool bShow )
 {
     if ( impl_checkDisposed() )
@@ -2246,7 +2246,7 @@ void FmXFormShell::ShowSelectionProperties( sal_Bool bShow )
     InvalidateSlot( SID_FM_CTL_PROPERTIES, sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
 {
     if ( impl_checkDisposed() )
@@ -2330,7 +2330,7 @@ IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation*, pfriWhere)
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere)
 {
     if ( impl_checkDisposed() )
@@ -2360,7 +2360,7 @@ IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation*, pfriWhere
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextInfo)
 {
     if ( impl_checkDisposed() )
@@ -2373,7 +2373,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
     Reference< XResultSet> xIter(xForm, UNO_QUERY);
     DBG_ASSERT(xIter.is(), "FmXFormShell::OnSearchContextRequest : unexpected : context has no iterator !");
 
-    // --------------------------------------------------------------------------------------------
+
     // assemble the list of fields to involve (that is, the ControlSources of all fields that have such a property)
     OUString strFieldList, sFieldDisplayNames;
     m_arrSearchedControls.clear();
@@ -2563,7 +2563,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
 }
 
   // XContainerListener
-//------------------------------------------------------------------------------
+
 void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( impl_checkDisposed() )
@@ -2576,7 +2576,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::
     m_pShell->DetermineForms(sal_True);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( impl_checkDisposed() )
@@ -2589,7 +2589,7 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::
     AddElement(xTemp);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( impl_checkDisposed() )
@@ -2601,7 +2601,7 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s
     m_pShell->DetermineForms(sal_True);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
 {
     if ( impl_checkDisposed() )
@@ -2626,14 +2626,14 @@ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate )
     m_pShell->DetermineForms( _bInvalidate );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::AddElement(const Reference< XInterface>& _xElement)
 {
     if ( impl_checkDisposed() )
         return;
     impl_AddElement_nothrow(_xElement);
 }
-// -----------------------------------------------------------------------------
+
 void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element)
 {
     // am Container horchen
@@ -2658,14 +2658,14 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element
         xSelSupplier->addSelectionChangeListener(this);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::RemoveElement(const Reference< XInterface>& Element)
 {
     if ( impl_checkDisposed() )
         return;
     impl_RemoveElement_nothrow(Element);
 }
-//------------------------------------------------------------------------------
+
 void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Element)
 {
     const Reference< ::com::sun::star::view::XSelectionSupplier> xSelSupplier(Element, UNO_QUERY);
@@ -2694,7 +2694,7 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem
         m_aCurrentSelection.erase( wasSelectedPos );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException)
 {
     if ( impl_checkDisposed() )
@@ -2723,7 +2723,7 @@ void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun:
         m_pShell->NotifyMarkListChanged( m_pShell->GetFormView() );
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/)
 {
     if ( impl_checkDisposed() )
@@ -2735,7 +2735,7 @@ IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/)
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::SetSelectionDelayed()
 {
     if ( impl_checkDisposed() )
@@ -2745,7 +2745,7 @@ void FmXFormShell::SetSelectionDelayed()
         m_aMarkTimer.Start();
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
 {
     if ( impl_checkDisposed() )
@@ -2755,14 +2755,14 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList)
     m_pShell->NotifyMarkListChanged(m_pShell->GetFormView());
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList)
 {
     if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() )
         ShowSelectionProperties( sal_True );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmXFormShell::IsPropBrwOpen() const
 {
     if ( impl_checkDisposed() )
@@ -2772,7 +2772,7 @@ sal_Bool FmXFormShell::IsPropBrwOpen() const
             m_pShell->GetViewShell()->GetViewFrame()->HasChildWindow(SID_FM_SHOW_PROPERTIES) : sal_False );
 }
 
-//------------------------------------------------------------------------------
+
 class FmXFormShell::SuspendPropertyTracking
 {
 private:
@@ -2798,7 +2798,7 @@ public:
     }
 };
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::SetDesignMode(bool bDesign)
 {
     if ( impl_checkDisposed() )
@@ -2884,7 +2884,7 @@ void FmXFormShell::SetDesignMode(bool bDesign)
     m_bChangingDesignMode = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlModel >& i_rxModel, const FmFormObj& i_rKnownFormObj )
 {
     if ( impl_checkDisposed() )
@@ -2929,7 +2929,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod
     return xControl;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint,
     const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames )
 {
@@ -2984,7 +2984,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::startFiltering()
 {
     if ( impl_checkDisposed() )
@@ -3032,7 +3032,7 @@ void FmXFormShell::startFiltering()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void saveFilter(const Reference< runtime::XFormController >& _rxController)
 {
     Reference< XPropertySet> xFormAsSet(_rxController->getModel(), UNO_QUERY);
@@ -3060,7 +3060,7 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController)
 
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::stopFiltering(sal_Bool bSave)
 {
     if ( impl_checkDisposed() )
@@ -3165,7 +3165,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
     m_pShell->GetViewShell()->GetViewFrame()->GetBindings().InvalidateShell(*m_pShell);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::CreateExternalView()
 {
     if ( impl_checkDisposed() )
@@ -3574,7 +3574,7 @@ void FmXFormShell::CreateExternalView()
     InvalidateSlot( SID_FM_VIEW_AS_GRID, sal_False );
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::implAdjustConfigCache()
 {
     // get (cache) the wizard usage flag
@@ -3585,7 +3585,7 @@ void FmXFormShell::implAdjustConfigCache()
         m_bUseWizards = ::cppu::any2bool(aFlags[0]);
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames)
 {
     if ( impl_checkDisposed() )
@@ -3605,7 +3605,7 @@ void FmXFormShell::Commit()
 {
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
 {
     m_bUseWizards = _bUseThem;
@@ -3617,7 +3617,7 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
     PutProperties(aNames, aValues);
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ )
 {
 
@@ -3658,7 +3658,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeacti
     UpdateForms( sal_True );
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK( FmXFormShell, OnFirstTimeActivation, void*, /*NOTINTERESTEDIN*/ )
 {
     if ( impl_checkDisposed() )
@@ -3680,14 +3680,14 @@ IMPL_LINK( FmXFormShell, OnFirstTimeActivation, void*, /*NOTINTERESTEDIN*/ )
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ )
 {
     UpdateForms( sal_True );
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ )
 {
 
@@ -3735,7 +3735,7 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi
     impl_defaultCurrentForm_nothrow();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::impl_defaultCurrentForm_nothrow()
 {
     if ( impl_checkDisposed() )
@@ -3765,7 +3765,7 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels )
 {
     if (!_rxModels.is())
@@ -3824,7 +3824,7 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels
     }
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ )
 {
     FmLoadAction aAction = m_aLoadingPages.front();
@@ -3834,7 +3834,7 @@ IMPL_LINK( FmXFormShell, OnLoadForms, FmFormPage*, /*_pPage*/ )
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     bool lcl_isLoadable( const Reference< XInterface >& _rxLoadable )
@@ -3872,7 +3872,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ )
 {
     DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) )  != ( FORMS_ASYNC | FORMS_UNLOAD ),
@@ -3949,43 +3949,43 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::ExecuteTextAttribute( SfxRequest& _rReq )
 {
     m_pTextShell->ExecuteTextAttribute( _rReq );
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::GetTextAttributeState( SfxItemSet& _rSet )
 {
     m_pTextShell->GetTextAttributeState( _rSet );
 }
 
-//------------------------------------------------------------------------
+
 bool FmXFormShell::IsActiveControl( bool _bCountRichTextOnly ) const
 {
     return m_pTextShell->IsActiveControl( _bCountRichTextOnly );
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::ForgetActiveControl()
 {
     m_pTextShell->ForgetActiveControl();
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::SetControlActivationHandler( const Link& _rHdl )
 {
     m_pTextShell->SetControlActivationHandler( _rHdl );
 }
-//------------------------------------------------------------------------
+
 void FmXFormShell::handleShowPropertiesRequest()
 {
     if ( onlyControlsAreMarked() )
         ShowSelectionProperties( sal_True );
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
 {
     // catch simple double clicks
@@ -3999,7 +3999,7 @@ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent )
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool FmXFormShell::HasControlFocus() const
 {
     bool bHasControlFocus = false;
@@ -4031,7 +4031,7 @@ SearchableControlIterator::SearchableControlIterator(Reference< XInterface> xSta
 {
 }
 
-//------------------------------------------------------------------------------
+
 bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface>& xElement)
 {
     // wenn das Ding eine ControlSource und einen BoundField-Property hat
@@ -4063,7 +4063,7 @@ bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterface>
     return false;
 }
 
-//------------------------------------------------------------------------------
+
 bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*xContainer*/) const
 {
     return true;
@@ -4074,7 +4074,7 @@ bool SearchableControlIterator::ShouldStepInto(const Reference< XInterface>& /*x
 
 SFX_IMPL_MENU_CONTROL(ControlConversionMenuController, SfxBoolItem);
 
-//------------------------------------------------------------------------------
+
 ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nId, Menu& _rMenu, SfxBindings& _rBindings )
     :SfxMenuControl( _nId, _rBindings )
     ,m_pMainMenu( &_rMenu )
@@ -4094,14 +4094,14 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI
     }
 }
 
-//------------------------------------------------------------------------------
+
 ControlConversionMenuController::~ControlConversionMenuController()
 {
     m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL);
     delete m_pConversionMenu;
 }
 
-//------------------------------------------------------------------------------
+
 void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState)
 {
     if (nSID == GetId())
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index cd81bf31d08b..3816ab40fddb 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -68,13 +68,13 @@ using namespace ::svxform;
 
 //========================================================================
 // = FmSearchThread
-//------------------------------------------------------------------------
+
 void FmSearchThread::run()
 {
     m_pEngine->SearchNextImpl();
 };
 
-//------------------------------------------------------------------------
+
 void FmSearchThread::onTerminated()
 {
     if (m_aTerminationHdl.IsSet())
@@ -88,7 +88,7 @@ void FmSearchThread::onTerminated()
 //  SMART_UNO_IMPLEMENTATION(FmRecordCountListener, UsrObject);
 
 DBG_NAME(FmRecordCountListener);
-//------------------------------------------------------------------------
+
 FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::sdbc::XResultSet > & dbcCursor)
 {
     DBG_CTOR(FmRecordCountListener,NULL);
@@ -107,7 +107,7 @@ FmRecordCountListener::FmRecordCountListener(const Reference< ::com::sun::star::
     m_xListening->addPropertyChangeListener(FM_PROP_ROWCOUNT, (::com::sun::star::beans::XPropertyChangeListener*)this);
 }
 
-//------------------------------------------------------------------------
+
 Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk)
 {
     Link lnkReturn = m_lnkWhoWantsToKnow;
@@ -119,14 +119,14 @@ Link FmRecordCountListener::SetPropChangeHandler(const Link& lnk)
     return lnkReturn;
 }
 
-//------------------------------------------------------------------------
+
 FmRecordCountListener::~FmRecordCountListener()
 {
 
     DBG_DTOR(FmRecordCountListener,NULL);
 }
 
-//------------------------------------------------------------------------
+
 void FmRecordCountListener::DisConnect()
 {
     if(m_xListening.is())
@@ -134,14 +134,14 @@ void FmRecordCountListener::DisConnect()
     m_xListening = NULL;
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL FmRecordCountListener::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException )
 {
     DBG_ASSERT(m_xListening.is(), "FmRecordCountListener::disposing should never have been called without a propset !");
     DisConnect();
 }
 
-//------------------------------------------------------------------------
+
 void FmRecordCountListener::NotifyCurrentCount()
 {
     if (m_lnkWhoWantsToKnow.IsSet())
@@ -152,7 +152,7 @@ void FmRecordCountListener::NotifyCurrentCount()
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmRecordCountListener::propertyChange(const  ::com::sun::star::beans::PropertyChangeEvent& /*evt*/) throw(::com::sun::star::uno::RuntimeException)
 {
     NotifyCurrentCount();
@@ -160,7 +160,7 @@ void FmRecordCountListener::propertyChange(const  ::com::sun::star::beans::Prope
 
 //========================================================================
 // FmSearchEngine - local classes
-//------------------------------------------------------------------------
+
 SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTextComponent > & _xText)
     :ControlTextWrapper(_xText.get())
     ,m_xText(_xText)
@@ -168,13 +168,13 @@ SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTe
     DBG_ASSERT(m_xText.is(), "FmSearchEngine::SimpleTextWrapper::SimpleTextWrapper : invalid argument !");
 }
 
-//------------------------------------------------------------------------
+
 OUString SimpleTextWrapper::getCurrentText() const
 {
     return m_xText->getText();
 }
 
-//------------------------------------------------------------------------
+
 ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox > & _xBox)
     :ControlTextWrapper(_xBox.get())
     ,m_xBox(_xBox)
@@ -182,13 +182,13 @@ ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox
     DBG_ASSERT(m_xBox.is(), "FmSearchEngine::ListBoxWrapper::ListBoxWrapper : invalid argument !");
 }
 
-//------------------------------------------------------------------------
+
 OUString ListBoxWrapper::getCurrentText() const
 {
     return m_xBox->getSelectedItem();
 }
 
-//------------------------------------------------------------------------
+
 CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckBox > & _xBox)
     :ControlTextWrapper(_xBox.get())
     ,m_xBox(_xBox)
@@ -196,7 +196,7 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB
     DBG_ASSERT(m_xBox.is(), "FmSearchEngine::CheckBoxWrapper::CheckBoxWrapper : invalid argument !");
 }
 
-//------------------------------------------------------------------------
+
 OUString CheckBoxWrapper::getCurrentText() const
 {
     switch ((TriState)m_xBox->getState())
@@ -210,7 +210,7 @@ OUString CheckBoxWrapper::getCurrentText() const
 
 //========================================================================
 // = FmSearchEngine
-//------------------------------------------------------------------------
+
 sal_Bool FmSearchEngine::MoveCursor()
 {
     sal_Bool bSuccess = sal_True;
@@ -269,7 +269,7 @@ sal_Bool FmSearchEngine::MoveCursor()
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
     sal_Bool bSuccess(sal_True);
@@ -297,7 +297,7 @@ sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& i
     return bSuccess;
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::container::XIndexAccess > & xAllFields, sal_Int32 nField)
 {
     DBG_ASSERT( xAllFields.is() && ( nField >= 0 ) && ( nField < xAllFields->getCount() ),
@@ -328,7 +328,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::
     m_arrUsedFields.insert(m_arrUsedFields.end(), fiCurrent);
 
 }
-//------------------------------------------------------------------------
+
 OUString FmSearchEngine::FormatField(const FieldInfo& rField)
 {
     DBG_ASSERT(!m_bUsingTextComponents, "FmSearchEngine::FormatField : im UsingTextComponents-Mode bitte FormatField(sal_Int32) benutzen !");
@@ -361,7 +361,7 @@ OUString FmSearchEngine::FormatField(const FieldInfo& rField)
     return sReturn;
 }
 
-//------------------------------------------------------------------------
+
 OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
 {
     if (m_bUsingTextComponents)
@@ -397,7 +397,7 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
     }
 }
 
-//------------------------------------------------------------------------
+
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos,
     FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
@@ -407,7 +407,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
     catch ( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); return SR_ERROR; }
     FieldCollection::iterator iterInitialField = iterFieldLoop;
 
-    // --------------------------------------------------------------
+
     sal_Bool bFound(sal_False);
     sal_Bool bMovedAround(sal_False);
     do
@@ -462,7 +462,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
     return bFound ? SR_FOUND : SR_NOTFOUND;
 }
 
-//------------------------------------------------------------------------
+
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos,
     FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
@@ -474,7 +474,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
 
     WildCard aSearchExpression(strExpression);
 
-    // --------------------------------------------------------------
+
     sal_Bool bFound(sal_False);
     sal_Bool bMovedAround(sal_False);
     do
@@ -540,7 +540,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& str
     return bFound ? SR_FOUND : SR_NOTFOUND;
 }
 
-//------------------------------------------------------------------------
+
 FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos,
     FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
 {
@@ -576,7 +576,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
     aParam.Locale = SvtSysLocale().GetLanguageTag().getLocale();
     ::utl::TextSearch aLocalEngine(aParam);
 
-    // --------------------------------------------------------------
+
     bool bFound = false;
     sal_Bool bMovedAround(sal_False);
     do
@@ -667,7 +667,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString
 
 
 DBG_NAME(FmSearchEngine);
-//------------------------------------------------------------------------
+
 FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
             const Reference< XResultSet > & xCursor, const OUString& sVisibleFields,
             const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)
@@ -706,7 +706,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
     Init(sVisibleFields);
 }
 
-//------------------------------------------------------------------------
+
 FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
         const Reference< XResultSet > & xCursor, const OUString& sVisibleFields,
         const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
@@ -741,7 +741,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
     Init(sVisibleFields);
 }
 
-//------------------------------------------------------------------------
+
 FmSearchEngine::~FmSearchEngine()
 {
     clearControlTexts();
@@ -749,7 +749,7 @@ FmSearchEngine::~FmSearchEngine()
     DBG_DTOR(FmSearchEngine,NULL);
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::SetIgnoreWidthCJK(sal_Bool bSet)
 {
     if (bSet)
@@ -758,13 +758,13 @@ void FmSearchEngine::SetIgnoreWidthCJK(sal_Bool bSet)
         m_nTransliterationFlags &= ~TransliterationModules_IGNORE_WIDTH;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmSearchEngine::GetIgnoreWidthCJK() const
 {
     return 0 != (m_nTransliterationFlags & TransliterationModules_IGNORE_WIDTH);
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::SetCaseSensitive(sal_Bool bSet)
 {
     if (bSet)
@@ -773,13 +773,13 @@ void FmSearchEngine::SetCaseSensitive(sal_Bool bSet)
         m_nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmSearchEngine::GetCaseSensitive() const
 {
     return 0 == (m_nTransliterationFlags & TransliterationModules_IGNORE_CASE);
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::clearControlTexts()
 {
     for (   ControlTextSuppliers::iterator aIter = m_aControlTexts.begin();
@@ -792,7 +792,7 @@ void FmSearchEngine::clearControlTexts()
     m_aControlTexts.clear();
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
 {
     clearControlTexts();
@@ -823,7 +823,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::Init(const OUString& sVisibleFields)
 {
     // analyze the fields
@@ -904,7 +904,7 @@ void FmSearchEngine::Init(const OUString& sVisibleFields)
 
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::SetFormatterUsing(sal_Bool bSet)
 {
     if (m_bFormatter == bSet)
@@ -943,7 +943,7 @@ void FmSearchEngine::SetFormatterUsing(sal_Bool bSet)
         InvalidatePreviousLoc();
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::PropagateProgress(sal_Bool _bDontPropagateOverflow)
 {
     if (m_aProgressHandler.IsSet())
@@ -967,7 +967,7 @@ void FmSearchEngine::PropagateProgress(sal_Bool _bDontPropagateOverflow)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::SearchNextImpl()
 {
     DBG_ASSERT(!(m_bWildcard && m_bRegular) && !(m_bRegular && m_bLevenshtein) && !(m_bLevenshtein && m_bWildcard),
@@ -1068,7 +1068,7 @@ void FmSearchEngine::SearchNextImpl()
         InvalidatePreviousLoc();
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK(FmSearchEngine, OnSearchTerminated, FmSearchThread*, /*pThread*/)
 {
     if (!m_aProgressHandler.IsSet())
@@ -1110,7 +1110,7 @@ IMPL_LINK(FmSearchEngine, OnSearchTerminated, FmSearchThread*, /*pThread*/)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 IMPL_LINK(FmSearchEngine, OnNewRecordCount, void*, pCounterAsVoid)
 {
     if (!m_aProgressHandler.IsSet())
@@ -1124,7 +1124,7 @@ IMPL_LINK(FmSearchEngine, OnNewRecordCount, void*, pCounterAsVoid)
     return 0L;
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmSearchEngine::CancelRequested()
 {
     m_aCancelAsynchAccess.acquire();
@@ -1133,7 +1133,7 @@ sal_Bool FmSearchEngine::CancelRequested()
     return bReturn;
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::CancelSearch()
 {
     m_aCancelAsynchAccess.acquire();
@@ -1141,7 +1141,7 @@ void FmSearchEngine::CancelSearch()
     m_aCancelAsynchAccess.release();
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields,
     sal_Int32 nFieldIndex)
 {
@@ -1162,7 +1162,7 @@ sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::ImplStartNextSearch()
 {
     m_bCancelAsynchRequest = sal_False;
@@ -1185,7 +1185,7 @@ void FmSearchEngine::ImplStartNextSearch()
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::SearchNext(const OUString& strExpression)
 {
     m_strSearchExpression = strExpression;
@@ -1193,14 +1193,14 @@ void FmSearchEngine::SearchNext(const OUString& strExpression)
     ImplStartNextSearch();
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::SearchNextSpecial(sal_Bool _bSearchForNull)
 {
     m_eSearchForType = _bSearchForNull ? SEARCHFOR_NULL : SEARCHFOR_NOTNULL;
     ImplStartNextSearch();
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::StartOver(const OUString& strExpression)
 {
     try
@@ -1220,7 +1220,7 @@ void FmSearchEngine::StartOver(const OUString& strExpression)
     SearchNext(strExpression);
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::StartOverSpecial(sal_Bool _bSearchForNull)
 {
     try
@@ -1240,14 +1240,14 @@ void FmSearchEngine::StartOverSpecial(sal_Bool _bSearchForNull)
     SearchNextSpecial(_bSearchForNull);
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::InvalidatePreviousLoc()
 {
     m_aPreviousLocBookmark.setValue(0,getVoidCppuType());
     m_iterPreviousLocField = m_arrUsedFields.end();
 }
 
-//------------------------------------------------------------------------
+
 void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce)
 {
     if (!bForce && (nFieldIndex == m_nCurrentFieldIndex))
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index c7eba1eb748e..d8c80f345b86 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -37,7 +37,7 @@ namespace svx
     //====================================================================
     //= TextControlCharAttribDialog
     //====================================================================
-    //--------------------------------------------------------------------
+
     TextControlCharAttribDialog::TextControlCharAttribDialog( Window* pParent, const SfxItemSet& _rCoreSet, const SvxFontListItem& _rFontList )
         : SfxTabDialog( pParent, "TextControlCharacterPropertiesDialog",
             "svx/ui/textcontrolchardialog.ui", &_rCoreSet )
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 94b40bd39955..029b0f9d8302 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -33,7 +33,7 @@ namespace svx
     //====================================================================
     //= FmTextControlFeature
     //====================================================================
-    //--------------------------------------------------------------------
+
     FmTextControlFeature::FmTextControlFeature( const Reference< XDispatch >& _rxDispatcher, const URL& _rFeatureURL, SfxSlotId _nSlotId, ISlotInvalidator* _pInvalidator )
         :m_xDispatcher    ( _rxDispatcher )
         ,m_aFeatureURL    ( _rFeatureURL  )
@@ -57,18 +57,18 @@ namespace svx
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     FmTextControlFeature::~FmTextControlFeature( )
     {
     }
 
-    //--------------------------------------------------------------------
+
     void FmTextControlFeature::dispatch() const SAL_THROW(())
     {
         dispatch( Sequence< PropertyValue >( ) );
     }
 
-    //--------------------------------------------------------------------
+
     void FmTextControlFeature::dispatch( const Sequence< PropertyValue >& _rArgs ) const SAL_THROW(())
     {
         try
@@ -82,7 +82,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmTextControlFeature::statusChanged( const FeatureStateEvent& _rState ) throw (RuntimeException)
     {
         m_aFeatureState   = _rState.State;
@@ -92,13 +92,13 @@ namespace svx
             m_pInvalidator->Invalidate( m_nSlotId );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmTextControlFeature::disposing( const EventObject& /*Source*/ ) throw (RuntimeException)
     {
         // nothing to do
     }
 
-    //--------------------------------------------------------------------
+
     void FmTextControlFeature::dispose() SAL_THROW(())
     {
         try
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 8365b206fbd4..36914c891158 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -184,9 +184,9 @@ namespace svx
         virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException);
     };
 
-    //--------------------------------------------------------------------
+
     DBG_NAME( FmFocusListenerAdapter )
-    //--------------------------------------------------------------------
+
     FmFocusListenerAdapter::FmFocusListenerAdapter( const Reference< XControl >& _rxControl, IFocusObserver* _pObserver )
         :m_pObserver( _pObserver )
         ,m_xWindow( _rxControl, UNO_QUERY )
@@ -209,7 +209,7 @@ namespace svx
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     FmFocusListenerAdapter::~FmFocusListenerAdapter()
     {
         acquire();
@@ -218,7 +218,7 @@ namespace svx
         DBG_DTOR( FmFocusListenerAdapter, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void FmFocusListenerAdapter::dispose()
     {
         if ( m_xWindow.is() )
@@ -228,21 +228,21 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmFocusListenerAdapter::focusGained( const FocusEvent& e ) throw (RuntimeException)
     {
         if ( m_pObserver )
             m_pObserver->focusGained( e );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmFocusListenerAdapter::focusLost( const FocusEvent& e ) throw (RuntimeException)
     {
         if ( m_pObserver )
             m_pObserver->focusLost( e );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmFocusListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         (void)Source;
@@ -281,9 +281,9 @@ namespace svx
     //====================================================================
     //= FmMouseListenerAdapter
     //====================================================================
-    //--------------------------------------------------------------------
+
     DBG_NAME( FmMouseListenerAdapter )
-    //--------------------------------------------------------------------
+
     FmMouseListenerAdapter::FmMouseListenerAdapter( const Reference< XControl >& _rxControl, IContextRequestObserver* _pObserver )
         :m_pObserver( _pObserver )
         ,m_xWindow( _rxControl, UNO_QUERY )
@@ -306,7 +306,7 @@ namespace svx
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     FmMouseListenerAdapter::~FmMouseListenerAdapter()
     {
         acquire();
@@ -315,7 +315,7 @@ namespace svx
         DBG_DTOR( FmMouseListenerAdapter, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void FmMouseListenerAdapter::dispose()
     {
         if ( m_xWindow.is() )
@@ -325,7 +325,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmMouseListenerAdapter::mousePressed( const awt::MouseEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -337,25 +337,25 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmMouseListenerAdapter::mouseReleased( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmMouseListenerAdapter::mouseEntered( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmMouseListenerAdapter::mouseExited( const awt::MouseEvent& /*e*/ ) throw (::com::sun::star::uno::RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FmMouseListenerAdapter::disposing( const EventObject& Source ) throw (RuntimeException)
     {
         (void)Source;
@@ -366,7 +366,7 @@ namespace svx
     //====================================================================
     //= FmTextControlShell
     //====================================================================
-    //------------------------------------------------------------------------
+
     namespace
     {
         //....................................................................
@@ -545,7 +545,7 @@ namespace svx
         }
     }
 
-    //------------------------------------------------------------------------
+
     FmTextControlShell::FmTextControlShell( SfxViewFrame* _pFrame )
         :m_bActiveControl( false )
         ,m_bActiveControlIsReadOnly( true )
@@ -558,13 +558,13 @@ namespace svx
         m_aClipboardInvalidation.SetTimeout( 200 );
     }
 
-    //------------------------------------------------------------------------
+
     FmTextControlShell::~FmTextControlShell()
     {
         dispose();
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK( FmTextControlShell, OnInvalidateClipboard, void*, /*_pNotInterestedIn*/ )
     {
         if ( m_bNeedClipboardInvalidation )
@@ -578,7 +578,7 @@ namespace svx
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::transferFeatureStatesToItemSet( ControlFeatures& _rDispatchers, SfxAllItemSet& _rSet, bool _bTranslateLatin )
     {
         SfxItemPool& rPool = *_rSet.GetPool();
@@ -650,7 +650,7 @@ namespace svx
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::executeAttributeDialog( AttributeSet _eSet, SfxRequest& _rReq )
     {
         const SvxFontListItem* pFontList = PTR_CAST( SvxFontListItem, m_pViewFrame->GetObjectShell()->GetItem( SID_ATTR_CHAR_FONTLIST ) );
@@ -764,7 +764,7 @@ namespace svx
         SfxItemPool::Free(pPool);
     }
 
-    //------------------------------------------------------------------------
+
     bool FmTextControlShell::executeSelectAll( )
     {
         try
@@ -783,7 +783,7 @@ namespace svx
         return false;   // not handled
     }
 
-    //------------------------------------------------------------------------
+
     bool FmTextControlShell::executeClipboardSlot( SfxSlotId _nSlot )
     {
         try
@@ -825,7 +825,7 @@ namespace svx
         return false;   // not handled
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::ExecuteTextAttribute( SfxRequest& _rReq )
     {
         SfxSlotId nSlot = _rReq.GetSlot();
@@ -931,7 +931,7 @@ namespace svx
         _rReq.Done();
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::GetTextAttributeState( SfxItemSet& _rSet )
     {
         SfxWhichIter aIter( _rSet );
@@ -1034,7 +1034,7 @@ namespace svx
         }
     }
 
-    //------------------------------------------------------------------------
+
     bool FmTextControlShell::IsActiveControl( bool _bCountRichTextOnly ) const
     {
         if ( _bCountRichTextOnly && !m_bActiveControlIsRichText )
@@ -1043,7 +1043,7 @@ namespace svx
         return m_bActiveControl;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::dispose()
     {
         if ( IsActiveControl() )
@@ -1052,13 +1052,13 @@ namespace svx
             stopControllerListening();
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::designModeChanged( bool /*_bNewDesignMode*/ )
     {
         m_rBindings.Invalidate( pTextControlSlots );
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::formActivated( const Reference< XFormController >& _rxController )
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -1086,7 +1086,7 @@ namespace svx
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::formDeactivated( const Reference< XFormController >& _rxController )
     {
 #if OSL_DEBUG_LEVEL > 0
@@ -1102,7 +1102,7 @@ namespace svx
             stopControllerListening();
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::startControllerListening( const Reference< XFormController >& _rxController )
     {
         OSL_PRECOND( _rxController.is(), "FmTextControlShell::startControllerListening: invalid controller!" );
@@ -1135,7 +1135,7 @@ namespace svx
         m_xActiveController = _rxController;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::stopControllerListening( )
     {
         OSL_PRECOND( isControllerListening(), "FmTextControlShell::stopControllerListening: inconsistence!" );
@@ -1155,7 +1155,7 @@ namespace svx
         m_xActiveController.clear();
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::implClearActiveControlRef()
     {
         // no more features for this control
@@ -1189,7 +1189,7 @@ namespace svx
         m_bActiveControl = false;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::controlDeactivated( )
     {
         DBG_ASSERT( IsActiveControl(), "FmTextControlShell::controlDeactivated: no active control!" );
@@ -1199,7 +1199,7 @@ namespace svx
         m_rBindings.Invalidate( pTextControlSlots );
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::controlActivated( const Reference< XControl >& _rxControl )
     {
         // ensure that all knittings with the previously active control are lost
@@ -1276,7 +1276,7 @@ namespace svx
         m_bNeedClipboardInvalidation = true;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::fillFeatureDispatchers(  const Reference< XControl > _rxControl, SfxSlotId* _pZeroTerminatedSlots,
             ControlFeatures& _rDispatchers )
     {
@@ -1297,7 +1297,7 @@ namespace svx
         }
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::impl_parseURL_nothrow( URL& _rURL )
     {
         try
@@ -1315,7 +1315,7 @@ namespace svx
         }
     }
 
-    //------------------------------------------------------------------------
+
     FmTextControlFeature* FmTextControlShell::implGetFeatureDispatcher( const Reference< XDispatchProvider >& _rxProvider, SfxApplication* _pApplication, SfxSlotId _nSlot )
     {
         OSL_PRECOND( _rxProvider.is() && _pApplication, "FmTextControlShell::implGetFeatureDispatcher: invalid arg(s)!" );
@@ -1328,7 +1328,7 @@ namespace svx
         return NULL;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::Invalidate( SfxSlotId _nSlot )
     {
         m_rBindings.Invalidate( _nSlot );
@@ -1337,7 +1337,7 @@ namespace svx
         m_rBindings.Update( _nSlot );
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::focusGained( const ::com::sun::star::awt::FocusEvent& _rEvent )
     {
         Reference< XControl > xControl( _rEvent.Source, UNO_QUERY );
@@ -1353,7 +1353,7 @@ namespace svx
             controlActivated( xControl );
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::focusLost( const ::com::sun::star::awt::FocusEvent& _rEvent )
     {
         Reference< XControl > xControl( _rEvent.Source, UNO_QUERY );
@@ -1367,13 +1367,13 @@ namespace svx
         m_bActiveControl = false;
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::ForgetActiveControl()
     {
         implClearActiveControlRef();
     }
 
-    //------------------------------------------------------------------------
+
     void FmTextControlShell::contextMenuRequested( const awt::MouseEvent& /*_rEvent*/ )
     {
         m_rBindings.GetDispatcher()->ExecutePopup( SVX_RES( RID_FM_TEXTATTRIBUTE_MENU ) );
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 5d5aa6ec2c99..f80c41b66ba9 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -167,7 +167,7 @@ void displayException(const ::com::sun::star::sdb::SQLErrorEvent& _rEvent, Windo
     displayException(_rEvent.Reason, _pParent);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAccess>& xCont, const Reference< XInterface >& xElement)
 {
     sal_Int32 nIndex = -1;
@@ -201,7 +201,7 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
     return nIndex;
 }
 
-//------------------------------------------------------------------
+
 OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel)
 {
     if (!xControlModel.is())
@@ -224,19 +224,19 @@ OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& x
 
 //========================================================================
 // = CursorWrapper
-//------------------------------------------------------------------------
+
 CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned)
 {
     ImplConstruct(Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned);
 }
 
-//------------------------------------------------------------------------
+
 CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned)
 {
     ImplConstruct(_rxCursor, bUseCloned);
 }
 
-//------------------------------------------------------------------------
+
 void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned)
 {
     if (bUseCloned)
@@ -267,7 +267,7 @@ void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResu
         m_xGeneric = m_xMoveOperations.get();
 }
 
-//------------------------------------------------------------------------
+
 const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor)
 {
     m_xMoveOperations = Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY);
@@ -282,13 +282,13 @@ const CursorWrapper& CursorWrapper::operator=(const Reference< ::com::sun::star:
     return *this;
 }
 
-//------------------------------------------------------------------------------
+
 FmXDisposeListener::~FmXDisposeListener()
 {
     setAdapter(NULL);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter)
 {
     if (m_pAdapter)
@@ -308,7 +308,7 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter)
 
 //==============================================================================
 DBG_NAME(FmXDisposeMultiplexer);
-//------------------------------------------------------------------------------
+
 FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId)
     :m_xObject(_rxObject)
     ,m_pListener(_pListener)
@@ -321,14 +321,14 @@ FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, con
         m_xObject->addEventListener(this);
 }
 
-//------------------------------------------------------------------------------
+
 FmXDisposeMultiplexer::~FmXDisposeMultiplexer()
 {
     DBG_DTOR(FmXDisposeMultiplexer, NULL);
 }
 
 // ::com::sun::star::lang::XEventListener
-//------------------------------------------------------------------
+
 void FmXDisposeMultiplexer::disposing(const ::com::sun::star::lang::EventObject& _Source) throw( RuntimeException )
 {
     Reference< ::com::sun::star::lang::XEventListener> xPreventDelete(this);
@@ -342,7 +342,7 @@ void FmXDisposeMultiplexer::disposing(const ::com::sun::star::lang::EventObject&
     m_xObject = NULL;
 }
 
-//------------------------------------------------------------------
+
 void FmXDisposeMultiplexer::dispose()
 {
     if (m_xObject.is())
@@ -358,7 +358,7 @@ void FmXDisposeMultiplexer::dispose()
 }
 
 //==============================================================================
-//------------------------------------------------------------------------------
+
 sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject)
 {
     // ask for the persistent service name
@@ -432,7 +432,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
     return OBJ_FM_CONTROL;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
 {
     sal_Bool bIsAlive = sal_False;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 0ef9fd22bded..7092502ea5c7 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -141,9 +141,9 @@ private:
 
 };
 
-//------------------------------------------------------------------------------
+
 // some helper structs for caching property infos
-//------------------------------------------------------------------------------
+
 struct PropertyInfo
 {
     sal_Bool    bIsTransientOrReadOnly  : 1;    // the property is transient or read-only, thus we need no undo action for it
@@ -168,12 +168,12 @@ sal_Bool operator < (const Reference< XPropertySet >& lhs,
 
 typedef std::map<Reference< XPropertySet >, PropertySetInfo> PropertySetInfoCache;
 
-//------------------------------------------------------------------------------
+
 
 OUString static_STR_UNDO_PROPERTY;
-//------------------------------------------------------------------------------
+
 DBG_NAME(FmXUndoEnvironment)
-//------------------------------------------------------------------------------
+
 FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
                    :rModel( _rModel )
                    ,m_pPropertySetCache( NULL )
@@ -192,7 +192,7 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
     }
 }
 
-//------------------------------------------------------------------------------
+
 FmXUndoEnvironment::~FmXUndoEnvironment()
 {
     DBG_DTOR(FmXUndoEnvironment,NULL);
@@ -203,7 +203,7 @@ FmXUndoEnvironment::~FmXUndoEnvironment()
         delete static_cast<PropertySetInfoCache*>(m_pPropertySetCache);
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::dispose()
 {
     OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::dispose: disposed twice?" );
@@ -251,7 +251,7 @@ void FmXUndoEnvironment::dispose()
     m_bDisposed = true;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::ModeChanged()
 {
     OSL_PRECOND( rModel.GetObjectShell(), "FmXUndoEnvironment::ModeChanged: no object shell anymore!" );
@@ -294,7 +294,7 @@ void FmXUndoEnvironment::ModeChanged()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if (rHint.ISA(SdrHint))
@@ -343,7 +343,7 @@ void FmXUndoEnvironment::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 
 }
 
-//------------------------------------------------------------------
+
 void FmXUndoEnvironment::Inserted(SdrObject* pObj)
 {
     if (pObj->GetObjInventor() == FmFormInventor)
@@ -359,7 +359,7 @@ void FmXUndoEnvironment::Inserted(SdrObject* pObj)
     }
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     sal_Bool lcl_searchElement(const Reference< XIndexAccess>& xCont, const Reference< XInterface >& xElement)
@@ -395,7 +395,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
 {
     DBG_ASSERT( pObj, "FmXUndoEnvironment::Inserted: invalid object!" );
@@ -452,7 +452,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj)
     }
 }
 
-//------------------------------------------------------------------
+
 void FmXUndoEnvironment::Removed(SdrObject* pObj)
 {
     if ( pObj->IsVirtualObj() )
@@ -473,7 +473,7 @@ void FmXUndoEnvironment::Removed(SdrObject* pObj)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 {
     DBG_ASSERT( pObj, "FmXUndoEnvironment::Removed: invalid object!" );
@@ -519,7 +519,7 @@ void FmXUndoEnvironment::Removed(FmFormObj* pObj)
 }
 
 //  XEventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( RuntimeException )
 {
     // check if it's an object we have cached information about
@@ -537,7 +537,7 @@ void SAL_CALL FmXUndoEnvironment::disposing(const EventObject& e) throw( Runtime
 }
 
 // XPropertyChangeListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -732,7 +732,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 }
 
 // XContainerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -747,7 +747,7 @@ void SAL_CALL FmXUndoEnvironment::elementInserted(const ContainerEvent& evt) thr
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::implSetModified()
 {
     if ( !IsLocked() && rModel.GetObjectShell() )
@@ -756,7 +756,7 @@ void FmXUndoEnvironment::implSetModified()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -773,7 +773,7 @@ void SAL_CALL FmXUndoEnvironment::elementReplaced(const ContainerEvent& evt) thr
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -786,13 +786,13 @@ void SAL_CALL FmXUndoEnvironment::elementRemoved(const ContainerEvent& evt) thro
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXUndoEnvironment::modified( const EventObject& /*aEvent*/ ) throw (RuntimeException)
 {
     implSetModified();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms)
 {
     Lock();
@@ -800,7 +800,7 @@ void FmXUndoEnvironment::AddForms(const Reference< XNameContainer > & rForms)
     UnLock();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms)
 {
     Lock();
@@ -808,7 +808,7 @@ void FmXUndoEnvironment::RemoveForms(const Reference< XNameContainer > & rForms)
     UnLock();
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > & Element)
 {
     // am Container horchen
@@ -835,7 +835,7 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > &
 }
 
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _rxContainer, bool _bStartListening ) SAL_THROW(())
 {
     OSL_PRECOND( _rxContainer.is(), "FmXUndoEnvironment::switchListening: invalid container!" );
@@ -892,7 +892,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XIndexContainer >& _r
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObject, bool _bStartListening ) SAL_THROW(())
 {
     OSL_PRECOND( _rxObject.is(), "FmXUndoEnvironment::switchListening: how should I listen at a NULL object?" );
@@ -926,7 +926,7 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
 {
     OSL_ENSURE( !m_bDisposed, "FmXUndoEnvironment::AddElement: not when I'm already disposed!" );
@@ -939,7 +939,7 @@ void FmXUndoEnvironment::AddElement(const Reference< XInterface >& _rxElement )
     switchListening( _rxElement, true );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement)
 {
     if ( m_bDisposed )
@@ -968,7 +968,7 @@ void FmXUndoEnvironment::RemoveElement(const Reference< XInterface >& _rxElement
 }
 
 
-//------------------------------------------------------------------------------
+
 FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyChangeEvent& evt)
                      :SdrUndoAction(rNewMod)
                      ,xObj(evt.Source, UNO_QUERY)
@@ -983,7 +983,7 @@ FmUndoPropertyAction::FmUndoPropertyAction(FmFormModel& rNewMod, const PropertyC
 }
 
 
-//------------------------------------------------------------------------------
+
 void FmUndoPropertyAction::Undo()
 {
     FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
@@ -1003,7 +1003,7 @@ void FmUndoPropertyAction::Undo()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmUndoPropertyAction::Redo()
 {
     FmXUndoEnvironment& rEnv = ((FmFormModel&)rMod).GetUndoEnv();
@@ -1023,7 +1023,7 @@ void FmUndoPropertyAction::Redo()
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString FmUndoPropertyAction::GetComment() const
 {
     OUString aStr(static_STR_UNDO_PROPERTY);
@@ -1034,7 +1034,7 @@ OUString FmUndoPropertyAction::GetComment() const
 
 
 DBG_NAME(FmUndoContainerAction);
-//------------------------------------------------------------------------------
+
 FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
                                              Action _eAction,
                                              const Reference< XIndexContainer > & xCont,
@@ -1071,7 +1071,7 @@ FmUndoContainerAction::FmUndoContainerAction(FmFormModel& _rMod,
     }
 }
 
-//------------------------------------------------------------------------------
+
 FmUndoContainerAction::~FmUndoContainerAction()
 {
     // if we own the object ....
@@ -1079,7 +1079,7 @@ FmUndoContainerAction::~FmUndoContainerAction()
     DBG_DTOR(FmUndoContainerAction,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 
 void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xElem )
 {
@@ -1094,7 +1094,7 @@ void FmUndoContainerAction::DisposeElement( const Reference< XInterface > & xEle
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
 {
     if ( m_xContainer->getCount() >= m_nIndex )
@@ -1123,7 +1123,7 @@ void FmUndoContainerAction::implReInsert( ) SAL_THROW( ( Exception ) )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
 {
     Reference< XInterface > xElement;
@@ -1151,7 +1151,7 @@ void FmUndoContainerAction::implReRemove( ) SAL_THROW( ( Exception ) )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmUndoContainerAction::Undo()
 {
     FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv();
@@ -1180,7 +1180,7 @@ void FmUndoContainerAction::Undo()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmUndoContainerAction::Redo()
 {
     FmXUndoEnvironment& rEnv = static_cast< FmFormModel& >( rMod ).GetUndoEnv();
@@ -1208,7 +1208,7 @@ void FmUndoContainerAction::Redo()
     }
 }
 
-//------------------------------------------------------------------------------
+
 FmUndoModelReplaceAction::FmUndoModelReplaceAction(FmFormModel& _rMod, SdrUnoObj* _pObject, const Reference< XControlModel > & _xReplaced)
     :SdrUndoAction(_rMod)
     ,m_xReplaced(_xReplaced)
@@ -1216,14 +1216,14 @@ FmUndoModelReplaceAction::FmUndoModelReplaceAction(FmFormModel& _rMod, SdrUnoObj
 {
 }
 
-//------------------------------------------------------------------------------
+
 FmUndoModelReplaceAction::~FmUndoModelReplaceAction()
 {
     // dispose our element if nobody else is responsible for
     DisposeElement(m_xReplaced);
 }
 
-//------------------------------------------------------------------------------
+
 
 void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xReplaced )
 {
@@ -1236,7 +1236,7 @@ void FmUndoModelReplaceAction::DisposeElement( const ::com::sun::star::uno::Refe
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmUndoModelReplaceAction::Undo()
 {
     try
@@ -1275,7 +1275,7 @@ void FmUndoModelReplaceAction::Undo()
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString FmUndoModelReplaceAction::GetComment() const
 {
     return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE);
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index e1e744337888..b0d3c0a3bd80 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -79,17 +79,17 @@ using namespace ::svxform;
 using namespace ::svx;
 
 //========================================================================
-//------------------------------------------------------------------------
+
 TYPEINIT1(FmFormView, E3dView);
 
-//------------------------------------------------------------------------
+
 FmFormView::FmFormView( FmFormModel* pModel, OutputDevice* pOut )
     :E3dView(pModel,pOut)
 {
     Init();
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::Init()
 {
     pFormShell = NULL;
@@ -138,7 +138,7 @@ void FmFormView::Init()
     SetDesignMode( bInitDesignMode );
 }
 
-//------------------------------------------------------------------------
+
 FmFormView::~FmFormView()
 {
     if( pFormShell )
@@ -149,7 +149,7 @@ FmFormView::~FmFormView()
     pImpl = NULL;
 }
 
-//------------------------------------------------------------------------
+
 FmFormPage* FmFormView::GetCurPage()
 {
     SdrPageView* pPageView = GetSdrPageView();
@@ -157,7 +157,7 @@ FmFormPage* FmFormView::GetCurPage()
     return pCurPage;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::MarkListHasChanged()
 {
     E3dView::MarkListHasChanged();
@@ -201,7 +201,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::AddWindowToPaintView(OutputDevice* pNewWin)
 {
     E3dView::AddWindowToPaintView(pNewWin);
@@ -216,7 +216,7 @@ void FmFormView::AddWindowToPaintView(OutputDevice* pNewWin)
         pImpl->addWindow( *pPageWindow );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin)
 {
     const SdrPageWindow* pPageWindow = findPageWindow( this, pNewWin );
@@ -226,7 +226,7 @@ void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin)
     E3dView::DeleteWindowFromPaintView(pNewWin);
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::ChangeDesignMode(sal_Bool bDesign)
 {
     if (bDesign == IsDesignMode())
@@ -313,14 +313,14 @@ void FmFormView::ChangeDesignMode(sal_Bool bDesign)
         pModel->GetUndoEnv().UnLock();
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::GrabFirstControlFocus( sal_Bool _bForceSync )
 {
     if ( !IsDesignMode() )
         pImpl->AutoFocus( _bForceSync );
 }
 
-//------------------------------------------------------------------------
+
 SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
 {
     SdrPageView* pPV = E3dView::ShowSdrPage(pPage);
@@ -356,7 +356,7 @@ SdrPageView* FmFormView::ShowSdrPage(SdrPage* pPage)
     return pPV;
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::HideSdrPage()
 {
     // --- 1. deactivate controls
@@ -373,19 +373,19 @@ void FmFormView::HideSdrPage()
     E3dView::HideSdrPage();
 }
 
-//------------------------------------------------------------------------
+
 SdrModel* FmFormView::GetMarkedObjModel() const
 {
     return E3dView::GetMarkedObjModel();
 }
 
-//------------------------------------------------------------------------
+
 sal_Bool FmFormView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
 {
     return E3dView::Paste(rMod, rPos, pLst, nOptions);
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::ActivateControls(SdrPageView* pPageView)
 {
     if (!pPageView)
@@ -398,7 +398,7 @@ void FmFormView::ActivateControls(SdrPageView* pPageView)
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::DeactivateControls(SdrPageView* pPageView)
 {
     if( !pPageView )
@@ -411,19 +411,19 @@ void FmFormView::DeactivateControls(SdrPageView* pPageView)
     }
 }
 
-//------------------------------------------------------------------------
+
 SdrObject* FmFormView::CreateFieldControl( const ODataAccessDescriptor& _rColumnDescriptor )
 {
     return pImpl->implCreateFieldControl( _rColumnDescriptor );
 }
 
-//------------------------------------------------------------------------
+
 SdrObject* FmFormView::CreateXFormsControl( const OXFormsDescriptor &_rDesc )
 {
     return pImpl->implCreateXFormsControl(_rDesc);
 }
 
-//------------------------------------------------------------------------
+
 SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const
 {
     OUString sDataSource     = rFieldDesc.getToken(0,sal_Unicode(11));
@@ -443,7 +443,7 @@ SdrObject* FmFormView::CreateFieldControl(const OUString& rFieldDesc) const
     return pImpl->implCreateFieldControl( aColumnDescriptor );
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC)
 {
     if( !IsDesignMode() )
@@ -465,7 +465,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt::
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmFormView::RemoveControlContainer(const Reference< ::com::sun::star::awt::XControlContainer > & xCC)
 {
     if( !IsDesignMode() )
@@ -474,7 +474,7 @@ void FmFormView::RemoveControlContainer(const Reference< ::com::sun::star::awt::
     }
 }
 
-// -----------------------------------------------------------------------------
+
 SdrPaintWindow* FmFormView::BeginCompleteRedraw(OutputDevice* pOut)
 {
     SdrPaintWindow* pPaintWindow = E3dView::BeginCompleteRedraw( pOut );
@@ -482,14 +482,14 @@ SdrPaintWindow* FmFormView::BeginCompleteRedraw(OutputDevice* pOut)
     return pPaintWindow;
 }
 
-// -----------------------------------------------------------------------------
+
 void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFormLayer )
 {
     E3dView::EndCompleteRedraw( rPaintWindow, bPaintFormLayer );
     pImpl->resumeTabOrderUpdate();
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
 {
     sal_Bool bDone = sal_False;
@@ -539,7 +539,7 @@ sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
         bDone = E3dView::KeyInput(rKEvt,pWin);
     return bDone;
 }
-// -----------------------------------------------------------------------------
+
 sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
 {
     Reference< ::com::sun::star::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY);
@@ -550,7 +550,7 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
 {
     sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
@@ -565,7 +565,7 @@ sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
     return bReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 FmFormObj* FmFormView::getMarkedGrid() const
 {
     FmFormObj* pFormObject = NULL;
@@ -587,7 +587,7 @@ FmFormObj* FmFormView::getMarkedGrid() const
     return pFormObject;
 }
 
-// -----------------------------------------------------------------------------
+
 void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
     const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
     sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
@@ -601,7 +601,7 @@ void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOf
         _rpLabel, _rpControl
     );
 }
-// -----------------------------------------------------------------------------
+
 Reference< runtime::XFormController > FmFormView::GetFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const
 {
     return pImpl->getFormController( _rxForm, _rDevice );
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 3f65b4638e45..c6c29adce7db 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -152,7 +152,7 @@ using namespace ::svxform;
     namespace CommandType = ::com::sun::star::sdb::CommandType;
     namespace DataType = ::com::sun::star::sdbc::DataType;
 
-//------------------------------------------------------------------------------
+
 class FmXFormView::ObjectRemoveListener : public SfxListener
 {
     FmXFormView* m_pParent;
@@ -163,7 +163,7 @@ public:
 
 //========================================================================
 DBG_NAME(FormViewPageWindowAdapter)
-//------------------------------------------------------------------------
+
 FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<css::uno::XComponentContext>& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl )
 :   m_xControlContainer( _rWindow.GetControlContainer() ),
     m_xContext( _rContext ),
@@ -194,13 +194,13 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const css::uno::Reference<
         }
     }
 }
-// -----------------------------------------------------------------------------
+
 FormViewPageWindowAdapter::~FormViewPageWindowAdapter()
 {
     DBG_DTOR(FormViewPageWindowAdapter,NULL);
 }
 
-//------------------------------------------------------------------
+
 void FormViewPageWindowAdapter::dispose()
 {
     for (   ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin();
@@ -234,33 +234,33 @@ void FormViewPageWindowAdapter::dispose()
 }
 
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException )
 {
     return getCount() != 0;
 }
 
-//------------------------------------------------------------------------------
+
 Type SAL_CALL  FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException )
 {
     return ::getCppuType((const Reference< XFormController>*)0);
 }
 
 // XEnumerationAccess
-//------------------------------------------------------------------------------
+
 Reference< XEnumeration >  SAL_CALL FormViewPageWindowAdapter::createEnumeration(void) throw( RuntimeException )
 {
     return new ::comphelper::OEnumerationByIndex(this);
 }
 
 // XIndexAccess
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException )
 {
     return m_aControllerList.size();
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     if (nIndex < 0 ||
@@ -272,7 +272,7 @@ Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( Inde
     return aElement;
 }
 
-//------------------------------------------------------------------------
+
 void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -287,7 +287,7 @@ void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl
     }
 }
 
-//------------------------------------------------------------------------
+
 Reference< XFormController >  getControllerSearchChildren( const Reference< XIndexAccess > & xIndex, const Reference< XTabControllerModel > & xModel)
 {
     if (xIndex.is() && xIndex->getCount())
@@ -311,7 +311,7 @@ Reference< XFormController >  getControllerSearchChildren( const Reference< XInd
 }
 
 // Search the according controller
-//------------------------------------------------------------------------
+
 Reference< XFormController >  FormViewPageWindowAdapter::getController( const Reference< XForm > & xForm ) const
 {
     Reference< XTabControllerModel >  xModel(xForm, UNO_QUERY);
@@ -329,7 +329,7 @@ Reference< XFormController >  FormViewPageWindowAdapter::getController( const Re
     return Reference< XFormController > ();
 }
 
-//------------------------------------------------------------------------
+
 void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController )
 {
     DBG_ASSERT( xForm.is(), "FormViewPageWindowAdapter::setController: there should be a form!" );
@@ -383,7 +383,7 @@ void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm,
     }
 }
 
-//------------------------------------------------------------------------
+
 void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxForm )
 {
     OSL_PRECOND( _rxForm.is(), "FormViewPageWindowAdapter::updateTabOrder: illegal argument!" );
@@ -417,7 +417,7 @@ void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxFor
     }
 }
 
-//------------------------------------------------------------------------
+
 FmXFormView::FmXFormView(FmFormView* _pView )
     :m_pMarkedGrid(NULL)
     ,m_pView(_pView)
@@ -431,7 +431,7 @@ FmXFormView::FmXFormView(FmFormView* _pView )
 {
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormView::cancelEvents()
 {
     if ( m_nActivationEvent )
@@ -459,7 +459,7 @@ void FmXFormView::cancelEvents()
     }
 }
 
-//------------------------------------------------------------------------
+
 void FmXFormView::notifyViewDying( )
 {
     DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" );
@@ -467,7 +467,7 @@ void FmXFormView::notifyViewDying( )
     cancelEvents();
 }
 
-//------------------------------------------------------------------------
+
 FmXFormView::~FmXFormView()
 {
     DBG_ASSERT( m_aPageWindowAdapters.empty(), "FmXFormView::~FmXFormView: Window list not empty!" );
@@ -489,7 +489,7 @@ FmXFormView::~FmXFormView()
 }
 
 //      EventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException )
 {
     if ( m_xWindow.is() && Source.Source == m_xWindow )
@@ -497,14 +497,14 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx
 }
 
 // XFormControllerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException )
 {
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
         m_pView->GetFormShell()->GetImpl()->formActivated( rEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException )
 {
     if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() )
@@ -512,7 +512,7 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run
 }
 
 // XContainerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
     try
@@ -540,18 +540,18 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
     elementInserted(evt);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC )  const
 {
     for (   PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin();
@@ -565,7 +565,7 @@ PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlCon
     return NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::addWindow(const SdrPageWindow& rWindow)
 {
     FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() );
@@ -587,7 +587,7 @@ void FmXFormView::addWindow(const SdrPageWindow& rWindow)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC )
 {
     // Wird gerufen, wenn
@@ -614,7 +614,7 @@ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent )
 {
     DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" );
@@ -624,7 +624,7 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent )
     m_nErrorMessageEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnDelayedErrorMessage ) );
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/)
 {
     m_nErrorMessageEvent = 0;
@@ -632,21 +632,21 @@ IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/)
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel )
 {
     if ( _pDocModel && _pDocModel->GetAutoControlFocus() )
         m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) );
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::suspendTabOrderUpdate()
 {
     OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" );
     m_isTabOrderUpdateSuspended = true;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::resumeTabOrderUpdate()
 {
     OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" );
@@ -673,7 +673,7 @@ void FmXFormView::resumeTabOrderUpdate()
     m_aNeedTabOrderUpdate.clear();
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
 {
     m_nActivationEvent = 0;
@@ -735,7 +735,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::Activate(sal_Bool bSync)
 {
     if (m_nActivationEvent)
@@ -752,7 +752,7 @@ void FmXFormView::Activate(sal_Bool bSync)
         m_nActivationEvent = Application::PostUserEvent(LINK(this,FmXFormView,OnActivate));
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::Deactivate(sal_Bool bDeactivateController)
 {
     if (m_nActivationEvent)
@@ -766,12 +766,12 @@ void FmXFormView::Deactivate(sal_Bool bDeactivateController)
         pShImpl->setActiveController( NULL );
 }
 
-//------------------------------------------------------------------------------
+
 FmFormShell* FmXFormView::GetFormShell() const
 {
     return m_pView ? m_pView->GetFormShell() : NULL;
 }
-// -----------------------------------------------------------------------------
+
 void FmXFormView::AutoFocus( sal_Bool _bSync )
 {
     if (m_nAutoFocusEvent)
@@ -783,7 +783,7 @@ void FmXFormView::AutoFocus( sal_Bool _bSync )
         m_nAutoFocusEvent = Application::PostUserEvent(LINK(this, FmXFormView, OnAutoFocus));
 }
 
-// -----------------------------------------------------------------------------
+
 bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl )
 {
     if ( !i_rControl.is() )
@@ -824,7 +824,7 @@ bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl )
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 static Reference< XControl > lcl_firstFocussableControl( const Sequence< Reference< XControl > >& _rControls )
 {
     Reference< XControl > xReturn;
@@ -850,7 +850,7 @@ static Reference< XControl > lcl_firstFocussableControl( const Sequence< Referen
     return xReturn;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     // .........................................................................
@@ -883,7 +883,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< XFormController > FmXFormView::getFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const
 {
     Reference< XFormController > xController;
@@ -911,7 +911,7 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF
     return xController;
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
 {
     m_nAutoFocusEvent = 0;
@@ -987,7 +987,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
     return 1L;
 }
 
-// -----------------------------------------------------------------------------
+
 void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
 {
     FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL;
@@ -1024,7 +1024,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject )
     m_nControlWizardEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnStartControlWizard ) );
 }
 
-// -----------------------------------------------------------------------------
+
 IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
 {
     m_nControlWizardEvent = 0;
@@ -1097,7 +1097,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
     return 1L;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     void lcl_insertIntoFormComponentHierarchy_throw( const FmFormView& _rView, const SdrUnoObj& _rSdrObj,
@@ -1118,7 +1118,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------------
+
 SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor )
 {
     // not if we're in design mode
@@ -1352,7 +1352,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
     return NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc )
 {
     // not if we're in design mode
@@ -1482,7 +1482,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
     return NULL;
 }
 
-//------------------------------------------------------------------------
+
 bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
         const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
         sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix,
@@ -1510,7 +1510,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
     return true;
 }
 
-//------------------------------------------------------------------------
+
 bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
     const Reference< XPropertySet >& _rxField,
     const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
@@ -1669,20 +1669,20 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 FmXFormView::ObjectRemoveListener::ObjectRemoveListener( FmXFormView* pParent )
     :m_pParent( pParent )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
 {
     if (rHint.ISA(SdrHint) && (((SdrHint&)rHint).GetKind() == HINT_OBJREMOVED))
         m_pParent->ObjectRemovedInAliveMode(((SdrHint&)rHint).GetObject());
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
 {
     // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht,
@@ -1704,7 +1704,7 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::stopMarkListWatching()
 {
     if ( m_pWatchStoredList )
@@ -1715,7 +1715,7 @@ void FmXFormView::stopMarkListWatching()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::startMarkListWatching()
 {
     if ( !m_pWatchStoredList )
@@ -1731,7 +1731,7 @@ void FmXFormView::startMarkListWatching()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
 {
     if ( m_pView )
@@ -1778,7 +1778,7 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
     }
 }
 
-//--------------------------------------------------------------------------
+
 static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj )
 {
     sal_Bool bFound = sal_False;
@@ -1789,7 +1789,7 @@ static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj )
     return bFound;
 }
 
-//------------------------------------------------------------------------------
+
 void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
 {
     if ( !m_pView )
@@ -1876,7 +1876,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
         m_aMark.Clear();
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException)
 {
     if ( m_xWindow.is() && m_pView )
@@ -1884,7 +1884,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
         m_pView->SetMoveOutside( true, FmFormView::ImplAccess() );
     }
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException)
 {
     // when switch the focus outside the office the mark didn't change
@@ -1894,7 +1894,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
         m_pView->SetMoveOutside( false, FmFormView::ImplAccess() );
     }
 }
-// -----------------------------------------------------------------------------
+
 void FmXFormView::removeGridWindowListening()
 {
     if ( m_xWindow.is() )
@@ -1908,7 +1908,7 @@ void FmXFormView::removeGridWindowListening()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 DocumentType FmXFormView::impl_getDocumentType() const
 {
     if ( GetFormShell() && GetFormShell()->GetImpl() )
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 8364115fa320..508e88ab0bf7 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -110,7 +110,7 @@ namespace svxform
     //====================================================================
     //= FormControlFactory
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormControlFactory::FormControlFactory( const Reference<XComponentContext>& _rContext )
         :m_pData( new FormControlFactory_Data( _rContext ) )
     {
@@ -121,12 +121,12 @@ namespace svxform
     {
     }
 
-    //--------------------------------------------------------------------
+
     FormControlFactory::~FormControlFactory()
     {
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const SdrUnoObj& _rObject )
     {
         return initializeControlModel(
@@ -136,7 +136,7 @@ namespace svxform
         );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel )
     {
         return initializeControlModel(
@@ -144,7 +144,7 @@ namespace svxform
         );
     }
 
-    // -----------------------------------------------------------------------------
+
     namespace
     {
         //....................................................................
@@ -391,7 +391,7 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 FormControlFactory::initializeControlModel( const DocumentType _eDocType, const Reference< XPropertySet >& _rxControlModel,
         const Rectangle& _rControlBoundRect )
     {
@@ -518,7 +518,7 @@ namespace svxform
         return nClassId;
     }
 
-    //------------------------------------------------------------------------------
+
     void FormControlFactory::initializeTextFieldLineEnds( const Reference< XPropertySet >& _rxModel )
     {
         OSL_PRECOND( _rxModel.is(), "initializeTextFieldLineEnds: invalid model!" );
@@ -555,7 +555,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void FormControlFactory::initializeFieldDependentProperties( const Reference< XPropertySet >& _rxDatabaseField,
         const Reference< XPropertySet >& _rxControlModel, const Reference< XNumberFormats >& _rxNumberFormats )
     {
@@ -653,7 +653,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------------
+
     OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject )
     {
         sal_uInt16 nResId(0);
@@ -694,7 +694,7 @@ namespace svxform
         return SVX_RESSTR(nResId);
     }
 
-    //------------------------------------------------------------------------------
+
     OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer,
         const Reference< XPropertySet >& _rxObject )
     {
@@ -705,7 +705,7 @@ namespace svxform
         return getUniqueName( _rxContainer, sBaseName );
     }
 
-    //------------------------------------------------------------------------------
+
     OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const OUString& _rBaseName )
     {
         sal_Int32 n = 0;
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 691e97016276..97d3dd8c2c58 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -97,7 +97,7 @@ using namespace ::comphelper;
 using namespace ::connectivity;
 using namespace ::connectivity::simple;
 
-//------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
     FormController_NewInstance_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & _rxORB )
 {
@@ -268,7 +268,7 @@ private:
     bool                                m_bControlsInitialized;
 };
 
-//------------------------------------------------------------------------------
+
 ColumnInfoCache::ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSupplier )
     :m_aColumns()
     ,m_bControlsInitialized( false )
@@ -302,7 +302,7 @@ ColumnInfoCache::ColumnInfoCache( const Reference< XColumnsSupplier >& _rxColSup
     }
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     bool lcl_isBoundTo( const Reference< XPropertySet >& _rxControlModel, const Reference< XInterface >& _rxNormDBField )
@@ -326,7 +326,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ColumnInfoCache::deinitializeControls()
 {
     for (   ColumnInfos::iterator col = m_aColumns.begin();
@@ -338,7 +338,7 @@ void ColumnInfoCache::deinitializeControls()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl > >& _rControls )
 {
     try
@@ -418,7 +418,7 @@ void ColumnInfoCache::initializeControls( const Sequence< Reference< XControl >
     m_bControlsInitialized = true;
 }
 
-//------------------------------------------------------------------------------
+
 const ColumnInfo& ColumnInfoCache::getColumnInfo( size_t _pos )
 {
     if ( _pos >= m_aColumns.size() )
@@ -443,7 +443,7 @@ public:
     virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException);
 };
 
-//------------------------------------------------------------------
+
 void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException)
 {
     m_aValues = _rValues;
@@ -484,7 +484,7 @@ protected:
     virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal );
 };
 
-//------------------------------------------------------------------------------
+
 void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw( RuntimeException )
 {
     UnoControl::createPeer( rxToolkit, rParentPeer );
@@ -497,7 +497,7 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal )
 {
     // these properties are ignored
@@ -507,14 +507,14 @@ void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any&
     UnoControl::ImplSetPeerProperty( rPropName, rVal );
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK( FormController, OnActivateTabOrder, void*, /*EMPTYTAG*/ )
 {
     activateTabOrder();
     return 1;
 }
 
-//------------------------------------------------------------------------------
+
 struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch >, bool >
 {
     bool operator()( const Reference< XDispatch >& _rxDispatcher ) const
@@ -547,7 +547,7 @@ IMPL_LINK( FormController, OnInvalidateFeatures, void*, /*_pNotInterestedInThisP
 /*************************************************************************/
 
 DBG_NAME( FormController )
-//------------------------------------------------------------------
+
 FormController::FormController(const Reference< css::uno::XComponentContext > & _rxORB )
                   :FormController_BASE( m_aMutex )
                   ,OPropertySetHelper( FormController_BASE::rBHelper )
@@ -601,7 +601,7 @@ FormController::FormController(const Reference< css::uno::XComponentContext > &
     m_aFeatureInvalidationTimer.SetTimeoutHdl( LINK( this, FormController, OnInvalidateFeatures ) );
 }
 
-//------------------------------------------------------------------
+
 FormController::~FormController()
 {
     {
@@ -637,19 +637,19 @@ FormController::~FormController()
     DBG_DTOR( FormController, NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL FormController::acquire() throw ()
 {
     FormController_BASE::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 void SAL_CALL FormController::release() throw ()
 {
     FormController_BASE::release();
 }
 
-//------------------------------------------------------------------
+
 Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeException)
 {
     Any aRet = FormController_BASE::queryInterface( _rType );
@@ -660,7 +660,7 @@ Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeE
     return aRet;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException )
 {
     static ::cppu::OImplementationId* pId = NULL;
@@ -707,13 +707,13 @@ Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) thro
     return ::comphelper::concatSequences( aCreatableServiceNames, aNonCreatableServiceNames );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::approveReset(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -721,7 +721,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime
         m_bModified = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString> FormController::getSupportedServiceNames_Static(void)
 {
     static Sequence< OUString> aServices;
@@ -734,7 +734,7 @@ Sequence< OUString> FormController::getSupportedServiceNames_Static(void)
     return aServices;
 }
 
-// -----------------------------------------------------------------------------
+
 namespace
 {
     struct ResetComponentText : public ::std::unary_function< Reference< XTextComponent >, void >
@@ -762,7 +762,7 @@ namespace
     };
 }
 
-// -----------------------------------------------------------------------------
+
 void FormController::impl_setTextOnAllFilter_throw()
 {
     m_bSuspendFilterTextListening = true;
@@ -795,7 +795,7 @@ void FormController::impl_setTextOnAllFilter_throw()
     }
 }
 // OPropertySetHelper
-//------------------------------------------------------------------------------
+
 sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/,
                                             sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
                 throw( IllegalArgumentException )
@@ -803,13 +803,13 @@ sal_Bool FormController::convertFastPropertyValue( Any & /*rConvertedValue*/, An
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::setFastPropertyValue_NoBroadcast( sal_Int32 /*nHandle*/, const Any& /*rValue*/ )
                          throw( Exception )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
     switch (nHandle)
@@ -889,14 +889,14 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XPropertySetInfo >  FormController::getPropertySetInfo() throw( RuntimeException )
 {
     static Reference< XPropertySetInfo >  xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
 
-//------------------------------------------------------------------------------
+
 #define DECL_PROP_CORE(varname, type) \
 pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((const type*)0),
 
@@ -904,7 +904,7 @@ pDesc[nPos++] = Property(FM_PROP_##varname, FM_ATTR_##varname, ::getCppuType((co
 #define DECL_PROP1(varname, type, attrib1)  \
     DECL_PROP_CORE(varname, type) PropertyAttribute::attrib1)
 
-//------------------------------------------------------------------------------
+
 void FormController::fillProperties(
         Sequence< Property >& /* [out] */ _rProps,
         Sequence< Property >& /* [out] */ /*_rAggregateProps*/
@@ -917,26 +917,26 @@ void FormController::fillProperties(
     DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY);
 }
 
-//------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& FormController::getInfoHelper()
 {
     return *getArrayHelper();
 }
 
 // XFilterController
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException )
 {
     m_aFilterListeners.addInterface( _Listener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeFilterControllerListener( const Reference< XFilterControllerListener >& _Listener ) throw( RuntimeException )
 {
     m_aFilterListeners.removeInterface( _Listener );
 }
 
-//------------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL FormController::getFilterComponents() throw( ::com::sun::star::uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -945,7 +945,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
     return m_aFilterComponents.size();
 }
 
-//------------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL FormController::getDisjunctiveTerms() throw( ::com::sun::star::uno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -954,7 +954,7 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
     return m_aFilterRows.size();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -973,7 +973,7 @@ void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::
         rFilterRow.erase( xText );
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component ) throw( RuntimeException, IndexOutOfBoundsException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -985,7 +985,7 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component
     return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY );
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1018,7 +1018,7 @@ Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw
     return aExpressions;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     // SYNCHRONIZED -->
@@ -1059,7 +1059,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (
     m_aFilterListeners.notifyEach( &XFilterControllerListener::disjunctiveTermRemoved, aEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeException)
 {
     // SYNCHRONIZED -->
@@ -1070,7 +1070,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
     // <-- SYNCHRONIZED
 }
 
-//------------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL FormController::getActiveTerm() throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1079,7 +1079,7 @@ void SAL_CALL FormController::appendEmptyDisjunctiveTerm() throw (RuntimeExcepti
     return m_nCurrentFilterPosition;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1096,14 +1096,14 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In
 }
 
 // XElementAccess
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::hasElements(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return !m_aChildren.empty();
 }
 
-//------------------------------------------------------------------------------
+
 Type SAL_CALL  FormController::getElementType(void) throw( RuntimeException )
 {
     return ::getCppuType((const Reference< XFormController>*)0);
@@ -1111,7 +1111,7 @@ Type SAL_CALL  FormController::getElementType(void) throw( RuntimeException )
 }
 
 // XEnumerationAccess
-//------------------------------------------------------------------------------
+
 Reference< XEnumeration > SAL_CALL  FormController::createEnumeration(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1119,14 +1119,14 @@ Reference< XEnumeration > SAL_CALL  FormController::createEnumeration(void) thro
 }
 
 // XIndexAccess
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL FormController::getCount(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     return m_aChildren.size();
 }
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1138,7 +1138,7 @@ Any SAL_CALL FormController::getByIndex(sal_Int32 Index) throw( IndexOutOfBounds
 }
 
 //  EventListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeException )
 {
     // Ist der Container disposed worden
@@ -1161,7 +1161,7 @@ void SAL_CALL FormController::disposing(const EventObject& e) throw( RuntimeExce
 }
 
 // OComponentHelper
-//-----------------------------------------------------------------------------
+
 void FormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
 {
     for ( DispatcherContainer::iterator aDispatcher = m_aFeatureDispatchers.begin();
@@ -1181,7 +1181,7 @@ void FormController::disposeAllFeaturesAndDispatchers() SAL_THROW(())
     m_aFeatureDispatchers.clear();
 }
 
-//-----------------------------------------------------------------------------
+
 void FormController::disposing(void)
 {
     EventObject aEvt( *this );
@@ -1252,7 +1252,7 @@ void FormController::disposing(void)
     m_bDBConnection = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     static bool lcl_shouldUseDynamicControlBorder( const Reference< XInterface >& _rxForm, const Any& _rDynamicColorProp )
@@ -1267,7 +1267,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1334,7 +1334,7 @@ void SAL_CALL FormController::propertyChange(const PropertyChangeEvent& evt) thr
     }
 }
 
-//------------------------------------------------------------------------------
+
 bool FormController::replaceControl( const Reference< XControl >& _rxExistentControl, const Reference< XControl >& _rxNewControl )
 {
     bool bSuccess = false;
@@ -1395,7 +1395,7 @@ bool FormController::replaceControl( const Reference< XControl >& _rxExistentCon
     return bSuccess;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::toggleAutoFields(sal_Bool bAutoFields)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1468,7 +1468,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
     }
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FormController, OnToggleAutoFields)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1478,7 +1478,7 @@ IMPL_LINK_NOARG(FormController, OnToggleAutoFields)
 }
 
 // XTextListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeException )
 {
     // SYNCHRONIZED -->
@@ -1535,7 +1535,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
 }
 
 // XItemListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1543,7 +1543,7 @@ void SAL_CALL FormController::itemStateChanged(const ItemEvent& /*rEvent*/) thro
 }
 
 // XModificationBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1551,7 +1551,7 @@ void SAL_CALL FormController::addModifyListener(const Reference< XModifyListener
     m_aModifyListeners.addInterface( l );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::removeModifyListener(const Reference< XModifyListener > & l) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1560,7 +1560,7 @@ void FormController::removeModifyListener(const Reference< XModifyListener > & l
 }
 
 // XModificationListener
-//------------------------------------------------------------------------------
+
 void FormController::modified( const EventObject& _rEvent ) throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1587,14 +1587,14 @@ void FormController::modified( const EventObject& _rEvent ) throw( RuntimeExcept
     impl_onModify();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::impl_checkDisposed_throw() const
 {
     if ( impl_isDisposed_nofail() )
         throw DisposedException( OUString(), *const_cast< FormController* >( this ) );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::impl_onModify()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1609,7 +1609,7 @@ void FormController::impl_onModify()
     m_aModifyListeners.notifyEach( &XModifyListener::modified, aEvt );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::impl_addFilterRow( const FmFilterRow& _row )
 {
     m_aFilterRows.push_back( _row );
@@ -1621,7 +1621,7 @@ void FormController::impl_addFilterRow( const FmFilterRow& _row )
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rClearBeforeNotify )
 {
     // SYNCHRONIZED -->
@@ -1636,7 +1636,7 @@ void FormController::impl_appendEmptyFilterRow( ::osl::ClearableMutexGuard& _rCl
     m_aFilterListeners.notifyEach( &XFilterControllerListener::disjunctiveTermAdded, aEvent );
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FormController::determineLockState() const
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1653,7 +1653,7 @@ sal_Bool FormController::determineLockState() const
 }
 
 //  FocusListener
-//------------------------------------------------------------------------------
+
 void FormController::focusGained(const FocusEvent& e) throw( RuntimeException )
 {
     // SYNCHRONIZED -->
@@ -1790,7 +1790,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException )
         xContext->makeVisible( xCurrentControl );
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK( FormController, OnActivated, void*, /**/ )
 {
     EventObject aEvent;
@@ -1800,7 +1800,7 @@ IMPL_LINK( FormController, OnActivated, void*, /**/ )
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK( FormController, OnDeactivated, void*, /**/ )
 {
     EventObject aEvent;
@@ -1810,7 +1810,7 @@ IMPL_LINK( FormController, OnDeactivated, void*, /**/ )
     return 0L;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::focusLost(const FocusEvent& e) throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -1827,31 +1827,31 @@ void FormController::focusLost(const FocusEvent& e) throw( RuntimeException )
     }
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL FormController::mousePressed( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
 {
     // not interested in
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL FormController::mouseReleased( const awt::MouseEvent& /*_rEvent*/ ) throw (RuntimeException)
 {
     // not interested in
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL FormController::mouseEntered( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
 {
     m_pControlBorderManager->mouseEntered( _rEvent.Source );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL FormController::mouseExited( const awt::MouseEvent& _rEvent ) throw (RuntimeException)
 {
     m_pControlBorderManager->mouseExited( _rEvent.Source );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSource ) throw (RuntimeException)
 {
     Reference< XControl > xControl( findControl( m_aControls, Reference< XControlModel >( _rSource.Source, UNO_QUERY ), sal_False, sal_False ) );
@@ -1863,7 +1863,7 @@ void SAL_CALL FormController::componentValidityChanged( const EventObject& _rSou
         m_pControlBorderManager->validityChanged( xControl, xValidatable );
 }
 
-//--------------------------------------------------------------------
+
 void FormController::setModel(const Reference< XTabControllerModel > & Model) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1976,7 +1976,7 @@ void FormController::setModel(const Reference< XTabControllerModel > & Model) th
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XTabControllerModel >  FormController::getModel() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1988,7 +1988,7 @@ Reference< XTabControllerModel >  FormController::getModel() throw( RuntimeExcep
     return m_xTabController->getModel();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::addToEventAttacher(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2015,7 +2015,7 @@ void FormController::addToEventAttacher(const Reference< XControl > & xControl)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::removeFromEventAttacher(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2042,7 +2042,7 @@ void FormController::removeFromEventAttacher(const Reference< XControl > & xCont
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::setContainer(const Reference< XControlContainer > & xContainer) throw( RuntimeException )
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2127,7 +2127,7 @@ void FormController::setContainer(const Reference< XControlContainer > & xContai
     m_bControlsSorted = sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControlContainer >  FormController::getContainer() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2139,7 +2139,7 @@ Reference< XControlContainer >  FormController::getContainer() throw( RuntimeExc
     return m_xTabController->getContainer();
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< Reference< XControl > > FormController::getControls(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2179,7 +2179,7 @@ Sequence< Reference< XControl > > FormController::getControls(void) throw( Runti
     return m_aControls;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::autoTabOrder() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2190,7 +2190,7 @@ void FormController::autoTabOrder() throw( RuntimeException )
         m_xTabController->autoTabOrder();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::activateTabOrder() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2201,7 +2201,7 @@ void FormController::activateTabOrder() throw( RuntimeException )
         m_xTabController->activateTabOrder();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::setControlLock(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2255,7 +2255,7 @@ void FormController::setControlLock(const Reference< XControl > & xControl)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::setLocks()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2266,7 +2266,7 @@ void FormController::setLocks()
         setControlLock( *pControls++ );
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     bool lcl_shouldListenForModifications( const Reference< XControl >& _rxControl, const Reference< XPropertyChangeListener >& _rxBoundFieldListener )
@@ -2296,7 +2296,7 @@ namespace
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::startControlModifyListening(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2345,7 +2345,7 @@ void FormController::startControlModifyListening(const Reference< XControl > & x
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::stopControlModifyListening(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2393,7 +2393,7 @@ void FormController::stopControlModifyListening(const Reference< XControl > & xC
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::startListening()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2406,7 +2406,7 @@ void FormController::startListening()
         startControlModifyListening( *pControls++ );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::stopListening()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2420,7 +2420,7 @@ void FormController::stopListening()
 }
 
 
-//------------------------------------------------------------------------------
+
 Reference< XControl >  FormController::findControl(Sequence< Reference< XControl > >& _rControls, const Reference< XControlModel > & xCtrlModel ,sal_Bool _bRemove,sal_Bool _bOverWrite) const
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2447,7 +2447,7 @@ Reference< XControl >  FormController::findControl(Sequence< Reference< XControl
     return Reference< XControl > ();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::implControlInserted( const Reference< XControl>& _rxControl, bool _bAddToEventAttacher )
 {
     Reference< XWindow > xWindow( _rxControl, UNO_QUERY );
@@ -2486,7 +2486,7 @@ void FormController::implControlInserted( const Reference< XControl>& _rxControl
 
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::implControlRemoved( const Reference< XControl>& _rxControl, bool _bRemoveFromEventAttacher )
 {
     Reference< XWindow > xWindow( _rxControl, UNO_QUERY );
@@ -2517,7 +2517,7 @@ void FormController::implControlRemoved( const Reference< XControl>& _rxControl,
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::implSetCurrentControl( const Reference< XControl >& _rxControl )
 {
     if ( m_xCurrentControl.get() == _rxControl.get() )
@@ -2534,7 +2534,7 @@ void FormController::implSetCurrentControl( const Reference< XControl >& _rxCont
         xGridControl->addGridControlListener( this );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::insertControl(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2554,7 +2554,7 @@ void FormController::insertControl(const Reference< XControl > & xControl)
         startControlModifyListening( xControl );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::removeControl(const Reference< XControl > & xControl)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2580,7 +2580,7 @@ void FormController::removeControl(const Reference< XControl > & xControl)
 }
 
 // XLoadListener
-//------------------------------------------------------------------------------
+
 void FormController::loaded(const EventObject& rEvent) throw( RuntimeException )
 {
     OSL_ENSURE( rEvent.Source == m_xModelAsIndex, "FormController::loaded: where did this come from?" );
@@ -2636,7 +2636,7 @@ void FormController::loaded(const EventObject& rEvent) throw( RuntimeException )
     updateAllDispatchers();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::updateAllDispatchers() const
 {
     ::std::for_each(
@@ -2649,7 +2649,7 @@ void FormController::updateAllDispatchers() const
     );
 }
 
-//------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FormController, OnLoad)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2667,7 +2667,7 @@ IMPL_LINK_NOARG(FormController, OnLoad)
     return 1L;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2676,7 +2676,7 @@ void FormController::unloaded(const EventObject& /*rEvent*/) throw( RuntimeExcep
     updateAllDispatchers();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2688,7 +2688,7 @@ void FormController::reloading(const EventObject& /*aEvent*/) throw( RuntimeExce
     unload();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2697,7 +2697,7 @@ void FormController::reloaded(const EventObject& aEvent) throw( RuntimeException
     loaded(aEvent);
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2706,7 +2706,7 @@ void FormController::unloading(const EventObject& /*aEvent*/) throw( RuntimeExce
     unload();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::unload() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2735,7 +2735,7 @@ void FormController::unload() throw( RuntimeException )
     m_pColumnInfoCache.reset();
 }
 
-// -----------------------------------------------------------------------------
+
 void FormController::removeBoundFieldListener()
 {
     const Reference< XControl >* pControls = m_aControls.getConstArray();
@@ -2748,7 +2748,7 @@ void FormController::removeBoundFieldListener()
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::startFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
 {
     try
@@ -2782,7 +2782,7 @@ void FormController::startFormListening( const Reference< XPropertySet >& _rxFor
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm, sal_Bool _bPropertiesOnly )
 {
     try
@@ -2815,7 +2815,7 @@ void FormController::stopFormListening( const Reference< XPropertySet >& _rxForm
 }
 
 // com::sun::star::sdbc::XRowSetListener
-//------------------------------------------------------------------------------
+
 void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2836,12 +2836,12 @@ void FormController::cursorMoved(const EventObject& /*event*/) throw( RuntimeExc
     m_bCurrentRecordModified = m_bModified = sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::rowChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
     // not interested in ...
 }
-//------------------------------------------------------------------------------
+
 void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeException )
 {
     // not interested in ...
@@ -2849,7 +2849,7 @@ void FormController::rowSetChanged(const EventObject& /*event*/) throw( RuntimeE
 
 
 // XContainerListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2895,7 +2895,7 @@ void SAL_CALL FormController::elementInserted(const ContainerEvent& evt) throw(
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw( RuntimeException )
 {
     // simulate an elementRemoved
@@ -2910,7 +2910,7 @@ void SAL_CALL FormController::elementReplaced(const ContainerEvent& evt) throw(
     elementInserted( aInsertEvent );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2937,7 +2937,7 @@ void SAL_CALL FormController::elementRemoved(const ContainerEvent& evt) throw( R
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControl >  FormController::isInList(const Reference< XWindowPeer > & xPeer) const
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -2956,7 +2956,7 @@ Reference< XControl >  FormController::isInList(const Reference< XWindowPeer > &
     return Reference< XControl > ();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::activateFirst() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2967,7 +2967,7 @@ void FormController::activateFirst() throw( RuntimeException )
         m_xTabController->activateFirst();
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::activateLast() throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2979,7 +2979,7 @@ void FormController::activateLast() throw( RuntimeException )
 }
 
 // XFormController
-//------------------------------------------------------------------------------
+
 Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2988,7 +2988,7 @@ Reference< XFormOperations > SAL_CALL FormController::getFormOperations() throw
     return m_xFormOperations;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -2996,14 +2996,14 @@ Reference< XControl> SAL_CALL FormController::getCurrentControl(void) throw( Run
     return m_xCurrentControl;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     impl_checkDisposed_throw();
     m_aActivateListeners.addInterface(l);
 }
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeActivateListener(const Reference< XFormControllerListener > & l) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3011,7 +3011,7 @@ void SAL_CALL FormController::removeActivateListener(const Reference< XFormContr
     m_aActivateListeners.removeInterface(l);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addChildController( const Reference< XFormController >& _ChildController ) throw( RuntimeException, IllegalArgumentException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3048,7 +3048,7 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll
     }
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3056,7 +3056,7 @@ Reference< XFormControllerContext > SAL_CALL FormController::getContext() throw
     return m_xFormControllerContext;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::setContext( const Reference< XFormControllerContext >& _context ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3064,7 +3064,7 @@ void SAL_CALL FormController::setContext( const Reference< XFormControllerContex
     m_xFormControllerContext = _context;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler() throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3072,7 +3072,7 @@ Reference< XInteractionHandler > SAL_CALL FormController::getInteractionHandler(
     return m_xInteractionHandler;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::setInteractionHandler( const Reference< XInteractionHandler >& _interactionHandler ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3080,7 +3080,7 @@ void SAL_CALL FormController::setInteractionHandler( const Reference< XInteracti
     m_xInteractionHandler = _interactionHandler;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -3260,7 +3260,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
     }
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::startFiltering()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -3399,7 +3399,7 @@ void FormController::startFiltering()
     m_bAttachEvents = sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::stopFiltering()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -3484,7 +3484,7 @@ void FormController::stopFiltering()
 }
 
 // XModeSelector
-//------------------------------------------------------------------------------
+
 void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3512,7 +3512,7 @@ void FormController::setMode(const OUString& Mode) throw( NoSupportException, Ru
     }
 }
 
-//------------------------------------------------------------------------------
+
 OUString SAL_CALL FormController::getMode(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3521,7 +3521,7 @@ OUString SAL_CALL FormController::getMode(void) throw( RuntimeException )
     return m_aMode;
 }
 
-//------------------------------------------------------------------------------
+
 Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3537,7 +3537,7 @@ Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( Run
     return aModes;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3553,7 +3553,7 @@ sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( Runt
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 Window* FormController::getDialogParentWindow()
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -3570,7 +3570,7 @@ Window* FormController::getDialogParentWindow()
     }
     return pParentWindow;
 }
-//------------------------------------------------------------------------------
+
 bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
 {
     try
@@ -3612,7 +3612,7 @@ bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstIn
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XControl > FormController::locateControl( const Reference< XControlModel >& _rxModel ) SAL_THROW(())
 {
     try
@@ -3639,7 +3639,7 @@ Reference< XControl > FormController::locateControl( const Reference< XControlMo
     return NULL;
 }
 
-//------------------------------------------------------------------------------
+
 namespace
 {
     void displayErrorSetFocus( const OUString& _rMessage, const Reference< XControl >& _rxFocusControl, Window* _pDialogParent )
@@ -3701,7 +3701,7 @@ namespace
 }
 
 // XRowSetApproveListener
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent) throw( RuntimeException )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -3789,7 +3789,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
     return true;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3806,7 +3806,7 @@ sal_Bool SAL_CALL FormController::approveCursorMove(const EventObject& event) th
     return sal_True;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3824,7 +3824,7 @@ sal_Bool SAL_CALL FormController::approveRowSetChange(const EventObject& event)
 }
 
 // XRowSetApproveBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3833,7 +3833,7 @@ void SAL_CALL FormController::addRowSetApproveListener(const Reference< XRowSetA
     m_aRowSetApproveListeners.addInterface(_rxListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowSetApproveListener > & _rxListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3843,7 +3843,7 @@ void SAL_CALL FormController::removeRowSetApproveListener(const Reference< XRowS
 }
 
 // XErrorListener
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( RuntimeException )
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -3864,7 +3864,7 @@ void SAL_CALL FormController::errorOccured(const SQLErrorEvent& aEvent) throw( R
 }
 
 // XErrorBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3873,7 +3873,7 @@ void SAL_CALL FormController::addSQLErrorListener(const Reference< XSQLErrorList
     m_aErrorListeners.addInterface(aListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorListener > & aListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3883,7 +3883,7 @@ void SAL_CALL FormController::removeSQLErrorListener(const Reference< XSQLErrorL
 }
 
 // XDatabaseParameterBroadcaster2
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3892,7 +3892,7 @@ void SAL_CALL FormController::addDatabaseParameterListener(const Reference< XDat
     m_aParameterListeners.addInterface(aListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -3902,20 +3902,20 @@ void SAL_CALL FormController::removeDatabaseParameterListener(const Reference< X
 }
 
 // XDatabaseParameterBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
     FormController::addDatabaseParameterListener( aListener );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeParameterListener(const Reference< XDatabaseParameterListener > & aListener) throw( RuntimeException )
 {
     FormController::removeDatabaseParameterListener( aListener );
 }
 
 // XDatabaseParameterListener
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent& aEvent) throw( RuntimeException )
 {
     SolarMutexGuard aSolarGuard;
@@ -3993,7 +3993,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent&
 }
 
 // XConfirmDeleteBroadcaster
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4002,7 +4002,7 @@ void SAL_CALL FormController::addConfirmDeleteListener(const Reference< XConfirm
     m_aDeleteListeners.addInterface(aListener);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConfirmDeleteListener > & aListener) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4012,7 +4012,7 @@ void SAL_CALL FormController::removeConfirmDeleteListener(const Reference< XConf
 }
 
 // XConfirmDeleteListener
-//------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) throw( RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4074,7 +4074,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
     return sal_False;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -4088,7 +4088,7 @@ void SAL_CALL FormController::invalidateFeatures( const Sequence< ::sal_Int16 >&
         m_aFeatureInvalidationTimer.Start();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -4106,7 +4106,7 @@ void SAL_CALL FormController::invalidateAllFeatures(  ) throw (RuntimeException)
         invalidateFeatures( aInterceptedFeatures );
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XDispatch >
 FormController::interceptedQueryDispatch( const URL& aURL,
                                             const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
@@ -4148,7 +4148,7 @@ FormController::interceptedQueryDispatch( const URL& aURL,
     return xReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArgs ) throw (RuntimeException)
 {
     if ( _rArgs.getLength() != 1 )
@@ -4176,7 +4176,7 @@ void SAL_CALL FormController::dispatch( const URL& _rURL, const Sequence< Proper
     OSL_FAIL( "FormController::dispatch: unknown URL!" );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::addStatusListener( const Reference< XStatusListener >& _rxListener, const URL& _rURL ) throw (RuntimeException)
 {
     if (_rURL.Complete == FMURL_CONFIRM_DELETION)
@@ -4194,19 +4194,19 @@ void SAL_CALL FormController::addStatusListener( const Reference< XStatusListene
         OSL_FAIL("FormController::addStatusListener: invalid (unsupported) URL!");
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL FormController::getParent() throw( RuntimeException )
 {
     return m_xParent;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::setParent( const Reference< XInterface >& Parent) throw( NoSupportException, RuntimeException )
 {
     m_xParent = Parent;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::removeStatusListener( const Reference< XStatusListener >& /*_rxListener*/, const URL& _rURL ) throw (RuntimeException)
 {
     (void)_rURL;
@@ -4214,7 +4214,7 @@ void SAL_CALL FormController::removeStatusListener( const Reference< XStatusList
     // we never really added the listener, so we don't need to remove it
 }
 
-//------------------------------------------------------------------------------
+
 Reference< XDispatchProviderInterceptor >  FormController::createInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -4237,7 +4237,7 @@ Reference< XDispatchProviderInterceptor >  FormController::createInterceptor(con
     return pInterceptor;
 }
 
-//------------------------------------------------------------------------------
+
 bool FormController::ensureInteractionHandler()
 {
     if ( m_xInteractionHandler.is() )
@@ -4250,7 +4250,7 @@ bool FormController::ensureInteractionHandler()
     return m_xInteractionHandler.is();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _rRequest ) throw (RuntimeException)
 {
     if ( !ensureInteractionHandler() )
@@ -4258,7 +4258,7 @@ void SAL_CALL FormController::handle( const Reference< XInteractionRequest >& _r
     m_xInteractionHandler->handle( _rRequest );
 }
 
-//------------------------------------------------------------------------------
+
 void FormController::deleteInterceptor(const Reference< XDispatchProviderInterception > & _xInterception)
 {
     OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
@@ -4286,7 +4286,7 @@ void FormController::deleteInterceptor(const Reference< XDispatchProviderInterce
     m_aControlDispatchInterceptors.erase(aIter);
 }
 
-//--------------------------------------------------------------------
+
 void FormController::implInvalidateCurrentControlDependentFeatures()
 {
     Sequence< sal_Int16 > aCurrentControlDependentFeatures(4);
@@ -4299,7 +4299,7 @@ void FormController::implInvalidateCurrentControlDependentFeatures()
     invalidateFeatures( aCurrentControlDependentFeatures );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL FormController::columnChanged( const EventObject& /*_event*/ ) throw (RuntimeException)
 {
     implInvalidateCurrentControlDependentFeatures();
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index bd5e5336cf43..67bddcdd7f33 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -117,7 +117,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         //................................................................
@@ -166,7 +166,7 @@ namespace svx
         };
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const OUString& _rMainURL )
     {
         const FeatureDescriptions& rDescriptions( getFeatureDescriptions() );
@@ -174,7 +174,7 @@ namespace svx
         return ( pos != rDescriptions.end() ) ? pos->nSlotId : -1;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 FeatureSlotTranslation::getFormFeatureForSlotId( sal_Int32 _nSlotId )
     {
         const FeatureDescriptions& rDescriptions( getFeatureDescriptions() );
@@ -183,7 +183,7 @@ namespace svx
         return ( pos != rDescriptions.end() ) ? pos->nFormFeature : -1;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 FeatureSlotTranslation::getSlotIdForFormFeature( sal_Int16 _nFormFeature )
     {
         const FeatureDescriptions& rDescriptions( getFeatureDescriptions() );
@@ -195,14 +195,14 @@ namespace svx
     //====================================================================
     //= ControllerFeatures
     //====================================================================
-    //--------------------------------------------------------------------
+
     ControllerFeatures::ControllerFeatures( IControllerFeatureInvalidation* _pInvalidationCallback )
         :m_pInvalidationCallback( _pInvalidationCallback )
         ,m_pImpl( NULL )
     {
     }
 
-    //--------------------------------------------------------------------
+
     ControllerFeatures::ControllerFeatures( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback )
         :m_pInvalidationCallback( _pInvalidationCallback )
         ,m_pImpl( NULL )
@@ -210,7 +210,7 @@ namespace svx
         assign( _rxController );
     }
 
-    //--------------------------------------------------------------------
+
     void ControllerFeatures::assign( const Reference< XFormController >& _rxController )
     {
         dispose();
@@ -218,13 +218,13 @@ namespace svx
         m_pImpl->acquire();
     }
 
-    //--------------------------------------------------------------------
+
     ControllerFeatures::~ControllerFeatures()
     {
         dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void ControllerFeatures::dispose()
     {
         if ( m_pImpl )
@@ -238,7 +238,7 @@ namespace svx
     //====================================================================
     //= FormControllerHelper
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormControllerHelper::FormControllerHelper( const Reference< XFormController >& _rxController, IControllerFeatureInvalidation* _pInvalidationCallback )
         :m_pInvalidationCallback( _pInvalidationCallback )
     {
@@ -261,7 +261,7 @@ namespace svx
         osl_atomic_decrement( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     FormControllerHelper::~FormControllerHelper( )
     {
         try
@@ -275,7 +275,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void FormControllerHelper::dispose()
     {
         if ( m_xFormOperations.is() )
@@ -283,7 +283,7 @@ namespace svx
         m_xFormOperations.clear();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool FormControllerHelper::isEnabled( sal_Int32 _nSlotId ) const
     {
         if ( !m_xFormOperations.is() )
@@ -291,7 +291,7 @@ namespace svx
         return m_xFormOperations->isEnabled( FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ) );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XRowSet > FormControllerHelper::getCursor() const
     {
         Reference< XRowSet > xCursor;
@@ -300,26 +300,26 @@ namespace svx
         return xCursor;
     }
 
-    //--------------------------------------------------------------------
+
     void FormControllerHelper::getState( sal_Int32 _nSlotId, FeatureState& _rState ) const
     {
         if ( m_xFormOperations.is() )
             _rState = m_xFormOperations->getState( FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ) );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool FormControllerHelper::commitCurrentControl( ) const
     {
         return impl_operateForm_nothrow( COMMIT_CONTROL );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool FormControllerHelper::commitCurrentRecord() const
     {
         return impl_operateForm_nothrow( COMMIT_RECORD );
     }
 
-    //--------------------------------------------------------------------
+
     void FormControllerHelper::execute( sal_Int32 _nSlotId, const OUString& _rParamName, const Any& _rParamValue ) const
     {
         Sequence< NamedValue > aArguments(1);
@@ -329,7 +329,7 @@ namespace svx
         impl_operateForm_nothrow( EXECUTE_ARGS, FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ), aArguments );
     }
 
-    //--------------------------------------------------------------------
+
     bool FormControllerHelper::impl_operateForm_nothrow( const FormOperation _eWhat, const sal_Int16 _nFeature,
             const Sequence< NamedValue >& _rArguments ) const
     {
@@ -390,14 +390,14 @@ namespace svx
         return false;
     }
 
-    //--------------------------------------------------------------------
+
     void FormControllerHelper::execute( sal_Int32 _nSlotId ) const
     {
         impl_operateForm_nothrow( EXECUTE, FeatureSlotTranslation::getFormFeatureForSlotId( _nSlotId ),
             Sequence< NamedValue >() );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormControllerHelper::invalidateFeatures( const Sequence< ::sal_Int16 >& _Features ) throw (RuntimeException)
     {
         if ( !m_pInvalidationCallback )
@@ -415,7 +415,7 @@ namespace svx
         m_pInvalidationCallback->invalidateFeatures( aFeatures );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormControllerHelper::invalidateAllFeatures() throw (RuntimeException)
     {
         if ( !m_pInvalidationCallback )
@@ -458,20 +458,20 @@ namespace svx
         m_pInvalidationCallback->invalidateFeatures( aSupportedFeatures );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormControllerHelper::errorOccured( const SQLErrorEvent& _Event ) throw (RuntimeException)
     {
         OSL_ENSURE( !m_aOperationError.hasValue(), "FormControllerHelper::errorOccurred: two errors during one operation?" );
         m_aOperationError = _Event.Reason;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL FormControllerHelper::disposing( const EventObject& /*_Source*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool FormControllerHelper::isInsertionRow() const
     {
         sal_Bool bIs = sal_False;
@@ -480,7 +480,7 @@ namespace svx
         return bIs;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool FormControllerHelper::isModifiedRow() const
     {
         sal_Bool bIs = sal_False;
@@ -488,7 +488,7 @@ namespace svx
             bIs = m_xFormOperations->isModifiedRow();
         return bIs;
     }
-    //--------------------------------------------------------------------
+
     bool FormControllerHelper::canDoFormFilter() const
     {
         if ( !m_xFormOperations.is() )
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index cfde37763c31..79a2aa1c490f 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -51,7 +51,7 @@ namespace svxform
     //========================================================================
 
     DBG_NAME(DispatchInterceptionMultiplexer)
-    //------------------------------------------------------------------------
+
     DispatchInterceptionMultiplexer::DispatchInterceptionMultiplexer(
                 const Reference< XDispatchProviderInterception >& _rxToIntercept, DispatchInterceptor* _pMaster )
         :DispatchInterceptionMultiplexer_BASE(_pMaster && _pMaster->getInterceptorMutex() ? *_pMaster->getInterceptorMutex() : m_aFallback)
@@ -80,7 +80,7 @@ namespace svxform
         ::comphelper::decrement(m_refCount);
     }
 
-    //------------------------------------------------------------------------
+
     DispatchInterceptionMultiplexer::~DispatchInterceptionMultiplexer()
     {
         if (!rBHelper.bDisposed)
@@ -89,7 +89,7 @@ namespace svxform
         DBG_DTOR(DispatchInterceptionMultiplexer,NULL);
     }
 
-    //------------------------------------------------------------------------------
+
     Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException)
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
@@ -105,7 +105,7 @@ namespace svxform
         return xResult;
     }
 
-    //------------------------------------------------------------------------------
+
     Sequence< Reference< XDispatch > > SAL_CALL
     DispatchInterceptionMultiplexer::queryDispatches( const Sequence< DispatchDescriptor >& aDescripts ) throw(RuntimeException)
     {
@@ -120,35 +120,35 @@ namespace svxform
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------
+
     Reference< XDispatchProvider > SAL_CALL DispatchInterceptionMultiplexer::getSlaveDispatchProvider(  ) throw(RuntimeException)
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         return m_xSlaveDispatcher;
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL DispatchInterceptionMultiplexer::setSlaveDispatchProvider(const Reference< XDispatchProvider>& xNewDispatchProvider) throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         m_xSlaveDispatcher = xNewDispatchProvider;
     }
 
-    //------------------------------------------------------------------------------
+
     Reference< XDispatchProvider> SAL_CALL DispatchInterceptionMultiplexer::getMasterDispatchProvider(void) throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         return m_xMasterDispatcher;
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL DispatchInterceptionMultiplexer::setMasterDispatchProvider(const Reference< XDispatchProvider>& xNewSupplier) throw( RuntimeException )
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
         m_xMasterDispatcher = xNewSupplier;
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL DispatchInterceptionMultiplexer::disposing(const EventObject& Source) throw( RuntimeException )
     {
         if (m_bListening)
@@ -159,7 +159,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void DispatchInterceptionMultiplexer::ImplDetach()
     {
         ::osl::MutexGuard aGuard( *m_pMutex );
@@ -179,7 +179,7 @@ namespace svxform
         m_bListening = sal_False;
     }
 
-    //------------------------------------------------------------------------------
+
     void DispatchInterceptionMultiplexer::disposing()
     {
         // remove ourself as event listener from the interception component
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index e15235269925..bb47ba7aa61e 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -38,7 +38,7 @@ namespace svx
     //====================================================================
     //= OSingleFeatureDispatcher
     //====================================================================
-    //--------------------------------------------------------------------
+
     OSingleFeatureDispatcher::OSingleFeatureDispatcher( const URL& _rFeatureURL, const sal_Int16 _nFormFeature,
             const Reference< XFormOperations >& _rxFormOperations, ::osl::Mutex& _rMutex )
         :m_rMutex( _rMutex )
@@ -51,7 +51,7 @@ namespace svx
     {
     }
 
-    //--------------------------------------------------------------------
+
     void OSingleFeatureDispatcher::getUnoState( FeatureStateEvent& /* [out] */ _rState ) const
     {
         _rState.Source = *const_cast< OSingleFeatureDispatcher* >( this );
@@ -64,7 +64,7 @@ namespace svx
         _rState.State = aState.State;
     }
 
-    //--------------------------------------------------------------------
+
     void OSingleFeatureDispatcher::updateAllListeners()
     {
         ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -81,7 +81,7 @@ namespace svx
         notifyStatus( NULL, aGuard );
     }
 
-    //--------------------------------------------------------------------
+
     void OSingleFeatureDispatcher::notifyStatus( const Reference< XStatusListener >& _rxListener, ::osl::ClearableMutexGuard& _rFreeForNotification )
     {
         FeatureStateEvent aUnoState;
@@ -123,7 +123,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( m_rMutex );
@@ -162,7 +162,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OSingleFeatureDispatcher::addStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException)
     {
         (void)_rURL;
@@ -186,7 +186,7 @@ namespace svx
         notifyStatus( _rxControl, aGuard );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OSingleFeatureDispatcher::removeStatusListener( const Reference< XStatusListener >& _rxControl, const URL& _rURL ) throw (RuntimeException)
     {
         (void)_rURL;
@@ -201,7 +201,7 @@ namespace svx
         m_aStatusListeners.removeInterface( _rxControl );
     }
 
-    //--------------------------------------------------------------------
+
     void OSingleFeatureDispatcher::checkAlive() const SAL_THROW((DisposedException))
     {
         if ( m_bDisposed )
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 43cbe8231829..5e969a2799fc 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -35,7 +35,7 @@ namespace svxform
     //====================================================================
     //= FormToolboxes
     //====================================================================
-    //--------------------------------------------------------------------
+
     FormToolboxes::FormToolboxes( const Reference< XFrame >& _rxFrame )
     {
         // the layout manager
@@ -44,7 +44,7 @@ namespace svxform
             xFrameProps->getPropertyValue("LayoutManager") >>= m_xLayouter;
     }
 
-    //--------------------------------------------------------------------
+
     void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const
     {
         try
@@ -72,14 +72,14 @@ namespace svxform
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const
     {
         return m_xLayouter.is() && m_xLayouter->isElementVisible(
             getToolboxResourceName( _nSlotId ) );
     }
 
-    //--------------------------------------------------------------------
+
     OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
     {
         OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 211bf65f168b..9920907f5420 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -106,79 +106,79 @@ namespace svxform
         const Reference< form::runtime::XFormController >   m_xDelegator;
     };
 
-    //--------------------------------------------------------------------
+
     Reference< XControl > SAL_CALL LegacyFormController::getCurrentControl(  ) throw (RuntimeException)
     {
         return m_xDelegator->getCurrentControl();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::addActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException)
     {
         m_xDelegator->addActivateListener( _listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::removeActivateListener( const Reference< form::XFormControllerListener >& _listener ) throw (RuntimeException)
     {
         m_xDelegator->removeActivateListener( _listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::setModel( const Reference< XTabControllerModel >& _model ) throw (RuntimeException)
     {
         m_xDelegator->setModel( _model );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XTabControllerModel > SAL_CALL LegacyFormController::getModel(  ) throw (RuntimeException)
     {
         return m_xDelegator->getModel();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::setContainer( const Reference< XControlContainer >& _container ) throw (RuntimeException)
     {
         m_xDelegator->setContainer( _container );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControlContainer > SAL_CALL LegacyFormController::getContainer(  ) throw (RuntimeException)
     {
         return m_xDelegator->getContainer();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Reference< XControl > > SAL_CALL LegacyFormController::getControls(  ) throw (RuntimeException)
     {
         return m_xDelegator->getControls();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::autoTabOrder(  ) throw (RuntimeException)
     {
         m_xDelegator->autoTabOrder();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::activateTabOrder(  ) throw (RuntimeException)
     {
         m_xDelegator->activateTabOrder();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::activateFirst(  ) throw (RuntimeException)
     {
         m_xDelegator->activateFirst();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL LegacyFormController::activateLast(  ) throw (RuntimeException)
     {
         m_xDelegator->activateLast();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL LegacyFormController::getImplementationName(  ) throw (RuntimeException)
     {
         return OUString( "org.openoffice.comp.svx.LegacyFormController" );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index a382e69ab5d7..6433330d4ca7 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -86,7 +86,7 @@ namespace svxform
             MapModelToShape;
     typedef MapModelToShape::value_type ModelShapePair;
 
-    //------------------------------------------------------------------------
+
     void    collectShapeModelMapping( SdrPage* _pPage, MapModelToShape& _rMapping )
     {
         OSL_ENSURE( _pPage, "collectShapeModelMapping: invalid arg!" );
@@ -117,7 +117,7 @@ namespace svxform
     // class NavigatorTree
     //========================================================================
 
-    //------------------------------------------------------------------------
+
     NavigatorTree::NavigatorTree( Window* pParent )
         :SvTreeListBox( pParent, WB_HASBUTTONS|WB_HASLINES|WB_BORDER|WB_HSCROLL ) // #100258# OJ WB_HSCROLL added
         ,m_aControlExchange(this)
@@ -165,7 +165,7 @@ namespace svxform
         SetDeselectHdl(LINK(this, NavigatorTree, OnEntrySelDesel));
     }
 
-    //------------------------------------------------------------------------
+
     NavigatorTree::~NavigatorTree()
     {
         if( nEditEvent )
@@ -180,13 +180,13 @@ namespace svxform
         delete m_pNavModel;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::Clear()
     {
         m_pNavModel->Clear();
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::UpdateContent( FmFormShell* pFormShell )
     {
         if (m_bInitialUpdate)
@@ -221,7 +221,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::implAllowExchange( sal_Int8 _nAction, sal_Bool* _pHasNonHidden )
     {
         SvTreeListEntry* pCurEntry = GetCurEntry();
@@ -257,7 +257,7 @@ namespace svxform
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::implPrepareExchange( sal_Int8 _nAction )
     {
         EndSelection();
@@ -293,7 +293,7 @@ namespace svxform
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     void NavigatorTree::StartDrag( sal_Int8 /*nAction*/, const ::Point& /*rPosPixel*/ )
     {
         EndSelection();
@@ -306,7 +306,7 @@ namespace svxform
         m_aControlExchange.startDrag( DND_ACTION_COPYMOVE );
     }
 
-    //------------------------------------------------------------------------------
+
     void NavigatorTree::Command( const CommandEvent& rEvt )
     {
         sal_Bool bHandled = sal_False;
@@ -534,7 +534,7 @@ namespace svxform
             SvTreeListBox::Command( rEvt );
     }
 
-    //------------------------------------------------------------------------
+
     SvTreeListEntry* NavigatorTree::FindEntry( FmEntryData* pEntryData )
     {
         if( !pEntryData ) return NULL;
@@ -552,7 +552,7 @@ namespace svxform
         return NULL;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     {
         if( rHint.ISA(FmNavRemovedHint) )
@@ -612,7 +612,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     SvTreeListEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
     {
         //////////////////////////////////////////////////////////////////////
@@ -649,7 +649,7 @@ namespace svxform
         return pNewEntry;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::Remove( FmEntryData* pEntryData )
     {
         if( !pEntryData )
@@ -685,21 +685,21 @@ namespace svxform
         UnlockSelectionHandling();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::IsFormEntry( SvTreeListEntry* pEntry )
     {
         FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
         return !pEntryData || pEntryData->ISA(FmFormData);
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::IsFormComponentEntry( SvTreeListEntry* pEntry )
     {
         FmEntryData* pEntryData = (FmEntryData*)pEntry->GetUserData();
         return pEntryData && pEntryData->ISA(FmControlData);
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::implAcceptPaste( )
     {
         SvTreeListEntry* pFirstSelected = FirstSelected();
@@ -714,13 +714,13 @@ namespace svxform
         return ( nAction == implAcceptDataTransfer( aClipboardContent.GetDataFlavorExVector(), nAction, pFirstSelected, sal_False ) );
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD )
     {
         return implAcceptDataTransfer( _rFlavors, _nAction, GetEntry( _rDropPos ), _bDnD );
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int8 NavigatorTree::implAcceptDataTransfer( const DataFlavorExVector& _rFlavors, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD )
     {
         // no target -> no drop
@@ -858,7 +858,7 @@ namespace svxform
         return DND_ACTION_MOVE;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int8 NavigatorTree::AcceptDrop( const AcceptDropEvent& rEvt )
     {
         ::Point aDropPos = rEvt.maPosPixel;
@@ -913,13 +913,13 @@ namespace svxform
         return implAcceptDataTransfer( GetDataFlavorExVector(), rEvt.mnAction, aDropPos, sal_True );
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, const ::Point& _rDropPos, sal_Bool _bDnD )
     {
         return implExecuteDataTransfer( _rData, _nAction, GetEntry( _rDropPos ), _bDnD );
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int8 NavigatorTree::implExecuteDataTransfer( const OControlTransferData& _rData, sal_Int8 _nAction, SvTreeListEntry* _pTargetEntry, sal_Bool _bDnD )
     {
         const DataFlavorExVector& rDataFlavors = _rData.GetDataFlavorExVector();
@@ -1181,7 +1181,7 @@ namespace svxform
         return _nAction;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Int8 NavigatorTree::ExecuteDrop( const ExecuteDropEvent& rEvt )
     {
         sal_Int8 nResult( DND_ACTION_NONE );
@@ -1197,7 +1197,7 @@ namespace svxform
         return nResult;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::doPaste()
     {
            try
@@ -1224,7 +1224,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::doCopy()
     {
         if ( implPrepareExchange( DND_ACTION_COPY ) )
@@ -1234,7 +1234,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::ModelHasRemoved( SvTreeListEntry* _pEntry )
     {
         SvTreeListEntry* pTypedEntry = static_cast< SvTreeListEntry* >( _pEntry );
@@ -1252,7 +1252,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::doCut()
     {
         if ( implPrepareExchange( DND_ACTION_MOVE ) )
@@ -1276,7 +1276,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::KeyInput(const ::KeyEvent& rKEvt)
     {
         const KeyCode& rCode = rKEvt.GetKeyCode();
@@ -1311,7 +1311,7 @@ namespace svxform
         SvTreeListBox::KeyInput(rKEvt);
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::EditingEntry( SvTreeListEntry* pEntry, Selection& rSelection )
     {
         if (!SvTreeListBox::EditingEntry( pEntry, rSelection ))
@@ -1321,7 +1321,7 @@ namespace svxform
             // die Wurzel, die ich nicht umbenennen darf, hat als UserData NULL
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::NewForm( SvTreeListEntry* pParentEntry )
     {
         //////////////////////////////////////////////////////////////////////
@@ -1383,7 +1383,7 @@ namespace svxform
         EditEntry( pNewEntry );
     }
 
-    //------------------------------------------------------------------------
+
     FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName )
     {
         //////////////////////////////////////////////////////////////////////
@@ -1432,7 +1432,7 @@ namespace svxform
         return pNewFormControlData;
     }
 
-    //------------------------------------------------------------------------
+
     OUString NavigatorTree::GenerateName( FmEntryData* pEntryData )
     {
         const sal_uInt16 nMaxCount = 99;
@@ -1466,7 +1466,7 @@ namespace svxform
         return aNewName;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
     {
         if (EditingCanceled())
@@ -1485,7 +1485,7 @@ namespace svxform
         return bRes;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(NavigatorTree, OnEdit)
     {
         nEditEvent = 0;
@@ -1495,7 +1495,7 @@ namespace svxform
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer)
     {
         if (--m_aTimerCounter > 0)
@@ -1532,7 +1532,7 @@ namespace svxform
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/)
     {
         m_sdiState = SDI_DIRTY;
@@ -1549,7 +1549,7 @@ namespace svxform
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer)
     {
         SynchronizeMarkList();
@@ -1557,7 +1557,7 @@ namespace svxform
     }
 
 
-    //------------------------------------------------------------------------
+
     IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction)
     {
         if ( !m_aControlExchange.isClipboardOwner() )
@@ -1585,7 +1585,7 @@ namespace svxform
         return 0L;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::ShowSelectionProperties(sal_Bool bForce)
     {
         // zuerst brauche ich die FormShell
@@ -1673,7 +1673,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::DeleteSelection()
     {
         // die Root darf ich natuerlich nicht mitloeschen
@@ -1769,7 +1769,7 @@ namespace svxform
         // this ... :(
         // #i31038#
         {
-            // ---------------
+
             // initialize UNDO
             OUString aUndoStr;
             if ( m_arrCurrentSelection.size() == 1 )
@@ -1814,7 +1814,7 @@ namespace svxform
         pFormModel->EndUndo();
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::CollectSelectionData(SELDATA_ITEMS sdiHow)
     {
         DBG_ASSERT(sdiHow != SDI_DIRTY, "NavigatorTree::CollectSelectionData : ever thought about your parameter ? DIRTY ?");
@@ -1888,7 +1888,7 @@ namespace svxform
         m_sdiState = sdiHow;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::SynchronizeSelection(FmEntryDataArray& arredToSelect)
     {
         LockSelectionHandling();
@@ -1951,7 +1951,7 @@ namespace svxform
         UnlockSelectionHandling();
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::SynchronizeSelection()
     {
         // Shell und View
@@ -1964,7 +1964,7 @@ namespace svxform
         GetNavModel()->BroadcastMarkedObjects(pFormView->GetMarkedObjectList());
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::SynchronizeMarkList()
     {
         // die Shell werde ich brauchen ...
@@ -2033,7 +2033,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::IsHiddenControl(FmEntryData* pEntryData)
     {
         if (pEntryData == NULL) return sal_False;
@@ -2047,7 +2047,7 @@ namespace svxform
         return sal_False;
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
     {
         if (bSelect == IsSelected(pEntry))  // das passiert manchmal, ich glaube, die Basisklasse geht zu sehr auf Nummer sicher ;)
@@ -2056,7 +2056,7 @@ namespace svxform
         return SvTreeListBox::Select(pEntry, bSelect );
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTree::UnmarkAllViewObj()
     {
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
@@ -2065,7 +2065,7 @@ namespace svxform
         FmFormView* pFormView = pFormShell->GetFormView();
         pFormView->UnMarkAll();
     }
-    //------------------------------------------------------------------------
+
     void NavigatorTree::MarkViewObj(FmFormData* pFormData, sal_Bool bMark, sal_Bool bDeep )
     {
         FmFormShell* pFormShell = GetNavModel()->GetFormShell();
@@ -2113,7 +2113,7 @@ namespace svxform
             } // for ( sal_uInt32 i = 0; i < pFormView->PaintWindowCount(); ++i )
         }
     }
-    //------------------------------------------------------------------------
+
     void NavigatorTree::CollectObjects(FmFormData* pFormData, sal_Bool bDeep, ::std::set< Reference< XFormComponent > >& _rObjects)
     {
         FmEntryDataList* pChildList = pFormData->GetChildList();
@@ -2131,7 +2131,7 @@ namespace svxform
                 CollectObjects((FmFormData*)pEntryData,bDeep,_rObjects);
         } // for( sal_uInt32 i=0; i<pChildList->Count(); i++ )
     }
-    //------------------------------------------------------------------------
+
     void NavigatorTree::MarkViewObj( FmControlData* pControlData, sal_Bool bMarkHandles, sal_Bool bMark)
     {
         if( !pControlData )
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index b4f480c36bda..1f0b60cc79e4 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -56,7 +56,7 @@ namespace svxform
     //========================================================================
     // class OFormComponentObserver
     //========================================================================
-    //------------------------------------------------------------------------
+
     OFormComponentObserver::OFormComponentObserver(NavigatorTreeModel* _pModel)
         :m_pNavModel(_pModel)
         ,m_nLocks(0)
@@ -65,13 +65,13 @@ namespace svxform
     }
 
     // XPropertyChangeListener
-    //------------------------------------------------------------------------
+
     void SAL_CALL OFormComponentObserver::disposing(const EventObject& Source) throw( RuntimeException )
     {
         Remove( Source.Source );
     }
 
-    //------------------------------------------------------------------------
+
     void SAL_CALL OFormComponentObserver::propertyChange(const PropertyChangeEvent& evt) throw(RuntimeException)
     {
         if( !m_pNavModel ) return;
@@ -96,7 +96,7 @@ namespace svxform
     }
 
     // XContainerListener
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OFormComponentObserver::elementInserted(const ContainerEvent& evt) throw(RuntimeException)
     {
         if (IsLocked() || !m_pNavModel)
@@ -112,7 +112,7 @@ namespace svxform
         m_bCanUndo = sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     void OFormComponentObserver::Insert(const Reference< XInterface > & xIface, sal_Int32 nIndex)
     {
         Reference< XForm >  xForm(xIface, UNO_QUERY);
@@ -135,7 +135,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OFormComponentObserver::elementReplaced(const ContainerEvent& evt) throw(RuntimeException)
     {
         if (IsLocked() || !m_pNavModel)
@@ -166,7 +166,7 @@ namespace svxform
         m_bCanUndo = sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     void OFormComponentObserver::Remove( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement )
     {
         if (IsLocked() || !m_pNavModel)
@@ -183,7 +183,7 @@ namespace svxform
         m_bCanUndo = sal_True;
     }
 
-    //------------------------------------------------------------------------------
+
     void SAL_CALL OFormComponentObserver::elementRemoved(const ContainerEvent& evt) throw(RuntimeException)
     {
         Reference< XInterface > xElement;
@@ -195,7 +195,7 @@ namespace svxform
     // class NavigatorTreeModel
     //========================================================================
 
-    //------------------------------------------------------------------------
+
     NavigatorTreeModel::NavigatorTreeModel( const ImageList& _rNormalImages )
                     :m_pFormShell(NULL)
                     ,m_pFormPage(NULL)
@@ -207,7 +207,7 @@ namespace svxform
         m_pRootList = new FmEntryDataList();
     }
 
-    //------------------------------------------------------------------------
+
     NavigatorTreeModel::~NavigatorTreeModel()
     {
         //////////////////////////////////////////////////////////////////////
@@ -229,7 +229,7 @@ namespace svxform
     }
 
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::SetModified( sal_Bool bMod )
     {
         if( !m_pFormShell ) return;
@@ -238,7 +238,7 @@ namespace svxform
         pObjShell->SetModified( bMod );
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::Clear()
     {
         Reference< css::form::XForms >  xForms( GetForms());
@@ -255,7 +255,7 @@ namespace svxform
         Broadcast( aClearedHint );
     }
 
-    //------------------------------------------------------------------------
+
     Reference< css::form::XForms >  NavigatorTreeModel::GetForms() const
     {
         if( !m_pFormShell || !m_pFormShell->GetCurPage())
@@ -264,7 +264,7 @@ namespace svxform
             return m_pFormShell->GetCurPage()->GetForms();
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel)
     {
         if (IsListening(*m_pFormModel))
@@ -363,7 +363,7 @@ namespace svxform
             StartListening(*m_pFormModel);
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::Remove(FmEntryData* pEntry, sal_Bool bAlterModel)
     {
         //////////////////////////////////////////////////////////////////////
@@ -453,7 +453,7 @@ namespace svxform
         StartListening(*m_pFormModel);
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::RemoveForm(FmFormData* pFormData)
     {
         //////////////////////////////////////////////////////////////////////
@@ -485,7 +485,7 @@ namespace svxform
             xContainer->removeContainerListener((XContainerListener*)m_pPropChangeList);
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::RemoveFormComponent(FmControlData* pControlData)
     {
         //////////////////////////////////////////////////////////////////////
@@ -500,7 +500,7 @@ namespace svxform
             xSet->removePropertyChangeListener( FM_PROP_NAME, m_pPropChangeList);
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::ClearBranch( FmFormData* pParentData )
     {
         //////////////////////////////////////////////////////////////////////
@@ -517,7 +517,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::FillBranch( FmFormData* pFormData )
     {
         //////////////////////////////////////////////////////////////
@@ -581,7 +581,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::InsertForm(const Reference< XForm > & xForm, sal_uInt32 nRelPos)
     {
         FmFormData* pFormData = (FmFormData*)FindData( xForm, GetRootList() );
@@ -600,7 +600,7 @@ namespace svxform
         Insert( pFormData, nRelPos );
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::InsertFormComponent(const Reference< XFormComponent > & xComp, sal_uInt32 nRelPos)
     {
         //////////////////////////////////////////////////////////
@@ -629,7 +629,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::ReplaceFormComponent(
         const Reference< XFormComponent > & xOld,
         const Reference< XFormComponent > & xNew
@@ -643,7 +643,7 @@ namespace svxform
         Broadcast( aReplacedHint );
     }
 
-    //------------------------------------------------------------------------
+
     FmEntryData* NavigatorTreeModel::FindData(const Reference< XInterface > & xElement, FmEntryDataList* pDataList, sal_Bool bRecurs)
     {
         // normalize
@@ -664,7 +664,7 @@ namespace svxform
         return NULL;
     }
 
-    //------------------------------------------------------------------------
+
     FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs )
     {
         FmEntryDataList* pDataList;
@@ -696,7 +696,7 @@ namespace svxform
         return NULL;
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
     {
         if( rHint.ISA(SdrHint) )
@@ -726,7 +726,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::InsertSdrObj( const SdrObject* pObj )
     {
         const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
@@ -753,7 +753,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::RemoveSdrObj( const SdrObject* pObj )
     {
         const FmFormObj* pFormObject = FmFormObj::GetFormObject( pObj );
@@ -838,7 +838,7 @@ namespace svxform
             // eine leere Liste interpretiert der NavigatorTree so, dass er seine Selektion komplett rausnimmt
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::UpdateContent( const Reference< css::form::XForms > & xForms )
     {
         //////////////////////////////////////////////////////////////////////
@@ -860,7 +860,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     void NavigatorTreeModel::UpdateContent( FmFormShell* pShell )
     {
         //////////////////////////////////////////////////////////////////////
@@ -901,7 +901,7 @@ namespace svxform
         }
     }
 
-    //------------------------------------------------------------------------
+
     Reference< XIndexContainer >  NavigatorTreeModel::GetFormComponents( FmFormData* pFormData )
     {
         //////////////////////////////////////////////////////////////////////
@@ -912,7 +912,7 @@ namespace svxform
         return Reference< XIndexContainer > ();
     }
 
-    //------------------------------------------------------------------------
+
     sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText )
     {
         //////////////////////////////////////////////////////////////////////
@@ -947,7 +947,7 @@ namespace svxform
         return sal_True;
     }
 
-    //------------------------------------------------------------------
+
     SdrObject* NavigatorTreeModel::Search(SdrObjListIter& rIter, const Reference< XFormComponent > & xComp)
     {
         while (rIter.IsMore())
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index ea3ffc9d847a..315d7a210766 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -31,12 +31,12 @@ namespace svxform
     //====================================================================
     //= OSQLParserClient
     //====================================================================
-    //--------------------------------------------------------------------
+
     OSQLParserClient::OSQLParserClient(const Reference< XComponentContext >& rxContext)
     {
         m_xContext = rxContext;
     }
-    //--------------------------------------------------------------------
+
     bool OSQLParserClient::ensureLoaded() const
     {
         if ( !ODbtoolsClient::ensureLoaded() )
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index 876b9424df7c..00b9118801e1 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -27,7 +27,7 @@ namespace svx
     //====================================================================
     //= StringListResource
     //====================================================================
-    //--------------------------------------------------------------------
+
     StringListResource::StringListResource( const ResId& _rResId )
         :Resource( _rResId )
     {
@@ -40,7 +40,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     StringListResource::~StringListResource()
     {
         FreeResource();
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 689e25a2e921..44124b542431 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -112,7 +112,7 @@ static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< conta
 // class FmFieldWinListBox
 //==================================================================
 DBG_NAME(FmFieldWinListBox)
-//------------------------------------------------------------------------------
+
 FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
     :SvTreeListBox( pParent, WB_HASBUTTONS|WB_BORDER )
     ,pTabWin( pParent )
@@ -123,25 +123,25 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent )
     SetHighlightRange( );
 }
 
-//------------------------------------------------------------------------------
+
 FmFieldWinListBox::~FmFieldWinListBox()
 {
     DBG_DTOR(FmFieldWinListBox,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int8 FmFieldWinListBox::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return DND_ACTION_NONE;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ )
 {
     return DND_ACTION_NONE;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Bool FmFieldWinListBox::DoubleClickHdl()
 {
     if ( pTabWin->createSelectionControls() )
@@ -150,7 +150,7 @@ sal_Bool FmFieldWinListBox::DoubleClickHdl()
     return SvTreeListBox::DoubleClickHdl();
 }
 
-//------------------------------------------------------------------------------
+
 void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPixel*/ )
 {
     SvTreeListEntry* pSelected = FirstSelected();
@@ -181,13 +181,13 @@ void FmFieldWinListBox::StartDrag( sal_Int8 /*_nAction*/, const Point& /*_rPosPi
 // class FmFieldWinData
 //========================================================================
 DBG_NAME(FmFieldWinData);
-//-----------------------------------------------------------------------
+
 FmFieldWinData::FmFieldWinData()
 {
     DBG_CTOR(FmFieldWinData,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 FmFieldWinData::~FmFieldWinData()
 {
     DBG_DTOR(FmFieldWinData,NULL);
@@ -197,7 +197,7 @@ FmFieldWinData::~FmFieldWinData()
 // class FmFieldWin
 //========================================================================
 DBG_NAME(FmFieldWin);
-//-----------------------------------------------------------------------
+
 FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _pParent)
             :SfxFloatingWindow(_pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE))
             ,SfxControllerItem(SID_FM_FIELDS_CONTROL, *_pBindings)
@@ -216,7 +216,7 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _
     SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y));
 }
 
-//-----------------------------------------------------------------------
+
 FmFieldWin::~FmFieldWin()
 {
     if (m_pChangeListener)
@@ -230,7 +230,7 @@ FmFieldWin::~FmFieldWin()
     DBG_DTOR(FmFieldWin,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::GetFocus()
 {
     if ( pListBox )
@@ -239,7 +239,7 @@ void FmFieldWin::GetFocus()
         SfxFloatingWindow::GetFocus();
 }
 
-//-----------------------------------------------------------------------
+
 sal_Bool FmFieldWin::createSelectionControls( )
 {
     SvTreeListEntry* pSelected = pListBox->FirstSelected();
@@ -270,7 +270,7 @@ sal_Bool FmFieldWin::createSelectionControls( )
     return NULL != pSelected;
 }
 
-//-----------------------------------------------------------------------
+
 bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt )
 {
     if ( EVENT_KEYINPUT == _rNEvt.GetType() )
@@ -286,20 +286,20 @@ bool FmFieldWin::PreNotify( NotifyEvent& _rNEvt )
     return SfxFloatingWindow::PreNotify( _rNEvt );
 }
 
-//-----------------------------------------------------------------------
+
 bool FmFieldWin::Close()
 {
     return SfxFloatingWindow::Close();
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::_propertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException )
 {
     ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >  xForm(evt.Source, ::com::sun::star::uno::UNO_QUERY);
     UpdateContent(xForm);
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState)
 {
     if (!pState  || SID_FM_FIELDS_CONTROL != nSID)
@@ -314,7 +314,7 @@ void FmFieldWin::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoo
         UpdateContent(NULL);
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::UpdateContent(FmFormShell* pShell)
 {
     pListBox->Clear();
@@ -329,7 +329,7 @@ void FmFieldWin::UpdateContent(FmFormShell* pShell)
         UpdateContent( xForm );
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xForm)
 {
     try
@@ -408,7 +408,7 @@ void FmFieldWin::UpdateContent(const ::com::sun::star::uno::Reference< ::com::su
     }
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::Resize()
 {
     SfxFloatingWindow::Resize();
@@ -426,16 +426,16 @@ void FmFieldWin::Resize()
     pListBox->SetPosSizePixel( aLBPos, aLBSize );
 }
 
-//-----------------------------------------------------------------------
+
 void FmFieldWin::FillInfo( SfxChildWinInfo& rInfo ) const
 {
     rInfo.bVisible = sal_False;
 }
 
-//-----------------------------------------------------------------------
+
 SFX_IMPL_FLOATINGWINDOW(FmFieldWinMgr, SID_FM_ADD_FIELD)
 
-//-----------------------------------------------------------------------
+
 FmFieldWinMgr::FmFieldWinMgr(Window* _pParent, sal_uInt16 _nId,
                SfxBindings* _pBindings, SfxChildWinInfo* _pInfo)
               :SfxChildWindow(_pParent, _nId)
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 7bf980cbdb8f..b811af0dd194 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -52,7 +52,7 @@ using ::com::sun::star::beans::XPropertySet;
 // class SvxFmAbsRecWin
 //========================================================================
 
-// -----------------------------------------------------------------------
+
 SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController )
     :NumericField( _pParent, WB_BORDER )
     ,m_pController(_pController)
@@ -66,12 +66,12 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle
     SetStrictFormat(true);
 }
 
-// -----------------------------------------------------------------------
+
 SvxFmAbsRecWin::~SvxFmAbsRecWin()
 {
 }
 
-// -----------------------------------------------------------------------
+
 void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
 {
     if ( _bForce || ( GetText() != GetSavedValue() ) )
@@ -97,13 +97,13 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void SvxFmAbsRecWin::LoseFocus()
 {
     FirePosition( sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent )
 {
     if( rKeyEvent.GetKeyCode() == KEY_RETURN && !GetText().isEmpty() )
@@ -150,7 +150,7 @@ static const MapSlotToCmd SlotToCommands[] =
 
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item );
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     : SfxToolBoxControl( nSlotId, nId, rTbx )
     ,nLastSlot( 0 )
@@ -158,7 +158,7 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBo
     rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
 }
 
-//-----------------------------------------------------------------------
+
 void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     if (nSID == SID_FM_CONFIG)
@@ -203,13 +203,13 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
     SfxToolBoxControl::StateChanged( nSID, eState,pState );
 }
 
-//-----------------------------------------------------------------------
+
 SfxPopupWindowType SvxFmTbxCtlConfig::GetPopupWindowType() const
 {
     return( nLastSlot == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT );
 }
 
-//-----------------------------------------------------------------------
+
 SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
 {
     if ( GetSlotId() == SID_FM_CONFIG )
@@ -220,7 +220,7 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
     return NULL;
 }
 
-//-----------------------------------------------------------------------
+
 void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
 {
     //////////////////////////////////////////////////////////////////////
@@ -251,20 +251,20 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
 
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
 DBG_NAME(SvxFmTbxCtlAbsRec);
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlAbsRec,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
 {
     DBG_DTOR(SvxFmTbxCtlAbsRec,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     sal_uInt16              nId = GetId();
@@ -290,7 +290,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, cons
     SfxToolBoxControl::StateChanged( nSID, eState,pState );
 }
 
-//-----------------------------------------------------------------------
+
 Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
 {
     SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this );
@@ -305,20 +305,20 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
 
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
 DBG_NAME(SvxFmTbxCtlRecText);
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlRecText,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlRecText::~SvxFmTbxCtlRecText()
 {
     DBG_DTOR(SvxFmTbxCtlRecText,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
 {
     OUString aText(SVX_RESSTR(RID_STR_REC_TEXT));
@@ -339,20 +339,20 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
 
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
 DBG_NAME(SvxFmTbxCtlRecFromText);
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
     DBG_CTOR(SvxFmTbxCtlRecFromText,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlRecFromText::~SvxFmTbxCtlRecFromText()
 {
     DBG_DTOR(SvxFmTbxCtlRecFromText,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent )
 {
     OUString aText(SVX_RESSTR(RID_STR_REC_FROM_TEXT));
@@ -372,7 +372,7 @@ Window* SvxFmTbxCtlRecFromText::CreateItemWindow( Window* pParent )
 DBG_NAME(SvxFmTbxCtlRecTotal);
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
     ,pFixedText( NULL )
@@ -380,13 +380,13 @@ SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, To
     DBG_CTOR(SvxFmTbxCtlRecTotal,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxCtlRecTotal::~SvxFmTbxCtlRecTotal()
 {
     DBG_DTOR(SvxFmTbxCtlRecTotal,NULL);
 }
 
-//-----------------------------------------------------------------------
+
 Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
 {
     pFixedText = new FixedText( pParent );
@@ -399,7 +399,7 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
     return pFixedText;
 }
 
-//-----------------------------------------------------------------------
+
 void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
     //////////////////////////////////////////////////////////////////////
@@ -425,7 +425,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, co
 //========================================================================
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem );
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
@@ -443,7 +443,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& r
 //========================================================================
 SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem );
 
-//-----------------------------------------------------------------------
+
 SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
     :SfxToolBoxControl( nSlotId, nId, rTbx )
 {
diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx
index 8097f271c657..0ab81ee54875 100644
--- a/svx/source/form/typeconversionclient.cxx
+++ b/svx/source/form/typeconversionclient.cxx
@@ -27,12 +27,12 @@ namespace svxform
     //====================================================================
     //= OTypeConversionClient
     //====================================================================
-    //--------------------------------------------------------------------
+
     OTypeConversionClient::OTypeConversionClient()
     {
     }
 
-    //--------------------------------------------------------------------
+
     bool OTypeConversionClient::ensureLoaded() const
     {
         if ( !ODbtoolsClient::ensureLoaded() )
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index b5456c487e7f..866fa7c9792b 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -43,13 +43,13 @@ namespace svxform
     //====================================================================
     //= OAddConditionDialog
     //====================================================================
-    //--------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OAddConditionDialog_Create( const Reference< XMultiServiceFactory > & _rxORB )
     {
         return OAddConditionDialog::Create( _rxORB );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames()
     {
         ::comphelper::StringSequence aSupported( 1 );
@@ -57,7 +57,7 @@ namespace svxform
         return aSupported;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OAddConditionDialog_GetImplementationName()
     {
         return OUString("org.openoffice.comp.svx.OAddConditionDialog");
@@ -66,7 +66,7 @@ namespace svxform
     //====================================================================
     //= OAddConditionDialog
     //====================================================================
-    //--------------------------------------------------------------------
+
     OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB )
         :OAddConditionDialogBase( _rxORB )
     {
@@ -103,7 +103,7 @@ namespace svxform
         );
     }
 
-    //-------------------------------------------------------------------------
+
     Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId(  ) throw(RuntimeException)
     {
         static ::cppu::OImplementationId * pId = 0;
@@ -119,37 +119,37 @@ namespace svxform
         return pId->getImplementationId();
     }
 
-    //-------------------------------------------------------------------------
+
     Reference< XInterface > SAL_CALL OAddConditionDialog::Create( const Reference< XMultiServiceFactory >& _rxFactory )
     {
         return *( new OAddConditionDialog( comphelper::getComponentContext(_rxFactory) ) );
     }
 
-    //-------------------------------------------------------------------------
+
     OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException)
     {
         return OAddConditionDialog_GetImplementationName();
     }
 
-    //-------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException)
     {
         return OAddConditionDialog_GetSupportedServiceNames();
     }
 
-    //-------------------------------------------------------------------------
+
     Reference<XPropertySetInfo>  SAL_CALL OAddConditionDialog::getPropertySetInfo() throw(RuntimeException)
     {
         return createPropertySetInfo( getInfoHelper() );
     }
 
-    //-------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& OAddConditionDialog::getInfoHelper()
     {
         return *const_cast< OAddConditionDialog* >( this )->getArrayHelper();
     }
 
-    //------------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OAddConditionDialog::createArrayHelper( ) const
     {
         Sequence< Property > aProperties;
@@ -157,7 +157,7 @@ namespace svxform
         return new ::cppu::OPropertyArrayHelper( aProperties );
     }
 
-    //------------------------------------------------------------------------------
+
     Dialog* OAddConditionDialog::createDialog(Window* _pParent)
     {
         if ( !m_xBinding.is() || m_sFacetName.isEmpty() )
@@ -166,7 +166,7 @@ namespace svxform
         return new AddConditionDialog( _pParent, m_sFacetName, m_xBinding );
     }
 
-    //------------------------------------------------------------------------------
+
     void OAddConditionDialog::executedDialog( sal_Int16 _nExecutionResult )
     {
         OAddConditionDialogBase::executedDialog( _nExecutionResult );
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 03dede7fa335..e6fa0bc8edae 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -50,21 +50,21 @@ SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
 {
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const
 {
     return false;
 }
-// -----------------------------------------------------------------------
+
 bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */)
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const
 {
@@ -81,21 +81,21 @@ bool SvxSmartTagItem::operator==( const SfxPoolItem& rAttr ) const
                maRangeText == rItem.maRangeText;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const
 {
     return new SvxSmartTagItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const
 {
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const
 {
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 2ec403520c37..74d1a423ca66 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -66,7 +66,7 @@ SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked,
     SetFromRotation( nRotation, bStacked );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxOrientationItem::GetPresentation
 (
@@ -89,7 +89,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
+
 
 bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
@@ -128,7 +128,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const
 {
@@ -136,14 +136,14 @@ OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const
     return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const
 {
     return new SvxOrientationItem( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
@@ -152,14 +152,14 @@ SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const
     return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 sal_uInt16 SvxOrientationItem::GetValueCount() const
 {
     return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxOrientationItem::IsStacked() const
 {
@@ -205,7 +205,7 @@ SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
                               sal_Int16 nTop,
@@ -222,7 +222,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
 }
 
 
-//------------------------------------------------------------------------
+
 
 SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) :
 
@@ -234,7 +234,7 @@ SvxMarginItem::SvxMarginItem( const SvxMarginItem& rItem ) :
     nBottomMargin = rItem.nBottomMargin;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxMarginItem::GetPresentation
 (
@@ -286,7 +286,7 @@ SfxItemPresentation SvxMarginItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
+
 
 bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -298,14 +298,14 @@ bool SvxMarginItem::operator==( const SfxPoolItem& rItem ) const
              ( nBottomMargin == ( (SvxMarginItem&)rItem ).nBottomMargin ) );
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const
 {
     return new SvxMarginItem(*this);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
@@ -320,7 +320,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const
     return new SvxMarginItem( nLeft, nTop, nRight, nBottom, Which() );
 }
 
-//------------------------------------------------------------------------
+
 
 SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
 {
@@ -332,7 +332,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/)
 }
 
 
-//------------------------------------------------------------------------
+
 
 bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
@@ -360,7 +360,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
@@ -391,7 +391,7 @@ bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxMarginItem::SetLeftMargin( sal_Int16 nLeft )
 {
@@ -399,7 +399,7 @@ sal_Bool SvxMarginItem::SetLeftMargin( sal_Int16 nLeft )
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxMarginItem::SetTopMargin( sal_Int16 nTop )
 {
@@ -407,7 +407,7 @@ sal_Bool SvxMarginItem::SetTopMargin( sal_Int16 nTop )
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxMarginItem::SetRightMargin( sal_Int16 nRight )
 {
@@ -415,7 +415,7 @@ sal_Bool SvxMarginItem::SetRightMargin( sal_Int16 nRight )
     return sal_True;
 }
 
-//------------------------------------------------------------------------
+
 
 sal_Bool SvxMarginItem::SetBottomMargin( sal_Int16 nBottom )
 {
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 02bff07b4dd5..f975bd9bf02d 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -30,7 +30,7 @@
 
 using namespace ::rtl;
 using namespace ::com::sun::star;
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0));
 TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem);
@@ -52,21 +52,21 @@ SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartStyleItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
@@ -84,14 +84,14 @@ SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartDataDescrItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
@@ -110,28 +110,28 @@ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartTextOrderItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartTextOrderItem(rIn, Which());
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
@@ -156,7 +156,7 @@ bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uI
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
@@ -203,14 +203,14 @@ SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartTextOrientItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
@@ -229,7 +229,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) :
     SfxPoolItem(rItem),
@@ -237,14 +237,14 @@ SvxDoubleItem::SvxDoubleItem(const SvxDoubleItem& rItem) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvxDoubleItem::GetValueText() const
 {
     return rtl::math::doubleToUString( fVal, rtl_math_StringFormat_E, 4, '.', false );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxItemPresentation SvxDoubleItem::GetPresentation
             ( SfxItemPresentation /*ePresentation*/, SfxMapUnit /*eCoreMetric*/,
@@ -262,21 +262,21 @@ SfxItemPresentation SvxDoubleItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NAMELESS;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxDoubleItem::operator == (const SfxPoolItem& rItem) const
 {
     return (((SvxDoubleItem&)rItem).fVal == fVal);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxDoubleItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
 {
@@ -285,7 +285,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
     return new SvxDoubleItem(_fVal, Which());
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const
 {
@@ -293,21 +293,21 @@ SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) cons
     return rOut;
 }
 
-// -----------------------------------------------------------------------
+
 
 double SvxDoubleItem::GetMin() const
 {
     return DBL_MIN;
 }
 
-// -----------------------------------------------------------------------
+
 
 double SvxDoubleItem::GetMax() const
 {
     return DBL_MAX;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxFieldUnit SvxDoubleItem::GetUnit() const
 {
@@ -317,14 +317,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
 
 
 
-// -----------------------------------------------------------------------
+
 bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
     rVal <<= fVal;
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
     return rVal >>= fVal;
@@ -344,28 +344,28 @@ SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartKindErrorItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartKindErrorItem(rIn, Which());
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
@@ -386,28 +386,28 @@ SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartIndicateItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartIndicateItem(rIn, Which());
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
@@ -428,28 +428,28 @@ SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) :
     SfxEnumItem(nId, rIn)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const
 {
     return new SvxChartRegressItem(*this);
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
 {
     return new SvxChartRegressItem(rIn, Which());
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx
index a89cca42ebcf..ace0d31fad9b 100644
--- a/svx/source/items/drawitem.cxx
+++ b/svx/source/items/drawitem.cxx
@@ -121,7 +121,7 @@ SvxGradientListItem::SvxGradientListItem( const SvxGradientListItem& rItem ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxGradientListItem::GetPresentation
 (
@@ -175,7 +175,7 @@ SvxHatchListItem::SvxHatchListItem( const SvxHatchListItem& rItem ) :
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxHatchListItem::GetPresentation
 (
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 765d5651b720..b57e5a84149f 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -30,11 +30,11 @@ using namespace ::com::sun::star;
 DBG_NAMEEX(SvxB3DVectorItem)
 DBG_NAME(SvxB3DVectorItem)
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxB3DVectorItem, SfxPoolItem, new SvxB3DVectorItem);
 
-// -----------------------------------------------------------------------
+
 
 SvxB3DVectorItem::SvxB3DVectorItem()
 {
@@ -46,7 +46,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem()
     DBG_DTOR(SvxB3DVectorItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) :
     SfxPoolItem( _nWhich ),
@@ -55,7 +55,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector
     DBG_CTOR(SvxB3DVectorItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) :
     SfxPoolItem( rItem ),
@@ -64,7 +64,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( const SvxB3DVectorItem& rItem ) :
     DBG_CTOR(SvxB3DVectorItem, 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const
 {
@@ -73,7 +73,7 @@ bool SvxB3DVectorItem::operator==( const SfxPoolItem &rItem ) const
     return ((SvxB3DVectorItem&)rItem).aVal == aVal;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
 {
@@ -81,7 +81,7 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
     return new SvxB3DVectorItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const
 {
@@ -94,7 +94,7 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/
     return new SvxB3DVectorItem(Which(), aStr);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
 {
@@ -109,7 +109,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
 {
@@ -124,7 +124,7 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) con
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
 {
@@ -138,7 +138,7 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
 {
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 1e06287e33a1..f5d76c327c1b 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -24,7 +24,7 @@
 
 #include "svx/hlnkitem.hxx"
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxHyperlinkItem, SfxPoolItem, new SvxHyperlinkItem(0));
 
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 1199a2f0ab14..7fbaae33a857 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -38,7 +38,7 @@
 
 const double SvxNumberFormatShell::DEFAULT_NUMVALUE = 1234.56789;
 
-// -----------------------------------------------------------------------
+
 
 
 
@@ -61,7 +61,7 @@ SvxNumberFormatShell* SvxNumberFormatShell::Create( SvNumberFormatter* pNumForma
                                     eNumValType,nNumVal,pNumStr );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
                                             sal_uInt32          nFormatKey,
@@ -93,7 +93,7 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
                                             sal_uInt32          nFormatKey,
@@ -130,7 +130,7 @@ SvxNumberFormatShell::SvxNumberFormatShell( SvNumberFormatter*  pNumFormatter,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberFormatShell::~SvxNumberFormatShell()
 {
@@ -154,14 +154,14 @@ SvxNumberFormatShell::~SvxNumberFormatShell()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 size_t SvxNumberFormatShell::GetUpdateDataCount() const
 {
     return aDelList.size();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize )
 {
@@ -174,7 +174,7 @@ void SvxNumberFormatShell::GetUpdateData( sal_uInt32* pDelArray, const sal_uInt3
             *pDelArray++ = *it;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos,
                                             short& rFmtSelPos,
@@ -191,7 +191,7 @@ void SvxNumberFormatShell::CategoryChanged( sal_uInt16 nCatLbPos,
     rFmtSelPos = FillEntryList_Impl( rFmtEntries );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType,
                                             short& rFmtSelPos,
@@ -204,7 +204,7 @@ void SvxNumberFormatShell::LanguageChanged( LanguageType eLangType,
     rFmtSelPos = FillEntryList_Impl( rFmtEntries );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::FormatChanged( sal_uInt16  nFmtLbPos,
                                           OUString&   rPreviewStr,
@@ -228,7 +228,7 @@ void SvxNumberFormatShell::FormatChanged( sal_uInt16  nFmtLbPos,
         }
     }
 }
-// -----------------------------------------------------------------------
+
 
 bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos,
                                       sal_uInt16& rCatLbSelPos, short& rFmtSelPos,
@@ -300,7 +300,7 @@ bool SvxNumberFormatShell::AddFormat( OUString& rFormat, sal_Int32& rErrPos,
     return bInserted;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat,
                                          sal_uInt16& rCatLbSelPos,
@@ -336,7 +336,7 @@ bool SvxNumberFormatShell::RemoveFormat( const OUString& rFormat,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::MakeFormat( OUString& rFormat,
                                        bool bThousand, bool bNegRed,
@@ -375,7 +375,7 @@ void SvxNumberFormatShell::MakeFormat( OUString& rFormat,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::GetOptions( const OUString&  rFormat,
                                        bool&            rThousand,
@@ -417,7 +417,7 @@ void SvxNumberFormatShell::GetOptions( const OUString&  rFormat,
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr,
                                               OUString&       rPreviewStr,
@@ -461,7 +461,7 @@ void SvxNumberFormatShell::MakePreviewString( const OUString& rFormatStr,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString )
 {
@@ -487,7 +487,7 @@ bool SvxNumberFormatShell::IsUserDefined( const OUString& rFmtString )
     return bFlag;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pAt /* = NULL */ )
 {
@@ -517,7 +517,7 @@ bool SvxNumberFormatShell::FindEntry( const OUString& rFmtString, sal_uInt32* pA
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos,
                                             LanguageType& rLangType,
@@ -526,7 +526,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos,
                                             OUString& rPrevString,
                                             Color*&   rpPrevColor )
 {
-    // -------------------------------------------------------------------
+
     // Vorbedingung: Zahlenformatierer gefunden
     DBG_ASSERT( pFormatter != NULL, "Zahlenformatierer nicht gefunden!" );
 
@@ -557,7 +557,7 @@ void SvxNumberFormatShell::GetInitSettings( sal_uInt16& nCatLbPos,
     GetPreviewString_Impl( rPrevString, rpPrevColor );
 }
 
-// -----------------------------------------------------------------------
+
 
 short SvxNumberFormatShell::FillEntryList_Impl( std::vector<OUString>& rList )
 {
@@ -1122,7 +1122,7 @@ short SvxNumberFormatShell::FillEListWithUsD_Impl( std::vector<OUString>& rList,
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpColor )
 {
@@ -1148,37 +1148,37 @@ void SvxNumberFormatShell::GetPreviewString_Impl( OUString& rString, Color*& rpC
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetRemoved_Impl( size_t nKey )
 {
     return ::std::find(aDelList.begin(), aDelList.end(), nKey);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxNumberFormatShell::IsRemoved_Impl( size_t nKey )
 {
     return GetRemoved_Impl( nKey ) != aDelList.end();
 }
 
-// -----------------------------------------------------------------------
+
 
 ::std::vector<sal_uInt32>::iterator SvxNumberFormatShell::GetAdded_Impl( size_t nKey )
 {
     return ::std::find(aAddList.begin(), aAddList.end(), nKey);
 }
 
-//------------------------------------------------------------------------
+
 
 bool SvxNumberFormatShell::IsAdded_Impl( size_t nKey )
 {
     return GetAdded_Impl( nKey ) != aAddList.end();
 }
 
-// -----------------------------------------------------------------------
+
 // Konvertierungs-Routinen:
-// ------------------------
+
 
 void SvxNumberFormatShell::PosToCategory_Impl( sal_uInt16 nPos, short& rCategory )
 {
@@ -1200,7 +1200,7 @@ void SvxNumberFormatShell::PosToCategory_Impl( sal_uInt16 nPos, short& rCategory
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberFormatShell::CategoryToPos_Impl( short nCategory, sal_uInt16& rPos )
 {
diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx
index ef2969f1f47a..ba5ac224fb2a 100644
--- a/svx/source/items/numinf.cxx
+++ b/svx/source/items/numinf.cxx
@@ -19,7 +19,7 @@
 
 #include <svx/numinf.hxx>
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1(SvxNumberInfoItem, SfxPoolItem);
 
@@ -42,7 +42,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( const sal_uInt16 nId ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const sal_uInt16 nId ) :
@@ -52,7 +52,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const OUString& rVal, const sal_uInt16 nId ) :
@@ -62,7 +62,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const double& rVal, const sal_uInt16 nId ) :
@@ -72,7 +72,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
                                       const double& rVal, const OUString& rValueStr,
@@ -85,7 +85,7 @@ SvxNumberInfoItem::SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
 
 #undef INIT
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
 
@@ -108,14 +108,14 @@ SvxNumberInfoItem::SvxNumberInfoItem( const SvxNumberInfoItem& rItem ) :
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxNumberInfoItem::~SvxNumberInfoItem()
 {
     delete [] pDelFormatArr;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxNumberInfoItem::GetPresentation
 (
@@ -129,7 +129,7 @@ SfxItemPresentation SvxNumberInfoItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const
 {
@@ -163,7 +163,7 @@ bool SvxNumberInfoItem::operator==( const SfxPoolItem& rItem ) const
     return bEqual;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const
 {
@@ -171,21 +171,21 @@ SfxPoolItem* SvxNumberInfoItem::Clone( SfxItemPool * ) const
 }
 
 // Laden/Speichern wird nicht gebraucht!
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxNumberInfoItem::Create( SvStream& /*rStream*/, sal_uInt16 ) const
 {
     return new SvxNumberInfoItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxNumberInfoItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/ ) const
 {
     return rStream;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxNumberInfoItem::SetDelFormatArray( const sal_uInt32* pData,
                                            const sal_uInt32 nCount )
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 50d6659e7629..225c9a5dca57 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -94,7 +94,7 @@ inline OUString GetUsageText( const sal_uInt16 eU )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPageItem::GetPresentation
 (
@@ -155,7 +155,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-//------------------------------------------------------------------------
+
 bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
 //    sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -192,7 +192,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 
     return true;
 }
-//------------------------------------------------------------------------
+
 bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
 {
     switch( nMemberId )
@@ -234,7 +234,7 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
     return true;
 }
 
-//------------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
 {
@@ -257,7 +257,7 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
     return pPage;
 }
 
-//------------------------------------------------------------------------
+
 
 SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
@@ -295,7 +295,7 @@ SfxPoolItem* SvxSetItem::Clone( SfxItemPool * ) const
     return new SvxSetItem(*this);
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxSetItem::GetPresentation
 (
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 794a55ca0e40..38e1384ab8dc 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -22,7 +22,7 @@
 #include <svx/svxitems.hrc>
 #include <svx/dialmgr.hxx>
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxPostItAuthorItem, SfxStringItem, new SvxPostItAuthorItem(0));
 TYPEINIT1_FACTORY(SvxPostItDateItem, SfxStringItem, new SvxPostItDateItem(0));
@@ -35,7 +35,7 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( sal_uInt16 _nWhich )
     SetWhich( _nWhich );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor,
                                           sal_uInt16 _nWhich ) :
@@ -43,7 +43,7 @@ SvxPostItAuthorItem::SvxPostItAuthorItem( const OUString& rAuthor,
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPostItAuthorItem::GetPresentation
 (
@@ -69,7 +69,7 @@ SfxItemPresentation SvxPostItAuthorItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPostItAuthorItem::Clone( SfxItemPool * ) const
 {
@@ -83,7 +83,7 @@ SvxPostItDateItem::SvxPostItDateItem( sal_uInt16 _nWhich )
     SetWhich( _nWhich );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich ) :
 
@@ -91,7 +91,7 @@ SvxPostItDateItem::SvxPostItDateItem( const OUString& rDate, sal_uInt16 _nWhich
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPostItDateItem::GetPresentation
 (
@@ -117,7 +117,7 @@ SfxItemPresentation SvxPostItDateItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPostItDateItem::Clone( SfxItemPool * ) const
 {
@@ -131,7 +131,7 @@ SvxPostItTextItem::SvxPostItTextItem( sal_uInt16 _nWhich )
     SetWhich( _nWhich );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich ) :
 
@@ -139,7 +139,7 @@ SvxPostItTextItem::SvxPostItTextItem( const OUString& rText, sal_uInt16 _nWhich
 {
 }
 
-//------------------------------------------------------------------------
+
 
 SfxItemPresentation SvxPostItTextItem::GetPresentation
 (
@@ -165,7 +165,7 @@ SfxItemPresentation SvxPostItTextItem::GetPresentation
     return SFX_ITEM_PRESENTATION_NONE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxPostItTextItem::Clone( SfxItemPool * ) const
 {
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 27f6e2c59571..c3e87d97a596 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -41,9 +41,9 @@ using namespace ::com::sun::star;
 TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD, 0));
 
 
-//-----------------------------------------------------------------------
+
 //  SvxRotateModeItem - Ausrichtung bei gedrehtem Text
-//-----------------------------------------------------------------------
+
 
 SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich )
     : SfxEnumItem( _nWhich, (sal_uInt16)eMode )
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 06b393c0a9f9..c75be5c8c22d 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
 
@@ -31,7 +31,7 @@ TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
 #define VIEWLAYOUT_PARAM_BOOKMODE   "BookMode"
 #define VIEWLAYOUT_PARAMS           2
 
-// -----------------------------------------------------------------------
+
 
 SvxViewLayoutItem::SvxViewLayoutItem
 (
@@ -44,7 +44,7 @@ SvxViewLayoutItem::SvxViewLayoutItem
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig )
 :   SfxUInt16Item( rOrig.Which(), rOrig.GetValue() ),
@@ -52,34 +52,34 @@ SvxViewLayoutItem::SvxViewLayoutItem( const SvxViewLayoutItem& rOrig )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxViewLayoutItem::~SvxViewLayoutItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxViewLayoutItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SvxViewLayoutItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxViewLayoutItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxViewLayoutItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
 {
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index ff646f30a0a6..97ac53b7a452 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -22,7 +22,7 @@
 #include <svx/zoomslideritem.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-// -----------------------------------------------------------------------
+
 
 TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
 
@@ -32,14 +32,14 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
 #define ZOOMSLIDER_PARAM_MAXZOOM        "MaxValue"
 #define ZOOMSLIDER_PARAMS           4
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich )
 :   SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig )
 : SfxUInt16Item( rOrig.Which(), rOrig.GetValue() )
@@ -49,34 +49,34 @@ SvxZoomSliderItem::SvxZoomSliderItem( const SvxZoomSliderItem& rOrig )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomSliderItem::~SvxZoomSliderItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxZoomSliderItem::Clone( SfxItemPool * /*pPool*/ ) const
 {
     return new SvxZoomSliderItem( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPoolItem* SvxZoomSliderItem::Create( SvStream& /*rStrm*/, sal_uInt16 /*nVersion*/ ) const
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& SvxZoomSliderItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
 {
     return rStrm;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
 {
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 739adbf273e3..45791381cb8a 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::uno;
 
 SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
 
-//--------------------------------------------------------------------
+
 
 SvxSmartTagsControl::SvxSmartTagsControl
 (
@@ -50,7 +50,7 @@ SvxSmartTagsControl::SvxSmartTagsControl
     rMenu.SetPopupMenu( _nId, mpMenu );
 }
 
-//--------------------------------------------------------------------
+
 
 const sal_uInt16 MN_ST_INSERT_START = 500;
 
@@ -135,7 +135,7 @@ void SvxSmartTagsControl::FillMenu()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 
@@ -154,7 +154,7 @@ void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const S
     }
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
 {
@@ -191,7 +191,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
 }
 IMPL_LINK_INLINE_END( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
 
-//--------------------------------------------------------------------
+
 
 SvxSmartTagsControl::~SvxSmartTagsControl()
 {
@@ -199,7 +199,7 @@ SvxSmartTagsControl::~SvxSmartTagsControl()
     delete mpMenu;
 }
 
-//--------------------------------------------------------------------
+
 
 PopupMenu* SvxSmartTagsControl::GetPopup() const
 {
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 65ec3097d9a0..f36861967282 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -33,7 +33,7 @@
 
 SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem);
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -56,7 +56,7 @@ SvxFontMenuControl::SvxFontMenuControl
     FillMenu();
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -78,7 +78,7 @@ void SvxFontMenuControl::FillMenu()
     }
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -110,7 +110,7 @@ void SvxFontMenuControl::StateChanged(
     }
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -126,7 +126,7 @@ void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
         FillMenu();
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -144,7 +144,7 @@ IMPL_LINK_INLINE_START( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
 }
 IMPL_LINK_INLINE_END( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen )
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -156,7 +156,7 @@ SvxFontMenuControl::~SvxFontMenuControl()
     delete pMenu;
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index a5384b3d8377..a5a9c09c3223 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -40,7 +40,7 @@
 
 SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem);
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -65,7 +65,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -149,7 +149,7 @@ void SvxFontSizeMenuControl::StateChanged(
     }
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -174,7 +174,7 @@ SvxFontSizeMenuControl::SvxFontSizeMenuControl
     pMenu->SetSelectHdl( LINK( this, SvxFontSizeMenuControl, MenuSelect ) );
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
@@ -186,7 +186,7 @@ SvxFontSizeMenuControl::~SvxFontSizeMenuControl()
     delete pMenu;
 }
 
-//--------------------------------------------------------------------
+
 
 /*  [Beschreibung]
 
diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx
index 90f6d0776269..4c5412ad631c 100644
--- a/svx/source/sdr/contact/sdrmediawindow.cxx
+++ b/svx/source/sdr/contact/sdrmediawindow.cxx
@@ -26,9 +26,9 @@
 
 namespace sdr { namespace contact {
 
-// ------------------
+
 // - SdrMediaWindow -
-// ------------------
+
 
 SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj& rViewObjContact ) :
     ::avmedia::MediaWindow( pParent, false ),
@@ -36,13 +36,13 @@ SdrMediaWindow::SdrMediaWindow( Window* pParent, ViewObjectContactOfSdrMediaObj&
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 SdrMediaWindow::~SdrMediaWindow()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt )
 {
@@ -58,7 +58,7 @@ void SdrMediaWindow::MouseMove( const MouseEvent& rMEvt )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -73,7 +73,7 @@ void SdrMediaWindow::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -88,7 +88,7 @@ void SdrMediaWindow::MouseButtonUp( const MouseEvent& rMEvt )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt )
 {
@@ -98,7 +98,7 @@ void SdrMediaWindow::KeyInput( const KeyEvent& rKEvt )
         pWindow->KeyInput( rKEvt );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt )
 {
@@ -108,7 +108,7 @@ void SdrMediaWindow::KeyUp( const KeyEvent& rKEvt )
         pWindow->KeyUp( rKEvt );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::Command( const CommandEvent& rCEvt )
 {
@@ -123,7 +123,7 @@ void SdrMediaWindow::Command( const CommandEvent& rCEvt )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt )
 {
@@ -143,7 +143,7 @@ sal_Int8 SdrMediaWindow::AcceptDrop( const AcceptDropEvent& rEvt )
     return( nRet );
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
 {
@@ -163,7 +163,7 @@ sal_Int8 SdrMediaWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
     return( nRet );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SdrMediaWindow::StartDrag( sal_Int8 nAction, const Point& rPosPixel )
 {
diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
index 8aa9abe90288..c17d71ce97a5 100644
--- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx
@@ -26,29 +26,29 @@
 
 namespace sdr { namespace contact {
 
-// ----------------------------
+
 // - ViewContactOfSdrMediaObj -
-// ----------------------------
+
 
 ViewContactOfSdrMediaObj::ViewContactOfSdrMediaObj( SdrMediaObj& rMediaObj ) :
     ViewContactOfSdrObj( rMediaObj )
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 ViewContactOfSdrMediaObj::~ViewContactOfSdrMediaObj()
 {
 }
 
-// ------------------------------------------------------------------------------
+
 
 ViewObjectContact& ViewContactOfSdrMediaObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact)
 {
     return *( new ViewObjectContactOfSdrMediaObj( rObjectContact, *this, static_cast< SdrMediaObj& >( GetSdrObject() ).getMediaProperties() ) );
 }
 
-// ------------------------------------------------------------------------------
+
 
 Size ViewContactOfSdrMediaObj::getPreferredSize() const
 {
@@ -70,7 +70,7 @@ Size ViewContactOfSdrMediaObj::getPreferredSize() const
     return Size();
 }
 
-// ------------------------------------------------------------------------------
+
 
 void ViewContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const
 {
@@ -88,7 +88,7 @@ void ViewContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) co
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void ViewContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem )
 {
@@ -105,7 +105,7 @@ void ViewContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rIt
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void ViewContactOfSdrMediaObj::mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState )
 {
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 08f11004e96a..60ffec16afbd 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -62,12 +62,12 @@ namespace sdr { namespace contact {
         ViewContactOfUnoControl_Impl& operator=( const ViewContactOfUnoControl_Impl& ); // never implemented
     };
 
-    //--------------------------------------------------------------------
+
     ViewContactOfUnoControl_Impl::ViewContactOfUnoControl_Impl()
     {
     }
 
-    //--------------------------------------------------------------------
+
     ViewContactOfUnoControl_Impl::~ViewContactOfUnoControl_Impl()
     {
     }
@@ -76,7 +76,7 @@ namespace sdr { namespace contact {
     //= ViewContactOfUnoControl
     //====================================================================
     DBG_NAME( ViewContactOfUnoControl )
-    //--------------------------------------------------------------------
+
     ViewContactOfUnoControl::ViewContactOfUnoControl( SdrUnoObj& _rUnoObject )
         :ViewContactOfSdrObj( _rUnoObject )
         ,m_pImpl( new ViewContactOfUnoControl_Impl )
@@ -84,13 +84,13 @@ namespace sdr { namespace contact {
         DBG_CTOR( ViewContactOfUnoControl, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     ViewContactOfUnoControl::~ViewContactOfUnoControl()
     {
         DBG_DTOR( ViewContactOfUnoControl, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControl > ViewContactOfUnoControl::getTemporaryControlForWindow(
         const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer ) const
     {
@@ -101,7 +101,7 @@ namespace sdr { namespace contact {
         return ViewObjectContactOfUnoControl::getTemporaryControlForWindow( _rWindow, _inout_ControlContainer, *pUnoObject );
     }
 
-    //--------------------------------------------------------------------
+
     ViewObjectContact& ViewContactOfUnoControl::CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact )
     {
         // print or print preview requires special handling
@@ -118,7 +118,7 @@ namespace sdr { namespace contact {
         return *new ViewObjectContactOfUnoControl( _rObjectContact, *this );
     }
 
-    //--------------------------------------------------------------------
+
     drawinglayer::primitive2d::Primitive2DSequence ViewContactOfUnoControl::createViewIndependentPrimitive2DSequence() const
     {
         // create range. Use model data directly, not getBoundRect()/getSnapRect; these will use
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
index a873f34ae87a..62dd879c8c21 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
@@ -35,9 +35,9 @@
 
 namespace sdr { namespace contact {
 
-// ----------------------------------
+
 // - ViewObjectContactOfSdrMediaObj -
-// ----------------------------------
+
 
 ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& rObjectContact,
                                                                 ViewContact& rViewContact,
@@ -55,7 +55,7 @@ ViewObjectContactOfSdrMediaObj::ViewObjectContactOfSdrMediaObj( ObjectContact& r
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
 {
@@ -63,7 +63,7 @@ ViewObjectContactOfSdrMediaObj::~ViewObjectContactOfSdrMediaObj()
     mpMediaWindow = NULL;
 }
 
-// ------------------------------------------------------------------------------
+
 
 Window* ViewObjectContactOfSdrMediaObj::getWindow() const
 {
@@ -95,7 +95,7 @@ Window* ViewObjectContactOfSdrMediaObj::getWindow() const
     return pRetval;
 }
 
-// ------------------------------------------------------------------------------
+
 
 Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
 {
@@ -107,7 +107,7 @@ Size ViewObjectContactOfSdrMediaObj::getPreferredSize() const
     return aRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rItem ) const
 {
@@ -135,7 +135,7 @@ void ViewObjectContactOfSdrMediaObj::updateMediaItem( ::avmedia::MediaItem& rIte
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaItem& rItem )
 {
@@ -151,7 +151,7 @@ void ViewObjectContactOfSdrMediaObj::executeMediaItem( const ::avmedia::MediaIte
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 }} // end of namespace sdr::contact
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index ba489eae6185..0659051844a3 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -223,31 +223,31 @@ namespace sdr { namespace contact {
         inline  const Reference< XControl >&    getControl() const  { return m_xControl; }
     };
 
-    //--------------------------------------------------------------------
+
     bool operator==( const ControlHolder& _rControl, const Reference< XInterface >& _rxCompare )
     {
         return _rControl.getControl() == _rxCompare;
     }
 
-    //--------------------------------------------------------------------
+
     bool operator==( const Reference< XInterface >& _rxCompare, const ControlHolder& _rControl )
     {
         return _rxCompare == _rControl.getControl();
     }
 
-    //--------------------------------------------------------------------
+
     bool operator==( const ControlHolder& _rControl, const Any& _rxCompare )
     {
         return _rControl == Reference< XInterface >( _rxCompare, UNO_QUERY );
     }
 
-    //--------------------------------------------------------------------
+
     bool operator==( const Any& _rxCompare, const ControlHolder& _rControl )
     {
         return Reference< XInterface >( _rxCompare, UNO_QUERY ) == _rControl;
     }
 
-    //--------------------------------------------------------------------
+
     void ControlHolder::setPosSize( const Rectangle& _rPosSize ) const
     {
         // no check whether we're valid, this is the responsibility of the caller
@@ -264,21 +264,21 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     ::Rectangle ControlHolder::getPosSize() const
     {
         // no check whether we're valid, this is the responsibility of the caller
         return VCLUnoHelper::ConvertToVCLRect( m_xControlWindow->getPosSize() );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlHolder::setZoom( const ::basegfx::B2DVector& _rScale ) const
     {
         // no check whether we're valid, this is the responsibility of the caller
         m_xControlView->setZoom( (float)_rScale.getX(), (float)_rScale.getY() );
     }
 
-    //--------------------------------------------------------------------
+
     void ControlHolder::invalidate() const
     {
         Reference< XWindowPeer > xPeer( m_xControl->getPeer() );
@@ -291,7 +291,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     ::basegfx::B2DVector ControlHolder::getZoom() const
     {
         // no check whether we're valid, this is the responsibility of the caller
@@ -337,7 +337,7 @@ namespace sdr { namespace contact {
         UnoControlContactHelper& operator=( const UnoControlContactHelper& );   // never implemented
     };
 
-    //--------------------------------------------------------------------
+
     void UnoControlContactHelper::adjustControlGeometry_throw( const ControlHolder& _rControl, const Rectangle& _rLogicBoundingRect,
         const basegfx::B2DHomMatrix& _rViewTransformation, const ::basegfx::B2DHomMatrix& _rZoomLevelNormalization )
     {
@@ -372,7 +372,7 @@ namespace sdr { namespace contact {
         _rControl.setZoom( aScale );
     }
 
-    //--------------------------------------------------------------------
+
     void UnoControlContactHelper::disposeAndClearControl_nothrow( ControlHolder& _rControl )
     {
         try
@@ -432,13 +432,13 @@ namespace sdr { namespace contact {
         virtual bool    isLayerVisible( SdrLayerID _nLayerID ) const;
     };
 
-    //--------------------------------------------------------------------
+
     bool SdrPageViewAccess::isDesignMode() const
     {
         return m_rPageView.GetView().IsDesignMode();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControlContainer > SdrPageViewAccess::getControlContainer( const OutputDevice& _rDevice ) const
     {
         Reference< XControlContainer > xControlContainer = m_rPageView.GetControlContainer( _rDevice );
@@ -447,7 +447,7 @@ namespace sdr { namespace contact {
         return xControlContainer;
     }
 
-    //--------------------------------------------------------------------
+
     bool SdrPageViewAccess::isLayerVisible( SdrLayerID _nLayerID ) const
     {
         return m_rPageView.GetVisibleLayers().IsSet( _nLayerID );
@@ -477,13 +477,13 @@ namespace sdr { namespace contact {
         virtual bool    isLayerVisible( SdrLayerID _nLayerID ) const;
     };
 
-    //--------------------------------------------------------------------
+
     bool InvisibleControlViewAccess::isDesignMode() const
     {
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControlContainer > InvisibleControlViewAccess::getControlContainer( const OutputDevice& _rDevice ) const
     {
         if ( !m_rControlContainer.is() )
@@ -496,7 +496,7 @@ namespace sdr { namespace contact {
         return m_rControlContainer;
     }
 
-    //--------------------------------------------------------------------
+
     bool InvisibleControlViewAccess::isLayerVisible( SdrLayerID /*_nLayerID*/ ) const
     {
         return false;
@@ -527,19 +527,19 @@ namespace sdr { namespace contact {
         virtual bool    isLayerVisible( SdrLayerID _nLayerID ) const;
     };
 
-    //--------------------------------------------------------------------
+
     bool DummyPageViewAccess::isDesignMode() const
     {
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControlContainer > DummyPageViewAccess::getControlContainer( const OutputDevice& /*_rDevice*/ ) const
     {
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     bool DummyPageViewAccess::isLayerVisible( SdrLayerID /*_nLayerID*/ ) const
     {
         return true;
@@ -923,7 +923,7 @@ namespace sdr { namespace contact {
     //= ViewObjectContactOfUnoControl_Impl
     //====================================================================
     DBG_NAME( ViewObjectContactOfUnoControl_Impl )
-    //--------------------------------------------------------------------
+
     ViewObjectContactOfUnoControl_Impl::ViewObjectContactOfUnoControl_Impl( ViewObjectContactOfUnoControl* _pAntiImpl )
         :m_pAntiImpl( _pAntiImpl )
         ,m_bCreatingControl( false )
@@ -956,7 +956,7 @@ namespace sdr { namespace contact {
     #endif
    }
 
-    //--------------------------------------------------------------------
+
     ViewObjectContactOfUnoControl_Impl::~ViewObjectContactOfUnoControl_Impl()
     {
         if ( !impl_isDisposed_nofail() )
@@ -968,7 +968,7 @@ namespace sdr { namespace contact {
         DBG_DTOR( ViewObjectContactOfUnoControl_Impl, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_dispose_nothrow( bool _bAlsoDisposeControl )
     {
         if ( impl_isDisposed_nofail() )
@@ -992,14 +992,14 @@ namespace sdr { namespace contact {
         m_pAntiImpl = NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::dispose()
     {
         SolarMutexGuard aSolarGuard;
         impl_dispose_nothrow( true );
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl_Impl::getUnoObject( SdrUnoObj*& _out_rpObject ) const
     {
         OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::getUnoObject: already disposed()" );
@@ -1014,7 +1014,7 @@ namespace sdr { namespace contact {
         return ( _out_rpObject != NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::positionAndZoomControl( const basegfx::B2DHomMatrix& _rViewTransformation ) const
     {
         OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::positionAndZoomControl: no output device or no control!" );
@@ -1043,7 +1043,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl_Impl::ensureControl( const basegfx::B2DHomMatrix* _pInitialViewTransformationOrNULL )
     {
         OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::ensureControl: already disposed()" );
@@ -1071,7 +1071,7 @@ namespace sdr { namespace contact {
         );
     }
 
-    //--------------------------------------------------------------------
+
     const OutputDevice& ViewObjectContactOfUnoControl_Impl::impl_getOutputDevice_throw() const
     {
         ObjectContactOfPageView* pPageViewContact = dynamic_cast< ObjectContactOfPageView* >( &m_pAntiImpl->GetObjectContact() );
@@ -1087,7 +1087,7 @@ namespace sdr { namespace contact {
         return *pDevice;
     }
 
-    //--------------------------------------------------------------------
+
     const OutputDevice& ViewObjectContactOfUnoControl_Impl::impl_getPageViewOutputDevice_nothrow( const ObjectContactOfPageView& _rObjectContact )
     {
         // if the PageWindow has a patched PaintWindow, use the original PaintWindow
@@ -1109,7 +1109,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl_Impl::impl_ensureControl_nothrow( IPageViewAccess& _rPageView, const OutputDevice& _rDevice,
         const basegfx::B2DHomMatrix& _rInitialViewTransformation )
     {
@@ -1188,7 +1188,7 @@ namespace sdr { namespace contact {
         return m_aControl.is();
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl_Impl::createControlForDevice( IPageViewAccess& _rPageView,
         const OutputDevice& _rDevice, const SdrUnoObj& _rUnoObject, const basegfx::B2DHomMatrix& _rInitialViewTransformation,
         const basegfx::B2DHomMatrix& _rInitialZoomNormalization, ControlHolder& _out_rControl )
@@ -1254,7 +1254,7 @@ namespace sdr { namespace contact {
         return _out_rControl.is();
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow( SdrPageView*& _out_rpPageView )
     {
         OSL_PRECOND( !impl_isDisposed_nofail(), "ViewObjectContactOfUnoControl_Impl::impl_getPageView_nothrow: already disposed!" );
@@ -1271,7 +1271,7 @@ namespace sdr { namespace contact {
         return ( _out_rpPageView != NULL );
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( bool _bForce )
     {
         OSL_PRECOND( m_aControl.is(),
@@ -1289,7 +1289,7 @@ namespace sdr { namespace contact {
         impl_adjustControlVisibilityToLayerVisibility_throw( m_aControl, *pUnoObject, aPVAccess, impl_isControlVisible_nofail(), _bForce );
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_adjustControlVisibilityToLayerVisibility_throw( const ControlHolder& _rControl,
         const SdrUnoObj& _rUnoObject, IPageViewAccess& _rPageView, bool _bIsCurrentlyVisible, bool _bForce )
     {
@@ -1310,7 +1310,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_switchContainerListening_nothrow( bool _bStart )
     {
         OSL_PRECOND( m_xContainer.is(), "ViewObjectContactOfUnoControl_Impl::impl_switchContainerListening_nothrow: no control container!" );
@@ -1330,7 +1330,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_switchControlListening_nothrow( bool _bStart )
     {
         OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::impl_switchControlListening_nothrow: invalid control!" );
@@ -1361,7 +1361,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_switchDesignModeListening_nothrow( bool _bStart )
     {
         if ( impl_isDesignModeListening_nofail() != _bStart )
@@ -1371,7 +1371,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //------------------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::impl_switchPropertyListening_nothrow( bool _bStart )
     {
         OSL_PRECOND( m_aControl.is(), "ViewObjectContactOfUnoControl_Impl::impl_switchPropertyListening_nothrow: no control!" );
@@ -1392,7 +1392,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl_Impl::isPrintableControl() const
     {
         SdrUnoObj* pUnoObject( NULL );
@@ -1413,7 +1413,7 @@ namespace sdr { namespace contact {
         return bIsPrintable;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::disposing( const EventObject& Source ) throw(RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1439,33 +1439,33 @@ namespace sdr { namespace contact {
         DBG_ASSERT( Source.Source == m_xContainer, "ViewObjectContactOfUnoControl_Impl::disposing: Who's this?" );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowResized( const WindowEvent& /*e*/ ) throw(RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowMoved( const WindowEvent& /*e*/ ) throw(RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowShown( const EventObject& /*e*/ ) throw(RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         m_bControlIsVisible = true;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::windowHidden( const EventObject& /*e*/ ) throw(RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
         m_bControlIsVisible = false;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::propertyChange( const PropertyChangeEvent& /*_rEvent*/ ) throw(RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1486,7 +1486,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::modeChanged( const ModeChangeEvent& _rSource ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1508,13 +1508,13 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementInserted( const ContainerEvent& /*_Event*/ ) throw (RuntimeException)
     {
         // not interested in
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1529,7 +1529,7 @@ namespace sdr { namespace contact {
             impl_dispose_nothrow( false );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL ViewObjectContactOfUnoControl_Impl::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -1564,7 +1564,7 @@ namespace sdr { namespace contact {
         m_pAntiImpl->onControlChangedOrModified( ViewObjectContactOfUnoControl::ImplAccess() );
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl_Impl::setControlDesignMode( bool _bDesignMode ) const
     {
         if ( ( m_eControlDesignMode != eUnknown ) && ( _bDesignMode == impl_isControlDesignMode_nothrow() ) )
@@ -1590,7 +1590,7 @@ namespace sdr { namespace contact {
     //====================================================================
     //= LazyControlCreationPrimitive2D
     //====================================================================
-    //--------------------------------------------------------------------
+
     bool LazyControlCreationPrimitive2D::operator==(const BasePrimitive2D& rPrimitive) const
     {
         if ( !BufferedDecompositionPrimitive2D::operator==( rPrimitive ) )
@@ -1609,7 +1609,7 @@ namespace sdr { namespace contact {
         return true;
     }
 
-    //--------------------------------------------------------------------
+
     void LazyControlCreationPrimitive2D::getTransformation( const ViewContactOfUnoControl& _rVOC, ::basegfx::B2DHomMatrix& _out_Transformation )
     {
         // Do use model data directly to create the correct geometry. Do NOT
@@ -1635,7 +1635,7 @@ namespace sdr { namespace contact {
         _out_Transformation.set( 1, 2, aRange.getMinY() );
     }
 
-    //--------------------------------------------------------------------
+
     ::basegfx::B2DRange LazyControlCreationPrimitive2D::getB2DRange( const ::drawinglayer::geometry::ViewInformation2D& /*rViewInformation*/ ) const
     {
         ::basegfx::B2DRange aRange( 0.0, 0.0, 1.0, 1.0 );
@@ -1643,7 +1643,7 @@ namespace sdr { namespace contact {
         return aRange;
     }
 
-    //--------------------------------------------------------------------
+
     ::drawinglayer::primitive2d::Primitive2DSequence LazyControlCreationPrimitive2D::get2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const
     {
     #if OSL_DEBUG_LEVEL > 1
@@ -1656,7 +1656,7 @@ namespace sdr { namespace contact {
         return BufferedDecompositionPrimitive2D::get2DDecomposition( _rViewInformation );
     }
 
-    //--------------------------------------------------------------------
+
     ::drawinglayer::primitive2d::Primitive2DSequence LazyControlCreationPrimitive2D::create2DDecomposition( const ::drawinglayer::geometry::ViewInformation2D& _rViewInformation ) const
     {
     #if OSL_DEBUG_LEVEL > 1
@@ -1697,14 +1697,14 @@ namespace sdr { namespace contact {
         return drawinglayer::primitive2d::Primitive2DSequence(&xRetval, 1);
     }
 
-    //--------------------------------------------------------------------
+
     ImplPrimitive2DIDBlock( LazyControlCreationPrimitive2D, PRIMITIVE2D_ID_SDRCONTROLPRIMITIVE2D )
 
     //====================================================================
     //= ViewObjectContactOfUnoControl
     //====================================================================
     DBG_NAME( ViewObjectContactOfUnoControl )
-    //--------------------------------------------------------------------
+
     ViewObjectContactOfUnoControl::ViewObjectContactOfUnoControl( ObjectContact& _rObjectContact, ViewContactOfUnoControl& _rViewContact )
         :ViewObjectContactOfSdrObj( _rObjectContact, _rViewContact )
         ,m_pImpl( new ViewObjectContactOfUnoControl_Impl( this ) )
@@ -1712,7 +1712,7 @@ namespace sdr { namespace contact {
         DBG_CTOR( ViewObjectContactOfUnoControl, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     ViewObjectContactOfUnoControl::~ViewObjectContactOfUnoControl()
     {
         m_pImpl->dispose();
@@ -1721,7 +1721,7 @@ namespace sdr { namespace contact {
         DBG_DTOR( ViewObjectContactOfUnoControl, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControl > ViewObjectContactOfUnoControl::getControl()
     {
         SolarMutexGuard aSolarGuard;
@@ -1729,7 +1729,7 @@ namespace sdr { namespace contact {
         return m_pImpl->getExistentControl().getControl();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XControl > ViewObjectContactOfUnoControl::getTemporaryControlForWindow(
         const Window& _rWindow, Reference< XControlContainer >& _inout_ControlContainer, const SdrUnoObj& _rUnoObject )
     {
@@ -1741,7 +1741,7 @@ namespace sdr { namespace contact {
         return aControl.getControl();
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl::ensureControlVisibility( bool _bVisible ) const
     {
         SolarMutexGuard aSolarGuard;
@@ -1772,7 +1772,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl::setControlDesignMode( bool _bDesignMode ) const
     {
         SolarMutexGuard aSolarGuard;
@@ -1787,7 +1787,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     drawinglayer::primitive2d::Primitive2DSequence ViewObjectContactOfUnoControl::createPrimitive2DSequence(const DisplayInfo& /*rDisplayInfo*/) const
     {
         if ( m_pImpl->isDisposed() )
@@ -1810,7 +1810,7 @@ namespace sdr { namespace contact {
         return ::drawinglayer::primitive2d::Primitive2DSequence( &xPrimitive, 1 );
     }
 
-    //--------------------------------------------------------------------
+
     bool ViewObjectContactOfUnoControl::isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const
     {
         SolarMutexGuard aSolarGuard;
@@ -1831,13 +1831,13 @@ namespace sdr { namespace contact {
         return ViewObjectContactOfSdrObj::isPrimitiveVisible( _rDisplayInfo );
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl::propertyChange()
     {
         impl_onControlChangedOrModified();
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl::ActionChanged()
     {
         // call parent
@@ -1863,7 +1863,7 @@ namespace sdr { namespace contact {
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ViewObjectContactOfUnoControl::impl_onControlChangedOrModified()
     {
         // graphical invalidate at all views
@@ -1880,20 +1880,20 @@ namespace sdr { namespace contact {
     //= UnoControlPrintOrPreviewContact
     //====================================================================
     DBG_NAME( UnoControlPrintOrPreviewContact )
-    //--------------------------------------------------------------------
+
     UnoControlPrintOrPreviewContact::UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact )
         :ViewObjectContactOfUnoControl( _rObjectContact, _rViewContact )
     {
         DBG_CTOR( UnoControlPrintOrPreviewContact, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     UnoControlPrintOrPreviewContact::~UnoControlPrintOrPreviewContact()
     {
         DBG_DTOR( UnoControlPrintOrPreviewContact, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     drawinglayer::primitive2d::Primitive2DSequence UnoControlPrintOrPreviewContact::createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const
     {
         if ( !m_pImpl->isPrintableControl() )
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 8a9c8a6b73e4..81c1a88a3a8c 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -41,13 +41,13 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxInsertStatusBarControl::~SvxInsertStatusBarControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
                                               const SfxPoolItem* pState )
@@ -69,7 +69,7 @@ void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxInsertStatusBarControl::Click()
 {
@@ -90,14 +90,14 @@ void SvxInsertStatusBarControl::Click()
     execute( aArgs );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
 {
     DrawItemText_Impl();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxInsertStatusBarControl::DrawItemText_Impl()
 {
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 542ec71e79a6..3d7c57764294 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -87,7 +87,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status
     mpImpl->maTimer.SetTimeoutHdl( LINK(this, SvxModifyControl, OnTimer) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
                                      const SfxPoolItem* pState )
@@ -113,7 +113,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
         mpImpl->maTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer )
 {
@@ -128,7 +128,7 @@ IMPL_LINK( SvxModifyControl, OnTimer, Timer *, pTimer )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxModifyControl::_repaint()
 {
@@ -136,7 +136,7 @@ void SvxModifyControl::_repaint()
         GetStatusBar().SetItemData( GetId(), 0 );    // force repaint
 }
 
-// -----------------------------------------------------------------------
+
 
 namespace {
 
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 65f4d1385dcd..634badff3e49 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -45,7 +45,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 
-// -----------------------------------------------------------------------
+
 
 /*  [Description]
 
@@ -88,7 +88,7 @@ OUString SvxPosSizeStatusBarControl::GetMetricStr_Impl( long nVal )
     return sMetric;
 }
 
-// -----------------------------------------------------------------------
+
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem);
 
@@ -107,7 +107,7 @@ private:
     virtual void    Select();
 };
 
-// -----------------------------------------------------------------------
+
 
 FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) :
     PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ),
@@ -117,7 +117,7 @@ FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) :
         CheckItem( nCheck );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FunctionPopup_Impl::Select()
 {
@@ -195,7 +195,7 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
     addStatusListener( OUString( STR_FUNC ));    // SID_PSZ_FUNCTION
 }
 
-// -----------------------------------------------------------------------
+
 
 /*  [Description]
 
@@ -209,7 +209,7 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
     delete pImp;
 }
 
-// -----------------------------------------------------------------------
+
 
 /*  [Description]
 
@@ -309,7 +309,7 @@ void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
     GetStatusBar().SetItemText( GetId(), aText );
 }
 
-// -----------------------------------------------------------------------
+
 
 /*  [Description]
 
@@ -349,7 +349,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
         SfxStatusBarControl::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 /*  [Description]
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 6f31d4842bd4..a56cd0af9d58 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -91,7 +91,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
     GetStatusBar().SetItemText( GetId(), "" );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
@@ -107,7 +107,7 @@ void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
 {
@@ -139,7 +139,7 @@ sal_Bool SvxSelectionModeControl::MouseButtonDown( const MouseEvent& rEvt )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSelectionModeControl::Paint( const UserDrawEvent& rUsrEvt )
 {
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 3a34edeab79c..30e23aa13541 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -52,7 +52,7 @@ private:
     virtual void    Select();
 };
 
-// -----------------------------------------------------------------------
+
 
 ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet )
     : PopupMenu(ResId(RID_SVXMNU_ZOOM, DIALOG_MGR()))
@@ -75,7 +75,7 @@ ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet )
             EnableItem( aTable[nPos+1], false );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ZoomPopup_Impl::Select()
 {
@@ -108,7 +108,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
                                             const SfxPoolItem* pState )
@@ -138,7 +138,7 @@ void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
 {
@@ -146,7 +146,7 @@ void SvxZoomStatusBarControl::Paint( const UserDrawEvent& )
     GetStatusBar().SetItemText( GetId(), aStr );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
 {
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 402807ab44ed..95aeda10f316 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -31,11 +31,11 @@
 
 #include <set>
 
-// -----------------------------------------------------------------------
+
 
 SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl, SvxZoomSliderItem );
 
-// -----------------------------------------------------------------------
+
 
 struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
 {
@@ -65,13 +65,13 @@ struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
         mbOmitPaint( false ) {}
 };
 
-// -----------------------------------------------------------------------
+
 
 const long nSliderXOffset = 20;
 const long nSnappingEpsilon = 5; // snapping epsilon in pixels
 const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two adjacent snapping points
 
-// -----------------------------------------------------------------------
+
 
 // nOffset referes to the origin of the control:
 // + ----------- -
@@ -161,7 +161,7 @@ long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId,  sal_uInt16 _nId, StatusBar& _rStb ) :
     SfxStatusBarControl( _nSlotId, _nId, _rStb ),
@@ -190,14 +190,14 @@ SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId,  sal_uInt16 _nI
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxZoomSliderControl::~SvxZoomSliderControl()
 {
     delete mpImpl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
 {
@@ -259,7 +259,7 @@ void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eStat
         GetStatusBar().SetItemData( GetId(), 0 );    // force repaint
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
 {
@@ -323,7 +323,7 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
     pDev->SetFillColor( aOldFillColor );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
 {
@@ -382,7 +382,7 @@ sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
 {
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 1654fa68790d..403a8d1d9def 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -819,9 +819,9 @@ SfxItemPresentation SdrYesNoItem::GetPresentation(SfxItemPresentation ePres,
     return ePres;
 }
 
-//------------------------------------------------------------
+
 // class SdrPercentItem
-//------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SdrPercentItem,SfxUInt16Item);
 
@@ -853,9 +853,9 @@ SfxItemPresentation SdrPercentItem::GetPresentation(
     return ePres;
 }
 
-//------------------------------------------------------------
+
 // class SdrAngleItem
-//------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SdrAngleItem,SfxInt32Item);
 
@@ -942,9 +942,9 @@ SfxItemPresentation SdrAngleItem::GetPresentation(
     return ePres;
 }
 
-//------------------------------------------------------------
+
 // class SdrMetricItem
-//------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY(SdrMetricItem,SfxInt32Item);
 
@@ -2038,9 +2038,9 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
     return true;
 }
 
-//------------------------------------------------------------
+
 // class SdrSignedPercentItem
-//------------------------------------------------------------
+
 
 TYPEINIT1_AUTOFACTORY( SdrSignedPercentItem, SfxInt16Item );
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index e8349069302f..a93152a9a611 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -171,7 +171,7 @@ private:
     virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException );
 };
 
-//--------------------------------------------------------------------
+
 SdrLightEmbeddedClient_Impl::SdrLightEmbeddedClient_Impl( SdrOle2Obj* pObj )
 : mpObj( pObj )
 {
@@ -184,12 +184,12 @@ Rectangle SdrLightEmbeddedClient_Impl::impl_getScaledRect_nothrow() const
                                 Fraction( aLogicRect.GetHeight() ) * m_aScaleHeight ) );
     return aLogicRect;
 }
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::changingState( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 /*nOldState*/, ::sal_Int32 /*nNewState*/ ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException)
 {
 }
 
-//--------------------------------------------------------------------
+
 void SdrLightEmbeddedClient_Impl::Release()
 {
     {
@@ -200,7 +200,7 @@ void SdrLightEmbeddedClient_Impl::Release()
     release();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star::lang::EventObject& /*aEvent*/, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -216,7 +216,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::stateChanged( const ::com::sun::star:
     }
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -224,7 +224,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::disposing( const ::com::sun::star::la
     GetSdrGlobalData().GetOLEObjCache().RemoveObj(mpObj);
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException )
 {
     // TODO/LATER: when writer uses this implementation the code could be shared with SfxInPlaceClient_Impl
@@ -290,7 +290,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::notifyEvent( const document::EventObj
     }
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
     throw ( embed::ObjectSaveVetoException,
             uno::Exception,
@@ -317,7 +317,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::saveObject()
         xModifiable->setModified( sal_True );
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisible*/ )
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -338,7 +338,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::visibilityChanged( sal_Bool /*bVisibl
     }
 }
 
-//--------------------------------------------------------------------
+
 uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComponent()
     throw ( uno::RuntimeException )
 {
@@ -351,7 +351,7 @@ uno::Reference< util::XCloseable > SAL_CALL SdrLightEmbeddedClient_Impl::getComp
     return xResult;
 }
 // XInplaceClient
-//--------------------------------------------------------------------
+
 sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
     throw ( uno::RuntimeException )
 {
@@ -368,14 +368,14 @@ sal_Bool SAL_CALL SdrLightEmbeddedClient_Impl::canInplaceActivate()
     return bRet;
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::activatingInplace()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -420,14 +420,14 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
     } // for(sal_Int32 i = nCount-1 ; i >= 0;--i)
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedInplace()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -442,7 +442,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
     }
 }
 
-//--------------------------------------------------------------------
+
 uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbeddedClient_Impl::getLayoutManager()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -462,7 +462,7 @@ uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL SdrLightEmbed
     return xMan;
 }
 
-//--------------------------------------------------------------------
+
 uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl::getInplaceDispatchProvider()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -471,7 +471,7 @@ uno::Reference< frame::XDispatchProvider > SAL_CALL SdrLightEmbeddedClient_Impl:
     return uno::Reference < frame::XDispatchProvider >( lcl_getFrame_throw(mpObj), uno::UNO_QUERY_THROW );
 }
 
-//--------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -490,7 +490,7 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getPlacement()
     return AWTRectangle( aLogicRect );
 }
 
-//--------------------------------------------------------------------
+
 awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle()
     throw ( embed::WrongStateException,
             uno::RuntimeException )
@@ -498,21 +498,21 @@ awt::Rectangle SAL_CALL SdrLightEmbeddedClient_Impl::getClipRectangle()
     return getPlacement();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::translateAccelerators( const uno::Sequence< awt::KeyEvent >& /*aKeys*/ )
     throw ( embed::WrongStateException,
             uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::scrollObject( const awt::Size& /*aOffset*/ )
     throw ( embed::WrongStateException,
             uno::RuntimeException )
 {
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangle& aPosRect )
     throw ( embed::WrongStateException,
             uno::Exception,
@@ -571,7 +571,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::changedPlacement( const awt::Rectangl
     }
 }
 // XWindowSupplier
-//--------------------------------------------------------------------
+
 uno::Reference< awt::XWindow > SAL_CALL SdrLightEmbeddedClient_Impl::getWindow()
     throw ( uno::RuntimeException )
 {
@@ -608,7 +608,7 @@ public:
     bool                Connect() { return GetRealObject() != NULL; }
 };
 
-// -----------------------------------------------------------------------------
+
 
 SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
     ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
@@ -617,13 +617,13 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
     SetSynchron( sal_False );
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrEmbedObjectLink::~SdrEmbedObjectLink()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::sfx2::SvBaseLink::UpdateResult SdrEmbedObjectLink::DataChanged(
     const OUString& /*rMimeType*/, const ::com::sun::star::uno::Any & /*rValue*/ )
@@ -660,7 +660,7 @@ SdrEmbedObjectLink::~SdrEmbedObjectLink()
     return SUCCESS;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrEmbedObjectLink::Closed()
 {
@@ -736,7 +736,7 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact()
     return new sdr::contact::ViewContactOfSdrOle2Obj(*this);
 }
 
-// -----------------------------------------------------------------------------
+
 
 TYPEINIT1(SdrOle2Obj,SdrRectObj);
 DBG_NAME(SdrOle2Obj)
@@ -750,7 +750,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false)
     bFrame=bFrame_;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef&  rNewObjRef, const OUString& rNewObjName, const Rectangle& rNewRect, bool bFrame_)
     : SdrRectObj(rNewRect)
@@ -773,7 +773,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef&  rNewObjRef, const OUStrin
     SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::Init()
 {
@@ -786,7 +786,7 @@ void SdrOle2Obj::Init()
     xObjRef.Lock( true );
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SdrOle2Obj::GetStyleString()
 {
@@ -798,7 +798,7 @@ OUString SdrOle2Obj::GetStyleString()
     return strStyle;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrOle2Obj::~SdrOle2Obj()
 {
@@ -829,25 +829,25 @@ SdrOle2Obj::~SdrOle2Obj()
     delete mpImpl;
 }
 
-// -----------------------------------------------------------------------------
+
 void SdrOle2Obj::SetAspect( sal_Int64 nAspect )
 {
     xObjRef.SetViewAspect( nAspect );
 }
 
-// -----------------------------------------------------------------------------
+
 bool SdrOle2Obj::isInplaceActive() const
 {
     return xObjRef.is() && embed::EmbedStates::INPLACE_ACTIVE == xObjRef->getCurrentState();
 }
 
-// -----------------------------------------------------------------------------
+
 bool SdrOle2Obj::isUiActive() const
 {
     return xObjRef.is() && embed::EmbedStates::UI_ACTIVE == xObjRef->getCurrentState();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetGraphic_Impl(const Graphic* pGrf)
 {
@@ -875,14 +875,14 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf)
     SetGraphic_Impl( pGrf );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool SdrOle2Obj::IsEmpty() const
 {
     return !(xObjRef.is());
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::Connect()
 {
@@ -901,7 +901,7 @@ void SdrOle2Obj::Connect()
     AddListeners_Impl();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
 {
@@ -961,7 +961,7 @@ sal_Bool SdrOle2Obj::UpdateLinkURL_Impl()
     return bResult;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::BreakFileLink_Impl()
 {
@@ -994,7 +994,7 @@ void SdrOle2Obj::BreakFileLink_Impl()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::DisconnectFileLink_Impl()
 {
@@ -1006,7 +1006,7 @@ void SdrOle2Obj::DisconnectFileLink_Impl()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::CheckFileLink_Impl()
 {
@@ -1044,7 +1044,7 @@ void SdrOle2Obj::CheckFileLink_Impl()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::Reconnect_Impl()
 {
@@ -1169,7 +1169,7 @@ void SdrOle2Obj::AddListeners_Impl()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::Disconnect()
 {
@@ -1298,7 +1298,7 @@ void SdrOle2Obj::Disconnect_Impl()
     mpImpl->mbConnected = false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrObject* SdrOle2Obj::createSdrGrafObjReplacement(bool bAddText, bool /* bUseHCGraphic */) const
 {
@@ -1376,7 +1376,7 @@ SdrObject* SdrOle2Obj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetModel(SdrModel* pNewModel)
 {
@@ -1452,7 +1452,7 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
     AddListeners_Impl();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetPage(SdrPage* pNewPage)
 {
@@ -1488,7 +1488,7 @@ void SdrOle2Obj::SetPage(SdrPage* pNewPage)
         Connect();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef )
 {
@@ -1528,7 +1528,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
     BroadcastObjectChange();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetClosedObj( bool bIsClosed )
 {
@@ -1537,7 +1537,7 @@ void SdrOle2Obj::SetClosedObj( bool bIsClosed )
     bClosedObj = bIsClosed;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrObject* SdrOle2Obj::getFullDragClone() const
 {
@@ -1545,7 +1545,7 @@ SdrObject* SdrOle2Obj::getFullDragClone() const
     return createSdrGrafObjReplacement(false, true);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetPersistName( const OUString& rPersistName )
 {
@@ -1565,14 +1565,14 @@ void SdrOle2Obj::AbandonObject()
     SetObjRef(0);
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SdrOle2Obj::GetPersistName() const
 {
     return mpImpl->aPersistName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
@@ -1594,14 +1594,14 @@ void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = true;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
 {
     return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2);
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SdrOle2Obj::TakeObjNameSingul() const
 {
@@ -1619,14 +1619,14 @@ OUString SdrOle2Obj::TakeObjNameSingul() const
     return sName.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SdrOle2Obj::TakeObjNamePlural() const
 {
     return ImpGetResStr(bFrame ? STR_ObjNamePluralFrame : STR_ObjNamePluralOLE2);
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrOle2Obj* SdrOle2Obj::Clone() const
 {
@@ -1693,7 +1693,7 @@ SdrOle2Obj& SdrOle2Obj::operator=(const SdrOle2Obj& rObj)
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::ImpSetVisAreaSize()
 {
@@ -1828,7 +1828,7 @@ void SdrOle2Obj::ImpSetVisAreaSize()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
@@ -1849,7 +1849,7 @@ void SdrOle2Obj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
         ImpSetVisAreaSize();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo)
 {
@@ -1859,7 +1859,7 @@ void SdrOle2Obj::SetGeoData(const SdrObjGeoData& rGeo)
         ImpSetVisAreaSize();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect)
 {
@@ -1877,7 +1877,7 @@ void SdrOle2Obj::NbcSetSnapRect(const Rectangle& rRect)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::NbcSetLogicRect(const Rectangle& rRect)
 {
@@ -1900,14 +1900,14 @@ void SdrOle2Obj::GetNewReplacement()
         xObjRef.UpdateReplacement();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Size SdrOle2Obj::GetOrigObjSize( MapMode* pTargetMapMode ) const
 {
     return xObjRef.GetSize( pTargetMapMode );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::NbcMove(const Size& rSize)
 {
@@ -1917,7 +1917,7 @@ void SdrOle2Obj::NbcMove(const Size& rSize)
         ImpSetVisAreaSize();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
 {
@@ -1951,7 +1951,7 @@ sal_Bool SdrOle2Obj::CanUnloadRunningObj( const uno::Reference< embed::XEmbedded
     return bResult;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xObj, sal_Int64 nAspect )
 {
@@ -1978,7 +1978,7 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
     return bResult;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdrOle2Obj::Unload()
 {
@@ -2006,7 +2006,7 @@ sal_Bool SdrOle2Obj::Unload()
     return bUnloaded;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrOle2Obj::GetObjRef_Impl()
 {
@@ -2098,7 +2098,7 @@ uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef_NoInit() const
     return xObjRef.GetObject();
 }
 
-// -----------------------------------------------------------------------------
+
 
 uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const
 {
@@ -2109,7 +2109,7 @@ uno::Reference< frame::XModel > SdrOle2Obj::getXModel() const
         return uno::Reference< frame::XModel >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SdrOle2Obj::IsChart() const
 {
@@ -2121,19 +2121,19 @@ sal_Bool SdrOle2Obj::IsChart() const
     return m_bChart;
 }
 
-// -----------------------------------------------------------------------------
+
 void SdrOle2Obj::SetGraphicToObj( const Graphic& aGraphic, const OUString& aMediaType )
 {
     xObjRef.SetGraphic( aGraphic, aMediaType );
 }
 
-// -----------------------------------------------------------------------------
+
 void SdrOle2Obj::SetGraphicToObj( const uno::Reference< io::XInputStream >& xGrStream, const OUString& aMediaType )
 {
     xObjRef.SetGraphicStream( xGrStream, aMediaType );
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SdrOle2Obj::IsCalc() const
 {
     if ( !xObjRef.is() )
@@ -2154,7 +2154,7 @@ sal_Bool SdrOle2Obj::IsCalc() const
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const
 {
     uno::Reference< frame::XModel > xDoc;
@@ -2163,7 +2163,7 @@ uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const
     return xDoc;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScaleHeight, Size& aObjAreaSize )
 {
     // TODO/LEAN: to avoid rounding errors scaling always uses the VisArea.
@@ -2185,7 +2185,7 @@ sal_Bool SdrOle2Obj::CalculateNewScaling( Fraction& aScaleWidth, Fraction& aScal
     return sal_True;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Bool SdrOle2Obj::AddOwnLightClient()
 {
     // The Own Light Client must be registered in object only using this method!
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 9a34dea3e04f..202c79199024 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -534,7 +534,7 @@ void SdrUnoObj::SetUnoControlModel( const uno::Reference< awt::XControlModel >&
     }
 }
 
-//------------------------------------------------------------------------
+
 uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const
 {
     uno::Reference< awt::XControl > xControl;
@@ -558,7 +558,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetUnoControl(const SdrView& _rView,
     return xControl;
 }
 
-//------------------------------------------------------------------------
+
 uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow(
     const Window& _rWindow, uno::Reference< awt::XControlContainer >& _inout_ControlContainer ) const
 {
@@ -571,7 +571,7 @@ uno::Reference< awt::XControl > SdrUnoObj::GetTemporaryControlForWindow(
     return xControl;
 }
 
-//------------------------------------------------------------------------
+
 bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact ) const
 {
     ViewContact& rViewContact( GetViewContact() );
@@ -580,7 +580,7 @@ bool SdrUnoObj::impl_getViewContact( ViewContactOfUnoControl*& _out_rpContact )
     return ( _out_rpContact != NULL );
 }
 
-//------------------------------------------------------------------------
+
 ::sdr::contact::ViewContact* SdrUnoObj::CreateObjectSpecificViewContact()
 {
   return new ::sdr::contact::ViewContactOfUnoControl( *this );
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 24792d582da3..a872b91460d0 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -42,9 +42,9 @@ using namespace ::com::sun::star::container;
 
 namespace accessibility {
 
-// --------------------------------------------------------------------
+
 // AccessibleCell
-// --------------------------------------------------------------------
+
 
 AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent, const sdr::table::CellRef& rCell, sal_Int32 nIndex, const AccessibleShapeTreeInfo& rShapeTreeInfo )
 : AccessibleCellBase( rxParent, AccessibleRole::TABLE_CELL )
@@ -57,14 +57,14 @@ AccessibleCell::AccessibleCell( const ::com::sun::star::uno::Reference< ::com::s
     pAccTable = dynamic_cast <AccessibleTableShape *> (rxParent.get());
 }
 
-// --------------------------------------------------------------------
+
 
 AccessibleCell::~AccessibleCell (void)
 {
     DBG_ASSERT( mpText == 0, "svx::AccessibleCell::~AccessibleCell(), not disposed!?" );
 }
 
-// --------------------------------------------------------------------
+
 
 void AccessibleCell::Init (void)
 {
@@ -95,7 +95,7 @@ void AccessibleCell::Init (void)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool AccessibleCell::SetState (sal_Int16 aState)
 {
@@ -115,7 +115,7 @@ sal_Bool AccessibleCell::SetState (sal_Int16 aState)
     return bStateHasChanged;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool AccessibleCell::ResetState (sal_Int16 aState)
 {
@@ -135,39 +135,39 @@ sal_Bool AccessibleCell::ResetState (sal_Int16 aState)
     return bStateHasChanged;
 }
 
-//-----------------------------------------------------------------------------
+
 
 bool AccessibleCell::operator== (const AccessibleCell& rAccessibleCell)
 {
     return this == &rAccessibleCell;
 }
 
-//-----------------------------------------------------------------------------
+
 // XInterface
-//-----------------------------------------------------------------------------
+
 
 Any SAL_CALL AccessibleCell::queryInterface( const Type& aType ) throw (RuntimeException)
 {
     return AccessibleCellBase::queryInterface( aType );
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::acquire(  ) throw ()
 {
     AccessibleCellBase::acquire();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::release(  ) throw ()
 {
     AccessibleCellBase::release();
 }
 
-// --------------------------------------------------------------------
+
 // XAccessibleContext
-// --------------------------------------------------------------------
+
 
 /** The children of this cell come from the paragraphs of text.
 */
@@ -178,7 +178,7 @@ sal_Int32 SAL_CALL AccessibleCell::getAccessibleChildCount() throw (::com::sun::
     return mpText != NULL ? mpText->GetChildCount () : 0;
 }
 
-// --------------------------------------------------------------------
+
 
 /** Forward the request to the shape.  Return the requested shape or throw
     an exception for a wrong index.
@@ -192,7 +192,7 @@ Reference<XAccessible> SAL_CALL AccessibleCell::getAccessibleChild (sal_Int32 nI
     return mpText->GetChild (nIndex);
 }
 
-// --------------------------------------------------------------------
+
 
 /** Return a copy of the state set.
     Possible states are:
@@ -267,9 +267,9 @@ Reference<XAccessibleStateSet> SAL_CALL AccessibleCell::getAccessibleStateSet (v
     return xStateSet;
 }
 
-// --------------------------------------------------------------------
+
 // XAccessibleComponent
-// --------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL AccessibleCell::containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -313,7 +313,7 @@ Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const :
     return uno::Reference<XAccessible>();
 }
 
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Rectangle SAL_CALL AccessibleCell::getBounds(void) throw(RuntimeException)
 {
@@ -360,7 +360,7 @@ Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const :
     return aBoundingBox;
 }
 
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocation(void) throw (RuntimeException)
 {
@@ -369,7 +369,7 @@ Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const :
     return ::com::sun::star::awt::Point(aBoundingBox.X, aBoundingBox.Y);
 }
 
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Point SAL_CALL AccessibleCell::getLocationOnScreen(void) throw(RuntimeException)
 {
@@ -394,7 +394,7 @@ Reference<XAccessible > SAL_CALL  AccessibleCell::getAccessibleAtPoint ( const :
     return aLocation;
 }
 
-// --------------------------------------------------------------------
+
 
 awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException)
 {
@@ -403,28 +403,28 @@ awt::Size SAL_CALL AccessibleCell::getSize (void) throw (RuntimeException)
     return awt::Size (aBoundingBox.Width, aBoundingBox.Height);
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::addFocusListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener) throw (::com::sun::star::uno::RuntimeException)
 {
     AccessibleComponentBase::addFocusListener( xListener );
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::removeFocusListener (const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException)
 {
     AccessibleComponentBase::removeFocusListener( xListener );
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::grabFocus (void) throw (::com::sun::star::uno::RuntimeException)
 {
     AccessibleComponentBase::grabFocus();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException)
 {
@@ -435,7 +435,7 @@ sal_Int32 SAL_CALL AccessibleCell::getForeground(void) throw (RuntimeException)
     return nColor;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException)
 {
@@ -446,9 +446,9 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException)
     return nColor;
 }
 
-// --------------------------------------------------------------------
+
 // XAccessibleExtendedComponent
-// --------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL AccessibleCell::getFont (void) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -456,23 +456,23 @@ sal_Int32 SAL_CALL AccessibleCell::getBackground (void) throw (RuntimeException)
     return AccessibleComponentBase::getFont();
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL AccessibleCell::getTitledBorderText (void) throw (::com::sun::star::uno::RuntimeException)
 {
     return AccessibleComponentBase::getTitledBorderText();
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL AccessibleCell::getToolTipText (void) throw (::com::sun::star::uno::RuntimeException)
 {
     return AccessibleComponentBase::getToolTipText();
 }
 
-// --------------------------------------------------------------------
+
 // XAccessibleEventBroadcaster
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener)  throw (RuntimeException)
 {
@@ -492,7 +492,7 @@ void SAL_CALL AccessibleCell::addAccessibleEventListener( const Reference<XAcces
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAccessibleEventListener >& rxListener) throw (RuntimeException)
 {
@@ -502,16 +502,16 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc
         mpText->RemoveEventListener (rxListener);
 }
 
-// --------------------------------------------------------------------
+
 // XServiceInfo
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL AccessibleCell::getImplementationName(void) throw (RuntimeException)
 {
     return OUString("AccessibleCell");
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw (RuntimeException)
 {
@@ -529,9 +529,9 @@ Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames(void) throw
     return aServiceNames;
 }
 
-// --------------------------------------------------------------------
+
 // IAccessibleViewForwarderListener
-// --------------------------------------------------------------------
+
 
 void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAccessibleViewForwarder* /*pViewForwarder*/)
 {
@@ -544,9 +544,9 @@ void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAc
         mpText->UpdateChildren();
 }
 
-// --------------------------------------------------------------------
+
 // protected
-// --------------------------------------------------------------------
+
 
 void AccessibleCell::disposing (void)
 {
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 1aef6422f66a..f36c949d51eb 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -61,9 +61,9 @@ struct hash
 
 typedef boost::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap;
 
-//-----------------------------------------------------------------------------
+
 // AccessibleTableShapeImpl
-//-----------------------------------------------------------------------------
+
 
 class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener >
 {
@@ -91,7 +91,7 @@ public:
     Reference< AccessibleCell > getAccessibleCell (Reference< XCell > xCell);
 };
 
-//-----------------------------------------------------------------------------
+
 
 AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo )
 : mrShapeTreeInfo( rShapeTreeInfo )
@@ -100,7 +100,7 @@ AccessibleTableShapeImpl::AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rSh
 {
 }
 
-//-----------------------------------------------------------------------------
+
 
 void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible, const Reference< XTable >& xTable )
 {
@@ -121,7 +121,7 @@ void AccessibleTableShapeImpl::init( const Reference< XAccessible>& xAccessible,
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void AccessibleTableShapeImpl::dispose()
 {
@@ -140,7 +140,7 @@ void AccessibleTableShapeImpl::dispose()
     mxAccessible.clear();
 }
 
-//-----------------------------------------------------------------------------
+
 //get the cached AccessibleCell from XCell
 Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (Reference< XCell > xCell)
 {
@@ -154,7 +154,7 @@ Reference< AccessibleCell > AccessibleTableShapeImpl::getAccessibleCell (Referen
     return Reference< AccessibleCell >();
 }
 
-//-----------------------------------------------------------------------------
+
 Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild( sal_Int32 nChildIndex ) throw(IndexOutOfBoundsException)
 {
     sal_Int32 nColumn = 0, nRow = 0;
@@ -182,7 +182,7 @@ Reference< XAccessible > AccessibleTableShapeImpl::getAccessibleChild( sal_Int32
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void AccessibleTableShapeImpl::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (IndexOutOfBoundsException )
 {
@@ -305,11 +305,11 @@ void SAL_CALL AccessibleTableShapeImpl::disposing( const EventObject& /*Source*/
 {
 }
 
-//-----------------------------------------------------------------------------
+
 // AccessibleTableShape
-//-----------------------------------------------------------------------------
 
-//-----------------------------------------------------------------------------
+
+
 
 AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo)
 : AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo)
@@ -318,13 +318,13 @@ AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo& rShapeInf
 {
 }
 
-//-----------------------------------------------------------------------------
+
 
 AccessibleTableShape::~AccessibleTableShape (void)
 {
 }
 
-//-----------------------------------------------------------------------------
+
 
 void AccessibleTableShape::Init()
 {
@@ -343,7 +343,7 @@ void AccessibleTableShape::Init()
     AccessibleTableShape_Base::Init();
 }
 
-//-----------------------------------------------------------------------------
+
 
 SvxTableController* AccessibleTableShape::getTableController()
 {
@@ -354,9 +354,9 @@ SvxTableController* AccessibleTableShape::getTableController()
         return 0;
 }
 
-//-----------------------------------------------------------------------------
+
 // XInterface
-//-----------------------------------------------------------------------------
+
 
 Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (RuntimeException)
 {
@@ -371,43 +371,43 @@ Any SAL_CALL AccessibleTableShape::queryInterface( const Type& aType ) throw (Ru
         return AccessibleTableShape_Base::queryInterface( aType );
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::acquire(  ) throw ()
 {
     AccessibleTableShape_Base::acquire();
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::release(  ) throw ()
 {
     AccessibleTableShape_Base::release();
 }
 
-//-----------------------------------------------------------------------------
+
 // XAccessible
-//-----------------------------------------------------------------------------
+
 
 Reference< XAccessibleContext > SAL_CALL AccessibleTableShape::getAccessibleContext(void) throw (RuntimeException)
 {
     return AccessibleShape::getAccessibleContext ();
 }
 
-//-----------------------------------------------------------------------------
+
 OUString SAL_CALL AccessibleTableShape::getImplementationName(void) throw (RuntimeException)
 {
     return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" );
 }
 
-//-----------------------------------------------------------------------------
+
 
 OUString AccessibleTableShape::CreateAccessibleBaseName(void) throw (RuntimeException)
 {
     return OUString("TableShape");
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(RuntimeException)
 {
@@ -415,7 +415,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleChildCount( ) throw(Runtim
     return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() * mxImpl->mxTable->getColumnCount() : 0;
 }
 
-//--------------------------------------------------------------------
+
 Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_Int32 i ) throw(IndexOutOfBoundsException, RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -424,20 +424,20 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleChild( sal_
     return mxImpl->getAccessibleChild( i );
 }
 
-//--------------------------------------------------------------------
+
 Reference< XAccessibleRelationSet > SAL_CALL AccessibleTableShape::getAccessibleRelationSet(  ) throw (RuntimeException)
 {
     return AccessibleShape::getAccessibleRelationSet( );
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL AccessibleTableShape::getAccessibleRole (void) throw (RuntimeException)
 {
     return AccessibleRole::TABLE;
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::disposing (void)
 {
@@ -447,9 +447,9 @@ void SAL_CALL AccessibleTableShape::disposing (void)
     AccessibleShape::disposing();
 }
 
-//--------------------------------------------------------------------
+
 // XAccessibleTable
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeException)
 {
@@ -457,7 +457,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowCount() throw (RuntimeE
     return mxImpl->mxTable.is() ? mxImpl->mxTable->getRowCount() : 0;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount(  ) throw (RuntimeException)
 {
@@ -465,7 +465,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnCount(  ) throw (Run
     return mxImpl->mxTable.is() ? mxImpl->mxTable->getColumnCount() : 0;
 }
 
-//--------------------------------------------------------------------
+
 
 OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -473,7 +473,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleRowDescription( sal_Int32 n
     return OUString();
 }
 
-//--------------------------------------------------------------------
+
 
 OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -482,7 +482,7 @@ OUString SAL_CALL AccessibleTableShape::getAccessibleColumnDescription( sal_Int3
     return OUString();
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -497,7 +497,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRowExtentAt( sal_Int32 nRo
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -512,7 +512,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumnExtentAt( sal_Int32
     return 1;
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHeaders(  ) throw (RuntimeException)
 {
@@ -529,7 +529,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleRowHea
     return xRet;
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumnHeaders(  ) throw (RuntimeException)
 {
@@ -546,7 +546,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleTableShape::getAccessibleColumn
     return xRet;
 }
 
-//--------------------------------------------------------------------
+
 
 Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows(  ) throw (RuntimeException)
 {
@@ -583,7 +583,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleRows(
     return aRet;
 }
 
-//--------------------------------------------------------------------
+
 
 Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumns(  ) throw (RuntimeException)
 {
@@ -620,7 +620,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleTableShape::getSelectedAccessibleColumn
     return aRet;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -634,7 +634,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleRowSelected( sal_Int32 nRow
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -648,7 +648,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleColumnSelected( sal_Int32 nC
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -662,7 +662,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCellAt( sal
     return getAccessibleChild( nChildIndex );
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption(  ) throw (RuntimeException)
 {
@@ -670,7 +670,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleCaption(  )
     return xRet;
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary(  ) throw (RuntimeException)
 {
@@ -678,7 +678,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getAccessibleSummary(  )
     return xRet;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -697,7 +697,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleSelected( sal_Int32 nRow, sa
     return sal_False;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -706,7 +706,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleIndex( sal_Int32 nRow, sal
     return  mxImpl->mxTable.is() ? (nRow * mxImpl->mxTable->getColumnCount() + nColumn) : 0;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -716,7 +716,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleRow( sal_Int32 nChildIndex
     return nRow;
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -726,9 +726,9 @@ sal_Int32 SAL_CALL AccessibleTableShape::getAccessibleColumn( sal_Int32 nChildIn
     return nColumn;
 }
 
-//--------------------------------------------------------------------
+
 // XAccessibleSelection
-//--------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException )
 {
@@ -754,7 +754,7 @@ void SAL_CALL AccessibleTableShape::selectAccessibleChild( sal_Int32 nChildIndex
     }
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException )
 {
@@ -765,7 +765,7 @@ sal_Bool SAL_CALL AccessibleTableShape::isAccessibleChildSelected( sal_Int32 nCh
     return isAccessibleSelected(aPos.mnRow, aPos.mnCol);
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeException )
 {
@@ -775,7 +775,7 @@ void SAL_CALL AccessibleTableShape::clearAccessibleSelection() throw ( RuntimeEx
     if( pController )
         pController->clearSelection();
 }
-//--------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( RuntimeException )
 {
@@ -787,7 +787,7 @@ void SAL_CALL AccessibleTableShape::selectAllAccessibleChildren() throw ( Runtim
         pController->selectAll();
 }
 
-//--------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw ( RuntimeException )
 {
@@ -807,7 +807,7 @@ sal_Int32 SAL_CALL AccessibleTableShape::getSelectedAccessibleChildCount() throw
     return 0;
 }
 
-//--------------------------------------------------------------------
+
 
 Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException)
 {
@@ -829,7 +829,7 @@ Reference< XAccessible > SAL_CALL AccessibleTableShape::getSelectedAccessibleChi
     return getAccessibleChild( nChildIndex );
 }
 
-//--------------------------------------------------------------------
+
 
 void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildIndex )  throw ( IndexOutOfBoundsException, RuntimeException )
 {
@@ -857,7 +857,7 @@ void SAL_CALL AccessibleTableShape::deselectAccessibleChild( sal_Int32 nChildInd
             pController->setSelectedCells( aFirstPos, aLastPos );
     }
 }
-//--------------------------------------------------------------------
+
 
 //=====  XAccessibleTableSelection  ============================================
 sal_Bool SAL_CALL AccessibleTableShape::selectRow( sal_Int32 row )
@@ -927,7 +927,7 @@ void AccessibleTableShape::getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rn
 {
     mxImpl->getColumnAndRow(nChildIndex, rnColumn, rnRow);
 }
-//--------------------------------------------------------------------
+
 // XSelectionChangeListener
 void SAL_CALL
     AccessibleTableShape::disposing (const EventObject& aEvent)
@@ -995,7 +995,7 @@ AccessibleCell* AccessibleTableShape::GetActiveAccessibleCell()
     }
     return pAccCell;
 }
-//--------------------------------------------------------------------
+
 //If current active cell is in editing, the focus state should be set to internal text
 sal_Bool AccessibleTableShape::SetState (sal_Int16 aState)
 {
@@ -1009,7 +1009,7 @@ sal_Bool AccessibleTableShape::SetState (sal_Int16 aState)
         bStateHasChanged = AccessibleShape::SetState (aState);
     return bStateHasChanged;
 }
-//--------------------------------------------------------------------
+
 //If current active cell is in editing, the focus state should be reset to internal text
 sal_Bool AccessibleTableShape::ResetState (sal_Int16 aState)
 {
@@ -1023,12 +1023,12 @@ sal_Bool AccessibleTableShape::ResetState (sal_Int16 aState)
         bStateHasChanged = AccessibleShape::ResetState (aState);
     return bStateHasChanged;
 }
-//--------------------------------------------------------------------
+
 sal_Bool AccessibleTableShape::SetStateDirectly (sal_Int16 aState)
 {
     return AccessibleContextBase::SetState (aState);
 }
-//--------------------------------------------------------------------
+
 sal_Bool AccessibleTableShape::ResetStateDirectly (sal_Int16 aState)
 {
     return AccessibleContextBase::ResetState (aState);
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 865ac63edd8e..55f7b3878e08 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -52,7 +52,7 @@
 #include "svx/xflbmtit.hxx"
 #include <svx/svdpool.hxx>
 
-// -----------------------------------------------------------------------------
+
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star::uno;
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::style;
 using namespace ::com::sun::star::container;
 
-// -----------------------------------------------------------------------------
+
 
 static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
 {
@@ -331,9 +331,9 @@ namespace sdr
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 // Cell
-// -----------------------------------------------------------------------------
+
 
 rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject )
 {
@@ -346,7 +346,7 @@ rtl::Reference< Cell > Cell::create( SdrTableObj& rTableObj, OutlinerParaObject*
     return xCell;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) throw()
 : SdrText( rTableObj, pOutlinerParaObject )
@@ -365,14 +365,14 @@ Cell::Cell( SdrTableObj& rTableObj, OutlinerParaObject* pOutlinerParaObject ) th
         SetModel( rTableObj.GetModel() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Cell::~Cell() throw()
 {
     dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::dispose()
 {
@@ -398,7 +398,7 @@ void Cell::dispose()
     SetOutlinerParaObject( 0 );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::SetModel(SdrModel* pNewModel)
 {
@@ -429,7 +429,7 @@ void Cell::SetModel(SdrModel* pNewModel)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan )
 {
@@ -442,7 +442,7 @@ void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::mergeContent( const CellRef& xSourceCell )
 {
@@ -471,7 +471,7 @@ void Cell::mergeContent( const CellRef& xSourceCell )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::cloneFrom( const CellRef& xCell )
 {
@@ -510,7 +510,7 @@ void Cell::replaceContentAndFormating( const CellRef& xSourceCell )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::setMerged()
 {
@@ -521,7 +521,7 @@ void Cell::setMerged()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::notifyModified()
 {
@@ -529,9 +529,9 @@ void Cell::notifyModified()
         mxTable->setModified( sal_True );
 }
 
-// -----------------------------------------------------------------------------
+
 // SdrTextShape proxy
-// -----------------------------------------------------------------------------
+
 
 bool Cell::IsTextEditActive()
 {
@@ -549,7 +549,7 @@ bool Cell::IsTextEditActive()
     return isActive;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool Cell::hasText() const
 {
@@ -571,7 +571,7 @@ bool Cell::hasText() const
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 OutlinerParaObject* Cell::GetEditOutlinerParaObject() const
 {
@@ -581,7 +581,7 @@ OutlinerParaObject* Cell::GetEditOutlinerParaObject() const
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr )
 {
@@ -595,7 +595,7 @@ void Cell::SetStyleSheet( SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAt
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 const SfxItemSet& Cell::GetObjectItemSet()
 {
@@ -632,14 +632,14 @@ SfxStyleSheet* Cell::GetStyleSheet() const
         return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 const Rectangle& Cell::GetCurrentBoundRect() const
 {
     return maCellRect;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const
 {
@@ -649,14 +649,14 @@ void Cell::TakeTextAnchorRect(Rectangle& rAnchorRect) const
     rAnchorRect.Bottom() = maCellRect.Bottom() - GetTextLowerDistance();
 }
 
-// -----------------------------------------------------------------------------
+
 
 const SfxItemSet& Cell::GetItemSet() const
 {
     return mpProperties->GetObjectItemSet();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems)
 {
@@ -667,14 +667,14 @@ void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearA
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 Cell::getMinimumWidth()
 {
     return GetTextLeftDistance() + GetTextRightDistance() + 100;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 Cell::getMinimumHeight()
 {
@@ -714,49 +714,49 @@ sal_Int32 Cell::getMinimumHeight()
     return nMinimumHeight;
 }
 
-// -----------------------------------------------------------------------------
+
 
 long Cell::GetTextLeftDistance() const
 {
     return ((SdrTextLeftDistItem&)(GetItemSet().Get(SDRATTR_TEXT_LEFTDIST))).GetValue();
 }
 
-// -----------------------------------------------------------------------------
+
 
 long Cell::GetTextRightDistance() const
 {
     return ((SdrTextRightDistItem&)(GetItemSet().Get(SDRATTR_TEXT_RIGHTDIST))).GetValue();
 }
 
-// -----------------------------------------------------------------------------
+
 
 long Cell::GetTextUpperDistance() const
 {
     return ((SdrTextUpperDistItem&)(GetItemSet().Get(SDRATTR_TEXT_UPPERDIST))).GetValue();
 }
 
-// -----------------------------------------------------------------------------
+
 
 long Cell::GetTextLowerDistance() const
 {
     return ((SdrTextLowerDistItem&)(GetItemSet().Get(SDRATTR_TEXT_LOWERDIST))).GetValue();
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrTextVertAdjust Cell::GetTextVerticalAdjust() const
 {
     return ((SdrTextVertAdjustItem&)(GetItemSet().Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrTextHorzAdjust Cell::GetTextHorizontalAdjust() const
 {
     return ((SdrTextHorzAdjustItem&)(GetItemSet().Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject )
 {
@@ -767,7 +767,7 @@ void Cell::SetOutlinerParaObject( OutlinerParaObject* pTextObject )
         ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void Cell::AddUndo()
 {
@@ -779,7 +779,7 @@ void Cell::AddUndo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextProperties* pProperties, SdrObject& rNewObj, Cell& rNewCell )
 {
@@ -789,16 +789,16 @@ sdr::properties::TextProperties* Cell::CloneProperties( sdr::properties::TextPro
         return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sdr::properties::TextProperties* Cell::CloneProperties( SdrObject& rNewObj, Cell& rNewCell )
 {
     return CloneProperties(mpProperties,rNewObj,rNewCell);
 }
 
-// -----------------------------------------------------------------------------
+
 // XInterface
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException)
 {
@@ -821,23 +821,23 @@ Any SAL_CALL Cell::queryInterface( const Type & rType ) throw(RuntimeException)
     return ::cppu::OWeakObject::queryInterface( rType );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::acquire() throw ()
 {
     ::cppu::OWeakObject::acquire();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::release() throw ()
 {
     ::cppu::OWeakObject::release();
 }
 
-// -----------------------------------------------------------------------------
+
 // XTypeProvider
-// -----------------------------------------------------------------------------
+
 
 Sequence< Type > SAL_CALL Cell::getTypes(  ) throw (RuntimeException)
 {
@@ -851,7 +851,7 @@ Sequence< Type > SAL_CALL Cell::getTypes(  ) throw (RuntimeException)
     return aTypes;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId(  ) throw (RuntimeException)
 {
@@ -897,7 +897,7 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames(  ) throw (RuntimeE
     return ::com::sun::star::awt::Size( getMinimumWidth(),  getMinimumHeight() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Size SAL_CALL Cell::getPreferredSize()
     throw (RuntimeException,
@@ -906,46 +906,46 @@ Sequence< OUString > SAL_CALL Cell::getSupportedServiceNames(  ) throw (RuntimeE
     return getMinimumSize();
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Size SAL_CALL Cell::calcAdjustedSize( const ::com::sun::star::awt::Size& aNewSize ) throw (RuntimeException)
 {
     return aNewSize;
 }
 
-// -----------------------------------------------------------------------------
+
 // XMergeableCell
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL Cell::getRowSpan() throw (RuntimeException)
 {
     return mnRowSpan;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL Cell::getColumnSpan() throw (RuntimeException)
 {
     return mnColSpan;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL Cell::isMerged() throw (RuntimeException)
 {
     return mbMerged;
 }
 
-// -----------------------------------------------------------------------------
+
 // XCell
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL Cell::getFormula(  ) throw (RuntimeException)
 {
     return msFormula;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeException)
 {
@@ -955,14 +955,14 @@ void SAL_CALL Cell::setFormula( const OUString& aFormula ) throw (RuntimeExcepti
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 double SAL_CALL Cell::getValue(  ) throw (RuntimeException)
 {
     return mfValue;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException)
 {
@@ -973,23 +973,23 @@ void SAL_CALL Cell::setValue( double nValue ) throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellContentType SAL_CALL Cell::getType() throw (RuntimeException)
 {
     return mnCellContentType;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL Cell::getError(  ) throw (RuntimeException)
 {
     return mnError;
 }
 
-// -----------------------------------------------------------------------------
+
 // XPropertySet
-// -----------------------------------------------------------------------------
+
 
 Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap )
 {
@@ -1018,7 +1018,7 @@ Reference< XPropertySetInfo > SAL_CALL Cell::getPropertySetInfo() throw(RuntimeE
     return mpPropSet->getPropertySetInfo();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
@@ -1163,7 +1163,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1247,33 +1247,33 @@ Any SAL_CALL Cell::getPropertyValue( const OUString& PropertyName ) throw(Unknow
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::addVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::removeVetoableChangeListener( const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener >& /*aListener*/ ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XMultiPropertySet
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
@@ -1304,7 +1304,7 @@ void SAL_CALL Cell::setPropertyValues( const Sequence< OUString >& aPropertyName
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException)
 {
@@ -1338,27 +1338,27 @@ Sequence< Any > SAL_CALL Cell::getPropertyValues( const Sequence< OUString >& aP
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::addPropertiesChangeListener( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::firePropertiesChangeEvent( const Sequence< OUString >& /*aPropertyNames*/, const Reference< XPropertiesChangeListener >& /*xListener*/ ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XPropertyState
-// -----------------------------------------------------------------------------
+
 
 PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
@@ -1461,7 +1461,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
@@ -1492,7 +1492,7 @@ Sequence< PropertyState > SAL_CALL Cell::getPropertyStates( const Sequence< OUSt
     return aRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
@@ -1534,7 +1534,7 @@ void SAL_CALL Cell::setPropertyToDefault( const OUString& PropertyName ) throw(U
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1577,9 +1577,9 @@ Any SAL_CALL Cell::getPropertyDefault( const OUString& aPropertyName ) throw(Unk
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 // XMultiPropertyStates
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setAllPropertiesToDefault()
     throw (RuntimeException, std::exception)
@@ -1608,7 +1608,7 @@ void SAL_CALL Cell::setAllPropertiesToDefault()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, RuntimeException)
 {
@@ -1619,7 +1619,7 @@ void SAL_CALL Cell::setPropertiesToDefault( const Sequence< OUString >& aPropert
         setPropertyToDefault( *pName++ );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1634,9 +1634,9 @@ Sequence< Any > SAL_CALL Cell::getPropertyDefaults( const Sequence< OUString >&
     return aDefaults;
 }
 
-// -----------------------------------------------------------------------------
+
 // XFastPropertySet
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
@@ -1645,7 +1645,7 @@ void SAL_CALL Cell::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue )
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 // TODO: Refactor this method!
 Any SAL_CALL Cell::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -1653,9 +1653,9 @@ Any SAL_CALL Cell::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPrope
     throw UnknownPropertyException();
 }
 
-// -----------------------------------------------------------------------------
+
 // XText
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, const Reference< XTextContent >& xContent, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -1663,7 +1663,7 @@ void SAL_CALL Cell::insertTextContent( const Reference< XTextRange >& xRange, co
     notifyModified();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent ) throw (NoSuchElementException, RuntimeException)
 {
@@ -1671,23 +1671,23 @@ void SAL_CALL Cell::removeTextContent( const Reference< XTextContent >& xContent
     notifyModified();
 }
 
-// -----------------------------------------------------------------------------
+
 // XSimpleText
-// -----------------------------------------------------------------------------
+
 
 Reference< XTextCursor > SAL_CALL Cell::createTextCursor(  ) throw (RuntimeException)
 {
     return SvxUnoTextBase::createTextCursor();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XTextCursor > SAL_CALL Cell::createTextCursorByRange( const Reference< XTextRange >& aTextPosition ) throw (RuntimeException)
 {
     return SvxUnoTextBase::createTextCursorByRange( aTextPosition );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) throw (RuntimeException)
 {
@@ -1695,7 +1695,7 @@ void SAL_CALL Cell::insertString( const Reference< XTextRange >& xRange, const O
     notifyModified();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -1703,30 +1703,30 @@ void SAL_CALL Cell::insertControlCharacter( const Reference< XTextRange >& xRang
     notifyModified();
 }
 
-// -----------------------------------------------------------------------------
+
 // XTextRange
-// -----------------------------------------------------------------------------
+
 
 Reference< XText > SAL_CALL Cell::getText(  ) throw (RuntimeException)
 {
     return SvxUnoTextBase::getText();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XTextRange > SAL_CALL Cell::getStart(  ) throw (RuntimeException)
 {
     return SvxUnoTextBase::getStart();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XTextRange > SAL_CALL Cell::getEnd(  ) throw (RuntimeException)
 {
     return SvxUnoTextBase::getEnd();
 }
 
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL Cell::getString(  ) throw (RuntimeException)
 {
@@ -1734,7 +1734,7 @@ OUString SAL_CALL Cell::getString(  ) throw (RuntimeException)
     return SvxUnoTextBase::getString();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL Cell::setString( const OUString& aString ) throw (RuntimeException)
 {
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index bd3ad5818f0f..8bac871fddb4 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -26,7 +26,7 @@
 #include "svx/svdstr.hrc"
 #include "svx/svdglob.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -34,51 +34,51 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::table;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 // CellCursor
-// -----------------------------------------------------------------------------
+
 
 CellCursor::CellCursor( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 : CellCursorBase( xTable, nLeft, nTop, nRight, nBottom )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellCursor::~CellCursor()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XCellCursor
-// -----------------------------------------------------------------------------
+
 
 Reference< XCell > SAL_CALL CellCursor::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return CellRange::getCellByPosition( nColumn, nRow );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return CellRange::getCellRangeByPosition( nLeft, nTop, nRight, nBottom );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL CellCursor::getCellRangeByName( const OUString& aRange ) throw (RuntimeException)
 {
     return CellRange::getCellRangeByName( aRange );
 }
 
-// -----------------------------------------------------------------------------
+
 // XCellCursor
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::gotoStart(  ) throw (RuntimeException)
 {
@@ -86,7 +86,7 @@ void SAL_CALL CellCursor::gotoStart(  ) throw (RuntimeException)
     mnBottom = mnTop;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::gotoEnd(  ) throw (RuntimeException)
 {
@@ -94,7 +94,7 @@ void SAL_CALL CellCursor::gotoEnd(  ) throw (RuntimeException)
     mnTop = mnBottom;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::gotoNext(  ) throw (RuntimeException)
 {
@@ -123,7 +123,7 @@ void SAL_CALL CellCursor::gotoNext(  ) throw (RuntimeException)
     mnTop = mnBottom;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::gotoPrevious(  ) throw (RuntimeException)
 {
@@ -144,7 +144,7 @@ void SAL_CALL CellCursor::gotoPrevious(  ) throw (RuntimeException)
     mnBottom = mnTop;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRowOffset ) throw (RuntimeException)
 {
@@ -160,9 +160,9 @@ void SAL_CALL CellCursor::gotoOffset( ::sal_Int32 nColumnOffset, ::sal_Int32 nRo
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XMergeableCellCursor
-// -----------------------------------------------------------------------------
+
 
 /** returns true and the merged cell positions if a merge is valid or false if a merge is
     not valid for that range */
@@ -243,7 +243,7 @@ bool CellCursor::GetMergedSelection( CellPos& rStart, CellPos& rEnd )
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::merge(  ) throw (NoSupportException, RuntimeException)
 {
@@ -278,7 +278,7 @@ void SAL_CALL CellCursor::merge(  ) throw (NoSupportException, RuntimeException)
         pModel->SetChanged();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector< sal_Int32 >& rLeftOvers )
 {
@@ -382,7 +382,7 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector<
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void CellCursor::split_horizontal( sal_Int32 nColumns )
 {
@@ -394,7 +394,7 @@ void CellCursor::split_horizontal( sal_Int32 nColumns )
         split_column( nCol, nColumns, aLeftOvers );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_Int32 >& rLeftOvers )
 {
@@ -498,7 +498,7 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void CellCursor::split_vertical( sal_Int32 nRows )
 {
@@ -510,7 +510,7 @@ void CellCursor::split_vertical( sal_Int32 nRows )
         split_row( nRow, nRows, aLeftOvers );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (NoSupportException, IllegalArgumentException, RuntimeException)
 {
@@ -549,7 +549,7 @@ void SAL_CALL CellCursor::split( sal_Int32 nColumns, sal_Int32 nRows ) throw (No
         pModel->SetChanged();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CellCursor::isMergeable(  ) throw (RuntimeException)
 {
@@ -557,7 +557,7 @@ sal_Bool SAL_CALL CellCursor::isMergeable(  ) throw (RuntimeException)
     return GetMergedSelection( aStart, aEnd ) ? sal_True : sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CellCursor::isUnmergeable(  ) throw (RuntimeException)
 {
@@ -574,7 +574,7 @@ sal_Bool SAL_CALL CellCursor::isUnmergeable(  ) throw (RuntimeException)
     return sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 
 } }
 
diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx
index 2d04fd389d95..aba1110bb820 100644
--- a/svx/source/table/cellrange.cxx
+++ b/svx/source/table/cellrange.cxx
@@ -20,20 +20,20 @@
 
 #include "cellrange.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 // CellRange
-// -----------------------------------------------------------------------------
+
 
 CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom )
 : mxTable( xTable )
@@ -44,15 +44,15 @@ CellRange::CellRange( const TableModelRef & xTable, sal_Int32 nLeft, sal_Int32 n
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellRange::~CellRange()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // ICellRange
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 CellRange::getLeft()
 {
@@ -79,16 +79,16 @@ Reference< XTable > CellRange::getTable()
     return mxTable.get();
 }
 
-// -----------------------------------------------------------------------------
+
 // XCellRange
-// -----------------------------------------------------------------------------
+
 
 Reference< XCell > SAL_CALL CellRange::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     return mxTable->getCellByPosition( mnLeft + nColumn, mnTop + nRow );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -109,14 +109,14 @@ Reference< XCellRange > SAL_CALL CellRange::getCellRangeByPosition( sal_Int32 nL
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL CellRange::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException)
 {
     return Reference< XCellRange >();
 }
 
-// -----------------------------------------------------------------------------
+
 
 } }
 
diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx
index a5bba34dec28..c11970c6df50 100644
--- a/svx/source/table/propertyset.cxx
+++ b/svx/source/table/propertyset.cxx
@@ -26,22 +26,22 @@ using namespace ::com::sun::star::lang;
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 // FastPropertySetInfo
-// -----------------------------------------------------------------------------
+
 
 FastPropertySetInfo::FastPropertySetInfo( const PropertyVector& rProps )
 {
     addProperties( rProps );
 }
 
-// -----------------------------------------------------------------------------
+
 
 FastPropertySetInfo::~FastPropertySetInfo()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void FastPropertySetInfo::addProperties( const PropertyVector& rProps )
 {
@@ -57,7 +57,7 @@ void FastPropertySetInfo::addProperties( const PropertyVector& rProps )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw (UnknownPropertyException )
 {
@@ -67,7 +67,7 @@ const Property& FastPropertySetInfo::getProperty( const OUString& aName ) throw
     return maProperties[(*aIter).second];
 }
 
-// -----------------------------------------------------------------------------
+
 
 const Property* FastPropertySetInfo::hasProperty( const OUString& aName )
 {
@@ -78,94 +78,94 @@ const Property* FastPropertySetInfo::hasProperty( const OUString& aName )
         return &maProperties[(*aIter).second];
 }
 
-// -----------------------------------------------------------------------------
+
 // XPropertySetInfo
-// -----------------------------------------------------------------------------
+
 
 Sequence< Property > SAL_CALL FastPropertySetInfo::getProperties() throw (RuntimeException)
 {
     return Sequence< Property >( &maProperties[0], maProperties.size() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Property SAL_CALL FastPropertySetInfo::getPropertyByName( const OUString& aName ) throw (UnknownPropertyException, RuntimeException)
 {
     return getProperty( aName );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL FastPropertySetInfo::hasPropertyByName( const OUString& aName ) throw (RuntimeException)
 {
     return hasProperty( aName ) != 0 ? sal_True : sal_False;
 }
 
-// -----------------------------------------------------------------------------
+
 // FastPropertySet
-// -----------------------------------------------------------------------------
+
 
 FastPropertySet::FastPropertySet( const rtl::Reference< FastPropertySetInfo >& xInfo )
 : mxInfo( xInfo )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 FastPropertySet::~FastPropertySet()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XPropertySet
-// -----------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SAL_CALL FastPropertySet::getPropertySetInfo(  ) throw (RuntimeException)
 {
     return Reference< XPropertySetInfo >( mxInfo.get() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     setFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle, aValue );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL FastPropertySet::getPropertyValue( const OUString& aPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     return getFastPropertyValue( mxInfo->getProperty( aPropertyName ).Handle );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XMultiPropertySet
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
@@ -189,7 +189,7 @@ void SAL_CALL FastPropertySet::setPropertyValues( const Sequence< OUString >& aP
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw (RuntimeException)
 {
@@ -213,19 +213,19 @@ Sequence< Any > SAL_CALL FastPropertySet::getPropertyValues( const Sequence< OUS
     return aValues;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw (RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL FastPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw (RuntimeException)
 {
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index b1ec03c69360..4dd6a56a42df 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -57,7 +57,7 @@
 #include "svx/xflftrit.hxx"
 #include "svx/xfltrit.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
@@ -155,9 +155,9 @@ public:
     Rectangle   maLogicRect;
 };
 
-//------------------------------------------------------------------------
+
 // TableStyleSettings
-//------------------------------------------------------------------------
+
 
 TableStyleSettings::TableStyleSettings()
 : mbUseFirstRow(true)
@@ -196,7 +196,7 @@ bool TableStyleSettings::operator==( const TableStyleSettings& rStyle ) const
         (mbUseColumnBanding == rStyle.mbUseColumnBanding);
 }
 
-// -----------------------------------------------------------------------------
+
 
 class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener >
 {
@@ -244,7 +244,7 @@ public:
     virtual bool isInUse();
 };
 
-// -----------------------------------------------------------------------------
+
 
 SdrTableObjImpl::SdrTableObjImpl()
 : mpTableObj( 0 )
@@ -253,13 +253,13 @@ SdrTableObjImpl::SdrTableObjImpl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrTableObjImpl::~SdrTableObjImpl()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 nRows )
 {
@@ -273,7 +273,7 @@ void SdrTableObjImpl::init( SdrTableObj* pTable, sal_Int32 nColumns, sal_Int32 n
     mpTableObj->maLogicRect = mpTableObj->aRect;
 }
 
-// -----------------------------------------------------------------------------
+
 
 SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource )
 {
@@ -311,7 +311,7 @@ SdrTableObjImpl& SdrTableObjImpl::operator=( const SdrTableObjImpl& rSource )
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel)
 {
@@ -351,7 +351,7 @@ void SdrTableObjImpl::SetModel(SdrModel* /*pOldModel*/, SdrModel* pNewModel)
     update();
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool SdrTableObjImpl::ApplyCellStyles()
 {
@@ -449,7 +449,7 @@ bool SdrTableObjImpl::ApplyCellStyles()
     return bChanges;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::dispose()
 {
@@ -471,7 +471,7 @@ void SdrTableObjImpl::dispose()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset )
 {
@@ -551,9 +551,9 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XModifyListener
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SdrTableObjImpl::modified( const ::com::sun::star::lang::EventObject& /*aEvent*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -588,7 +588,7 @@ void SdrTableObjImpl::update()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::connectTableStyle()
 {
@@ -603,7 +603,7 @@ void SdrTableObjImpl::connectTableStyle()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::disconnectTableStyle()
 {
@@ -618,16 +618,16 @@ void SdrTableObjImpl::disconnectTableStyle()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool SdrTableObjImpl::isInUse()
 {
     return mpTableObj && mpTableObj->IsInserted();
 }
 
-// -----------------------------------------------------------------------------
+
 // XEventListener
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL SdrTableObjImpl::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -641,7 +641,7 @@ void SAL_CALL SdrTableObjImpl::disposing( const ::com::sun::star::lang::EventObj
     mpTableObj = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellRef SdrTableObjImpl::getCell(  const CellPos& rPos  ) const
 {
@@ -657,21 +657,21 @@ CellRef SdrTableObjImpl::getCell(  const CellPos& rPos  ) const
     return xCell;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SdrTableObjImpl::getColumnCount() const
 {
     return mxTable.is() ? mxTable->getColumnCount() : 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SdrTableObjImpl::getRowCount() const
 {
     return mxTable.is() ? mxTable->getRowCount() : 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHeight )
 {
@@ -682,7 +682,7 @@ void SdrTableObjImpl::LayoutTable( Rectangle& rArea, bool bFitWidth, bool bFitHe
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SdrTableObjImpl::UpdateCells( Rectangle& rArea )
 {
@@ -694,29 +694,29 @@ void SdrTableObjImpl::UpdateCells( Rectangle& rArea )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // BaseProperties section
-// -----------------------------------------------------------------------------
+
 
 sdr::properties::BaseProperties* SdrTableObj::CreateObjectSpecificProperties()
 {
     return new TableProperties(*this);
 }
 
-// -----------------------------------------------------------------------------
+
 // DrawContact section
-// -----------------------------------------------------------------------------
+
 
 sdr::contact::ViewContact* SdrTableObj::CreateObjectSpecificViewContact()
 {
     return new sdr::contact::ViewContactOfTableObj(*this);
 }
 
-// --------------------------------------------------------------------
+
 
 TYPEINIT1(SdrTableObj,SdrTextObj);
 
-// --------------------------------------------------------------------
+
 
 SdrTableObj::SdrTableObj(SdrModel* _pModel)
 {
@@ -724,7 +724,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel)
     init( 1, 1 );
 }
 
-// --------------------------------------------------------------------
+
 
 SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int32 nColumns, sal_Int32 nRows)
 : SdrTextObj( rNewRect )
@@ -741,7 +741,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int
     init( nColumns, nRows );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
 {
@@ -752,7 +752,7 @@ void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
     mpImpl->init( this, nColumns, nRows );
 }
 
-// --------------------------------------------------------------------
+
 
 SdrTableObj::~SdrTableObj()
 {
@@ -760,30 +760,30 @@ SdrTableObj::~SdrTableObj()
     mpImpl->release();
 }
 
-// --------------------------------------------------------------------
+
 // table stuff
-// --------------------------------------------------------------------
+
 
 Reference< XTable > SdrTableObj::getTable() const
 {
     return Reference< XTable >( mpImpl->mxTable.get() );
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::isValid( const CellPos& rPos ) const
 {
     return (rPos.mnCol >= 0) && (rPos.mnCol < mpImpl->getColumnCount()) && (rPos.mnRow >= 0) && (rPos.mnRow < mpImpl->getRowCount());
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getFirstCell() const
 {
     return CellPos( 0,0 );
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getLastCell() const
 {
@@ -796,7 +796,7 @@ CellPos SdrTableObj::getLastCell() const
     return aPos;
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -812,7 +812,7 @@ CellPos SdrTableObj::getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getRightCell( const CellPos& rPos, bool bEdgeTravel  ) const
 {
@@ -828,7 +828,7 @@ CellPos SdrTableObj::getRightCell( const CellPos& rPos, bool bEdgeTravel  ) cons
     }
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getUpCell( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -843,7 +843,7 @@ CellPos SdrTableObj::getUpCell( const CellPos& rPos, bool bEdgeTravel ) const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -858,7 +858,7 @@ CellPos SdrTableObj::getDownCell( const CellPos& rPos, bool bEdgeTravel ) const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -886,7 +886,7 @@ CellPos SdrTableObj::getPreviousCell( const CellPos& rPos, bool bEdgeTravel ) co
     return aPos;
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -929,7 +929,7 @@ CellPos SdrTableObj::getNextCell( const CellPos& rPos, bool bEdgeTravel ) const
     return rPos;
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -959,7 +959,7 @@ CellPos SdrTableObj::getPreviousRow( const CellPos& rPos, bool bEdgeTravel ) con
     return aPos;
 }
 
-// --------------------------------------------------------------------
+
 
 CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const
 {
@@ -1003,7 +1003,7 @@ CellPos SdrTableObj::getNextRow( const CellPos& rPos, bool bEdgeTravel ) const
     return rPos;
 }
 
-// --------------------------------------------------------------------
+
 
 const TableStyleSettings& SdrTableObj::getTableStyleSettings() const
 {
@@ -1018,7 +1018,7 @@ const TableStyleSettings& SdrTableObj::getTableStyleSettings() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle )
 {
@@ -1029,7 +1029,7 @@ void SdrTableObj::setTableStyleSettings( const TableStyleSettings& rStyle )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_Int32& rnY, int nTol ) const
 {
@@ -1157,7 +1157,7 @@ const SfxItemSet& SdrTableObj::GetActiveCellItemSet() const
     return getActiveCell()->GetItemSet();
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle )
 {
@@ -1170,7 +1170,7 @@ void SdrTableObj::setTableStyle( const Reference< XIndexAccess >& xTableStyle )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 const Reference< XIndexAccess >& SdrTableObj::getTableStyle() const
 {
@@ -1185,9 +1185,9 @@ const Reference< XIndexAccess >& SdrTableObj::getTableStyle() const
     }
 }
 
-// --------------------------------------------------------------------
+
 // text stuff
-// --------------------------------------------------------------------
+
 
 /** returns the currently active text. */
 SdrText* SdrTableObj::getActiveText() const
@@ -1195,7 +1195,7 @@ SdrText* SdrTableObj::getActiveText() const
     return dynamic_cast< SdrText* >( getActiveCell().get() );
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns the nth available text. */
 SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const
@@ -1214,7 +1214,7 @@ SdrText* SdrTableObj::getText( sal_Int32 nIndex ) const
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns the number of texts available for this object. */
 sal_Int32 SdrTableObj::getTextCount() const
@@ -1232,7 +1232,7 @@ sal_Int32 SdrTableObj::getTextCount() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** changes the current active text */
 void SdrTableObj::setActiveText( sal_Int32 nIndex )
@@ -1249,7 +1249,7 @@ void SdrTableObj::setActiveText( sal_Int32 nIndex )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 /** returns the index of the text that contains the given point or -1 */
 sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const
@@ -1264,7 +1264,7 @@ sal_Int32 SdrTableObj::CheckTextHit(const Point& rPnt) const
     return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const
 {
@@ -1275,7 +1275,7 @@ SdrOutliner* SdrTableObj::GetCellTextEditOutliner( const Cell& rCell ) const
 }
 
 
-// --------------------------------------------------------------------
+
 
 const TableLayouter& SdrTableObj::getTableLayouter() const
 {
@@ -1283,35 +1283,35 @@ const TableLayouter& SdrTableObj::getTableLayouter() const
     return *(mpImpl->mpLayouter);
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::IsAutoGrowHeight() const
 {
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::IsAutoGrowWidth() const
 {
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::HasText() const
 {
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::IsTextEditActive( const CellPos& rPos )
 {
     return pEdtOutl && mpImpl && (rPos == mpImpl->maEditPos);
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
 {
@@ -1328,7 +1328,7 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
 {
@@ -1355,21 +1355,21 @@ void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
     rInfo.bCanConvToContour = false;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt16 SdrTableObj::GetObjIdentifier() const
 {
     return static_cast<sal_uInt16>(OBJ_TABLE);
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::SetPage(SdrPage* pNewPage)
 {
     SdrTextObj::SetPage(pNewPage);
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::SetModel(SdrModel* pNewModel)
 {
@@ -1391,7 +1391,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const
 {
@@ -1399,7 +1399,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bo
         TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const
 {
@@ -1434,7 +1434,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
 //      rOutliner.SetMinAutoPaperSize(Size(0, aAnkRect.GetHeight()));
 //  }
 
-    // ---
+
 
     // set text at outliner, maybe from edit outliner
     OutlinerParaObject* pPara= xCell->GetOutlinerParaObject();
@@ -1483,7 +1483,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
     rTextRect=Rectangle(aTextPos,aTextSiz);
 }
 
-// --------------------------------------------------------------------
+
 
 const CellRef& SdrTableObj::getActiveCell() const
 {
@@ -1503,21 +1503,21 @@ const CellRef& SdrTableObj::getActiveCell() const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 SdrTableObj::getRowCount() const
 {
     return mpImpl ? mpImpl->getRowCount() : 0;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Int32 SdrTableObj::getColumnCount() const
 {
     return mpImpl ? mpImpl->getColumnCount() : 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::setActiveCell( const CellPos& rPos )
 {
@@ -1542,14 +1542,14 @@ void SdrTableObj::setActiveCell( const CellPos& rPos )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::getActiveCellPos( CellPos& rPos ) const
 {
     rPos = mpImpl->maEditPos;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect )
 {
@@ -1561,7 +1561,7 @@ void SdrTableObj::getCellBounds( const CellPos& rPos, ::Rectangle& rCellRect )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
 {
@@ -1569,7 +1569,7 @@ void SdrTableObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
         TakeTextAnchorRect( mpImpl->maEditPos, rAnchorRect );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRect ) const
 {
@@ -1586,7 +1586,7 @@ void SdrTableObj::TakeTextAnchorRect( const CellPos& rPos, Rectangle& rAnchorRec
     rAnchorRect=aAnkRect;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const
 {
@@ -1594,7 +1594,7 @@ void SdrTableObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle*
         TakeTextEditArea( mpImpl->maEditPos, pPaperMin, pPaperMax, pViewInit, pViewMin );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin ) const
 {
@@ -1651,7 +1651,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
     if (pViewInit!=NULL) *pViewInit=aViewInit;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
 {
@@ -1679,14 +1679,14 @@ sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
     return (sal_uInt16)eRet;
 }
 
-// --------------------------------------------------------------------
+
 
 OutlinerParaObject* SdrTableObj::GetEditOutlinerParaObject() const
 {
     return SdrTextObj::GetEditOutlinerParaObject();
 }
 
-// --------------------------------------------------------------------
+
 
 struct ImplTableShadowPaintInfo
 {
@@ -1706,7 +1706,7 @@ struct ImplTableShadowPaintInfo
     }
 };
 
-// --------------------------------------------------------------------
+
 
 OUString SdrTableObj::TakeObjNameSingul() const
 {
@@ -1724,14 +1724,14 @@ OUString SdrTableObj::TakeObjNameSingul() const
     return sName.makeStringAndClear();
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SdrTableObj::TakeObjNamePlural() const
 {
     return ImpGetResStr(STR_ObjNamePluralTable);
 }
 
-// --------------------------------------------------------------------
+
 
 SdrTableObj* SdrTableObj::Clone() const
 {
@@ -1764,55 +1764,55 @@ SdrTableObj& SdrTableObj::operator=(const SdrTableObj& rObj)
     return *this;
 }
 
-// --------------------------------------------------------------------
+
 
 basegfx::B2DPolyPolygon SdrTableObj::TakeXorPoly() const
 {
     return SdrTextObj::TakeXorPoly();
 }
 
-// --------------------------------------------------------------------
+
 
 basegfx::B2DPolyPolygon SdrTableObj::TakeContour() const
 {
     return SdrTextObj::TakeContour();
 }
 
-// --------------------------------------------------------------------
+
 
 const Rectangle& SdrTableObj::GetSnapRect() const
 {
     return aRect;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::NbcSetSnapRect(const Rectangle& rRect)
 {
     NbcSetLogicRect( rRect );
 }
 
-// --------------------------------------------------------------------
+
 
 const Rectangle& SdrTableObj::GetLogicRect() const
 {
     return maLogicRect;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::RecalcSnapRect()
 {
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt32 SdrTableObj::GetSnapPointCount() const
 {
     return SdrTextObj::GetSnapPointCount();
 }
 
-// --------------------------------------------------------------------
+
 
 
 Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const
@@ -1820,7 +1820,7 @@ Point SdrTableObj::GetSnapPoint(sal_uInt32 i) const
     return SdrTextObj::GetSnapPoint(i);
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
 {
@@ -1862,7 +1862,7 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
     return sal_True;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
 {
@@ -1909,7 +1909,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
     mbInEditMode = sal_False;
 }
 
-// --------------------------------------------------------------------
+
 
 OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const
 {
@@ -1920,7 +1920,7 @@ OutlinerParaObject* SdrTableObj::GetOutlinerParaObject() const
         return 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject)
 {
@@ -1942,7 +1942,7 @@ void SdrTableObj::NbcSetOutlinerParaObject( OutlinerParaObject* pTextObject)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect)
 {
@@ -1956,7 +1956,7 @@ void SdrTableObj::NbcSetLogicRect(const Rectangle& rRect)
 }
 
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnly = false */ )
 {
@@ -1965,7 +1965,7 @@ void SdrTableObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool /* bShrinkOnl
     SetLogicRect( aAdjustRect );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::NbcMove(const Size& rSiz)
 {
@@ -1975,7 +1975,7 @@ void SdrTableObj::NbcMove(const Size& rSiz)
         mpImpl->UpdateCells( aRect );
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
@@ -1987,7 +1987,7 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
     SetRectsDirty();
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
 {
@@ -2007,7 +2007,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt)
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const
 {
@@ -2028,14 +2028,14 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::NbcReformatText()
 {
     NbcAdjustTextFrameWidthAndHeight();
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::ReformatText()
 {
@@ -2048,7 +2048,7 @@ void SdrTableObj::ReformatText()
     SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
 }
 
-// --------------------------------------------------------------------
+
 
 sal_Bool SdrTableObj::IsVerticalWriting() const
 {
@@ -2056,7 +2056,7 @@ sal_Bool SdrTableObj::IsVerticalWriting() const
     return pModeItem && pModeItem->GetValue() == com::sun::star::text::WritingMode_TB_RL;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::SetVerticalWriting(sal_Bool bVertical )
 {
@@ -2067,7 +2067,7 @@ void SdrTableObj::SetVerticalWriting(sal_Bool bVertical )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 WritingMode SdrTableObj::GetWritingMode() const
 {
@@ -2094,7 +2094,7 @@ WritingMode SdrTableObj::GetWritingMode() const
     return eWritingMode;
 }
 
-// --------------------------------------------------------------------
+
 
 // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon
 // with the base geometry and returns TRUE. Otherwise it returns FALSE.
@@ -2103,7 +2103,7 @@ sal_Bool SdrTableObj::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx:
     return SdrTextObj::TRGetBaseGeometry( rMatrix, rPolyPolygon );
 }
 
-// --------------------------------------------------------------------
+
 
 // sets the base geometry of the object using infos contained in the homogen 3x3 matrix.
 // If it's an SdrPathObj it will use the provided geometry information. The Polygon has
@@ -2113,21 +2113,21 @@ void SdrTableObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const
     SdrTextObj::TRSetBaseGeometry( rMatrix, rPolyPolygon );
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::IsRealyEdited() const
 {
     return pEdtOutl && pEdtOutl->IsModified();
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::IsFontwork() const
 {
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt32 SdrTableObj::GetHdlCount() const
 {
@@ -2141,7 +2141,7 @@ sal_uInt32 SdrTableObj::GetHdlCount() const
     return nCount;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
 {
@@ -2238,7 +2238,7 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
         rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this);
 }
 
-// --------------------------------------------------------------------
+
 
 SdrHdl* SdrTableObj::GetHdl(sal_uInt32 nHdlNum) const
 {
@@ -2391,7 +2391,7 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Create
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::BegCreate(SdrDragStat& rStat)
 {
@@ -2403,7 +2403,7 @@ bool SdrTableObj::BegCreate(SdrDragStat& rStat)
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::MovCreate(SdrDragStat& rStat)
 {
@@ -2417,7 +2417,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat)
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
 {
@@ -2430,14 +2430,14 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/)
 {
 }
 
-// --------------------------------------------------------------------
+
 
 bool SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
 {
     return true;
 }
 
-// --------------------------------------------------------------------
+
 
 basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) const
 {
@@ -2451,28 +2451,28 @@ basegfx::B2DPolyPolygon SdrTableObj::TakeCreatePoly(const SdrDragStat& rDrag) co
     return aRetval;
 }
 
-// --------------------------------------------------------------------
+
 
 Pointer SdrTableObj::GetCreatePointer() const
 {
     return Pointer(POINTER_CROSS);
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::createCell( CellRef& xNewCell )
 {
     xNewCell = Cell::create( *this, 0 );
 }
 
-// --------------------------------------------------------------------
+
 
 SdrObjGeoData *SdrTableObj::NewGeoData() const
 {
     return new TableObjectGeoData;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::SaveGeoData(SdrObjGeoData& rGeo) const
 {
@@ -2482,7 +2482,7 @@ void SdrTableObj::SaveGeoData(SdrObjGeoData& rGeo) const
     ((TableObjectGeoData &) rGeo).maLogicRect = maLogicRect;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo)
 {
@@ -2497,7 +2497,7 @@ void SdrTableObj::RestGeoData(const SdrObjGeoData& rGeo)
     ActionChanged();
 }
 
-// --------------------------------------------------------------------
+
 
 SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd )
 {
@@ -2556,7 +2556,7 @@ SdrTableObj* SdrTableObj::CloneRange( const CellPos& rStart, const CellPos& rEnd
     return pNewTableObj;
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColumn )
 {
@@ -2567,7 +2567,7 @@ void SdrTableObj::DistributeColumns( sal_Int32 nFirstColumn, sal_Int32 nLastColu
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow )
 {
@@ -2578,7 +2578,7 @@ void SdrTableObj::DistributeRows( sal_Int32 nFirstRow, sal_Int32 nLastRow )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::SetChanged()
 {
@@ -2590,7 +2590,7 @@ void SdrTableObj::SetChanged()
     ::SdrTextObj::SetChanged();
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::uno_lock()
 {
@@ -2598,7 +2598,7 @@ void SdrTableObj::uno_lock()
         mpImpl->mxTable->lockBroadcasts();
 }
 
-// --------------------------------------------------------------------
+
 
 void SdrTableObj::uno_unlock()
 {
@@ -2606,7 +2606,7 @@ void SdrTableObj::uno_unlock()
         mpImpl->mxTable->unlockBroadcasts();
 }
 
-// --------------------------------------------------------------------
+
 
 
 
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index 5ab1030a7e96..c60dc3af72c1 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -25,7 +25,7 @@
 #include "svx/svdmodel.hxx"
 #include "svx/svdotable.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::beans;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
@@ -42,9 +42,9 @@ const sal_Int32 Property_OptimalWidth = 1;
 const sal_Int32 Property_IsVisible = 2;
 const sal_Int32 Property_IsStartOfNewPage = 3;
 
-// -----------------------------------------------------------------------------
+
 // TableRow
-// -----------------------------------------------------------------------------
+
 
 TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn )
 : TableColumnBase( getStaticPropertySetInfo() )
@@ -57,20 +57,20 @@ TableColumn::TableColumn( const TableModelRef& xTableModel, sal_Int32 nColumn )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableColumn::~TableColumn()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumn::dispose()
 {
     mxTableModel.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumn::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException)
 {
@@ -78,7 +78,7 @@ void TableColumn::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeE
         throw DisposedException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableColumn& TableColumn::operator=( const TableColumn& r )
 {
@@ -92,9 +92,9 @@ TableColumn& TableColumn::operator=( const TableColumn& r )
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 // XCellRange
-// -----------------------------------------------------------------------------
+
 
 Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -105,7 +105,7 @@ Reference< XCell > SAL_CALL TableColumn::getCellByPosition( sal_Int32 nColumn, s
     return mxTableModel->getCellByPosition( mnColumn, nRow );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -117,32 +117,32 @@ Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByPosition( sal_Int32
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL TableColumn::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException)
 {
     return Reference< XCellRange >();
 }
 
-// -----------------------------------------------------------------------------
+
 // XNamed
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL TableColumn::getName() throw (RuntimeException)
 {
     return maName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableColumn::setName( const OUString& aName ) throw (RuntimeException)
 {
     maName = aName;
 }
 
-// -----------------------------------------------------------------------------
+
 // XFastPropertySet
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException)
 {
@@ -227,7 +227,7 @@ void SAL_CALL TableColumn::setFastPropertyValue( sal_Int32 nHandle, const Any& a
     delete pUndo;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -241,7 +241,7 @@ Any SAL_CALL TableColumn::getFastPropertyValue( sal_Int32 nHandle ) throw (Unkno
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
 {
@@ -290,7 +290,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
     return xInfo;
 }
 
-// -----------------------------------------------------------------------------
+
 
 } }
 
diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx
index 0dc240f6c9c5..a564896e2d62 100644
--- a/svx/source/table/tablecolumns.cxx
+++ b/svx/source/table/tablecolumns.cxx
@@ -23,41 +23,41 @@
 #include "tablecolumns.hxx"
 #include "tablecolumn.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 // TableColumns
-// -----------------------------------------------------------------------------
+
 
 TableColumns::TableColumns( const TableModelRef& xTableModel )
 : mxTableModel( xTableModel )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableColumns::~TableColumns()
 {
     dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumns::dispose()
 {
     mxTableModel.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumns::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException)
 {
@@ -65,9 +65,9 @@ void TableColumns::throwIfDisposed() const throw (::com::sun::star::uno::Runtime
         throw DisposedException();
 }
 
-// -----------------------------------------------------------------------------
+
 // XTableRows
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException)
 {
@@ -75,7 +75,7 @@ void SAL_CALL TableColumns::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount )
     mxTableModel->insertColumns( nIndex, nCount );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException)
 {
@@ -83,9 +83,9 @@ void SAL_CALL TableColumns::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount )
     mxTableModel->removeColumns( nIndex, nCount );
 }
 
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException)
 {
@@ -93,7 +93,7 @@ sal_Int32 SAL_CALL TableColumns::getCount() throw (RuntimeException)
     return mxTableModel->getColumnCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
@@ -105,9 +105,9 @@ Any SAL_CALL TableColumns::getByIndex( sal_Int32 Index ) throw (IndexOutOfBounds
     return Any( Reference< XCellRange >( mxTableModel->getColumn( Index ).get() ) );
 }
 
-// -----------------------------------------------------------------------------
+
 // XElementAccess
-// -----------------------------------------------------------------------------
+
 
 Type SAL_CALL TableColumns::getElementType() throw (RuntimeException)
 {
@@ -116,7 +116,7 @@ Type SAL_CALL TableColumns::getElementType() throw (RuntimeException)
     return cppu::UnoType<XCellRange>::get();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException)
 {
@@ -125,7 +125,7 @@ sal_Bool SAL_CALL TableColumns::hasElements() throw (RuntimeException)
     return mxTableModel->getColumnCount() != 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 } }
 
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index f9a92b0bc8c8..431251cb8769 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -79,9 +79,9 @@ using namespace ::com::sun::star::style;
 
 namespace sdr { namespace table {
 
-// --------------------------------------------------------------------
+
 // class SvxTableControllerModifyListener
-// --------------------------------------------------------------------
+
 
 class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener >
 {
@@ -98,9 +98,9 @@ public:
     SvxTableController* mpController;
 };
 
-// --------------------------------------------------------------------
+
 // XModifyListener
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SvxTableControllerModifyListener::modified( const ::com::sun::star::lang::EventObject&  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -108,25 +108,25 @@ void SAL_CALL SvxTableControllerModifyListener::modified( const ::com::sun::star
         mpController->onTableModified();
 }
 
-// --------------------------------------------------------------------
+
 // XEventListener
-// --------------------------------------------------------------------
+
 
 void SAL_CALL SvxTableControllerModifyListener::disposing( const ::com::sun::star::lang::EventObject&  ) throw (::com::sun::star::uno::RuntimeException)
 {
     mpController = 0;
 }
 
-// --------------------------------------------------------------------
+
 // class SvxTableController
-// --------------------------------------------------------------------
+
 
 rtl::Reference< sdr::SelectionController > CreateTableController( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController )
 {
     return SvxTableController::create( pView, pObj, xRefController );
 }
 
-// --------------------------------------------------------------------
+
 
 rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEditView* pView, const SdrObject* pObj, const rtl::Reference< sdr::SelectionController >& xRefController )
 {
@@ -139,7 +139,7 @@ rtl::Reference< sdr::SelectionController > SvxTableController::create( SdrObjEdi
     return new SvxTableController( pView, pObj );
 }
 
-// --------------------------------------------------------------------
+
 
 SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject* pObj )
 : mbCellSelectionMode(false)
@@ -169,7 +169,7 @@ SvxTableController::SvxTableController( SdrObjEditView* pView, const SdrObject*
     }
 }
 
-// --------------------------------------------------------------------
+
 
 SvxTableController::~SvxTableController()
 {
@@ -189,7 +189,7 @@ SvxTableController::~SvxTableController()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 const sal_uInt16 ACTION_NONE = 0;
 const sal_uInt16 ACTION_GOTO_FIRST_CELL = 1;
@@ -244,9 +244,9 @@ bool SvxTableController::onKeyInput(const KeyEvent& rKEvt, Window* pWindow )
     return executeAction( nAction, ( rKEvt.GetKeyCode().IsShift() ) ? sal_True : sal_False, pWindow );
 }
 
-// --------------------------------------------------------------------
+
 // ::com::sun::star::awt::XMouseClickHandler:
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWindow )
 {
@@ -299,7 +299,7 @@ bool SvxTableController::onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin*/)
 {
@@ -314,7 +314,7 @@ bool SvxTableController::onMouseButtonUp(const MouseEvent& rMEvt, Window* /*pWin
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, Window* pWindow )
 {
@@ -352,7 +352,7 @@ bool SvxTableController::onMouseMove(const MouseEvent& rMEvt, Window* pWindow )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::onSelectionHasChanged()
 {
@@ -389,7 +389,7 @@ void SvxTableController::onSelectionHasChanged()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::GetState( SfxItemSet& rSet )
 {
@@ -489,7 +489,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
     delete pSet;
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
 {
@@ -621,7 +621,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::onDelete( sal_uInt16 nSId )
 {
@@ -680,7 +680,7 @@ void SvxTableController::onDelete( sal_uInt16 nSId )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::onSelect( sal_uInt16 nSId )
 {
@@ -715,7 +715,7 @@ void SvxTableController::onSelect( sal_uInt16 nSId )
     }
 }
 
-// --------------------------------------------------------------------
+
 void SvxTableController::onFormatTable( SfxRequest& rReq )
 {
     ::sdr::table::SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
@@ -769,7 +769,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::Execute( SfxRequest& rReq )
 {
@@ -1223,16 +1223,16 @@ bool SvxTableController::SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRe
     return false;
 }
 
-// --------------------------------------------------------------------
+
 // internals
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::checkTableObject()
 {
     return mxTableObj.is();
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, Window* /*pWindow*/ )
 {
@@ -1531,7 +1531,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, Window
     return nAction != ACTION_HANDLED_BY_VIEW;
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pWindow, sal_uInt16 nAction )
 {
@@ -1560,7 +1560,7 @@ void SvxTableController::gotoCell( const CellPos& rPos, bool bSelect, Window* pW
     }
 }
 
-// --------------------------------------------------------------------
+
 
 const CellPos& SvxTableController::getSelectionStart()
 {
@@ -1568,14 +1568,14 @@ const CellPos& SvxTableController::getSelectionStart()
     return maCursorFirstPos;
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::setSelectionStart( const CellPos& rPos )
 {
     maCursorFirstPos = rPos;
 }
 
-// --------------------------------------------------------------------
+
 
 const CellPos& SvxTableController::getSelectionEnd()
 {
@@ -1583,7 +1583,7 @@ const CellPos& SvxTableController::getSelectionEnd()
     return maCursorLastPos;
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow )
 {
@@ -1613,7 +1613,7 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s
 
 
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::checkCell( CellPos& rPos )
 {
@@ -1631,7 +1631,7 @@ void SvxTableController::checkCell( CellPos& rPos )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::findMergeOrigin( CellPos& rPos )
 {
@@ -1649,7 +1649,7 @@ void SvxTableController::findMergeOrigin( CellPos& rPos )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const awt::MouseEvent* pMouseEvent /*= 0*/, sal_uInt16 nAction /*= ACTION_NONE */ )
 {
@@ -1742,7 +1742,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::StopTextEdit()
 {
@@ -1759,7 +1759,7 @@ bool SvxTableController::StopTextEdit()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast )
 {
@@ -1843,7 +1843,7 @@ void SvxTableController::getSelectedCells( CellPos& rFirst, CellPos& rLast )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::StartSelection( const CellPos& rPos )
 {
@@ -1853,7 +1853,7 @@ void SvxTableController::StartSelection( const CellPos& rPos )
     mpView->MarkListHasChanged();
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos& rEnd )
 {
@@ -1863,7 +1863,7 @@ void SvxTableController::setSelectedCells( const CellPos& rStart, const CellPos&
     UpdateSelection( rEnd );
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::UpdateSelection( const CellPos& rPos )
 {
@@ -1871,14 +1871,14 @@ void SvxTableController::UpdateSelection( const CellPos& rPos )
     mpView->MarkListHasChanged();
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::clearSelection()
 {
     RemoveSelection();
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::selectAll()
 {
@@ -1892,7 +1892,7 @@ void SvxTableController::selectAll()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::RemoveSelection()
 {
@@ -1903,14 +1903,14 @@ void SvxTableController::RemoveSelection()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::onTableModified()
 {
     if( mnUpdateEvent == 0 )
         mnUpdateEvent = Application::PostUserEvent( LINK( this, SvxTableController, UpdateHdl ) );
 }
-// --------------------------------------------------------------------
+
 
 void SvxTableController::updateSelectionOverlay()
 {
@@ -1965,7 +1965,7 @@ void SvxTableController::updateSelectionOverlay()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::destroySelectionOverlay()
 {
@@ -1976,7 +1976,7 @@ void SvxTableController::destroySelectionOverlay()
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnlyHardAttr) const
 {
@@ -2018,7 +2018,7 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
     }
 }
 
-// --------------------------------------------------------------------
+
 
 const sal_uInt16 CELL_BEFORE = 0x0001;
 const sal_uInt16 CELL_LEFT   = 0x0002;
@@ -2030,7 +2030,7 @@ const sal_uInt16 CELL_TOP    = 0x0020;
 const sal_uInt16 CELL_BOTTOM = 0x0040;
 const sal_uInt16 CELL_LOWER  = 0x0080;
 
-// --------------------------------------------------------------------
+
 
 static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, sal_uInt16 nLine )
 {
@@ -2048,7 +2048,7 @@ static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine
     rNewFrame.SetLine( pNew, nLine );
 }
 
-// --------------------------------------------------------------------
+
 
 static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SvxBoxItem& rNewFrame )
 {
@@ -2106,7 +2106,7 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem,
     }
 }
 
-// --------------------------------------------------------------------
+
 
 static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Color& rColor )
 {
@@ -2119,7 +2119,7 @@ static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Col
     }
 }
 
-// --------------------------------------------------------------------
+
 
 static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* pLineColorItem, SvxBoxItem& rNewFrame )
 {
@@ -2138,7 +2138,7 @@ static void ImplApplyLineColorItem( sal_uInt16 nCellFlags, const SvxColorItem* p
         ImplSetLineColor( rNewFrame, BOX_LINE_LEFT, aColor );
 }
 
-// --------------------------------------------------------------------
+
 
 static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine* pBorderLineItem, SvxBoxItem& rNewFrame )
 {
@@ -2184,7 +2184,7 @@ static void ImplApplyBorderLineItem( sal_uInt16 nCellFlags, const SvxBorderLine*
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
 {
@@ -2273,7 +2273,7 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::UpdateTableShape()
 {
@@ -2287,7 +2287,7 @@ void SvxTableController::UpdateTableShape()
 }
 
 
-// --------------------------------------------------------------------
+
 
 void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bReplaceAll)
 {
@@ -2339,7 +2339,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const
 {
@@ -2369,7 +2369,7 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt
     }
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
 {
@@ -2381,7 +2381,7 @@ bool SvxTableController::SetAttributes(const SfxItemSet& rSet, bool bReplaceAll)
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage )
 {
@@ -2409,7 +2409,7 @@ bool SvxTableController::GetMarkedObjModel( SdrPage* pNewPage )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::PasteObjModel( const SdrModel& rModel )
 {
@@ -2429,7 +2429,7 @@ bool SvxTableController::PasteObjModel( const SdrModel& rModel )
     return false;
 }
 
-// --------------------------------------------------------------------
+
 
 bool SvxTableController::PasteObject( SdrTableObj* pPasteTableObj )
 {
@@ -2568,7 +2568,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
 }
 
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxTableController, UpdateHdl)
 {
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 00e857bf459d..d5a08f1e4f85 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -49,7 +49,7 @@
 
 #include <boost/bind.hpp>
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::style;
@@ -178,9 +178,9 @@ public:
     TableDesignStyleVector  maDesigns;
 };
 
-//------------------------------------------------------------------------
+
 // TableDesignStyle
-//------------------------------------------------------------------------
+
 
 TableDesignStyle::TableDesignStyle()
 : TableDesignStyleBase(m_aMutex)
@@ -253,38 +253,38 @@ sal_Bool SAL_CALL TableDesignStyle::isInUse() throw (RuntimeException)
     return sal_False;
 }
 
-// ----------------------------------------------------------
+
 
 OUString SAL_CALL TableDesignStyle::getParentStyle() throw (RuntimeException)
 {
     return OUString();
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::setParentStyle( const OUString& ) throw (NoSuchElementException, RuntimeException)
 {
 }
 
-// ----------------------------------------------------------
+
 // XNamed
-// ----------------------------------------------------------
+
 
 OUString SAL_CALL TableDesignStyle::getName() throw (RuntimeException)
 {
     return msName;
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::setName( const OUString& rName ) throw (RuntimeException)
 {
     msName = rName;
 }
 
-// ----------------------------------------------------------
+
 // XNameAccess
-// ----------------------------------------------------------
+
 
 Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -299,7 +299,7 @@ Any SAL_CALL TableDesignStyle::getByName( const OUString& rName ) throw(NoSuchEl
     return Any( maCellStyles[(*iter).second] );
 }
 
-// ----------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeException)
 {
@@ -316,7 +316,7 @@ Sequence< OUString > SAL_CALL TableDesignStyle::getElementNames() throw(RuntimeE
     return aRet;
 }
 
-// ----------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )  throw(RuntimeException)
 {
@@ -328,32 +328,32 @@ sal_Bool SAL_CALL TableDesignStyle::hasByName( const OUString& rName )  throw(Ru
     return ( iter != rMap.end() ) ? sal_True : sal_False;
 }
 
-// ----------------------------------------------------------
+
 // XElementAccess
-// ----------------------------------------------------------
+
 
 Type SAL_CALL TableDesignStyle::getElementType() throw(RuntimeException)
 {
     return cppu::UnoType<XStyle>::get();
 }
 
-// ----------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableDesignStyle::hasElements() throw(RuntimeException)
 {
     return sal_True;
 }
 
-// ----------------------------------------------------------
+
 // XIndexAccess
-// ----------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TableDesignStyle::getCount() throw(RuntimeException)
 {
     return style_count;
 }
 
-// ----------------------------------------------------------
+
 
 Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
@@ -365,9 +365,9 @@ Any SAL_CALL TableDesignStyle::getByIndex( sal_Int32 Index ) throw(IndexOutOfBou
     return Any( maCellStyles[Index] );
 }
 
-// ----------------------------------------------------------
+
 // XNameReplace
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -405,9 +405,9 @@ void SAL_CALL TableDesignStyle::replaceByName( const OUString& rName, const Any&
     }
 }
 
-// ----------------------------------------------------------
+
 // XComponent
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::disposing()
 {
@@ -415,9 +415,9 @@ void SAL_CALL TableDesignStyle::disposing()
         maCellStyles[nIndex].clear();
 }
 
-//------------------------------------------------------------------------
+
 // XModifyBroadcaster
-//------------------------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
@@ -434,14 +434,14 @@ void SAL_CALL TableDesignStyle::addModifyListener( const Reference< XModifyListe
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
     rBHelper.removeListener( cppu::UnoType<XModifyListener>::get(), xListener );
 }
 
-//------------------------------------------------------------------------
+
 
 void TableDesignStyle::notifyModifyListener()
 {
@@ -455,9 +455,9 @@ void TableDesignStyle::notifyModifyListener()
     }
 }
 
-//------------------------------------------------------------------------
+
 // XModifyListener
-//------------------------------------------------------------------------
+
 
 // if we get a modify hint from a style, notify all registered XModifyListener
 void SAL_CALL TableDesignStyle::modified( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
@@ -465,17 +465,17 @@ void SAL_CALL TableDesignStyle::modified( const ::com::sun::star::lang::EventObj
     notifyModifyListener();
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL TableDesignStyle::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------
+
 // TableStyle
-//------------------------------------------------------------------------
 
-// ----------------------------------------------------------
+
+
 // XServiceInfo
 OUString SAL_CALL TableDesignFamily::getImplementationName() throw(RuntimeException)
 {
@@ -520,7 +520,7 @@ Any SAL_CALL TableDesignFamily::getByName( const OUString& rName ) throw(NoSuchE
     throw NoSuchElementException();
 }
 
-// ----------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(RuntimeException)
 {
@@ -537,7 +537,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getElementNames() throw(Runtime
     return aRet;
 }
 
-// ----------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(RuntimeException)
 {
@@ -552,16 +552,16 @@ sal_Bool SAL_CALL TableDesignFamily::hasByName( const OUString& aName ) throw(Ru
     return sal_False;
 }
 
-// ----------------------------------------------------------
+
 // XElementAccess
-// ----------------------------------------------------------
+
 
 Type SAL_CALL TableDesignFamily::getElementType() throw(RuntimeException)
 {
     return cppu::UnoType<XStyle>::get();
 }
 
-// ----------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException)
 {
@@ -570,9 +570,9 @@ sal_Bool SAL_CALL TableDesignFamily::hasElements() throw(RuntimeException)
     return maDesigns.empty() ? sal_False : sal_True;
 }
 
-// ----------------------------------------------------------
+
 // XIndexAccess
-// ----------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException)
 {
@@ -581,7 +581,7 @@ sal_Int32 SAL_CALL TableDesignFamily::getCount() throw(RuntimeException)
     return sal::static_int_cast< sal_Int32 >( maDesigns.size() );
 }
 
-// ----------------------------------------------------------
+
 
 Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
@@ -593,9 +593,9 @@ Any SAL_CALL TableDesignFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBo
     throw IndexOutOfBoundsException();
 }
 
-// ----------------------------------------------------------
+
 // XNameContainer
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException)
 {
@@ -615,7 +615,7 @@ void SAL_CALL TableDesignFamily::insertByName( const OUString& rName, const Any&
     maDesigns.push_back( xStyle );
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -636,9 +636,9 @@ void SAL_CALL TableDesignFamily::removeByName( const OUString& rName ) throw(NoS
     throw NoSuchElementException();
 }
 
-// ----------------------------------------------------------
+
 // XNameReplace
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException)
 {
@@ -663,9 +663,9 @@ void SAL_CALL TableDesignFamily::replaceByName( const OUString& rName, const Any
     throw NoSuchElementException();
 }
 
-// ----------------------------------------------------------
+
 // XSingleServiceFactory
-// ----------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Exception, RuntimeException)
 {
@@ -674,16 +674,16 @@ Reference< XInterface > SAL_CALL TableDesignFamily::createInstance() throw(Excep
     return Reference< XInterface >( static_cast< XStyle* >( new TableDesignStyle ) );
 }
 
-// ----------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL TableDesignFamily::createInstanceWithArguments( const Sequence< Any >&  ) throw(Exception, RuntimeException)
 {
     return createInstance();
 }
 
-// ----------------------------------------------------------
+
 // XComponent
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignFamily::dispose(  ) throw (RuntimeException)
 {
@@ -698,21 +698,21 @@ void SAL_CALL TableDesignFamily::dispose(  ) throw (RuntimeException)
     }
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignFamily::addEventListener( const Reference< XEventListener >&  ) throw (RuntimeException)
 {
 }
 
-// ----------------------------------------------------------
+
 
 void SAL_CALL TableDesignFamily::removeEventListener( const Reference< XEventListener >&  ) throw (RuntimeException)
 {
 }
 
-// ----------------------------------------------------------
+
 // XPropertySet
-// ----------------------------------------------------------
+
 
 Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (RuntimeException)
 {
@@ -720,14 +720,14 @@ Reference<XPropertySetInfo> TableDesignFamily::getPropertySetInfo() throw (Runti
     return Reference<XPropertySetInfo>();
 }
 
-// ----------------------------------------------------------
+
 
 void TableDesignFamily::setPropertyValue( const OUString& , const Any&  ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -742,35 +742,35 @@ Any TableDesignFamily::getPropertyValue( const OUString& PropertyName ) throw (U
     }
 }
 
-// ----------------------------------------------------------
+
 
 void TableDesignFamily::addPropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 void TableDesignFamily::removePropertyChangeListener( const OUString& , const Reference<XPropertyChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 void TableDesignFamily::addVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>& ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// ----------------------------------------------------------
+
 
 void TableDesignFamily::removeVetoableChangeListener( const OUString& , const Reference<XVetoableChangeListener>&  ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     OSL_FAIL( "###unexpected!" );
 }
 
-// --------------------------------------------------------------------
+
 
 
 SVX_DLLPUBLIC Reference< XNameAccess > CreateTableDesignFamily()
diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx
index d6457e7becc0..72ad4ff0d357 100644
--- a/svx/source/table/tablehandles.cxx
+++ b/svx/source/table/tablehandles.cxx
@@ -40,7 +40,7 @@
 
 namespace sdr { namespace table {
 
-// --------------------------------------------------------------------
+
 
 class OverlayTableEdge : public sdr::overlay::OverlayObject
 {
@@ -56,7 +56,7 @@ public:
     virtual ~OverlayTableEdge();
 };
 
-// --------------------------------------------------------------------
+
 
 TableEdgeHdl::TableEdgeHdl( const Point& rPnt, bool bHorizontal, sal_Int32 nMin, sal_Int32 nMax, sal_Int32 nEdges )
 : SdrHdl( rPnt, HDL_USER )
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 55ed2d2247a8..d2ec7309792e 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -47,15 +47,15 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::text;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 
 static SvxBorderLine gEmptyBorder;
 
-// -----------------------------------------------------------------------------
+
 
 TableLayouter::TableLayouter( const TableModelRef& xTableModel )
 : mxTable( xTableModel )
@@ -63,14 +63,14 @@ TableLayouter::TableLayouter( const TableModelRef& xTableModel )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableLayouter::~TableLayouter()
 {
     ClearBorderLayout();
 }
 
-// -----------------------------------------------------------------------------
+
 
 basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos  ) const
 {
@@ -115,7 +115,7 @@ basegfx::B2ITuple TableLayouter::getCellSize( const CellPos& rPos  ) const
     return basegfx::B2ITuple( width, height );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rArea ) const
 {
@@ -153,7 +153,7 @@ bool TableLayouter::getCellArea( const CellPos& rPos, basegfx::B2IRectangle& rAr
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const
 {
     if( isValidRow(nRow) )
@@ -162,7 +162,7 @@ sal_Int32 TableLayouter::getRowHeight( sal_Int32 nRow ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const
 {
     if( isValidColumn(nColumn) )
@@ -171,7 +171,7 @@ sal_Int32 TableLayouter::getColumnWidth( sal_Int32 nColumn ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal ) const
 {
@@ -190,7 +190,7 @@ bool TableLayouter::isEdgeVisible( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHor
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** returns the requested borderline in rpBorderLine or a null pointer if there is no border at this edge */
 SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY, bool bHorizontal )const
@@ -214,7 +214,7 @@ SvxBorderLine* TableLayouter::getBorderLine( sal_Int32 nEdgeX, sal_Int32 nEdgeY,
     return pLine;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ )
 {
@@ -245,7 +245,7 @@ sal_Int32 TableLayouter::getHorizontalEdge( int nEdgeY, sal_Int32* pnMin /*= 0*/
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/, sal_Int32* pnMax /*= 0*/ )
 {
@@ -300,7 +300,7 @@ sal_Int32 TableLayouter::getVerticalEdge( int nEdgeX, sal_Int32* pnMin /*= 0*/,
     return nRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 static bool checkMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32 nMergedY, sal_Int32 nCellX, sal_Int32 nCellY, bool& bRunning )
 {
@@ -421,7 +421,7 @@ bool findMergeOrigin( const TableModelRef& xTable, sal_Int32 nMergedX, sal_Int32
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn )
 {
@@ -436,7 +436,7 @@ sal_Int32 TableLayouter::getMinimumColumnWidth( sal_Int32 nColumn )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribute )
 {
@@ -506,13 +506,13 @@ sal_Int32 TableLayouter::distribute( LayoutVector& rLayouts, sal_Int32 nDistribu
     return nSize;
 }
 
-// -----------------------------------------------------------------------------
+
 
 typedef std::vector< CellRef > MergeableCellVector;
 typedef std::vector< MergeableCellVector > MergeVector;
 typedef std::vector< sal_Int32 > Int32Vector;
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit )
 {
@@ -665,7 +665,7 @@ void TableLayouter::LayoutTableWidth( Rectangle& rArea, bool bFit )
     updateCells( rArea );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
 {
@@ -813,7 +813,7 @@ void TableLayouter::LayoutTableHeight( Rectangle& rArea, bool bFit )
     updateCells( rArea );
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** try to fit the table into the given rectangle.
     If the rectangle is to small, it will be grown to fit the table. */
@@ -846,7 +846,7 @@ void TableLayouter::LayoutTable( Rectangle& rRectangle, bool bFitWidth, bool bFi
     UpdateBorderLayout();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::updateCells( Rectangle& rRectangle )
 {
@@ -876,7 +876,7 @@ void TableLayouter::updateCells( Rectangle& rRectangle )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellRef TableLayouter::getCell( const CellPos& rPos ) const
 {
@@ -892,7 +892,7 @@ CellRef TableLayouter::getCell( const CellPos& rPos ) const
     return xCell;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther )
 {
@@ -928,7 +928,7 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal, const SvxBorderLine* pLine )
 {
@@ -951,7 +951,7 @@ void TableLayouter::SetBorder( sal_Int32 nCol, sal_Int32 nRow, bool bHorizontal,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::ClearBorderLayout()
 {
@@ -959,7 +959,7 @@ void TableLayouter::ClearBorderLayout()
     ClearBorderLayout(maVerticalBorders);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::ClearBorderLayout(BorderLineMap& rMap)
 {
@@ -982,7 +982,7 @@ void TableLayouter::ClearBorderLayout(BorderLineMap& rMap)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::ResizeBorderLayout()
 {
@@ -991,7 +991,7 @@ void TableLayouter::ResizeBorderLayout()
     ResizeBorderLayout(maVerticalBorders);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap )
 {
@@ -1008,7 +1008,7 @@ void TableLayouter::ResizeBorderLayout( BorderLineMap& rMap )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::UpdateBorderLayout()
 {
@@ -1051,7 +1051,7 @@ void TableLayouter::UpdateBorderLayout()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol, sal_Int32 nLastCol )
 {
@@ -1090,7 +1090,7 @@ void TableLayouter::DistributeColumns( ::Rectangle& rArea, sal_Int32 nFirstCol,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableLayouter::DistributeRows( ::Rectangle& rArea, sal_Int32 nFirstRow, sal_Int32 nLastRow )
 {
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 0bbb63d78131..65dbaa15973b 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -46,11 +46,11 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 
 // removes the given range from a vector
 template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount )
@@ -84,7 +84,7 @@ template< class Vec, class Iter > void remove_range( Vec& rVector, sal_Int32 nIn
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** inserts a range into a vector */
 template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVector, sal_Int32 nIndex, sal_Int32 nCount )
@@ -112,7 +112,7 @@ template< class Vec, class Iter, class Entry > sal_Int32 insert_range( Vec& rVec
     return nIndex;
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableModel::TableModel( SdrTableObj* pTableObj )
 : TableModelBase( m_aMutex  )
@@ -158,13 +158,13 @@ TableModel::TableModel( SdrTableObj* pTableObj, const TableModelRef& xSourceTabl
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableModel::~TableModel()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::init( sal_Int32 nColumns, sal_Int32 nRows )
 {
@@ -187,44 +187,44 @@ void TableModel::init( sal_Int32 nColumns, sal_Int32 nRows )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // ICellRange
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableModel::getLeft()
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableModel::getTop()
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableModel::getRight()
 {
     return getColumnCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableModel::getBottom()
 {
     return getRowCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XTable > TableModel::getTable()
 {
     return this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -236,7 +236,7 @@ void TableModel::UndoInsertRows( sal_Int32 nIndex, sal_Int32 nCount )
     setModified(sal_True);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows )
 {
@@ -253,7 +253,7 @@ void TableModel::UndoRemoveRows( sal_Int32 nIndex, RowVector& aRows )
     setModified(sal_True);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -269,7 +269,7 @@ void TableModel::UndoInsertColumns( sal_Int32 nIndex, sal_Int32 nCount )
     setModified(sal_True);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellVector& aCells )
 {
@@ -298,9 +298,9 @@ void TableModel::UndoRemoveColumns( sal_Int32 nIndex, ColumnVector& aCols, CellV
     setModified(sal_True);
 }
 
-// -----------------------------------------------------------------------------
+
 // XTable
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeException)
 {
@@ -308,7 +308,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursor() throw (RuntimeExcep
     return createCursorByRange( Reference< XCellRange >( this ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Reference< XCellRange >& rRange ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -322,7 +322,7 @@ Reference< XCellCursor > SAL_CALL TableModel::createCursorByRange( const Referen
     return new CellCursor( xModel, pRange->getLeft(), pRange->getTop(), pRange->getRight(), pRange->getBottom() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException)
 {
@@ -330,7 +330,7 @@ sal_Int32 SAL_CALL TableModel::getRowCount() throw (RuntimeException)
     return getRowCountImpl();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException)
 {
@@ -338,9 +338,9 @@ sal_Int32 SAL_CALL TableModel::getColumnCount() throw (RuntimeException)
     return getColumnCountImpl();
 }
 
-// -----------------------------------------------------------------------------
+
 // XComponent
-// -----------------------------------------------------------------------------
+
 
 void TableModel::dispose() throw (RuntimeException)
 {
@@ -348,23 +348,23 @@ void TableModel::dispose() throw (RuntimeException)
     TableModelBase::dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
 {
     TableModelBase::addEventListener( xListener );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
 {
     TableModelBase::removeEventListener( xListener );
 }
 
-// -----------------------------------------------------------------------------
+
 // XModifiable
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableModel::isModified(  ) throw (RuntimeException)
 {
@@ -372,7 +372,7 @@ sal_Bool SAL_CALL TableModel::isModified(  ) throw (RuntimeException)
     return mbModified;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoException, RuntimeException)
 {
@@ -384,25 +384,25 @@ void SAL_CALL TableModel::setModified( sal_Bool bModified ) throw (PropertyVetoE
         notifyModification();
 }
 
-// -----------------------------------------------------------------------------
+
 // XModifyBroadcaster
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::addModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
     rBHelper.addListener( cppu::UnoType<XModifyListener>::get() , xListener );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::removeModifyListener( const Reference< XModifyListener >& xListener ) throw (RuntimeException)
 {
     rBHelper.removeListener( cppu::UnoType<XModifyListener>::get() , xListener );
 }
 
-// -----------------------------------------------------------------------------
+
 // XColumnRowRange
-// -----------------------------------------------------------------------------
+
 
 Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeException)
 {
@@ -413,7 +413,7 @@ Reference< XTableColumns > SAL_CALL TableModel::getColumns() throw (RuntimeExcep
     return mxTableColumns.get();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException)
 {
@@ -424,9 +424,9 @@ Reference< XTableRows > SAL_CALL TableModel::getRows() throw (RuntimeException)
     return mxTableRows.get();
 }
 
-// -----------------------------------------------------------------------------
+
 // XCellRange
-// -----------------------------------------------------------------------------
+
 
 Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw ( IndexOutOfBoundsException, RuntimeException)
 {
@@ -439,7 +439,7 @@ Reference< XCell > SAL_CALL TableModel::getCellByPosition( sal_Int32 nColumn, sa
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -454,16 +454,16 @@ Reference< XCellRange > SAL_CALL TableModel::getCellRangeByPosition( sal_Int32 n
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL TableModel::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException)
 {
     return Reference< XCellRange >();
 }
 
-// -----------------------------------------------------------------------------
+
 // XPropertySet
-// -----------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo(  ) throw (RuntimeException)
 {
@@ -471,52 +471,52 @@ Reference< XPropertySetInfo > SAL_CALL TableModel::getPropertySetInfo(  ) throw
     return xInfo;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::setPropertyValue( const OUString& /*aPropertyName*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TableModel::getPropertyValue( const OUString& /*PropertyName*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     return Any();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::addPropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::removePropertyChangeListener( const OUString& /*aPropertyName*/, const Reference< XPropertyChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::addVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::removeVetoableChangeListener( const OUString& /*aPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 // XFastPropertySet
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableModel::setFastPropertyValue( ::sal_Int32 /*nHandle*/, const Any& /*aValue*/ ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -524,23 +524,23 @@ Any SAL_CALL TableModel::getFastPropertyValue( ::sal_Int32 /*nHandle*/ ) throw (
     return aAny;
 }
 
-// -----------------------------------------------------------------------------
+
 // internals
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableModel::getRowCountImpl() const
 {
     return static_cast< sal_Int32 >( maRows.size() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 TableModel::getColumnCountImpl() const
 {
     return static_cast< sal_Int32 >( maColumns.size() );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::disposing()
 {
@@ -575,16 +575,16 @@ void TableModel::disposing()
     mpTableObj = 0;
 }
 
-// -----------------------------------------------------------------------------
+
 // XBroadcaster
-// -----------------------------------------------------------------------------
+
 
 void TableModel::lockBroadcasts() throw (RuntimeException)
 {
     ::SolarMutexGuard aGuard;
     ++mnNotifyLock;
 }
-// -----------------------------------------------------------------------------
+
 
 void TableModel::unlockBroadcasts() throw (RuntimeException)
 {
@@ -598,7 +598,7 @@ void TableModel::unlockBroadcasts() throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------------
+
 void TableModel::notifyModification()
 {
     ::osl::MutexGuard guard( m_aMutex );
@@ -620,7 +620,7 @@ void TableModel::notifyModification()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const
 {
@@ -635,7 +635,7 @@ CellRef TableModel::getCell( sal_Int32 nCol, sal_Int32 nRow ) const
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 CellRef TableModel::createCell()
 {
@@ -645,7 +645,7 @@ CellRef TableModel::createCell()
     return xCell;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -726,7 +726,7 @@ void TableModel::insertColumns( sal_Int32 nIndex, sal_Int32 nCount )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -836,7 +836,7 @@ void TableModel::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -899,7 +899,7 @@ void TableModel::insertRows( sal_Int32 nIndex, sal_Int32 nCount )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -995,7 +995,7 @@ void TableModel::removeRows( sal_Int32 nIndex, sal_Int32 nCount )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsException)
 {
@@ -1005,7 +1005,7 @@ TableRowRef TableModel::getRow( sal_Int32 nRow ) const throw (IndexOutOfBoundsEx
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutOfBoundsException)
 {
@@ -1015,7 +1015,7 @@ TableColumnRef TableModel::getColumn( sal_Int32 nColumn ) const throw (IndexOutO
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 /** deletes rows and columns that are completely merged. Must be called between BegUndo/EndUndo! */
 void TableModel::optimize()
@@ -1106,7 +1106,7 @@ void TableModel::optimize()
         setModified(sal_True);
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_Int32 nRowSpan )
 {
@@ -1152,7 +1152,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::updateRows()
 {
@@ -1164,7 +1164,7 @@ void TableModel::updateRows()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableModel::updateColumns()
 {
@@ -1176,7 +1176,7 @@ void TableModel::updateColumns()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 } }
 
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index ab77a38b8997..c081ac13e020 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -26,7 +26,7 @@
 #include "svx/svdmodel.hxx"
 #include "svx/svdotable.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -34,7 +34,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 using namespace ::com::sun::star::beans;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
@@ -43,9 +43,9 @@ const sal_Int32 Property_OptimalHeight = 1;
 const sal_Int32 Property_IsVisible = 2;
 const sal_Int32 Property_IsStartOfNewPage = 3;
 
-// -----------------------------------------------------------------------------
+
 // TableRow
-// -----------------------------------------------------------------------------
+
 
 TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32 nColumns )
 : TableRowBase( getStaticPropertySetInfo() )
@@ -67,13 +67,13 @@ TableRow::TableRow( const TableModelRef& xTableModel, sal_Int32 nRow, sal_Int32
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableRow::~TableRow()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRow::dispose()
 {
@@ -87,7 +87,7 @@ void TableRow::dispose()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRow::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException)
 {
@@ -95,7 +95,7 @@ void TableRow::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeExce
         throw DisposedException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableRow& TableRow::operator=( const TableRow& r )
 {
@@ -109,7 +109,7 @@ TableRow& TableRow::operator=( const TableRow& r )
     return *this;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::iterator* pIter /* = 0 */  )
 {
@@ -129,7 +129,7 @@ void TableRow::insertColumns( sal_Int32 nIndex, sal_Int32 nCount, CellVector::it
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
 {
@@ -161,9 +161,9 @@ void TableRow::removeColumns( sal_Int32 nIndex, sal_Int32 nCount )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // XCellRange
-// -----------------------------------------------------------------------------
+
 
 Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -174,7 +174,7 @@ Reference< XCell > SAL_CALL TableRow::getCellByPosition( sal_Int32 nColumn, sal_
     return mxTableModel->getCellByPosition( nColumn, mnRow );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw (IndexOutOfBoundsException, RuntimeException)
 {
@@ -186,7 +186,7 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByPosition( sal_Int32 nLe
     throw IndexOutOfBoundsException();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /*aRange*/ ) throw (RuntimeException)
 {
@@ -194,25 +194,25 @@ Reference< XCellRange > SAL_CALL TableRow::getCellRangeByName( const OUString& /
     return Reference< XCellRange >();
 }
 
-// -----------------------------------------------------------------------------
+
 // XNamed
-// -----------------------------------------------------------------------------
+
 
 OUString SAL_CALL TableRow::getName() throw (RuntimeException)
 {
     return maName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableRow::setName( const OUString& aName ) throw (RuntimeException)
 {
     maName = aName;
 }
 
-// -----------------------------------------------------------------------------
+
 // XFastPropertySet
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, RuntimeException)
 {
@@ -301,7 +301,7 @@ void SAL_CALL TableRow::setFastPropertyValue( sal_Int32 nHandle, const Any& aVal
     delete pUndo;
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
@@ -315,7 +315,7 @@ Any SAL_CALL TableRow::getFastPropertyValue( sal_Int32 nHandle ) throw (UnknownP
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
 {
@@ -364,7 +364,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
     return xInfo;
 }
 
-// -----------------------------------------------------------------------------
+
 
 
 } }
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index 6bc90ed81f53..d1a5f802760a 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -24,41 +24,41 @@
 #include "tablerow.hxx"
 #include "tablerows.hxx"
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::table;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
-// -----------------------------------------------------------------------------
+
 // TableRows
-// -----------------------------------------------------------------------------
+
 
 TableRows::TableRows( const TableModelRef& xTableModel )
 : mxTableModel( xTableModel )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableRows::~TableRows()
 {
     dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRows::dispose()
 {
     mxTableModel.clear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRows::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeException)
 {
@@ -66,9 +66,9 @@ void TableRows::throwIfDisposed() const throw (::com::sun::star::uno::RuntimeExc
         throw DisposedException();
 }
 
-// -----------------------------------------------------------------------------
+
 // XTableRows
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException)
 {
@@ -76,7 +76,7 @@ void SAL_CALL TableRows::insertByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr
     mxTableModel->insertRows( nIndex, nCount );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) throw (RuntimeException)
 {
@@ -84,9 +84,9 @@ void SAL_CALL TableRows::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) thr
     mxTableModel->removeRows( nIndex, nCount );
 }
 
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
-// -----------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException)
 {
@@ -94,7 +94,7 @@ sal_Int32 SAL_CALL TableRows::getCount() throw (RuntimeException)
     return mxTableModel->getRowCount();
 }
 
-// -----------------------------------------------------------------------------
+
 
 Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsException, WrappedTargetException, RuntimeException)
 {
@@ -102,9 +102,9 @@ Any SAL_CALL TableRows::getByIndex( sal_Int32 Index ) throw (IndexOutOfBoundsExc
     return Any( Reference< XCellRange >( static_cast< XCellRange* >( mxTableModel->getRow( Index ).get() ) ) );
 }
 
-// -----------------------------------------------------------------------------
+
 // XElementAccess
-// -----------------------------------------------------------------------------
+
 
 Type SAL_CALL TableRows::getElementType() throw (RuntimeException)
 {
@@ -112,7 +112,7 @@ Type SAL_CALL TableRows::getElementType() throw (RuntimeException)
     return cppu::UnoType<XCellRange>::get();
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException)
 {
@@ -120,7 +120,7 @@ sal_Bool SAL_CALL TableRows::hasElements() throw (RuntimeException)
     return mxTableModel->getRowCount() != 0;
 }
 
-// -----------------------------------------------------------------------------
+
 
 } }
 
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index aee0012abef3..d4d5d48e2b4e 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -28,12 +28,12 @@
 #include "tablecolumn.hxx"
 
 
-// -----------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::table;
 
-// -----------------------------------------------------------------------------
+
 
 namespace sdr { namespace table {
 
@@ -156,9 +156,9 @@ void CellUndo::getDataFromCell( Data& rData )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // class InsertRowUndo : public SdrUndoAction
-// -----------------------------------------------------------------------------
+
 
 static void Dispose( RowVector& rRows )
 {
@@ -167,7 +167,7 @@ static void Dispose( RowVector& rRows )
         (*aIter++)->dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, RowVector& aNewRows )
     : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() )
@@ -178,7 +178,7 @@ InsertRowUndo::InsertRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row
     maRows.swap( aNewRows );
 }
 
-// -----------------------------------------------------------------------------
+
 
 InsertRowUndo::~InsertRowUndo()
 {
@@ -186,7 +186,7 @@ InsertRowUndo::~InsertRowUndo()
         Dispose( maRows );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void InsertRowUndo::Undo()
 {
@@ -197,7 +197,7 @@ void InsertRowUndo::Undo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void InsertRowUndo::Redo()
 {
@@ -208,9 +208,9 @@ void InsertRowUndo::Redo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // class RemoveRowUndo : public SdrUndoAction
-// -----------------------------------------------------------------------------
+
 
 RemoveRowUndo::RemoveRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, RowVector& aRemovedRows )
     : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() )
@@ -221,7 +221,7 @@ RemoveRowUndo::RemoveRowUndo( const TableModelRef& xTable, sal_Int32 nIndex, Row
     maRows.swap( aRemovedRows );
 }
 
-// -----------------------------------------------------------------------------
+
 
 RemoveRowUndo::~RemoveRowUndo()
 {
@@ -229,7 +229,7 @@ RemoveRowUndo::~RemoveRowUndo()
         Dispose( maRows );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void RemoveRowUndo::Undo()
 {
@@ -240,7 +240,7 @@ void RemoveRowUndo::Undo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void RemoveRowUndo::Redo()
 {
@@ -251,9 +251,9 @@ void RemoveRowUndo::Redo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // class InsertColUndo : public SdrUndoAction
-// -----------------------------------------------------------------------------
+
 
 static void Dispose( ColumnVector& rCols )
 {
@@ -262,7 +262,7 @@ static void Dispose( ColumnVector& rCols )
         (*aIter++)->dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 static void Dispose( CellVector& rCells )
 {
@@ -271,7 +271,7 @@ static void Dispose( CellVector& rCells )
         (*aIter++)->dispose();
 }
 
-// -----------------------------------------------------------------------------
+
 
 InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, ColumnVector& aNewCols, CellVector& aCells  )
     : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() )
@@ -283,7 +283,7 @@ InsertColUndo::InsertColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col
     maCells.swap( aCells );
 }
 
-// -----------------------------------------------------------------------------
+
 
 InsertColUndo::~InsertColUndo()
 {
@@ -294,7 +294,7 @@ InsertColUndo::~InsertColUndo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void InsertColUndo::Undo()
 {
@@ -305,7 +305,7 @@ void InsertColUndo::Undo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void InsertColUndo::Redo()
 {
@@ -316,9 +316,9 @@ void InsertColUndo::Redo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // class RemoveColUndo : public SdrUndoAction
-// -----------------------------------------------------------------------------
+
 
 RemoveColUndo::RemoveColUndo( const TableModelRef& xTable, sal_Int32 nIndex, ColumnVector& aNewCols, CellVector& aCells )
     : SdrUndoAction( *xTable->getSdrTableObj()->GetModel() )
@@ -330,7 +330,7 @@ RemoveColUndo::RemoveColUndo( const TableModelRef& xTable, sal_Int32 nIndex, Col
     maCells.swap( aCells );
 }
 
-// -----------------------------------------------------------------------------
+
 
 RemoveColUndo::~RemoveColUndo()
 {
@@ -341,7 +341,7 @@ RemoveColUndo::~RemoveColUndo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void RemoveColUndo::Undo()
 {
@@ -352,7 +352,7 @@ void RemoveColUndo::Undo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void RemoveColUndo::Redo()
 {
@@ -363,9 +363,9 @@ void RemoveColUndo::Redo()
     }
 }
 
-// -----------------------------------------------------------------------------
+
 // class TableColumnUndo : public SdrUndoAction
-// -----------------------------------------------------------------------------
+
 
 TableColumnUndo::TableColumnUndo( const TableColumnRef& xCol )
     : SdrUndoAction( *xCol->mxTableModel->getSdrTableObj()->GetModel() )
@@ -375,13 +375,13 @@ TableColumnUndo::TableColumnUndo( const TableColumnRef& xCol )
     getData( maUndoData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableColumnUndo::~TableColumnUndo()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumnUndo::Undo()
 {
@@ -393,14 +393,14 @@ void TableColumnUndo::Undo()
     setData( maUndoData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumnUndo::Redo()
 {
     setData( maRedoData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool TableColumnUndo::Merge( SfxUndoAction *pNextAction )
 {
@@ -408,7 +408,7 @@ bool TableColumnUndo::Merge( SfxUndoAction *pNextAction )
     return pNext && pNext->mxCol == mxCol;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumnUndo::setData( const Data& rData )
 {
@@ -420,7 +420,7 @@ void TableColumnUndo::setData( const Data& rData )
     mxCol->maName = rData.maName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableColumnUndo::getData( Data& rData )
 {
@@ -432,9 +432,9 @@ void TableColumnUndo::getData( Data& rData )
     rData.maName = mxCol->maName;
 }
 
-// -----------------------------------------------------------------------------
+
 // class TableRowUndo : public SdrUndoAction
-// -----------------------------------------------------------------------------
+
 
 TableRowUndo::TableRowUndo( const TableRowRef& xRow )
     : SdrUndoAction( *xRow->mxTableModel->getSdrTableObj()->GetModel() )
@@ -444,13 +444,13 @@ TableRowUndo::TableRowUndo( const TableRowRef& xRow )
     getData( maUndoData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableRowUndo::~TableRowUndo()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRowUndo::Undo()
 {
@@ -462,14 +462,14 @@ void TableRowUndo::Undo()
     setData( maUndoData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRowUndo::Redo()
 {
     setData( maRedoData );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool TableRowUndo::Merge( SfxUndoAction *pNextAction )
 {
@@ -477,7 +477,7 @@ bool TableRowUndo::Merge( SfxUndoAction *pNextAction )
     return pNext && pNext->mxRow == mxRow;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRowUndo::setData( const Data& rData )
 {
@@ -489,7 +489,7 @@ void TableRowUndo::setData( const Data& rData )
     mxRow->maName = rData.maName;
  }
 
-// -----------------------------------------------------------------------------
+
 
 void TableRowUndo::getData( Data& rData )
 {
@@ -501,7 +501,7 @@ void TableRowUndo::getData( Data& rData )
     rData.maName = mxRow->maName;
 }
 
-// -----------------------------------------------------------------------------
+
 
 TableStyleUndo::TableStyleUndo( const SdrTableObj& rTableObj )
     : SdrUndoAction( *rTableObj.GetModel() )
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index cce884f49765..a8946a934337 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -36,9 +36,9 @@
 #include "svx/xexch.hxx"
 #include <vcl/svapp.hxx>
 
-// ------------------------
+
 // - SvxColorValueSetData -
-// ------------------------
+
 
 class SvxColorValueSetData : public TransferableHelper
 {
@@ -58,14 +58,14 @@ public:
                                 maData( rSetItem ) {}
 };
 
-// -----------------------------------------------------------------------------
+
 
 void SvxColorValueSetData::AddSupportedFormats()
 {
     AddFormat( SOT_FORMATSTR_ID_XFA );
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor )
 {
@@ -80,7 +80,7 @@ sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::Da
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor&  )
 {
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index ae35c5c306b7..eb49b9e77f62 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -131,7 +131,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled )
 {
@@ -156,7 +156,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
     enableEntry( 2, bEnabled );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bEnabled )
 {
@@ -166,7 +166,7 @@ void ExtrusionDirectionWindow::implSetProjection( sal_Int32 nProjection, bool bE
     enableEntry( 1, bEnabled );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL ExtrusionDirectionWindow::statusChanged(
     const ::com::sun::star::frame::FeatureStateEvent& Event
@@ -200,7 +200,7 @@ void SAL_CALL ExtrusionDirectionWindow::statusChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ExtrusionDirectionWindow, SelectHdl, void *, pControl )
 {
@@ -246,23 +246,23 @@ ExtrusionDirectionControl::ExtrusionDirectionControl(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::Window* ExtrusionDirectionControl::createPopupWindow( ::Window* pParent )
 {
     return new ExtrusionDirectionWindow( *this, m_xFrame, pParent );
 }
 
-// -----------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionDirectionControl_getImplementationName()
 {
     return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -271,7 +271,7 @@ Sequence< OUString > SAL_CALL ExtrusionDirectionControl_getSupportedServiceNames
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstance(
     const Reference< XMultiServiceFactory >& rSMgr
@@ -280,14 +280,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDirectionControl_createInstan
     return *new ExtrusionDirectionControl( comphelper::getComponentContext(rSMgr) );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionDirectionControl::getImplementationName(  ) throw (RuntimeException)
 {
     return ExtrusionDirectionControl_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionDirectionControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
@@ -352,7 +352,7 @@ ExtrusionDepthWindow::ExtrusionDepthWindow(
     AddStatusListener( msMetricUnit );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionDepthWindow::implSetDepth( double fDepth )
 {
@@ -371,7 +371,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
 {
@@ -385,7 +385,7 @@ void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
     };
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL ExtrusionDepthWindow::statusChanged(
     const ::com::sun::star::frame::FeatureStateEvent& Event
@@ -419,7 +419,7 @@ void SAL_CALL ExtrusionDepthWindow::statusChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -437,7 +437,7 @@ void ExtrusionDepthWindow::DataChanged( const DataChangedEvent& rDCEvt )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl)
 {
@@ -500,7 +500,7 @@ ExtrusionDepthController::ExtrusionDepthController(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::Window* ExtrusionDepthController::createPopupWindow( ::Window* pParent )
 {
@@ -508,16 +508,16 @@ ExtrusionDepthController::ExtrusionDepthController(
 }
 
 
-// -----------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionDepthController_getImplementationName()
 {
     return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -526,21 +526,21 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedServiceNames(
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionDepthController_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
     return *new ExtrusionDepthController( comphelper::getComponentContext(rSMgr) );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionDepthController::getImplementationName(  ) throw (RuntimeException)
 {
     return ExtrusionDepthController_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames(  ) throw (RuntimeException)
 {
@@ -550,7 +550,7 @@ Sequence< OUString > SAL_CALL ExtrusionDepthController::getSupportedServiceNames
 
 // ####################################################################
 
-// -------------------------------------------------------------------------
+
 
 ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rController, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow )
 : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_EXTRUSION_LIGHTING ))
@@ -613,7 +613,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
     AddStatusListener( msExtrusionLightingIntensity );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
 {
@@ -627,7 +627,7 @@ void ExtrusionLightingWindow::implSetIntensity( int nLevel, bool bEnabled )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
 {
@@ -656,7 +656,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
     enableEntry( 3, bEnabled );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL ExtrusionLightingWindow::statusChanged(
     const ::com::sun::star::frame::FeatureStateEvent& Event
@@ -690,7 +690,7 @@ void SAL_CALL ExtrusionLightingWindow::statusChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -705,7 +705,7 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ExtrusionLightingWindow, SelectHdl, void *, pControl )
 {
@@ -762,23 +762,23 @@ ExtrusionLightingControl::ExtrusionLightingControl(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::Window* ExtrusionLightingControl::createPopupWindow( ::Window* pParent )
 {
     return new ExtrusionLightingWindow( *this, m_xFrame, pParent );
 }
 
-// -----------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionLightingControl_getImplementationName()
 {
     return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -787,7 +787,7 @@ Sequence< OUString > SAL_CALL ExtrusionLightingControl_getSupportedServiceNames(
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstance(
     const Reference< XMultiServiceFactory >& rSMgr
@@ -796,14 +796,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionLightingControl_createInstanc
     return *new ExtrusionLightingControl( comphelper::getComponentContext(rSMgr) );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionLightingControl::getImplementationName(  ) throw (RuntimeException)
 {
     return ExtrusionLightingControl_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionLightingControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
@@ -839,7 +839,7 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(
     AddStatusListener( msExtrusionSurface );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled )
 {
@@ -851,7 +851,7 @@ void ExtrusionSurfaceWindow::implSetSurface( int nSurface, bool bEnabled )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL ExtrusionSurfaceWindow::statusChanged(
     const ::com::sun::star::frame::FeatureStateEvent& Event
@@ -872,7 +872,7 @@ void SAL_CALL ExtrusionSurfaceWindow::statusChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl)
 {
@@ -907,23 +907,23 @@ ExtrusionSurfaceControl::ExtrusionSurfaceControl(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::Window* ExtrusionSurfaceControl::createPopupWindow( ::Window* pParent )
 {
     return new ExtrusionSurfaceWindow( *this, m_xFrame, pParent );
 }
 
-// -----------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionSurfaceControl_getImplementationName()
 {
     return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -932,7 +932,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl_getSupportedServiceNames()
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance(
     const Reference< XMultiServiceFactory >& rSMgr
@@ -941,14 +941,14 @@ Reference< XInterface > SAL_CALL SAL_CALL ExtrusionSurfaceControl_createInstance
     return *new ExtrusionSurfaceControl( comphelper::getComponentContext(rSMgr) );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL ExtrusionSurfaceControl::getImplementationName(  ) throw (RuntimeException)
 {
     return ExtrusionSurfaceControl_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
@@ -968,21 +968,21 @@ ExtrusionColorControl::ExtrusionColorControl(
     mpBtnUpdater = new ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() );
 }
 
-// -----------------------------------------------------------------------
+
 
 ExtrusionColorControl::~ExtrusionColorControl()
 {
     delete mpBtnUpdater;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType ExtrusionColorControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
 {
@@ -999,7 +999,7 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
     return pColorWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 92f095e75d2b..c99830464191 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -516,7 +516,7 @@ FillControl::FillControl( Window* pParent, WinBits nStyle ) :
     aDelayTimer.Start();
 }
 
-//------------------------------------------------------------------------
+
 
 FillControl::~FillControl()
 {
@@ -524,7 +524,7 @@ FillControl::~FillControl()
     delete pLbFillAttr;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl)
 {
@@ -535,7 +535,7 @@ IMPL_LINK_NOARG_INLINE_START(FillControl, DelayHdl)
 }
 IMPL_LINK_INLINE_END( FillControl, DelayHdl, Timer *, pTimer )
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox )
 {
@@ -641,7 +641,7 @@ IMPL_LINK( FillControl, SelectFillTypeHdl, ListBox *, pBox )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
 {
@@ -772,7 +772,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
     return 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void FillControl::Resize()
 {
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index ea0d92491451..c1c6365c3546 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -98,12 +98,12 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent
     fillFavorites( GALLERY_THEME_FONTWORK );
 }
 
-// -----------------------------------------------------------------------
+
 FontWorkGalleryDialog::~FontWorkGalleryDialog()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
 {
@@ -243,7 +243,7 @@ void FontWorkGalleryDialog::insertSelectedFontwork()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl)
 {
@@ -252,7 +252,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl)
 {
@@ -261,7 +261,7 @@ IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl)
     return( 0L );
 }
 
-//------------------------------------------------------------------------
+
 
 SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem );
 FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
@@ -271,20 +271,20 @@ FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt
     rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 FontWorkShapeTypeControl::~FontWorkShapeTypeControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType FontWorkShapeTypeControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK; //( aLastAction.getLength() == 0 ? SFX_POPUPWINDOW_ONCLICK : SFX_POPUPWINDOW_ONTIMEOUT );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
 {
@@ -293,7 +293,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontWorkShapeTypeControl::Select( sal_Bool )
 {
@@ -354,7 +354,7 @@ FontworkAlignmentWindow::FontworkAlignmentWindow( svt::ToolboxController& rContr
     AddStatusListener( msFontworkAlignment );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
 {
@@ -366,7 +366,7 @@ void FontworkAlignmentWindow::implSetAlignment( int nSurface, bool bEnabled )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateEvent& Event ) throw ( RuntimeException )
 {
@@ -385,7 +385,7 @@ void SAL_CALL FontworkAlignmentWindow::statusChanged( const frame::FeatureStateE
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -401,7 +401,7 @@ void FontworkAlignmentWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl)
 {
@@ -442,30 +442,30 @@ public:
 };
 
 
-// -----------------------------------------------------------------------
+
 
 FontworkAlignmentControl::FontworkAlignmentControl( const Reference< XComponentContext >& rxContext )
 : svt::PopupWindowController( rxContext, Reference< frame::XFrame >(), OUString( ".uno:FontworkAlignment" ) )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::Window* FontworkAlignmentControl::createPopupWindow( ::Window* pParent )
 {
     return new FontworkAlignmentWindow( *this, m_xFrame, pParent );
 }
 
-// -----------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------
+
 
 OUString SAL_CALL FontworkAlignmentControl_getImplementationName()
 {
     return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -474,21 +474,21 @@ Sequence< OUString > SAL_CALL FontworkAlignmentControl_getSupportedServiceNames(
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SAL_CALL FontworkAlignmentControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
     return *new FontworkAlignmentControl( comphelper::getComponentContext(rSMgr) );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL FontworkAlignmentControl::getImplementationName(  ) throw (RuntimeException)
 {
     return FontworkAlignmentControl_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL FontworkAlignmentControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
@@ -517,7 +517,7 @@ private:
 
 };
 
-// -----------------------------------------------------------------------
+
 
 FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxController& rController, const Reference< XFrame >& rFrame, Window* pParentWindow )
 : ToolbarMenu( rFrame, pParentWindow, SVX_RES( RID_SVXFLOAT_FONTWORK_CHARSPACING ))
@@ -545,7 +545,7 @@ FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow( svt::ToolboxCont
     AddStatusListener( msFontworkKernCharacterPairs );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled )
 {
@@ -571,7 +571,7 @@ void FontworkCharacterSpacingWindow::implSetCharacterSpacing( sal_Int32 nCharact
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool bEnabled )
 {
@@ -579,7 +579,7 @@ void FontworkCharacterSpacingWindow::implSetKernCharacterPairs( sal_Bool, bool b
     checkEntry( 6, bEnabled );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException )
 {
@@ -611,7 +611,7 @@ void SAL_CALL FontworkCharacterSpacingWindow::statusChanged( const ::com::sun::s
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl)
 {
@@ -685,23 +685,23 @@ FontworkCharacterSpacingControl::FontworkCharacterSpacingControl( const Referenc
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ::Window* FontworkCharacterSpacingControl::createPopupWindow( ::Window* pParent )
 {
     return new FontworkCharacterSpacingWindow( *this, m_xFrame, pParent );
 }
 
-// -----------------------------------------------------------------------
+
 // XServiceInfo
-// -----------------------------------------------------------------------
+
 
 OUString SAL_CALL FontworkCharacterSpacingControl_getImplementationName()
 {
     return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" );
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServiceNames() throw( RuntimeException )
 {
@@ -710,21 +710,21 @@ Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl_getSupportedServic
     return aSNS;
 }
 
-// --------------------------------------------------------------------
+
 
 Reference< XInterface > SAL_CALL SAL_CALL FontworkCharacterSpacingControl_createInstance( const Reference< XMultiServiceFactory >& rSMgr ) throw( RuntimeException )
 {
     return *new FontworkCharacterSpacingControl( comphelper::getComponentContext(rSMgr) );
 }
 
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL FontworkCharacterSpacingControl::getImplementationName(  ) throw (RuntimeException)
 {
     return FontworkCharacterSpacingControl_getImplementationName();
 }
 
-// --------------------------------------------------------------------
+
 
 Sequence< OUString > SAL_CALL FontworkCharacterSpacingControl::getSupportedServiceNames(  ) throw (RuntimeException)
 {
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 0af1446b99d3..2f87062297c8 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -51,14 +51,14 @@ FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlot
     m_aDoubleClickTimer.SetTimeout(nDblClkTime);
 }
 
-// -----------------------------------------------------------------------
+
 
 FormatPaintBrushToolBoxControl::~FormatPaintBrushToolBoxControl()
 {
     m_aDoubleClickTimer.Stop();
 }
 
-// -----------------------------------------------------------------------
+
 void FormatPaintBrushToolBoxControl::impl_executePaintBrush()
 {
     Sequence< PropertyValue > aArgs( 1 );
@@ -68,7 +68,7 @@ void FormatPaintBrushToolBoxControl::impl_executePaintBrush()
         , aArgs );
 }
 
-// -----------------------------------------------------------------------
+
 void FormatPaintBrushToolBoxControl::DoubleClick()
 {
     m_aDoubleClickTimer.Stop();
@@ -77,14 +77,14 @@ void FormatPaintBrushToolBoxControl::DoubleClick()
     this->impl_executePaintBrush();
 }
 
-// -----------------------------------------------------------------------
+
 void FormatPaintBrushToolBoxControl::Click()
 {
     m_bPersistentCopy = false;
     m_aDoubleClickTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl)
 {
     //there was no second click during waiting
@@ -92,12 +92,12 @@ IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 void FormatPaintBrushToolBoxControl::Select( sal_Bool )
 {
 }
 
-// -----------------------------------------------------------------------
+
 void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                 const SfxPoolItem* pState )
 {
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 01b221c05155..9591a1c9ae94 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -73,13 +73,13 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB
     aDelayTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineBox::~SvxLineBox()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl)
 {
@@ -91,7 +91,7 @@ IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineBox::Select()
 {
@@ -156,7 +156,7 @@ void SvxLineBox::Select()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -185,7 +185,7 @@ bool SvxLineBox::PreNotify( NotifyEvent& rNEvt )
     return LineLB::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineBox::Notify( NotifyEvent& rNEvt )
 {
@@ -212,7 +212,7 @@ bool SvxLineBox::Notify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineBox::ReleaseFocus_Impl()
 {
@@ -288,13 +288,13 @@ SvxColorBox::SvxColorBox(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorBox::~SvxColorBox()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorBox::Update( const XLineColorItem* pItem )
 {
@@ -335,7 +335,7 @@ void SvxColorBox::Update( const XLineColorItem* pItem )
         SetNoSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorBox::Select()
 {
@@ -361,7 +361,7 @@ void SvxColorBox::Select()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxColorBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -391,7 +391,7 @@ bool SvxColorBox::PreNotify( NotifyEvent& rNEvt )
     return ColorLB::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxColorBox::Notify( NotifyEvent& rNEvt )
 {
@@ -430,7 +430,7 @@ void SvxColorBox::DataChanged( const DataChangedEvent& rDCEvt )
 
     ColorLB::DataChanged( rDCEvt );
 }
-// -----------------------------------------------------------------------
+
 
 void SvxColorBox::ReleaseFocus_Impl()
 {
@@ -477,13 +477,13 @@ SvxMetricField::SvxMetricField(
     Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxMetricField::~SvxMetricField()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::Update( const XLineWidthItem* pItem )
 {
@@ -496,7 +496,7 @@ void SvxMetricField::Update( const XLineWidthItem* pItem )
         SetText( "" );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::Modify()
 {
@@ -514,7 +514,7 @@ void SvxMetricField::Modify()
                                  aArgs );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::ReleaseFocus_Impl()
 {
@@ -526,7 +526,7 @@ void SvxMetricField::ReleaseFocus_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::Down()
 {
@@ -538,21 +538,21 @@ void SvxMetricField::Down()
         MetricField::Down();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::Up()
 {
     MetricField::Up();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::SetCoreUnit( SfxMapUnit eUnit )
 {
     ePoolUnit = eUnit;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxMetricField::RefreshDlgUnit()
 {
@@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxMetricField::PreNotify( NotifyEvent& rNEvt )
 {
@@ -576,7 +576,7 @@ bool SvxMetricField::PreNotify( NotifyEvent& rNEvt )
     return MetricField::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxMetricField::Notify( NotifyEvent& rNEvt )
 {
@@ -650,13 +650,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillTypeBox(Window *pPar
     return new SvxFillTypeBox(pParent);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFillTypeBox::~SvxFillTypeBox()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -677,7 +677,7 @@ bool SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
     return FillTypeLB::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
 {
@@ -708,7 +708,7 @@ bool SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFillTypeBox::ReleaseFocus_Impl()
 {
@@ -743,13 +743,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxFillAttrBox(Window *pPar
     return new SvxFillAttrBox(pParent);
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFillAttrBox::~SvxFillAttrBox()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -761,7 +761,7 @@ bool SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
     return FillAttrLB::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
 {
@@ -792,14 +792,14 @@ bool SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
     return nHandled;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFillAttrBox::Select()
 {
     FillAttrLB::Select();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFillAttrBox::ReleaseFocus_Impl()
 {
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 07898e1023f5..1d5aa7688f54 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -98,7 +98,7 @@ private:
 const long TableWindow::TABLE_CELLS_HORIZ = 10;
 const long TableWindow::TABLE_CELLS_VERT = 15;
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TableWindow, SelectHdl)
 {
@@ -106,7 +106,7 @@ IMPL_LINK_NOARG(TableWindow, SelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUString& rText,
                           ToolBox& rParentTbx, const Reference< XFrame >& rFrame )
@@ -154,20 +154,20 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri
     SetOutputSizePixel( Size( mnTableWidth + 3, mnTableHeight + 33 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 TableWindow::~TableWindow()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* TableWindow::Clone() const
 {
     return new TableWindow( GetId(), maCommand, GetText(), rTbx, mxFrame );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::MouseMove( const MouseEvent& rMEvt )
 {
@@ -181,7 +181,7 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt )
     Update( nNewCol, nNewLine );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::KeyInput( const KeyEvent& rKEvt )
 {
@@ -255,7 +255,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
         SfxPopupWindow::KeyInput(rKEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -263,7 +263,7 @@ void TableWindow::MouseButtonUp( const MouseEvent& rMEvt )
     EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::Paint( const Rectangle& )
 {
@@ -333,7 +333,7 @@ void TableWindow::Paint( const Rectangle& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::PopupModeEnd()
 {
@@ -351,7 +351,7 @@ void TableWindow::PopupModeEnd()
     SfxPopupWindow::PopupModeEnd();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::Update( long nNewCol, long nNewLine )
 {
@@ -369,7 +369,7 @@ void TableWindow::Update( long nNewCol, long nNewLine )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
 {
@@ -391,7 +391,7 @@ void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TableWindow::CloseAndShowTableDialog()
 {
@@ -437,7 +437,7 @@ public:
     sal_uInt16                  GetColCount() const { return (sal_uInt16)nCol; }
 };
 
-// -----------------------------------------------------------------------
+
 
 ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUString& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
     SfxPopupWindow( nId, rFrame, WB_STDPOPUP ),
@@ -474,14 +474,14 @@ ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const OUString& rCmd, const OUStri
     StartCascading();
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* ColumnsWindow::Clone() const
 {
     return new ColumnsWindow( GetId(), maCommand, GetText(), rTbx, mxFrame );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColumnsWindow::MouseMove( const MouseEvent& rMEvt )
 {
@@ -561,7 +561,7 @@ void ColumnsWindow::UpdateSize_Impl( long nNewCol )
     }
     Update();
 }
-// -----------------------------------------------------------------------
+
 
 void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -622,7 +622,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
         SfxPopupWindow::KeyInput(rKEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -633,7 +633,7 @@ void ColumnsWindow::MouseButtonUp( const MouseEvent& rMEvt )
         EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColumnsWindow::Paint( const Rectangle& )
 {
@@ -689,7 +689,7 @@ void ColumnsWindow::Paint( const Rectangle& )
     DrawRect( Rectangle( 0, 0, aSize.Width() - 1, aSize.Height() - nTextHeight + 1 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ColumnsWindow::PopupModeEnd()
 {
@@ -724,20 +724,20 @@ SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n
     rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxTableToolBoxControl::~SvxTableToolBoxControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxTableToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow()
 {
@@ -752,7 +752,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindow()
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading()
 {
@@ -761,7 +761,7 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading()
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
@@ -790,20 +790,20 @@ SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt
     rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColumnsToolBoxControl::~SvxColumnsToolBoxControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxColumnsToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONTIMEOUTANDMOVE;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow()
 {
@@ -818,7 +818,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindow()
     return pWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading()
 {
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 451e451eb2cc..29586d4f997a 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -423,13 +423,13 @@ SfxPopupWindow* SvxLineEndWindow::Clone() const
     return new SvxLineEndWindow( GetId(), mxFrame, GetText() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineEndWindow::~SvxLineEndWindow()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl)
 {
@@ -490,7 +490,7 @@ IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::FillValueSet()
 {
@@ -541,7 +541,7 @@ void SvxLineEndWindow::FillValueSet()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::Resize()
 {
@@ -567,7 +567,7 @@ void SvxLineEndWindow::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::Resizing( Size& rNewSize )
 {
@@ -614,21 +614,21 @@ void SvxLineEndWindow::Resizing( Size& rNewSize )
     rNewSize.Width() = nW;
     rNewSize.Height() = nH;
 }
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::StartSelection()
 {
     aLineEndSet.StartSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineEndWindow::Close()
 {
     return SfxPopupWindow::Close();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::StateChanged(
     sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState )
@@ -651,7 +651,7 @@ void SvxLineEndWindow::StateChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::PopupModeEnd()
 {
@@ -663,7 +663,7 @@ void SvxLineEndWindow::PopupModeEnd()
     SfxPopupWindow::PopupModeEnd();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndWindow::SetSize()
 {
@@ -716,20 +716,20 @@ SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt
     rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxLineEndToolBoxControl::~SvxLineEndToolBoxControl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxLineEndToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow()
 {
@@ -744,7 +744,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow()
     return pLineEndWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
 {
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index b46c61c9d4fa..b282f8fb016f 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -88,7 +88,7 @@
 #include <editeng/eerdll.hxx>
 #include <editeng/editrids.hrc>
 
-// ------------------------------------------------------------------------
+
 
 #define MAX_MRU_FONTNAME_ENTRIES    5
 #define LOGICAL_EDIT_HEIGHT         12
@@ -360,7 +360,7 @@ SvxStyleBox_Impl::~SvxStyleBox_Impl()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleBox_Impl::ReleaseFocus()
 {
@@ -373,7 +373,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
         m_xFrame->getContainerWindow()->setFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleBox_Impl::Select()
 {
@@ -463,14 +463,14 @@ void SvxStyleBox_Impl::Select()
         }
     }
 }
-// -----------------------------------------------------------------------
+
 
 void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
 {
     eStyleFamily = eNewFamily;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
@@ -487,7 +487,7 @@ bool SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
     return ComboBox::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -707,7 +707,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
     }
 }
 
-//--------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
 {
@@ -717,7 +717,7 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool lcl_GetDocFontList( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
 {
@@ -819,7 +819,7 @@ SvxFontNameBox_Impl::~SvxFontNameBox_Impl()
     GetSubEdit()->RemoveEventListener( LINK( this, SvxFontNameBox_Impl, CheckAndMarkUnknownFont ));
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontNameBox_Impl::FillList()
 {
@@ -860,7 +860,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent*, event
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
 {
@@ -877,7 +877,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
         SetText( aCurName );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
 {
@@ -891,7 +891,7 @@ bool SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
     return FontNameBox::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -936,7 +936,7 @@ bool SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
     return nHandled || FontNameBox::Notify( rNEvt );
 }
 
-// ---------------------------------------------------------------------------
+
 void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 {
     if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
@@ -950,7 +950,7 @@ void SvxFontNameBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
     FontNameBox::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontNameBox_Impl::ReleaseFocus_Impl()
 {
@@ -963,7 +963,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
         m_xFrame->getContainerWindow()->setFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontNameBox_Impl::EnableControls_Impl()
 {
@@ -982,7 +982,7 @@ void SvxFontNameBox_Impl::EnableControls_Impl()
     EnableWYSIWYG( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontNameBox_Impl::UserDraw( const UserDrawEvent& rUDEvt )
 {
@@ -1164,7 +1164,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const
     return new SvxColorWindow_Impl( maCommand, theSlotId, GetFrame(), GetText(), GetParent(), mLastColor );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
 {
@@ -1216,28 +1216,28 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorWindow_Impl::Resize()
 {
     lcl_ResizeValueSet( *this, aColorSet);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorWindow_Impl::StartSelection()
 {
     aColorSet.StartSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxColorWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
 {
@@ -1352,7 +1352,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
             aFrameSet.SetItemImage( i, aImgList.GetImage( i ) );
     }
 }
-// -----------------------------------------------------------------------
+
 
 #define FRM_VALID_LEFT      0x01
 #define FRM_VALID_RIGHT     0x02
@@ -1478,14 +1478,14 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFrameWindow_Impl::Resize()
 {
     lcl_ResizeValueSet( *this, aFrameSet);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFrameWindow_Impl::StateChanged(
 
@@ -1528,14 +1528,14 @@ void SvxFrameWindow_Impl::StateChanged(
     SfxPopupWindow::StateChanged( nSID, eState, pState );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFrameWindow_Impl::StartSelection()
 {
     aFrameSet.StartSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFrameWindow_Impl::Close()
 {
@@ -1611,7 +1611,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const
     return new SvxLineWindow_Impl( GetId(), GetFrame(), GetParent() );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
 {
@@ -1643,28 +1643,28 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineWindow_Impl::Resize()
 {
     m_aLineStyleLb.Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxLineWindow_Impl::Close()
 {
     return SfxPopupWindow::Close();
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* SvxLineWindow_Impl::GetPreferredKeyInputWindow()
 {
     return &m_aLineStyleLb;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxLineWindow_Impl::GetFocus()
 {
@@ -1683,7 +1683,7 @@ void SvxLineWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 //########################################################################
 // Helper classes
@@ -1702,7 +1702,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SfxStyleControllerItem_Impl::StateChanged(
     sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
@@ -1862,13 +1862,13 @@ SvxStyleToolBoxControl::SvxStyleToolBoxControl(
     }
 }
 
-// -----------------------------------------------------------------------
+
 SvxStyleToolBoxControl::~SvxStyleToolBoxControl()
 {
     delete pImpl;
 }
 
-// -----------------------------------------------------------------------
+
 void SAL_CALL SvxStyleToolBoxControl::initialize( const Sequence< Any >& aArguments )
 throw ( Exception, RuntimeException)
 {
@@ -1919,7 +1919,7 @@ throw (::com::sun::star::uno::RuntimeException)
     DELETEZ( pImpl );
 }
 
-// -----------------------------------------------------------------------
+
 void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException)
 {
     // Do nothing, we will start binding our listener when we are visible.
@@ -1934,7 +1934,7 @@ void SAL_CALL SvxStyleToolBoxControl::update() throw (RuntimeException)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxStyleFamily SvxStyleToolBoxControl::GetActFamily()
 {
@@ -1952,7 +1952,7 @@ SfxStyleFamily SvxStyleToolBoxControl::GetActFamily()
     return SFX_STYLE_FAMILY_PARA;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleToolBoxControl::FillStyleBox()
 {
@@ -2068,7 +2068,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName )
 {
@@ -2090,7 +2090,7 @@ void SvxStyleToolBoxControl::SelectStyle( const OUString& rStyleName )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleToolBoxControl::Update()
 {
@@ -2111,7 +2111,7 @@ void SvxStyleToolBoxControl::Update()
         return;
     }
 
-    //--------------------------------------------------------------------
+
     const SfxTemplateItem* pItem = NULL;
 
     if ( nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1]) )
@@ -2141,7 +2141,7 @@ void SvxStyleToolBoxControl::Update()
         SelectStyle( pItem->GetStyleName() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
                                              const SfxTemplateItem* pItem )
@@ -2154,7 +2154,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
     Update();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification)
 {
@@ -2180,7 +2180,7 @@ IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxStyleToolBoxControl::StateChanged(
 
@@ -2220,7 +2220,7 @@ void SvxStyleToolBoxControl::StateChanged(
         Update();
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
 {
@@ -2253,7 +2253,7 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontNameToolBoxControl::StateChanged(
 
@@ -2291,7 +2291,7 @@ void SvxFontNameToolBoxControl::StateChanged(
     rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
 {
@@ -2318,21 +2318,21 @@ SvxFontColorToolBoxControl::SvxFontColorToolBoxControl(
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFontColorToolBoxControl::~SvxFontColorToolBoxControl()
 {
     delete pBtnUpdater;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxFontColorToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
 {
@@ -2352,7 +2352,7 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
     return pColorWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontColorToolBoxControl::StateChanged(
 
@@ -2393,21 +2393,21 @@ SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 n
     pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorToolBoxControl::~SvxColorToolBoxControl()
 {
     delete pBtnUpdater;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
 {
@@ -2428,7 +2428,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
     return pColorWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorToolBoxControl::StateChanged(
     sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
@@ -2501,21 +2501,21 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
     pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox() );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxColorExtToolBoxControl::~SvxColorExtToolBoxControl()
 {
     delete pBtnUpdater;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxColorExtToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONTIMEOUT;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
 {
@@ -2551,7 +2551,7 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
     return pColorWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorExtToolBoxControl::StateChanged(
 
@@ -2582,7 +2582,7 @@ void SvxColorExtToolBoxControl::StateChanged(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxColorExtToolBoxControl::Select( sal_Bool )
 {
@@ -2643,14 +2643,14 @@ SvxFrameToolBoxControl::SvxFrameToolBoxControl(
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxFrameToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
 {
@@ -2667,7 +2667,7 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
     return pFrameWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFrameToolBoxControl::StateChanged(
 
@@ -2697,14 +2697,14 @@ SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
 {
@@ -2718,7 +2718,7 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
     return pLineWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFrameLineStyleToolBoxControl::StateChanged(
 
@@ -2749,7 +2749,7 @@ SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl(
     rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxFrameLineColorToolBoxControl::~SvxFrameLineColorToolBoxControl()
 {
@@ -2757,14 +2757,14 @@ SvxFrameLineColorToolBoxControl::~SvxFrameLineColorToolBoxControl()
     delete pBtnUpdater;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxFrameLineColorToolBoxControl::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
 {
@@ -2783,7 +2783,7 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
     return pColorWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFrameLineColorToolBoxControl::StateChanged(
     sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
@@ -2815,13 +2815,13 @@ SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sa
     aDefaultText = rTbx.GetItemText( nId );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
 {
@@ -2847,7 +2847,7 @@ static void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet )
     rValueSet.SetPosSizePixel( Point(2,2), aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize )
 {
@@ -2857,7 +2857,7 @@ static void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size
     rWin.SetOutputSizePixel( aSize );
 }
 
-// -----------------------------------------------------------------------------
+
 Reference< ::com::sun::star::accessibility::XAccessible > SvxFontNameBox_Impl::CreateAccessible()
 {
     FillList();
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index c2ad93a71096..62806157d50d 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -135,7 +135,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
     SetText( "" );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontSizeBox_Impl::ReleaseFocus_Impl()
 {
@@ -149,7 +149,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl()
         m_xFrame->getContainerWindow()->setFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontSizeBox_Impl::Select()
 {
@@ -173,7 +173,7 @@ void SvxFontSizeBox_Impl::Select()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase )
 {
@@ -195,7 +195,7 @@ void SvxFontSizeBox_Impl::statusChanged_Impl( long nPoint, bool bErase )
     SaveValue();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescriptor& rCurrentFont )
 {
@@ -221,7 +221,7 @@ void SvxFontSizeBox_Impl::UpdateFont( const ::com::sun::star::awt::FontDescripto
     m_aCurText = GetText(); // zum R"ucksetzen bei ESC merken
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
 {
@@ -271,7 +271,7 @@ void SvxFontSizeBox_Impl::SetOptimalSize()
     SetDropDownSizePixel(aDropSize);
 }
 
-// ---------------------------------------------------------------------------
+
 
 void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 98cbbe0cdf28..a446d4e8dab0 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -239,7 +239,7 @@ bool FindTextFieldControl::PreNotify( NotifyEvent& rNEvt )
 }
 
 
-//-----------------------------------------------------------------------------------------------------------
+
 // SearchToolbarControllersManager
 
 SearchToolbarControllersManager::SearchToolbarControllersManager()
@@ -346,7 +346,7 @@ css::uno::Reference< css::frame::XStatusListener > SearchToolbarControllersManag
     return xStatusListener;
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // FindTextToolbarController
 
 FindTextToolbarController::FindTextToolbarController( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
@@ -502,7 +502,7 @@ IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl)
     return 0;
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // class UpDownSearchToolboxController
 
 UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, Type eType )
@@ -597,7 +597,7 @@ void SAL_CALL UpDownSearchToolboxController::statusChanged( const css::frame::Fe
 {
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // MatchCaseToolboxController
 
 MatchCaseToolboxController::MatchCaseToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
@@ -695,7 +695,7 @@ void SAL_CALL MatchCaseToolboxController::statusChanged( const css::frame::Featu
 {
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // class FindAllToolboxController
 
 FindAllToolboxController::FindAllToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -782,7 +782,7 @@ void SAL_CALL FindAllToolboxController::statusChanged( const css::frame::Feature
 {
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // class ExitSearchToolboxController
 
 ExitSearchToolboxController::ExitSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -880,7 +880,7 @@ void SAL_CALL ExitSearchToolboxController::statusChanged( const css::frame::Feat
 {
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // class SearchLabelToolboxController
 
 SearchLabelToolboxController::SearchLabelToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext )
@@ -962,7 +962,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL SearchLabelToolboxController::
     return VCLUnoHelper::GetInterface(pSL);
 }
 
-//-----------------------------------------------------------------------------------------------------------
+
 // class FindbarDispatcher
 
 FindbarDispatcher::FindbarDispatcher()
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 4c33fbb9bf26..b83be60f60ef 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -62,7 +62,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void ToolboxAccess::toggleToolbox() const
     {
         try
@@ -94,7 +94,7 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     bool ToolboxAccess::isToolboxVisible() const
     {
         return ( m_xLayouter.is() && m_xLayouter->isElementVisible( m_sToolboxResName ) );
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 2396145eda09..f561fb9e7746 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -72,13 +72,13 @@ namespace svx
         }
     }
 
-    // -----------------------------------------------------------------------
+
 
     ToolboxButtonColorUpdater::~ToolboxButtonColorUpdater()
     {
     }
 
-    // -----------------------------------------------------------------------
+
 
     void ToolboxButtonColorUpdater::Update( const Color& rColor )
     {
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 2453f4593d72..cac037a5fdb7 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -41,7 +41,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlDraw, SfxAllEnumItem);
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
-// -----------------------------------------------------------------------
+
 
 SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
 
@@ -54,7 +54,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx
     rTbx.Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
                                   const SfxPoolItem* pState )
@@ -68,14 +68,14 @@ void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
             GetId(), xLayoutMgr->isElementVisible( m_sToolboxName ) != sal_False );
 }
 
-// -----------------------------------------------------------------------
+
 
 SfxPopupWindowType SvxTbxCtlDraw::GetPopupWindowType() const
 {
     return SFX_POPUPWINDOW_ONCLICK;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTbxCtlDraw::toggleToolbox()
 {
@@ -99,7 +99,7 @@ void SvxTbxCtlDraw::toggleToolbox()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvxTbxCtlDraw::Select( sal_Bool )
 {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 0e07e5105a5b..8743580b333d 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -337,9 +337,9 @@ SvLBoxItem* DictionaryList::getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16
     return pItem;
 }
 
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
-//-----------------------------------------------------------------------------
+
+
+
 
 DictionaryEntry::DictionaryEntry( const OUString& rTerm, const OUString& rMapping
                     , sal_Int16 nConversionPropertyType
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index af28cbb6ddbd..44f731b69315 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -101,7 +101,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::setTitle( const OUString& ) throw(un
     //not implemented - fell free to do so, if you do need this
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException)
 {
     SolarMutexGuard aSolarGuard;
@@ -122,7 +122,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::initialize( const uno::Sequence< uno
     }
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeException)
 {
     sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL;
@@ -152,7 +152,7 @@ sal_Int16 SAL_CALL ChineseTranslation_UnoDialog::execute() throw(uno::RuntimeExc
     return nRet;
 }
 
-//-------------------------------------------------------------------------
+
 // lang::XComponent
 
 void SAL_CALL ChineseTranslation_UnoDialog::dispose() throw (uno::RuntimeException)
@@ -190,7 +190,7 @@ void SAL_CALL ChineseTranslation_UnoDialog::removeEventListener( const uno::Refe
     m_aDisposeEventListeners.removeInterface( xListener );
 }
 
-//-------------------------------------------------------------------------
+
 // XPropertySet
 
 uno::Reference< beans::XPropertySetInfo > SAL_CALL ChineseTranslation_UnoDialog::getPropertySetInfo(  ) throw (uno::RuntimeException)
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 65c03157ce75..a17a5fad15bc 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -115,7 +115,7 @@ namespace svx
 
 using namespace ::svx;
 
-// -------------
+
 
 NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool* pPool )
 {
@@ -182,7 +182,7 @@ sal_Bool NamespaceIteratorImpl::next( OUString& rPrefix, OUString& rURL )
     return false;
 }
 
-// -------------
+
 
 NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool )
 : mpWhichIds( pWhichIds ), mpPool( pPool )
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 4f4266d11905..dfdb83596669 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -47,7 +47,7 @@ namespace {
 class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo        ,
                                                    css::frame::XSynchronousDispatch > // => XDispatch!
 {
-    //-------------------------------------------
+
     // const, types, etcpp.
     private:
 
@@ -59,7 +59,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo
             E_DO_RECOVERY,
         };
 
-    //-------------------------------------------
+
     // member
     private:
 
@@ -75,19 +75,19 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo
         /** @short TODO */
         css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory;
 
-    //-------------------------------------------
+
     // interface
     public:
 
-        //---------------------------------------
+
         /** @short  TODO */
         RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-        //---------------------------------------
+
         /** @short  TODO */
         virtual ~RecoveryUI();
 
-        //---------------------------------------
+
         // css.lang.XServiceInfo
 
         virtual OUString SAL_CALL getImplementationName()
@@ -99,12 +99,12 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo
         virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
             throw(css::uno::RuntimeException);
 
-        //---------------------------------------
+
         virtual com::sun::star::uno::Any SAL_CALL dispatchWithReturnValue(const css::util::URL& aURL,
                                             const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
             throw(css::uno::RuntimeException);
 
-        //---------------------------------------
+
         // css.frame.XDispatch
 
         virtual void SAL_CALL dispatch(const css::util::URL&                                  aURL      ,
@@ -118,7 +118,7 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo
                                                    const css::util::URL&                                     aURL     )
             throw(css::uno::RuntimeException);
 
-    //-------------------------------------------
+
     // helper
     private:
 
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 2a401e7161fa..b208dfbfcb5c 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -92,13 +92,13 @@ namespace svx
     //====================================================================
     //= PropertyValueProvider
     //====================================================================
-    //--------------------------------------------------------------------
+
     OUString PropertyValueProvider::getPropertyName() const
     {
         return m_sPropertyName;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyValueProvider::getCurrentValue( Any& _out_rValue ) const
     {
         Reference< XPropertySet > xContextProps( const_cast< PropertyValueProvider* >( this )->m_rContext, UNO_QUERY_THROW );
@@ -108,18 +108,18 @@ namespace svx
     //====================================================================
     //= PropertyChangeNotifier
     //====================================================================
-    //--------------------------------------------------------------------
+
     PropertyChangeNotifier::PropertyChangeNotifier( ::cppu::OWeakObject& _rOwner, ::osl::Mutex& _rMutex )
         :m_pData( new PropertyChangeNotifier_Data( _rOwner, _rMutex ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     PropertyChangeNotifier::~PropertyChangeNotifier()
     {
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyChangeNotifier::registerProvider( const ShapeProperty _eProperty, const PPropertyValueProvider _pProvider )
     {
         ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" );
@@ -131,7 +131,7 @@ namespace svx
         m_pData->m_aProviders[ _eProperty ] = _pProvider;
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyChangeNotifier::notifyPropertyChange( const ShapeProperty _eProperty ) const
     {
         ENSURE_OR_THROW( _eProperty != eInvalidShapeProperty, "Illegal ShapeProperty value!" );
@@ -167,19 +167,19 @@ namespace svx
         }
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyChangeNotifier::addPropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener )
     {
         m_pData->m_aPropertyChangeListeners.addInterface( _rPropertyName, _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyChangeNotifier::removePropertyChangeListener( const OUString& _rPropertyName, const Reference< XPropertyChangeListener >& _rxListener )
     {
         m_pData->m_aPropertyChangeListeners.removeInterface( _rPropertyName, _rxListener );
     }
 
-    //--------------------------------------------------------------------
+
     void PropertyChangeNotifier::disposing()
     {
         EventObject aEvent;
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index 90fc9905847a..627019725cc3 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -41,12 +41,12 @@ SvxTableShape::SvxTableShape( SdrObject* pObj ) throw()
     SetShapeType( OUString( "com.sun.star.drawing.TableShape" ) );
 }
 
-//----------------------------------------------------------------------
+
 SvxTableShape::~SvxTableShape() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxTableShape::setPropertyValueImpl(
     const OUString& rName,
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 7a7abf07057d..5dd9ed6f136a 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -851,7 +851,7 @@ namespace {
   }
 }
 
-//----------------------------------------------------------------------
+
 OUString UHashMap::getNameFromId(sal_uInt32 nId)
 {
     const UHashMapImpl &rMap = GetUHashImpl();
@@ -903,7 +903,7 @@ SvxUnoPropertyMapProvider& getSvxMapProvider()
     return theSvxMapProvider::get();
 }
 
-// ---------------------------------------------------------------------
+
 
 SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
 {
@@ -920,7 +920,7 @@ SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider()
         delete aSetArr[i];
 }
 
-// ---------------------------------------------------------------------
+
 
 const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId)
 {
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index fc2285106307..bc4f6fafccd2 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -81,19 +81,19 @@ SvxShapeGroup::SvxShapeGroup( SdrObject* pObj, SvxDrawPage* pDrawPage  )  throw(
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeGroup::~SvxShapeGroup() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 void SvxShapeGroup::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 {
     SvxShape::Create( pNewObj, pNewPage );
     mxPage = pNewPage;
 }
 
-//----------------------------------------------------------------------
+
 uno::Any SAL_CALL SvxShapeGroup::queryInterface( const uno::Type & rType )
     throw(uno::RuntimeException)
 {
@@ -144,7 +144,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId()
 
 // ::com::sun::star::drawing::XShape
 
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxShapeGroup::getShapeType()
     throw( uno::RuntimeException )
 {
@@ -157,20 +157,20 @@ awt::Point SAL_CALL SvxShapeGroup::getPosition() throw(uno::RuntimeException)
     return SvxShape::getPosition();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeGroup::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
 {
     SvxShape::setPosition(Position);
 }
 
-//----------------------------------------------------------------------
+
 
 awt::Size SAL_CALL SvxShapeGroup::getSize() throw(uno::RuntimeException)
 {
     return SvxShape::getSize();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize )
     throw(beans::PropertyVetoException, uno::RuntimeException)
 {
@@ -179,14 +179,14 @@ void SAL_CALL SvxShapeGroup::setSize( const awt::Size& rSize )
 
 // drawing::XShapeGroup
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeGroup::enterGroup(  ) throw(uno::RuntimeException)
 {
     // Todo
 //  pDrView->EnterMarkedGroup();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeGroup::leaveGroup(  ) throw(uno::RuntimeException)
 {
     // Todo
@@ -241,7 +241,7 @@ void SAL_CALL SvxShapeGroup::add( const uno::Reference< drawing::XShape >& xShap
     addUnoShape(xShape, 0xFFFF);
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeGroup::remove( const uno::Reference< drawing::XShape >& xShape )
     throw( uno::RuntimeException )
 {
@@ -314,7 +314,7 @@ void SAL_CALL SvxShapeGroup::addBottom( const uno::Reference< drawing::XShape >&
 
 // XIndexAccess
 
-//----------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
 {
     ::SolarMutexGuard aGuard;
@@ -329,7 +329,7 @@ sal_Int32 SAL_CALL SvxShapeGroup::getCount() throw( uno::RuntimeException )
     return nRetval;
 }
 
-//----------------------------------------------------------------------
+
 uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
     throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
 {
@@ -352,13 +352,13 @@ uno::Any SAL_CALL SvxShapeGroup::getByIndex( sal_Int32 Index )
 
 // ::com::sun::star::container::XElementAccess
 
-//----------------------------------------------------------------------
+
 uno::Type SAL_CALL SvxShapeGroup::getElementType() throw( uno::RuntimeException )
 {
     return ::getCppuType(( const Reference< drawing::XShape >*)0);
 }
 
-//----------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException )
 {
     ::SolarMutexGuard aGuard;
@@ -366,7 +366,7 @@ sal_Bool SAL_CALL SvxShapeGroup::hasElements() throw( uno::RuntimeException )
     return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0);
 }
 
-//----------------------------------------------------------------------
+
 // ::com::sun::star::lang::XServiceInfo
 
 uno::Sequence< OUString > SAL_CALL SvxShapeGroup::getSupportedServiceNames()
@@ -384,12 +384,12 @@ SvxShapeConnector::SvxShapeConnector( SdrObject* pObj )  throw() :
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeConnector::~SvxShapeConnector() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShapeConnector::queryInterface( const uno::Type & rType )
     throw(uno::RuntimeException)
@@ -439,7 +439,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId()
 
 // ::com::sun::star::drawing::XShape
 
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxShapeConnector::getShapeType()
     throw( uno::RuntimeException )
 {
@@ -452,27 +452,27 @@ awt::Point SAL_CALL SvxShapeConnector::getPosition() throw(uno::RuntimeException
     return SvxShapeText::getPosition();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeConnector::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
 {
     SvxShapeText::setPosition(Position);
 }
 
-//----------------------------------------------------------------------
+
 
 awt::Size SAL_CALL SvxShapeConnector::getSize() throw(uno::RuntimeException)
 {
     return SvxShapeText::getSize();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeConnector::setSize( const awt::Size& rSize )
     throw(beans::PropertyVetoException, uno::RuntimeException)
 {
     SvxShapeText::setSize( rSize );
 }
 
-//----------------------------------------------------------------------
+
 
 // XConnectorShape
 
@@ -490,7 +490,7 @@ void SAL_CALL SvxShapeConnector::connectStart( const uno::Reference< drawing::XC
         mpModel->SetChanged();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XConnectableShape >& xShape, drawing::ConnectionType  )
     throw( uno::RuntimeException )
 {
@@ -506,7 +506,7 @@ void SAL_CALL SvxShapeConnector::connectEnd( const uno::Reference< drawing::XCon
         mpModel->SetChanged();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing::XConnectableShape >&  )
     throw( uno::RuntimeException )
 {
@@ -519,7 +519,7 @@ void SAL_CALL SvxShapeConnector::disconnectBegin( const uno::Reference< drawing:
         mpModel->SetChanged();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::XConnectableShape >& )
     throw( uno::RuntimeException )
 {
@@ -532,9 +532,9 @@ void SAL_CALL SvxShapeConnector::disconnectEnd( const uno::Reference< drawing::X
         mpModel->SetChanged();
 }
 
-//----------------------------------------------------------------------
+
 // ::com::sun::star::lang::XServiceInfo
-//----------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL SvxShapeConnector::getSupportedServiceNames() throw( uno::RuntimeException )
 {
     return SvxShapeText::getSupportedServiceNames();
@@ -552,13 +552,13 @@ SvxShapeControl::SvxShapeControl( SdrObject* pObj )  throw() :
     setShapeKind( OBJ_UNO );
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeControl::~SvxShapeControl() throw()
 {
     DBG_DTOR(SvxShapeControl,NULL);
 }
 
-//----------------------------------------------------------------------
+
 uno::Any SAL_CALL SvxShapeControl::queryInterface( const uno::Type & rType )
     throw(uno::RuntimeException)
 {
@@ -606,7 +606,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId()
 
 // ::com::sun::star::drawing::XShape
 
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxShapeControl::getShapeType()
     throw( uno::RuntimeException )
 {
@@ -619,27 +619,27 @@ awt::Point SAL_CALL SvxShapeControl::getPosition() throw(uno::RuntimeException)
     return SvxShapeText::getPosition();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeControl::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
 {
     SvxShapeText::setPosition(Position);
 }
 
-//----------------------------------------------------------------------
+
 
 awt::Size SAL_CALL SvxShapeControl::getSize() throw(uno::RuntimeException)
 {
     return SvxShapeText::getSize();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeControl::setSize( const awt::Size& rSize )
     throw(beans::PropertyVetoException, uno::RuntimeException)
 {
     SvxShapeText::setSize( rSize );
 }
 
-//----------------------------------------------------------------------
+
 // XControlShape
 
 Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
@@ -656,7 +656,7 @@ Reference< awt::XControlModel > SAL_CALL SvxShapeControl::getControl()
     return xModel;
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeControl::setControl( const Reference< awt::XControlModel >& xControl )
     throw( uno::RuntimeException )
 {
@@ -1009,13 +1009,13 @@ uno::Any SAL_CALL SvxShapeControl::getPropertyDefault( const OUString& aProperty
 * class SvxShapeDimensioning                                           *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 SvxShapeDimensioning::SvxShapeDimensioning( SdrObject* pObj ) throw()
 :   SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_DIMENSIONING), getSvxMapProvider().GetPropertySet(SVXMAP_DIMENSIONING, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeDimensioning::~SvxShapeDimensioning() throw()
 {
 }
@@ -1030,13 +1030,13 @@ uno::Sequence< OUString > SAL_CALL SvxShapeDimensioning::getSupportedServiceName
 *                                                                      *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 SvxShapeCircle::SvxShapeCircle( SdrObject* pObj ) throw()
 :   SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_CIRCLE), getSvxMapProvider().GetPropertySet(SVXMAP_CIRCLE, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeCircle::~SvxShapeCircle() throw()
 {
 }
@@ -1054,7 +1054,7 @@ uno::Sequence< OUString > SAL_CALL SvxShapeCircle::getSupportedServiceNames() th
 
 #include <svx/svdopath.hxx>
 
-//----------------------------------------------------------------------
+
 SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind eNew )
  throw( com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException)
 : SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGON), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGON, SdrObject::GetGlobalDrawObjectItemPool()) )
@@ -1062,7 +1062,7 @@ SvxShapePolyPolygon::SvxShapePolyPolygon( SdrObject* pObj , drawing::PolygonKind
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapePolyPolygon::~SvxShapePolyPolygon() throw()
 {
 }
@@ -1099,7 +1099,7 @@ basegfx::B2DPolyPolygon SAL_CALL ImplSvxPointSequenceSequenceToB2DPolyPolygon( c
     return aRetval;
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShapePolyPolygon::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -1209,7 +1209,7 @@ void SAL_CALL B2DPolyPolygonToSvxPointSequenceSequence( const basegfx::B2DPolyPo
     }
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1281,13 +1281,13 @@ bool SvxShapePolyPolygon::getPropertyValueImpl( const OUString& rName, const Sfx
     return true;
 }
 
-//----------------------------------------------------------------------
+
 drawing::PolygonKind SvxShapePolyPolygon::GetPolygonKind() const throw()
 {
     return mePolygonKind;
 }
 
-//----------------------------------------------------------------------
+
 void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw()
 {
     ::SolarMutexGuard aGuard;
@@ -1296,7 +1296,7 @@ void SvxShapePolyPolygon::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(
         ((SdrPathObj*)mpObj.get())->SetPathPoly(rNew);
 }
 
-//----------------------------------------------------------------------
+
 basegfx::B2DPolyPolygon SvxShapePolyPolygon::GetPolygon() const throw()
 {
     ::SolarMutexGuard aGuard;
@@ -1322,19 +1322,19 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygon::getSupportedServiceNames
 ***********************************************************************/
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
-//----------------------------------------------------------------------
+
 SvxShapePolyPolygonBezier::SvxShapePolyPolygonBezier( SdrObject* pObj , drawing::PolygonKind eNew ) throw()
 :   SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_POLYPOLYGONBEZIER), getSvxMapProvider().GetPropertySet(SVXMAP_POLYPOLYGONBEZIER, SdrObject::GetGlobalDrawObjectItemPool()) )
 ,   mePolygonKind( eNew )
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapePolyPolygonBezier::~SvxShapePolyPolygonBezier() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -1377,7 +1377,7 @@ bool SvxShapePolyPolygonBezier::setPropertyValueImpl( const OUString& rName, con
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1416,13 +1416,13 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl( const OUString& rName, con
     return true;
 }
 
-//----------------------------------------------------------------------
+
 drawing::PolygonKind SvxShapePolyPolygonBezier::GetPolygonKind() const throw()
 {
     return mePolygonKind;
 }
 
-//----------------------------------------------------------------------
+
 void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw()
 {
     ::SolarMutexGuard aGuard;
@@ -1431,7 +1431,7 @@ void SvxShapePolyPolygonBezier::SetPolygon(const basegfx::B2DPolyPolygon& rNew)
         static_cast<SdrPathObj*>(mpObj.get())->SetPathPoly(rNew);
 }
 
-//----------------------------------------------------------------------
+
 basegfx::B2DPolyPolygon SvxShapePolyPolygonBezier::GetPolygon() const throw()
 {
     ::SolarMutexGuard aGuard;
@@ -1465,18 +1465,18 @@ uno::Sequence< OUString > SAL_CALL SvxShapePolyPolygonBezier::getSupportedServic
 
 #include <toolkit/helper/vclunohelper.hxx>
 
-//----------------------------------------------------------------------
+
 SvxGraphicObject::SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw()
 :   SvxShapeText( pObj, getSvxMapProvider().GetMap(SVXMAP_GRAPHICOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_GRAPHICOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) ), referer_(referer)
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxGraphicObject::~SvxGraphicObject() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -1631,7 +1631,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const OUString& rName, const SfxIte
     return true;
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxGraphicObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1746,19 +1746,19 @@ SvxCustomShape::SvxCustomShape( SdrObject* pObj )  throw() :
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxCustomShape::~SvxCustomShape() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxCustomShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 {
     SvxShapeText::Create( pNewObj, pNewPage );
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType )
     throw(uno::RuntimeException)
@@ -1785,7 +1785,7 @@ void SAL_CALL SvxCustomShape::release() throw ( )
     SvxShapeText::release();
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes()
     throw (uno::RuntimeException)
@@ -1806,7 +1806,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId()
 
 // ::com::sun::star::drawing::XShape
 
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxCustomShape::getShapeType()
     throw( uno::RuntimeException )
 {
@@ -1895,29 +1895,29 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
         return SvxShape::getPosition();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxCustomShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
 {
     SvxShapeText::setPosition(Position);
 }
 
-//----------------------------------------------------------------------
+
 
 awt::Size SAL_CALL SvxCustomShape::getSize() throw(uno::RuntimeException)
 {
     return SvxShapeText::getSize();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxCustomShape::setSize( const awt::Size& rSize )
     throw(beans::PropertyVetoException, uno::RuntimeException)
 {
     SvxShapeText::setSize( rSize );
 }
 
-//----------------------------------------------------------------------
 
-//----------------------------------------------------------------------
+
+
 void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue )
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException)
 {
@@ -1997,7 +1997,7 @@ bool SvxCustomShape::getPropertyValueImpl( const OUString& rName, const SfxItemP
         return SvxShape::getPropertyValueImpl( rName, pProperty, rValue );
     }
 }
-//----------------------------------------------------------------------
+
 
 void SvxCustomShape::createCustomShapeDefaults( const OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException)
 {
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index 2f343d6208ba..3745fec1fa44 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -60,26 +60,26 @@ using namespace ::com::sun::star::container;
 * class Svx3DSceneObject                                               *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 Svx3DSceneObject::Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw()
 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSCENEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSCENEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 ,   mxPage( pDrawPage )
 {
 }
 
-//----------------------------------------------------------------------
+
 Svx3DSceneObject::~Svx3DSceneObject() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 void Svx3DSceneObject::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 {
     SvxShape::Create( pNewObj, pNewPage );
     mxPage = pNewPage;
 }
 
-//----------------------------------------------------------------------
+
 uno::Any SAL_CALL Svx3DSceneObject::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
 {
     uno::Any aAny;
@@ -128,7 +128,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId()
     return theSvx3DSceneObjectImplementationId::get().getSeq();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape )
     throw( uno::RuntimeException)
 {
@@ -157,7 +157,7 @@ void SAL_CALL Svx3DSceneObject::add( const Reference< drawing::XShape >& xShape
         mpModel->SetChanged();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xShape )
     throw( uno::RuntimeException )
 {
@@ -198,7 +198,7 @@ void SAL_CALL Svx3DSceneObject::remove( const Reference< drawing::XShape >& xSha
     }
 }
 
-//----------------------------------------------------------------------
+
 sal_Int32 SAL_CALL Svx3DSceneObject::getCount()
     throw( uno::RuntimeException )
 {
@@ -211,7 +211,7 @@ sal_Int32 SAL_CALL Svx3DSceneObject::getCount()
     return nRetval;
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index )
     throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
@@ -234,7 +234,7 @@ uno::Any SAL_CALL Svx3DSceneObject::getByIndex( sal_Int32 Index )
     return aAny;
 }
 
-//----------------------------------------------------------------------
+
 // ::com::sun::star::container::XElementAccess
 
 uno::Type SAL_CALL Svx3DSceneObject::getElementType()
@@ -243,7 +243,7 @@ uno::Type SAL_CALL Svx3DSceneObject::getElementType()
     return ::getCppuType(( const Reference< drawing::XShape>*)0);
 }
 
-//----------------------------------------------------------------------
+
 sal_Bool SAL_CALL Svx3DSceneObject::hasElements()
     throw( uno::RuntimeException )
 {
@@ -252,7 +252,7 @@ sal_Bool SAL_CALL Svx3DSceneObject::hasElements()
     return mpObj.is() && mpObj->GetSubList() && (mpObj->GetSubList()->GetObjCount() > 0);
 }
 
-//----------------------------------------------------------------------
+
 
 static bool ConvertHomogenMatrixToObject( E3dObject* pObject, const Any& rValue )
 {
@@ -305,7 +305,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue )
     rValue <<= aHomMat;
 }
 
-//----------------------------------------------------------------------
+
 #include <svx/svditer.hxx>
 
 struct ImpRememberTransAndRect
@@ -424,7 +424,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const OUString& rName, const SfxIte
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DSceneObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -482,18 +482,18 @@ uno::Sequence< OUString > SAL_CALL Svx3DSceneObject::getSupportedServiceNames()
 *                                                                      *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 Svx3DCubeObject::Svx3DCubeObject( SdrObject* pObj ) throw()
 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DCUBEOBJEKT), getSvxMapProvider().GetPropertySet(SVXMAP_3DCUBEOBJEKT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
-//----------------------------------------------------------------------
+
 Svx3DCubeObject::~Svx3DCubeObject() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -549,7 +549,7 @@ bool Svx3DCubeObject::setPropertyValueImpl( const OUString& rName, const SfxItem
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DCubeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -613,18 +613,18 @@ uno::Sequence< OUString > SAL_CALL Svx3DCubeObject::getSupportedServiceNames()
 *                                                                      *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 Svx3DSphereObject::Svx3DSphereObject( SdrObject* pObj ) throw()
 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DSPHEREOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DSPHEREOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
-//----------------------------------------------------------------------
+
 Svx3DSphereObject::~Svx3DSphereObject() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -670,7 +670,7 @@ bool Svx3DSphereObject::setPropertyValueImpl( const OUString& rName, const SfxIt
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DSphereObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -729,13 +729,13 @@ uno::Sequence< OUString > SAL_CALL Svx3DSphereObject::getSupportedServiceNames()
 *                                                                      *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 Svx3DLatheObject::Svx3DLatheObject( SdrObject* pObj ) throw()
 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DLATHEOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DLATHEOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
-//----------------------------------------------------------------------
+
 Svx3DLatheObject::~Svx3DLatheObject() throw()
 {
 }
@@ -828,7 +828,7 @@ static void B3dPolyPolygon_to_PolyPolygonShape3D( const basegfx::B3DPolyPolygon&
     rValue <<= aRetval;
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -876,7 +876,7 @@ bool Svx3DLatheObject::setPropertyValueImpl( const OUString& rName, const SfxIte
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 bool Svx3DLatheObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     switch( pProperty->nWID )
@@ -942,12 +942,12 @@ Svx3DExtrudeObject::Svx3DExtrudeObject( SdrObject* pObj ) throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 Svx3DExtrudeObject::~Svx3DExtrudeObject() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -984,7 +984,7 @@ bool Svx3DExtrudeObject::setPropertyValueImpl( const OUString& rName, const SfxI
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool Svx3DExtrudeObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -1048,18 +1048,18 @@ uno::Sequence< OUString > SAL_CALL Svx3DExtrudeObject::getSupportedServiceNames(
 *                                                                      *
 ***********************************************************************/
 
-//----------------------------------------------------------------------
+
 Svx3DPolygonObject::Svx3DPolygonObject( SdrObject* pObj ) throw()
 :   SvxShape( pObj, getSvxMapProvider().GetMap(SVXMAP_3DPOLYGONOBJECT), getSvxMapProvider().GetPropertySet(SVXMAP_3DPOLYGONOBJECT, SdrObject::GetGlobalDrawObjectItemPool()) )
 {
 }
 
-//----------------------------------------------------------------------
+
 Svx3DPolygonObject::~Svx3DPolygonObject() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
     switch( pProperty->nWID )
@@ -1133,7 +1133,7 @@ bool Svx3DPolygonObject::setPropertyValueImpl( const OUString& rName, const SfxI
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 bool Svx3DPolygonObject::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
     switch( pProperty->nWID )
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index f0047142ca44..96ce7103a8e9 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -796,12 +796,12 @@ SvxMediaShape::SvxMediaShape( SdrObject* pObj, OUString const & referer ) throw(
     SetShapeType( OUString(  "com.sun.star.drawing.MediaShape"  ) );
 }
 
-//----------------------------------------------------------------------
+
 SvxMediaShape::~SvxMediaShape() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -890,7 +890,7 @@ bool SvxMediaShape::setPropertyValueImpl( const OUString& rName, const SfxItemPr
     throw IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxMediaShape::getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 0fa267c60753..8b7b6766d3d7 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -163,7 +163,7 @@ protected:
     }
 };
 
-//----------------------------------------------------------------------
+
 class ShapeSizeProvider : public PropertyValueProvider
 {
 public:
@@ -199,7 +199,7 @@ SvxShape::SvxShape( SdrObject* pObject ) throw()
     impl_construct();
 }
 
-//----------------------------------------------------------------------
+
 SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries, const SvxItemPropertySet* pPropertySet ) throw()
 :   maSize(100,100)
 ,   mpImpl( new SvxShapeImpl( *this, maMutex ) )
@@ -214,7 +214,7 @@ SvxShape::SvxShape( SdrObject* pObject, const SfxItemPropertyMapEntry* pEntries,
     impl_construct();
 }
 
-//----------------------------------------------------------------------
+
 SvxShape::SvxShape() throw()
 :   maSize(100,100)
 ,   mpImpl( new SvxShapeImpl( *this, maMutex ) )
@@ -229,7 +229,7 @@ SvxShape::SvxShape() throw()
     impl_construct();
 }
 
-//----------------------------------------------------------------------
+
 SvxShape::~SvxShape() throw()
 {
     ::SolarMutexGuard aGuard;
@@ -257,14 +257,14 @@ SvxShape::~SvxShape() throw()
     DBG_DTOR(SvxShape,NULL);
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxShape::TakeSdrObjectOwnership()
 {
     mpImpl->mbHasSdrObjectOwnership = true;
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShape::HasSdrObjectOwnership() const
 {
@@ -275,28 +275,28 @@ bool SvxShape::HasSdrObjectOwnership() const
     return mpObj.is();
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxShape::setShapeKind( sal_uInt32 nKind )
 {
     mpImpl->mnObjId = nKind;
 }
 
-//----------------------------------------------------------------------
+
 
 sal_uInt32 SvxShape::getShapeKind() const
 {
     return mpImpl->mnObjId;
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxShape::setMaster( SvxShapeMaster* pMaster )
 {
     mpImpl->mpMaster = pMaster;
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShape::queryAggregation( const uno::Type& rType ) throw (uno::RuntimeException)
 {
@@ -320,7 +320,7 @@ const ::com::sun::star::uno::Sequence< sal_Int8 > & SvxShape::getUnoTunnelId() t
     return theSvxShapeUnoTunnelId::get().getSeq();
 }
 
-//----------------------------------------------------------------------
+
 SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >& xInt )
 {
     uno::Reference< lang::XUnoTunnel > xUT( xInt, ::com::sun::star::uno::UNO_QUERY );
@@ -330,7 +330,7 @@ SvxShape* SvxShape::getImplementation( const uno::Reference< uno::XInterface >&
         return NULL;
 }
 
-//----------------------------------------------------------------------
+
 sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw(::com::sun::star::uno::RuntimeException) \
 {
     if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
@@ -343,13 +343,13 @@ sal_Int64 SAL_CALL SvxShape::getSomething( const ::com::sun::star::uno::Sequence
     }
 }
 
-//----------------------------------------------------------------------
+
 ::svx::PropertyChangeNotifier& SvxShape::getShapePropertyChangeNotifier()
 {
     return mpImpl->maPropertyNotifier;
 }
 
-//----------------------------------------------------------------------
+
 void SvxShape::impl_construct()
 {
     mpImpl->maPropertyNotifier.registerProvider( ::svx::eShapePosition,
@@ -361,7 +361,7 @@ void SvxShape::impl_construct()
         impl_initFromSdrObject();
 }
 
-//----------------------------------------------------------------------
+
 void SvxShape::impl_initFromSdrObject()
 {
     DBG_TESTSOLARMUTEX();
@@ -416,7 +416,7 @@ void SvxShape::impl_initFromSdrObject()
     }
 }
 
-//----------------------------------------------------------------------
+
 void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
 {
     DBG_TESTSOLARMUTEX();
@@ -470,7 +470,7 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ )
     }
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxShape::ChangeModel( SdrModel* pNewModel )
 {
@@ -504,7 +504,7 @@ void SvxShape::ChangeModel( SdrModel* pNewModel )
         mpImpl->mpMaster->modelChanged( pNewModel );
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxShape::ForceMetricToItemPoolMetric(Pair& rPoint) const throw()
 {
@@ -560,7 +560,7 @@ void SvxShape::ForceMetricToItemPoolMetric(basegfx::B2DPolyPolygon& rPolyPolygon
     }
 }
 
-//----------------------------------------------------------------------
+
 void SvxShape::ForceMetricTo100th_mm(Pair& rPoint) const throw()
 {
     DBG_TESTSOLARMUTEX();
@@ -616,7 +616,7 @@ void SvxShape::ForceMetricTo100th_mm(basegfx::B2DPolyPolygon& rPolyPolygon) cons
     }
 }
 
-//----------------------------------------------------------------------
+
 void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet,
   SfxItemSet& rSet, uno::Reference< beans::XPropertySet > xSet, const SfxItemPropertyMap* pMap )
 {
@@ -677,7 +677,7 @@ void SvxShape::ObtainSettingsFromPropertySet(const SvxItemPropertySet& rPropSet)
     }
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw()
 {
@@ -730,7 +730,7 @@ uno::Any SvxShape::GetBitmap( sal_Bool bMetaFile /* = sal_False */ ) const throw
     return aAny;
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes()
     throw (uno::RuntimeException)
@@ -745,7 +745,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes()
     }
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
     throw(uno::RuntimeException)
@@ -1024,7 +1024,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
     }
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
     throw (uno::RuntimeException)
@@ -1049,16 +1049,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
     return pID->getImplementationId() ;
 }
 
-//----------------------------------------------------------------------
+
 
 Reference< uno::XInterface > SvxShape_NewInstance()
 {
     return uno::Reference< uno::XInterface >(static_cast< OWeakObject* >( new SvxShape() ) );
 }
 
-//----------------------------------------------------------------------
+
 // SfxListener
-//----------------------------------------------------------------------
+
 
 void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
 {
@@ -1115,7 +1115,7 @@ void SvxShape::Notify( SfxBroadcaster&, const SfxHint& rHint ) throw()
 
 // XShape
 
-//----------------------------------------------------------------------
+
 // The "*LogicRectHack" functions also existed in sch, and those
 // duplicate symbols cause Bad Things To Happen (TM)  #i9462#.
 // Prefixing with 'svx' and marking static to make sure name collisions
@@ -1147,7 +1147,7 @@ static bool svx_needLogicRectHack( SdrObject* pObj )
     return false;
 }
 
-//----------------------------------------------------------------------
+
 
 static Rectangle svx_getLogicRectHack( SdrObject* pObj )
 {
@@ -1161,7 +1161,7 @@ static Rectangle svx_getLogicRectHack( SdrObject* pObj )
     }
 }
 
-//----------------------------------------------------------------------
+
 
 static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
 {
@@ -1175,7 +1175,7 @@ static void svx_setLogicRectHack( SdrObject* pObj, const Rectangle& rRect )
     }
 }
 
-//----------------------------------------------------------------------
+
 
 awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
 {
@@ -1199,7 +1199,7 @@ awt::Point SAL_CALL SvxShape::getPosition() throw(uno::RuntimeException)
     }
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
@@ -1229,7 +1229,7 @@ void SAL_CALL SvxShape::setPosition( const awt::Point& Position ) throw(uno::Run
     maPosition = Position;
 }
 
-//----------------------------------------------------------------------
+
 awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
@@ -1245,7 +1245,7 @@ awt::Size SAL_CALL SvxShape::getSize() throw(uno::RuntimeException)
         return maSize;
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
     throw(beans::PropertyVetoException, uno::RuntimeException)
 {
@@ -1296,7 +1296,7 @@ void SAL_CALL SvxShape::setSize( const awt::Size& rSize )
     maSize = rSize;
 }
 
-//----------------------------------------------------------------------
+
 
 // XNamed
 OUString SAL_CALL SvxShape::getName(  ) throw(::com::sun::star::uno::RuntimeException)
@@ -1312,7 +1312,7 @@ OUString SAL_CALL SvxShape::getName(  ) throw(::com::sun::star::uno::RuntimeExce
     }
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException)
 {
@@ -1329,7 +1329,7 @@ void SAL_CALL SvxShape::setName( const OUString& aName ) throw(::com::sun::star:
 
 // XShapeDescriptor
 
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
 {
     if( !maShapeType.getLength() )
@@ -1340,7 +1340,7 @@ OUString SAL_CALL SvxShape::getShapeType() throw(uno::RuntimeException)
 
 // XComponent
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException)
 {
     ::SolarMutexGuard aGuard;
@@ -1398,7 +1398,7 @@ void SAL_CALL SvxShape::dispose() throw(uno::RuntimeException)
     }
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener >& xListener )
     throw(uno::RuntimeException)
@@ -1406,7 +1406,7 @@ void SAL_CALL SvxShape::addEventListener( const Reference< lang::XEventListener
     mpImpl->maDisposeListeners.addInterface(xListener);
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListener >& aListener ) throw(uno::RuntimeException)
 {
@@ -1415,7 +1415,7 @@ void SAL_CALL SvxShape::removeEventListener( const Reference< lang::XEventListen
 
 // XPropertySet
 
-//----------------------------------------------------------------------
+
 
 Reference< beans::XPropertySetInfo > SAL_CALL
     SvxShape::getPropertySetInfo() throw(uno::RuntimeException)
@@ -1436,7 +1436,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL
     return mpPropSet->getPropertySetInfo();
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -1444,7 +1444,7 @@ void SAL_CALL SvxShape::addPropertyChangeListener( const OUString& _propertyName
     mpImpl->maPropertyNotifier.addPropertyChangeListener( _propertyName, _listener );
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyName, const Reference< beans::XPropertyChangeListener >& _listener  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
@@ -1452,21 +1452,21 @@ void SAL_CALL SvxShape::removePropertyChangeListener( const OUString& _propertyN
     mpImpl->maPropertyNotifier.removePropertyChangeListener( _propertyName, _listener );
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::addVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OSL_FAIL( "SvxShape::addVetoableChangeListener: don't have any vetoable properties, so why ...?" );
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Reference< beans::XVetoableChangeListener >&  ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OSL_FAIL( "SvxShape::removeVetoableChangeListener: don't have any vetoable properties, so why ...?" );
 }
 
-//----------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName )
 {
@@ -1485,7 +1485,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
     }
 }
 
-//----------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet, SdrModel* pModel )
 {
@@ -1616,7 +1616,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
     return sal_True;
 }
 
-//----------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName, SfxItemSet& rSet )
 {
@@ -1669,7 +1669,7 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
     return sal_False;
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::setPropertyValue( const OUString& rPropertyName, const uno::Any& rVal )
     throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
@@ -1800,7 +1800,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
     }
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -1811,7 +1811,7 @@ uno::Any SAL_CALL SvxShape::getPropertyValue( const OUString& PropertyName )
         return _getPropertyValue( PropertyName );
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
     throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -1870,7 +1870,7 @@ uno::Any SvxShape::_getPropertyValue( const OUString& PropertyName )
     return aAny;
 }
 
-//----------------------------------------------------------------------
+
 
 // XMultiPropertySet
 void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
@@ -1932,7 +1932,7 @@ void SAL_CALL SvxShape::setPropertyValues( const ::com::sun::star::uno::Sequence
         mpObj->SetMergedItemSetAndBroadcast( *mpImpl->mpItemSet );
 }
 
-//----------------------------------------------------------------------
+
 
 void SvxShape::endSetPropertyValues()
 {
@@ -1944,7 +1944,7 @@ void SvxShape::endSetPropertyValues()
     }
 }
 
-//----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL SvxShape::getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -2001,7 +2001,7 @@ void SAL_CALL SvxShape::firePropertiesChangeEvent( const ::com::sun::star::uno::
 {
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) const
 {
@@ -2082,7 +2082,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
     return aAny;
 }
 
-//----------------------------------------------------------------------
+
 
 // XPropertyState
 beans::PropertyState SAL_CALL SvxShape::getPropertyState( const OUString& PropertyName )
@@ -2166,7 +2166,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
     return eState;
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, 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, ::com::sun::star::uno::RuntimeException)
 {
@@ -2612,7 +2612,7 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
     throw lang::IllegalArgumentException();
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -3000,7 +3000,7 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
     return true;
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
@@ -3031,7 +3031,7 @@ bool SvxShape::getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty
     return true;
 }
 
-//----------------------------------------------------------------------
+
 
 bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
@@ -3052,7 +3052,7 @@ bool SvxShape::setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProp
     }
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( const uno::Sequence< OUString >& aPropertyName )
     throw(beans::UnknownPropertyException, uno::RuntimeException)
@@ -3069,7 +3069,7 @@ uno::Sequence< beans::PropertyState > SAL_CALL SvxShape::getPropertyStates( cons
     return aRet;
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::setPropertyToDefault( const OUString& PropertyName )
     throw(beans::UnknownPropertyException, uno::RuntimeException)
@@ -3102,7 +3102,7 @@ void SAL_CALL SvxShape::_setPropertyToDefault( const OUString& PropertyName )
     mpModel->SetChanged();
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShape::getPropertyDefault( const OUString& aPropertyName )
     throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
@@ -3191,11 +3191,11 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults(
     return uno::Sequence<uno::Any>( &ret[0], ret.size() );
 }
 
-//----------------------------------------------------------------------
 
-//----------------------------------------------------------------------
+
+
 // XServiceInfo
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxShape::getImplementationName()
     throw(uno::RuntimeException)
 {
@@ -3839,7 +3839,7 @@ uno::Reference< container::XIndexContainer > SAL_CALL SvxShape::getGluePoints()
     return xGluePoints;
 }
 
-//----------------------------------------------------------------------
+
 
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent(  )
@@ -3872,7 +3872,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxShape::getParent(  )
     return xParent;
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& )
     throw(lang::NoSupportException, uno::RuntimeException)
@@ -3880,21 +3880,21 @@ void SAL_CALL SvxShape::setParent( const ::com::sun::star::uno::Reference< ::com
     throw lang::NoSupportException();
 }
 
-//----------------------------------------------------------------------
+
 
 /** called from the XActionLockable interface methods on initial locking */
 void SvxShape::lock()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 /** called from the XActionLockable interface methods on final unlock */
 void SvxShape::unlock()
 {
 }
 
-//----------------------------------------------------------------------
+
 
 // XActionLockable
 sal_Bool SAL_CALL SvxShape::isActionLocked(  ) throw (::com::sun::star::uno::RuntimeException)
@@ -3904,7 +3904,7 @@ sal_Bool SAL_CALL SvxShape::isActionLocked(  ) throw (::com::sun::star::uno::Run
     return mnLockCount != 0;
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::addActionLock(  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3917,7 +3917,7 @@ void SAL_CALL SvxShape::addActionLock(  ) throw (::com::sun::star::uno::RuntimeE
         lock();
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::removeActionLock(  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3930,7 +3930,7 @@ void SAL_CALL SvxShape::removeActionLock(  ) throw (::com::sun::star::uno::Runti
         unlock();
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException )
 {
@@ -3945,7 +3945,7 @@ void SAL_CALL SvxShape::setActionLocks( sal_Int16 nLock ) throw (::com::sun::sta
     mnLockCount = (sal_uInt16)nLock;
 }
 
-//----------------------------------------------------------------------
+
 
 sal_Int16 SAL_CALL SvxShape::resetActionLocks(  ) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -3960,7 +3960,7 @@ sal_Int16 SAL_CALL SvxShape::resetActionLocks(  ) throw (::com::sun::star::uno::
     return nOldLocks;
 }
 
-//----------------------------------------------------------------------
+
 
 /** since polygon shapes can change theire kind during editing, we have
     to recheck it here.
@@ -4003,7 +4003,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject ) throw ()
         SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) );
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw ()
 : SvxShape( pObject, pPropertyMap, pPropertySet ), SvxUnoTextBase( ImplGetSvxUnoOutlinerTextCursorSvxPropertySet() )
 {
@@ -4011,7 +4011,7 @@ SvxShapeText::SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* p
         SetEditSource( new SvxTextEditSource( pObject, 0, static_cast< uno::XWeak * >( this ) ) );
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeText::~SvxShapeText() throw ()
 {
     // check if only this instance is registered at the ranges
@@ -4027,14 +4027,14 @@ void SvxShapeText::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage )
 }
 
 // XInterface
-//----------------------------------------------------------------------
+
 uno::Any SAL_CALL SvxShapeText::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException )
 {
     return SvxShape::queryInterface( rType );
 }
 
-//----------------------------------------------------------------------
+
 
 uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -4046,41 +4046,41 @@ uno::Any SAL_CALL SvxShapeText::queryAggregation( const uno::Type & rType )
     return SvxUnoTextBase::queryAggregation( rType );
 }
 
-//----------------------------------------------------------------------
+
 
 void SAL_CALL SvxShapeText::acquire() throw()
 {
     SvxShape::acquire();
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeText::release() throw()
 {
     SvxShape::release();
 }
 
 // XServiceInfo
-//----------------------------------------------------------------------
+
 OUString SAL_CALL SvxShapeText::getImplementationName() throw( uno::RuntimeException )
 {
     static OUString aServiceName("SvxShapeText");
     return aServiceName;
 }
 
-//----------------------------------------------------------------------
+
 uno::Sequence< OUString > SAL_CALL SvxShapeText::getSupportedServiceNames() throw( uno::RuntimeException )
 {
     return SvxShape::getSupportedServiceNames();
 }
 
-//----------------------------------------------------------------------
+
 sal_Bool SAL_CALL SvxShapeText::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException )
 {
     return SvxShape::supportsService(ServiceName);
 }
 
     // XTypeProvider
-//----------------------------------------------------------------------
+
 uno::Sequence< uno::Type > SAL_CALL SvxShapeText::getTypes()
     throw( uno::RuntimeException )
 {
@@ -4096,7 +4096,7 @@ sal_Int64 SAL_CALL SvxShapeText::getSomething( const ::com::sun::star::uno::Sequ
     return SvxUnoTextBase::getSomething( rId );
 }
 
-//----------------------------------------------------------------------
+
 uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId()
     throw( uno::RuntimeException )
 {
@@ -4120,7 +4120,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId()
     return pID->getImplementationId() ;
 }
 
-//----------------------------------------------------------------------
+
 
 /** called from the XActionLockable interface methods on initial locking */
 void SvxShapeText::lock()
@@ -4130,7 +4130,7 @@ void SvxShapeText::lock()
         pEditSource->lock();
 }
 
-//----------------------------------------------------------------------
+
 
 /** called from the XActionLockable interface methods on final unlock */
 void SvxShapeText::unlock()
@@ -4262,9 +4262,9 @@ void SAL_CALL SvxShapeRect::release() throw()
 {
     OWeakAggObject::release();
 }
-//----------------------------------------------------------------------
+
 // XServiceInfo
-//----------------------------------------------------------------------
+
 uno::Sequence< OUString > SvxShapeRect::getSupportedServiceNames(void) throw( uno::RuntimeException )
 {
     return SvxShape::getSupportedServiceNames();
@@ -4284,7 +4284,7 @@ SdrObject* GetSdrObjectFromXShape( uno::Reference< drawing::XShape > xShape ) th
     return pShape ? pShape->GetSdrObject() : 0;
 }
 
-//----------------------------------------------------------------------
+
 
 SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInt )
 {
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index 925a88146d9b..e874d6c7c0df 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -87,7 +87,7 @@ SvxShapeCollection::SvxShapeCollection() throw()
 {
 }
 
-//----------------------------------------------------------------------
+
 SvxShapeCollection::~SvxShapeCollection() throw()
 {
 }
@@ -204,25 +204,25 @@ void SAL_CALL SvxShapeCollection::removeEventListener( const ::com::sun::star::u
 }
 
 // XShapes
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeCollection::add( const Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException )
 {
     maShapeContainer.addInterface( xShape );
 }
 
-//----------------------------------------------------------------------
+
 void SAL_CALL SvxShapeCollection::remove( const uno::Reference< drawing::XShape >& xShape ) throw( uno::RuntimeException )
 {
     maShapeContainer.removeInterface( xShape );
 }
 
-//----------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SvxShapeCollection::getCount() throw( uno::RuntimeException )
 {
     return maShapeContainer.getLength();
 }
 
-//----------------------------------------------------------------------
+
 uno::Any SAL_CALL SvxShapeCollection::getByIndex( sal_Int32 Index )
     throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException )
 {
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index eb3dcb39cdc9..43a6a1ef63f3 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -53,9 +53,9 @@ using namespace ::rtl;
 
 using ::com::sun::star::uno::XInterface;
 
-//------------------------------------------------------------------------
+
 // SvxTextEditSourceImpl
-//------------------------------------------------------------------------
+
 
 /** @descr
     <p>This class essentially provides the text and view forwarders. If
@@ -158,7 +158,7 @@ public:
     void                    UpdateOutliner();
 };
 
-//------------------------------------------------------------------------
+
 
 SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText, XInterface* pOwner )
   : maRefCount      ( 0 ),
@@ -196,7 +196,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
         mpObject->AddObjectUser( *this );
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText, SdrView& rView, const Window& rWindow )
   : maRefCount      ( 0 ),
@@ -236,7 +236,7 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
     mbShapeIsEditMode = IsEditMode();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextEditSourceImpl::~SvxTextEditSourceImpl()
 {
@@ -247,7 +247,7 @@ SvxTextEditSourceImpl::~SvxTextEditSourceImpl()
     dispose();
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange )
 {
@@ -256,7 +256,7 @@ void SvxTextEditSourceImpl::addRange( SvxUnoTextRangeBase* pNewRange )
             maTextRanges.push_back( pNewRange );
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange )
 {
@@ -264,21 +264,21 @@ void SvxTextEditSourceImpl::removeRange( SvxUnoTextRangeBase* pOldRange )
         maTextRanges.remove( pOldRange );
 }
 
-//------------------------------------------------------------------------
+
 
 const SvxUnoTextRangeBaseList& SvxTextEditSourceImpl::getRanges() const
 {
     return maTextRanges;
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL SvxTextEditSourceImpl::acquire()
 {
     osl_atomic_increment( &maRefCount );
 }
 
-//------------------------------------------------------------------------
+
 
 void SAL_CALL SvxTextEditSourceImpl::release()
 {
@@ -331,7 +331,7 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* pNewModel )
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEditSourceImpl::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
 {
@@ -529,7 +529,7 @@ void SvxTextEditSourceImpl::dispose()
     mpWindow = 0;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEditSourceImpl::SetupOutliner()
 {
@@ -552,7 +552,7 @@ void SvxTextEditSourceImpl::SetupOutliner()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEditSourceImpl::UpdateOutliner()
 {
@@ -575,7 +575,7 @@ void SvxTextEditSourceImpl::UpdateOutliner()
     }
 }
 
-//------------------------------------------------------------------------
+
 
 
 
@@ -713,7 +713,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
     return mpTextForwarder;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder()
 {
@@ -731,7 +731,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetEditModeTextForwarder()
     return mpTextForwarder;
 }
 
-//------------------------------------------------------------------------
+
 
 SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder()
 {
@@ -765,7 +765,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetTextForwarder()
         return GetBackgroundTextForwarder();
 }
 
-//------------------------------------------------------------------------
+
 
 SvxDrawOutlinerViewForwarder* SvxTextEditSourceImpl::CreateViewForwarder()
 {
@@ -849,7 +849,7 @@ SvxEditViewForwarder* SvxTextEditSourceImpl::GetEditViewForwarder( sal_Bool bCre
     return mpViewForwarder;
 }
 
-//------------------------------------------------------------------------
+
 
 void SvxTextEditSourceImpl::UpdateData()
 {
@@ -1039,11 +1039,11 @@ IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify*, aNotify)
     return 0;
 }
 
-//------------------------------------------------------------------------
 
-// --------------------------------------------------------------------
+
+
 // SvxTextEditSource
-// --------------------------------------------------------------------
+
 
 SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText, XInterface* pOwner )
 {
@@ -1051,14 +1051,14 @@ SvxTextEditSource::SvxTextEditSource( SdrObject* pObject, SdrText* pText, XInter
     mpImpl->acquire();
 }
 
-// --------------------------------------------------------------------
+
 SvxTextEditSource::SvxTextEditSource( SdrObject& rObj, SdrText* pText, SdrView& rView, const Window& rWindow )
 {
     mpImpl = new SvxTextEditSourceImpl( rObj, pText, rView, rWindow );
     mpImpl->acquire();
 }
 
-// --------------------------------------------------------------------
+
 
 SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl )
 {
@@ -1066,7 +1066,7 @@ SvxTextEditSource::SvxTextEditSource( SvxTextEditSourceImpl* pImpl )
     mpImpl->acquire();
 }
 
-//------------------------------------------------------------------------
+
 SvxTextEditSource::~SvxTextEditSource()
 {
     ::SolarMutexGuard aGuard;
@@ -1074,31 +1074,31 @@ SvxTextEditSource::~SvxTextEditSource()
     mpImpl->release();
 }
 
-//------------------------------------------------------------------------
+
 SvxEditSource* SvxTextEditSource::Clone() const
 {
     return new SvxTextEditSource( mpImpl );
 }
 
-//------------------------------------------------------------------------
+
 SvxTextForwarder* SvxTextEditSource::GetTextForwarder()
 {
     return mpImpl->GetTextForwarder();
 }
 
-//------------------------------------------------------------------------
+
 SvxEditViewForwarder* SvxTextEditSource::GetEditViewForwarder( bool bCreate )
 {
     return mpImpl->GetEditViewForwarder( bCreate );
 }
 
-//------------------------------------------------------------------------
+
 SvxViewForwarder* SvxTextEditSource::GetViewForwarder()
 {
     return this;
 }
 
-//------------------------------------------------------------------------
+
 void SvxTextEditSource::UpdateData()
 {
     mpImpl->UpdateData();
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index 32e28f55fdbe..b0e6a4afffe9 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star;
 
 namespace unogallery {
 
-// -----------------
+
 // - GalleryItem -
-// -----------------
+
 
 GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObject& rObject ) :
     ::comphelper::PropertySetHelper( createPropertySetInfo() ),
@@ -59,7 +59,7 @@ GalleryItem::GalleryItem( ::unogallery::GalleryTheme& rTheme, const GalleryObjec
     mpTheme->implRegisterGalleryItem( *this );
 }
 
-// ------------------------------------------------------------------------------
+
 
 GalleryItem::~GalleryItem()
     throw()
@@ -68,14 +68,14 @@ GalleryItem::~GalleryItem()
         mpTheme->implDeregisterGalleryItem( *this );
 }
 
-// ------------------------------------------------------------------------------
+
 
 bool GalleryItem::isValid() const
 {
     return( mpTheme != NULL );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -100,7 +100,7 @@ uno::Any SAL_CALL GalleryItem::queryAggregation( const uno::Type & rType )
     return aAny;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType )
     throw( uno::RuntimeException )
@@ -108,7 +108,7 @@ uno::Any SAL_CALL GalleryItem::queryInterface( const uno::Type & rType )
     return OWeakAggObject::queryInterface( rType );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GalleryItem::acquire()
     throw()
@@ -116,7 +116,7 @@ void SAL_CALL GalleryItem::acquire()
     OWeakAggObject::acquire();
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GalleryItem::release()
     throw()
@@ -124,7 +124,7 @@ void SAL_CALL GalleryItem::release()
     OWeakAggObject::release();
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString GalleryItem::getImplementationName_Static()
     throw()
@@ -132,7 +132,7 @@ OUString GalleryItem::getImplementationName_Static()
     return OUString( "com.sun.star.comp.gallery.GalleryItem" );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > GalleryItem::getSupportedServiceNames_Static()
     throw()
@@ -189,7 +189,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId()
     return theGalleryItemImplementationId::get().getSeq();
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL GalleryItem::getType()
     throw (uno::RuntimeException)
@@ -219,7 +219,7 @@ sal_Int8 SAL_CALL GalleryItem::getType()
     return nRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::comphelper::PropertySetInfo* GalleryItem::createPropertySetInfo()
 {
@@ -255,7 +255,7 @@ sal_Int8 SAL_CALL GalleryItem::getType()
     return pRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues )
     throw( beans::UnknownPropertyException,
@@ -302,7 +302,7 @@ void GalleryItem::_setPropertyValues( const comphelper::PropertyMapEntry** ppEnt
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValue )
     throw( beans::UnknownPropertyException,
@@ -408,14 +408,14 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 const ::GalleryObject* GalleryItem::implGetObject() const
 {
     return mpGalleryObject;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryItem::implSetInvalid()
 {
@@ -426,9 +426,9 @@ void GalleryItem::implSetInvalid()
     }
 }
 
-// -----------------------
+
 // - GalleryDrawingModel -
-// -----------------------
+
 
 GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc )
     throw() :
@@ -436,7 +436,7 @@ GalleryDrawingModel::GalleryDrawingModel( SdrModel* pDoc )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 GalleryDrawingModel::~GalleryDrawingModel()
     throw()
@@ -444,7 +444,7 @@ GalleryDrawingModel::~GalleryDrawingModel()
     delete GetDoc();
 }
 
-// -----------------------------------------------------------------------------
+
 
 UNO3_GETIMPLEMENTATION_IMPL( GalleryDrawingModel );
 
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 7017871b7519..24e441484fe3 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -38,9 +38,9 @@ using namespace ::com::sun::star;
 
 namespace unogallery {
 
-// -----------------
+
 // - GalleryTheme -
-// -----------------
+
 
 GalleryTheme::GalleryTheme( const OUString& rThemeName )
 {
@@ -51,7 +51,7 @@ GalleryTheme::GalleryTheme( const OUString& rThemeName )
         StartListening( *mpGallery );
 }
 
-// ------------------------------------------------------------------------------
+
 
 GalleryTheme::~GalleryTheme()
 {
@@ -70,7 +70,7 @@ GalleryTheme::~GalleryTheme()
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString GalleryTheme::getImplementationName_Static()
     throw()
@@ -78,7 +78,7 @@ OUString GalleryTheme::getImplementationName_Static()
     return OUString( "com.sun.star.comp.gallery.GalleryTheme" );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > GalleryTheme::getSupportedServiceNames_Static()
     throw()
@@ -134,7 +134,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId()
     return theGalleryThemeImplementationId::get().getSeq();
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Type SAL_CALL GalleryTheme::getElementType()
     throw (uno::RuntimeException)
@@ -142,7 +142,7 @@ uno::Type SAL_CALL GalleryTheme::getElementType()
     return ::getCppuType( (const uno::Reference< gallery::XGalleryItem >*) 0);
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL GalleryTheme::hasElements()
     throw (uno::RuntimeException)
@@ -152,7 +152,7 @@ sal_Bool SAL_CALL GalleryTheme::hasElements()
     return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) );
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL GalleryTheme::getCount()
     throw (uno::RuntimeException)
@@ -162,7 +162,7 @@ sal_Int32 SAL_CALL GalleryTheme::getCount()
     return( mpTheme ? mpTheme->GetObjectCount() : 0 );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
     throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
@@ -188,7 +188,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex )
     return aRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 OUString SAL_CALL GalleryTheme::getName(  )
     throw (uno::RuntimeException)
@@ -202,7 +202,7 @@ OUString SAL_CALL GalleryTheme::getName(  )
     return aRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GalleryTheme::update(  )
     throw (uno::RuntimeException)
@@ -216,7 +216,7 @@ void SAL_CALL GalleryTheme::update(  )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex(
     const OUString& rURL, ::sal_Int32 nIndex )
@@ -249,7 +249,7 @@ void SAL_CALL GalleryTheme::update(  )
     return nRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex(
     const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex )
@@ -277,7 +277,7 @@ void SAL_CALL GalleryTheme::update(  )
     return nRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex(
     const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex )
@@ -333,7 +333,7 @@ void SAL_CALL GalleryTheme::update(  )
     return nRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
@@ -349,7 +349,7 @@ void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
 {
@@ -386,7 +386,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryTheme::implReleaseItems( GalleryObject* pObj )
 {
@@ -404,14 +404,14 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj )
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 ::GalleryTheme* GalleryTheme::implGetTheme() const
 {
     return mpTheme;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem )
 {
@@ -421,7 +421,7 @@ void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem )
     maItemList.push_back( &rItem );
 }
 
-// ------------------------------------------------------------------------------
+
 
 void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem )
 {
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index a94224673d22..280f8ad8f0bc 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -112,7 +112,7 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >&
     }
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Type SAL_CALL GalleryThemeProvider::getElementType()
     throw (uno::RuntimeException)
@@ -120,7 +120,7 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType()
     return ::getCppuType( (const uno::Reference< gallery::XGalleryTheme >*) 0);
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
     throw (uno::RuntimeException)
@@ -130,7 +130,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasElements()
     return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName )
     throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
@@ -150,7 +150,7 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const OUString& rName )
     return aRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames()
     throw (uno::RuntimeException)
@@ -172,7 +172,7 @@ uno::Sequence< OUString > SAL_CALL GalleryThemeProvider::getElementNames()
     return aSeq;
 }
 
-// ------------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName )
     throw (uno::RuntimeException)
@@ -187,7 +187,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const OUString& rName )
     return( bRet );
 }
 
-// ------------------------------------------------------------------------------
+
 
 uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const OUString& rThemeName )
     throw (container::ElementExistException, uno::RuntimeException)
@@ -210,7 +210,7 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe
     return xRet;
 }
 
-// ------------------------------------------------------------------------------
+
 
 void SAL_CALL GalleryThemeProvider::removeByName( const OUString& rName )
     throw (container::NoSuchElementException, uno::RuntimeException)
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 4f6ac4a37ecc..28663b1cc12c 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star::lang;
 #define XML_EMBEDDEDOBJECT_URL_BASE     "vnd.sun.star.EmbeddedObject:"
 #define XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE      "vnd.sun.star.GraphicObject:"
 
-// -----------------------------------------------------------------------------
+
 
 class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper1<XOutputStream>
 {
diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx
index f57351088fd1..4f0270c5761f 100644
--- a/svx/source/xml/xmlexport.cxx
+++ b/svx/source/xml/xmlexport.cxx
@@ -175,7 +175,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu
         if ( xTargetModel.is() )
             xTargetModel->lockControllers();
 
-        // -------------------------------------
+
 
         pGraphicHelper = SvXMLGraphicHelper::Create( GRAPHICHELPER_MODE_READ );
         xGraphicResolver = pGraphicHelper;
@@ -189,7 +189,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu
             xObjectResolver = pObjectHelper;
         }
 
-        // -------------------------------------
+
 
         if( 0 == nRet )
         {
diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx
index 2980724d156b..856fe4a74c2f 100644
--- a/svx/workben/msview/msview.cxx
+++ b/svx/workben/msview/msview.cxx
@@ -793,7 +793,7 @@ private:
     DECL_LINK( implMenuHdl, Menu* );
 };
 
-// -----------------------------------------------------------------------
+
 
 void MSViewerWorkWindow::onView()
 {
@@ -870,7 +870,7 @@ PPTDocumentPtr MSViewerWorkWindow::Load()
     return pDocument;
 }
 
-// -----------------------------------------------------------------------
+
 
 MSViewerWorkWindow::MSViewerWorkWindow() :
     WorkWindow( 0, WB_APP | WB_STDWORK | WB_3DLOOK ),mbSelectHdlGuard(false)
@@ -909,7 +909,7 @@ MSViewerWorkWindow::MSViewerWorkWindow() :
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static String GetAtomText( const Atom* pAtom )
 {
@@ -1035,7 +1035,7 @@ IMPL_LINK( MSViewerWorkWindow, implMenuHdl, Menu*, pMenu )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 MSViewerWorkWindow::~MSViewerWorkWindow()
 {
@@ -1050,7 +1050,7 @@ MSViewerWorkWindow::~MSViewerWorkWindow()
     delete mpMenuBar;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MSViewerWorkWindow::Resize()
 {
@@ -1076,9 +1076,9 @@ void MSViewerWorkWindow::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
     SAL_IMPLEMENT_MAIN()
 {
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 4cd0fc65ba2f..46fe10e390ea 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -172,14 +172,14 @@ void SAL_CALL
 //=====  XAccessibleSelection  ============================================
 //
 
-//--------------------------------------------------------------------------------
+
 void SAL_CALL SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
     DBG_ASSERT( false, "<SwAccessibleTextFrame::selectAccessibleChild( sal_Int32 )> - missing implementation" );
 }
 
-//----------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nChildIndex )
     throw (lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
@@ -206,21 +206,21 @@ sal_Bool SAL_CALL SwAccessibleTextFrame::isAccessibleChildSelected( sal_Int32 nC
     return sal_False;
 }
 
-//---------------------------------------------------------------------
+
 void SAL_CALL SwAccessibleTextFrame::clearAccessibleSelection(  )
     throw ( uno::RuntimeException )
 {
     DBG_ASSERT( false, "<SwAccessibleTextFrame::clearAccessibleSelection(  )> - missing implementation" );
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL SwAccessibleTextFrame::selectAllAccessibleChildren(  )
     throw ( uno::RuntimeException )
 {
     DBG_ASSERT( false, "<SwAccessibleTextFrame::selectAllAccessibleChildren(  )> - missing implementation" );
 }
 
-//----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount()
     throw ( uno::RuntimeException )
 {
@@ -232,7 +232,7 @@ sal_Int32 SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChildCount()
     return nCount;
 }
 
-//--------------------------------------------------------------------------------------
+
 uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException)
 {
@@ -251,7 +251,7 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTextFrame::getSelectedAccessibl
     return uno::Reference<XAccessible>();
 }
 
-//----------------------------------------------------------------------------------
+
 void SAL_CALL SwAccessibleTextFrame::deselectAccessibleChild( sal_Int32 )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
 {
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 57a6cae4cd89..d62219874f21 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -27,9 +27,9 @@ static SwClientIter* pClientIters = 0;
 
 TYPEINIT0( SwClient );
 
-// ----------
+
 // SwClient
-// ----------
+
 
 SwClient::SwClient( SwModify* pToRegisterIn )
     : pLeft( 0 ), pRight( 0 ), pRegisteredIn( 0 ), mbIsAllowedToBeRemovedInModifyCall( false )
@@ -84,9 +84,9 @@ bool SwClient::GetInfo( SfxPoolItem& ) const
     return true;
 }
 
-// ----------
+
 // SwModify
-// ----------
+
 
 SwModify::SwModify()
     : SwClient(0), pRoot(0)
@@ -359,9 +359,9 @@ void SwModify::ModifyBroadcast( const SfxPoolItem* pOldValue, const SfxPoolItem*
     }
 }
 
-// ----------
+
 // SwDepend
-// ----------
+
 
 SwDepend::SwDepend( SwClient* pTellHim, SwModify* pDepend )
     : SwClient( pDepend )
@@ -388,9 +388,9 @@ bool SwDepend::GetInfo( SfxPoolItem& rInfo ) const
     return pToTell ? pToTell->GetInfo( rInfo ) : true;
 }
 
-// ------------
+
 // SwClientIter
-// ------------
+
 
 SwClientIter::SwClientIter( const SwModify& rModify )
     : rRoot( rModify )
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index df5525b7d06c..1722936ed22e 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -31,9 +31,9 @@
 #include <switerator.hxx>
 #include <swtable.hxx>
 
-// -----------------
+
 // SwTblBoxNumFormat
-// -----------------
+
 
 SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, sal_Bool bFlag )
     : SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag )
@@ -52,9 +52,9 @@ SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const
     return new SwTblBoxNumFormat( GetValue(), bAuto );
 }
 
-// -----------------
+
 // SwTblBoxFormula
-// -----------------
+
 
 SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula )
     : SfxPoolItem( RES_BOXATR_FORMULA ),
@@ -196,9 +196,9 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
     }
 }
 
-// -------------
+
 // SwTblBoxValue
-// -------------
+
 
 SwTblBoxValue::SwTblBoxValue()
     : SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 9e7de6f47311..0c38fef4486b 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -36,9 +36,9 @@
 #include <svl/whiter.hxx>
 #include <svx/xtable.hxx>
 
-// ----------
+
 // SwAttrPool
-// ----------
+
 
 SwAttrPool::SwAttrPool( SwDoc* pD )
     : SfxItemPool( OUString("SWG"),
@@ -60,9 +60,9 @@ SwAttrPool::~SwAttrPool()
 {
 }
 
-// ---------
+
 // SwAttrSet
-// ---------
+
 
 SwAttrSet::SwAttrSet( SwAttrPool& rPool, sal_uInt16 nWh1, sal_uInt16 nWh2 )
     : SfxItemSet( rPool, nWh1, nWh2 ), pOldSet( 0 ), pNewSet( 0 )
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index f3c0cc630752..7caf1f49acf8 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -26,9 +26,9 @@
 
 TYPEINIT0(SwIndexReg);
 
-// -------
+
 // SwIndex
-// -------
+
 
 SwIndex::SwIndex(SwIndexReg *const pReg, sal_Int32 const nIdx)
     : m_nIndex( nIdx )
@@ -213,9 +213,9 @@ SwIndex& SwIndex::Assign( SwIndexReg* pArr, sal_Int32 nIdx )
     return *this;
 }
 
-// ----------
+
 // SwIndexReg
-// ----------
+
 
 SwIndexReg::SwIndexReg()
     : m_pFirst( 0 ), m_pLast( 0 )
@@ -287,9 +287,9 @@ void SwIndexReg::MoveTo( SwIndexReg& rArr )
 
 #ifdef DBG_UTIL
 
-// -------
+
 // SwIndex
-// -------
+
 
 sal_Int32 SwIndex::operator++(int)
 {
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8103f11c447b..f136cb300d12 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -113,9 +113,9 @@ void CheckRange( SwCursor* pCurCrsr )
     }
 }
 
-// -----------
+
 // SwCrsrShell
-// -----------
+
 
 SwPaM * SwCrsrShell::CreateCrsr()
 {
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 39bb271568a8..4d4c2f5eaa8a 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -1839,7 +1839,7 @@ void SwAutoFormat::AutoCorrect( sal_Int32 nPos )
               ( bReplaceSglQuote && '\'' == cChar ) ) &&
             (!nPos || ' ' == (*pTxt)[nPos-1]))
         {
-            // --------------------------------------
+
             // beachte: Sonderfall Symbolfonts !!!
             if( !aFInfo.GetFrm() )
                 aFInfo.SetFrm( GetFrm( *m_pCurTxtNd ) );
diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index 11a276567d9e..8f6747e9084f 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2035,7 +2035,7 @@ sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
     return sal_True;
 }
 
-// -------------------------------------------------------------------
+
 // These Classes copy the current table selections (rBoxes),
 // into a new structure, retaining the table structure
 // new: SS for targeted erasing/restoring of the layout
diff --git a/sw/source/core/layout/laycache.cxx b/sw/source/core/layout/laycache.cxx
index 212135404101..8f0f30610235 100644
--- a/sw/source/core/layout/laycache.cxx
+++ b/sw/source/core/layout/laycache.cxx
@@ -81,7 +81,7 @@ void SwLayoutCache::Read( SvStream &rStream )
     }
 }
 
-//-----------------------------------------------------------------------------
+
 
 void SwLayCacheImpl::Insert( sal_uInt16 nType, sal_uLong nIndex, sal_Int32 nOffset )
 {
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 0082908d8782..4b089c64c9cc 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2164,7 +2164,7 @@ void DrawGraphic( const SvxBrushItem *pBrush,
     }
 }
 
-//------------------------------------------------------------------------
+
 
 /** local help method for SwRootFrm::Paint(..) - Adjust given rectangle to pixel size
 
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 3a8d2ad5c708..74e06a96bb4d 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -145,9 +145,9 @@ void SAL_CALL SwOLEListener_Impl::disposing( const lang::EventObject& ) throw (u
         pOLELRU_Cache->RemoveObj( *mpObj );
 }
 
-// --------------------
+
 // SwEmbedObjectLink
-// --------------------
+
 // TODO/LATER: actually SwEmbedObjectLink should be used here, but because different objects are used to control
 //             embedded object different link objects with the same functionality had to be implemented
 
@@ -166,7 +166,7 @@ public:
     bool            Connect() { return GetRealObject() != NULL; }
 };
 
-// -----------------------------------------------------------------------------
+
 
 SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode):
     ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
@@ -175,13 +175,13 @@ SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode):
     SetSynchron( sal_False );
 }
 
-// -----------------------------------------------------------------------------
+
 
 SwEmbedObjectLink::~SwEmbedObjectLink()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ::sfx2::SvBaseLink::UpdateResult SwEmbedObjectLink::DataChanged(
     const OUString&, const uno::Any& )
@@ -216,7 +216,7 @@ SwEmbedObjectLink::~SwEmbedObjectLink()
     return SUCCESS;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SwEmbedObjectLink::Closed()
 {
@@ -225,9 +225,9 @@ void SwEmbedObjectLink::Closed()
 }
 
 
-// --------------------
+
 // SwOLENode
-// --------------------
+
 
 SwOLENode::SwOLENode( const SwNodeIndex &rWhere,
                     const svt::EmbeddedObjectRef& xObj,
diff --git a/sw/source/core/table/swnewtable.cxx b/sw/source/core/table/swnewtable.cxx
index c41aedfbc288..5f6b7714a4b4 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -46,7 +46,7 @@
 #define CHECK_TABLE(t)
 #endif
 
-// ---------------------------------------------------------------
+
 
 /** SwBoxSelection is a small helperclass (structure) to handle selections
     of cells (boxes) between table functions
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index a14351393ea3..25ed11ef4de2 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -79,7 +79,7 @@ SV_IMPL_REF( SwServerObject )
 
 void ChgTextToNum( SwTableBox& rBox, const OUString& rTxt, const Color* pCol,
                     sal_Bool bChgAlign,sal_uLong nNdPos );
-//----------------------------------
+
 
 class SwTableBox_Impl
 {
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 8592046108fa..55c0b6f25f85 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -413,7 +413,7 @@ bool operator == (const SwFormToken & rToken, FormTokenType eType)
     return rToken.eTokenType == eType;
 }
 
-//-----------------------------------------------------------------------------
+
 void SwForm::AdjustTabStops(SwDoc& rDoc, sal_Bool bInsertNewTapStops) // #i21237#
 {
     for(sal_uInt16 nLevel = 1; nLevel < GetFormMax(); nLevel++)
diff --git a/sw/source/core/txtnode/fntcache.cxx b/sw/source/core/txtnode/fntcache.cxx
index 7299bcb44a8e..ccaf3c03181c 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -851,11 +851,11 @@ void SwFntObj::DrawText( SwDrawTextInfo &rInf )
     //  bDirectPrint and bUseScrFont should have these values:
     //
     //  Outdev / RefDef  | Printer | VirtPrinter | Window
-    // ----------------------------------------------------
+
     //  Printer          | 1 - 0   | 0 - 1       | -
-    // ----------------------------------------------------
+
     //  VirtPrinter/PDF  | 0 - 1   | 0 - 1       | -
-    // ----------------------------------------------------
+
     //  Window/VirtWindow| 0 - 1   | 0 - 1       | 1 - 0
     //
     // Exception: During painting of a Writer OLE object, we do not have
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 177972a5ef15..8cf266c6cebb 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -184,9 +184,9 @@ SwTxtNode *SwNodes::MakeTxtNode( const SwNodeIndex & rWhere,
     } while( true );
 }
 
-// --------------------
+
 // SwTxtNode
-// --------------------
+
 
 SwTxtNode::SwTxtNode( const SwNodeIndex &rWhere,
                       SwTxtFmtColl *pTxtColl,
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 72b2eb08fa08..3d45dfa0a47d 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -3218,7 +3218,7 @@ bool SwpHints::TryInsertHint(
         return true;
     }
 
-    // ----------------------------------------------------------------
+
     // Ab hier gibt es nur noch pHint mit einem EndIdx !!!
 
     if( *pHtEnd < nHtStart )
diff --git a/sw/source/core/txtnode/txatritr.cxx b/sw/source/core/txtnode/txatritr.cxx
index c333191c2bfb..a09bb94344c6 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -94,7 +94,7 @@ bool SwScriptIterator::Next()
     return bRet;
 }
 
-// --------------------------------------------------------------------
+
 
 SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16 nWhchId,
                                         sal_Int32 nStt,
diff --git a/sw/source/core/undo/unbkmk.cxx b/sw/source/core/undo/unbkmk.cxx
index f2dd42e3b583..87848b74ece5 100644
--- a/sw/source/core/undo/unbkmk.cxx
+++ b/sw/source/core/undo/unbkmk.cxx
@@ -72,7 +72,7 @@ SwRewriter SwUndoBookmark::GetRewriter() const
     return aResult;
 }
 
-//----------------------------------------------------------------------
+
 
 
 SwUndoInsBookmark::SwUndoInsBookmark( const ::sw::mark::IMark& rBkmk )
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index b766fc23f88b..7dffdcb97648 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -112,7 +112,7 @@ OUString SwSdrUndo::GetComment() const
     return pSdrUndo->GetComment();
 }
 
-//--------------------------------------------
+
 
 static void lcl_SendRemoveToUno( SwFmt& rFmt )
 {
@@ -327,7 +327,7 @@ void SwUndoDrawGroup::SetGroupFmt( SwDrawFrmFmt* pFmt )
 }
 
 
-// ------------------------------
+
 
 SwUndoDrawUnGroup::SwUndoDrawUnGroup( SdrObjGroup* pObj )
     : SwUndo( UNDO_DRAWUNGROUP ), bDelFmt( sal_False )
@@ -503,7 +503,7 @@ void SwUndoDrawUnGroupConnectToLayout::AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt,
             std::pair< SwDrawFrmFmt*, SdrObject* >( pDrawFrmFmt, pDrawObject ) );
 }
 
-//-------------------------------------
+
 
 SwUndoDrawDelete::SwUndoDrawDelete( sal_uInt16 nCnt )
     : SwUndo( UNDO_DRAWDELETE ), nSize( nCnt ), bDelFmt( sal_True )
diff --git a/sw/source/core/undo/unfmco.cxx b/sw/source/core/undo/unfmco.cxx
index bfce6d1211cf..4e0aaa8279ad 100644
--- a/sw/source/core/undo/unfmco.cxx
+++ b/sw/source/core/undo/unfmco.cxx
@@ -25,7 +25,7 @@
 #include "rolbck.hxx"
 #include "docary.hxx"
 
-//--------------------------------------------------
+
 
 SwUndoFmtColl::SwUndoFmtColl( const SwPaM& rRange,
                               SwFmtColl* pColl,
diff --git a/sw/source/core/undo/unins.cxx b/sw/source/core/undo/unins.cxx
index dd09040acf22..d61d29f78996 100644
--- a/sw/source/core/undo/unins.cxx
+++ b/sw/source/core/undo/unins.cxx
@@ -57,7 +57,7 @@
 using namespace ::com::sun::star;
 
 
-//------------------------------------------------------------
+
 
 // INSERT
 
diff --git a/sw/source/core/undo/unspnd.cxx b/sw/source/core/undo/unspnd.cxx
index f44c81073993..84f8ebcf3026 100644
--- a/sw/source/core/undo/unspnd.cxx
+++ b/sw/source/core/undo/unspnd.cxx
@@ -32,7 +32,7 @@
 #include "docary.hxx"
 #include <IShellCursorSupplier.hxx>
 
-//------------------------------------------------------------------
+
 // SPLITNODE
 
 SwUndoSplitNode::SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos,
diff --git a/sw/source/core/unocore/XMLRangeHelper.cxx b/sw/source/core/unocore/XMLRangeHelper.cxx
index c90348d77fd3..ccf3e8701c0a 100644
--- a/sw/source/core/unocore/XMLRangeHelper.cxx
+++ b/sw/source/core/unocore/XMLRangeHelper.cxx
@@ -53,7 +53,7 @@ private:
     OUStringBuffer & m_aResultBuffer;
 };
 
-// ----------------------------------------
+
 
 /** unary function that removes backslash escapes in a sal_Unicode array (which
     you can get from an OUString with getStr()) and puts the result into the
@@ -75,7 +75,7 @@ private:
     OUStringBuffer & m_aResultBuffer;
 };
 
-// ----------------------------------------
+
 
 void lcl_getXMLStringForCell( const /*::chart::*/XMLRangeHelper::Cell & rCell, OUStringBuffer * output )
 {
diff --git a/sw/source/filter/ascii/ascatr.cxx b/sw/source/filter/ascii/ascatr.cxx
index 23719cd01f40..097145bbdc07 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -169,9 +169,9 @@ bool SwASC_AttrIter::OutAttr( sal_Int32 nSwPos )
 }
 
 
-//------------------------
+
 // Output of the node
-//------------------------
+
 
 static Writer& OutASC_SwTxtNode( Writer& rWrt, SwCntntNode& rNode )
 {
diff --git a/sw/source/filter/ascii/wrtasc.cxx b/sw/source/filter/ascii/wrtasc.cxx
index 9b501d0822b4..67ac4c6a7234 100644
--- a/sw/source/filter/ascii/wrtasc.cxx
+++ b/sw/source/filter/ascii/wrtasc.cxx
@@ -31,7 +31,7 @@
 
 #include <statstr.hrc>
 
-//-----------------------------------------------------------------
+
 
 SwASCWriter::SwASCWriter( const OUString& rFltNm )
 {
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 48ee4f422732..12e7c93eaa96 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -221,9 +221,9 @@ sal_Bool SwReader::CheckPasswd( const OUString& /*rPasswd*/, const Reader& /*rOp
 
 
 
-//-----------------------------------------------------------------------
+
 // Filter Flags lesen, wird von WW8 / W4W / EXCEL / LOTUS benutzt.
-//-----------------------------------------------------------------------
+
 
 /*
 <FilterFlags>
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index 4e332d320cc1..4e7c6bfa48b1 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -672,7 +672,7 @@ size_t Reader::GetSectionList( SfxMedium&, std::vector<OUString*>& ) const
     return 0;
 }
 
-// ------------------------------------------------
+
 sal_Bool SwReader::HasGlossaries( const Reader& rOptions )
 {
     // Variable uebertragen
@@ -714,7 +714,7 @@ sal_Bool Reader::ReadGlossaries( SwTextBlocks&, sal_Bool ) const
     return sal_False;
 }
 
-// ------------------------------------------------
+
 
 int StgReader::GetReaderType()
 {
@@ -946,7 +946,7 @@ sal_uLong SwWriter::Write( WriterRef& rxWriter, const OUString* pRealFileName )
 
 
 
-// ----------------------------------------------------------------------
+
 
 
 sal_Bool SetHTMLTemplate( SwDoc & rDoc )
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 0a8019933ca3..222fd2180c59 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -110,7 +110,7 @@ using ::editeng::SvxBorderLine;
 #define CSS1_FRMSIZE_ANYHEIGHT  0x0e
 #define CSS1_FRMSIZE_PIXEL      0x10
 
-//-----------------------------------------------------------------------
+
 
 sal_Char CSS1_CONSTASCII_DEF( sCSS1_rule_end, " }" );
 sal_Char CSS1_CONSTASCII_DEF( sCSS1_span_tag_end, "\">" );
@@ -643,7 +643,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
     nDfltBottomMargin = 0;
 }
 
-//-----------------------------------------------------------------------
+
 
 // wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben,
 // sonst wird nur nach Token und Class fuer ein Format gesucht
@@ -1994,7 +1994,7 @@ Writer& OutCSS1_NumBulListStyleOpt( Writer& rWrt, const SwNumRule& rNumRule,
     return rWrt;
 }
 
-//-----------------------------------------------------------------------
+
 
 void SwHTMLWriter::OutCSS1_FrmFmtOptions( const SwFrmFmt& rFrmFmt,
                                           sal_uInt32 nFrmOpts,
@@ -2354,7 +2354,7 @@ void SwHTMLWriter::OutCSS1_FrmFmtBackground( const SwFrmFmt& rFrmFmt )
     }
 }
 
-//-----------------------------------------------------------------------
+
 
 static Writer& OutCSS1_SvxTxtLn_SvxCrOut_SvxBlink( Writer& rWrt,
                     const SvxUnderlineItem *pUItem,
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 9045a8a02618..c6446cd76c70 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -142,7 +142,7 @@ static Writer& OutHTML_FrmFmtGrfNode( Writer& rWrt, const SwFrmFmt& rFmt,
 static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
                                         const SdrObject& rSdrObj    );
 
-//-----------------------------------------------------------------------
+
 
 extern HTMLOutEvent aAnchorEventTable[];
 
@@ -1226,7 +1226,7 @@ Writer& OutHTML_BulletImage( Writer& rWrt,
 }
 
 
-//-----------------------------------------------------------------------
+
 
 static Writer& OutHTML_FrmFmtTableNode( Writer& rWrt, const SwFrmFmt& rFrmFmt )
 {
@@ -1514,7 +1514,7 @@ static Writer& OutHTML_FrmFmtAsMarquee( Writer& rWrt, const SwFrmFmt& rFrmFmt,
     return rWrt;
 }
 
-//-----------------------------------------------------------------------
+
 
 Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
                               sal_Bool bHeader )
@@ -1720,7 +1720,7 @@ void SwHTMLWriter::CollectLinkTargets()
     }
 }
 
-//-----------------------------------------------------------------------
+
 
 SwHTMLPosFlyFrm::SwHTMLPosFlyFrm( const SwPosFlyFrm& rPosFly,
                                   const SdrObject *pSdrObj,
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 719c34ed4765..c84bd023e44f 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -114,9 +114,9 @@ public:
     void Write( SvStream& rStrm );
 };
 
-//------------------------------------------------------------
+
 //  Styles
-//------------------------------------------------------------
+
 
 #define WW8_RESERVED_SLOTS 15
 
@@ -725,9 +725,9 @@ const SwNumRule* MSWordStyles::GetSwNumRule(sal_uInt16 nId) const
     return it->second;
 }
 
-//---------------------------------------------------------------------------
+
 //          Fonts
-//---------------------------------------------------------------------------
+
 wwFont::wwFont(const OUString &rFamilyName, FontPitch ePitch, FontFamily eFamily,
     rtl_TextEncoding eChrSet, bool bWrtWW8) : mbAlt(false), mbWrtWW8(bWrtWW8), mePitch(ePitch), meFamily(eFamily), meChrSet(eChrSet)
 {
@@ -1035,12 +1035,12 @@ void WW8_WrPlc0::Write( SvStream& rStrm )
     }
 }
 
-//------------------------------------------------------------------------------
 
-//------------------------------------------------------------------------------
+
+
 // class MSWordSections : translate PageDescs into Sections
 //      also deals with header and footer
-//------------------------------------------------------------------------------
+
 
 MSWordSections::MSWordSections( MSWordExportBase& rExport )
     : mbDocumentIsProtected( false )
@@ -2040,11 +2040,11 @@ void MSWordExportBase::WriteHeaderFooterText( const SwFmt& rFmt, bool bHeader )
     }
 }
 
-//------------------------------------------------------------------------------
+
 // class WW8_WrPlcFtnEdn : Collect the Footnotes and Endnotes and output their text
 // and Plcs at the end of the document.
 // WW8_WrPlcFtnEdn is the class for Footnotes and Endnotes
-//------------------------------------------------------------------------------
+
 WW8_WrPlcSubDoc::WW8_WrPlcSubDoc()
     : pTxtPos( 0 )
 {
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 3f81acfcf2bc..5c5a25e02132 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -683,7 +683,7 @@ const SfxPoolItem& MSWordExportBase::GetItem(sal_uInt16 nWhich) const
     return *pItem;
 }
 
-//------------------------------------------------------------------------------
+
 
 WW8_WrPlc1::WW8_WrPlc1( sal_uInt16 nStructSz )
     : nStructSiz( nStructSz )
@@ -827,7 +827,7 @@ void WW8_WrMagicTable::Append( WW8_CP nCp, sal_uLong nData)
     }
 }
 
-//--------------------------------------------------------------------------
+
 
 void SwWW8Writer::FillCount( SvStream& rStrm, sal_uLong nCount )
 {
@@ -860,7 +860,7 @@ sal_uLong SwWW8Writer::FillUntil( SvStream& rStrm, sal_uLong nEndPos )
 }
 
 
-//--------------------------------------------------------------------------
+
 
 WW8_WrPlcPn::WW8_WrPlcPn( WW8Export& rWr, ePLCFT ePl, WW8_FC nStartFc )
     : rWrt(rWr), nFkpStartPage(0), ePlc(ePl), nMark(0)
@@ -981,7 +981,7 @@ void WW8_WrPlcPn::WritePlc()
     }
 }
 
-//--------------------------------------------------------------------------
+
 
 WW8_WrFkp::WW8_WrFkp(ePLCFT ePl, WW8_FC nStartFc, bool bWrtWW8)
     : ePlc(ePl), nStartGrp(511), nOldStartGrp(511),
@@ -1551,7 +1551,7 @@ void MSWordExportBase::AppendWordBookmark( const OUString& rName )
 }
 
 
-//--------------------------------------------------------------------------
+
 
 void WW8_WrtRedlineAuthor::Write( Writer& rWrt )
 {
@@ -1570,7 +1570,7 @@ sal_uInt16 WW8Export::AddRedlineAuthor( sal_uInt16 nId )
     return pRedlAuthors->AddName( SW_MOD()->GetRedlineAuthor( nId ) );
 }
 
-//--------------------------------------------------------------------------
+
 
 void WW8Export::WriteAsStringTable(const std::vector<OUString>& rStrings,
     sal_Int32& rfcSttbf, sal_Int32& rlcbSttbf, sal_uInt16 nExtraLen)
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index a949fbcc10d8..7f5f64e0359b 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -218,9 +218,9 @@ bool WW8Export::CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 nWhich
     return bRet;
 }
 
-//------------------------------------------------------------
+
 //  Hilfsroutinen fuer Styles
-//------------------------------------------------------------
+
 
 void MSWordExportBase::ExportPoolItemsToCHP( sw::PoolItems &rItems, sal_uInt16 nScript )
 {
@@ -911,7 +911,7 @@ OUString MSWordExportBase::GetBookmarkName( sal_uInt16 nTyp, const OUString* pNa
     return BookmarkToWord( sRet ); // #i43956# - encode bookmark accordingly
 }
 
-//-----------------------------------------------------------------------
+
 /* File CHRATR.HXX: */
 void WW8AttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 nScript )
 {
@@ -3021,7 +3021,7 @@ void AttributeOutputBase::TextFlyContent( const SwFmtFlyCnt& rFlyContent )
 // Detaillierte Einstellungen zur Trennung erlaubt WW nur dokumentenweise.
 // Man koennte folgende Mimik einbauen: Die Werte des Style "Standard" werden,
 // falls vorhanden, in die Document Properties ( DOP ) gesetzt.
-// ---
+
 // ACK.  Dieser Vorschlag passt exakt zu unserer Implementierung des Import,
 // daher setze ich das gleich mal um. (KHZ, 07/15/2000)
 void WW8AttributeOutput::ParaHyphenZone( const SvxHyphenZoneItem& rHyphenZone )
@@ -5077,7 +5077,7 @@ void WW8AttributeOutput::ParaTabStop( const SvxTabStopItem& rTabStops )
     }
 }
 
-//-----------------------------------------------------------------------
+
 
 void AttributeOutputBase::OutputItem( const SfxPoolItem& rHt )
 {
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index fecf9f735251..ecd41d12b80f 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -98,11 +98,10 @@ using namespace ::com::sun::star;
 using namespace sw::types;
 using namespace sw::util;
 
-// Hilfsroutinen
-
+// helper methods
 Color WW8TransCol(SVBT32 nWC)
 {
-#if 1               // 1 = Vordefinierte Farben benutzen, 0 = ignorieren
+#if 1               // 1 = use predefined color, 0 = ignore
 
     // Farbtabelle zum Umrechnen RGB-Werte in vordefinierte Farben
     // ( Damit bei der Writer-UI die Farbnamen stimmen )
@@ -130,7 +129,7 @@ Color WW8TransCol(SVBT32 nWC)
         (    ( nWC[0] == 0 ||  nWC[0]== 0x80 || nWC[0] == 0xff )    // R-Anteil
           && ( nWC[1] == 0 ||  nWC[1]== 0x80 || nWC[1] == 0xff )    // G-Anteil
           && ( nWC[2] == 0 ||  nWC[2]== 0x80 || nWC[2] == 0xff ) ) ){// B-Anteil
-        int nIdx = 0;       // und nun: Idx-Berechnung im 3er-System
+        int nIdx = 0;       // and now: Idx-calculation im 3er-System
         for (int i = 2; i >= 0; i--)
         {
             nIdx *= 3;
@@ -138,13 +137,13 @@ Color WW8TransCol(SVBT32 nWC)
                 nIdx += ((nWC[i] == 0xff) ? 2 : 1);
         }
         if (eColA[nIdx] != COL_BLACK)
-            return Color(eColA[nIdx]);  // Standard-Color
+            return Color(eColA[nIdx]);  // default color
     }
 #endif
 
     if (nWC[3] & 0x1)
     {
-        //Special colour gray
+        // Special color gray
         sal_uInt8 u = (sal_uInt8)( (sal_uLong)( 200 - nWC[0] ) * 256 / 200 );
         return Color(u, u, u);
     }
@@ -185,11 +184,11 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
 
     if (eAnchor == FLY_AT_PARA)
     {
-        if( pDo->bx == 1 )       // Pos: echt links
+        if( pDo->bx == 1 )       // Position: actually left
             nDrawXOfs2 = static_cast< short >(nDrawXOfs2 - maSectionManager.GetPageLeft());
-        if( nInTable )                          // Obj in Table
-            nDrawXOfs2 = nDrawXOfs2 - GetTableLeft();       // -> siehe Kommentar
-                                                // bei GetTableLeft()
+        if( nInTable )                          // Object in table
+            nDrawXOfs2 = nDrawXOfs2 - GetTableLeft();       // -> see comment
+                                                // at GetTableLeft()
     }
     else
     {
@@ -201,19 +200,18 @@ bool SwWW8ImplReader::ReadGrafStart(void* pData, short nDataSiz,
 }
 
 // SetStdAttr() setzt die Attribute, die jedes Objekt hat
-
 static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
                         WW8_DP_SHADOW& rSh )
 {
-    if( SVBT16ToShort( rL.lnps ) == 5 ){            // unsichtbar
+    if( SVBT16ToShort( rL.lnps ) == 5 ){            // invisible
         rSet.Put( XLineStyleItem( XLINE_NONE ) );
     }else{                                          // sichtbar
         Color aCol( WW8TransCol( rL.lnpc ) );           // LinienFarbe
         rSet.Put( XLineColorItem( OUString(), aCol ) );
         rSet.Put( XLineWidthItem( SVBT16ToShort( rL.lnpw ) ) );
-                                                    // LinienDicke
+                                                    // line thickness
         if( SVBT16ToShort( rL.lnps ) >= 1
-            && SVBT16ToShort(rL.lnps ) <= 4 ){      // LinienStil
+            && SVBT16ToShort(rL.lnps ) <= 4 ){      // line style
             rSet.Put( XLineStyleItem( XLINE_DASH ) );
             sal_Int16 nLen = SVBT16ToShort( rL.lnpw );
             XDash aD( XDASH_RECT, 1, 2 * nLen, 1, 5 * nLen, 5 * nLen );
@@ -228,10 +226,10 @@ static void SetStdAttr( SfxItemSet& rSet, WW8_DP_LINETYPE& rL,
             }
             rSet.Put( XLineDashItem( OUString(), aD ) );
         }else{
-            rSet.Put( XLineStyleItem( XLINE_SOLID ) );  // noetig fuer TextBox
+            rSet.Put( XLineStyleItem( XLINE_SOLID ) );  // needed for TextBox
         }
     }
-    if( SVBT16ToShort( rSh.shdwpi ) ){                  // Schatten
+    if( SVBT16ToShort( rSh.shdwpi ) ){                  // shadow
         rSet.Put(SdrShadowItem(true));
         rSet.Put( SdrShadowXDistItem( SVBT16ToShort( rSh.xaOffset ) ) );
         rSet.Put( SdrShadowYDistItem( SVBT16ToShort( rSh.yaOffset ) ) );
@@ -261,11 +259,11 @@ static void SetFill( SfxItemSet& rSet, WW8_DP_FILL& rFill )
         rSet.Put(XFillStyleItem(XFILL_SOLID));  // necessary for textbox
         if (nPat <= 1 || ((sizeof(nPatA)/sizeof(nPatA[0])) <= nPat))
         {
-            // Solid Background or unknown
+            // Solid background or unknown
             rSet.Put(XFillColorItem(OUString(), WW8TransCol(rFill.dlpcBg)));
         }
         else
-        {                                      // Brush -> Farbmischung
+        {                                      // Brush -> color mix
             Color aB( WW8TransCol( rFill.dlpcBg ) );
             Color aF( WW8TransCol( rFill.dlpcFg ) );
             aB.SetRed( (sal_uInt8)( ( (sal_uLong)aF.GetRed() * nPatA[nPat]
@@ -501,8 +499,8 @@ void SwWW8ImplReader::InsertTxbxStyAttrs( SfxItemSet& rS, sal_uInt16 nColl )
         const SfxPoolItem* pItem;
         for( sal_uInt16 i = POOLATTR_BEGIN; i < POOLATTR_END; i++ )
         {
-            //If we are set in the source and not set in the destination
-            //then add it in.
+            // If we are set in the source and not set in the destination
+            // then add it in.
             if ( SFX_ITEM_SET == pStyInf->pFmt->GetItemState(
                 i, true, &pItem ) )
             {
@@ -564,8 +562,8 @@ class Chunk
 {
 private:
     OUString msURL;
-    long mnStartPos; //0x13
-    long mnEndPos;   //0x15
+    long mnStartPos; // 0x13
+    long mnEndPos;   // 0x15
 public:
     explicit Chunk(long nStart, const OUString &rURL)
         : msURL(rURL), mnStartPos(nStart), mnEndPos(0)  {}
@@ -617,12 +615,12 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
 
     std::deque<Chunk> aChunks;
 
-    //Here store stack location
+    // Here store stack location
     size_t nCurrentCount = pCtrlStck->size();
     while (nStart < nEndCp)
     {
-        //nStart is the beginning of the attributes for this range, and
-        //may be before the text itself. So watch out for that
+        // nStart is the beginning of the attributes for this range, and
+        // may be before the text itself. So watch out for that
         WW8_CP nTxtStart = nStart;
         if (nTxtStart < nStartCp)
             nTxtStart = nStartCp;
@@ -645,8 +643,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
             else if ( aRes.nSprmId && (
                 (eFTN >  aRes.nSprmId) || (0x0800 <= aRes.nSprmId) ) )
             {
-                //Here place them onto our usual stack and we will pop them
-                //off and convert them later
+                // Here place them onto our usual stack and we will pop them
+                // off and convert them later
                 if (bStartAttr)
                 {
                     ImportSprm(aRes.pMemPos, aRes.nSprmId);
@@ -711,9 +709,9 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
             nEnd = ( nNext < nEndCp ) ? nNext : nEndCp;
             SfxItemPool *pEditPool = pS->GetPool();
 
-            //Here read current properties and convert them into pS
-            //and put those attrs into the draw box if they can be converted
-            //to draw attributes
+            // Here read current properties and convert them into pS
+            // and put those attrs into the draw box if they can be converted
+            // to draw attributes
             if (pCtrlStck->size() - nCurrentCount)
             {
                 for (size_t i = nCurrentCount; i < pCtrlStck->size(); ++i)
@@ -738,7 +736,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
                     }
                 }
             }
-            //Fill in the remainder from the style
+            // Fill in the remainder from the style
             InsertTxbxStyAttrs(*pS, nAktColl);
 
             if( pS->Count() )
@@ -753,8 +751,8 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
     }
     delete pS;
 
-    //pop off as far as recorded location just in case there were some left
-    //unclosed
+    // pop off as far as recorded location just in case there were some left
+    // unclosed
     for (size_t nI = pCtrlStck->size(); nI > nCurrentCount; --nI)
         pCtrlStck->DeleteAndDestroy(nI-1);
 
@@ -796,7 +794,7 @@ void SwWW8ImplReader::InsertAttrsAsDrawingAttrs(long nStartCp, long nEndCp,
 bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
     sal_uInt16 nTxBxS, sal_uInt16 nSequence)
 {
-    // rasch den TextBox-PLCF greifen
+    // grab the TextBox-PLCF quickly
     WW8PLCFspecial* pT = pPlcxMan ? pPlcxMan->GetTxbx() : 0;
     if( !pT )
     {
@@ -809,7 +807,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
     if(  bCheckTextBoxStory )
         pT->SetIdx( nTxBxS-1 );
 
-    // dann Start und Ende ermitteln
+    // then determine start and end
     void* pT0;
     if( !pT->Get( rStartCp, pT0 ) )
     {
@@ -849,7 +847,7 @@ bool SwWW8ImplReader::GetTxbxTextSttEndCp(WW8_CP& rStartCp, WW8_CP& rEndCp,
             long nMaxEndCp   = rEndCp;
             // rasch den TextBox-Break-Deskriptor-PLCF greifen
             pT = pPlcxMan->GetTxbxBkd();
-            if (!pT) //It can occur on occasion, Caolan
+            if (!pT) // It can occur on occasion, Caolan
                 return false;
 
             // den ersten Eintrag fuer diese TextBox-Story finden
@@ -928,7 +926,7 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
         mpDrawEditEngine->SetText(rString);
         InsertAttrsAsDrawingAttrs(nStartCp, nEndCp, eType);
 
-        //Annotations typically begin with a (useless) 0x5
+        // Annotations typically begin with a (useless) 0x5
         if ((eType == MAN_AND) && mpDrawEditEngine->GetTextLen())
         {
             ESelection aFirstChar(0, 0, 0, 1);
@@ -944,10 +942,10 @@ OutlinerParaObject* SwWW8ImplReader::ImportAsOutliner(OUString &rString, WW8_CP
         mpDrawEditEngine->SetText( OUString() );
         mpDrawEditEngine->SetParaAttribs(0, mpDrawEditEngine->GetEmptyItemSet());
 
-        //Strip out fields, leaving the result
+        // Strip out fields, leaving the result
         long nDummy(0);
         lcl_StripFields(rString, nDummy);
-        //Strip out word's special characters for the simple string
+        // Strip out word's special characters for the simple string
         rString = rString.replaceAll(OUString(0x1), "");
         rString = rString.replaceAll(OUString(0x5), "");
         rString = rString.replaceAll(OUString(0x8), "");
@@ -1004,8 +1002,8 @@ SwFrmFmt* SwWW8ImplReader::InsertTxbxText(SdrTextObj* pTextObj,
                     {
                         WW8ReaderSave aSave(this, nNewStartCp -1);
                         bool bOldEmbeddObj = bEmbeddObj;
-                        //bEmbedd Ordinarily would have been set by field
-                        //parse, but this is impossible here so...
+                        // bEmbedd Ordinarily would have been set by field
+                        // parse, but this is impossible here so...
                         bEmbeddObj = true;
 
                         // 1st look for OLE- or Graph-Indicator Sprms
@@ -1320,8 +1318,8 @@ SdrObject *SwWW8ImplReader::ReadGroup( WW8_DPHEAD* pHd, const WW8_DO* pDo,
 SdrObject* SwWW8ImplReader::ReadGrafPrimitive( short& rLeft, const WW8_DO* pDo,
     SfxAllItemSet &rSet)
 {
-    //cmc: This whole archaic word 6 graphic import can probably be refactored
-    //into an object hierarachy with a little effort.
+    // cmc: This whole archaic word 6 graphic import can probably be refactored
+    // into an object hierarachy with a little effort.
     SdrObject *pRet=0;
     WW8_DPHEAD aHd;                         // Lese Draw-Primitive-Header
     bool bCouldRead = checkRead(*pStrm, &aHd, sizeof(WW8_DPHEAD));
@@ -1473,9 +1471,9 @@ sal_Int32 SwMSDffManager::GetEscherLineMatch(MSO_LineStyle eStyle,
     return nOutsideThick;
 }
 
-//Returns the thickness of the line outside the frame, the logic of
-//words positioning of borders around floating objects is that of a
-//disturbed mind.
+// Returns the thickness of the line outside the frame, the logic of
+// words positioning of borders around floating objects is that of a
+// disturbed mind.
 sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
     MSO_LineStyle eLineStyle, MSO_LineDashing eDashing, MSO_SPT eShapeType, sal_Int32 &rLineThick,
     SvxBoxItem& rBox )
@@ -1552,7 +1550,7 @@ sal_Int32 SwWW8ImplReader::MatchSdrBoxIntoFlyBoxItem(const Color& rLineColor,
 
         for(sal_uInt16 nLine = 0; nLine < 4; ++nLine)
         {
-            //aLine is cloned by SetLine
+            // aLine is cloned by SetLine
             rBox.SetLine(&aLine, nLine);
         }
     }
@@ -1678,7 +1676,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
             rSnapRect.GetWidth()  + 2*nOutside,
             rSnapRect.GetHeight() + 2*nOutside) );
     }
-    else //If a size is set, adjust it to consider border thickness
+    else // If a size is set, adjust it to consider border thickness
     {
         SwFmtFrmSize aSize = (const SwFmtFrmSize &)(rFlySet.Get(RES_FRM_SIZE));
 
@@ -1689,8 +1687,8 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
         rFlySet.Put( aNewSize );
     }
 
-    //Sadly word puts escher borders outside the graphic, but orients the
-    //graphic in relation to the top left inside the border. We don't
+    // Sadly word puts escher borders outside the graphic, but orients the
+    // graphic in relation to the top left inside the border. We don't
     if (nOutside)
     {
         SwFmtHoriOrient aHori = (const SwFmtHoriOrient &)(rFlySet.Get(
@@ -1748,7 +1746,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
     bool bBrushItemOk = false;
     sal_uInt8 nTrans = 0;
 
-    //Separate transparency
+    // Separate transparency
     eState = rOldSet.GetItemState(XATTR_FILLTRANSPARENCE, true, &pItem);
     if (eState == SFX_ITEM_SET)
     {
@@ -1768,7 +1766,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
         switch (eFill)
         {
             case XFILL_NONE:
-                //Writer graphics don't have it yet
+                // Writer graphics don't have it yet
                 if (eShapeType != mso_sptPictureFrame)
                 {
                     aBrushItem.GetColor().SetTransparency(0xFE);
@@ -1782,14 +1780,14 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
                         rOldSet.Get(XATTR_FILLCOLOR)).GetColorValue();
                     aBrushItem.SetColor(aColor);
 
-                    if (bBrushItemOk) //has trans
+                    if (bBrushItemOk) // has trans
                         aBrushItem.GetColor().SetTransparency(nTrans);
 
                     bBrushItemOk = true;
                 }
             break;
-            //case XFILL_GRADIENT:
-            //break;
+            // case XFILL_GRADIENT:
+            // break;
             case XFILL_HATCH:
             break;
             case XFILL_BITMAP:
@@ -1797,7 +1795,7 @@ void SwWW8ImplReader::MatchSdrItemsIntoFlySet( SdrObject* pSdrObj,
                     GraphicObject aGrfObj(static_cast< XFillBitmapItem const & >(rOldSet.Get(XATTR_FILLBITMAP)).GetGraphicObject());
                     const bool bTile(WW8ITEMVALUE(rOldSet, XATTR_FILLBMP_TILE, SfxBoolItem) ? true: false);
 
-                    if(bBrushItemOk) //has trans
+                    if(bBrushItemOk) // has trans
                     {
                         GraphicAttr aAttr(aGrfObj.GetAttr());
 
@@ -1842,13 +1840,13 @@ void SwWW8ImplReader::AdjustLRWrapForWordMargins(
             rLR.SetRight((sal_uInt16)0);
     }
 
-    //Inside margin, remove left wrapping
+    // Inside margin, remove left wrapping
     if ((rRecord.nXAlign == 4) && (nXRelTo == 0))
     {
         rLR.SetLeft((sal_uInt16)0);
     }
 
-    //Outside margin, remove left wrapping
+    // Outside margin, remove left wrapping
     if ((rRecord.nXAlign == 5) && (nXRelTo == 0))
     {
         rLR.SetRight((sal_uInt16)0);
@@ -1881,7 +1879,7 @@ void SwWW8ImplReader::AdjustULWrapForWordMargins(
             rUL.SetLower((sal_uInt16)0);
     }
 
-    //Remove top margin if aligned vertically inside margin
+    // Remove top margin if aligned vertically inside margin
     if ((rRecord.nYAlign == 4) && (nYRelTo == 0))
         rUL.SetUpper((sal_uInt16)0);
 }
@@ -1907,7 +1905,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
         pFlyFmt->SetFmtAttr(aUL);
     }
 
-    //If we are contoured and have a custom polygon...
+    // If we are contoured and have a custom polygon...
     if (pRecord->pWrapPolygon && pFlyFmt->GetSurround().IsContour())
     {
         if (SwNoTxtNode *pNd = GetNoTxtNodeFromSwFrmFmt(*pFlyFmt))
@@ -1976,7 +1974,7 @@ void SwWW8ImplReader::MapWrapIntoFlyFmt(SvxMSDffImportRec* pRecord,
             Fraction aHackY(ww::nWrap100Percent, ww::nWrap100Percent - nMove);
             aPoly.Scale(aHackX, aHackY);
 
-            //Turn polygon back into units that match the graphic's
+            // Turn polygon back into units that match the graphic's
             const Size &rOrigSize = pNd->GetGraphic().GetPrefSize();
             Fraction aMapPolyX(rOrigSize.Width(), ww::nWrap100Percent);
             Fraction aMapPolyY(rOrigSize.Height(), ww::nWrap100Percent);
@@ -2035,7 +2033,7 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
         if (pRecord->pObj)
         {
             const SfxItemSet& rOldSet = pRecord->pObj->GetMergedItemSet();
-            //contrast
+            // contrast
             if (WW8ITEMVALUE(rOldSet, SDRATTR_GRAFCONTRAST,
                 SdrGrafContrastItem))
             {
@@ -2045,7 +2043,7 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
                 pGrfNd->SetAttr( aContrast );
             }
 
-            //luminance
+            // luminance
             if (WW8ITEMVALUE(rOldSet, SDRATTR_GRAFLUMINANCE,
                 SdrGrafLuminanceItem))
             {
@@ -2053,7 +2051,7 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
                     SDRATTR_GRAFLUMINANCE, SdrGrafLuminanceItem));
                 pGrfNd->SetAttr( aLuminance );
             }
-            //gamma
+            // gamma
             if (WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA, SdrGrafGamma100Item))
             {
                 double fVal = WW8ITEMVALUE(rOldSet, SDRATTR_GRAFGAMMA,
@@ -2061,7 +2059,7 @@ SwWW8ImplReader::SetAttributesAtGrfNode(SvxMSDffImportRec const*const pRecord,
                 pGrfNd->SetAttr(SwGammaGrf(fVal/100.));
             }
 
-            //drawmode
+            // drawmode
             if (WW8ITEMVALUE(rOldSet, SDRATTR_GRAFMODE, SdrGrafModeItem))
             {
                 SwDrawModeGrf aDrawMode( static_cast< sal_uInt16 >(WW8ITEMVALUE(rOldSet,
@@ -2174,8 +2172,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
     if (pFSPA)
     {
         // #i18732#
-        //Given new layout where everything is changed to be anchored to
-        //character the following 4 tables may need to be changed.
+        // Given new layout where everything is changed to be anchored to
+        // character the following 4 tables may need to be changed.
 
         // horizontal Adjustment
         static const sal_Int16 aHoriOriTab[ nCntXAlign ] =
@@ -2283,8 +2281,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
         }
 
 
-        //Writer honours this wrap distance when aligned as "left" or "right",
-        //Word doesn't. Writer doesn't honour it when its "from left".
+        // Writer honours this wrap distance when aligned as "left" or "right",
+        // Word doesn't. Writer doesn't honour it when its "from left".
         if (eHoriOri == text::HoriOrientation::LEFT)
             pRecord->nDxWrapDistLeft=0;
         else if (eHoriOri == text::HoriOrientation::RIGHT)
@@ -2306,8 +2304,8 @@ RndStdIds SwWW8ImplReader::ProcessEscherAlign(SvxMSDffImportRec* pRecord,
             eVertOri = aVertOriTab[ nYAlign ];
         }
 
-        //Below line in word is a positive value, while in writer its
-        //negative
+        // Below line in word is a positive value, while in writer its
+        // negative
         long nYPos = pFSPA->nYaTop;
         // #i22673#
         if ((eVertRel == text::RelOrientation::TEXT_LINE) && (eVertOri == text::VertOrientation::NONE))
@@ -2406,7 +2404,7 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
         return 0;
     }
 
-    //Normal case of Word 8+ version stuff
+    // Normal case of Word 8+ version stuff
     pPF->SeekPos( nGrafAnchorCp );
 
     WW8_FC nStartFc;
@@ -2440,12 +2438,12 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     sorts of trouble later on
     */
     SwDocShell* pPersist = rDoc.GetDocShell();
-    rDoc.SetDocShell(0);         //#i20540# Persist guard
+    rDoc.SetDocShell(0);         // #i20540# Persist guard
 
     SdrObject* pObject = 0;
     bool bOk = (pMSDffManager->GetShape(pF->nSpId, pObject, aData) && pObject);
 
-    rDoc.SetDocShell(pPersist);  //#i20540# Persist guard
+    rDoc.SetDocShell(pPersist);  // #i20540# Persist guard
 
     if (!bOk)
     {
@@ -2479,18 +2477,18 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     bool bContour = false;
     switch (pF->nwr)
     {
-        case 0: //0 like 2, but doesn't require absolute object
-        case 2: //2 wrap around absolute object
+        case 0: // 0 like 2, but doesn't require absolute object
+        case 2: // 2 wrap around absolute object
             eSurround = SURROUND_PARALLEL;
             break;
-        case 1: //1 no text next to shape
+        case 1: // 1 no text next to shape
             eSurround = SURROUND_NONE;
             break;
-        case 3: //3 wrap as if no object present
+        case 3: // 3 wrap as if no object present
             eSurround = SURROUND_THROUGHT;
             break;
-        case 4: //4 wrap tightly around object
-        case 5: //5 wrap tightly, but allow holes
+        case 4: // 4 wrap tightly around object
+        case 5: // 5 wrap tightly, but allow holes
             eSurround = SURROUND_PARALLEL;
             bContour = true;
             break;
@@ -2501,19 +2499,19 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     {
         switch( pF->nwrk )
         {
-            //0 wrap both sides
+            // 0 wrap both sides
             case 0:
                 eSurround = SURROUND_PARALLEL;
                 break;
-            //1 wrap only on left
+            // 1 wrap only on left
             case 1:
                 eSurround = SURROUND_LEFT;
                 break;
-            //2 wrap only on right
+            // 2 wrap only on right
             case 2:
                 eSurround = SURROUND_RIGHT;
                 break;
-            //3 wrap only on largest side
+            // 3 wrap only on largest side
             case 3:
                 eSurround = SURROUND_IDEAL;
                 break;
@@ -2565,8 +2563,8 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     }
 
 
-    //#i21847#
-    //Some shapes are set to *hidden*, don't import those ones.
+    // #i21847#
+    // Some shapes are set to *hidden*, don't import those ones.
     if (pRecord->bHidden)
         return 0;
 
@@ -2620,13 +2618,13 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long nGrafAnchorCp )
     SwFrmFmt* pRetFrmFmt = 0;
     if (bReplaceable)
     {
-        //Single graphics or ole objects
+        // Single graphics or ole objects
         pRetFrmFmt = ImportReplaceableDrawables(pObject, pOurNewObject, pRecord,
             pF, aFlySet);
     }
     else
     {
-        //Drawing objects, (e.g. ovals or drawing groups)
+        // Drawing objects, (e.g. ovals or drawing groups)
         if (pF->bRcaSimple)
         {
             pF->nbx = WW8_FSPA::RelPageBorder;
@@ -2957,8 +2955,8 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
 
     if (pRecord)
     {
-        //Note that the escher inner distance only seems to be honoured in
-        //word for textboxes, not for graphics and ole objects.
+        // Note that the escher inner distance only seems to be honoured in
+        // word for textboxes, not for graphics and ole objects.
         Rectangle aInnerDist(0, 0, 0, 0);
 
         MatchSdrItemsIntoFlySet(rpObject, rFlySet, pRecord->eLineStyle,
@@ -3009,8 +3007,8 @@ SwFlyFrmFmt* SwWW8ImplReader::ImportReplaceableDrawables( SdrObject* &rpObject,
         // mehrfaches Auftreten gleicher Grafik-Namen vermeiden
         maGrfNameGenerator.SetUniqueGraphName(pRetFrmFmt, aObjectName);
     }
-    //falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste
-    //entsprechend korrigieren (oder Eintrag loeschen)
+    // falls alles Ok, Zeiger auf neues Objekt ermitteln und Z-Order-Liste
+    // entsprechend korrigieren (oder Eintrag loeschen)
     rpOurNewObject = CreateContactObject(pRetFrmFmt);
 
     // altes Objekt aus der Z-Order-Liste entfernen
@@ -3055,8 +3053,8 @@ void SwWW8ImplReader::GrafikCtor()  // Fuer SVDraw und VCControls und Escher
         pMSDffManager = new SwMSDffManager(*this);
         pMSDffManager->SetModel(pDrawModel, 1440);
         /*
-         Now the dff manager always needs a controls //converter as well, but a
-         control converter may still exist //without a dffmanager. cmc
+         Now the dff manager always needs a controls // converter as well, but a
+         control converter may still exist // without a dffmanager. cmc
         */
         pFormImpl = new SwMSConvertControls(mpDocShell, pPaM);
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 8f5831f0646c..0ccf6d618b2c 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -555,9 +555,9 @@ ApoTestResults SwWW8ImplReader::TestApo(int nCellLevel, bool bTableRowEnd,
     return aRet;
 }
 
-//---------------------------------------------------------------------
+
 // helper methods for outline, numbering and bullets
-//---------------------------------------------------------------------
+
 
 static void SetBaseAnlv(SwNumFmt &rNum, WW8_ANLV &rAV, sal_uInt8 nSwLevel )
 {
@@ -701,9 +701,9 @@ void SwWW8ImplReader::SetAnld(SwNumRule* pNumR, WW8_ANLD* pAD, sal_uInt8 nSwLeve
     pNumR->Set(nSwLevel, aNF);
 }
 
-//-------------------------------------------------------
+
 // chapter numbering and bullets
-//-------------------------------------------------------
+
 // Chapter numbering happens in the style definition.
 // Sprm 13 provides the level, Sprm 12 the content.
 
@@ -808,9 +808,9 @@ void SwWW8ImplReader::Read_ANLevelDesc( sal_uInt16, const sal_uInt8* pData, shor
     }
 }
 
-//-----------------------------------------
+
 // Numbering / Bullets
-//-----------------------------------------
+
 
 // SetNumOlst() carries the Numrules for this cell to SwNumFmt.
 // For this the info is fetched from OLST and not from ANLD ( see later )
@@ -3545,9 +3545,9 @@ const SwFmt* SwWW8ImplReader::GetStyleWithOrgWWName( OUString& rName ) const
     return pRet;
 }
 
-//-----------------------------------------
+
 //          class WW8RStyle
-//-----------------------------------------
+
 
 const sal_uInt8* WW8RStyle::HasParaSprm( sal_uInt16 nId ) const
 {
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 694345e9bf8e..e5d462fd6d02 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -89,9 +89,9 @@ using namespace sw::util;
 using namespace sw::types;
 using namespace sw::mark;
 
-//-----------------------------------------
+
 //            UNO-Controls
-//-----------------------------------------
+
 
 //cmc, OCX i.e. word 97 form controls
 eF_ResT SwWW8ImplReader::Read_F_OCX( WW8FieldDesc*, OUString& )
@@ -318,7 +318,7 @@ void SwWW8ImplReader::DeleteFormImpl()
     delete pFormImpl, pFormImpl = 0;
 }
 
-//----------------------------------------------------------------------------
+
 //          WW8ListManager          oeffentliche Methoden stehen ganz am Ende
 //------------------------- ============ --------------- ============ --------
 
@@ -1640,9 +1640,9 @@ SwNumRule* WW8ListManager::GetNumRuleForActivation(sal_uInt16 nLFOPosition,
     return pRet;
 }
 
-//----------------------------------------------------------------------------
+
 //          SwWW8ImplReader:  anhaengen einer Liste an einen Style oder Absatz
-//----------------------------------------------------------------------------
+
 bool SwWW8ImplReader::SetTxtFmtCollAndListLevel(const SwPaM& rRg,
     SwWW8StyInf& rStyleInfo)
 {
@@ -2088,9 +2088,9 @@ void SwWW8ImplReader::Read_LFOPosition(sal_uInt16, const sal_uInt8* pData,
     }
 }
 
-// -------------------------------------------------------------------
+
 // ------------------------- Reading Controls ------------------------
-// -------------------------------------------------------------------
+
 
 bool SwWW8ImplReader::ImportFormulaControl(WW8FormulaControl &aFormula,
     WW8_CP nStart, SwWw8ControlType nWhich )
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 974ff4df0197..4c92ef1f324e 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -91,9 +91,9 @@ using namespace sw::mark;
 using namespace std; // #i24377#
 using namespace nsSwDocInfoSubType;
 
-//----------------------------------------
+
 //              Bookmarks
-//----------------------------------------
+
 
 namespace
 {
@@ -218,9 +218,9 @@ long SwWW8ImplReader::Read_Book(WW8PLCFManResult*)
     return 0;
 }
 
-//----------------------------------------------------------------------
+
 //    general help methods to separate parameters
-//----------------------------------------------------------------------
+
 
 /// translate FieldParameter names into the system character set and
 /// at the same time, douple backslashes are converted into single ones
@@ -452,9 +452,9 @@ short SwWW8ImplReader::GetTimeDatePara(OUString& rStr, sal_uInt32& rFormat,
     return nNumFmtType;
 }
 
-//-----------------------------------------
+
 //              Felder
-//-----------------------------------------
+
 // Am Ende des Einlesens entsprechende Felder updaten ( z.Zt. die Referenzen )
 void SwWW8ImplReader::UpdateFields()
 {
@@ -956,9 +956,9 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
     }
 }
 
-//-----------------------------------------
+
 //        Felder Taggen
-//-----------------------------------------
+
 
 // MakeTagString() gibt als Returnwert die Position des ersten
 // CR / Zeilenende / Seitenumbruch in pText und wandelt auch nur bis dort
@@ -1078,9 +1078,9 @@ long SwWW8ImplReader::Read_F_Tag( WW8FieldDesc* pF )
     return pF->nLen;
 }
 
-//-----------------------------------------
+
 //        normal fields
-//-----------------------------------------
+
 
 eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, OUString& rStr )
 {
@@ -2650,9 +2650,9 @@ void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
     }
 }
 
-//-----------------------------------------
+
 //        "table of ..." fields
-//-----------------------------------------
+
 
 static void lcl_toxMatchACSwitch(  SwWW8ImplReader& /*rReader*/,
                             SwDoc& rDoc,
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 18ddb249bb25..8b4e254edb02 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -105,9 +105,9 @@ using namespace sw::types;
 using namespace ::com::sun::star;
 using namespace nsHdFtFlags;
 
-//-----------------------------------------
+
 //              diverses
-//-----------------------------------------
+
 
 #define MM_250 1417             // WW-Default fuer Hor. Seitenraender: 2.5 cm
 #define MM_200 1134             // WW-Default fuer u.Seitenrand: 2.0 cm
@@ -1194,9 +1194,9 @@ void SwWW8ImplReader::CopyPageDescHdFt(const SwPageDesc* pOrgPageDesc,
     }
 }
 
-//------------------------------------------------------
+
 //   Hilfsroutinen fuer Grafiken und Apos und Tabellen
-//------------------------------------------------------
+
 
 static bool _SetWW8_BRC(bool bVer67, WW8_BRC& rVar, const sal_uInt8* pS)
 {
@@ -1454,9 +1454,9 @@ bool SwWW8ImplReader::SetFlyBordersShadow(SfxItemSet& rFlySet,
     return bShadowed;
 }
 
-//-----------------------------------------
+
 //              APOs
-//-----------------------------------------
+
                             // fuer Berechnung der minimalen FrameSize
 #define MAX_BORDER_SIZE 210         // so breit ist max. der Border
 #define MAX_EMPTY_BORDER 10         // fuer +-1-Fehler, mindestens 1
@@ -6126,9 +6126,9 @@ const wwSprmDispatcher *GetWW8SprmDispatcher()
     return &aSprmSrch;
 }
 
-//-----------------------------------------
+
 //      Hilfsroutinen : SPRM finden
-//-----------------------------------------
+
 
 const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const
 {
@@ -6154,9 +6154,9 @@ const SprmReadInfo& SwWW8ImplReader::GetSprmReadInfo(sal_uInt16 nId) const
     return *pFound;
 }
 
-//-----------------------------------------
+
 //      Hilfsroutinen : SPRMs
-//-----------------------------------------
+
 void SwWW8ImplReader::EndSprm( sal_uInt16 nId )
 {
     if( ( nId > 255 ) && ( nId < 0x0800 ) ) return;
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 4eb18137900b..1cb94ad7a20f 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -471,7 +471,7 @@ bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
 
     return bInsert;
 }
-// ---------------------------------------------------------------------
+
 
 class SwXMLTableInfo_Impl
 {
@@ -504,7 +504,7 @@ inline void SwXMLTableInfo_Impl::SetBaseSection(
     bBaseSectionValid = true;
 }
 
-// ---------------------------------------------------------------------
+
 
 
 void SwXMLExport::ExportTableColumnStyle( const SwXMLTableColumn_Impl& rCol )
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 6ab0257bd13a..4b4340d66076 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -2222,7 +2222,7 @@ void SwRedlineOptionsTabPage::InitFontStyle(SvxFontPrevWindow& rExampleWin)
 }
 
 
-//----------------------------------------------------------
+
 SwCompareOptionsTabPage::SwCompareOptionsTabPage(  Window* pParent, const SfxItemSet& rSet )
     : SfxTabPage( pParent,"OptComparison","modules/swriter/ui/optcomparison.ui", rSet )
 {
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 192d29e7bea0..00bb3ba522b8 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -155,9 +155,9 @@ const sal_Char cDataSourceName[] = "DataSourceName";
 const sal_Char cSelection[] = "Selection";
 const sal_Char cActiveConnection[] = "ActiveConnection";
 
-// -----------------------------------------------------------------------------
+
 // Use nameless namespace to avoid to rubbish the global namespace
-// -----------------------------------------------------------------------------
+
 namespace
 {
 
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index f1db23bdb482..3f513397769b 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -39,34 +39,34 @@ using namespace ::com::sun::star::sdb;
 //====================================================================
 namespace
 {
-    // -----------------------------------------------------------------------------
+
     // this namespace contains access to all static members of the class SwDbtoolsClient
     // to make the initialize of the dll a little bit faster
-    // -----------------------------------------------------------------------------
+
     ::osl::Mutex& getDbtoolsClientMutex()
     {
         static  ::osl::Mutex aMutex;
         return aMutex;
     }
-    // -----------------------------------------------------------------------------
+
     sal_Int32& getDbToolsClientClients()
     {
         static  sal_Int32 nClients = 0;
         return nClients;
     }
-    // -----------------------------------------------------------------------------
+
     oslModule& getDbToolsClientModule()
     {
         static oslModule hDbtoolsModule = NULL;
         return hDbtoolsModule;
     }
-    // -----------------------------------------------------------------------------
+
     createDataAccessToolsFactoryFunction& getDbToolsClientFactoryFunction()
     {
         static createDataAccessToolsFactoryFunction pFactoryCreationFunc = NULL;
         return pFactoryCreationFunc;
     }
-    // -----------------------------------------------------------------------------
+
 }
 
 SwDbtoolsClient::SwDbtoolsClient()
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index b98c01875e45..bcf4785e9cfe 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1837,7 +1837,7 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
     return 0;
 }
 
-// --------------------------------------------------------------
+
 
 // numbering format conversion:
 // ListBox  - format            - enum-value
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index d52a9af40c15..18da20105978 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2583,7 +2583,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
             case KS_CellTopSmall:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTblVMove() );   break;
             case KS_CellBottomSmall:    rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTblVMove() );    break;
 
-//---------------
+
             case KS_InsDel_ColLeftBig:          rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() ); break;
             case KS_InsDel_ColRightBig:         rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_RIGHT|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblHInsert() );    break;
             case KS_InsDel_ColLeftSmall:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_COL_LEFT, pModOpt->GetTblHInsert() ); break;
@@ -2600,7 +2600,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
             case KS_InsDel_CellBottomBig:       rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_BOTTOM|nsTblChgWidthHeightType::WH_FLAG_BIGGER, pModOpt->GetTblVInsert() );  break;
             case KS_InsDel_CellTopSmall:        rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_TOP, pModOpt->GetTblVInsert() ); break;
             case KS_InsDel_CellBottomSmall:     rSh.SetColRowWidthHeight( nsTblChgWidthHeightType::WH_FLAG_INSDEL|nsTblChgWidthHeightType::WH_CELL_BOTTOM, pModOpt->GetTblVInsert() );  break;
-//---------------
+
             case KS_TblColCellInsDel:
                 rSh.SetColRowWidthHeight( eTblChgMode, nTblChgSize );
                 break;
diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx
index 5510639a0880..5a033d1a8542 100644
--- a/sw/source/ui/fldui/xfldui.cxx
+++ b/sw/source/ui/fldui/xfldui.cxx
@@ -43,11 +43,11 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::beans;
 
 
-// ---------------------------------------------------------------------------
+
 // This file contains all routines of the fldui directory, which must compile
 // with exceptions. So we can reduce the code of the other files, which don't
 // need any exception handling.
-// ---------------------------------------------------------------------------
+
 
 /*--------------------------------------------------------------------
      Description: Is the database field numeric?
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index f43075de9572..4dc0ce7c1acb 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -62,7 +62,7 @@ SwHyphWrapper::SwHyphWrapper( SwView* pVw,
     SetHyphen();
 }
 
-// -----------------------------------------------------------------------
+
 void SwHyphWrapper::SpellStart( SvxSpellArea eSpell )
 {
     if( SVX_SPELL_OTHER == eSpell && nPageCount )
@@ -74,7 +74,7 @@ void SwHyphWrapper::SpellStart( SvxSpellArea eSpell )
     pView->HyphStart( eSpell );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SwHyphWrapper::SpellContinue()
 {
@@ -101,14 +101,14 @@ sal_Bool SwHyphWrapper::SpellContinue()
     return GetLast().is();
 }
 
-// -----------------------------------------------------------------------
+
 void SwHyphWrapper::SpellEnd()
 {
     PSH->HyphEnd();
     SvxSpellWrapper::SpellEnd();
 }
 
-// -----------------------------------------------------------------------
+
 sal_Bool SwHyphWrapper::SpellMore()
 {
     PSH->Push();
@@ -117,7 +117,7 @@ sal_Bool SwHyphWrapper::SpellMore()
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos )
 {
@@ -129,7 +129,7 @@ void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos )
         PSH->HyphIgnore();
 }
 
-// -----------------------------------------------------------------------
+
 SwHyphWrapper::~SwHyphWrapper()
 {
     if( nPageCount )
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 423df7f5b151..f6e888b7b7ba 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -69,7 +69,7 @@ IMPL_LINK( SwFootNoteOptionDlg, OkHdl, Button *, pBtn )
 }
 
 
-//----------------------------------------------------------------------
+
 
 
 SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN,
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index a9d2cf8cf8b7..7509afb1f826 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -72,7 +72,7 @@ namespace bridge_test
 template< class T>
 Sequence<T> cloneSequence(const Sequence<T>& val);
 
-//--------------------------------------------------------------------------------------------------
+
 inline static Sequence< OUString > getSupportedServiceNames()
 {
     OUString aName( SERVICENAME );
@@ -282,7 +282,7 @@ static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const Test
     return bReturn;
 }
 
-//_______________________________________________________________________________________
+
 static sal_Bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT )
 {
     sal_Int32 i,nRounds;
@@ -327,7 +327,7 @@ public:
 };
 
 
-//_______________________________________________________________________________________
+
 static sal_Bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT )
 {
     xLBT->startRecursiveCall( new ORecursiveCall , 50 );
@@ -344,20 +344,20 @@ public:
     virtual void SAL_CALL release() throw ();
 };
 
-//______________________________________________________________________________
+
 MyClass::MyClass()
 {
 }
-//______________________________________________________________________________
+
 MyClass::~MyClass()
 {
 }
-//______________________________________________________________________________
+
 void MyClass::acquire() throw ()
 {
     OWeakObject::acquire();
 }
-//______________________________________________________________________________
+
 void MyClass::release() throw ()
 {
     OWeakObject::release();
@@ -1234,19 +1234,19 @@ sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
 }
 
 // XServiceInfo
-//__________________________________________________________________________________________________
+
 OUString TestBridgeImpl::getImplementationName()
     throw (RuntimeException)
 {
     return OUString( IMPLNAME );
 }
-//__________________________________________________________________________________________________
+
 sal_Bool TestBridgeImpl::supportsService( const OUString & rServiceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > TestBridgeImpl::getSupportedServiceNames()
     throw (RuntimeException)
 {
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 370c2b74adad..f488800397dd 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -61,7 +61,7 @@ using namespace test::testtools::bridgetest;
 namespace bridge_object
 {
 
-//--------------------------------------------------------------------------------------------------
+
 inline static Sequence< OUString > getSupportedServiceNames()
 {
     OUString aName( SERVICENAME );
@@ -479,13 +479,13 @@ public:
      Dummy(): WeakComponentImplHelperBase(*Mutex::getGlobalMutex()){}
 
 };
-//__________________________________________________________________________________________________
+
 Any Test_Impl::transportAny( const Any & value ) throw ( ::com::sun::star::uno::RuntimeException)
 {
     return value;
 }
 
-//__________________________________________________________________________________________________
+
 
 namespace {
 
@@ -513,7 +513,7 @@ void Test_Impl::call( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw(::com::su
     m_nLastCallId = nCallId;
 }
 
-//__________________________________________________________________________________________________
+
 void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (::com::sun::star::uno::RuntimeException)
 {
     wait(nWaitMUSEC);
@@ -521,13 +521,13 @@ void Test_Impl::callOneway( sal_Int32 nCallId , sal_Int32 nWaitMUSEC ) throw (::
     m_nLastCallId = nCallId;
 }
 
-//__________________________________________________________________________________________________
+
 sal_Bool Test_Impl::sequenceOfCallTestPassed() throw (::com::sun::star::uno::RuntimeException)
 {
     return m_bSequenceOfCallTestPassed;
 }
 
-//__________________________________________________________________________________________________
+
 void SAL_CALL Test_Impl::startRecursiveCall(
     const ::com::sun::star::uno::Reference< XRecursiveCall >& xCall, sal_Int32 nToCall )
     throw(::com::sun::star::uno::RuntimeException)
@@ -564,7 +564,7 @@ OUString Test_Impl::testMulti(Reference< XMulti > const & multi)
     return testtools::bridgetest::testMulti(multi);
 }
 
-//__________________________________________________________________________________________________
+
 void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
                            sal_Int16 nShort, sal_uInt16 nUShort,
                            sal_Int32 nLong, sal_uInt32 nULong,
@@ -582,7 +582,7 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
             eEnum, rStr, xTest, rAny, rSequence );
     _aStructData = rStruct;
 }
-//__________________________________________________________________________________________________
+
 TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                 sal_Int16& nShort, sal_uInt16& nUShort,
                                 sal_Int32& nLong, sal_uInt32& nULong,
@@ -606,7 +606,7 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n
 
     return _aStructData;
 }
-//__________________________________________________________________________________________________
+
 TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte,
                                sal_Int16& nShort, sal_uInt16& nUShort,
                                sal_Int32& nLong, sal_uInt32& nULong,
@@ -638,7 +638,7 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB
     rStruct = _aStructData;
     return _aStructData;
 }
-//__________________________________________________________________________________________________
+
 TestData Test_Impl::raiseException( sal_Int16 nArgumentPos, const OUString & rMsg, const Reference< XInterface > & xContext )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
@@ -692,7 +692,7 @@ void dothrow( RuntimeException const & e )
 #endif
     dothrow2( e );
 }
-//______________________________________________________________________________
+
 sal_Int32 Test_Impl::getRuntimeException()
     throw (RuntimeException)
 {
@@ -707,7 +707,7 @@ sal_Int32 Test_Impl::getRuntimeException()
     }
     return 0; // for dummy
 }
-//__________________________________________________________________________________________________
+
 void Test_Impl::setRuntimeException( sal_Int32 ) throw(::com::sun::star::uno::RuntimeException)
 {
     RuntimeException aExc;
@@ -1145,19 +1145,19 @@ Reference< XCurrentContextChecker > Test_Impl::getCurrentContextChecker()
 }
 
 // XServiceInfo
-//__________________________________________________________________________________________________
+
 OUString Test_Impl::getImplementationName()
     throw (RuntimeException)
 {
     return OUString( IMPLNAME );
 }
-//__________________________________________________________________________________________________
+
 sal_Bool Test_Impl::supportsService( const OUString & rServiceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > Test_Impl::getSupportedServiceNames()
     throw (RuntimeException)
 {
diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx
index 3c5d35ccbf67..613ae9af9132 100644
--- a/testtools/source/performance/pseudo.cxx
+++ b/testtools/source/performance/pseudo.cxx
@@ -59,7 +59,7 @@ struct pseudo_unoInterfaceProxy : public uno_Interface
                                      typelib_InterfaceTypeDescription * pTypeDescr_,
                                      const OUString & rOId_ );
 };
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_unoInterfaceProxy_dispatch(
     uno_Interface * pUnoI,
     const typelib_TypeDescription * pMemberType,
@@ -71,7 +71,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_dispatch(
     (*pThis->pUnoI->pDispatcher)( pThis->pUnoI, pMemberType, pReturn, pArgs, ppException );
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, void * pProxy )
 {
     pseudo_unoInterfaceProxy * pThis =
@@ -89,7 +89,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_free( uno_ExtEnvironment * pEnv, v
 #endif
     delete pThis;
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_unoInterfaceProxy_acquire( uno_Interface * pUnoI )
 {
     if (1 == osl_atomic_increment( &static_cast< pseudo_unoInterfaceProxy * >( pUnoI )->nRef ))
@@ -105,7 +105,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_acquire( uno_Interface * pUnoI )
         OSL_ASSERT( pThis == static_cast< uno_Interface * >( pUnoI ) );
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_unoInterfaceProxy_release( uno_Interface * pUnoI )
 {
     if (! osl_atomic_decrement( & static_cast< pseudo_unoInterfaceProxy * >( pUnoI )->nRef ))
@@ -115,7 +115,7 @@ static void SAL_CALL pseudo_unoInterfaceProxy_release( uno_Interface * pUnoI )
             static_cast< pseudo_unoInterfaceProxy * >( pUnoI )->pPseudoMapping->pTo, pUnoI );
     }
 }
-//__________________________________________________________________________________________________
+
 inline pseudo_unoInterfaceProxy::pseudo_unoInterfaceProxy(
     pseudo_Mapping * pPseudoMapping_, uno_Interface * pUnoI_,
     typelib_InterfaceTypeDescription * pTypeDescr_, const OUString & rOId_ )
@@ -137,7 +137,7 @@ inline pseudo_unoInterfaceProxy::pseudo_unoInterfaceProxy(
     uno_Interface::pDispatcher = pseudo_unoInterfaceProxy_dispatch;
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_Mapping_mapInterface(
     uno_Mapping * pMapping, void ** ppOut,
     void * pUnoI, typelib_InterfaceTypeDescription * pTypeDescr )
@@ -180,12 +180,12 @@ static void SAL_CALL pseudo_Mapping_mapInterface(
         }
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_Mapping_free( uno_Mapping * pMapping )
 {
     delete static_cast< pseudo_Mapping * >( pMapping );
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_Mapping_acquire( uno_Mapping * pMapping )
 {
     if (1 == osl_atomic_increment( & static_cast< pseudo_Mapping * >( pMapping )->nRef ))
@@ -198,7 +198,7 @@ static void SAL_CALL pseudo_Mapping_acquire( uno_Mapping * pMapping )
                              aMappingPurpose.pData );
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static void SAL_CALL pseudo_Mapping_release( uno_Mapping * pMapping )
 {
     if (! osl_atomic_decrement( & static_cast< pseudo_Mapping * >( pMapping )->nRef ))
@@ -207,7 +207,7 @@ static void SAL_CALL pseudo_Mapping_release( uno_Mapping * pMapping )
     }
 }
 
-//__________________________________________________________________________________________________
+
 pseudo_Mapping::pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment * pTo_ )
     : nRef( 1 )
     , pFrom( pFrom_ )
@@ -220,7 +220,7 @@ pseudo_Mapping::pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment
     uno_Mapping::release = pseudo_Mapping_release;
     uno_Mapping::mapInterface = pseudo_Mapping_mapInterface;
 }
-//__________________________________________________________________________________________________
+
 pseudo_Mapping::~pseudo_Mapping()
 {
     (*((uno_Environment *)pTo)->release)( (uno_Environment *)pTo );
diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx
index 404e14fc5a79..15560436cf5d 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::test::performance;
 namespace benchmark_object
 {
 
-//--------------------------------------------------------------------------------------------------
+
 inline static Sequence< OUString > getSupportedServiceNames()
 {
     OUString aName( SERVICENAME);
@@ -201,19 +201,19 @@ public:
 //##################################################################################################
 
 // XServiceInfo
-//__________________________________________________________________________________________________
+
 OUString ServiceImpl::getImplementationName()
     throw (RuntimeException)
 {
     return OUString( IMPLNAME );
 }
-//__________________________________________________________________________________________________
+
 sal_Bool ServiceImpl::supportsService( const OUString & rServiceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > ServiceImpl::getSupportedServiceNames()
     throw (RuntimeException)
 {
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index acdeb8255200..783c28a3643a 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -107,7 +107,7 @@ static inline sal_uInt32 getSystemTicks()
 #endif
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static void out( const sal_Char * pText, FILE * stream = stderr,
                  sal_Int32 nStart = -1, sal_Char cFillchar = ' ' )
 {
@@ -130,14 +130,14 @@ static void out( const sal_Char * pText, FILE * stream = stderr,
             ++s_nPos;
     }
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline void out( const OUString & rText, FILE * stream = stderr,
                         sal_Int32 nStart = -1, sal_Char cFillchar = ' ' )
 {
     OString aText( OUStringToOString( rText, RTL_TEXTENCODING_ASCII_US ) );
     out( aText.getStr(), stream, nStart, cFillchar );
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline void out( double fVal, FILE * stream = stderr,
                         sal_Int32 nStart = -1, sal_Char cFillchar = ' ' )
 {
@@ -145,7 +145,7 @@ static inline void out( double fVal, FILE * stream = stderr,
     ::snprintf( ar, sizeof(ar), (fVal < 0.000001 ? "%g" : "%f"), fVal );
     out( ar, stream, nStart, cFillchar );
 }
-//--------------------------------------------------------------------------------------------------
+
 static inline void out( sal_Int64 nVal, FILE * stream = stderr,
                         sal_Int32 nStart = -1, sal_Char cFillchar = ' ' )
 {
@@ -312,7 +312,7 @@ Reference< XSingleServiceFactory > loadLibComponentFactory(
 
     return xRet;
 }
-//--------------------------------------------------------------------------------------------------
+
 template< class T >
 static void createInstance( Reference< T > & rxOut,
                             const Reference< XMultiServiceFactory > & xMgr,
@@ -392,7 +392,7 @@ static void createInstance( Reference< T > & rxOut,
     }
 }
 
-//--------------------------------------------------------------------------------------------------
+
 inline static Sequence< OUString > getSupportedServiceNames()
 {
     OUString aName( SERVICENAME );
@@ -423,12 +423,12 @@ public:
 
 //##################################################################################################
 
-//__________________________________________________________________________________________________
+
 TestImpl::TestImpl( const Reference< XMultiServiceFactory > & xSMgr )
     : _xSMgr( xSMgr )
 {
 }
-//__________________________________________________________________________________________________
+
 TestImpl::~TestImpl()
 {
 }
@@ -440,26 +440,26 @@ static Reference< XInterface > SAL_CALL TestImpl_create( const Reference< XMulti
 }
 
 // XServiceInfo
-//__________________________________________________________________________________________________
+
 OUString TestImpl::getImplementationName()
     throw (RuntimeException)
 {
     return OUString( IMPLNAME );
 }
-//__________________________________________________________________________________________________
+
 sal_Bool TestImpl::supportsService( const OUString & rServiceName )
     throw (RuntimeException)
 {
     return cppu::supportsService(this, rServiceName);
 }
-//__________________________________________________________________________________________________
+
 Sequence< OUString > TestImpl::getSupportedServiceNames()
     throw (RuntimeException)
 {
     return benchmark_test::getSupportedServiceNames();
 }
 
-//__________________________________________________________________________________________________
+
 Reference< XInterface > TestImpl::getDirect()
     throw (Exception)
 {
@@ -479,7 +479,7 @@ Reference< XInterface > TestImpl::getDirect()
     }
     return _xDirect;
 }
-//--------------------------------------------------------------------------------------------------
+
 Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl )
     throw (Exception)
 {
@@ -521,7 +521,7 @@ public:
 
     double ratio( const TimeEntry & rEntry ) const;
 };
-//__________________________________________________________________________________________________
+
 double TimeEntry::ratio( const TimeEntry & rEntry ) const
 {
     double f = rEntry.nTicks * nLoop;
@@ -544,7 +544,7 @@ struct TimingSheet
     t_TimeEntryMap      _entries;
     void insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks );
 };
-//__________________________________________________________________________________________________
+
 void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nTicks )
 {
     _entries[ pText ] = TimeEntry( nLoop, nTicks );
@@ -553,7 +553,7 @@ void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nT
 //==================================================================================================
 typedef boost::unordered_map< std::string, TimingSheet > t_TimingSheetMap;
 
-//--------------------------------------------------------------------------------------------------
+
 static void benchmark(
     TimingSheet & rSheet, const Reference< XInterface > & xInstance, sal_Int64 nLoop )
     throw (Exception)
@@ -570,7 +570,7 @@ static void benchmark(
 
     ComplexTypes aDummyStruct;
 
-    //------------------------------------
+
     // oneway calls
     i = nLoop;
     tStart = getSystemTicks();
@@ -928,10 +928,10 @@ static void benchmark(
     tEnd = getSystemTicks();
     rSheet.insert( "Ba: raising RuntimeException", nLoop, tEnd - tStart );
 
-    //------------------------------------
+
 }
 
-//--------------------------------------------------------------------------------------------------
+
 static OUString extractParam( const Sequence< OUString > & rArgs, const OUString & rParam )
 {
     const OUString * pArgs = rArgs.getConstArray();
@@ -949,7 +949,7 @@ static OUString extractParam( const Sequence< OUString > & rArgs, const OUString
 const sal_Int32 nMagicNumberDirect = 34000;
 
 //XMain
-//__________________________________________________________________________________________________
+
 sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
     throw (RuntimeException)
 {
@@ -1027,7 +1027,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
         t_TimingSheetMap aSheets;
         TimingSheet aDirect;
 
-        //------------------------------------------------------------------------------------------
+
 
         if (aArg.indexOf( 'd' ) >= 0)
         {
@@ -1038,7 +1038,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             fprintf( stderr, "Duration (direct in process): %g s\n", (nEnd - nStart)/1000.  );
         }
 
-        //------------------------------------------------------------------------------------------
+
 
         if (aArg.indexOf( 'm' ) >= 0)
         {
@@ -1069,7 +1069,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             fprintf( stderr, "Duration (mapped in process): %g s\n", (nStart - nEnd)/1000. );
         }
 
-        //------------------------------------------------------------------------------------------
+
 
         if (aArg.indexOf( 's' ) >= 0)
         {
@@ -1137,7 +1137,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             benchmark( aSheets[ "remote same host" ], xResolvedObject, nLoop / 300 );
         }
 
-        //------------------------------------------------------------------------------------------
+
 
         if (aArg.indexOf( 'r' ) >= 0)
         {
@@ -1156,7 +1156,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
             fprintf( stderr, "Duration (%s): %g s\n", o.getStr(),(t2 - t1)/1000. );
         }
 
-        //------------------------------------------------------------------------------------------
+
 
         if (aArg.indexOf( 'j' ) >= 0)
         {
@@ -1166,7 +1166,7 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
                        nLoop / 1000 );
         }
 
-        //------------------------------------------------------------------------------------------
+
         // dump out tables
 
         out( "\nTimes( ratio to direct in process )", stream );
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index 464522c70cc5..362719ed8ee0 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -106,7 +106,7 @@ namespace toolkit
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         OUString lcl_getHighContrastURL( OUString const& i_imageURL )
         {
             INetURLObject aURL( i_imageURL );
@@ -127,7 +127,7 @@ namespace toolkit
             return composer.makeStringAndClear();
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         bool lcl_ensureImage_throw( Reference< XGraphicProvider > const& i_graphicProvider, const bool i_isHighContrast, const CachedImage& i_cachedImage )
         {
             if ( !i_cachedImage.xGraphic.is() )
@@ -148,7 +148,7 @@ namespace toolkit
             return i_cachedImage.xGraphic.is();
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         Size lcl_getGraphicSizePixel( Reference< XGraphic > const& i_graphic )
         {
             Size aSizePixel;
@@ -167,7 +167,7 @@ namespace toolkit
             return aSizePixel;
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_init( Sequence< OUString > const& i_imageURLs, ::std::vector< CachedImage >& o_images )
         {
             o_images.resize(0);
@@ -179,7 +179,7 @@ namespace toolkit
             }
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_updateImageList_nothrow( AnimatedImagesPeer_Data& i_data )
         {
             Throbber* pThrobber = dynamic_cast< Throbber* >( i_data.rAntiImpl.GetWindow() );
@@ -268,7 +268,7 @@ namespace toolkit
             }
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_updateImageList_nothrow( AnimatedImagesPeer_Data& i_data, const Reference< XAnimatedImages >& i_images )
         {
             try
@@ -295,19 +295,19 @@ namespace toolkit
     //==================================================================================================================
     //= AnimatedImagesPeer
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     AnimatedImagesPeer::AnimatedImagesPeer()
         :AnimatedImagesPeer_Base()
         ,m_pData( new AnimatedImagesPeer_Data( *this ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     AnimatedImagesPeer::~AnimatedImagesPeer()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::startAnimation(  ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -316,7 +316,7 @@ namespace toolkit
             pThrobber->start();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::stopAnimation(  ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -325,7 +325,7 @@ namespace toolkit
             pThrobber->stop();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL AnimatedImagesPeer::isAnimationRunning(  ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -335,7 +335,7 @@ namespace toolkit
         return sal_False;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::setProperty( const OUString& i_propertyName, const Any& i_value ) throw(RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -382,7 +382,7 @@ namespace toolkit
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL AnimatedImagesPeer::getProperty( const OUString& i_propertyName ) throw(RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -419,7 +419,7 @@ namespace toolkit
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void AnimatedImagesPeer::ProcessWindowEvent( const VclWindowEvent& i_windowEvent )
     {
         switch ( i_windowEvent.GetId() )
@@ -432,7 +432,7 @@ namespace toolkit
         AnimatedImagesPeer_Base::ProcessWindowEvent( i_windowEvent );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void AnimatedImagesPeer::impl_updateImages_nolck( const Reference< XInterface >& i_animatedImages )
     {
         SolarMutexGuard aGuard;
@@ -440,7 +440,7 @@ namespace toolkit
         lcl_updateImageList_nothrow( *m_pData, Reference< XAnimatedImages >( i_animatedImages, UNO_QUERY_THROW ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -463,7 +463,7 @@ namespace toolkit
         lcl_updateImageList_nothrow( *m_pData );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -482,7 +482,7 @@ namespace toolkit
         lcl_updateImageList_nothrow( *m_pData );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -505,19 +505,19 @@ namespace toolkit
         lcl_updateImageList_nothrow( *m_pData );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::disposing( const EventObject& i_event ) throw (RuntimeException)
     {
         VCLXWindow::disposing( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::modified( const EventObject& i_event ) throw (RuntimeException)
     {
         impl_updateImages_nolck( i_event.Source );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesPeer::dispose(  ) throw(RuntimeException)
     {
         AnimatedImagesPeer_Base::dispose();
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index a09f95f7af2e..91a7231fd833 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -68,7 +68,7 @@ namespace toolkit
         DECL_LINK( OnWindowEvent, const VclWindowEvent* );
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     IMPL_LINK( WindowStyleSettings_Data, OnWindowEvent, const VclWindowEvent*, i_pEvent )
     {
         if ( !i_pEvent || ( i_pEvent->GetId() != VCLEVENT_WINDOW_DATACHANGED ) )
@@ -107,7 +107,7 @@ namespace toolkit
     //==================================================================================================================
     //= WindowStyleSettings
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     WindowStyleSettings::WindowStyleSettings(::osl::Mutex& i_rListenerMutex, VCLXWindow& i_rOwningWindow )
         :m_pData( new WindowStyleSettings_Data(i_rListenerMutex, i_rOwningWindow ) )
     {
@@ -117,12 +117,12 @@ namespace toolkit
         pWindow->AddEventListener( LINK( m_pData.get(), WindowStyleSettings_Data, OnWindowEvent ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     WindowStyleSettings::~WindowStyleSettings()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void WindowStyleSettings::dispose()
     {
         StyleMethodGuard aGuard( *m_pData );
@@ -138,7 +138,7 @@ namespace toolkit
         m_pData->pOwningWindow = NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         sal_Int32 lcl_getStyleColor( WindowStyleSettings_Data& i_rData, Color const & (StyleSettings::*i_pGetter)() const )
@@ -180,217 +180,217 @@ namespace toolkit
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveBorderColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveBorderColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setActiveBorderColor( ::sal_Int32 _activebordercolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveBorderColor, _activebordercolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setActiveColor( ::sal_Int32 _activecolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveColor, _activecolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTabColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTabColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setActiveTabColor( ::sal_Int32 _activetabcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTabColor, _activetabcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getActiveTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetActiveTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setActiveTextColor( ::sal_Int32 _activetextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetActiveTextColor, _activetextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonRolloverTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonRolloverTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setButtonRolloverTextColor( ::sal_Int32 _buttonrollovertextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonRolloverTextColor, _buttonrollovertextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getButtonTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetButtonTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setButtonTextColor( ::sal_Int32 _buttontextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetButtonTextColor, _buttontextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getCheckedColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetCheckedColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setCheckedColor( ::sal_Int32 _checkedcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetCheckedColor, _checkedcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDarkShadowColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDarkShadowColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDarkShadowColor( ::sal_Int32 _darkshadowcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDarkShadowColor, _darkshadowcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveBorderColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveBorderColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDeactiveBorderColor( ::sal_Int32 _deactivebordercolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveBorderColor, _deactivebordercolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDeactiveColor( ::sal_Int32 _deactivecolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveColor, _deactivecolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDeactiveTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDeactiveTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDeactiveTextColor( ::sal_Int32 _deactivetextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDeactiveTextColor, _deactivetextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDialogColor( ::sal_Int32 _dialogcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogColor, _dialogcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDialogTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDialogTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDialogTextColor( ::sal_Int32 _dialogtextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDialogTextColor, _dialogtextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getDisableColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetDisableColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setDisableColor( ::sal_Int32 _disablecolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetDisableColor, _disablecolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFaceColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setFaceColor( ::sal_Int32 _facecolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFaceColor, _facecolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getFaceGradientColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
@@ -400,301 +400,301 @@ namespace toolkit
         return aStyleSettings.GetFaceGradientColor().GetColor();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setFieldColor( ::sal_Int32 _fieldcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldColor, _fieldcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldRolloverTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldRolloverTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setFieldRolloverTextColor( ::sal_Int32 _fieldrollovertextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldRolloverTextColor, _fieldrollovertextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getFieldTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetFieldTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setFieldTextColor( ::sal_Int32 _fieldtextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetFieldTextColor, _fieldtextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getGroupTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetGroupTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setGroupTextColor( ::sal_Int32 _grouptextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetGroupTextColor, _grouptextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setHelpColor( ::sal_Int32 _helpcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpColor, _helpcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getHelpTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHelpTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setHelpTextColor( ::sal_Int32 _helptextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHelpTextColor, _helptextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setHighlightColor( ::sal_Int32 _highlightcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightColor, _highlightcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getHighlightTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetHighlightTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setHighlightTextColor( ::sal_Int32 _highlighttextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetHighlightTextColor, _highlighttextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getInactiveTabColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetInactiveTabColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setInactiveTabColor( ::sal_Int32 _inactivetabcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetInactiveTabColor, _inactivetabcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getInfoTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetInfoTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setInfoTextColor( ::sal_Int32 _infotextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetInfoTextColor, _infotextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getLabelTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetLabelTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setLabelTextColor( ::sal_Int32 _labeltextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetLabelTextColor, _labeltextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getLightColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetLightColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setLightColor( ::sal_Int32 _lightcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetLightColor, _lightcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuBarColor( ::sal_Int32 _menubarcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarColor, _menubarcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBarTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBarTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuBarTextColor( ::sal_Int32 _menubartextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBarTextColor, _menubartextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuBorderColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuBorderColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuBorderColor( ::sal_Int32 _menubordercolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuBorderColor, _menubordercolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuColor( ::sal_Int32 _menucolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuColor, _menucolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuHighlightColor( ::sal_Int32 _menuhighlightcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightColor, _menuhighlightcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuHighlightTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuHighlightTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuHighlightTextColor( ::sal_Int32 _menuhighlighttextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuHighlightTextColor, _menuhighlighttextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMenuTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMenuTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuTextColor( ::sal_Int32 _menutextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMenuTextColor, _menutextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getMonoColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetMonoColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMonoColor( ::sal_Int32 _monocolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetMonoColor, _monocolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getRadioCheckTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetRadioCheckTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setRadioCheckTextColor( ::sal_Int32 _radiochecktextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetRadioCheckTextColor, _radiochecktextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getSeparatorColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
@@ -704,63 +704,63 @@ namespace toolkit
         return aStyleSettings.GetSeparatorColor().GetColor();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getShadowColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetShadowColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setShadowColor( ::sal_Int32 _shadowcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetShadowColor, _shadowcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setWindowColor( ::sal_Int32 _windowcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowColor, _windowcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getWindowTextColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetWindowTextColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setWindowTextColor( ::sal_Int32 _windowtextcolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetWindowTextColor, _windowtextcolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL WindowStyleSettings::getWorkspaceColor() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleColor( *m_pData, &StyleSettings::GetWorkspaceColor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setWorkspaceColor( ::sal_Int32 _workspacecolor ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleColor( *m_pData, &StyleSettings::SetWorkspaceColor, _workspacecolor );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL WindowStyleSettings::getHighContrastMode() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
@@ -770,7 +770,7 @@ namespace toolkit
         return aStyleSettings.GetHighContrastMode();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setHighContrastMode( ::sal_Bool _highcontrastmode ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
@@ -782,175 +782,175 @@ namespace toolkit
         pWindow->SetSettings( aAllSettings );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getApplicationFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetAppFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setApplicationFont( const FontDescriptor& _applicationfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetAppFont, &StyleSettings::GetAppFont, _applicationfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getHelpFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetHelpFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setHelpFont( const FontDescriptor& _helpfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetHelpFont, &StyleSettings::GetHelpFont, _helpfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getTitleFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetTitleFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setTitleFont( const FontDescriptor& _titlefont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetTitleFont, &StyleSettings::GetTitleFont, _titlefont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getFloatTitleFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetFloatTitleFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setFloatTitleFont( const FontDescriptor& _floattitlefont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetFloatTitleFont, &StyleSettings::GetFloatTitleFont, _floattitlefont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getMenuFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetMenuFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setMenuFont( const FontDescriptor& _menufont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetMenuFont, &StyleSettings::GetMenuFont, _menufont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getToolFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetToolFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setToolFont( const FontDescriptor& _toolfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetToolFont, &StyleSettings::GetToolFont, _toolfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getGroupFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetGroupFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setGroupFont( const FontDescriptor& _groupfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetGroupFont, &StyleSettings::GetGroupFont, _groupfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getLabelFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetLabelFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setLabelFont( const FontDescriptor& _labelfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetLabelFont, &StyleSettings::GetLabelFont, _labelfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getInfoFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetInfoFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setInfoFont( const FontDescriptor& _infofont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetInfoFont, &StyleSettings::GetInfoFont, _infofont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getRadioCheckFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetRadioCheckFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setRadioCheckFont( const FontDescriptor& _radiocheckfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetRadioCheckFont, &StyleSettings::GetRadioCheckFont, _radiocheckfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getPushButtonFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetPushButtonFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setPushButtonFont( const FontDescriptor& _pushbuttonfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetPushButtonFont, &StyleSettings::GetPushButtonFont, _pushbuttonfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     FontDescriptor SAL_CALL WindowStyleSettings::getFieldFont() throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         return lcl_getStyleFont( *m_pData, &StyleSettings::GetFieldFont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::setFieldFont( const FontDescriptor& _fieldfont ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
         lcl_setStyleFont( *m_pData, &StyleSettings::SetFieldFont, &StyleSettings::GetFieldFont, _fieldfont );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::addStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
@@ -958,7 +958,7 @@ namespace toolkit
             m_pData->aStyleChangeListeners.addInterface( i_rListener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL WindowStyleSettings::removeStyleChangeListener( const Reference< XStyleChangeListener >& i_rListener ) throw (RuntimeException)
     {
         StyleMethodGuard aGuard( *m_pData );
diff --git a/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index f2573db0a923..75e6ecc6cfc4 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.cxx
@@ -235,9 +235,9 @@ VCLXVirtualDevice::~VCLXVirtualDevice()
 }
 
 
-// -----------------------------------------------------------------------------
+
 // Interface implementation of ::com::sun::star::awt::XUnitConversion
-// -----------------------------------------------------------------------------
+
 
 ::com::sun::star::awt::Point SAL_CALL VCLXDevice::convertPointToLogic( const ::com::sun::star::awt::Point& aPoint, ::sal_Int16 TargetUnit ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index a34b8f4a3614..7215dec464f9 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.cxx
@@ -42,7 +42,7 @@ namespace toolkit
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;
 
-    //--------------------------------------------------------------------
+
     namespace
     {
         void lcl_modifyStyle( Window* _pWindow, WinBits _nStyleBits, sal_Bool _bShouldBePresent )
@@ -60,26 +60,26 @@ namespace toolkit
     //= VCLXSpinButton
     //====================================================================
     DBG_NAME( VCLXSpinButton )
-    //--------------------------------------------------------------------
+
     VCLXSpinButton::VCLXSpinButton()
         :maAdjustmentListeners( *this )
     {
         DBG_CTOR( VCLXSpinButton, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     VCLXSpinButton::~VCLXSpinButton()
     {
         DBG_DTOR( VCLXSpinButton, NULL );
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE2( VCLXSpinButton, VCLXWindow, VCLXSpinButton_Base )
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXSpinButton, VCLXWindow, VCLXSpinButton_Base )
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::dispose( ) throw(RuntimeException)
     {
         {
@@ -93,14 +93,14 @@ namespace toolkit
         VCLXWindow::dispose();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::addAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException)
     {
         if ( listener.is() )
             maAdjustmentListeners.addInterface( listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::removeAdjustmentListener( const Reference< XAdjustmentListener >& listener ) throw (RuntimeException)
     {
         if ( listener.is() )
@@ -135,13 +135,13 @@ namespace toolkit
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setValue( sal_Int32 n ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValue, n );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -151,49 +151,49 @@ namespace toolkit
         setValue( currentValue );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL VCLXSpinButton::getValue(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValue );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setMinimum( sal_Int32 minValue ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMin, minValue );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setMaximum( sal_Int32 maxValue ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetRangeMax, maxValue );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL VCLXSpinButton::getMinimum(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMin );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL VCLXSpinButton::getMaximum(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetRangeMax );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException)
     {
         lcl_setSpinButtonValue( GetWindow(), &SpinButton::SetValueStep, spinIncrement );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL VCLXSpinButton::getSpinIncrement(  ) throw (RuntimeException)
     {
         return lcl_getSpinButtonValue( GetWindow(), &SpinButton::GetValueStep );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -201,7 +201,7 @@ namespace toolkit
         lcl_modifyStyle( GetWindow(), WB_HSCROLL, orientation == ScrollBarOrientation::HORIZONTAL );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL VCLXSpinButton::getOrientation(  ) throw (RuntimeException)
     {
         return  ( 0 != ( GetWindow()->GetStyle() & WB_HSCROLL ) )
@@ -209,7 +209,7 @@ namespace toolkit
             :   ScrollBarOrientation::VERTICAL;
     }
 
-    //--------------------------------------------------------------------
+
     void VCLXSpinButton::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent )
     {
         SolarMutexClearableGuard aGuard;
@@ -241,7 +241,7 @@ namespace toolkit
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL VCLXSpinButton::setProperty( const OUString& PropertyName, const Any& Value ) throw(RuntimeException)
     {
         SolarMutexGuard aGuard;
@@ -291,7 +291,7 @@ namespace toolkit
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL VCLXSpinButton::getProperty( const OUString& PropertyName ) throw(RuntimeException)
     {
         SolarMutexGuard aGuard;
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index e2697aeed071..cf11f2ad3eb5 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -161,7 +161,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c
     mxMenuBar = rxMenu;
 }
 
-//--------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMaximized() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -173,7 +173,7 @@ void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::c
     return pWindow->IsMaximized();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -185,7 +185,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro
     pWindow->Maximize( _ismaximized );
 }
 
-//--------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL VCLXTopWindow_Base::getIsMinimized() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -197,7 +197,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMaximized( ::sal_Bool _ismaximized ) thro
     return pWindow->IsMinimized();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -209,7 +209,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro
     _isMinimized ? pWindow->Minimize() : pWindow->Restore();
 }
 
-//--------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL VCLXTopWindow_Base::getDisplay() throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -221,7 +221,7 @@ void SAL_CALL VCLXTopWindow_Base::setIsMinimized( ::sal_Bool _isMinimized ) thro
     return pWindow->GetScreenNumber();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL VCLXTopWindow_Base::setDisplay( ::sal_Int32 _display ) throw (RuntimeException, IndexOutOfBoundsException)
 {
     SolarMutexGuard aGuard;
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index a8b8981bed99..66ed80c97f6c 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -198,7 +198,7 @@ private:
     VCLXWindowImpl& operator=( const VCLXWindowImpl& ); // never implemented
 };
 
-//--------------------------------------------------------------------
+
 VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps )
     :mrAntiImpl( _rAntiImpl )
     ,mbDisposed( false )
@@ -234,7 +234,7 @@ VCLXWindowImpl::~VCLXWindowImpl()
     delete mpPropHelper;
 }
 
-//--------------------------------------------------------------------
+
 void VCLXWindowImpl::disposing()
 {
     SolarMutexGuard aGuard;
@@ -264,7 +264,7 @@ void VCLXWindowImpl::disposing()
     mxWindowStyleSettings.clear();
 }
 
-//--------------------------------------------------------------------
+
 void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback )
 {
     DBG_TESTSOLARMUTEX();
@@ -277,7 +277,7 @@ void VCLXWindowImpl::callBackAsync( const VCLXWindow::Callback& i_callback )
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks)
 {
     const Reference< uno::XInterface > xKeepAlive( mrAntiImpl );
@@ -313,19 +313,19 @@ IMPL_LINK_NOARG(VCLXWindowImpl, OnProcessCallbacks)
     return 0L;
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL VCLXWindowImpl::acquire()
 {
     mrAntiImpl.acquire();
 }
 
-//--------------------------------------------------------------------
+
 void SAL_CALL VCLXWindowImpl::release()
 {
     mrAntiImpl.release();
 }
 
-//--------------------------------------------------------------------
+
 Reference< XStyleSettings > VCLXWindowImpl::getStyleSettings()
 {
     SolarMutexGuard aGuard;
@@ -383,13 +383,13 @@ VCLXWindow::~VCLXWindow()
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback )
 {
     mpImpl->callBackAsync( i_callback );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::toolkit::IAccessibleFactory& VCLXWindow::getAccessibleFactory()
 {
     return mpImpl->getAccessibleFactory().getFactory();
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 623c5eb0cecf..f7cefe668003 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -328,7 +328,7 @@ void VCLXGraphicControl::setProperty( const OUString& PropertyName, const ::com:
     return aProp;
 }
 
-//--------------------------------------------------------------------
+
 //  class VCLXButton
 //  ----------------------------------------------------
 
diff --git a/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 509d2ba78f27..56b13a0bd25f 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.cxx
@@ -43,25 +43,25 @@ namespace toolkit
     //====================================================================
     //= OAccessibleControlContext
     //====================================================================
-    //--------------------------------------------------------------------
+
     OAccessibleControlContext::OAccessibleControlContext()
         : OAccessibleControlContext_Base(new VCLExternalSolarLock)
     {
         // nothing to do here, we have a late ctor
     }
 
-    //--------------------------------------------------------------------
+
     OAccessibleControlContext::~OAccessibleControlContext()
     {
         ensureDisposed();
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XINTERFACE3( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleImplementationAccess, OAccessibleControlContext_IBase )
     IMPLEMENT_FORWARD_XTYPEPROVIDER3( OAccessibleControlContext, OAccessibleControlContext_Base, OAccessibleImplementationAccess, OAccessibleControlContext_IBase )
         // (order matters: the first is the class name, the second is the class doing the ref counting)
 
-    //--------------------------------------------------------------------
+
     void OAccessibleControlContext::Init( const Reference< XAccessible >& _rxCreator ) SAL_THROW( ( Exception ) )
     {
         OContextEntryGuard aGuard( this );
@@ -83,7 +83,7 @@ namespace toolkit
         OAccessibleControlContext_Base::lateInit( _rxCreator );
     }
 
-    //--------------------------------------------------------------------
+
     OAccessibleControlContext* OAccessibleControlContext::create( const Reference< XAccessible >& _rxCreator ) SAL_THROW( ( ) )
     {
         OAccessibleControlContext* pNew = NULL;
@@ -99,7 +99,7 @@ namespace toolkit
         return pNew;
     }
 
-    //--------------------------------------------------------------------
+
     void OAccessibleControlContext::startModelListening( ) SAL_THROW( ( Exception ) )
     {
         Reference< XComponent > xModelComp( m_xControlModel, UNO_QUERY );
@@ -108,7 +108,7 @@ namespace toolkit
             xModelComp->addEventListener( this );
     }
 
-    //--------------------------------------------------------------------
+
     void OAccessibleControlContext::stopModelListening( ) SAL_THROW( ( Exception ) )
     {
         Reference< XComponent > xModelComp( m_xControlModel, UNO_QUERY );
@@ -117,21 +117,21 @@ namespace toolkit
             xModelComp->removeEventListener( this );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleControlContext::getAccessibleChildCount(  ) throw (RuntimeException)
     {
         // we do not have children
         return 0;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         // we do not have children
         throw IndexOutOfBoundsException();
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleParent(  ) throw (RuntimeException)
     {
         OContextEntryGuard aGuard( this );
@@ -141,33 +141,33 @@ namespace toolkit
         return implGetForeignControlledParent();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int16 SAL_CALL OAccessibleControlContext::getAccessibleRole(  ) throw (RuntimeException)
     {
         return AccessibleRole::SHAPE;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OAccessibleControlContext::getAccessibleDescription(  ) throw (RuntimeException)
     {
         OContextEntryGuard aGuard( this );
         return getModelStringProperty( "HelpText" );
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL OAccessibleControlContext::getAccessibleName(  ) throw (RuntimeException)
     {
         OContextEntryGuard aGuard( this );
         return getModelStringProperty( "Name" );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleRelationSet > SAL_CALL OAccessibleControlContext::getAccessibleRelationSet(  ) throw (RuntimeException)
     {
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessibleStateSet > SAL_CALL OAccessibleControlContext::getAccessibleStateSet(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
@@ -187,7 +187,7 @@ namespace toolkit
         return pStateSet;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleControlContext::disposing( const EventObject&
     #if OSL_DEBUG_LEVEL > 0
     _rSource
@@ -204,7 +204,7 @@ namespace toolkit
         OAccessibleControlContext_Base::disposing();
     }
 
-    //--------------------------------------------------------------------
+
     OUString OAccessibleControlContext::getModelStringProperty( const sal_Char* _pPropertyName )
     {
         OUString sReturn;
@@ -224,7 +224,7 @@ namespace toolkit
         return sReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Window* OAccessibleControlContext::implGetWindow( Reference< awt::XWindow >* _pxUNOWindow ) const
     {
         Reference< awt::XControl > xControl( getAccessibleCreator(), UNO_QUERY );
@@ -239,7 +239,7 @@ namespace toolkit
         return pWindow;
     }
 
-    //--------------------------------------------------------------------
+
     awt::Rectangle SAL_CALL OAccessibleControlContext::implGetBounds(  ) throw (RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -299,27 +299,27 @@ namespace toolkit
         return aBounds;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XAccessible > SAL_CALL OAccessibleControlContext::getAccessibleAtPoint( const awt::Point& /* _rPoint */ ) throw (RuntimeException)
     {
         // no children at all
         return NULL;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OAccessibleControlContext::grabFocus(  ) throw (RuntimeException)
     {
         OSL_FAIL( "OAccessibleControlContext::grabFocus: !isFocusTraversable, but grabFocus!" );
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OAccessibleControlContext::getAccessibleKeyBinding(  ) throw (RuntimeException)
     {
         // we do not have any key bindings to activate a UNO control in design mode
         return Any();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleControlContext::getForeground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
@@ -345,7 +345,7 @@ namespace toolkit
         return nColor;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL OAccessibleControlContext::getBackground(  ) throw (::com::sun::star::uno::RuntimeException)
     {
         SolarMutexGuard aSolarGuard;
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index 43f2199799d5..842072ce8cd2 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -86,13 +86,13 @@ public:
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString AnimatedImagesControl::GetComponentServiceName()
     {
         return OUString( "AnimatedImages" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::startAnimation(  ) throw (RuntimeException)
     {
         Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY );
@@ -100,7 +100,7 @@ public:
             xAnimation->startAnimation();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::stopAnimation(  ) throw (RuntimeException)
     {
         Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY );
@@ -108,7 +108,7 @@ public:
             xAnimation->stopAnimation();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL AnimatedImagesControl::isAnimationRunning(  ) throw (RuntimeException)
     {
         Reference< XAnimation > xAnimation( getPeer(), UNO_QUERY );
@@ -117,13 +117,13 @@ public:
         return sal_False;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL AnimatedImagesControl::getImplementationName(  ) throw(RuntimeException)
     {
         return OUString( "org.openoffice.comp.toolkit.AnimatedImagesControl" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AnimatedImagesControl::getSupportedServiceNames() throw(RuntimeException)
     {
         Sequence< OUString > aServices( AnimatedImagesControl_Base::getSupportedServiceNames() );
@@ -132,7 +132,7 @@ public:
         return aServices;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         void lcl_updatePeer( Reference< XWindowPeer > const& i_peer, Reference< XControlModel > const& i_model )
@@ -147,7 +147,7 @@ public:
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool SAL_CALL AnimatedImagesControl::setModel( const Reference< XControlModel >& i_rModel ) throw ( RuntimeException )
     {
         const Reference< XAnimatedImages > xOldContainer( getModel(), UNO_QUERY );
@@ -167,7 +167,7 @@ public:
         return sal_True;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::createPeer( const Reference< XToolkit >& i_toolkit, const Reference< XWindowPeer >& i_parentPeer ) throw(RuntimeException)
     {
         AnimatedImagesControl_Base::createPeer( i_toolkit, i_parentPeer );
@@ -175,7 +175,7 @@ public:
         lcl_updatePeer( getPeer(), getModel() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY );
@@ -183,7 +183,7 @@ public:
             xPeerListener->elementInserted( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY );
@@ -191,7 +191,7 @@ public:
             xPeerListener->elementRemoved( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         const Reference< XContainerListener > xPeerListener( getPeer(), UNO_QUERY );
@@ -199,7 +199,7 @@ public:
             xPeerListener->elementReplaced( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControl::disposing( const EventObject& i_event ) throw (RuntimeException)
     {
         UnoControlBase::disposing( i_event );
@@ -258,44 +258,44 @@ namespace toolkit {
         ImplRegisterProperty( BASEPROPERTY_STEP_TIME );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     AnimatedImagesControlModel::AnimatedImagesControlModel( const AnimatedImagesControlModel& i_copySource )
         :AnimatedImagesControlModel_Base( i_copySource )
         ,m_pData( new AnimatedImagesControlModel_Data( *i_copySource.m_pData ) )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     AnimatedImagesControlModel::~AnimatedImagesControlModel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UnoControlModel* AnimatedImagesControlModel::Clone() const
     {
         return new AnimatedImagesControlModel( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< css::beans::XPropertySetInfo > SAL_CALL AnimatedImagesControlModel::getPropertySetInfo(  ) throw(RuntimeException)
     {
         static Reference< css::beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL AnimatedImagesControlModel::getServiceName() throw(RuntimeException)
     {
         return OUString("com.sun.star.awt.AnimatedImagesControlModel");
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL AnimatedImagesControlModel::getImplementationName(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.toolkit.AnimatedImagesControlModel");
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getSupportedServiceNames() throw(RuntimeException)
     {
         Sequence< OUString > aServiceNames(2);
@@ -304,7 +304,7 @@ namespace toolkit {
         return aServiceNames;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 i_handle, const Any& i_value ) throw (Exception)
     {
         switch ( i_handle )
@@ -325,7 +325,7 @@ namespace toolkit {
         AnimatedImagesControlModel_Base::setFastPropertyValue_NoBroadcast( i_handle, i_value );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any AnimatedImagesControlModel::ImplGetDefaultValue( sal_uInt16 i_propertyId ) const
     {
         switch ( i_propertyId )
@@ -350,7 +350,7 @@ namespace toolkit {
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL AnimatedImagesControlModel::getInfoHelper()
     {
         static UnoPropertyArrayHelper* pHelper = NULL;
@@ -362,7 +362,7 @@ namespace toolkit {
         return *pHelper;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getStepTime() throw (RuntimeException)
     {
         sal_Int32 nStepTime( 100 );
@@ -370,13 +370,13 @@ namespace toolkit {
         return nStepTime;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::setStepTime( ::sal_Int32 i_stepTime ) throw (RuntimeException)
     {
         setPropertyValue( GetPropertyName( BASEPROPERTY_STEP_TIME ), makeAny( i_stepTime ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Bool SAL_CALL AnimatedImagesControlModel::getAutoRepeat() throw (RuntimeException)
     {
         sal_Bool bAutoRepeat( sal_True );
@@ -384,13 +384,13 @@ namespace toolkit {
         return bAutoRepeat;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::setAutoRepeat( ::sal_Bool i_autoRepeat ) throw (RuntimeException)
     {
         setPropertyValue( GetPropertyName( BASEPROPERTY_AUTO_REPEAT ), makeAny( i_autoRepeat ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException)
     {
         sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC );
@@ -398,13 +398,13 @@ namespace toolkit {
         return nImageScaleMode;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::setScaleMode( ::sal_Int16 i_scaleMode ) throw (IllegalArgumentException, RuntimeException)
     {
         setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ), makeAny( i_scaleMode ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL AnimatedImagesControlModel::getImageSetCount(  ) throw (RuntimeException)
     {
         ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -414,7 +414,7 @@ namespace toolkit {
         return m_pData->aImageSets.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL AnimatedImagesControlModel::getImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -426,7 +426,7 @@ namespace toolkit {
         return m_pData->aImageSets[ i_index ];
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::insertImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -443,7 +443,7 @@ namespace toolkit {
         lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementInserted, i_index, i_imageURLs, *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::replaceImageSet( ::sal_Int32 i_index, const Sequence< OUString >& i_imageURLs ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -460,7 +460,7 @@ namespace toolkit {
         lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementReplaced, i_index, i_imageURLs, *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::removeImageSet( ::sal_Int32 i_index ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -479,13 +479,13 @@ namespace toolkit {
         lcl_notify( aGuard, BrdcstHelper, &XContainerListener::elementRemoved, i_index, aRemovedElement, *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
     {
         BrdcstHelper.addListener( cppu::UnoType<XContainerListener>::get(), i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL AnimatedImagesControlModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
     {
         BrdcstHelper.removeListener( cppu::UnoType<XContainerListener>::get(), i_listener );
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 54d26c3c7546..e9edfeb65ef2 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -83,7 +83,7 @@ struct LanguageDependentProp
     sal_Int32   nPropNameLength;
 };
 
-// ----------------------------------------------------------------------------
+
 namespace
 {
     static const Sequence< OUString >& lcl_getLanguageDependentProperties()
@@ -104,7 +104,7 @@ namespace
     }
 }
 
-// ----------------------------------------------------------------------------
+
 // functor for disposing a control model
 struct DisposeControlModel : public ::std::unary_function< Reference< XControlModel >, void >
 {
@@ -121,7 +121,7 @@ struct DisposeControlModel : public ::std::unary_function< Reference< XControlMo
     }
 };
 
-// ----------------------------------------------------------------------------
+
 // functor for searching control model by name
 struct FindControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool >
 {
@@ -137,7 +137,7 @@ public:
     }
 };
 
-// ----------------------------------------------------------------------------
+
 // functor for cloning a control model, and insertion into a target list
 struct CloneControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, void >
 {
@@ -160,7 +160,7 @@ public:
     }
 };
 
-// ----------------------------------------------------------------------------
+
 // functor for comparing a XControlModel with a given reference
 struct CompareControlModel : public ::std::unary_function< ControlModelContainerBase::UnoControlModelHolder, bool >
 {
@@ -175,32 +175,32 @@ public:
     }
 };
 
-// ----------------------------------------------------------------------------
+
 static void lcl_throwIllegalArgumentException( )
 {   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw IllegalArgumentException();
 }
 
-// ----------------------------------------------------------------------------
+
 static void lcl_throwNoSuchElementException( )
 {   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw NoSuchElementException();
 }
 
-// ----------------------------------------------------------------------------
+
 static void lcl_throwElementExistException( )
 {   // throwing is expensive (in terms of code size), thus we hope the compiler does not inline this ....
     throw ElementExistException();
 }
 
-// ----------------------------------------------------------------------------
+
 static const OUString& getTabIndexPropertyName( )
 {
     static const OUString s_sTabIndexProperty( "TabIndex" );
     return s_sTabIndexProperty;
 }
 
-// ----------------------------------------------------------------------------
+
 static const OUString& getStepPropertyName( )
 {
     static const OUString s_sStepProperty( "Step" );
@@ -666,19 +666,19 @@ void ControlModelContainerBase::removeByName( const OUString& aName ) throw(NoSu
     implNotifyTabModelChange( aName );
 }
 
-// ----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL ControlModelContainerBase::getGroupControl(  ) throw (RuntimeException)
 {
     return sal_True;
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::setGroupControl( sal_Bool ) throw (RuntimeException)
 {
     OSL_TRACE( "ControlModelContainerBase::setGroupControl: explicit grouping not supported" );
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Reference< XControlModel > >& _rControls ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -715,7 +715,7 @@ void SAL_CALL ControlModelContainerBase::setControlModels( const Sequence< Refer
 
 typedef ::std::multimap< sal_Int32, Reference< XControlModel >, ::std::less< sal_Int32 > > MapIndexToModel;
 
-// ----------------------------------------------------------------------------
+
 Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getControlModels(  ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -763,7 +763,7 @@ Sequence< Reference< XControlModel > > SAL_CALL ControlModelContainerBase::getCo
     return aReturn;
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::setGroup( const Sequence< Reference< XControlModel > >&, const OUString& ) throw (RuntimeException)
 {
     // not supported. We have only implicit grouping:
@@ -829,7 +829,7 @@ void SAL_CALL ControlModelContainerBase::setToolTip( const OUString& _tooltip )
     m_sTooltip = _tooltip;
 }
 
-// ----------------------------------------------------------------------------
+
 namespace
 {
     enum GroupingMachineState
@@ -855,7 +855,7 @@ namespace
     }
 }
 
-// ----------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount(  ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -865,7 +865,7 @@ sal_Int32 SAL_CALL ControlModelContainerBase::getGroupCount(  ) throw (RuntimeEx
     return maGroups.size();
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence< Reference< XControlModel > >& _rGroup, OUString& _rName ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -889,7 +889,7 @@ void SAL_CALL ControlModelContainerBase::getGroup( sal_Int32 _nGroup, Sequence<
     }
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName, Sequence< Reference< XControlModel > >& _rGroup ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -898,19 +898,19 @@ void SAL_CALL ControlModelContainerBase::getGroupByName( const OUString& _rName,
     getGroup( _rName.toInt32( ), _rGroup, sDummyName );
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::addChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException)
 {
     maChangeListeners.addInterface( _rxListener );
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::removeChangesListener( const Reference< XChangesListener >& _rxListener ) throw (RuntimeException)
 {
     maChangeListeners.removeInterface( _rxListener );
 }
 
-// ----------------------------------------------------------------------------
+
 void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAccessor )
 {
     // multiplex to our change listeners:
@@ -933,7 +933,7 @@ void ControlModelContainerBase::implNotifyTabModelChange( const OUString& _rAcce
 }
 
 
-// ----------------------------------------------------------------------------
+
 void ControlModelContainerBase::implUpdateGroupStructure()
 {
     if ( mbGroupsUpToDate )
@@ -1069,7 +1069,7 @@ void ControlModelContainerBase::implUpdateGroupStructure()
     mbGroupsUpToDate = sal_True;
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException)
 {
     SolarMutexGuard aGuard;
@@ -1095,12 +1095,12 @@ void SAL_CALL ControlModelContainerBase::propertyChange( const PropertyChangeEve
     implNotifyTabModelChange( sAccessor );
 }
 
-// ----------------------------------------------------------------------------
+
 void SAL_CALL ControlModelContainerBase::disposing( const EventObject& /*rEvent*/ ) throw (RuntimeException)
 {
 }
 
-// ----------------------------------------------------------------------------
+
 void ControlModelContainerBase::startControlListening( const Reference< XControlModel >& _rxChildModel )
 {
     SolarMutexGuard aGuard;
@@ -1114,7 +1114,7 @@ void ControlModelContainerBase::startControlListening( const Reference< XControl
         xModelProps->addPropertyChangeListener( getTabIndexPropertyName(), this );
 }
 
-// ----------------------------------------------------------------------------
+
 void ControlModelContainerBase::stopControlListening( const Reference< XControlModel >& _rxChildModel )
 {
     SolarMutexGuard aGuard;
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index f61a3b8239fc..954619d0bd9f 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -945,7 +945,7 @@ void UnoMultiPageModel::insertByName( const OUString& aName, const Any& aElement
     return ControlModelContainerBase::insertByName( aName, aElement );
 }
 
-// ----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL UnoMultiPageModel::getGroupControl(  ) throw (RuntimeException)
 {
     return sal_True;
@@ -1050,7 +1050,7 @@ uno::Reference< beans::XPropertySetInfo > UnoPageModel::getPropertySetInfo(  ) t
     return xInfo;
 }
 
-// ----------------------------------------------------------------------------
+
 sal_Bool SAL_CALL UnoPageModel::getGroupControl(  ) throw (RuntimeException)
 {
     return sal_False;
diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 57d1d0e7f0df..a7c44e88dfd0 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.cxx
@@ -40,7 +40,7 @@ namespace toolkit
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::util;
 
-    // -------------------------------------------------------------------
+
     namespace
     {
         // ...............................................................
@@ -111,7 +111,7 @@ namespace toolkit
     // ===================================================================
     // = UnoControlFormattedFieldModel
     // ===================================================================
-    // -------------------------------------------------------------------
+
     UnoControlFormattedFieldModel::UnoControlFormattedFieldModel( const Reference< XComponentContext >& rxContext )
         :UnoControlModel( rxContext )
         ,m_bRevokedAsClient( false )
@@ -157,18 +157,18 @@ namespace toolkit
         lcl_registerDefaultFormatsClient();
     }
 
-    // -------------------------------------------------------------------
+
     UnoControlFormattedFieldModel::~UnoControlFormattedFieldModel()
     {
     }
 
-    // -------------------------------------------------------------------
+
     OUString UnoControlFormattedFieldModel::getServiceName() throw(RuntimeException)
     {
         return OUString::createFromAscii( szServiceName_UnoControlFormattedFieldModel );
     }
 
-    // -------------------------------------------------------------------
+
     void SAL_CALL UnoControlFormattedFieldModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
     {
         UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
@@ -190,7 +190,7 @@ namespace toolkit
         }
     }
 
-    // -------------------------------------------------------------------
+
     void UnoControlFormattedFieldModel::impl_updateTextFromValue_nothrow()
     {
         if ( !m_xCachedFormatter.is() )
@@ -225,7 +225,7 @@ namespace toolkit
         }
     }
 
-    // -------------------------------------------------------------------
+
     void UnoControlFormattedFieldModel::impl_updateCachedFormatter_nothrow()
     {
         Any aFormatsSupplier;
@@ -251,7 +251,7 @@ namespace toolkit
         }
     }
 
-    // -------------------------------------------------------------------
+
     void UnoControlFormattedFieldModel::impl_updateCachedFormatKey_nothrow()
     {
         Any aFormatKey;
@@ -259,7 +259,7 @@ namespace toolkit
         m_aCachedFormat = aFormatKey;
     }
 
-    // -------------------------------------------------------------------
+
     void UnoControlFormattedFieldModel::dispose(  ) throw(RuntimeException)
     {
         UnoControlModel::dispose();
@@ -272,7 +272,7 @@ namespace toolkit
         }
     }
 
-    // -------------------------------------------------------------------
+
     void UnoControlFormattedFieldModel::ImplNormalizePropertySequence( const sal_Int32 _nCount, sal_Int32* _pHandles,
         Any* _pValues, sal_Int32* _pValidHandles ) const SAL_THROW(())
     {
@@ -281,7 +281,7 @@ namespace toolkit
         UnoControlModel::ImplNormalizePropertySequence( _nCount, _pHandles, _pValues, _pValidHandles );
     }
 
-    // -------------------------------------------------------------------
+
     namespace
     {
         class ResetFlagOnExit
@@ -301,7 +301,7 @@ namespace toolkit
         };
     }
 
-    // -------------------------------------------------------------------
+
     void SAL_CALL UnoControlFormattedFieldModel::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
     {
         bool bSettingValue = false;
@@ -323,7 +323,7 @@ namespace toolkit
         UnoControlModel::setPropertyValues( _rPropertyNames, _rValues );
     }
 
-    // -------------------------------------------------------------------
+
     sal_Bool UnoControlFormattedFieldModel::convertFastPropertyValue(
                 Any& rConvertedValue, Any& rOldValue, sal_Int32 nPropId,
                 const Any& rValue ) throw (IllegalArgumentException)
@@ -372,7 +372,7 @@ namespace toolkit
         return UnoControlModel::convertFastPropertyValue( rConvertedValue, rOldValue, nPropId, rValue );
     }
 
-    // -------------------------------------------------------------------
+
     Any UnoControlFormattedFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
         Any aReturn;
@@ -397,7 +397,7 @@ namespace toolkit
         return aReturn;
     }
 
-    // -------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& UnoControlFormattedFieldModel::getInfoHelper()
     {
         static UnoPropertyArrayHelper* pHelper = NULL;
@@ -410,7 +410,7 @@ namespace toolkit
     }
 
     // beans::XMultiPropertySet
-    // -------------------------------------------------------------------
+
     Reference< XPropertySetInfo > UnoControlFormattedFieldModel::getPropertySetInfo(  ) throw(RuntimeException)
     {
         static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
@@ -420,19 +420,19 @@ namespace toolkit
     // ===================================================================
     // = UnoFormattedFieldControl
     // ===================================================================
-    // -------------------------------------------------------------------
+
     UnoFormattedFieldControl::UnoFormattedFieldControl()
         :UnoSpinFieldControl()
     {
     }
 
-    // -------------------------------------------------------------------
+
     OUString UnoFormattedFieldControl::GetComponentServiceName()
     {
         return OUString("FormattedField");
     }
 
-    // -------------------------------------------------------------------
+
     void UnoFormattedFieldControl::textChanged(const TextEvent& e) throw(RuntimeException)
     {
         Reference< XVclWindowPeer >  xPeer(getPeer(), UNO_QUERY);
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index fca475abb0cb..d2010687745a 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -68,7 +68,7 @@
     //====================================================================
     //= OGeometryControlModel_Base
     //====================================================================
-    //--------------------------------------------------------------------
+
     OGeometryControlModel_Base::OGeometryControlModel_Base(::com::sun::star::uno::XAggregation* _pAggregateInstance)
         :OPropertySetAggregationHelper( m_aBHelper )
         ,OPropertyContainer( m_aBHelper )
@@ -100,7 +100,7 @@
         registerProperties();
     }
 
-    //--------------------------------------------------------------------
+
     OGeometryControlModel_Base::OGeometryControlModel_Base(Reference< XCloneable >& _rxAggregateInstance)
         :OPropertySetAggregationHelper( m_aBHelper )
         ,OPropertyContainer( m_aBHelper )
@@ -133,7 +133,7 @@
         registerProperties();
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL OGeometryControlModel_Base::getTypes(  ) throw (RuntimeException)
     {
         // our own types
@@ -166,7 +166,7 @@
         return aTypes;
     }
 
-    //--------------------------------------------------------------------
+
     void OGeometryControlModel_Base::registerProperties()
     {
         // register our members for the property handling of the OPropertyContainer
@@ -181,7 +181,7 @@
         registerProperty(GCM_PROPERTY_RESOURCERESOLVER, GCM_PROPERTY_ID_RESOURCERESOLVER, DEFAULT_ATTRIBS(), &m_xStrResolver, ::getCppuType(&m_xStrResolver));
     }
 
-    //--------------------------------------------------------------------
+
     ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetDefaultValueByHandle(sal_Int32 nHandle) const
     {
         ::com::sun::star::uno::Any aDefault;
@@ -203,7 +203,7 @@
         return aDefault;
     }
 
-    //--------------------------------------------------------------------
+
     ::com::sun::star::uno::Any OGeometryControlModel_Base::ImplGetPropertyValueByHandle(sal_Int32 nHandle) const
     {
         ::com::sun::star::uno::Any aValue;
@@ -225,7 +225,7 @@
         return aValue;
     }
 
-    //--------------------------------------------------------------------
+
     void OGeometryControlModel_Base::ImplSetPropertyValueByHandle(sal_Int32 nHandle, const :: com::sun::star::uno::Any& aValue)
     {
         switch ( nHandle )
@@ -243,7 +243,7 @@
         }
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OGeometryControlModel_Base::queryAggregation( const Type& _rType ) throw(RuntimeException)
     {
         Any aReturn;
@@ -268,25 +268,25 @@
         return aReturn;
     }
 
-    //--------------------------------------------------------------------
+
     Any SAL_CALL OGeometryControlModel_Base::queryInterface( const Type& _rType ) throw(RuntimeException)
     {
         return OGCM_Base::queryInterface(_rType);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OGeometryControlModel_Base::acquire(  ) throw()
     {
         OGCM_Base::acquire();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OGeometryControlModel_Base::release(  ) throw()
     {
         OGCM_Base::release();
     }
 
-    //--------------------------------------------------------------------
+
     void OGeometryControlModel_Base::releaseAggregation()
     {
         // release the aggregate (_before_ clearing m_xAggregate)
@@ -295,26 +295,26 @@
         setAggregation(NULL);
     }
 
-    //--------------------------------------------------------------------
+
     OGeometryControlModel_Base::~OGeometryControlModel_Base()
     {
         releaseAggregation();
     }
 
-    //--------------------------------------------------------------------
+
     sal_Bool SAL_CALL OGeometryControlModel_Base::convertFastPropertyValue(Any& _rConvertedValue, Any& _rOldValue,
             sal_Int32 _nHandle, const Any& _rValue) throw (IllegalArgumentException)
     {
         return OPropertyContainer::convertFastPropertyValue(_rConvertedValue, _rOldValue, _nHandle, _rValue);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception)
     {
         OPropertyContainer::setFastPropertyValue_NoBroadcast(_nHandle, _rValue);
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OGeometryControlModel_Base::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
     {
         OPropertyArrayAggregationHelper& rPH = static_cast<OPropertyArrayAggregationHelper&>(const_cast<OGeometryControlModel_Base*>(this)->getInfoHelper());
@@ -327,7 +327,7 @@
             OPropertyContainer::getFastPropertyValue(_rValue, _nHandle);
     }
 
-    //--------------------------------------------------------------------
+
     ::com::sun::star::beans::PropertyState OGeometryControlModel_Base::getPropertyStateByHandle(sal_Int32 nHandle)
     {
         ::com::sun::star::uno::Any aValue = ImplGetPropertyValueByHandle( nHandle );
@@ -336,25 +336,25 @@
         return CompareProperties( aValue, aDefault ) ? ::com::sun::star::beans::PropertyState_DEFAULT_VALUE : ::com::sun::star::beans::PropertyState_DIRECT_VALUE;
     }
 
-    //--------------------------------------------------------------------
+
     void OGeometryControlModel_Base::setPropertyToDefaultByHandle(sal_Int32 nHandle)
     {
         ImplSetPropertyValueByHandle( nHandle , ImplGetDefaultValueByHandle( nHandle ) );
     }
 
-    //--------------------------------------------------------------------
+
     ::com::sun::star::uno::Any OGeometryControlModel_Base::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
     {
         return ImplGetDefaultValueByHandle( nHandle );
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo> SAL_CALL OGeometryControlModel_Base::getPropertySetInfo() throw(RuntimeException)
     {
         return OPropertySetAggregationHelper::createPropertySetInfo(getInfoHelper());
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XCloneable > SAL_CALL OGeometryControlModel_Base::createClone(  ) throw(RuntimeException)
     {
         OSL_ENSURE(m_bCloneable, "OGeometryControlModel_Base::createClone: invalid call!");
@@ -416,7 +416,7 @@
         return pOwnClone;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XNameContainer > SAL_CALL OGeometryControlModel_Base::getEvents() throw(RuntimeException)
     {
         if( !mxEventContainer.is() )
@@ -424,7 +424,7 @@
         return mxEventContainer;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OGeometryControlModel_Base::disposing()
     {
         OGCM_Base::disposing();
@@ -438,7 +438,7 @@
     //====================================================================
     //= OCommonGeometryControlModel
     //====================================================================
-    //--------------------------------------------------------------------
+
 
     typedef ::boost::unordered_map< OUString, sal_Int32, OUStringHash > HashMapString2Int;
     typedef ::std::vector< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > >   PropSeqArray;
@@ -463,7 +463,7 @@
     // service specifier.
 
 
-    //--------------------------------------------------------------------
+
     OCommonGeometryControlModel::OCommonGeometryControlModel( Reference< XCloneable >& _rxAgg, const OUString& _rServiceSpecifier )
         :OGeometryControlModel_Base( _rxAgg )
         ,m_sServiceSpecifier( _rServiceSpecifier )
@@ -493,7 +493,7 @@
             m_nPropertyMapId = aPropMapIdPos->second;
     }
 
-    //--------------------------------------------------------------------
+
     struct PropertyNameLess : public ::std::binary_function< Property, Property, bool >
     {
         bool operator()( const Property& _rLHS, const Property& _rRHS )
@@ -502,7 +502,7 @@
         }
     };
 
-    //--------------------------------------------------------------------
+
     struct PropertyNameEqual : public ::std::unary_function< Property, bool >
     {
         const OUString&  m_rCompare;
@@ -514,7 +514,7 @@
         }
     };
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper* OCommonGeometryControlModel::createArrayHelper( sal_Int32 _nId ) const
     {
         OSL_ENSURE( _nId == m_nPropertyMapId, "OCommonGeometryControlModel::createArrayHelper: invalid argument!" );
@@ -568,13 +568,13 @@
         return new OPropertyArrayAggregationHelper(aProps, aAggregateProps);
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& SAL_CALL OCommonGeometryControlModel::getInfoHelper()
     {
         return *getArrayHelper( m_nPropertyMapId );
     }
 
-    //--------------------------------------------------------------------
+
     OGeometryControlModel_Base* OCommonGeometryControlModel::createClone_Impl( Reference< XCloneable >& _rxAggregateInstance )
     {
         return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier );
@@ -586,13 +586,13 @@
             public rtl::Static< ::cppu::OImplementationId, theOCommonGeometryControlModelImplementationId > {};
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId(  ) throw (RuntimeException)
     {
         return theOCommonGeometryControlModelImplementationId::get().getImplementationId();
     }
 
-    //--------------------------------------------------------------------
+
     struct Int32Equal : public ::std::unary_function< sal_Int32, bool >
     {
         sal_Int32   m_nCompare;
@@ -604,7 +604,7 @@
         }
     };
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL OCommonGeometryControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception )
     {
         OGeometryControlModel_Base::setFastPropertyValue_NoBroadcast( _nHandle, _rValue );
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 271b30d4b9bc..95ac0f9631a1 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -132,25 +132,25 @@ private:
             m_aColumns.swap( aColumns );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultGridColumnModel::~DefaultGridColumnModel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultGridColumnModel::getColumnCount() throw (RuntimeException)
     {
         return m_aColumns.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn(  ) throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return new GridColumn();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column )
         throw (RuntimeException, css::lang::IllegalArgumentException)
     {
@@ -176,7 +176,7 @@ private:
         return index;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex )
         throw (RuntimeException, css::lang::IndexOutOfBoundsException)
     {
@@ -226,14 +226,14 @@ private:
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< Reference< XGridColumn > > SAL_CALL DefaultGridColumnModel::getColumns() throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return ::comphelper::containerToSequence( m_aColumns );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::getColumn(::sal_Int32 index)
         throw (css::lang::IndexOutOfBoundsException, RuntimeException)
     {
@@ -245,7 +245,7 @@ private:
         throw css::lang::IndexOutOfBoundsException();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridColumnModel::setDefaultColumns(sal_Int32 rowElements) throw (RuntimeException)
     {
         ::std::vector< ContainerEvent > aRemovedColumns;
@@ -329,7 +329,7 @@ private:
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL DefaultGridColumnModel::getImplementationName(  ) throw (RuntimeException)
     {
         return OUString("stardiv.Toolkit.DefaultGridColumnModel");
@@ -347,21 +347,21 @@ private:
         return aSeq;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridColumnModel::addContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
     {
         if ( i_listener.is() )
             m_aContainerListeners.addInterface( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridColumnModel::removeContainerListener( const Reference< XContainerListener >& i_listener ) throw (RuntimeException)
     {
         if ( i_listener.is() )
             m_aContainerListeners.removeInterface( i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridColumnModel::disposing()
     {
         DefaultGridColumnModel_Base::disposing();
@@ -391,7 +391,7 @@ private:
         m_aColumns.swap( aEmpty );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< css::util::XCloneable > SAL_CALL DefaultGridColumnModel::createClone(  ) throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 13936bcafb9d..614555e4ae0e 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -121,7 +121,7 @@ private:
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultGridDataModel::DefaultGridDataModel( DefaultGridDataModel const & i_copySource )
         :cppu::BaseMutex()
         ,DefaultGridDataModel_Base( m_aMutex )
@@ -131,12 +131,12 @@ private:
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultGridDataModel::~DefaultGridDataModel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DefaultGridDataModel::broadcast( GridDataEvent const & i_event,
         void ( SAL_CALL XGridDataListener::*i_listenerMethod )( GridDataEvent const & ), ::comphelper::ComponentGuard & i_instanceLock )
     {
@@ -148,21 +148,21 @@ private:
         pListeners->notifyEach( i_listenerMethod, i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return impl_getRowCount_nolck();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL DefaultGridDataModel::getColumnCount() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nColumnCount;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultGridDataModel::CellData const & DefaultGridDataModel::impl_getCellData_throw( sal_Int32 const i_column, sal_Int32 const i_row ) const
     {
         if  (   ( i_row < 0 ) || ( size_t( i_row ) > m_aData.size() )
@@ -178,7 +178,7 @@ private:
         return s_aEmpty;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultGridDataModel::RowData& DefaultGridDataModel::impl_getRowDataAccess_throw( sal_Int32 const i_rowIndex, size_t const i_requiredColumnCount )
     {
         OSL_ENSURE( i_requiredColumnCount <= size_t( m_nColumnCount ), "DefaultGridDataModel::impl_getRowDataAccess_throw: invalid column count!" );
@@ -191,7 +191,7 @@ private:
         return rRowData;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DefaultGridDataModel::CellData& DefaultGridDataModel::impl_getCellDataAccess_throw( sal_Int32 const i_columnIndex, sal_Int32 const i_rowIndex )
     {
         if  ( ( i_columnIndex < 0 ) || ( i_columnIndex >= m_nColumnCount ) )
@@ -201,21 +201,21 @@ private:
         return rRowData[ i_columnIndex ];
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL DefaultGridDataModel::getCellData( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return impl_getCellData_throw( i_column, i_row ).first;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL DefaultGridDataModel::getCellToolTip( ::sal_Int32 i_column, ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return impl_getCellData_throw( i_column, i_row ).second;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL DefaultGridDataModel::getRowHeading( ::sal_Int32 i_row ) throw (RuntimeException, IndexOutOfBoundsException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -226,7 +226,7 @@ private:
         return m_aRowHeaders[ i_row ];
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< Any > SAL_CALL DefaultGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -239,7 +239,7 @@ private:
         return resultData;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DefaultGridDataModel::impl_insertRow( sal_Int32 const i_position, Any const & i_heading, Sequence< Any > const & i_rowData, sal_Int32 const i_assumedColCount )
     {
         OSL_PRECOND( ( i_assumedColCount <= 0 ) || ( i_assumedColCount >= i_rowData.getLength() ),
@@ -258,19 +258,19 @@ private:
         m_aData.insert( m_aData.begin() + i_position, newRow );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException)
     {
         insertRow( getRowCount(), i_heading, i_data );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException)
     {
         insertRows( getRowCount(), i_headings, i_data );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -293,7 +293,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException)
     {
         if ( i_headings.getLength() != i_data.getLength() )
@@ -332,7 +332,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -350,7 +350,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::removeAllRows(  ) throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -365,7 +365,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -379,7 +379,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -419,7 +419,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -436,14 +436,14 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         impl_getCellDataAccess_throw( i_columnIndex, i_rowIndex ).second = i_value;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -453,19 +453,19 @@ private:
             cell->second = i_value;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException)
     {
         rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< grid::XGridDataListener >& i_listener ) throw (RuntimeException)
     {
         rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL DefaultGridDataModel::disposing()
     {
         ::com::sun::star::lang::EventObject aEvent;
@@ -482,7 +482,7 @@ private:
         m_nColumnCount = 0;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL DefaultGridDataModel::getImplementationName(  ) throw (RuntimeException)
     {
         return OUString("stardiv.Toolkit.DefaultGridDataModel");
@@ -500,7 +500,7 @@ private:
         return aSeq;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< css::util::XCloneable > SAL_CALL DefaultGridDataModel::createClone(  ) throw (RuntimeException)
     {
         return new DefaultGridDataModel( *this );
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index 644d9cd1aa5d..b4d78179aeab 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -37,7 +37,7 @@ namespace toolkit
     //==================================================================================================================
     //= DefaultGridColumnModel
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     GridColumn::GridColumn()
         :GridColumn_Base( m_aMutex )
         ,m_aIdentifier()
@@ -52,7 +52,7 @@ namespace toolkit
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     GridColumn::GridColumn( GridColumn const & i_copySource )
         :cppu::BaseMutex()
         ,GridColumn_Base( m_aMutex )
@@ -70,12 +70,12 @@ namespace toolkit
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     GridColumn::~GridColumn()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridColumn::broadcast_changed( sal_Char const * const i_asciiAttributeName, Any i_oldValue, Any i_newValue,
         ::comphelper::ComponentGuard& i_Guard )
     {
@@ -92,106 +92,106 @@ namespace toolkit
             pIter->notifyEach( &XGridColumnListener::columnChanged, aEvent );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::com::sun::star::uno::Any SAL_CALL GridColumn::getIdentifier() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_aIdentifier;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setIdentifier(const ::com::sun::star::uno::Any & value) throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         m_aIdentifier = value;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL GridColumn::getColumnWidth() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nColumnWidth;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
     {
         impl_set( m_nColumnWidth, value, "ColumnWidth" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL GridColumn::getMaxWidth() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nMaxWidth;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
     {
         impl_set( m_nMaxWidth, value, "MaxWidth" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL GridColumn::getMinWidth() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nMinWidth;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
     {
         impl_set( m_nMinWidth, value, "MinWidth" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL GridColumn::getTitle() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_sTitle;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setTitle(const OUString & value) throw (::com::sun::star::uno::RuntimeException)
     {
         impl_set( m_sTitle, value, "Title" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL GridColumn::getHelpText() throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_sHelpText;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setHelpText( const OUString & value ) throw (RuntimeException)
     {
         impl_set( m_sHelpText, value, "HelpText" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Bool SAL_CALL GridColumn::getResizeable() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_bResizeable;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setResizeable(sal_Bool value) throw (::com::sun::star::uno::RuntimeException)
     {
         impl_set( m_bResizeable, value, "Resizeable" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL GridColumn::getFlexibility() throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nFlexibility;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setFlexibility( ::sal_Int32 i_value ) throw (IllegalArgumentException, RuntimeException)
     {
         if ( i_value < 0 )
@@ -199,32 +199,32 @@ namespace toolkit
         impl_set( m_nFlexibility, i_value, "Flexibility" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     HorizontalAlignment SAL_CALL GridColumn::getHorizontalAlign() throw (::com::sun::star::uno::RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_eHorizontalAlign;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align) throw (::com::sun::star::uno::RuntimeException)
     {
         impl_set( m_eHorizontalAlign, align, "HorizontalAlign" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::addGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
     {
         rBHelper.addListener( cppu::UnoType<XGridColumnListener>::get(), xListener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::removeGridColumnListener( const Reference< XGridColumnListener >& xListener ) throw (RuntimeException)
     {
         rBHelper.removeListener( cppu::UnoType<XGridColumnListener>::get(), xListener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::disposing()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
@@ -232,34 +232,34 @@ namespace toolkit
         m_sTitle = m_sHelpText = OUString();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL GridColumn::getIndex() throw (RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nIndex;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void GridColumn::setIndex( sal_Int32 const i_index )
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         m_nIndex = i_index;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL GridColumn::getDataColumnIndex() throw(RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
         return m_nDataColumnIndex;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32 i_dataColumnIndex ) throw(RuntimeException)
     {
         impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL GridColumn::getImplementationName(  ) throw (RuntimeException)
     {
         return OUString( "org.openoffice.comp.toolkit.GridColumn" );
@@ -277,13 +277,13 @@ namespace toolkit
         return aSeq;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XCloneable > SAL_CALL GridColumn::createClone(  ) throw (RuntimeException)
     {
         return new GridColumn( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_Int64 SAL_CALL GridColumn::getSomething( const Sequence< sal_Int8 >& i_identifier ) throw(RuntimeException)
     {
         if ( ( i_identifier.getLength() == 16 ) && ( i_identifier == getUnoTunnelId() ) )
@@ -291,14 +291,14 @@ namespace toolkit
         return 0;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< sal_Int8 > GridColumn::getUnoTunnelId() throw()
     {
         static ::cppu::OImplementationId const aId;
         return aId.getImplementationId();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     GridColumn* GridColumn::getImplementation( const Reference< XInterface >& i_component )
     {
         Reference< XUnoTunnel > const xTunnel( i_component, UNO_QUERY );
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 84b6000ccfa7..ce2df3a18d4b 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -67,7 +67,7 @@ namespace
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext )
         :UnoControlModel( rxContext )
 {
@@ -109,7 +109,7 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::
     ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
     :UnoControlModel( rModel )
 {
@@ -154,13 +154,13 @@ UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
     osl_atomic_decrement( &m_refCount );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 UnoControlModel* UnoGridModel::Clone() const
 {
     return new UnoGridModel( *this );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 namespace
 {
     void lcl_dispose_nothrow( const Any& i_component )
@@ -177,7 +177,7 @@ namespace
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridModel::dispose(  ) throw(RuntimeException)
 {
     lcl_dispose_nothrow( getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ) );
@@ -186,7 +186,7 @@ void SAL_CALL UnoGridModel::dispose(  ) throw(RuntimeException)
     UnoControlModel::dispose();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
 {
     Any aOldSubModel;
@@ -207,13 +207,13 @@ void SAL_CALL UnoGridModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle,
         lcl_dispose_nothrow( aOldSubModel );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 OUString UnoGridModel::getServiceName() throw(RuntimeException)
 {
     return OUString("com.sun.star.awt.grid.UnoControlGridModel");
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     switch( nPropId )
@@ -246,7 +246,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& UnoGridModel::getInfoHelper()
 {
     static UnoPropertyArrayHelper* pHelper = NULL;
@@ -258,7 +258,7 @@ Any UnoGridModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return *pHelper;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 // XMultiPropertySet
 Reference< XPropertySetInfo > UnoGridModel::getPropertySetInfo(  ) throw(RuntimeException)
 {
@@ -277,18 +277,18 @@ UnoGridControl::UnoGridControl()
 {
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 UnoGridControl::~UnoGridControl()
 {
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 OUString UnoGridControl::GetComponentServiceName()
 {
     return OUString("Grid");
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException)
 {
     lang::EventObject aEvt;
@@ -297,7 +297,7 @@ void SAL_CALL UnoGridControl::dispose(  ) throw(RuntimeException)
     UnoControl::dispose();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit > & rxToolkit, const uno::Reference< awt::XWindowPeer >  & rParentPeer ) throw(uno::RuntimeException)
 {
     UnoControlBase::createPeer( rxToolkit, rParentPeer );
@@ -306,7 +306,7 @@ void SAL_CALL UnoGridControl::createPeer( const uno::Reference< awt::XToolkit >
     xGrid->addSelectionListener( &m_aSelectionListeners );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 namespace
 {
     void lcl_setEventForwarding( const Reference< XControlModel >& i_gridControlModel, const ::boost::scoped_ptr< toolkit::GridEventForwarder >& i_listener,
@@ -346,7 +346,7 @@ namespace
     }
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_model ) throw(RuntimeException)
 {
     lcl_setEventForwarding( getModel(), m_pEventForwarder, false );
@@ -356,90 +356,90 @@ sal_Bool SAL_CALL UnoGridControl::setModel( const Reference< XControlModel >& i_
     return sal_True;
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Int32 UnoGridControl::getRowAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getRowAtPoint( x, y );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Int32 UnoGridControl::getColumnAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getColumnAtPoint( x, y );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL UnoGridControl::getCurrentColumn(  ) throw (RuntimeException)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getCurrentColumn();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL UnoGridControl::getCurrentRow(  ) throw (RuntimeException)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     return xGrid->getCurrentRow();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::goToCell( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException, VetoException)
 {
     Reference< XGridControl > const xGrid ( getPeer(), UNO_QUERY_THROW );
     xGrid->goToCell( i_columnIndex, i_rowIndex );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::selectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException )
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectRow( i_rowIndex );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::selectAllRows() throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->selectAllRows();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::deselectRow( ::sal_Int32 i_rowIndex ) throw (RuntimeException, IndexOutOfBoundsException )
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectRow( i_rowIndex );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::deselectAllRows() throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->deselectAllRows();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoGridControl::getSelectedRows() throw (::com::sun::star::uno::RuntimeException)
 {
     return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->getSelectedRows();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL UnoGridControl::hasSelectedRows() throw (::com::sun::star::uno::RuntimeException)
 {
     return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->hasSelectedRows();
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL UnoGridControl::isRowSelected(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
 {
     return Reference< XGridRowSelection >( getPeer(), UNO_QUERY_THROW )->isRowSelected( index );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException)
 {
     m_aSelectionListeners.addInterface( listener );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoGridControl::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException)
 {
     m_aSelectionListeners.removeInterface( listener );
diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx
index 06508169374b..cad7956ac29f 100644
--- a/toolkit/source/controls/grid/grideventforwarder.cxx
+++ b/toolkit/source/controls/grid/grideventforwarder.cxx
@@ -43,30 +43,30 @@ namespace toolkit
     //==================================================================================================================
     //= GridEventForwarder
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     GridEventForwarder::GridEventForwarder( UnoGridControl& i_parent )
         :m_parent( i_parent )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     GridEventForwarder::~GridEventForwarder()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::acquire() throw()
     {
         m_parent.acquire();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::release() throw()
     {
         m_parent.release();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -74,7 +74,7 @@ namespace toolkit
             xPeer->rowsInserted( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -82,7 +82,7 @@ namespace toolkit
             xPeer->rowsRemoved( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -90,7 +90,7 @@ namespace toolkit
             xPeer->dataChanged( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         Reference< XGridDataListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -98,7 +98,7 @@ namespace toolkit
             xPeer->rowHeadingChanged( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::elementInserted( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -106,7 +106,7 @@ namespace toolkit
             xPeer->elementInserted( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::elementRemoved( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -114,7 +114,7 @@ namespace toolkit
             xPeer->elementRemoved( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::elementReplaced( const ContainerEvent& i_event ) throw (RuntimeException)
     {
         Reference< XContainerListener > xPeer( m_parent.getPeer(), UNO_QUERY );
@@ -122,7 +122,7 @@ namespace toolkit
             xPeer->elementReplaced( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL GridEventForwarder::disposing( const EventObject& i_event ) throw (RuntimeException)
     {
         Reference< XEventListener > xPeer( m_parent.getPeer(), UNO_QUERY );
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index fc53ea7c492b..1ddd53e36f3e 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -207,7 +207,7 @@ private:
         return static_cast< const SortableGridDataModel* >( _pInstance )->checkInvariants();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     const char* SortableGridDataModel::checkInvariants() const
     {
         if ( m_publicToPrivateRowIndex.size() != m_privateToPublicRowIndex.size() )
@@ -247,7 +247,7 @@ private:
 #define DBG_CHECK_ME() \
     DBG_CHKTHIS( SortableGridDataModel, SortableGridDataModel_checkInvariants )
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         template< class STLCONTAINER >
@@ -262,7 +262,7 @@ private:
     //= SortableGridDataModel
     //==================================================================================================================
     DBG_NAME( SortableGridDataModel )
-    //------------------------------------------------------------------------------------------------------------------
+
     SortableGridDataModel::SortableGridDataModel( Reference< XComponentContext > const & rxContext )
         :SortableGridDataModel_Base( m_aMutex )
         ,SortableGridDataModel_PrivateBase()
@@ -278,7 +278,7 @@ private:
         DBG_CTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SortableGridDataModel::SortableGridDataModel( SortableGridDataModel const & i_copySource )
         :cppu::BaseMutex()
         ,SortableGridDataModel_Base( m_aMutex )
@@ -299,7 +299,7 @@ private:
         m_delegator.set( i_copySource.m_delegator->createClone(), UNO_QUERY_THROW );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SortableGridDataModel::~SortableGridDataModel()
     {
         if ( !rBHelper.bDisposed )
@@ -311,7 +311,7 @@ private:
         DBG_DTOR( SortableGridDataModel, SortableGridDataModel_checkInvariants );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL SortableGridDataModel::queryInterface( const Type& aType ) throw (RuntimeException)
     {
         Any aReturn( SortableGridDataModel_Base::queryInterface( aType ) );
@@ -320,33 +320,33 @@ private:
         return aReturn;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::acquire(  ) throw ()
     {
         SortableGridDataModel_Base::acquire();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::release(  ) throw ()
     {
         SortableGridDataModel_Base::release();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< Type > SAL_CALL SortableGridDataModel::getTypes(  ) throw (RuntimeException)
     {
         return SortableGridDataModel_Base::getTypes();
         // don't expose the types got via SortableGridDataModel_PrivateBase - they're private, after all
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId(  ) throw (RuntimeException)
     {
         static ::cppu::OImplementationId aId;
         return aId.getImplementationId();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         Reference< XCollator > lcl_loadDefaultCollator_throw( const Reference<XComponentContext> & rxContext )
@@ -357,7 +357,7 @@ private:
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::initialize( const Sequence< Any >& i_arguments ) throw (Exception, RuntimeException)
     {
         ::comphelper::ComponentGuard aGuard( *this, rBHelper );
@@ -393,7 +393,7 @@ private:
         m_isInitialized = true;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     GridDataEvent SortableGridDataModel::impl_createPublicEvent( GridDataEvent const & i_originalEvent ) const
     {
         GridDataEvent aEvent( i_originalEvent );
@@ -403,7 +403,7 @@ private:
         return aEvent;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SortableGridDataModel::impl_broadcast( void ( SAL_CALL XGridDataListener::*i_listenerMethod )( const GridDataEvent & ),
             GridDataEvent const & i_publicEvent, MethodGuard& i_instanceLock )
     {
@@ -415,7 +415,7 @@ private:
         pListeners->notifyEach( i_listenerMethod, i_publicEvent );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::rowsInserted( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -433,7 +433,7 @@ private:
         impl_broadcast( &XGridDataListener::rowsInserted, aEvent, aGuard );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         void lcl_decrementValuesGreaterThan( ::std::vector< ::sal_Int32 > & io_indexMap, sal_Int32 const i_threshold )
@@ -449,7 +449,7 @@ private:
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SortableGridDataModel::impl_rebuildIndexesAndNotify( MethodGuard& i_instanceLock )
     {
         OSL_PRECOND( impl_isSorted_nothrow(), "SortableGridDataModel::impl_rebuildIndexesAndNotify: illegal call!" );
@@ -475,7 +475,7 @@ private:
         impl_broadcast( &XGridDataListener::rowsInserted, aAdditionEvent, i_instanceLock );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::rowsRemoved( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -536,7 +536,7 @@ private:
         impl_broadcast( &XGridDataListener::rowsRemoved, aEvent, aGuard );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::dataChanged( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -546,7 +546,7 @@ private:
         impl_broadcast( &XGridDataListener::dataChanged, aEvent, aGuard );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::rowHeadingChanged( const GridDataEvent& i_event ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -556,14 +556,14 @@ private:
         impl_broadcast( &XGridDataListener::rowHeadingChanged, aEvent, aGuard );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::disposing( const EventObject& i_event ) throw (RuntimeException)
     {
         // not interested in
         OSL_UNUSED( i_event );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         class CellDataLessComparison : public ::std::binary_function< sal_Int32, sal_Int32, bool >
@@ -604,7 +604,7 @@ private:
         };
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool SortableGridDataModel::impl_reIndex_nothrow( ::sal_Int32 const i_columnIndex, sal_Bool const i_sortAscending )
     {
         ::sal_Int32 const rowCount( getRowCount() );
@@ -650,7 +650,7 @@ private:
         return true;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::sortByColumn( ::sal_Int32 i_columnIndex, ::sal_Bool i_sortAscending ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -672,7 +672,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SortableGridDataModel::impl_removeColumnSort_noBroadcast()
     {
         lcl_clear( m_publicToPrivateRowIndex );
@@ -682,7 +682,7 @@ private:
         m_sortAscending = sal_True;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SortableGridDataModel::impl_removeColumnSort( MethodGuard& i_instanceLock )
     {
         impl_removeColumnSort_noBroadcast();
@@ -693,7 +693,7 @@ private:
         );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::removeColumnSort(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -701,7 +701,7 @@ private:
         impl_removeColumnSort( aGuard );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     css::beans::Pair< ::sal_Int32, ::sal_Bool > SAL_CALL SortableGridDataModel::getCurrentSortOrder(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -710,7 +710,7 @@ private:
         return css::beans::Pair< ::sal_Int32, ::sal_Bool >( m_currentSortColumn, m_sortAscending );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::addRow( const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -721,7 +721,7 @@ private:
         delegator->addRow( i_heading, i_data );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::addRows( const Sequence< Any >& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -732,7 +732,7 @@ private:
         delegator->addRows( i_headings, i_data );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::insertRow( ::sal_Int32 i_index, const Any& i_heading, const Sequence< Any >& i_data ) throw (RuntimeException, IndexOutOfBoundsException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -746,7 +746,7 @@ private:
         delegator->insertRow( rowIndex, i_heading, i_data );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::insertRows( ::sal_Int32 i_index, const Sequence< Any>& i_headings, const Sequence< Sequence< Any > >& i_data ) throw (IllegalArgumentException, IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -760,7 +760,7 @@ private:
         delegator->insertRows( rowIndex, i_headings, i_data );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::removeRow( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -773,7 +773,7 @@ private:
         delegator->removeRow( rowIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::removeAllRows(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -784,7 +784,7 @@ private:
         delegator->removeAllRows();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::updateCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -797,7 +797,7 @@ private:
         delegator->updateCellData( i_columnIndex, rowIndex, i_value );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::updateRowData( const Sequence< ::sal_Int32 >& i_columnIndexes, ::sal_Int32 i_rowIndex, const Sequence< Any >& i_values ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -810,7 +810,7 @@ private:
         delegator->updateRowData( i_columnIndexes, rowIndex, i_values );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::updateRowHeading( ::sal_Int32 i_rowIndex, const Any& i_heading ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -823,7 +823,7 @@ private:
         delegator->updateRowHeading( rowIndex, i_heading );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::updateCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -836,7 +836,7 @@ private:
         delegator->updateCellToolTip( i_columnIndex, rowIndex, i_value );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::updateRowToolTip( ::sal_Int32 i_rowIndex, const Any& i_value ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -849,19 +849,19 @@ private:
         delegator->updateRowToolTip( rowIndex, i_value );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::addGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException)
     {
         rBHelper.addListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& i_listener ) throw (RuntimeException)
     {
         rBHelper.removeListener( cppu::UnoType<XGridDataListener>::get(), i_listener );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL SortableGridDataModel::getRowCount() throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -872,7 +872,7 @@ private:
         return delegator->getRowCount();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SAL_CALL SortableGridDataModel::getColumnCount() throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -883,7 +883,7 @@ private:
         return delegator->getColumnCount();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL SortableGridDataModel::getCellData( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -896,7 +896,7 @@ private:
         return delegator->getCellData( i_columnIndex, rowIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL SortableGridDataModel::getCellToolTip( ::sal_Int32 i_columnIndex, ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -909,7 +909,7 @@ private:
         return delegator->getCellToolTip( i_columnIndex, rowIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL SortableGridDataModel::getRowHeading( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -922,7 +922,7 @@ private:
         return delegator->getRowHeading( rowIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< Any > SAL_CALL SortableGridDataModel::getRowData( ::sal_Int32 i_rowIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -935,7 +935,7 @@ private:
         return delegator->getRowData( rowIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL SortableGridDataModel::disposing()
     {
         m_currentSortColumn = -1;
@@ -954,7 +954,7 @@ private:
         lcl_clear( m_privateToPublicRowIndex );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< css::util::XCloneable > SAL_CALL SortableGridDataModel::createClone(  ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this, rBHelper );
@@ -963,7 +963,7 @@ private:
         return new SortableGridDataModel( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL SortableGridDataModel::getImplementationName(  ) throw (RuntimeException)
     {
         return OUString( "org.openoffice.comp.toolkit.SortableGridDataModel" );
@@ -981,7 +981,7 @@ private:
         return aServiceNames;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SortableGridDataModel::impl_getPrivateRowIndex_throw( ::sal_Int32 const i_publicRowIndex ) const
     {
         if ( ( i_publicRowIndex < 0 ) || ( i_publicRowIndex >= m_delegator->getRowCount() ) )
@@ -999,7 +999,7 @@ private:
         return m_publicToPrivateRowIndex[ i_publicRowIndex ];
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ::sal_Int32 SortableGridDataModel::impl_getPublicRowIndex_nothrow( ::sal_Int32 const i_privateRowIndex ) const
     {
         if ( !impl_isSorted_nothrow() )
diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index 56bb561517bf..38c20c01c77c 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -52,7 +52,7 @@ static void lcl_throwIndexOutOfBoundsException( )
     // ===================================================================
     // = UnoControlRoadmapModel
     // ===================================================================
-    // -------------------------------------------------------------------
+
     UnoControlRoadmapModel::UnoControlRoadmapModel( const Reference< XComponentContext >& i_factory )
         :UnoControlRoadmapModel_Base( i_factory )
         ,maContainerListeners( *this )
@@ -74,14 +74,14 @@ static void lcl_throwIndexOutOfBoundsException( )
         ImplRegisterProperty( BASEPROPERTY_TEXT );
     }
 
-    // -------------------------------------------------------------------
+
     OUString UnoControlRoadmapModel::getServiceName() throw(RuntimeException)
     {
         return OUString::createFromAscii( szServiceName_UnoControlRoadmapModel );
     }
 
 
-    // -------------------------------------------------------------------
+
     Any UnoControlRoadmapModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
         Any aReturn;
@@ -131,7 +131,7 @@ static void lcl_throwIndexOutOfBoundsException( )
  IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoControlRoadmapModel, UnoControlRoadmapModel_Base, UnoControlRoadmapModel_IBase )
 
 
-    // -------------------------------------------------------------------
+
     ::com::sun::star::uno::Any  SAL_CALL UnoControlRoadmapModel::queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
     {
         Any aRet = UnoControlRoadmapModel_Base::queryAggregation( rType );
@@ -141,7 +141,7 @@ static void lcl_throwIndexOutOfBoundsException( )
     }
 
 
-    // -------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& UnoControlRoadmapModel::getInfoHelper()
     {
         static UnoPropertyArrayHelper* pHelper = NULL;
@@ -155,7 +155,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 
 
     // beans::XMultiPropertySet
-    // -------------------------------------------------------------------
+
     Reference< XPropertySetInfo > UnoControlRoadmapModel::getPropertySetInfo(  ) throw(RuntimeException)
     {
         static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
@@ -356,7 +356,7 @@ static void lcl_throwIndexOutOfBoundsException( )
     // ===================================================================
     // = UnoRoadmapControl
     // ===================================================================
-    // -------------------------------------------------------------------
+
     UnoRoadmapControl::UnoRoadmapControl()
         :UnoControlRoadmap_Base()
         ,maItemListeners( *this )
@@ -385,7 +385,7 @@ sal_Bool SAL_CALL UnoRoadmapControl::setModel(const Reference< XControlModel >&
     }
 
 
-    // -------------------------------------------------------------------
+
     OUString UnoRoadmapControl::GetComponentServiceName()
     {
         return OUString("Roadmap");
diff --git a/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 1e01e24287d6..28c0bb3c02b8 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.cxx
@@ -59,7 +59,7 @@ ORoadmapEntry::ORoadmapEntry() : ORoadmapEntry_Base( )
     // which has been built from the registered property of _one_ instance.
 }
 
-//--------------------------------------------------------------------------
+
 IMPLEMENT_FORWARD_XINTERFACE2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelper::OPropertyContainer );
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelper::OPropertyContainer );
     // order matters:
@@ -68,7 +68,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ORoadmapEntry, ORoadmapEntry_Base, ::comphelpe
     //  the third up to n-th (when using IMPLEMENT_FORWARD_*3 and so on) are other base classes
     //  whose XInterface and XTypeProvider implementations should be merged
 
-//--------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star:: beans::XPropertySetInfo > SAL_CALL
     ORoadmapEntry::getPropertySetInfo()
     throw(::com::sun::star::uno::RuntimeException)
@@ -95,13 +95,13 @@ sal_Bool SAL_CALL ORoadmapEntry::supportsService( const OUString& ServiceName )
     pArray[0] = "com.sun.star.awt.RoadmapItem";
     return aRet;
 }
-//--------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& ORoadmapEntry::getInfoHelper()
 {
     return *getArrayHelper();
 }
 
-//--------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper* ORoadmapEntry::createArrayHelper() const
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps;
diff --git a/toolkit/source/controls/spinningprogress.cxx b/toolkit/source/controls/spinningprogress.cxx
index a9d207d8c9b1..c93362eff131 100644
--- a/toolkit/source/controls/spinningprogress.cxx
+++ b/toolkit/source/controls/spinningprogress.cxx
@@ -77,43 +77,43 @@ protected:
         osl_atomic_decrement( &m_refCount );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SpinningProgressControlModel::SpinningProgressControlModel( const SpinningProgressControlModel& i_copySource )
         :SpinningProgressControlModel_Base( i_copySource )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     SpinningProgressControlModel::~SpinningProgressControlModel()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     UnoControlModel* SpinningProgressControlModel::Clone() const
     {
         return new SpinningProgressControlModel( *this );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< beans::XPropertySetInfo > SAL_CALL SpinningProgressControlModel::getPropertySetInfo(  ) throw(RuntimeException)
     {
         static Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL SpinningProgressControlModel::getServiceName() throw(RuntimeException)
     {
         return OUString("com.sun.star.awt.SpinningProgressControlModel");
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL SpinningProgressControlModel::getImplementationName(  ) throw(RuntimeException)
     {
         return OUString("org.openoffice.comp.toolkit.SpinningProgressControlModel");
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL SpinningProgressControlModel::getSupportedServiceNames() throw(RuntimeException)
     {
         Sequence< OUString > aServiceNames(3);
diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx
index 7ddecc262ef8..63532b33f838 100644
--- a/toolkit/source/controls/tabpagecontainer.cxx
+++ b/toolkit/source/controls/tabpagecontainer.cxx
@@ -168,7 +168,7 @@ void SAL_CALL UnoControlTabPageContainerModel::insertByIndex( ::sal_Int32 nIndex
         throw IllegalArgumentException( OUString( WRONG_TYPE_EXCEPTION ),
             (OWeakObject *)this, 2 );
 }
-// -----------------------------------------------------------------------------
+
 void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Index*/ ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
 }
@@ -176,14 +176,14 @@ void SAL_CALL UnoControlTabPageContainerModel::removeByIndex( ::sal_Int32 /*Inde
 void SAL_CALL UnoControlTabPageContainerModel::replaceByIndex( ::sal_Int32 /*Index*/, const uno::Any& /*Element*/ ) throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
 }
-// -----------------------------------------------------------------------------
+
 // XIndexAccess
 ::sal_Int32 SAL_CALL UnoControlTabPageContainerModel::getCount(  ) throw (uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
     return sal_Int32( m_aTabPageVector.size());
 }
-// -----------------------------------------------------------------------------
+
 uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -191,13 +191,13 @@ uno::Any SAL_CALL UnoControlTabPageContainerModel::getByIndex( ::sal_Int32 nInde
         throw lang::IndexOutOfBoundsException();
     return uno::makeAny(m_aTabPageVector[nIndex]);
 }
-// -----------------------------------------------------------------------------
+
 // XElementAccess
 uno::Type SAL_CALL UnoControlTabPageContainerModel::getElementType(  ) throw (uno::RuntimeException)
 {
     return ::getCppuType(static_cast<  Reference< com::sun::star::awt::XControlModel>* >(NULL));
 }
-// -----------------------------------------------------------------------------
+
 ::sal_Bool SAL_CALL UnoControlTabPageContainerModel::hasElements(  ) throw (uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
@@ -245,7 +245,7 @@ void UnoControlTabPageContainer::createPeer( const uno::Reference< awt::XToolkit
         xTPContainer->addTabPageContainerListener(&m_aTabPageListeners);
 }
 
-// -------------------------------------------------------------------
+
 // XTabPageContainer
 
 ::sal_Int16 SAL_CALL UnoControlTabPageContainer::getActiveTabPageID() throw (RuntimeException)
diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index c541fea8a594..5debe2d77c32 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.cxx
@@ -35,20 +35,20 @@ namespace toolkit
     //====================================================================
     //= UnoControlScrollBarModel
     //====================================================================
-    //--------------------------------------------------------------------
+
     UnoControlScrollBarModel::UnoControlScrollBarModel( const uno::Reference< uno::XComponentContext >& i_factory )
         :UnoControlModel( i_factory )
     {
         UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXScrollBar );
     }
 
-    //--------------------------------------------------------------------
+
     OUString UnoControlScrollBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
     {
         return OUString::createFromAscii( szServiceName_UnoControlScrollBarModel );
     }
 
-    //--------------------------------------------------------------------
+
     uno::Any UnoControlScrollBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
         switch ( nPropId )
@@ -63,7 +63,7 @@ namespace toolkit
         }
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& UnoControlScrollBarModel::getInfoHelper()
     {
         static UnoPropertyArrayHelper* pHelper = NULL;
@@ -75,7 +75,7 @@ namespace toolkit
         return *pHelper;
     }
 
-    //--------------------------------------------------------------------
+
     uno::Reference< beans::XPropertySetInfo > UnoControlScrollBarModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
     {
         static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 871f29d8a315..7cde541f6758 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.cxx
@@ -114,7 +114,7 @@ public:
     //====================================================================
     //= UnoSpinButtonModel
     //====================================================================
-    //--------------------------------------------------------------------
+
     UnoSpinButtonModel::UnoSpinButtonModel( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_factory )
         :UnoControlModel( i_factory )
     {
@@ -140,13 +140,13 @@ public:
         ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
     }
 
-    //--------------------------------------------------------------------
+
     OUString UnoSpinButtonModel::getServiceName( ) throw (RuntimeException)
     {
         return OUString("com.sun.star.awt.UnoControlSpinButtonModel");
     }
 
-    //--------------------------------------------------------------------
+
     Any UnoSpinButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     {
         switch ( nPropId )
@@ -165,7 +165,7 @@ public:
         }
     }
 
-    //--------------------------------------------------------------------
+
     ::cppu::IPropertyArrayHelper& UnoSpinButtonModel::getInfoHelper()
     {
         static UnoPropertyArrayHelper* pHelper = NULL;
@@ -177,20 +177,20 @@ public:
         return *pHelper;
     }
 
-    //--------------------------------------------------------------------
+
     Reference< XPropertySetInfo > UnoSpinButtonModel::getPropertySetInfo(  ) throw(RuntimeException)
     {
         static Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
         return xInfo;
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL UnoSpinButtonModel::getImplementationName(  ) throw(RuntimeException)
     {
         return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonModel" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL UnoSpinButtonModel::getSupportedServiceNames() throw(RuntimeException)
     {
         Sequence< OUString > aServices( UnoControlModel::getSupportedServiceNames() );
@@ -202,20 +202,20 @@ public:
     //====================================================================
     //= UnoSpinButtonControl
     //====================================================================
-    //--------------------------------------------------------------------
+
     UnoSpinButtonControl::UnoSpinButtonControl()
         :UnoControlBase()
         ,maAdjustmentListeners( *this )
     {
     }
 
-    //--------------------------------------------------------------------
+
     OUString UnoSpinButtonControl::GetComponentServiceName()
     {
         return OUString("SpinButton");
     }
 
-    //--------------------------------------------------------------------
+
     Any UnoSpinButtonControl::queryAggregation( const Type & rType ) throw(RuntimeException)
     {
         Any aRet = UnoControlBase::queryAggregation( rType );
@@ -224,10 +224,10 @@ public:
         return aRet;
     }
 
-    //--------------------------------------------------------------------
+
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoSpinButtonControl, UnoControlBase, UnoSpinButtonControl_Base )
 
-    //--------------------------------------------------------------------
+
     void UnoSpinButtonControl::dispose() throw(RuntimeException)
     {
         ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -247,13 +247,13 @@ public:
         UnoControl::dispose();
     }
 
-    //--------------------------------------------------------------------
+
     OUString SAL_CALL UnoSpinButtonControl::getImplementationName(  ) throw(RuntimeException)
     {
         return OUString( "com.sun.star.comp.toolkit.UnoSpinButtonControl" );
     }
 
-    //--------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL UnoSpinButtonControl::getSupportedServiceNames() throw(RuntimeException)
     {
         Sequence< OUString > aServices( UnoControlBase::getSupportedServiceNames() );
@@ -262,7 +262,7 @@ public:
         return aServices;
     }
 
-    //--------------------------------------------------------------------
+
     void UnoSpinButtonControl::createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer >  & rParentPeer ) throw(RuntimeException)
     {
         UnoControl::createPeer( rxToolkit, rParentPeer );
@@ -272,7 +272,7 @@ public:
             xSpinnable->addAdjustmentListener( this );
     }
 
-    //--------------------------------------------------------------------
+
     void UnoSpinButtonControl::adjustmentValueChanged( const AdjustmentEvent& rEvent ) throw(RuntimeException)
     {
         switch ( rEvent.Type )
@@ -294,27 +294,27 @@ public:
         }
     }
 
-    //--------------------------------------------------------------------
+
     void UnoSpinButtonControl::addAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         maAdjustmentListeners.addInterface( listener );
     }
 
-    //--------------------------------------------------------------------
+
     void UnoSpinButtonControl::removeAdjustmentListener( const Reference< XAdjustmentListener > & listener ) throw(RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
         maAdjustmentListeners.removeInterface( listener );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL UnoSpinButtonControl::setValue( sal_Int32 value ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( value ), sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL UnoSpinButtonControl::setValues( sal_Int32 minValue, sal_Int32 maxValue, sal_Int32 currentValue ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True );
@@ -322,7 +322,7 @@ public:
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE ), makeAny( currentValue ), sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL UnoSpinButtonControl::getValue(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
@@ -335,19 +335,19 @@ public:
         return nValue;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL UnoSpinButtonControl::setMinimum( sal_Int32 minValue ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MIN ), makeAny( minValue ), sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL UnoSpinButtonControl::setMaximum( sal_Int32 maxValue ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPINVALUE_MAX ), makeAny( maxValue ), sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL UnoSpinButtonControl::getMinimum(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
@@ -360,7 +360,7 @@ public:
         return nMin;
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL UnoSpinButtonControl::getMaximum(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
@@ -373,13 +373,13 @@ public:
         return nMax;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL UnoSpinButtonControl::setSpinIncrement( sal_Int32 spinIncrement ) throw (RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_SPININCREMENT ), makeAny( spinIncrement ), sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL UnoSpinButtonControl::getSpinIncrement(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
@@ -392,13 +392,13 @@ public:
         return nIncrement;
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL UnoSpinButtonControl::setOrientation( sal_Int32 orientation ) throw (NoSupportException, RuntimeException)
     {
         ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_ORIENTATION ), makeAny( orientation ), sal_True );
     }
 
-    //--------------------------------------------------------------------
+
     sal_Int32 SAL_CALL UnoSpinButtonControl::getOrientation(  ) throw (RuntimeException)
     {
         ::osl::MutexGuard aGuard( GetMutex() );
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 2bd588879a6f..657cbd0c2511 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.cxx
@@ -200,23 +200,23 @@ OUString UnoTreeControl::GetComponentServiceName()
     return OUString("Tree");
 }
 
-// -------------------------------------------------------------------
+
 // ::com::sun::star::view::XSelectionSupplier
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::select( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->select( rSelection );
 }
 
-// -------------------------------------------------------------------
+
 
 Any SAL_CALL UnoTreeControl::getSelection() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelection();
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException)
 {
@@ -230,7 +230,7 @@ void SAL_CALL UnoTreeControl::addSelectionChangeListener( const Reference< XSele
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& xListener ) throw (RuntimeException)
 {
@@ -244,16 +244,16 @@ void SAL_CALL UnoTreeControl::removeSelectionChangeListener( const Reference< XS
     maSelectionListeners.removeInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 // ::com::sun::star::view::XMultiSelectionSupplier
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::addSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->addSelection(rSelection);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -261,7 +261,7 @@ void SAL_CALL UnoTreeControl::removeSelection( const Any& rSelection ) throw (Il
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->removeSelection(rSelection);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException)
 {
@@ -269,37 +269,37 @@ void SAL_CALL UnoTreeControl::clearSelection() throw (RuntimeException)
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->clearSelection();
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL UnoTreeControl::getSelectionCount() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getSelectionCount();
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XEnumeration > SAL_CALL UnoTreeControl::createSelectionEnumeration() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createSelectionEnumeration();
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XEnumeration > SAL_CALL UnoTreeControl::createReverseSelectionEnumeration() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->createReverseSelectionEnumeration();
 }
 
-// --------------------------------------------------------------------
+
 // XTreeControl
-// --------------------------------------------------------------------
+
 
 OUString SAL_CALL UnoTreeControl::getDefaultExpandedGraphicURL() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultExpandedGraphicURL();
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _defaultexpansiongraphicurl ) throw (RuntimeException)
 {
@@ -307,14 +307,14 @@ void SAL_CALL UnoTreeControl::setDefaultExpandedGraphicURL( const OUString& _def
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->setDefaultExpandedGraphicURL(_defaultexpansiongraphicurl);
 }
 
-// -------------------------------------------------------------------
+
 
 OUString SAL_CALL UnoTreeControl::getDefaultCollapsedGraphicURL() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getDefaultCollapsedGraphicURL();
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _defaultcollapsedgraphicurl ) throw (RuntimeException)
 {
@@ -322,21 +322,21 @@ void SAL_CALL UnoTreeControl::setDefaultCollapsedGraphicURL( const OUString& _de
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->setDefaultCollapsedGraphicURL(_defaultcollapsedgraphicurl);
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::isNodeExpanded( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeExpanded(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::isNodeCollapsed( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeCollapsed(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
@@ -344,14 +344,14 @@ void SAL_CALL UnoTreeControl::makeNodeVisible( const Reference< XTreeNode >& xNo
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->makeNodeVisible(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::isNodeVisible( const Reference< XTreeNode >& xNode ) throw (RuntimeException, IllegalArgumentException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isNodeVisible(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
@@ -359,7 +359,7 @@ void SAL_CALL UnoTreeControl::expandNode( const Reference< XTreeNode >& xNode )
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->expandNode(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode ) throw (RuntimeException, ExpandVetoException, IllegalArgumentException)
 {
@@ -367,7 +367,7 @@ void SAL_CALL UnoTreeControl::collapseNode( const Reference< XTreeNode >& xNode
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->collapseNode(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException)
 {
@@ -381,7 +381,7 @@ void SAL_CALL UnoTreeControl::addTreeExpansionListener( const Reference< XTreeEx
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTreeExpansionListener >& xListener ) throw (RuntimeException)
 {
@@ -395,42 +395,42 @@ void SAL_CALL UnoTreeControl::removeTreeExpansionListener( const Reference< XTre
     maTreeExpansionListeners.removeInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XTreeNode > SAL_CALL UnoTreeControl::getNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeForLocation(x,y);
 }
 
-// -------------------------------------------------------------------
+
 
 Reference< XTreeNode > SAL_CALL UnoTreeControl::getClosestNodeForLocation( sal_Int32 x, sal_Int32 y ) throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getClosestNodeForLocation(x,y);
 }
 
-// -------------------------------------------------------------------
+
 
 awt::Rectangle SAL_CALL UnoTreeControl::getNodeRect( const Reference< XTreeNode >& Node ) throw (IllegalArgumentException, RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->getNodeRect( Node );
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::isEditing(  ) throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->isEditing();
 }
 
-// -------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL UnoTreeControl::stopEditing() throw (RuntimeException)
 {
     return Reference< XTreeControl >( getPeer(), UNO_QUERY_THROW )->stopEditing();
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException)
 {
@@ -438,7 +438,7 @@ void SAL_CALL UnoTreeControl::cancelEditing() throw (RuntimeException)
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->cancelEditing();
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >& xNode ) throw (IllegalArgumentException, RuntimeException)
 {
@@ -446,7 +446,7 @@ void SAL_CALL UnoTreeControl::startEditingAtNode( const Reference< XTreeNode >&
     Reference< XTreeControl >( xGcc3WorkaroundTemporary, UNO_QUERY_THROW )->startEditingAtNode(xNode);
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException)
 {
@@ -460,7 +460,7 @@ void SAL_CALL UnoTreeControl::addTreeEditListener( const Reference< XTreeEditLis
     }
 }
 
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEditListener >& xListener ) throw (RuntimeException)
 {
@@ -474,9 +474,9 @@ void SAL_CALL UnoTreeControl::removeTreeEditListener( const Reference< XTreeEdit
     maTreeEditListeners.removeInterface( xListener );
 }
 
-// -------------------------------------------------------------------
+
 // XComponent
-// -------------------------------------------------------------------
+
 
 void SAL_CALL UnoTreeControl::dispose(  ) throw(RuntimeException)
 {
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 2a06319dcfc3..503a4c284785 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -1443,7 +1443,7 @@ Sequence< OUString > UnoControl::getSupportedServiceNames(  ) throw(RuntimeExcep
     return Sequence< OUString >( &sName, 1 );
 }
 
-// ------------------------------------------------------------------------
+
 Reference< XAccessibleContext > SAL_CALL UnoControl::getAccessibleContext(  ) throw (RuntimeException)
 {
     // creation of the context will certainly require the SolarMutex ...
@@ -1501,7 +1501,7 @@ void SAL_CALL UnoControl::removeModeChangeApproveListener( const Reference< XMod
     throw NoSupportException( );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException)
 {
     Reference< XUnitConversion > xPeerConversion;
@@ -1514,7 +1514,7 @@ awt::Point SAL_CALL UnoControl::convertPointToLogic( const awt::Point& i_Point,
     return awt::Point( );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException)
 {
     Reference< XUnitConversion > xPeerConversion;
@@ -1527,7 +1527,7 @@ awt::Point SAL_CALL UnoControl::convertPointToPixel( const awt::Point& i_Point,
     return awt::Point( );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sal_Int16 i_TargetUnit ) throw (IllegalArgumentException, RuntimeException)
 {
     Reference< XUnitConversion > xPeerConversion;
@@ -1540,7 +1540,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToLogic( const awt::Size& i_Size, ::sa
     return awt::Size( );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sal_Int16 i_SourceUnit ) throw (IllegalArgumentException, RuntimeException)
 {
     Reference< XUnitConversion > xPeerConversion;
@@ -1553,7 +1553,7 @@ awt::Size SAL_CALL UnoControl::convertSizeToPixel( const awt::Size& i_Size, ::sa
     return awt::Size( );
 }
 
-//----------------------------------------------------------------------------------------------------------------------
+
 uno::Reference< awt::XStyleSettings > SAL_CALL UnoControl::getStyleSettings() throw (RuntimeException)
 {
     Reference< awt::XStyleSettingsSupplier > xPeerSupplier;
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index 8c3d99ae8a5f..03f961295752 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -166,23 +166,23 @@ private:
     OUString impl_getFreeName_throw();
 };
 
-//------------------------------------------------------------------------
+
 UnoControlHolderList::UnoControlHolderList()
 {
 }
 
-//------------------------------------------------------------------------
+
 UnoControlHolderList::~UnoControlHolderList()
 {
 }
 
-//------------------------------------------------------------------------
+
 UnoControlHolderList::ControlIdentifier UnoControlHolderList::addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName )
 {
     return impl_addControl( _rxControl, _pName );
 }
 
-//------------------------------------------------------------------------
+
 size_t UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XControl > >& _out_rControls ) const
 {
     _out_rControls.realloc( maControls.size() );
@@ -195,7 +195,7 @@ size_t UnoControlHolderList::getControls( uno::Sequence< uno::Reference< awt::XC
     return maControls.size();
 }
 
-//------------------------------------------------------------------------
+
 size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rIdentifiers ) const
 {
     _out_rIdentifiers.realloc( maControls.size() );
@@ -208,7 +208,7 @@ size_t UnoControlHolderList::getIdentifiers( uno::Sequence< sal_Int32 >& _out_rI
     return maControls.size();
 }
 
-//------------------------------------------------------------------------
+
 uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const OUString& _rName ) const
 {
     for (   ControlMap::const_iterator loop = maControls.begin();
@@ -220,7 +220,7 @@ uno::Reference< awt::XControl > UnoControlHolderList::getControlForName( const O
     return uno::Reference< awt::XControl >();
 }
 
-//------------------------------------------------------------------------
+
 UnoControlHolderList::ControlIdentifier UnoControlHolderList::getControlIdentifier( const uno::Reference< awt::XControl >& _rxControl )
 {
     for (   ControlMap::iterator loop = maControls.begin();
@@ -234,7 +234,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::getControlIdentifi
     return -1;
 }
 
-//------------------------------------------------------------------------
+
 bool UnoControlHolderList::getControlForIdentifier( UnoControlHolderList::ControlIdentifier _nIdentifier, uno::Reference< awt::XControl >& _out_rxControl ) const
 {
     ControlMap::const_iterator pos = maControls.find( _nIdentifier );
@@ -244,7 +244,7 @@ bool UnoControlHolderList::getControlForIdentifier( UnoControlHolderList::Contro
     return true;
 }
 
-//------------------------------------------------------------------------
+
 void UnoControlHolderList::removeControlById( UnoControlHolderList::ControlIdentifier _nId )
 {
     ControlMap::iterator pos = maControls.find( _nId );
@@ -255,7 +255,7 @@ void UnoControlHolderList::removeControlById( UnoControlHolderList::ControlIdent
     maControls.erase( pos );
 }
 
-//------------------------------------------------------------------------
+
 void UnoControlHolderList::replaceControlById( ControlIdentifier _nId, const uno::Reference< awt::XControl >& _rxNewControl )
 {
     DBG_ASSERT( _rxNewControl.is(), "UnoControlHolderList::replaceControlById: invalid new control!" );
@@ -268,7 +268,7 @@ void UnoControlHolderList::replaceControlById( ControlIdentifier _nId, const uno
     pos->second.reset( new UnoControlHolder( pos->second->getName(), _rxNewControl ) );
 }
 
-//------------------------------------------------------------------------
+
 UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName )
 {
     DBG_ASSERT( _rxControl.is(), "UnoControlHolderList::impl_addControl: invalid control!" );
@@ -280,7 +280,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_addControl( c
     return nId;
 }
 
-//------------------------------------------------------------------------
+
 UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdentifier_throw()
 {
     for ( ControlIdentifier candidateId = 0; candidateId < ::std::numeric_limits< ControlIdentifier >::max(); ++candidateId )
@@ -292,7 +292,7 @@ UnoControlHolderList::ControlIdentifier UnoControlHolderList::impl_getFreeIdenti
     throw uno::RuntimeException("out of identifiers", NULL );
 }
 
-//------------------------------------------------------------------------
+
 OUString UnoControlHolderList::impl_getFreeName_throw()
 {
     OUString name( "control_" );
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index 0dcc3e0c22e1..ce0bbef0eb8c 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -1040,7 +1040,7 @@ sal_Bool UnoControlModel::supportsService( const OUString& rServiceName ) throw(
     return Sequence< OUString >( &sName, 1 );
 }
 
-// ------------------------------------------------------------------
+
 template <class TYPE>
 sal_Bool convertType(Any& _rConvertedValue, const Any& _rNewValueTest, const TYPE* /* _pTypeDisambiguation */)
 {
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 62413d6f1139..b0057fee227d 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -1985,7 +1985,7 @@ private:
 // =====================================================================================================================
 // = UnoControlListBoxModel
 // =====================================================================================================================
-// ---------------------------------------------------------------------------------------------------------------------
+
 UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentContext >& rxContext, ConstructorMode const i_mode )
     :UnoControlListBoxModel_Base( rxContext )
     ,m_pData( new UnoControlListBoxModel_Data( *this ) )
@@ -1996,7 +1996,7 @@ UnoControlListBoxModel::UnoControlListBoxModel( const Reference< XComponentConte
         UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXListBox );
     }
 }
-// ---------------------------------------------------------------------------------------------------------------------
+
 UnoControlListBoxModel::UnoControlListBoxModel( const UnoControlListBoxModel& i_rSource )
     :UnoControlListBoxModel_Base( i_rSource )
     ,m_pData( new UnoControlListBoxModel_Data( *this ) )
@@ -2008,13 +2008,13 @@ UnoControlListBoxModel::~UnoControlListBoxModel()
 {
 }
 IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel )
-// ---------------------------------------------------------------------------------------------------------------------
+
 OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
 {
     return OUString::createFromAscii( szServiceName_UnoControlListBoxModel );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
 {
     if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
@@ -2026,7 +2026,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return UnoControlModel::ImplGetDefaultValue( nPropId );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& UnoControlListBoxModel::getInfoHelper()
 {
     static UnoPropertyArrayHelper* pHelper = NULL;
@@ -2038,7 +2038,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
     return *pHelper;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 // beans::XMultiPropertySet
 uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySetInfo(  ) throw(uno::RuntimeException)
 {
@@ -2046,7 +2046,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySet
     return xInfo;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 namespace
 {
     struct CreateListItem : public ::std::unary_function< OUString, ListItem >
@@ -2058,7 +2058,7 @@ namespace
     };
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception)
 {
     UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
@@ -2100,7 +2100,7 @@ void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int3
     }
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCount, sal_Int32* _pHandles,
     uno::Any* _pValues, sal_Int32* _pValidHandles ) const SAL_THROW(())
 {
@@ -2111,14 +2111,14 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo
     UnoControlModel::ImplNormalizePropertySequence( _nCount, _pHandles, _pValues, _pValidHandles );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 ::sal_Int32 SAL_CALL UnoControlListBoxModel::getItemCount() throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     return m_pData->getItemCount();
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2131,7 +2131,7 @@ void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2143,7 +2143,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, c
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2155,7 +2155,7 @@ void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition,
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2166,7 +2166,7 @@ void SAL_CALL UnoControlListBoxModel::removeItem( ::sal_Int32 i_nPosition ) thro
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::removeAllItems(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2177,7 +2177,7 @@ void SAL_CALL UnoControlListBoxModel::removeAllItems(  ) throw (::com::sun::star
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2189,7 +2189,7 @@ void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, cons
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2201,7 +2201,7 @@ void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, con
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2214,7 +2214,7 @@ void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPositi
     // <----- SYNCHRONIZED
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, const Any& i_rDataValue ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2222,7 +2222,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons
     rItem.ItemData = i_rDataValue;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
@@ -2230,7 +2230,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition )
     return rItem.ItemText;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
@@ -2238,7 +2238,7 @@ OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition
     return rItem.ItemImageURL;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
@@ -2246,7 +2246,7 @@ beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAn
     return beans::Pair< OUString, OUString >( rItem.ItemText, rItem.ItemImageURL );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -2254,28 +2254,28 @@ Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) thro
     return rItem.ItemData;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems(  ) throw (RuntimeException)
 {
     ::osl::MutexGuard aGuard( GetMutex() );
     return m_pData->getAllItems();
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::addItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException)
 {
     if ( i_Listener.is() )
         m_aItemListListeners.addInterface( i_Listener );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Reference< awt::XItemListListener >& i_Listener ) throw (uno::RuntimeException)
 {
     if ( i_Listener.is() )
         m_aItemListListeners.removeInterface( i_Listener );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< OUString >& o_rStringItems ) const
 {
     Sequence< OUString > aStringItemList;
@@ -2291,7 +2291,7 @@ void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< OUString >&
     );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector< OUString >& i_rStringItems )
 {
     Sequence< OUString > aStringItems( i_rStringItems.size() );
@@ -2313,7 +2313,7 @@ void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector<
     m_pData->m_bSettingLegacyProperty = false;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::impl_handleInsert( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText,
         const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
 {
@@ -2336,7 +2336,7 @@ void UnoControlListBoxModel::impl_handleInsert( const sal_Int32 i_nItemPosition,
     impl_notifyItemListEvent_nolck( i_nItemPosition, i_rItemText, i_rItemImageURL, &XItemListListener::listItemInserted );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::impl_handleRemove( const sal_Int32 i_nItemPosition, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
 {
     // SYNCHRONIZED ----->
@@ -2374,7 +2374,7 @@ void UnoControlListBoxModel::impl_handleRemove( const sal_Int32 i_nItemPosition,
     }
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText,
         const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
 {
@@ -2404,7 +2404,7 @@ void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition,
     impl_notifyItemListEvent_nolck( i_nItemPosition, i_rItemText, i_rItemImageURL, &XItemListListener::listItemModified );
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText,
     const ::boost::optional< OUString >& i_rItemImageURL,
     void ( SAL_CALL XItemListListener::*NotificationMethod )( const ItemListEvent& ) )
@@ -2882,7 +2882,7 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe
     static uno::Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
 }
-// ---------------------------------------------------------------------------------------------------------------------
+
 ::cppu::IPropertyArrayHelper& UnoControlComboBoxModel::getInfoHelper()
 {
     static UnoPropertyArrayHelper* pHelper = NULL;
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 9ab29d0a4e75..e9d9535ed43c 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -143,23 +143,23 @@ namespace toolkit
         }
     };
 
-    //--------------------------------------------------------------------
+
     AccessibleDummyFactory::AccessibleDummyFactory()
     {
     }
 
-    //--------------------------------------------------------------------
+
     AccessibleDummyFactory::~AccessibleDummyFactory()
     {
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AccessibleDummyFactory::acquire()
     {
         return osl_atomic_increment( &m_refCount );
     }
 
-    //--------------------------------------------------------------------
+
     oslInterlockedCount SAL_CALL AccessibleDummyFactory::release()
     {
         if ( 0 == osl_atomic_decrement( &m_refCount ) )
@@ -173,13 +173,13 @@ namespace toolkit
     //====================================================================
     //= AccessibilityClient
     //====================================================================
-    //--------------------------------------------------------------------
+
     AccessibilityClient::AccessibilityClient()
         :m_bInitialized( false )
     {
     }
 
-    //--------------------------------------------------------------------
+
 #ifndef DISABLE_DYNLOADING
     extern "C" { static void SAL_CALL thisModule() {} }
 #else
@@ -240,7 +240,7 @@ namespace toolkit
         m_bInitialized = true;
     }
 
-    //--------------------------------------------------------------------
+
     AccessibilityClient::~AccessibilityClient()
     {
         if ( m_bInitialized )
@@ -262,7 +262,7 @@ namespace toolkit
         }
     }
 
-    //--------------------------------------------------------------------
+
     IAccessibleFactory& AccessibilityClient::getFactory()
     {
         ensureInitialized();
diff --git a/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx
index fe9081d706c7..4e4e5e92ca16 100644
--- a/toolkit/source/helper/externallock.cxx
+++ b/toolkit/source/helper/externallock.cxx
@@ -21,14 +21,14 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-// -----------------------------------------------------------------------------
+
 //  class VCLExternalSolarLock
-// -----------------------------------------------------------------------------
+
 void VCLExternalSolarLock::acquire()
 {
     Application::GetSolarMutex().acquire();
 }
-// -----------------------------------------------------------------------------
+
 void VCLExternalSolarLock::release()
 {
     Application::GetSolarMutex().release();
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 8fc3b9695806..4a4fdf813158 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -58,7 +58,7 @@ namespace toolkitform
 
     namespace
     {
-        //--------------------------------------------------------------------
+
         /** determines the FormComponentType of a form control
         */
         sal_Int16 classifyFormControl( const Reference< XPropertySet >& _rxModel ) SAL_THROW(( Exception ))
@@ -77,7 +77,7 @@ namespace toolkitform
             return nControlType;
         }
 
-        //--------------------------------------------------------------------
+
         /** (default-)creates a PDF widget according to a given FormComponentType
         */
         ::vcl::PDFWriter::AnyWidget* createDefaultWidget( sal_Int16 _nFormComponentType )
@@ -107,7 +107,7 @@ namespace toolkitform
             return NULL;
         }
 
-        //--------------------------------------------------------------------
+
         /** determines a unique number for the radio group which the given radio
             button model belongs to
 
@@ -238,7 +238,7 @@ namespace toolkitform
             return -1;
         }
 
-        //--------------------------------------------------------------------
+
         /** copies a StringItemList to a PDF widget's list
         */
         void getStringItemVector( const Reference< XPropertySet >& _rxModel, ::std::vector< OUString >& _rVector )
@@ -251,7 +251,7 @@ namespace toolkitform
         }
     }
 
-    //--------------------------------------------------------------------
+
     /** creates a PDF compatible control descriptor for the given control
     */
     void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl,
@@ -280,7 +280,7 @@ namespace toolkitform
             // ================================
             // set the common widget properties
 
-            // --------------------------------
+
             // Name, Description, Text
             OSL_VERIFY( xModelProps->getPropertyValue( OUString(FM_PROP_NAME) ) >>= _rpDescriptor->Name );
             static const OUString FM_PROP_HELPTEXT("HelpText");
@@ -295,13 +295,13 @@ namespace toolkitform
             if ( aText.hasValue() )
                 OSL_VERIFY( aText >>= _rpDescriptor->Text );
 
-            // --------------------------------
+
             // readonly
             static const OUString FM_PROP_READONLY("ReadOnly");
             if ( xPSI->hasPropertyByName( FM_PROP_READONLY ) )
                 OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_READONLY ) >>= _rpDescriptor->ReadOnly );
 
-            // --------------------------------
+
             // border
             {
                 static const OUString FM_PROP_BORDER("Border");
@@ -323,7 +323,7 @@ namespace toolkitform
                 }
             }
 
-            // --------------------------------
+
             // background color
             static const OUString FM_PROP_BACKGROUNDCOLOR("BackgroundColor");
             if ( xPSI->hasPropertyByName( FM_PROP_BACKGROUNDCOLOR ) )
@@ -334,7 +334,7 @@ namespace toolkitform
                 _rpDescriptor->BackgroundColor = Color( nBackColor );
             }
 
-            // --------------------------------
+
             // text color
             static const OUString FM_PROP_TEXTCOLOR("TextColor");
             if ( xPSI->hasPropertyByName( FM_PROP_TEXTCOLOR ) )
@@ -344,7 +344,7 @@ namespace toolkitform
                 _rpDescriptor->TextColor = Color( nTextColor );
             }
 
-            // --------------------------------
+
             // text style
             _rpDescriptor->TextStyle = 0;
             // ............................
@@ -416,7 +416,7 @@ namespace toolkitform
 
             // ================================
             // special widget properties
-            // --------------------------------
+
             // edits
             if ( _rpDescriptor->getType() == ::vcl::PDFWriter::Edit )
             {
@@ -452,7 +452,7 @@ namespace toolkitform
                 }
             }
 
-            // --------------------------------
+
             // buttons
             if ( _rpDescriptor->getType() == ::vcl::PDFWriter::PushButton )
             {
@@ -516,7 +516,7 @@ namespace toolkitform
                     pButtonWidget->TextStyle = TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER;
             }
 
-            // --------------------------------
+
             // check boxes
             static const OUString FM_PROP_STATE("State");
             if ( _rpDescriptor->getType() == ::vcl::PDFWriter::CheckBox )
@@ -527,7 +527,7 @@ namespace toolkitform
                 pCheckBoxWidget->Checked = ( nState != 0 );
             }
 
-            // --------------------------------
+
             // radio buttons
             if ( _rpDescriptor->getType() == ::vcl::PDFWriter::RadioButton )
             {
@@ -547,7 +547,7 @@ namespace toolkitform
                 }
             }
 
-            // --------------------------------
+
             // list boxes
             if ( _rpDescriptor->getType() == ::vcl::PDFWriter::ListBox )
             {
@@ -581,7 +581,7 @@ namespace toolkitform
                 }
             }
 
-            // --------------------------------
+
             // combo boxes
             if ( _rpDescriptor->getType() == ::vcl::PDFWriter::ComboBox )
             {
@@ -595,7 +595,7 @@ namespace toolkitform
 
             // ================================
             // some post-processing
-            // --------------------------------
+
             // text line ends
             // some controls may (always or dependent on other settings) return UNIX line ends
             _rpDescriptor->Text = convertLineEnd(_rpDescriptor->Text, LINEEND_CRLF);
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 38b016e9fa64..290502e0f0b5 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -292,7 +292,7 @@ void UnoWrapper::WindowDestroyed( Window* pWindow )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > UnoWrapper::CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar )
 {
     return maAccessibleFactoryAccess.getFactory().createAccessible( pMenu, bIsMenuBar );
diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 5c03a72c331c..6b1090225aa5 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.cxx
@@ -519,13 +519,13 @@ namespace
 //========================================================================
 //= MeasurementUnitConversion
 //========================================================================
-//------------------------------------------------------------------------
+
 sal_Int16 VCLUnoHelper::ConvertToMeasurementUnit( FieldUnit _nFieldUnit, sal_Int16 _nUNOToFieldValueFactor )
 {
     return convertMeasurementUnit( (sal_Int16)_nFieldUnit, FieldUnitToMeasurementUnit, _nUNOToFieldValueFactor );
 }
 
-//------------------------------------------------------------------------
+
 FieldUnit VCLUnoHelper::ConvertToFieldUnit( sal_Int16 _nMeasurementUnit, sal_Int16& _rFieldToUNOValueFactor )
 {
     return (FieldUnit)convertMeasurementUnit( _nMeasurementUnit, MeasurementUnitToFieldUnit, _rFieldToUNOValueFactor );
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 823f024772aa..5d539eec720e 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -264,6 +264,6 @@ namespace tools_urlobj
 }                               // namespace rtl_random
 
 
-// -----------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/test/tests.cxx b/tools/test/tests.cxx
index f8e14ca29c09..5e848c492cca 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.cxx
@@ -102,7 +102,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------------
+
 CPPUNIT_TEST_SUITE_REGISTRATION(FractionTest);
 } // namespace tools
 
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index 0c692fd70242..2bfcf9bcfc87 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -107,11 +107,11 @@ template<typename T> T CachedContentResultSet::rowOriginGet(
     return aRet;
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // CCRS_Cache methoeds.
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 CachedContentResultSet::CCRS_Cache::CCRS_Cache(
     const Reference< XContentIdentifierMapping > & xMapping )
@@ -364,11 +364,11 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache
     }
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class CCRS_PropertySetInfo
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 class CCRS_PropertySetInfo :
                 public cppu::OWeakObject,
@@ -513,26 +513,26 @@ CCRS_PropertySetInfo::~CCRS_PropertySetInfo()
     delete m_pProperties;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces inclusive baseclasses of interfaces
 XINTERFACE_IMPL_2( CCRS_PropertySetInfo
                   , XTypeProvider
                   , XPropertySetInfo
                   );
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces exclusive baseclasses
 XTYPEPROVIDER_IMPL_2( CCRS_PropertySetInfo
                     , XTypeProvider
                     , XPropertySetInfo
                     );
-//--------------------------------------------------------------------------
+
 // XPropertySetInfo methods.
-//--------------------------------------------------------------------------
+
 //virtual
 Sequence< Property > SAL_CALL CCRS_PropertySetInfo
     ::getProperties() throw( RuntimeException )
@@ -563,9 +563,9 @@ sal_Bool SAL_CALL CCRS_PropertySetInfo
     return ( impl_getPos( Name ) != -1 );
 }
 
-//--------------------------------------------------------------------------
+
 // impl_ methods.
-//--------------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL CCRS_PropertySetInfo
             ::impl_getPos( const OUString& rName ) const
@@ -635,11 +635,11 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo
     return nHandle;
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class CachedContentResultSet
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 CachedContentResultSet::CachedContentResultSet(
                   const Reference< XComponentContext > & rxContext
@@ -691,9 +691,9 @@ CachedContentResultSet::~CachedContentResultSet()
     //do not delete m_pMyPropSetInfo, cause it is hold via reference
 };
 
-//--------------------------------------------------------------------------
+
 // impl_ methods.
-//--------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL CachedContentResultSet
     ::applyPositionToOrigin( sal_Int32 nRow )
@@ -701,7 +701,7 @@ sal_Bool SAL_CALL CachedContentResultSet
            RuntimeException )
 {
     impl_EnsureNotDisposed();
-    //-------------------------------------------------------------------------
+
     /**
     @returns
         <TRUE/> if the cursor is on a valid row; <FALSE/> if it is off
@@ -802,11 +802,11 @@ sal_Bool SAL_CALL CachedContentResultSet
     return sal_True;
 };
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 //define for fetching data
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 #define FETCH_XXX( aCache, fetchInterface, fetchMethod )            \
 sal_Bool bDirection = !!(                                           \
@@ -911,9 +911,9 @@ void SAL_CALL CachedContentResultSet
     m_xPropertySetInfo = m_xMyPropertySetInfo;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods. ( inherited )
-//--------------------------------------------------------------------------
+
 XINTERFACE_COMMON_IMPL( CachedContentResultSet )
 
 Any SAL_CALL CachedContentResultSet
@@ -933,9 +933,9 @@ Any SAL_CALL CachedContentResultSet
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces exclusive baseclasses
 XTYPEPROVIDER_IMPL_11( CachedContentResultSet
                     , XTypeProvider
@@ -953,9 +953,9 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet
                     , XResultSet
                     , XRow );
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
                                OUString(
@@ -963,9 +963,9 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSet,
                             OUString(
                             CACHED_CONTENT_RESULTSET_SERVICE_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // XPropertySet methods. ( inherited )
-//--------------------------------------------------------------------------
+
 
 // virtual
 void SAL_CALL CachedContentResultSet
@@ -1079,7 +1079,7 @@ void SAL_CALL CachedContentResultSet
     }
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 Any SAL_CALL CachedContentResultSet
     ::getPropertyValue( const OUString& rPropertyName )
@@ -1139,9 +1139,9 @@ Any SAL_CALL CachedContentResultSet
     return aValue;
 }
 
-//--------------------------------------------------------------------------
+
 // own methods.  ( inherited )
-//--------------------------------------------------------------------------
+
 
 //virtual
 void SAL_CALL CachedContentResultSet
@@ -1168,7 +1168,7 @@ void SAL_CALL CachedContentResultSet
     PropertyChangeEvent aEvt( rEvt );
     aEvt.Source = static_cast< XPropertySet * >( this );
     aEvt.Further = sal_False;
-    //---------
+
 
     if( CCRS_PropertySetInfo
             ::impl_isMyPropertyName( rEvt.PropertyName ) )
@@ -1211,7 +1211,7 @@ void SAL_CALL CachedContentResultSet
         return;
     }
 
-    //-----------
+
     impl_notifyPropertyChangeListeners( aEvt );
 }
 
@@ -1239,9 +1239,9 @@ void SAL_CALL CachedContentResultSet
     impl_notifyVetoableChangeListeners( aEvt );
 }
 
-//--------------------------------------------------------------------------
+
 // XContentAccess methods. ( inherited ) ( -- position dependent )
-//--------------------------------------------------------------------------
+
 
 #define XCONTENTACCESS_queryXXX( queryXXX, XXX, TYPE )              \
 impl_EnsureNotDisposed();                                   \
@@ -1277,7 +1277,7 @@ if( !m_aCache##XXX.hasRow( nRow ) )                         \
 }                                                           \
 return m_aCache##XXX.get##XXX( nRow );
 
-//--------------------------------------------------------------------------
+
 // virtual
 OUString SAL_CALL CachedContentResultSet
     ::queryContentIdentifierString()
@@ -1286,7 +1286,7 @@ OUString SAL_CALL CachedContentResultSet
     XCONTENTACCESS_queryXXX( queryContentIdentifierString, ContentIdentifierString, OUString )
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
     ::queryContentIdentifier()
@@ -1295,7 +1295,7 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet
     XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier, Reference< XContentIdentifier > )
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 Reference< XContent > SAL_CALL CachedContentResultSet
     ::queryContent()
@@ -1304,9 +1304,9 @@ Reference< XContent > SAL_CALL CachedContentResultSet
     XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > )
 }
 
-//-----------------------------------------------------------------
+
 // XResultSet methods. ( inherited )
-//-----------------------------------------------------------------
+
 //virtual
 
 sal_Bool SAL_CALL CachedContentResultSet
@@ -1889,9 +1889,9 @@ Reference< XInterface > SAL_CALL CachedContentResultSet
     return Reference< XInterface >();
 }
 
-//-----------------------------------------------------------------
+
 // XRow methods. ( inherited )
-//-----------------------------------------------------------------
+
 
 //virtual
 sal_Bool SAL_CALL CachedContentResultSet
@@ -2134,9 +2134,9 @@ Reference< XArray > SAL_CALL CachedContentResultSet
         &css::sdbc::XRow::getArray, columnIndex);
 }
 
-//-----------------------------------------------------------------
+
 // Type Converter Support
-//-----------------------------------------------------------------
+
 
 const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
 {
@@ -2154,11 +2154,11 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter()
     return m_xTypeConverter;
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class CachedContentResultSetFactory
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 CachedContentResultSetFactory::CachedContentResultSetFactory(
         const Reference< XComponentContext > & rxContext )
@@ -2170,41 +2170,41 @@ CachedContentResultSetFactory::~CachedContentResultSetFactory()
 {
 }
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetFactory XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_3( CachedContentResultSetFactory,
                    XTypeProvider,
                    XServiceInfo,
                    XCachedContentResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetFactory XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
                       XTypeProvider,
                          XServiceInfo,
                       XCachedContentResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetFactory XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_IMPL_1_CTX( CachedContentResultSetFactory,
                      OUString( "com.sun.star.comp.ucb.CachedContentResultSetFactory" ),
                      OUString( CACHED_CONTENT_RESULTSET_FACTORY_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // Service factory implementation.
-//--------------------------------------------------------------------------
+
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetFactory XCachedContentResultSetFactory methods.
-//--------------------------------------------------------------------------
+
 
     //virtual
 Reference< XResultSet > SAL_CALL CachedContentResultSetFactory
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx
index 23b986353e52..719973099d9e 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.cxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx
@@ -51,9 +51,9 @@ CachedContentResultSetStub::~CachedContentResultSetStub()
     impl_deinit();
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 XINTERFACE_COMMON_IMPL( CachedContentResultSetStub )
 
 Any SAL_CALL CachedContentResultSetStub
@@ -76,9 +76,9 @@ Any SAL_CALL CachedContentResultSetStub
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-//--------------------------------------------------------------------------
+
 // own methods.  ( inherited )
-//--------------------------------------------------------------------------
+
 
 //virtual
 void SAL_CALL CachedContentResultSetStub
@@ -122,9 +122,9 @@ void SAL_CALL CachedContentResultSetStub
     impl_notifyVetoableChangeListeners( aEvt );
 }
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_COMMON_IMPL( CachedContentResultSetStub )
 //list all interfaces exclusive baseclasses
@@ -157,17 +157,17 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub
     return *pTypes;
 }
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedContentResultSetStub,
                         OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ),
                         OUString( CACHED_CRS_STUB_SERVICE_NAME ) );
 
-//-----------------------------------------------------------------
+
 // XFetchProvider methods.
-//-----------------------------------------------------------------
+
 
 #define FETCH_XXX( impl_loadRow, loadInterface ) \
 impl_EnsureNotDisposed(); \
@@ -422,9 +422,9 @@ void SAL_CALL CachedContentResultSetStub
     }
 }
 
-//-----------------------------------------------------------------
+
 // XFetchProviderForContentAccess methods.
-//-----------------------------------------------------------------
+
 
 void SAL_CALL CachedContentResultSetStub
     ::impl_getCurrentContentIdentifierString( Any& rAny
@@ -480,11 +480,11 @@ FetchResult SAL_CALL CachedContentResultSetStub
     FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin );
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class CachedContentResultSetStubFactory
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 CachedContentResultSetStubFactory::CachedContentResultSetStubFactory(
         const Reference< XMultiServiceFactory > & rSMgr )
@@ -496,41 +496,41 @@ CachedContentResultSetStubFactory::~CachedContentResultSetStubFactory()
 {
 }
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetStubFactory XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_3( CachedContentResultSetStubFactory,
                    XTypeProvider,
                    XServiceInfo,
                    XCachedContentResultSetStubFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetStubFactory XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_3( CachedContentResultSetStubFactory,
                       XTypeProvider,
                          XServiceInfo,
                       XCachedContentResultSetStubFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetStubFactory XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_IMPL_1( CachedContentResultSetStubFactory,
                      OUString( "com.sun.star.comp.ucb.CachedContentResultSetStubFactory" ),
                      OUString( CACHED_CRS_STUB_FACTORY_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // Service factory implementation.
-//--------------------------------------------------------------------------
+
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedContentResultSetStubFactory XCachedContentResultSetStubFactory methods.
-//--------------------------------------------------------------------------
+
 
     //virtual
 Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory
diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx
index ab6d880bdb21..ab9467825fd7 100644
--- a/ucb/source/cacher/cacheddynamicresultset.cxx
+++ b/ucb/source/cacher/cacheddynamicresultset.cxx
@@ -73,9 +73,9 @@ void SAL_CALL CachedDynamicResultSet
     m_xMyResultTwo = xCache;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 XINTERFACE_COMMON_IMPL( CachedDynamicResultSet )
 
 Any SAL_CALL CachedDynamicResultSet
@@ -95,9 +95,9 @@ Any SAL_CALL CachedDynamicResultSet
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces exclusive baseclasses
 XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
                     , XTypeProvider
@@ -106,17 +106,17 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet
                     , XSourceInitialization
                     );
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSet,
                             OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ),
                             OUString( CACHED_DRS_SERVICE_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // own methds. ( inherited )
-//--------------------------------------------------------------------------
+
 //virtual
 void SAL_CALL CachedDynamicResultSet
     ::impl_disposing( const EventObject& Source )
@@ -126,11 +126,11 @@ void SAL_CALL CachedDynamicResultSet
     m_xContentIdentifierMapping.clear();
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class CachedDynamicResultSetFactory
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 CachedDynamicResultSetFactory::CachedDynamicResultSetFactory(
         const Reference< XComponentContext > & xContext )
@@ -142,41 +142,41 @@ CachedDynamicResultSetFactory::~CachedDynamicResultSetFactory()
 {
 }
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetFactory XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_3( CachedDynamicResultSetFactory,
                    XTypeProvider,
                    XServiceInfo,
                    XCachedDynamicResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetFactory XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetFactory,
                       XTypeProvider,
                          XServiceInfo,
                       XCachedDynamicResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetFactory XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetFactory,
                          OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetFactory" ),
                          OUString( CACHED_DRS_FACTORY_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // Service factory implementation.
-//--------------------------------------------------------------------------
+
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetFactory XCachedDynamicResultSetFactory methods.
-//--------------------------------------------------------------------------
+
 
 //virtual
 Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetFactory
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
index c370a59cdc37..fb7dbe5daa02 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx
@@ -74,9 +74,9 @@ void SAL_CALL CachedDynamicResultSetStub
     m_xMyResultTwo = xStub;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 XINTERFACE_COMMON_IMPL( CachedDynamicResultSetStub )
 
 Any SAL_CALL CachedDynamicResultSetStub
@@ -96,9 +96,9 @@ Any SAL_CALL CachedDynamicResultSetStub
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces exclusive baseclasses
 XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
                     , XTypeProvider
@@ -108,19 +108,19 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub
                     , XSourceInitialization
                     );
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub,
                         OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ),
                         OUString( CACHED_DRS_STUB_SERVICE_NAME ) );
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class CachedDynamicResultSetStubFactory
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 CachedDynamicResultSetStubFactory::CachedDynamicResultSetStubFactory(
         const Reference< XComponentContext > & rxContext )
@@ -132,41 +132,41 @@ CachedDynamicResultSetStubFactory::~CachedDynamicResultSetStubFactory()
 {
 }
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetStubFactory XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_3( CachedDynamicResultSetStubFactory,
                    XTypeProvider,
                    XServiceInfo,
                    XCachedDynamicResultSetStubFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetStubFactory XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_3( CachedDynamicResultSetStubFactory,
                       XTypeProvider,
                          XServiceInfo,
                       XCachedDynamicResultSetStubFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetStubFactory XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_IMPL_1_CTX( CachedDynamicResultSetStubFactory,
                      OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStubFactory" ),
                      OUString( CACHED_DRS_STUB_FACTORY_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // Service factory implementation.
-//--------------------------------------------------------------------------
+
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory );
 
-//--------------------------------------------------------------------------
+
 // CachedDynamicResultSetStubFactory XCachedDynamicResultSetStubFactory methods.
-//--------------------------------------------------------------------------
+
 
 //virtual
 Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory
diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx
index 14fa320cc8d9..19826e66412a 100644
--- a/ucb/source/cacher/contentresultsetwrapper.cxx
+++ b/ucb/source/cacher/contentresultsetwrapper.cxx
@@ -36,11 +36,11 @@ using namespace com::sun::star::util;
 using namespace cppu;
 
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class ContentResultSetWrapper
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 ContentResultSetWrapper::ContentResultSetWrapper(
                                 Reference< XResultSet > xOrigin )
@@ -335,9 +335,9 @@ sal_Bool SAL_CALL ContentResultSetWrapper
     */
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces inclusive baseclasses of interfaces
 QUERYINTERFACE_IMPL_START( ContentResultSetWrapper )
 
@@ -352,9 +352,9 @@ QUERYINTERFACE_IMPL_START( ContentResultSetWrapper )
 
 QUERYINTERFACE_IMPL_END
 
-//--------------------------------------------------------------------------
+
 // XComponent methods.
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::dispose() throw( RuntimeException )
@@ -428,7 +428,7 @@ void SAL_CALL ContentResultSetWrapper
     m_bInDispose = sal_False;
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::addEventListener( const Reference< XEventListener >& Listener )
@@ -444,7 +444,7 @@ void SAL_CALL ContentResultSetWrapper
     m_pDisposeEventListeners->addInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::removeEventListener( const Reference< XEventListener >& Listener )
@@ -457,9 +457,9 @@ void SAL_CALL ContentResultSetWrapper
         m_pDisposeEventListeners->removeInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 //XCloseable methods.
-//--------------------------------------------------------------------------
+
 //virtual
 void SAL_CALL ContentResultSetWrapper
     ::close()
@@ -470,9 +470,9 @@ void SAL_CALL ContentResultSetWrapper
     dispose();
 }
 
-//--------------------------------------------------------------------------
+
 //XResultSetMetaDataSupplier methods.
-//--------------------------------------------------------------------------
+
 //virtual
 Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper
     ::getMetaData()
@@ -503,9 +503,9 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper
 }
 
 
-//--------------------------------------------------------------------------
+
 // XPropertySet methods.
-//--------------------------------------------------------------------------
+
 // virtual
 Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper
     ::getPropertySetInfo() throw( RuntimeException )
@@ -519,7 +519,7 @@ Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper
     impl_initPropertySetInfo();
     return m_xPropertySetInfo;
 }
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
@@ -539,7 +539,7 @@ void SAL_CALL ContentResultSetWrapper
     m_xPropertySetOrigin->setPropertyValue( rPropertyName, rValue );
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 Any SAL_CALL ContentResultSetWrapper
     ::getPropertyValue( const OUString& rPropertyName )
@@ -557,7 +557,7 @@ Any SAL_CALL ContentResultSetWrapper
     return m_xPropertySetOrigin->getPropertyValue( rPropertyName );
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::addPropertyChangeListener(
@@ -609,7 +609,7 @@ void SAL_CALL ContentResultSetWrapper
     }
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::addVetoableChangeListener(
@@ -660,7 +660,7 @@ void SAL_CALL ContentResultSetWrapper
     }
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::removePropertyChangeListener(
@@ -719,7 +719,7 @@ void SAL_CALL ContentResultSetWrapper
     }
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL ContentResultSetWrapper
     ::removeVetoableChangeListener(
@@ -778,9 +778,9 @@ void SAL_CALL ContentResultSetWrapper
     }
 }
 
-//--------------------------------------------------------------------------
+
 // own methods.
-//--------------------------------------------------------------------------
+
 
 //virtual
 void SAL_CALL ContentResultSetWrapper
@@ -835,9 +835,9 @@ void SAL_CALL ContentResultSetWrapper
     impl_notifyVetoableChangeListeners( aEvt );
 }
 
-//--------------------------------------------------------------------------
+
 // XContentAccess methods.  ( -- position dependent )
-//--------------------------------------------------------------------------
+
 
 // virtual
 OUString SAL_CALL ContentResultSetWrapper
@@ -854,7 +854,7 @@ OUString SAL_CALL ContentResultSetWrapper
     return m_xContentAccessOrigin->queryContentIdentifierString();
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper
     ::queryContentIdentifier()
@@ -870,7 +870,7 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper
     return m_xContentAccessOrigin->queryContentIdentifier();
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 Reference< XContent > SAL_CALL ContentResultSetWrapper
     ::queryContent()
@@ -886,9 +886,9 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper
     return m_xContentAccessOrigin->queryContent();
 }
 
-//-----------------------------------------------------------------
+
 // XResultSet methods.
-//-----------------------------------------------------------------
+
 //virtual
 
 sal_Bool SAL_CALL ContentResultSetWrapper
@@ -1174,9 +1174,9 @@ Reference< XInterface > SAL_CALL ContentResultSetWrapper
     return Reference< XInterface >();
 }
 
-//-----------------------------------------------------------------
+
 // XRow methods.
-//-----------------------------------------------------------------
+
 
 #define XROW_GETXXX( getXXX )                                   \
 impl_EnsureNotDisposed();                                       \
@@ -1389,11 +1389,11 @@ Reference< XArray > SAL_CALL ContentResultSetWrapper
     XROW_GETXXX( getArray );
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class ContentResultSetWrapperListener
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 ContentResultSetWrapperListener::ContentResultSetWrapperListener(
     ContentResultSetWrapper* pOwner )
@@ -1405,9 +1405,9 @@ ContentResultSetWrapperListener::~ContentResultSetWrapperListener()
 {
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces inclusive baseclasses of interfaces
 XINTERFACE_COMMON_IMPL( ContentResultSetWrapperListener )
 QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
@@ -1420,9 +1420,9 @@ QUERYINTERFACE_IMPL_START( ContentResultSetWrapperListener )
 QUERYINTERFACE_IMPL_END
 
 
-//--------------------------------------------------------------------------
+
 //XEventListener methods.
-//--------------------------------------------------------------------------
+
 
 //virtual
 void SAL_CALL ContentResultSetWrapperListener
@@ -1433,9 +1433,9 @@ void SAL_CALL ContentResultSetWrapperListener
         m_pOwner->impl_disposing( rEventObject );
 }
 
-//--------------------------------------------------------------------------
+
 //XPropertyChangeListener methods.
-//--------------------------------------------------------------------------
+
 
 //virtual
 void SAL_CALL ContentResultSetWrapperListener
@@ -1446,9 +1446,9 @@ void SAL_CALL ContentResultSetWrapperListener
         m_pOwner->impl_propertyChange( rEvt );
 }
 
-//--------------------------------------------------------------------------
+
 //XVetoableChangeListener methods.
-//--------------------------------------------------------------------------
+
 //virtual
 void SAL_CALL ContentResultSetWrapperListener
     ::vetoableChange( const PropertyChangeEvent& rEvt )
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx
index e50863fc2c90..dc96206bdf13 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.cxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx
@@ -33,11 +33,11 @@ using namespace com::sun::star::uno;
 using namespace cppu;
 
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class DynamicResultSetWrapper
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 DynamicResultSetWrapper::DynamicResultSetWrapper(
                     Reference< XDynamicResultSet > xOrigin
@@ -121,9 +121,9 @@ void SAL_CALL DynamicResultSetWrapper
     m_xMyResultTwo = xResultSet;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces inclusive baseclasses of interfaces
 QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper )
     (static_cast< XComponent* >(this)) //base of XDynamicResultSet
@@ -131,9 +131,9 @@ QUERYINTERFACE_IMPL_START( DynamicResultSetWrapper )
     , (static_cast< XSourceInitialization* >(this))
 QUERYINTERFACE_IMPL_END
 
-//--------------------------------------------------------------------------
+
 // XComponent methods.
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL DynamicResultSetWrapper
     ::dispose() throw( RuntimeException )
@@ -169,7 +169,7 @@ void SAL_CALL DynamicResultSetWrapper
     m_bInDispose = sal_False;
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL DynamicResultSetWrapper
     ::addEventListener( const Reference< XEventListener >& Listener )
@@ -185,7 +185,7 @@ void SAL_CALL DynamicResultSetWrapper
     m_pDisposeEventListeners->addInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL DynamicResultSetWrapper
     ::removeEventListener( const Reference< XEventListener >& Listener )
@@ -198,9 +198,9 @@ void SAL_CALL DynamicResultSetWrapper
         m_pDisposeEventListeners->removeInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 // own methods
-//--------------------------------------------------------------------------
+
 
 //virtual
 void SAL_CALL DynamicResultSetWrapper
@@ -287,9 +287,9 @@ void SAL_CALL DynamicResultSetWrapper
     */
 }
 
-//--------------------------------------------------------------------------
+
 // XSourceInitialization
-//--------------------------------------------------------------------------
+
 //virtual
 void SAL_CALL DynamicResultSetWrapper
     ::setSource( const Reference< XInterface > & Source )
@@ -329,9 +329,9 @@ void SAL_CALL DynamicResultSetWrapper
     m_aSourceSet.set();
 }
 
-//--------------------------------------------------------------------------
+
 // XDynamicResultSet
-//--------------------------------------------------------------------------
+
 //virtual
 Reference< XResultSet > SAL_CALL DynamicResultSetWrapper
     ::getStaticResultSet()
@@ -447,11 +447,11 @@ sal_Int16 SAL_CALL DynamicResultSetWrapper
     return xSource->getCapabilities();
 }
 
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 // class DynamicResultSetWrapperListener
-//--------------------------------------------------------------------------
-//--------------------------------------------------------------------------
+
+
 
 DynamicResultSetWrapperListener::DynamicResultSetWrapperListener(
         DynamicResultSetWrapper* pOwner )
@@ -465,18 +465,18 @@ DynamicResultSetWrapperListener::~DynamicResultSetWrapperListener()
 
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 //list all interfaces inclusive baseclasses of interfaces
 XINTERFACE_IMPL_2( DynamicResultSetWrapperListener
                    , XDynamicResultSetListener
                    , XEventListener //base of XDynamicResultSetListener
                    );
 
-//--------------------------------------------------------------------------
+
 // XDynamicResultSetListener methods:
-//--------------------------------------------------------------------------
+
 //virtual
 void SAL_CALL DynamicResultSetWrapperListener
     ::disposing( const EventObject& rEventObject )
@@ -499,9 +499,9 @@ void SAL_CALL DynamicResultSetWrapperListener
         m_pOwner->impl_notify( Changes );
 }
 
-//--------------------------------------------------------------------------
+
 // own methods:
-//--------------------------------------------------------------------------
+
 
 void SAL_CALL DynamicResultSetWrapperListener
     ::impl_OwnerDies()
diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index 88cdcab084e5..ef1e7895727d 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp>
 #include <com/sun/star/ucb/XSourceInitialization.hpp>
 
-//-----------------------------------------------------------------------------
+
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
@@ -85,7 +85,7 @@ SortedDynamicResultSet::SortedDynamicResultSet(
     mbStatic        = sal_False;
 }
 
-//--------------------------------------------------------------------------
+
 SortedDynamicResultSet::~SortedDynamicResultSet()
 {
     mpOwnListener->impl_OwnerDies();
@@ -101,9 +101,9 @@ SortedDynamicResultSet::~SortedDynamicResultSet()
     mpTwo = NULL;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_4( SortedDynamicResultSet,
                    XTypeProvider,
@@ -111,26 +111,26 @@ XINTERFACE_IMPL_4( SortedDynamicResultSet,
                    XComponent,      /* base class of XDynamicResultSet */
                    XDynamicResultSet );
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_3( SortedDynamicResultSet,
                       XTypeProvider,
                          XServiceInfo,
                       XDynamicResultSet );
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet,
                                    OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" ),
                                    OUString( DYNAMIC_RESULTSET_SERVICE_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // XComponent methods.
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedDynamicResultSet::dispose()
     throw( RuntimeException )
 {
@@ -152,7 +152,7 @@ void SAL_CALL SortedDynamicResultSet::dispose()
     mbUseOne = sal_True;
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedDynamicResultSet::addEventListener(
                             const Reference< XEventListener >& Listener )
     throw( RuntimeException )
@@ -166,7 +166,7 @@ void SAL_CALL SortedDynamicResultSet::addEventListener(
     mpDisposeEventListeners->addInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedDynamicResultSet::removeEventListener(
                             const Reference< XEventListener >& Listener )
     throw( RuntimeException )
@@ -177,9 +177,9 @@ void SAL_CALL SortedDynamicResultSet::removeEventListener(
         mpDisposeEventListeners->removeInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 // XDynamicResultSet methods.
-// ------------------------------------------------------------------------------
+
 Reference< XResultSet > SAL_CALL
 SortedDynamicResultSet::getStaticResultSet()
     throw( ListenerAlreadySetException, RuntimeException )
@@ -201,7 +201,7 @@ SortedDynamicResultSet::getStaticResultSet()
     return mxOne;
 }
 
-// ------------------------------------------------------------------------------
+
 void SAL_CALL
 SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener >& Listener )
     throw( ListenerAlreadySetException, RuntimeException )
@@ -219,7 +219,7 @@ SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener
         mxOriginal->setListener( mxOwnListener );
 }
 
-// ------------------------------------------------------------------------------
+
 void SAL_CALL
 SortedDynamicResultSet::connectToCache(
         const Reference< XDynamicResultSet > & xCache )
@@ -256,7 +256,7 @@ SortedDynamicResultSet::connectToCache(
     throw ServiceNotFoundException();
 }
 
-// ------------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL
 SortedDynamicResultSet::getCapabilities()
     throw( RuntimeException )
@@ -273,9 +273,9 @@ SortedDynamicResultSet::getCapabilities()
     return nCaps;
 }
 
-//--------------------------------------------------------------------------
+
 // XDynamicResultSetListener methods.
-// ------------------------------------------------------------------------------
+
 
 /** In the first notify-call the listener gets the two
  <type>XResultSet</type>s and has to hold them. The <type>XResultSet</type>s
@@ -421,9 +421,9 @@ SortedDynamicResultSet::impl_notify( const ListEvent& Changes )
     pCurSet->CheckProperties( nOldCount, bWasFinal );
 }
 
-//-----------------------------------------------------------------
+
 // XEventListener
-//-----------------------------------------------------------------
+
 void SAL_CALL
 SortedDynamicResultSet::impl_disposing( const EventObject& )
     throw( RuntimeException )
@@ -432,9 +432,9 @@ SortedDynamicResultSet::impl_disposing( const EventObject& )
     mxOriginal.clear();
 }
 
-// ------------------------------------------------------------------------------
+
 // private methods
-// ------------------------------------------------------------------------------
+
 void SortedDynamicResultSet::SendNotify()
 {
     long nCount = maActions.Count();
@@ -470,46 +470,46 @@ SortedDynamicResultSetFactory::SortedDynamicResultSetFactory(
     m_xContext = rxContext;
 }
 
-//--------------------------------------------------------------------------
+
 SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory()
 {
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_3( SortedDynamicResultSetFactory,
                    XTypeProvider,
                    XServiceInfo,
                    XSortedDynamicResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_3( SortedDynamicResultSetFactory,
                       XTypeProvider,
                          XServiceInfo,
                       XSortedDynamicResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_IMPL_1_CTX( SortedDynamicResultSetFactory,
                          OUString( "com.sun.star.comp.ucb.SortedDynamicResultSetFactory" ),
                          OUString( DYNAMIC_RESULTSET_FACTORY_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // Service factory implementation.
-//--------------------------------------------------------------------------
+
 
 ONE_INSTANCE_SERVICE_FACTORY_IMPL( SortedDynamicResultSetFactory );
 
-//--------------------------------------------------------------------------
+
 // SortedDynamicResultSetFactory methods.
-//--------------------------------------------------------------------------
+
 Reference< XDynamicResultSet > SAL_CALL
 SortedDynamicResultSetFactory::createSortedDynamicResultSet(
                 const Reference< XDynamicResultSet > & Source,
@@ -539,7 +539,7 @@ void EventList::Clear()
     maData.clear();
 }
 
-//--------------------------------------------------------------------------
+
 void EventList::AddEvent( sal_IntPtr nType, sal_IntPtr nPos, sal_IntPtr nCount )
 {
     ListAction *pAction = new ListAction;
@@ -562,22 +562,22 @@ SortedDynamicResultSetListener::SortedDynamicResultSetListener(
     mpOwner = mOwner;
 }
 
-//-----------------------------------------------------------------
+
 SortedDynamicResultSetListener::~SortedDynamicResultSetListener()
 {
 }
 
-//-----------------------------------------------------------------
+
 // XInterface methods.
-//-----------------------------------------------------------------
+
 
 XINTERFACE_IMPL_2( SortedDynamicResultSetListener,
                    XEventListener,  /* base class of XDynamicResultSetListener */
                    XDynamicResultSetListener );
 
-//-----------------------------------------------------------------
+
 // XEventListener ( base of XDynamicResultSetListener )
-//-----------------------------------------------------------------
+
 void SAL_CALL
 SortedDynamicResultSetListener::disposing( const EventObject& Source )
     throw( RuntimeException )
@@ -588,9 +588,9 @@ SortedDynamicResultSetListener::disposing( const EventObject& Source )
         mpOwner->impl_disposing( Source );
 }
 
-//-----------------------------------------------------------------
+
 // XDynamicResultSetListener
-//-----------------------------------------------------------------
+
 void SAL_CALL
 SortedDynamicResultSetListener::notify( const ListEvent& Changes )
     throw( RuntimeException )
@@ -601,9 +601,9 @@ SortedDynamicResultSetListener::notify( const ListEvent& Changes )
         mpOwner->impl_notify( Changes );
 }
 
-//-----------------------------------------------------------------
+
 // own methods:
-//-----------------------------------------------------------------
+
 void SAL_CALL
 SortedDynamicResultSetListener::impl_OwnerDies()
 {
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index 25a94d83147d..ca09eae5643a 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <osl/diagnose.h>
 
-//-----------------------------------------------------------------------------
+
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 using namespace com::sun::star::io;
@@ -73,7 +73,7 @@ struct SortInfo
     Reference < XAnyCompare >   mxCompareFunction;
 };
 
-//-----------------------------------------------------------------------------
+
 
 struct SortListData
 {
@@ -176,7 +176,7 @@ SortedResultSet::SortedResultSet( Reference< XResultSet > aResult )
     mbIsCopy    = sal_False;
 }
 
-//--------------------------------------------------------------------------
+
 SortedResultSet::~SortedResultSet()
 {
     mxOriginal.clear();
@@ -202,9 +202,9 @@ SortedResultSet::~SortedResultSet()
     delete mpVetoChangeListeners;
 }
 
-//--------------------------------------------------------------------------
+
 // XInterface methods.
-//--------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_9( SortedResultSet,
                    XTypeProvider,
@@ -217,9 +217,9 @@ XINTERFACE_IMPL_9( SortedResultSet,
                    XResultSetMetaDataSupplier,
                    XPropertySet );
 
-//--------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//--------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_9( SortedResultSet,
                       XTypeProvider,
@@ -232,17 +232,17 @@ XTYPEPROVIDER_IMPL_9( SortedResultSet,
                       XResultSetMetaDataSupplier,
                       XPropertySet );
 
-//--------------------------------------------------------------------------
+
 // XServiceInfo methods.
-//--------------------------------------------------------------------------
+
 
 XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet,
                                OUString( "com.sun.star.comp.ucb.SortedResultSet" ),
                                OUString( RESULTSET_SERVICE_NAME ) );
 
-//--------------------------------------------------------------------------
+
 // XComponent methods.
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::dispose()
     throw( RuntimeException )
 {
@@ -273,7 +273,7 @@ void SAL_CALL SortedResultSet::dispose()
     mxOther.clear();
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::addEventListener(
                             const Reference< XEventListener >& Listener )
     throw( RuntimeException )
@@ -287,7 +287,7 @@ void SAL_CALL SortedResultSet::addEventListener(
     mpDisposeEventListeners->addInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::removeEventListener(
                             const Reference< XEventListener >& Listener )
     throw( RuntimeException )
@@ -298,9 +298,9 @@ void SAL_CALL SortedResultSet::removeEventListener(
         mpDisposeEventListeners->removeInterface( Listener );
 }
 
-//--------------------------------------------------------------------------
+
 // XContentAccess methods.
-//--------------------------------------------------------------------------
+
 
 OUString SAL_CALL
 SortedResultSet::queryContentIdentifierString()
@@ -310,7 +310,7 @@ SortedResultSet::queryContentIdentifierString()
     return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifierString();
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XContentIdentifier > SAL_CALL
 SortedResultSet::queryContentIdentifier()
     throw( RuntimeException )
@@ -319,7 +319,7 @@ SortedResultSet::queryContentIdentifier()
     return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifier();
 }
 
-//--------------------------------------------------------------------------
+
 Reference< XContent > SAL_CALL
 SortedResultSet::queryContent()
     throw( RuntimeException )
@@ -329,9 +329,9 @@ SortedResultSet::queryContent()
 }
 
 
-//--------------------------------------------------------------------------
+
 // XResultSet methods.
-//--------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::next()
     throw ( SQLException, RuntimeException )
 {
@@ -354,7 +354,7 @@ sal_Bool SAL_CALL SortedResultSet::next()
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::isBeforeFirst()
     throw ( SQLException, RuntimeException )
 {
@@ -364,7 +364,7 @@ sal_Bool SAL_CALL SortedResultSet::isBeforeFirst()
         return sal_True;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::isAfterLast()
     throw ( SQLException, RuntimeException )
 {
@@ -374,7 +374,7 @@ sal_Bool SAL_CALL SortedResultSet::isAfterLast()
         return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::isFirst()
     throw ( SQLException, RuntimeException )
 {
@@ -384,7 +384,7 @@ sal_Bool SAL_CALL SortedResultSet::isFirst()
         return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::isLast()
     throw ( SQLException, RuntimeException )
 {
@@ -394,7 +394,7 @@ sal_Bool SAL_CALL SortedResultSet::isLast()
         return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::beforeFirst()
     throw ( SQLException, RuntimeException )
 {
@@ -403,7 +403,7 @@ void SAL_CALL SortedResultSet::beforeFirst()
     mxOriginal->beforeFirst();
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::afterLast()
     throw ( SQLException, RuntimeException )
 {
@@ -412,7 +412,7 @@ void SAL_CALL SortedResultSet::afterLast()
     mxOriginal->afterLast();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::first()
     throw ( SQLException, RuntimeException )
 {
@@ -431,7 +431,7 @@ sal_Bool SAL_CALL SortedResultSet::first()
     }
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::last()
     throw ( SQLException, RuntimeException )
 {
@@ -450,14 +450,14 @@ sal_Bool SAL_CALL SortedResultSet::last()
     }
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SortedResultSet::getRow()
     throw ( SQLException, RuntimeException )
 {
     return mnCurEntry;
 }
 
-//-------------------------------------------------------------------------
+
 /**
  moves the cursor to the given row number in the result set.
  <p>If the row number is positive, the cursor moves to the given row
@@ -524,7 +524,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row )
     }
 }
 
-//-------------------------------------------------------------------------
+
 /**
  moves the cursor a relative number of rows, either positive or negative.
  <p>
@@ -579,7 +579,7 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows )
     }
 }
 
-//-------------------------------------------------------------------------
+
 /**
  moves the cursor to the previous row in the result set.
  <p>Note: <code>previous()</code> is not the same as
@@ -612,7 +612,7 @@ sal_Bool SAL_CALL SortedResultSet::previous()
     return sal_False;
 }
 
-//-------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::refreshRow()
     throw ( SQLException, RuntimeException )
 {
@@ -626,7 +626,7 @@ void SAL_CALL SortedResultSet::refreshRow()
     mxOriginal->refreshRow();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::rowUpdated()
     throw ( SQLException, RuntimeException )
 {
@@ -640,7 +640,7 @@ sal_Bool SAL_CALL SortedResultSet::rowUpdated()
     return mxOriginal->rowUpdated();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::rowInserted()
     throw ( SQLException, RuntimeException )
 {
@@ -654,7 +654,7 @@ sal_Bool SAL_CALL SortedResultSet::rowInserted()
     return mxOriginal->rowInserted();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::rowDeleted()
     throw ( SQLException, RuntimeException )
 {
@@ -668,7 +668,7 @@ sal_Bool SAL_CALL SortedResultSet::rowDeleted()
     return mxOriginal->rowDeleted();
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XInterface > SAL_CALL SortedResultSet::getStatement()
     throw ( SQLException, RuntimeException )
 {
@@ -682,9 +682,9 @@ Reference< XInterface > SAL_CALL SortedResultSet::getStatement()
     return mxOriginal->getStatement();
 }
 
-//--------------------------------------------------------------------------
+
 // XRow methods.
-//--------------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL SortedResultSet::wasNull()
     throw( SQLException, RuntimeException )
@@ -693,7 +693,7 @@ sal_Bool SAL_CALL SortedResultSet::wasNull()
     return Reference< XRow >::query(mxOriginal)->wasNull();
 }
 
-//-------------------------------------------------------------------------
+
 OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -701,7 +701,7 @@ OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getString( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -709,7 +709,7 @@ sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getBoolean( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -717,7 +717,7 @@ sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getByte( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -725,14 +725,14 @@ sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getShort( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SortedResultSet::getInt( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
     return Reference< XRow >::query(mxOriginal)->getInt( columnIndex );
 }
-//-------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -740,7 +740,7 @@ sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getLong( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -748,7 +748,7 @@ float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getFloat( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -756,7 +756,7 @@ double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getDouble( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -764,7 +764,7 @@ Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getBytes( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -772,7 +772,7 @@ Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getDate( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -780,7 +780,7 @@ Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getTime( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -788,7 +788,7 @@ DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getTimestamp( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL
 SortedResultSet::getBinaryStream( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
@@ -797,7 +797,7 @@ SortedResultSet::getBinaryStream( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getBinaryStream( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XInputStream > SAL_CALL
 SortedResultSet::getCharacterStream( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
@@ -806,7 +806,7 @@ SortedResultSet::getCharacterStream( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getCharacterStream( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex,
                        const Reference< XNameAccess >& typeMap )
     throw( SQLException, RuntimeException )
@@ -816,7 +816,7 @@ Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex,
                                                             typeMap);
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -824,7 +824,7 @@ Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getRef( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -832,7 +832,7 @@ Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getBlob( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -840,7 +840,7 @@ Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex )
     return Reference< XRow >::query(mxOriginal)->getClob( columnIndex );
 }
 
-//-------------------------------------------------------------------------
+
 Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException )
 {
@@ -849,9 +849,9 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex )
 }
 
 
-//--------------------------------------------------------------------------
+
 // XCloseable methods.
-//--------------------------------------------------------------------------
+
 
 void SAL_CALL SortedResultSet::close()
     throw( SQLException, RuntimeException )
@@ -860,9 +860,9 @@ void SAL_CALL SortedResultSet::close()
     Reference< XCloseable >::query(mxOriginal)->close();
 }
 
-//--------------------------------------------------------------------------
+
 // XResultSetMetaDataSupplier methods.
-//--------------------------------------------------------------------------
+
 
 Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData()
     throw( SQLException, RuntimeException )
@@ -872,9 +872,9 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData()
 }
 
 
-//--------------------------------------------------------------------------
+
 // XPropertySet methods.
-//--------------------------------------------------------------------------
+
 
 Reference< XPropertySetInfo > SAL_CALL
 SortedResultSet::getPropertySetInfo() throw( RuntimeException )
@@ -890,7 +890,7 @@ SortedResultSet::getPropertySetInfo() throw( RuntimeException )
     return Reference< XPropertySetInfo >( mpPropSetInfo );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::setPropertyValue(
                         const OUString& PropertyName,
                         const Any& )
@@ -909,7 +909,7 @@ void SAL_CALL SortedResultSet::setPropertyValue(
         throw UnknownPropertyException();
 }
 
-//--------------------------------------------------------------------------
+
 Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
     throw( UnknownPropertyException,
            WrappedTargetException,
@@ -950,7 +950,7 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName )
     return aRet;
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::addPropertyChangeListener(
                         const OUString& PropertyName,
                         const Reference< XPropertyChangeListener >& Listener )
@@ -967,7 +967,7 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener(
     mpPropChangeListeners->addInterface( PropertyName, Listener );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::removePropertyChangeListener(
                         const OUString& PropertyName,
                         const Reference< XPropertyChangeListener >& Listener )
@@ -981,7 +981,7 @@ void SAL_CALL SortedResultSet::removePropertyChangeListener(
         mpPropChangeListeners->removeInterface( PropertyName, Listener );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::addVetoableChangeListener(
                         const OUString& PropertyName,
                         const Reference< XVetoableChangeListener >& Listener )
@@ -998,7 +998,7 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener(
     mpVetoChangeListeners->addInterface( PropertyName, Listener );
 }
 
-//--------------------------------------------------------------------------
+
 void SAL_CALL SortedResultSet::removeVetoableChangeListener(
                         const OUString& PropertyName,
                         const Reference< XVetoableChangeListener >& Listener )
@@ -1012,9 +1012,9 @@ void SAL_CALL SortedResultSet::removeVetoableChangeListener(
         mpVetoChangeListeners->removeInterface( PropertyName, Listener );
 }
 
-//--------------------------------------------------------------------------
+
 // private methods
-//--------------------------------------------------------------------------
+
 sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne,
                                    Reference < XResultSet > xResultTwo,
                                    sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo,
@@ -1229,7 +1229,7 @@ sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne,
     return nCompare;
 }
 
-//--------------------------------------------------------------------------
+
 sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne,
                                    Reference < XResultSet > xResultTwo,
                                    sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo )
@@ -1271,7 +1271,7 @@ sal_IntPtr SortedResultSet::CompareImpl( Reference < XResultSet > xResultOne,
     return nCompare;
 }
 
-//--------------------------------------------------------------------------
+
 sal_IntPtr SortedResultSet::Compare( SortListData *pOne,
                                SortListData *pTwo )
     throw( SQLException, RuntimeException )
@@ -1310,7 +1310,7 @@ sal_IntPtr SortedResultSet::Compare( SortListData *pOne,
     return nCompare;
 }
 
-//--------------------------------------------------------------------------
+
 sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry,
                                sal_IntPtr _nStart, sal_IntPtr _nEnd )
     throw( SQLException, RuntimeException )
@@ -1345,7 +1345,7 @@ sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry,
         return nMid+1;
 }
 
-//--------------------------------------------------------------------------
+
 void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
@@ -1383,11 +1383,11 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt )
     }
 }
 
-//-------------------------------------------------------------------------
 
-//--------------------------------------------------------------------------
+
+
 // public methods
-//--------------------------------------------------------------------------
+
 
 void SortedResultSet::CopyData( SortedResultSet *pSource )
 {
@@ -1421,7 +1421,7 @@ void SortedResultSet::CopyData( SortedResultSet *pSource )
     }
 }
 
-//--------------------------------------------------------------------------
+
 void SortedResultSet::Initialize(
                 const Sequence < NumberedSortingInfo > &xSortInfo,
                 const Reference< XAnyCompareFactory > &xCompFactory )
@@ -1469,7 +1469,7 @@ void SortedResultSet::Initialize(
     mnCount = maS2O.Count() - 1;
 }
 
-//--------------------------------------------------------------------------
+
 void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal )
 {
     osl::Guard< osl::Mutex > aGuard( maMutex );
@@ -1509,7 +1509,7 @@ void SortedResultSet::CheckProperties( sal_IntPtr nOldCount, sal_Bool bWasFinal
     catch (const WrappedTargetException&) {}
 }
 
-//-------------------------------------------------------------------------
+
 void SortedResultSet::InsertNew( sal_IntPtr nPos, sal_IntPtr nCount )
 {
     // for all entries in the msS20-list, which are >= nPos, increase by nCount
@@ -1540,7 +1540,7 @@ void SortedResultSet::InsertNew( sal_IntPtr nPos, sal_IntPtr nCount )
     mnCount += nCount;
 }
 
-//-------------------------------------------------------------------------
+
 void SortedResultSet::Remove( sal_IntPtr nPos, sal_IntPtr nCount, EventList *pEvents )
 {
     sal_uInt32  i, j;
@@ -1594,7 +1594,7 @@ void SortedResultSet::Remove( sal_IntPtr nPos, sal_IntPtr nCount, EventList *pEv
     mnCount -= nCount;
 }
 
-//-------------------------------------------------------------------------
+
 void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr nOffset )
 {
     if ( !nOffset )
@@ -1672,7 +1672,7 @@ void SortedResultSet::Move( sal_IntPtr nPos, sal_IntPtr nCount, sal_IntPtr nOffs
     delete [] pTmpArr;
 }
 
-//--------------------------------------------------------------------------
+
 void SortedResultSet::BuildSortInfo(
                 Reference< XResultSet > aResult,
                 const Sequence < NumberedSortingInfo > &xSortInfo,
@@ -1723,7 +1723,7 @@ void SortedResultSet::BuildSortInfo(
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SortedResultSet::SetChanged( sal_IntPtr nPos, sal_IntPtr nCount )
 {
     for ( sal_IntPtr i=0; i<nCount; i++ )
@@ -1742,7 +1742,7 @@ void SortedResultSet::SetChanged( sal_IntPtr nPos, sal_IntPtr nCount )
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SortedResultSet::ResortModified( EventList* pList )
 {
     sal_uInt32 i, j;
@@ -1813,7 +1813,7 @@ void SortedResultSet::ResortModified( EventList* pList )
     maModList.Clear();
 }
 
-//-------------------------------------------------------------------------
+
 void SortedResultSet::ResortNew( EventList* pList )
 {
     sal_IntPtr            i, j, nNewPos, nVal;
@@ -1847,11 +1847,11 @@ void SortedResultSet::ResortNew( EventList* pList )
     }
 }
 
-//-------------------------------------------------------------------------
+
 //
 // SortListData
 //
-//-------------------------------------------------------------------------
+
 SortListData::SortListData( sal_IntPtr nPos, sal_Bool bModified )
 {
     mbModified = bModified;
@@ -1872,7 +1872,7 @@ void SortedEntryList::Clear()
     maData.clear();
 }
 
-//-------------------------------------------------------------------------
+
 void SortedEntryList::Insert( SortListData *pEntry, sal_IntPtr nPos )
 {
     if ( nPos < (sal_IntPtr) maData.size() )
@@ -1881,7 +1881,7 @@ void SortedEntryList::Insert( SortListData *pEntry, sal_IntPtr nPos )
         maData.push_back( pEntry );
 }
 
-//-------------------------------------------------------------------------
+
 SortListData* SortedEntryList::Remove( sal_IntPtr nPos )
 {
     SortListData *pData;
@@ -1897,7 +1897,7 @@ SortListData* SortedEntryList::Remove( sal_IntPtr nPos )
     return pData;
 }
 
-//-------------------------------------------------------------------------
+
 SortListData* SortedEntryList::GetData( sal_IntPtr nPos )
 {
     SortListData *pData;
@@ -1910,7 +1910,7 @@ SortListData* SortedEntryList::GetData( sal_IntPtr nPos )
     return pData;
 }
 
-//-------------------------------------------------------------------------
+
 sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const
 {
     SortListData *pData;
@@ -1935,9 +1935,9 @@ sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const
     }
 }
 
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
-//-------------------------------------------------------------------------
+
+
+
 void SimpleList::Remove( sal_uInt32 nPos )
 {
     if ( nPos < (sal_uInt32) maData.size() )
@@ -1946,7 +1946,7 @@ void SimpleList::Remove( sal_uInt32 nPos )
     }
 }
 
-//-------------------------------------------------------------------------
+
 void SimpleList::Remove( void* pData )
 {
     sal_Bool    bFound = sal_False;
@@ -1965,7 +1965,7 @@ void SimpleList::Remove( void* pData )
         maData.erase( maData.begin() + i );
 }
 
-//-------------------------------------------------------------------------
+
 void SimpleList::Insert( void* pData, sal_uInt32 nPos )
 {
     if ( nPos < (sal_uInt32) maData.size() )
@@ -1974,7 +1974,7 @@ void SimpleList::Insert( void* pData, sal_uInt32 nPos )
         maData.push_back( pData );
 }
 
-//-------------------------------------------------------------------------
+
 void* SimpleList::GetObject( sal_uInt32 nPos ) const
 {
     if ( nPos < (sal_uInt32) maData.size() )
@@ -1983,18 +1983,18 @@ void* SimpleList::GetObject( sal_uInt32 nPos ) const
         return NULL;
 }
 
-//-------------------------------------------------------------------------
+
 void SimpleList::Replace( void* pData, sal_uInt32 nPos )
 {
     if ( nPos < (sal_uInt32) maData.size() )
         maData[ nPos ] = pData;
 }
 
-//-------------------------------------------------------------------------
+
 //
 // class SRSPropertySetInfo.
 //
-//-------------------------------------------------------------------------
+
 
 SRSPropertySetInfo::SRSPropertySetInfo()
 {
@@ -2009,36 +2009,36 @@ SRSPropertySetInfo::SRSPropertySetInfo()
     maProps[1].Attributes = -1;
 }
 
-//-------------------------------------------------------------------------
+
 SRSPropertySetInfo::~SRSPropertySetInfo()
 {}
 
-//-------------------------------------------------------------------------
+
 // XInterface methods.
-//-------------------------------------------------------------------------
+
 
 XINTERFACE_IMPL_2( SRSPropertySetInfo,
                    XTypeProvider,
                    XPropertySetInfo );
 
-//-------------------------------------------------------------------------
+
 // XTypeProvider methods.
-//-------------------------------------------------------------------------
+
 
 XTYPEPROVIDER_IMPL_2( SRSPropertySetInfo,
                       XTypeProvider,
                       XPropertySetInfo );
 
-//-------------------------------------------------------------------------
+
 // XPropertySetInfo methods.
-//-------------------------------------------------------------------------
+
 Sequence< Property > SAL_CALL
 SRSPropertySetInfo::getProperties() throw( RuntimeException )
 {
     return Sequence < Property > ( maProps, 2 );
 }
 
-//-------------------------------------------------------------------------
+
 Property SAL_CALL
 SRSPropertySetInfo::getPropertyByName( const OUString& Name )
     throw( UnknownPropertyException, RuntimeException )
@@ -2051,7 +2051,7 @@ SRSPropertySetInfo::getPropertyByName( const OUString& Name )
         throw UnknownPropertyException();
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool SAL_CALL
 SRSPropertySetInfo::hasPropertyByName( const OUString& Name )
     throw( RuntimeException )
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 384133e3945e..ae4b4847fb8a 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -89,7 +89,7 @@ public:
         throw (uno::RuntimeException);
 };
 
-//______________________________________________________________________________
+
 inline void ExpandContentProviderImpl::check() const
 {
     // xxx todo guard?
@@ -104,12 +104,12 @@ inline void ExpandContentProviderImpl::check() const
     }
 }
 
-//______________________________________________________________________________
+
 ExpandContentProviderImpl::~ExpandContentProviderImpl() throw ()
 {
 }
 
-//______________________________________________________________________________
+
 void ExpandContentProviderImpl::disposing()
 {
 }
@@ -140,7 +140,7 @@ static uno::Sequence< OUString > SAL_CALL supportedServices()
 }
 
 // XServiceInfo
-//______________________________________________________________________________
+
 OUString ExpandContentProviderImpl::getImplementationName()
     throw (uno::RuntimeException)
 {
@@ -148,7 +148,7 @@ OUString ExpandContentProviderImpl::getImplementationName()
     return implName();
 }
 
-//______________________________________________________________________________
+
 uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames()
     throw (uno::RuntimeException)
 {
@@ -183,7 +183,7 @@ OUString ExpandContentProviderImpl::expandUri(
 }
 
 // XContentProvider
-//______________________________________________________________________________
+
 uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent(
     uno::Reference< ucb::XContentIdentifier > const & xIdentifier )
     throw (ucb::IllegalIdentifierException, uno::RuntimeException)
@@ -204,7 +204,7 @@ uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent(
     }
 }
 
-//______________________________________________________________________________
+
 sal_Int32 ExpandContentProviderImpl::compareContentIds(
     uno::Reference< ucb::XContentIdentifier > const & xId1,
     uno::Reference< ucb::XContentIdentifier > const & xId2 )
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 2e5b7658a717..2b9a16f96781 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -100,7 +100,7 @@ namespace ucb { namespace ucp { namespace ext
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL )
         {
             ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL );
@@ -112,7 +112,7 @@ namespace ucb { namespace ucp { namespace ext
             return aComposer.makeStringAndClear();
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         struct SelectPropertyName : public ::std::unary_function< Property, OUString >
         {
             const OUString& operator()( const Property& i_rProperty ) const
@@ -125,7 +125,7 @@ namespace ucb { namespace ucp { namespace ext
     //==================================================================================================================
     //= Content
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     Content::Content( const Reference< XComponentContext >& rxContext, ::ucbhelper::ContentProviderImplHelper* i_pProvider,
                       const Reference< XContentIdentifier >& i_rIdentifier )
         :Content_Base( rxContext, i_pProvider, i_rIdentifier )
@@ -169,18 +169,18 @@ namespace ucb { namespace ucp { namespace ext
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Content::~Content()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL Content::getImplementationName() throw( RuntimeException )
     {
         return OUString(  "org.openoffice.comp.ucp.ext.Content"  );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException )
     {
         Sequence< OUString > aServiceNames(2);
@@ -189,14 +189,14 @@ namespace ucb { namespace ucp { namespace ext
         return aServiceNames;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL Content::getContentType() throw( RuntimeException )
     {
         impl_determineContentType();
         return *m_aContentType;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment )
         throw( Exception, CommandAbortedException, RuntimeException )
     {
@@ -288,25 +288,25 @@ namespace ucb { namespace ucp { namespace ext
         return aRet;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString Content::encodeIdentifier( const OUString& i_rIdentifier )
     {
         return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes,
             RTL_TEXTENCODING_UTF8 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString Content::decodeIdentifier( const OUString& i_rIdentifier )
     {
         return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool Content::denotesRootContent( const OUString& i_rContentIdentifier )
     {
         const OUString sRootURL( ContentProvider::getRootURL() );
@@ -323,7 +323,7 @@ namespace ucb { namespace ucp { namespace ext
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString Content::getParentURL()
     {
         const OUString sRootURL( ContentProvider::getRootURL() );
@@ -389,7 +389,7 @@ namespace ucb { namespace ucp { namespace ext
         return OUString();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XComponentContext >& rxContext,
         const Sequence< Property >& i_rProperties, const OUString& i_rTitle )
     {
@@ -458,7 +458,7 @@ namespace ucb { namespace ucp { namespace ext
         return Reference< XRow >( xRow.get() );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString Content::getPhysicalURL() const
     {
         ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", OUString() );
@@ -472,7 +472,7 @@ namespace ucb { namespace ucp { namespace ext
         return lcl_compose( sPackageLocation, m_sPathIntoExtension );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XRow > Content::getPropertyValues( const Sequence< Property >& i_rProperties, const Reference< XCommandEnvironment >& i_rEnv )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex );
@@ -518,7 +518,7 @@ namespace ucb { namespace ucp { namespace ext
         return NULL;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< Any > Content::setPropertyValues( const Sequence< PropertyValue >& i_rValues, const Reference< XCommandEnvironment >& /* xEnv */)
     {
         ::osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -542,7 +542,7 @@ namespace ucb { namespace ucp { namespace ext
         return aRet;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< CommandInfo > Content::getCommands( const Reference< XCommandEnvironment > & /*xEnv*/ )
     {
         sal_uInt32 nCommandCount = 5;
@@ -586,7 +586,7 @@ namespace ucb { namespace ucp { namespace ext
         return Sequence< CommandInfo >( aCommandInfoTable, nCommandCount );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< Property > Content::getProperties( const Reference< XCommandEnvironment > & /*xEnv*/ )
     {
         static const Property aProperties[] =
@@ -619,7 +619,7 @@ namespace ucb { namespace ucp { namespace ext
         return Sequence< Property >( aProperties, sizeof( aProperties ) / sizeof( aProperties[0] ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool Content::impl_isFolder()
     {
         if ( !!m_aIsFolder )
@@ -641,7 +641,7 @@ namespace ucb { namespace ucp { namespace ext
         return *m_aIsFolder;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void Content::impl_determineContentType()
     {
         if ( !!m_aContentType )
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index 3c2d80ef34ca..20e9409ef68d 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -98,7 +98,7 @@ namespace ucb { namespace ucp { namespace ext
         ~DataSupplier_Impl();
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DataSupplier_Impl::~DataSupplier_Impl()
     {
     }
@@ -124,7 +124,7 @@ namespace ucb { namespace ucp { namespace ext
     //==================================================================================================================
     //= DataSupplier
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     DataSupplier::DataSupplier( const Reference< XComponentContext >& rxContext,
                                 const ::rtl::Reference< Content >& i_rContent,
                                 const sal_Int32 i_nOpenMode )
@@ -132,7 +132,7 @@ namespace ucb { namespace ucp { namespace ext
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DataSupplier::fetchData()
     {
         try
@@ -195,12 +195,12 @@ namespace ucb { namespace ucp { namespace ext
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     DataSupplier::~DataSupplier()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -216,7 +216,7 @@ namespace ucb { namespace ucp { namespace ext
         return OUString();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 i_nIndex )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -239,7 +239,7 @@ namespace ucb { namespace ucp { namespace ext
         return Reference< XContentIdentifier >();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XContent > DataSupplier::queryContent( sal_uInt32 i_nIndex )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -271,7 +271,7 @@ namespace ucb { namespace ucp { namespace ext
         return Reference< XContent >();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DataSupplier::getResult( sal_uInt32 i_nIndex )
     {
         ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -283,26 +283,26 @@ namespace ucb { namespace ucp { namespace ext
         return false;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_uInt32 DataSupplier::totalCount()
     {
         ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
         return m_pImpl->m_aResults.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     sal_uInt32 DataSupplier::currentCount()
     {
         return m_pImpl->m_aResults.size();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     bool DataSupplier::isCountFinal()
     {
         return true;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XRow > DataSupplier::queryPropertyValues( sal_uInt32 i_nIndex  )
     {
         ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
@@ -343,7 +343,7 @@ namespace ucb { namespace ucp { namespace ext
         return xRow;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DataSupplier::releasePropertyValues( sal_uInt32 i_nIndex )
     {
         ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -352,12 +352,12 @@ namespace ucb { namespace ucp { namespace ext
             m_pImpl->m_aResults[ i_nIndex ].xRow.clear();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DataSupplier::close()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void DataSupplier::validate() throw( ResultSetException )
     {
     }
diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx
index 66d3e4b72535..05b83dcaae25 100644
--- a/ucb/source/ucp/ext/ucpext_provider.cxx
+++ b/ucb/source/ucp/ext/ucpext_provider.cxx
@@ -50,30 +50,30 @@ namespace ucb { namespace ucp { namespace ext
     //==================================================================================================================
     //= ContentProvider
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ContentProvider::ContentProvider( const Reference< XComponentContext >& rxContext )
         :ContentProvider_Base( rxContext )
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     ContentProvider::~ContentProvider()
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException)
     {
         return OUString(  "org.openoffice.comp.ucp.ext.ContentProvider"  );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException)
     {
         return getImplementationName_static();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static(  ) throw (RuntimeException)
     {
         Sequence< OUString > aServiceNames(2);
@@ -82,31 +82,31 @@ namespace ucb { namespace ucp { namespace ext
         return aServiceNames;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XInterface > ContentProvider::Create( const Reference< XComponentContext >& i_rContext )
     {
         return *( new ContentProvider( i_rContext ) );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString ContentProvider::getRootURL()
     {
         return OUString(  "vnd.sun.star.extension://"  );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     OUString ContentProvider::getArtificialNodeContentType()
     {
         return OUString(  "application/vnd.sun.star.extension-content"  );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     namespace
     {
         void lcl_ensureAndTransfer( OUString& io_rIdentifierFragment, OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar )
@@ -118,7 +118,7 @@ namespace ucb { namespace ucp { namespace ext
         }
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier  >& i_rIdentifier )
         throw( IllegalIdentifierException, RuntimeException )
     {
diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx
index 432f2a014507..415e0ceab799 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.cxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.cxx
@@ -49,7 +49,7 @@ namespace ucb { namespace ucp { namespace ext
     //==================================================================================================================
     //= ResultSet
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     ResultSet::ResultSet( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent,
             const OpenCommandArgument2& i_rCommand, const Reference< XCommandEnvironment >& i_rEnv )
         :ResultSetImplHelper( rxContext, i_rCommand )
@@ -58,7 +58,7 @@ namespace ucb { namespace ucp { namespace ext
     {
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ResultSet::initStatic()
     {
         ::rtl::Reference< DataSupplier > pDataSupplier( new DataSupplier(
@@ -75,7 +75,7 @@ namespace ucb { namespace ucp { namespace ext
         pDataSupplier->fetchData();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void ResultSet::initDynamic()
     {
         initStatic();
diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx
index bbb64b4815b8..8b2388fdb920 100644
--- a/ucb/source/ucp/ext/ucpext_services.cxx
+++ b/ucb/source/ucp/ext/ucpext_services.cxx
@@ -59,7 +59,7 @@ namespace ucb { namespace ucp { namespace ext
 
 extern "C"
 {
-    //------------------------------------------------------------------------------------------------------------------
+
     SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
     {
         return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries );
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.cxx b/ucb/source/ucp/gvfs/gvfs_stream.cxx
index 080d484dfb47..8fc6898bea7b 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.cxx
@@ -61,9 +61,9 @@ Any Stream::queryInterface( const Type &type )
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type );
 }
 
-// -------------------------------------------------------------------
+
 //                            XStream
-// -------------------------------------------------------------------
+
 
 com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL
 Stream::getInputStream(  )
@@ -87,9 +87,9 @@ Stream::getOutputStream(  )
     return Reference< XOutputStream >( this );
 }
 
-// -------------------------------------------------------------------
+
 //                            XInputStream
-// -------------------------------------------------------------------
+
 
 sal_Int32 SAL_CALL Stream::readBytes(
     Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
@@ -184,9 +184,9 @@ void SAL_CALL Stream::closeInput( void )
         closeStream();
 }
 
-// -------------------------------------------------------------------
+
 //                            XSeekable
-// -------------------------------------------------------------------
+
 
 void SAL_CALL Stream::seek( sal_Int64 location )
         throw( ::com::sun::star::lang::IllegalArgumentException,
@@ -236,9 +236,9 @@ sal_Int64 SAL_CALL Stream::getLength()
     }
 }
 
-// -------------------------------------------------------------------
+
 //                            XTruncate
-// -------------------------------------------------------------------
+
 
 void SAL_CALL Stream::truncate( void )
     throw( com::sun::star::io::IOException,
@@ -250,9 +250,9 @@ void SAL_CALL Stream::truncate( void )
     throwOnError( gnome_vfs_truncate_handle( m_handle, 0 ) );
 }
 
-// -------------------------------------------------------------------
+
 //                            XOutputStream
-// -------------------------------------------------------------------
+
 
 void SAL_CALL Stream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& aData )
     throw( com::sun::star::io::NotConnectedException,
@@ -298,9 +298,9 @@ void SAL_CALL Stream::closeOutput( void )
         closeStream();
 }
 
-// -------------------------------------------------------------------
+
 //                            Misc.
-// -------------------------------------------------------------------
+
 
 void Stream::closeStream( void )
     throw( ::com::sun::star::io::NotConnectedException,
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index 7d29a241dcb9..be216215127d 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -47,7 +47,7 @@ const OUString DAVProperties::SUPPORTEDLOCK =
 const OUString DAVProperties::EXECUTABLE =
                 OUString( "http://apache.org/dav/props/executable" );
 
-// -------------------------------------------------------------------
+
 // static
 void DAVProperties::createSerfPropName( const OUString & rFullName,
                                         SerfPropName & rName )
@@ -107,7 +107,7 @@ void DAVProperties::createSerfPropName( const OUString & rFullName,
     }
 }
 
-// -------------------------------------------------------------------
+
 // static
 void DAVProperties::createUCBPropName( const char * nspace,
                                        const char * name,
@@ -170,7 +170,7 @@ void DAVProperties::createUCBPropName( const char * nspace,
     }
 }
 
-// -------------------------------------------------------------------
+
 // static
 bool DAVProperties::isUCBDeadProperty( const SerfPropName & rName )
 {
diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx
index 4276900b3820..94aaa0b6892b 100644
--- a/ucb/source/ucp/webdav/SerfInputStream.cxx
+++ b/ucb/source/ucp/webdav/SerfInputStream.cxx
@@ -27,26 +27,26 @@ using namespace com::sun::star::uno;
 using namespace http_dav_ucp;
 
 
-// -------------------------------------------------------------------
+
 // Constructor
-// -------------------------------------------------------------------
+
 SerfInputStream::SerfInputStream( void )
 : mLen( 0 ),
   mPos( 0 )
 {
 }
 
-// -------------------------------------------------------------------
+
 // Destructor
-// -------------------------------------------------------------------
+
 SerfInputStream::~SerfInputStream( void )
 {
 }
 
-// -------------------------------------------------------------------
+
 // AddToStream
 // Allows the caller to add some data to the "end" of the stream
-// -------------------------------------------------------------------
+
 void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
 {
     mInputBuffer.realloc( sal::static_int_cast<sal_Int32>(mLen) + inLen );
@@ -54,9 +54,9 @@ void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen )
     mLen += inLen;
 }
 
-// -------------------------------------------------------------------
+
 // queryInterface
-// -------------------------------------------------------------------
+
 Any SerfInputStream::queryInterface( const Type &type )
                         throw( RuntimeException )
 {
@@ -66,10 +66,10 @@ Any SerfInputStream::queryInterface( const Type &type )
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( type );
 }
 
-// -------------------------------------------------------------------
+
 // readBytes
 // "Reads" the specified number of bytes from the stream
-// -------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SerfInputStream::readBytes(
   ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
         throw( ::com::sun::star::io::NotConnectedException,
@@ -96,9 +96,9 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes(
     return theBytes2Read;
 }
 
-// -------------------------------------------------------------------
+
 // readSomeBytes
-// -------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SerfInputStream::readSomeBytes(
  ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
         throw( ::com::sun::star::io::NotConnectedException,
@@ -110,10 +110,10 @@ sal_Int32 SAL_CALL SerfInputStream::readSomeBytes(
     return readBytes( aData, nMaxBytesToRead );
 }
 
-// -------------------------------------------------------------------
+
 // skipBytes
 // Moves the current stream position forward
-// -------------------------------------------------------------------
+
 void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip )
         throw( ::com::sun::star::io::NotConnectedException,
                ::com::sun::star::io::BufferSizeExceededException,
@@ -125,10 +125,10 @@ void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip )
         mPos = mLen;
 }
 
-// -------------------------------------------------------------------
+
 // available
 // Returns the number of unread bytes currently remaining on the stream
-// -------------------------------------------------------------------
+
 sal_Int32 SAL_CALL SerfInputStream::available(  )
         throw( ::com::sun::star::io::NotConnectedException,
                ::com::sun::star::io::IOException,
@@ -137,9 +137,9 @@ sal_Int32 SAL_CALL SerfInputStream::available(  )
     return sal::static_int_cast<sal_Int32>(mLen - mPos);
 }
 
-// -------------------------------------------------------------------
+
 // closeInput
-// -------------------------------------------------------------------
+
 void SAL_CALL SerfInputStream::closeInput( void )
         throw( ::com::sun::star::io::NotConnectedException,
                ::com::sun::star::io::IOException,
@@ -147,9 +147,9 @@ void SAL_CALL SerfInputStream::closeInput( void )
 {
 }
 
-// -------------------------------------------------------------------
+
 // seek
-// -------------------------------------------------------------------
+
 void SAL_CALL SerfInputStream::seek( sal_Int64 location )
         throw( ::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::io::IOException,
@@ -164,9 +164,9 @@ void SAL_CALL SerfInputStream::seek( sal_Int64 location )
         throw ::com::sun::star::lang::IllegalArgumentException();
 }
 
-// -------------------------------------------------------------------
+
 // getPosition
-// -------------------------------------------------------------------
+
 sal_Int64 SAL_CALL SerfInputStream::getPosition()
         throw( ::com::sun::star::io::IOException,
                ::com::sun::star::uno::RuntimeException )
@@ -174,9 +174,9 @@ sal_Int64 SAL_CALL SerfInputStream::getPosition()
     return mPos;
 }
 
-// -------------------------------------------------------------------
+
 // getLength
-// -------------------------------------------------------------------
+
 sal_Int64 SAL_CALL SerfInputStream::getLength()
         throw( ::com::sun::star::io::IOException,
                ::com::sun::star::uno::RuntimeException )
diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx
index 80dcd60ca0cd..7cf3cdf6157d 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.cxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.cxx
@@ -48,7 +48,7 @@ protected:
 
 } // namespace http_dav_ucp
 
-// -------------------------------------------------------------------
+
 void TickerThread::run()
 {
     OSL_TRACE( "TickerThread: start." );
@@ -74,7 +74,7 @@ void TickerThread::run()
     OSL_TRACE( "TickerThread: stop." );
 }
 
-// -------------------------------------------------------------------
+
 SerfLockStore::SerfLockStore()
     : m_pSerfLockStore( ne_lockstore_create() ),
       m_pTickerThread( 0 )
@@ -82,7 +82,7 @@ SerfLockStore::SerfLockStore()
     OSL_ENSURE( m_pSerfLockStore, "Unable to create neon lock store!" );
 }
 
-// -------------------------------------------------------------------
+
 SerfLockStore::~SerfLockStore()
 {
     stopTicker();
@@ -107,7 +107,7 @@ SerfLockStore::~SerfLockStore()
     ne_lockstore_destroy( m_pSerfLockStore );
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::startTicker()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -119,7 +119,7 @@ void SerfLockStore::startTicker()
     }
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::stopTicker()
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -133,7 +133,7 @@ void SerfLockStore::stopTicker()
     }
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::registerSession( HttpSession * pHttpSession )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -141,7 +141,7 @@ void SerfLockStore::registerSession( HttpSession * pHttpSession )
     ne_lockstore_register( m_pSerfLockStore, pHttpSession );
 }
 
-// -------------------------------------------------------------------
+
 SerfLock * SerfLockStore::findByUri( OUString const & rUri )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -152,7 +152,7 @@ SerfLock * SerfLockStore::findByUri( OUString const & rUri )
     return ne_lockstore_findbyuri( m_pSerfLockStore, &aUri );
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::addLock( SerfLock * pLock,
                              rtl::Reference< SerfSession > const & xSession,
                              sal_Int32 nLastChanceToSendRefreshRequest )
@@ -166,7 +166,7 @@ void SerfLockStore::addLock( SerfLock * pLock,
     startTicker();
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::updateLock( SerfLock * pLock,
                                 sal_Int32 nLastChanceToSendRefreshRequest )
 {
@@ -183,7 +183,7 @@ void SerfLockStore::updateLock( SerfLock * pLock,
     }
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::removeLock( SerfLock * pLock )
 {
     osl::MutexGuard aGuard( m_aMutex );
@@ -195,7 +195,7 @@ void SerfLockStore::removeLock( SerfLock * pLock )
         stopTicker();
 }
 
-// -------------------------------------------------------------------
+
 void SerfLockStore::refreshLocks()
 {
     osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index bb8c6e17d4da..b83689070d84 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -54,13 +54,13 @@ using namespace com::sun::star;
 using namespace http_dav_ucp;
 
 
-// -------------------------------------------------------------------
+
 // static members!
 //SerfLockStore SerfSession::m_aSerfLockStore;
 
-// -------------------------------------------------------------------
+
 // Constructor
-// -------------------------------------------------------------------
+
 SerfSession::SerfSession(
         const rtl::Reference< DAVSessionFactory > & rSessionFactory,
         const OUString& inUri,
@@ -84,9 +84,9 @@ SerfSession::SerfSession(
     m_pSerfBucket_Alloc = serf_bucket_allocator_create( getAprPool(), NULL, NULL );
 }
 
-// -------------------------------------------------------------------
+
 // Destructor
-// -------------------------------------------------------------------
+
 SerfSession::~SerfSession( )
 {
     if ( m_pSerfConnection )
@@ -96,7 +96,7 @@ SerfSession::~SerfSession( )
     }
 }
 
-// -------------------------------------------------------------------
+
 void SerfSession::Init( const DAVRequestEnvironment & rEnv )
   throw ( DAVException )
 {
@@ -105,7 +105,7 @@ void SerfSession::Init( const DAVRequestEnvironment & rEnv )
     Init();
 }
 
-// -------------------------------------------------------------------
+
 void SerfSession::Init()
     throw ( DAVException )
 {
@@ -220,7 +220,7 @@ char* SerfSession::getHostinfo()
 }
 
 
-// -------------------------------------------------------------------
+
 // virtual
 sal_Bool SerfSession::CanUse( const OUString & inUri )
 {
@@ -241,7 +241,7 @@ sal_Bool SerfSession::CanUse( const OUString & inUri )
     return sal_False;
 }
 
-// -------------------------------------------------------------------
+
 // virtual
 sal_Bool SerfSession::UsesProxy()
 {
@@ -346,7 +346,7 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA
 }
 
 namespace {
-    // -------------------------------------------------------------------
+
     // Helper function
     OUString GetHostnamePart( const OUString& _rRawString )
     {
@@ -601,9 +601,9 @@ SerfRequestProcessor* SerfSession::createReqProc( const OUString & inPath )
                                      m_bUseChunkedEncoding );
 }
 
-// -------------------------------------------------------------------
+
 // PROPFIND - allprop & named
-// -------------------------------------------------------------------
+
 void SerfSession::PROPFIND( const OUString & inPath,
                             const Depth inDepth,
                             const std::vector< OUString > & inPropNames,
@@ -632,9 +632,9 @@ void SerfSession::PROPFIND( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // PROPFIND - propnames
-// -------------------------------------------------------------------
+
 void SerfSession::PROPFIND( const OUString & inPath,
                             const Depth inDepth,
                             std::vector< DAVResourceInfo > & ioResInfo,
@@ -661,9 +661,9 @@ void SerfSession::PROPFIND( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // PROPPATCH
-// -------------------------------------------------------------------
+
 void SerfSession::PROPPATCH( const OUString & inPath,
                              const std::vector< ProppatchValue > & inValues,
                              const DAVRequestEnvironment & rEnv )
@@ -681,9 +681,9 @@ void SerfSession::PROPPATCH( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // HEAD
-// -------------------------------------------------------------------
+
 void SerfSession::HEAD( const OUString & inPath,
                         const std::vector< OUString > & inHeaderNames,
                         DAVResource & ioResource,
@@ -709,9 +709,9 @@ void SerfSession::HEAD( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // GET
-// -------------------------------------------------------------------
+
 uno::Reference< io::XInputStream >
 SerfSession::GET( const OUString & inPath,
                   const DAVRequestEnvironment & rEnv )
@@ -732,9 +732,9 @@ SerfSession::GET( const OUString & inPath,
     return uno::Reference< io::XInputStream >( xInputStream.get() );
 }
 
-// -------------------------------------------------------------------
+
 // GET
-// -------------------------------------------------------------------
+
 void SerfSession::GET( const OUString & inPath,
                        uno::Reference< io::XOutputStream > & ioOutputStream,
                        const DAVRequestEnvironment & rEnv )
@@ -752,9 +752,9 @@ void SerfSession::GET( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // GET
-// -------------------------------------------------------------------
+
 uno::Reference< io::XInputStream >
 SerfSession::GET( const OUString & inPath,
                   const std::vector< OUString > & inHeaderNames,
@@ -782,9 +782,9 @@ SerfSession::GET( const OUString & inPath,
 }
 
 
-// -------------------------------------------------------------------
+
 // GET
-// -------------------------------------------------------------------
+
 void SerfSession::GET( const OUString & inPath,
                        uno::Reference< io::XOutputStream > & ioOutputStream,
                        const std::vector< OUString > & inHeaderNames,
@@ -808,9 +808,9 @@ void SerfSession::GET( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // PUT
-// -------------------------------------------------------------------
+
 void SerfSession::PUT( const OUString & inPath,
                        const uno::Reference< io::XInputStream > & inInputStream,
                        const DAVRequestEnvironment & rEnv )
@@ -832,9 +832,9 @@ void SerfSession::PUT( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // POST
-// -------------------------------------------------------------------
+
 uno::Reference< io::XInputStream >
 SerfSession::POST( const OUString & inPath,
                    const OUString & rContentType,
@@ -867,9 +867,9 @@ SerfSession::POST( const OUString & inPath,
     return uno::Reference< io::XInputStream >( xInputStream.get() );
 }
 
-// -------------------------------------------------------------------
+
 // POST
-// -------------------------------------------------------------------
+
 void SerfSession::POST( const OUString & inPath,
                         const OUString & rContentType,
                         const OUString & rReferer,
@@ -900,9 +900,9 @@ void SerfSession::POST( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // MKCOL
-// -------------------------------------------------------------------
+
 void SerfSession::MKCOL( const OUString & inPath,
                          const DAVRequestEnvironment & rEnv )
     throw ( DAVException )
@@ -918,9 +918,9 @@ void SerfSession::MKCOL( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // COPY
-// -------------------------------------------------------------------
+
 void SerfSession::COPY( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
@@ -941,9 +941,9 @@ void SerfSession::COPY( const OUString & inSourceURL,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // MOVE
-// -------------------------------------------------------------------
+
 void SerfSession::MOVE( const OUString & inSourceURL,
                         const OUString & inDestinationURL,
                         const DAVRequestEnvironment & rEnv,
@@ -964,9 +964,9 @@ void SerfSession::MOVE( const OUString & inSourceURL,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 // DESTROY
-// -------------------------------------------------------------------
+
 void SerfSession::DESTROY( const OUString & inPath,
                            const DAVRequestEnvironment & rEnv )
     throw ( DAVException )
@@ -982,7 +982,7 @@ void SerfSession::DESTROY( const OUString & inPath,
     HandleError( aReqProc );
 }
 
-// -------------------------------------------------------------------
+
 /*
 namespace
 {
@@ -1013,9 +1013,9 @@ namespace
 
 } // namespace
 */
-// -------------------------------------------------------------------
+
 // LOCK (set new lock)
-// -------------------------------------------------------------------
+
 void SerfSession::LOCK( const OUString & inPath,
                         ucb::Lock & /*rLock*/,
                         const DAVRequestEnvironment & rEnv )
@@ -1112,9 +1112,9 @@ void SerfSession::LOCK( const OUString & inPath,
     */
 }
 
-// -------------------------------------------------------------------
+
 // LOCK (refresh existing lock)
-// -------------------------------------------------------------------
+
 sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/,
                              sal_Int64 nTimeout,
                              const DAVRequestEnvironment & /*rEnv*/ )
@@ -1153,9 +1153,9 @@ sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/,
     */
 }
 
-// -------------------------------------------------------------------
+
 // LOCK (refresh existing lock)
-// -------------------------------------------------------------------
+
 bool SerfSession::LOCK( SerfLock * /*pLock*/,
                         sal_Int32 & /*rlastChanceToSendRefreshRequest*/ )
 {
@@ -1184,9 +1184,9 @@ bool SerfSession::LOCK( SerfLock * /*pLock*/,
     */
 }
 
-// -------------------------------------------------------------------
+
 // UNLOCK
-// -------------------------------------------------------------------
+
 void SerfSession::UNLOCK( const OUString & /*inPath*/,
                           const DAVRequestEnvironment & /*rEnv*/ )
     throw ( DAVException )
@@ -1220,9 +1220,9 @@ void SerfSession::UNLOCK( const OUString & /*inPath*/,
     */
 }
 
-// -------------------------------------------------------------------
+
 // UNLOCK
-// -------------------------------------------------------------------
+
 bool SerfSession::UNLOCK( SerfLock * /*pLock*/ )
 {
     osl::Guard< osl::Mutex > theGuard( m_aMutex );
@@ -1242,7 +1242,7 @@ bool SerfSession::UNLOCK( SerfLock * /*pLock*/ )
     */
 }
 
-// -------------------------------------------------------------------
+
 void SerfSession::abort()
     throw ( DAVException )
 {
@@ -1254,7 +1254,7 @@ void SerfSession::abort()
     //    ne_close_connection( m_pHttpSession );
 }
 
-// -------------------------------------------------------------------
+
 const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const
 {
     if ( m_aUri.GetScheme() == "http" || m_aUri.GetScheme() == "https" )
@@ -1273,7 +1273,7 @@ const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const
 }
 
 /*
-// -------------------------------------------------------------------
+
 namespace {
 
 bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks,
@@ -1295,7 +1295,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks,
 } // namespace
 */
 
-// -------------------------------------------------------------------
+
 bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/,
                                           const DAVRequestEnvironment & /*rEnv*/ )
 {
@@ -1363,10 +1363,10 @@ bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/,
     */
 }
 
-// -------------------------------------------------------------------
+
 // HandleError
 // Common Error Handler
-// -------------------------------------------------------------------
+
 void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc )
     throw ( DAVException )
 {
@@ -1483,7 +1483,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc
     */
 }
 
-// -------------------------------------------------------------------
+
 // static
 bool
 SerfSession::getDataFromInputStream(
@@ -1573,7 +1573,7 @@ SerfSession::getDataFromInputStream(
     return false;
 }
 
-// ---------------------------------------------------------------------
+
 sal_Bool
 SerfSession::isDomainMatch( OUString certHostName )
 {
@@ -1595,7 +1595,7 @@ SerfSession::isDomainMatch( OUString certHostName )
 }
 
 /*
-// ---------------------------------------------------------------------
+
 OUString SerfSession::makeAbsoluteURL( OUString const & rURL ) const
 {
     try
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index a49c46e8bba6..75d2d94f5463 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -29,9 +29,9 @@
 
 using namespace http_dav_ucp;
 
-// -------------------------------------------------------------------
+
 // Constructor
-// -------------------------------------------------------------------
+
 
 namespace {
 
diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx
index 6a7a6016aea8..f9dbb1c72a33 100644
--- a/ucb/workben/ucb/ucbdemo.cxx
+++ b/ucb/workben/ucb/ucbdemo.cxx
@@ -93,7 +93,7 @@ public:
     void Append( const String &rLine );
 };
 
-//-------------------------------------------------------------------------
+
 void MyOutWindow::Append( const String &rLine )
 {
     OUString aLine( rLine );
@@ -138,13 +138,13 @@ public:
     void print( const OUString& rText );
 };
 
-//-------------------------------------------------------------------------
+
 void MessagePrinter::print( const sal_Char* pText )
 {
     print( OUString::createFromAscii(pText) );
 }
 
-//-------------------------------------------------------------------------
+
 void MessagePrinter::print( const OUString& rText )
 {
     SolarMutexGuard aGuard;
@@ -376,7 +376,7 @@ public:
 // static
 OUString Ucb::m_aProtocol;
 
-//-------------------------------------------------------------------------
+
 // static
 OUString Ucb::getUnoURL()
 {
@@ -390,7 +390,7 @@ OUString Ucb::getUnoURL()
     return aUnoURL;
 }
 
-//-------------------------------------------------------------------------
+
 Ucb::Ucb( uno::Reference< lang::XMultiServiceFactory >& rxFactory,
           OUString const & rConfigurationKey1,
           OUString const & rConfigurationKey2 )
@@ -401,12 +401,12 @@ Ucb::Ucb( uno::Reference< lang::XMultiServiceFactory >& rxFactory,
 {
 }
 
-//-------------------------------------------------------------------------
+
 Ucb::~Ucb()
 {
 }
 
-//-------------------------------------------------------------------------
+
 sal_Bool Ucb::init()
 {
     if ( m_bInited )
@@ -451,7 +451,7 @@ sal_Bool Ucb::init()
     return m_bInited;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< ucb::XContentIdentifierFactory >
 Ucb::getContentIdentifierFactory()
 {
@@ -465,7 +465,7 @@ Ucb::getContentIdentifierFactory()
     return m_xIdFac;
 }
 
-//-------------------------------------------------------------------------
+
 uno::Reference< ucb::XContentProvider > Ucb::getContentProvider()
 {
     if ( !m_xProv.is() )
@@ -517,7 +517,7 @@ public:
     { return m_xProgressHandler; }
  };
 
-//-------------------------------------------------------------------------
+
 UcbTaskEnvironment::UcbTaskEnvironment(
                     const uno::Reference< task::XInteractionHandler >&
                      rxInteractionHandler,
@@ -528,17 +528,17 @@ UcbTaskEnvironment::UcbTaskEnvironment(
 {
 }
 
-//-------------------------------------------------------------------------
+
 // virtual
 UcbTaskEnvironment::~UcbTaskEnvironment()
 {
 }
 
-//----------------------------------------------------------------------------
+
 //
 // XInterface methods
 //
-//----------------------------------------------------------------------------
+
 
 // virtual
 uno::Any SAL_CALL
@@ -550,7 +550,7 @@ UcbTaskEnvironment::queryInterface( const uno::Type & rType )
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-//----------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL UcbTaskEnvironment::acquire()
     throw()
@@ -558,7 +558,7 @@ void SAL_CALL UcbTaskEnvironment::acquire()
     OWeakObject::acquire();
 }
 
-//----------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL UcbTaskEnvironment::release()
     throw()
@@ -594,7 +594,7 @@ public:
                              bool bPrint = true );
 };
 
-//-------------------------------------------------------------------------
+
 UcbCommandProcessor::UcbCommandProcessor( Ucb& rUCB,
                                           const uno::Reference<
                                             ucb::XCommandProcessor >&
@@ -614,13 +614,13 @@ UcbCommandProcessor::UcbCommandProcessor( Ucb& rUCB,
     }
 }
 
-//----------------------------------------------------------------------------
+
 // virtual
 UcbCommandProcessor::~UcbCommandProcessor()
 {
 }
 
-//----------------------------------------------------------------------------
+
 uno::Any UcbCommandProcessor::executeCommand( const OUString& rName,
                                               const uno::Any& rArgument,
                                               bool bPrint )
@@ -783,7 +783,7 @@ public:
         throw( uno::RuntimeException );
 };
 
-//-------------------------------------------------------------------------
+
 UcbContent::UcbContent( Ucb& rUCB,
                         uno::Reference< ucb::XContent >& rxContent,
                         MyOutWindow* pOutEdit)
@@ -795,13 +795,13 @@ UcbContent::UcbContent( Ucb& rUCB,
 {
 }
 
-//----------------------------------------------------------------------------
+
 // virtual
 UcbContent::~UcbContent()
 {
 }
 
-//-------------------------------------------------------------------------
+
 // static
 UcbContent* UcbContent::create(
         Ucb& rUCB, const OUString& rURL, MyOutWindow* pOutEdit )
@@ -861,7 +861,7 @@ UcbContent* UcbContent::create(
     return pNew;
 }
 
-//-------------------------------------------------------------------------
+
 const OUString UcbContent::getURL() const
 {
     uno::Reference< ucb::XContentIdentifier > xId(
@@ -872,14 +872,14 @@ const OUString UcbContent::getURL() const
     return OUString();
 }
 
-//-------------------------------------------------------------------------
+
 const OUString UcbContent::getType() const
 {
     const OUString aType( m_xContent->getContentType() );
     return aType;
 }
 
-//-------------------------------------------------------------------------
+
 void UcbContent::dispose()
 {
     uno::Reference< lang::XComponent > xComponent( m_xContent, uno::UNO_QUERY );
@@ -887,7 +887,7 @@ void UcbContent::dispose()
         xComponent->dispose();
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::open( const OUString & rName, const OUString& rInput,
                        bool bPrint, bool bTiming, bool bSort,
                        OpenStack * pStack, sal_uInt32 nLevel,
@@ -1144,7 +1144,7 @@ void UcbContent::open( const OUString & rName, const OUString& rInput,
     }
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort,
                           sal_Int32 nFetchSize )
 {
@@ -1219,7 +1219,7 @@ void UcbContent::openAll( Ucb& rUCB, bool bPrint, bool bTiming, bool bSort,
     }
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::transfer( const OUString& rSourceURL, sal_Bool bMove  )
 {
     if ( bMove )
@@ -1282,7 +1282,7 @@ void UcbContent::transfer( const OUString& rSourceURL, sal_Bool bMove  )
 #endif
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::destroy()
 {
     print( "Deleting content..." );
@@ -1294,7 +1294,7 @@ void UcbContent::destroy()
 //  executeCommand( OUString("flush"), Any() );
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< ucb::CommandInfo > UcbContent::getCommands()
 {
     uno::Any aResult = executeCommand(
@@ -1322,7 +1322,7 @@ uno::Sequence< ucb::CommandInfo > UcbContent::getCommands()
     return uno::Sequence< ucb::CommandInfo >();
 }
 
-//-------------------------------------------------------------------------
+
 uno::Sequence< beans::Property > UcbContent::getProperties()
 {
     uno::Any aResult = executeCommand(
@@ -1349,7 +1349,7 @@ uno::Sequence< beans::Property > UcbContent::getProperties()
     return uno::Sequence< beans::Property >();
 }
 
-//----------------------------------------------------------------------------
+
 uno::Any UcbContent::getPropertyValue( const OUString& rName )
 {
     uno::Sequence< beans::Property > aProps( 1 );
@@ -1375,7 +1375,7 @@ uno::Any UcbContent::getPropertyValue( const OUString& rName )
     return uno::Any();
 }
 
-//----------------------------------------------------------------------------
+
 OUString UcbContent::getStringPropertyValue( const OUString& rName )
 {
     uno::Any aAny = getPropertyValue( rName );
@@ -1394,7 +1394,7 @@ OUString UcbContent::getStringPropertyValue( const OUString& rName )
     return OUString();
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::setPropertyValue( const OUString& rName,
                                    const uno::Any& rValue )
 {
@@ -1415,7 +1415,7 @@ void UcbContent::setPropertyValue( const OUString& rName,
 //  executeCommand( OUString("flush"), Any() );
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::setStringPropertyValue( const OUString& rName,
                                          const OUString& rValue )
 {
@@ -1427,7 +1427,7 @@ void UcbContent::setStringPropertyValue( const OUString& rName,
     print( aText );
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::addProperty( const OUString& rName,
                               const uno::Any& rValue )
 {
@@ -1465,7 +1465,7 @@ void UcbContent::addProperty( const OUString& rName,
     print( "Adding property failed. No XPropertyContainer!" );
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::addStringProperty(
                     const OUString& rName, const OUString& rValue )
 {
@@ -1474,7 +1474,7 @@ void UcbContent::addStringProperty(
     addProperty( rName, aValue );
 }
 
-//----------------------------------------------------------------------------
+
 void UcbContent::removeProperty( const OUString& rName )
 {
     uno::Reference< beans::XPropertyContainer > xContainer( m_xContent,
@@ -1501,11 +1501,11 @@ void UcbContent::removeProperty( const OUString& rName )
     print( "Removing property failed. No XPropertyContainer!" );
 }
 
-//----------------------------------------------------------------------------
+
 //
 // XInterface methods
 //
-//----------------------------------------------------------------------------
+
 
 // virtual
 uno::Any SAL_CALL UcbContent::queryInterface( const uno::Type & rType )
@@ -1520,7 +1520,7 @@ uno::Any SAL_CALL UcbContent::queryInterface( const uno::Type & rType )
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-//----------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL UcbContent::acquire()
     throw()
@@ -1528,7 +1528,7 @@ void SAL_CALL UcbContent::acquire()
     OWeakObject::acquire();
 }
 
-//----------------------------------------------------------------------------
+
 // virtual
 void SAL_CALL UcbContent::release()
     throw()
@@ -1536,11 +1536,11 @@ void SAL_CALL UcbContent::release()
     OWeakObject::release();
 }
 
-//----------------------------------------------------------------------------
+
 //
 // XEventListener methods.
 //
-//----------------------------------------------------------------------------
+
 
 // virtual
 void SAL_CALL UcbContent::disposing( const lang::EventObject& /*Source*/ )
@@ -1549,11 +1549,11 @@ void SAL_CALL UcbContent::disposing( const lang::EventObject& /*Source*/ )
     print ( "Content: disposing..." );
 }
 
-//----------------------------------------------------------------------------
+
 //
 // XContentEventListener methods,
 //
-//----------------------------------------------------------------------------
+
 
 // virtual
 void SAL_CALL UcbContent::contentEvent( const ucb::ContentEvent& evt )
@@ -1611,11 +1611,11 @@ void SAL_CALL UcbContent::contentEvent( const ucb::ContentEvent& evt )
     }
 }
 
-//----------------------------------------------------------------------------
+
 //
 // XPropertiesChangeListener methods.
 //
-//----------------------------------------------------------------------------
+
 
 // virtual
 void SAL_CALL UcbContent::propertiesChange(
@@ -1668,7 +1668,7 @@ void SAL_CALL UcbContent::propertiesChange(
 #define MYWIN_ITEMID_ONLINE         24
 #define MYWIN_ITEMID_REORGANIZE     25
 
-//-------------------------------------------------------------------------
+
 class MyWin : public WorkWindow
 {
 private:
@@ -1697,7 +1697,7 @@ public:
     void print( const sal_Char* pText );
 };
 
-//-------------------------------------------------------------------------
+
 MyWin::MyWin( Window *pParent, WinBits nWinStyle,
               uno::Reference< lang::XMultiServiceFactory >& rxFactory,
               OUString const & rConfigurationKey1,
@@ -1873,7 +1873,7 @@ MyWin::MyWin( Window *pParent, WinBits nWinStyle,
     m_aUCB.setOutEdit( m_pOutEdit );
 }
 
-//-------------------------------------------------------------------------
+
 // virtual
 MyWin::~MyWin()
 {
@@ -1888,7 +1888,7 @@ MyWin::~MyWin()
     delete m_pOutEdit;
 }
 
-//-------------------------------------------------------------------------
+
 void MyWin::Resize()
 {
     Size aWinSize = GetOutputSizePixel();
@@ -1904,13 +1904,13 @@ void MyWin::Resize()
         Point( 0, nBoxH + nBoxH ), Size ( nWinW, nWinH - ( nBoxH + nBoxH ) ) );
 }
 
-//-------------------------------------------------------------------------
+
 void MyWin::print( const sal_Char* pText )
 {
     print( OUString.createFromAscii( pText ) );
 }
 
-//-------------------------------------------------------------------------
+
 void MyWin::print( const OUString& rText )
 {
     SolarMutexGuard aGuard;
@@ -1922,7 +1922,7 @@ void MyWin::print( const OUString& rText )
     }
 }
 
-//-------------------------------------------------------------------------
+
 IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox )
 {
     USHORT nItemId   = pToolBox->GetCurItemId();
@@ -2240,7 +2240,7 @@ public:
 
 MyApp aMyApp;
 
-//-------------------------------------------------------------------------
+
 // virtual
 void MyApp::Main()
 {
diff --git a/unodevtools/source/unodevtools/options.cxx b/unodevtools/source/unodevtools/options.cxx
index 915ac84a27dc..d9d46667ffa2 100644
--- a/unodevtools/source/unodevtools/options.cxx
+++ b/unodevtools/source/unodevtools/options.cxx
@@ -27,7 +27,7 @@ using namespace ::rtl;
 
 namespace unodevtools {
 
-//-------------------------------------------------------------------------------
+
 #if OSL_DEBUG_LEVEL > 1
 static void out( const sal_Char * pText )
 {
@@ -35,7 +35,7 @@ static void out( const sal_Char * pText )
 }
 #endif
 
-//-------------------------------------------------------------------------------
+
 bool readOption( OUString * pValue, const sal_Char * pOpt,
                      sal_uInt32 * pnIndex, const OUString & aArg)
 {
@@ -85,7 +85,7 @@ bool readOption( OUString * pValue, const sal_Char * pOpt,
     return false;
 }
 
-//-------------------------------------------------------------------------------
+
 bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
                      sal_uInt32 * pnIndex, const OUString & aArg)
 {
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index a3d57edacb21..c956caeec8fb 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -23,19 +23,19 @@
 
 #include "unotools/bootstrap.hxx"
 
-// ---------------------------------------------------------------------------------------
+
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #include <osl/diagnose.h>
-// ---------------------------------------------------------------------------------------
+
 #include <rtl/bootstrap.hxx>
 #include <rtl/instance.hxx>
 #include <osl/process.h>
 #include "tools/getprocessworkingdir.hxx"
 
-// ---------------------------------------------------------------------------------------
+
 // #define this to true, if remembering defaults is not supported properly
 #define RTL_BOOTSTRAP_DEFAULTS_BROKEN true
 
@@ -53,17 +53,17 @@
 
 #define BOOTSTRAP_DIRNAME_USERDIR           "user"
 
-// ---------------------------------------------------------------------------------------
+
 typedef char const * AsciiString;
-// ---------------------------------------------------------------------------------------
+
 
 namespace utl
 {
-// ---------------------------------------------------------------------------------------
 
-// ---------------------------------------------------------------------------------------
+
+
 // Implementation class: Bootstrap::Impl
-// ---------------------------------------------------------------------------------------
+
 
     namespace
     {
@@ -137,15 +137,15 @@ namespace utl
         theImpl::get().initialize();
     }
 
-// ---------------------------------------------------------------------------------------
+
 // helper
-// ---------------------------------------------------------------------------------------
+
 
 typedef Bootstrap::PathStatus PathStatus;
 
 sal_Unicode const cURLSeparator = '/';
 
-// ---------------------------------------------------------------------------------------
+
 // path status utility function
 static
 PathStatus implCheckStatusOfURL(OUString const& _sURL, osl::DirectoryItem& aDirItem)
@@ -186,7 +186,7 @@ PathStatus implCheckStatusOfURL(OUString const& _sURL, osl::DirectoryItem& aDirI
 
     return eStatus;
 }
-// ---------------------------------------------------------------------------------------
+
 
 static
 bool implNormalizeURL(OUString & _sURL, osl::DirectoryItem& aDirItem)
@@ -216,7 +216,7 @@ bool implNormalizeURL(OUString & _sURL, osl::DirectoryItem& aDirItem)
 
     return true;
 }
-// ---------------------------------------------------------------------------------------
+
 static
 bool implEnsureAbsolute(OUString & _rsURL) // also strips embedded dots !!
 {
@@ -238,7 +238,7 @@ bool implEnsureAbsolute(OUString & _rsURL) // also strips embedded dots !!
     }
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 static
 bool implMakeAbsoluteURL(OUString & _rsPathOrURL)
@@ -264,7 +264,7 @@ bool implMakeAbsoluteURL(OUString & _rsPathOrURL)
 
     return bURL && implEnsureAbsolute(_rsPathOrURL);
 }
-// ---------------------------------------------------------------------------------------
+
 #if OSL_DEBUG_LEVEL > 0
 static
 PathStatus dbgCheckStatusOfURL(OUString const& _sURL)
@@ -275,7 +275,7 @@ PathStatus dbgCheckStatusOfURL(OUString const& _sURL)
 
     return implCheckStatusOfURL(_sURL,aDirItem);
 }
-// ---------------------------------------------------------------------------------------
+
 #endif
 
 static
@@ -307,7 +307,7 @@ PathStatus checkStatusAndNormalizeURL(OUString & _sURL)
 }
 
 
-// ----------------------------------------------------------------------------------
+
 // helpers to build and check a nested URL
 static
 PathStatus getDerivedPath(
@@ -356,7 +356,7 @@ PathStatus getDerivedPath(
     return aStatus;
 }
 
-// ----------------------------------------------------------------------------------
+
 static
 inline
 PathStatus getDerivedPath(
@@ -369,7 +369,7 @@ PathStatus getDerivedPath(
     return getDerivedPath(_rURL,_aBaseData.path,_aBaseData.status,_sRelativeURL,_rData,_sBootstrapParameter);
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 static
 OUString getExecutableBaseName()
@@ -397,7 +397,7 @@ OUString getExecutableBaseName()
     return sExecutable;
 }
 
-// ----------------------------------------------------------------------------------
+
 
 static
 inline
@@ -405,7 +405,7 @@ Bootstrap::PathStatus updateStatus(Bootstrap::Impl::PathData & _rResult)
 {
     return _rResult.status = checkStatusAndNormalizeURL(_rResult.path);
 }
-// ---------------------------------------------------------------------------------------
+
 
 static
 Bootstrap::PathStatus implGetBootstrapFile(rtl::Bootstrap& _rData, Bootstrap::Impl::PathData & _rBootstrapFile)
@@ -414,7 +414,7 @@ Bootstrap::PathStatus implGetBootstrapFile(rtl::Bootstrap& _rData, Bootstrap::Im
 
     return updateStatus(_rBootstrapFile);
 }
-// ---------------------------------------------------------------------------------------
+
 
 static
 Bootstrap::PathStatus implGetVersionFile(rtl::Bootstrap& _rData, Bootstrap::Impl::PathData & _rVersionFile)
@@ -425,14 +425,14 @@ Bootstrap::PathStatus implGetVersionFile(rtl::Bootstrap& _rData, Bootstrap::Impl
 
     return updateStatus(_rVersionFile);
 }
-// ---------------------------------------------------------------------------------------
+
 // Error reporting
 
 static char const IS_MISSING[] = "is missing";
 static char const IS_INVALID[] = "is corrupt";
 static char const PERIOD[] = ". ";
 
-// ---------------------------------------------------------------------------------------
+
 static void addFileError(OUStringBuffer& _rBuf, OUString const& _aPath, AsciiString _sWhat)
 {
     OUString sSimpleFileName = _aPath.copy(1 +_aPath.lastIndexOf(cURLSeparator));
@@ -441,7 +441,7 @@ static void addFileError(OUStringBuffer& _rBuf, OUString const& _aPath, AsciiStr
     _rBuf.appendAscii(" '").append(sSimpleFileName).appendAscii("' ");
     _rBuf.appendAscii(_sWhat).appendAscii(PERIOD);
 }
-// ---------------------------------------------------------------------------------------
+
 
 static void addMissingDirectoryError(OUStringBuffer& _rBuf, OUString const& _aPath)
 {
@@ -449,7 +449,7 @@ static void addMissingDirectoryError(OUStringBuffer& _rBuf, OUString const& _aPa
     _rBuf.appendAscii(" '").append(_aPath).appendAscii("' ");
     _rBuf.appendAscii(IS_MISSING).appendAscii(PERIOD);
 }
-// ---------------------------------------------------------------------------------------
+
 
 static void addUnexpectedError(OUStringBuffer& _rBuf, AsciiString _sExtraInfo = NULL)
 {
@@ -458,7 +458,7 @@ static void addUnexpectedError(OUStringBuffer& _rBuf, AsciiString _sExtraInfo =
 
     _rBuf.appendAscii(_sExtraInfo).appendAscii(PERIOD);
 }
-// ---------------------------------------------------------------------------------------
+
 
 static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Impl const& _rData)
 {
@@ -555,10 +555,10 @@ static Bootstrap::FailureCode describeError(OUStringBuffer& _rBuf, Bootstrap::Im
 
     return eErrCode;
 }
-// ---------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
+
+
 // class Bootstrap
-// ---------------------------------------------------------------------------------------
+
 
 OUString Bootstrap::getProductKey()
 {
@@ -568,7 +568,7 @@ OUString Bootstrap::getProductKey()
 
     return data().getBootstrapValue( csProductKeyItem, sDefaultProductKey );
 }
-// ---------------------------------------------------------------------------------------
+
 
 OUString Bootstrap::getProductKey(OUString const& _sDefault)
 {
@@ -576,7 +576,7 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault)
 
     return data().getBootstrapValue( csProductKeyItem, _sDefault );
 }
-// ---------------------------------------------------------------------------------------
+
 
 OUString Bootstrap::getBuildVersion(OUString const& _sDefault)
 {
@@ -587,7 +587,7 @@ OUString Bootstrap::getBuildVersion(OUString const& _sDefault)
     data().getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault );
     return sBuildVersion;
 }
-// ---------------------------------------------------------------------------------------
+
 
 OUString Bootstrap::getBuildIdData(OUString const& _sDefault)
 {
@@ -602,7 +602,7 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault)
     return sBuildId;
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL)
 {
@@ -611,7 +611,7 @@ Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL)
     _rURL = aPathData.path;
     return aPathData.status;
 }
-// ---------------------------------------------------------------------------------------
+
 
 PathStatus Bootstrap::locateUserInstallation(OUString& _rURL)
 {
@@ -621,7 +621,7 @@ PathStatus Bootstrap::locateUserInstallation(OUString& _rURL)
     return aPathData.status;
 }
 
-// ---------------------------------------------------------------------------------------
+
 
 PathStatus Bootstrap::locateUserData(OUString& _rURL)
 {
@@ -639,7 +639,7 @@ PathStatus Bootstrap::locateUserData(OUString& _rURL)
         return getDerivedPath(_rURL, data().aUserInstall_ ,csUserDir, aData, csUserDirItem);
     }
 }
-// ---------------------------------------------------------------------------------------
+
 
 PathStatus Bootstrap::locateBootstrapFile(OUString& _rURL)
 {
@@ -648,7 +648,7 @@ PathStatus Bootstrap::locateBootstrapFile(OUString& _rURL)
     _rURL = aPathData.path;
     return aPathData.status;
 }
-// ---------------------------------------------------------------------------------------
+
 
 PathStatus Bootstrap::locateVersionFile(OUString& _rURL)
 {
@@ -657,7 +657,7 @@ PathStatus Bootstrap::locateVersionFile(OUString& _rURL)
     _rURL = aPathData.path;
     return aPathData.status;
 }
-// ---------------------------------------------------------------------------------------
+
 
 Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage, FailureCode& _rErrCode)
 {
@@ -679,9 +679,9 @@ Bootstrap::Status Bootstrap::checkBootstrapStatus(OUString& _rDiagnosticMessage,
     return result;
 }
 
-// ---------------------------------------------------------------------------------------
+
 // class Bootstrap::Impl
-// ---------------------------------------------------------------------------------------
+
 
 bool Bootstrap::Impl::initBaseInstallationData(rtl::Bootstrap& _rData)
 {
@@ -696,7 +696,7 @@ bool Bootstrap::Impl::initBaseInstallationData(rtl::Bootstrap& _rData)
 
     return bResult;
 }
-// ---------------------------------------------------------------------------------------
+
 
 bool Bootstrap::Impl::initUserInstallationData(rtl::Bootstrap& _rData)
 {
@@ -730,7 +730,7 @@ bool Bootstrap::Impl::initUserInstallationData(rtl::Bootstrap& _rData)
 
     return bResult;
 }
-// ---------------------------------------------------------------------------------------
+
 
 void Bootstrap::Impl::initialize()
 {
@@ -767,7 +767,7 @@ void Bootstrap::Impl::initialize()
         status_ = DATA_OK;
     }
 }
-// ---------------------------------------------------------------------------------------
+
 
 OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString const& _sDefault) const
 {
@@ -777,7 +777,7 @@ OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString con
     aData.getFrom(_sName,sResult,_sDefault);
     return sResult;
 }
-// ---------------------------------------------------------------------------------------
+
 
 bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const
 {
@@ -793,7 +793,7 @@ bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue,
     aData.getFrom(_sName,_rValue,_sDefault);
     return true;
 }
-// ---------------------------------------------------------------------------------------
+
 
 } // namespace utl
 
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 61bf2db03a50..f9e2df578b60 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::beans ;
 class SvtCmdOptions
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         // the only way to free memory!
         void Clear()
         {
@@ -75,7 +75,7 @@ class SvtCmdOptions
             m_aCommandHashMap.insert( CommandHashMap::value_type( aCmd, 0 ) );
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // convert internal list to external format
         // for using it on right menus really
         // Notice:   We build a property list with 4 entries and set it on result list then.
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 34ab126c1503..1c6b49efddae 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -137,21 +137,21 @@ struct SvtCompatibilityEntry
 class SvtCompatibility
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         // append one entry
         void AppendEntry( const SvtCompatibilityEntry& rEntry )
         {
             lEntries.push_back( rEntry );
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // the only way to free memory!
         void Clear()
         {
             lEntries.clear();
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // convert internal list to external format
         Sequence< Sequence< PropertyValue > > GetList() const
         {
@@ -214,24 +214,24 @@ class SvtCompatibility
 
 class SvtCompatibilityOptions_Impl : public ConfigItem
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
 
          SvtCompatibilityOptions_Impl();
         ~SvtCompatibilityOptions_Impl();
 
         void SetDefault( OUString sName, bool bValue );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      called for notify of configmanager
@@ -264,9 +264,9 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
 
         virtual void Commit();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  public interface
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      base implementation of public interface for "SvtCompatibilityOptions"!
@@ -309,9 +309,9 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
         inline bool IsConsiderWrappingStyle() const { return m_aDefOptions.bConsiderWrappingStyle; }
         inline bool IsExpandWordSpace() const { return m_aDefOptions.bExpandWordSpace; }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
@@ -347,9 +347,9 @@ class SvtCompatibilityOptions_Impl : public ConfigItem
         void impl_ExpandPropertyNames( const Sequence< OUString >& lSource,
                                              Sequence< OUString >& lDestination );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 818ca7454e6b..e2494560779d 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -130,7 +130,7 @@ static bool lcl_Find(
             return true;
     return false;
 }
-//-----------------------------------------------------------------------------
+
 void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) throw(RuntimeException)
 {
     const ElementChange* pElementChanges = rEvent.Changes.getConstArray();
@@ -764,14 +764,14 @@ bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString >&
     }
     return bRet;
 }
-//----------------------------------------------------------------------------
+
 static inline
 OUString lcl_extractSetPropertyName( const OUString& rInPath, const OUString& rPrefix )
 {
     OUString const sSubPath = dropPrefixFromConfigurationPath( rInPath, rPrefix);
     return extractFirstFromConfigurationPath( sSubPath );
 }
-//----------------------------------------------------------------------------
+
 static
 Sequence< OUString > lcl_extractSetPropertyNames( const Sequence< PropertyValue >& rValues, const OUString& rPrefix )
 {
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index ac1966491dae..11f2bd3c3d18 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.cxx
@@ -52,7 +52,7 @@ namespace utl
     //========================================================================
     //= OConfigurationNode
     //========================================================================
-    //------------------------------------------------------------------------
+
     OConfigurationNode::OConfigurationNode(const Reference< XInterface >& _rxNode )
         :m_bEscapeNames(false)
     {
@@ -83,7 +83,7 @@ namespace utl
             setEscape(isSetNode());
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationNode::OConfigurationNode(const OConfigurationNode& _rSource)
         :OEventListenerAdapter()
         ,m_xHierarchyAccess(_rSource.m_xHierarchyAccess)
@@ -98,7 +98,7 @@ namespace utl
             startComponentListening(xConfigNodeComp);
     }
 
-    //------------------------------------------------------------------------
+
     const OConfigurationNode& OConfigurationNode::operator=(const OConfigurationNode& _rSource)
     {
         stopAllComponentListening();
@@ -117,7 +117,7 @@ namespace utl
         return *this;
     }
 
-    //------------------------------------------------------------------------
+
     void OConfigurationNode::_disposing( const EventObject& _rSource )
     {
         Reference< XComponent > xDisposingSource(_rSource.Source, UNO_QUERY);
@@ -126,7 +126,7 @@ namespace utl
             clear();
     }
 
-    //------------------------------------------------------------------------
+
     OUString OConfigurationNode::getLocalName() const
     {
         OUString sLocalName;
@@ -142,7 +142,7 @@ namespace utl
         return sLocalName;
     }
 
-    //------------------------------------------------------------------------
+
     OUString OConfigurationNode::getNodePath() const
     {
         OUString sNodePath;
@@ -158,7 +158,7 @@ namespace utl
         return sNodePath;
     }
 
-    //------------------------------------------------------------------------
+
     OUString OConfigurationNode::normalizeName(const OUString& _rName, NAMEORIGIN _eOrigin) const
     {
         OUString sName(_rName);
@@ -183,7 +183,7 @@ namespace utl
         return sName;
     }
 
-    //------------------------------------------------------------------------
+
     Sequence< OUString > OConfigurationNode::getNodeNames() const throw()
     {
         OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::getNodeNames: object is invalid!");
@@ -207,7 +207,7 @@ namespace utl
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     bool OConfigurationNode::removeNode(const OUString& _rName) const throw()
     {
         OSL_ENSURE(m_xContainerAccess.is(), "OConfigurationNode::removeNode: object is invalid!");
@@ -240,7 +240,7 @@ namespace utl
         }
         return false;
     }
-    //------------------------------------------------------------------------
+
     OConfigurationNode OConfigurationNode::insertNode(const OUString& _rName,const Reference< XInterface >& _xNode) const throw()
     {
         if(_xNode.is())
@@ -265,7 +265,7 @@ namespace utl
 
         return OConfigurationNode();
     }
-    //------------------------------------------------------------------------
+
     OConfigurationNode OConfigurationNode::createNode(const OUString& _rName) const throw()
     {
         Reference< XSingleServiceFactory > xChildFactory(m_xContainerAccess, UNO_QUERY);
@@ -288,7 +288,7 @@ namespace utl
         return OConfigurationNode();
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationNode OConfigurationNode::openNode(const OUString& _rPath) const throw()
     {
         OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::openNode: object is invalid!");
@@ -328,13 +328,13 @@ namespace utl
         return OConfigurationNode();
     }
 
-    //------------------------------------------------------------------------
+
     void OConfigurationNode::setEscape(bool _bEnable)
     {
         m_bEscapeNames = _bEnable && Reference< XStringEscape >::query(m_xDirectAccess).is();
     }
 
-    //------------------------------------------------------------------------
+
     bool OConfigurationNode::isSetNode() const
     {
         bool bIsSet = false;
@@ -364,7 +364,7 @@ namespace utl
         return false;
     }
 
-    //------------------------------------------------------------------------
+
     bool OConfigurationNode::hasByName(const OUString& _rName) const throw()
     {
         OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!");
@@ -380,7 +380,7 @@ namespace utl
         return false;
     }
 
-    //------------------------------------------------------------------------
+
     bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw()
     {
         bool bResult = false;
@@ -441,7 +441,7 @@ namespace utl
         return bResult;
     }
 
-    //------------------------------------------------------------------------
+
     Any OConfigurationNode::getNodeValue(const OUString& _rPath) const throw()
     {
         OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!");
@@ -466,7 +466,7 @@ namespace utl
         return aReturn;
     }
 
-    //------------------------------------------------------------------------
+
     void OConfigurationNode::clear() throw()
     {
         m_xHierarchyAccess.clear();
@@ -480,7 +480,7 @@ namespace utl
     //========================================================================
     namespace
     {
-        //--------------------------------------------------------------------
+
         Reference< XMultiServiceFactory > lcl_getConfigProvider( const Reference<XComponentContext> & i_rContext )
         {
             try
@@ -495,7 +495,7 @@ namespace utl
             return NULL;
         }
 
-        //--------------------------------------------------------------------
+
         Reference< XInterface > lcl_createConfigurationRoot( const Reference< XMultiServiceFactory >& i_rxConfigProvider,
             const OUString& i_rNodePath, const bool i_bUpdatable, const sal_Int32 i_nDepth, const bool i_bLazyWrite )
         {
@@ -525,14 +525,14 @@ namespace utl
         }
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference< XInterface >& _rxRootNode )
         :OConfigurationNode( _rxRootNode )
         ,m_xCommitter( _rxRootNode, UNO_QUERY )
     {
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationTreeRoot::OConfigurationTreeRoot( const Reference<XComponentContext> & i_rContext, const OUString& i_rNodePath, const bool i_bUpdatable )
         :OConfigurationNode( lcl_createConfigurationRoot( lcl_getConfigProvider( i_rContext ),
             i_rNodePath, i_bUpdatable, -1, false ).get() )
@@ -545,14 +545,14 @@ namespace utl
         }
     }
 
-    //------------------------------------------------------------------------
+
     void OConfigurationTreeRoot::clear() throw()
     {
         OConfigurationNode::clear();
         m_xCommitter.clear();
     }
 
-    //------------------------------------------------------------------------
+
     bool OConfigurationTreeRoot::commit() const throw()
     {
         OSL_ENSURE(isValid(), "OConfigurationTreeRoot::commit: object is invalid!");
@@ -574,7 +574,7 @@ namespace utl
         return false;
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite)
     {
         Reference< XInterface > xRoot( lcl_createConfigurationRoot(
@@ -584,13 +584,13 @@ namespace utl
         return OConfigurationTreeRoot();
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite )
     {
         return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite );
     }
 
-    //------------------------------------------------------------------------
+
     OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext,
         const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , bool _bLazyWrite )
     {
diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx
index ff6875fc281f..ebff6c425ce6 100644
--- a/unotools/source/config/configpaths.cxx
+++ b/unotools/source/config/configpaths.cxx
@@ -23,13 +23,13 @@
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
-//----------------------------------------------------------------------------
+
 namespace utl
 {
-//----------------------------------------------------------------------------
 
 
-//----------------------------------------------------------------------------
+
+
 
 static
 void lcl_resolveCharEntities(OUString & aLocalString)
@@ -73,7 +73,7 @@ void lcl_resolveCharEntities(OUString & aLocalString)
     aLocalString = aResult.makeStringAndClear();
 }
 
-//----------------------------------------------------------------------------
+
 bool splitLastFromConfigurationPath(OUString const& _sInPath,
                                         OUString& _rsOutPath,
                                         OUString& _rsLocalName)
@@ -141,7 +141,7 @@ bool splitLastFromConfigurationPath(OUString const& _sInPath,
     return nPos >= 0;
 }
 
-//----------------------------------------------------------------------------
+
 OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _sOutPath)
 {
     sal_Int32 nSep      = _sInPath.indexOf('/');
@@ -184,7 +184,7 @@ OUString extractFirstFromConfigurationPath(OUString const& _sInPath, OUString* _
     return sResult;
 }
 
-//----------------------------------------------------------------------------
+
 
 // find the position after the prefix in the nested path
 static inline
@@ -215,14 +215,14 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref
     return bIsPrefix ? nPrefixLength : 0;
 }
 
-//----------------------------------------------------------------------------
+
 bool isPrefixOfConfigurationPath(OUString const& _sNestedPath,
                                      OUString const& _sPrefixPath)
 {
     return _sPrefixPath.isEmpty() || lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) != 0;
 }
 
-//----------------------------------------------------------------------------
+
 OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath,
                                          OUString const& _sPrefixPath)
 {
@@ -238,7 +238,7 @@ OUString dropPrefixFromConfigurationPath(OUString const& _sNestedPath,
     }
 }
 
-//----------------------------------------------------------------------------
+
 static
 OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType)
 {
@@ -276,14 +276,14 @@ OUString lcl_wrapName(const OUString& _sContent, const OUString& _sType)
     return aNormalized.makeStringAndClear();
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString wrapConfigurationElementName(OUString const& _sElementName)
 {
     return lcl_wrapName(_sElementName, "*" );
 }
 
-//----------------------------------------------------------------------------
+
 
 OUString wrapConfigurationElementName(OUString const& _sElementName,
                                       OUString const& _sTypeName)
@@ -292,7 +292,7 @@ OUString wrapConfigurationElementName(OUString const& _sElementName,
     return lcl_wrapName(_sElementName, _sTypeName);
 }
 
-//----------------------------------------------------------------------------
+
 } // namespace utl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index 017d16308a25..e8ff2be0a4ff 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -214,7 +214,7 @@ OUString SvtDefaultOptions_Impl::GetDefaultPath( sal_uInt16 nId ) const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem( "Office.Common/Path/Default" )
 {
@@ -324,7 +324,7 @@ SvtDefaultOptions::SvtDefaultOptions()
     pImp = pOptions;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtDefaultOptions::~SvtDefaultOptions()
 {
@@ -338,7 +338,7 @@ SvtDefaultOptions::~SvtDefaultOptions()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtDefaultOptions::GetDefaultPath( sal_uInt16 nId ) const
 {
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index b808121b71db..c0cbe066b365 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -331,9 +331,9 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
                                                     Sequence< OUString >& lDestination ,
                                               const OUString&             sSetNode     );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index cc05e1041c5a..f8e1f843ff33 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -27,7 +27,7 @@
 using namespace utl;
 using namespace com::sun::star::uno;
 
-// -----------------------------------------------------------------------
+
 #define FILTERCFG_WORD_CODE             0x0001
 #define FILTERCFG_WORD_STORAGE          0x0002
 #define FILTERCFG_EXCEL_CODE            0x0004
@@ -123,7 +123,7 @@ void    SvtAppFilterOptions_Impl::Load()
         bSaveVBA = *(sal_Bool*)pValues[1].getValue();
 }
 
-// -----------------------------------------------------------------------
+
 class SvtWriterFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
     bool                bLoadExecutable;
@@ -169,7 +169,7 @@ void SvtWriterFilterOptions_Impl::Load()
         bLoadExecutable = *(sal_Bool*)pValues[0].getValue();
 }
 
-// -----------------------------------------------------------------------
+
 class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl
 {
     bool                bLoadExecutable;
@@ -295,7 +295,7 @@ bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtFilterOptions::SvtFilterOptions() :
     ConfigItem( "Office.Common/Filter/Microsoft" ),
@@ -305,7 +305,7 @@ SvtFilterOptions::SvtFilterOptions() :
     Load();
 }
 
-// -----------------------------------------------------------------------
+
 SvtFilterOptions::~SvtFilterOptions()
 {
     delete pImp;
@@ -340,7 +340,7 @@ const Sequence<OUString>& SvtFilterOptions::GetPropertyNames()
     }
     return aNames;
 }
-//-----------------------------------------------------------------------
+
 static sal_uLong lcl_GetFlag(sal_Int32 nProp)
 {
     sal_uLong nFlag = 0;
@@ -407,7 +407,7 @@ void SvtFilterOptions::Load()
         }
     }
 }
-// -----------------------------------------------------------------------
+
 
 void SvtFilterOptions::SetLoadWordBasicCode( bool bFlag )
 {
@@ -442,7 +442,7 @@ bool SvtFilterOptions::IsLoadWordBasicStorage() const
     return pImp->IsFlag( FILTERCFG_WORD_STORAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFilterOptions::SetLoadExcelBasicCode( bool bFlag )
 {
@@ -477,7 +477,7 @@ bool SvtFilterOptions::IsLoadExcelBasicStorage() const
     return pImp->IsFlag( FILTERCFG_EXCEL_STORAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtFilterOptions::SetLoadPPointBasicCode( bool bFlag )
 {
@@ -501,7 +501,7 @@ bool SvtFilterOptions::IsLoadPPointBasicStorage() const
     return pImp->IsFlag( FILTERCFG_PPOINT_STORAGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtFilterOptions::IsMathType2Math() const
 {
@@ -526,7 +526,7 @@ void SvtFilterOptions::SetMath2MathType( bool bFlag )
 }
 
 
-// -----------------------------------------------------------------------
+
 bool SvtFilterOptions::IsWinWord2Writer() const
 {
     return pImp->IsFlag( FILTERCFG_WRITER_LOAD );
@@ -554,7 +554,7 @@ bool SvtFilterOptions::IsUseEnhancedFields() const
     return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
 }
 
-// -----------------------------------------------------------------------
+
 bool SvtFilterOptions::IsExcel2Calc() const
 {
     return pImp->IsFlag( FILTERCFG_CALC_LOAD );
@@ -578,7 +578,7 @@ void SvtFilterOptions::SetCalc2Excel( bool bFlag )
 }
 
 
-// -----------------------------------------------------------------------
+
 bool SvtFilterOptions::IsPowerPoint2Impress() const
 {
     return pImp->IsFlag( FILTERCFG_IMPRESS_LOAD );
@@ -602,7 +602,7 @@ void SvtFilterOptions::SetImpress2PowerPoint( bool bFlag )
 }
 
 
-// -----------------------------------------------------------------------
+
 bool SvtFilterOptions::IsSmartArt2Shape() const
 {
     return pImp->IsFlag( FILTERCFG_SMARTART_SHAPE_LOAD );
@@ -627,7 +627,7 @@ SvtFilterOptions& SvtFilterOptions::Get()
     return theFilterOptions::get();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtFilterOptions::IsEnablePPTPreview() const
 {
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index c6f32074436e..9a4b94996539 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -339,7 +339,7 @@ OUString DefaultFontConfiguration::getUserInterfaceFont( const LanguageTag& rLan
     return OUString(FALLBACKFONT_UI_SANS);
 }
 
-// ------------------------------------------------------------------------------------
+
 
 /*
  *  FontSubstConfigItem::get
@@ -456,7 +456,7 @@ static const char* const aImplKillLeadingList[] =
     NULL
 };
 
-// -----------------------------------------------------------------------
+
 
 static const char* const aImplKillTrailingList[] =
 {
@@ -508,7 +508,7 @@ static const char* const aImplKillTrailingList[] =
     NULL
 };
 
-// -----------------------------------------------------------------------
+
 
 static const char* const aImplKillTrailingWithExceptionsList[] =
 {
@@ -517,7 +517,7 @@ static const char* const aImplKillTrailingWithExceptionsList[] =
     NULL
 };
 
-// -----------------------------------------------------------------------
+
 
 struct ImplFontAttrWeightSearchData
 {
@@ -545,7 +545,7 @@ static ImplFontAttrWeightSearchData const aImplWeightAttrSearchList[] =
 {   NULL,                   WEIGHT_DONTKNOW },
 };
 
-// -----------------------------------------------------------------------
+
 
 struct ImplFontAttrWidthSearchData
 {
@@ -638,7 +638,7 @@ static ImplFontAttrTypeSearchData const aImplTypeAttrSearchList[] =
 {   NULL,                   0 },
 };
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplKillLeading( OUString& rName, const char* const* ppStr )
 {
@@ -672,7 +672,7 @@ static bool ImplKillLeading( OUString& rName, const char* const* ppStr )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_Int32 ImplIsTrailing( const OUString& rName, const char* pStr )
 {
@@ -689,7 +689,7 @@ static sal_Int32 ImplIsTrailing( const OUString& rName, const char* pStr )
     return nStrLen;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplKillTrailing( OUString& rName, const char* const* ppStr )
 {
@@ -706,7 +706,7 @@ static bool ImplKillTrailing( OUString& rName, const char* const* ppStr )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplKillTrailingWithExceptions( OUString& rName, const char* const* ppStr )
 {
@@ -733,7 +733,7 @@ static bool ImplKillTrailingWithExceptions( OUString& rName, const char* const*
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplFindAndErase( OUString& rName, const char* pStr )
 {
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index cc9e4dd97ab3..da36d669ffd3 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -49,7 +49,7 @@
 #include <unotools/options.hxx>
 #include <unotools/syslocaleoptions.hxx>
 
-//-----------------------------------------------
+
 ItemHolder1::ItemHolder1()
     : ItemHolderMutexBase()
 {
@@ -80,20 +80,20 @@ ItemHolder1::ItemHolder1()
 #endif
 }
 
-//-----------------------------------------------
+
 ItemHolder1::~ItemHolder1()
 {
     impl_releaseAllItems();
 }
 
-//-----------------------------------------------
+
 void ItemHolder1::holdConfigItem(EItem eItem)
 {
     static ItemHolder1* pHolder = new ItemHolder1();
     pHolder->impl_addItem(eItem);
 }
 
-//-----------------------------------------------
+
 void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&)
     throw(css::uno::RuntimeException)
 {
@@ -101,7 +101,7 @@ void SAL_CALL ItemHolder1::disposing(const css::lang::EventObject&)
     impl_releaseAllItems();
 }
 
-//-----------------------------------------------
+
 void ItemHolder1::impl_addItem(EItem eItem)
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -123,7 +123,7 @@ void ItemHolder1::impl_addItem(EItem eItem)
         m_lItems.push_back(aNewItem);
 }
 
-//-----------------------------------------------
+
 void ItemHolder1::impl_releaseAllItems()
 {
     ::osl::ResettableMutexGuard aLock(m_aLock);
@@ -139,7 +139,7 @@ void ItemHolder1::impl_releaseAllItems()
     m_lItems.clear();
 }
 
-//-----------------------------------------------
+
 void ItemHolder1::impl_newItem(TItemInfo& rItem)
 {
     switch(rItem.eItem)
@@ -250,7 +250,7 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
     }
 }
 
-//-----------------------------------------------
+
 void ItemHolder1::impl_deleteItem(TItemInfo& rItem)
 {
     if (rItem.pItem)
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 15adf8b10c8b..f571e6f01569 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -173,7 +173,7 @@ void SfxMiscCfg::Commit()
     }
     PutProperties(rNames, aValues);
 }
-// -----------------------------------------------------------------------
+
 namespace
 {
     class LocalSingleton : public rtl::Static< osl::Mutex, LocalSingleton >
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 60607d0e4352..7b8b6bc862cd 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -92,14 +92,14 @@
 struct FactoryInfo
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         // initialize empty struct
         FactoryInfo()
         {
             free();
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // easy way to reset struct member!
         void free()
         {
@@ -119,7 +119,7 @@ struct FactoryInfo
             bDefaultFilterReadonly      = false;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // returns list of properties, which has changed only!
         // We use given value of sNodeBase to build full qualified paths ...
         // Last sign of it must be "/". because we use it directly, without any additional things!
@@ -184,7 +184,7 @@ struct FactoryInfo
             return lProperties;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // We must support setting AND marking of changed values.
         // That's why we can't make our member public. We must use get/set/init methods
         // to control access on it!
@@ -197,7 +197,7 @@ struct FactoryInfo
         bool            isDefaultFilterReadonly() const { return bDefaultFilterReadonly; }
         sal_Int32           getIcon             () const { return nIcon;              };
 
-        //---------------------------------------------------------------------------------------------------------
+
         // If you call set-methods - we check for changes of valkues and mark it.
         // But if you wish to set it without that ... you must initialize it!
         void initInstalled        ( bool               bNewInstalled        ) { bInstalled        = bNewInstalled        ; }
@@ -209,7 +209,7 @@ struct FactoryInfo
         void setDefaultFilterReadonly( const bool bVal){bDefaultFilterReadonly = bVal;}
         void initIcon             ( sal_Int32              nNewIcon             ) { nIcon             = nNewIcon             ; }
 
-        //---------------------------------------------------------------------------------------------------------
+
         void initTemplateFile( const OUString& sNewTemplateFile )
         {
             if ( !sNewTemplateFile.isEmpty() )
@@ -224,7 +224,7 @@ struct FactoryInfo
             }
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         void setTemplateFile( const OUString& sNewTemplateFile )
         {
             if( sTemplateFile != sNewTemplateFile )
@@ -234,7 +234,7 @@ struct FactoryInfo
             }
         };
 
-        //---------------------------------------------------------------------------------------------------------
+
         void setWindowAttributes( const OUString& sNewWindowAttributes )
         {
             if( sWindowAttributes != sNewWindowAttributes )
@@ -244,7 +244,7 @@ struct FactoryInfo
             }
         };
 
-        //---------------------------------------------------------------------------------------------------------
+
         void setDefaultFilter( const OUString& sNewDefaultFilter )
         {
             if( sDefaultFilter != sNewDefaultFilter )
@@ -299,25 +299,25 @@ typedef FactoryInfo   FactoryInfoList[FACTORYCOUNT];
 *//*-*************************************************************************************************************/
 class SvtModuleOptions_Impl : public ::utl::ConfigItem
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
          SvtModuleOptions_Impl();
         ~SvtModuleOptions_Impl();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void Notify( const css::uno::Sequence< OUString >& lPropertyNames );
         virtual void Commit(                                                             );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  public interface
-        //---------------------------------------------------------------------------------------------------------
+
         bool        IsModuleInstalled         (       SvtModuleOptions::EModule     eModule    ) const;
         ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames();
         OUString GetFactoryName            (       SvtModuleOptions::EFactory    eFactory   ) const;
@@ -334,21 +334,21 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem
                                                     const OUString&              sFilter    );
         void            MakeReadonlyStatesAvailable();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         static css::uno::Sequence< OUString > impl_ExpandSetNames ( const css::uno::Sequence< OUString >& lSetNames   );
                void                                  impl_Read           ( const css::uno::Sequence< OUString >& lSetNames   );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private types
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         FactoryInfoList     m_lFactories;
         bool            m_bReadOnlyStatesWellKnown;
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 6bfed83d7e99..0f6e79798d2f 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -80,7 +80,7 @@ namespace
     return theOptionsDlgOptions_ImplMutex::get();
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtOptionsDlgOptions_Impl::SvtOptionsDlgOptions_Impl()
     : ConfigItem( OUString( CFG_FILENAME ) ),
@@ -100,14 +100,14 @@ SvtOptionsDlgOptions_Impl::SvtOptionsDlgOptions_Impl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtOptionsDlgOptions_Impl::Commit()
 {
     // nothing to commit
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtOptionsDlgOptions_Impl::Notify( const Sequence< OUString >& )
 {
@@ -168,7 +168,7 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString getGroupPath( const OUString& _rGroup )
 {
@@ -183,7 +183,7 @@ OUString getOptionPath( const OUString& _rOption )
     return OUString( OPTIONS_NODE + OUString('/') + _rOption + OUString('/') );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
 {
@@ -194,21 +194,21 @@ bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const
 {
     return IsHidden( getGroupPath( _rGroup  ) + getPagePath( _rPage ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtOptionsDlgOptions_Impl::IsOptionHidden(
     const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const
@@ -216,7 +216,7 @@ bool SvtOptionsDlgOptions_Impl::IsOptionHidden(
     return IsHidden( getGroupPath( _rGroup  ) + getPagePath( _rPage ) + getOptionPath( _rOption ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtOptionsDialogOptions::SvtOptionsDialogOptions()
 {
@@ -232,7 +232,7 @@ SvtOptionsDialogOptions::SvtOptionsDialogOptions()
     m_pImp = pOptions;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtOptionsDialogOptions::~SvtOptionsDialogOptions()
 {
diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index c7beb4c7cba4..f147e61fc6e7 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -306,7 +306,7 @@ void SvtPathOptions_Impl::SetPath( SvtPathOptions::Paths ePath, const OUString&
     }
 }
 
-//-------------------------------------------------------------------------
+
 
 OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const
 {
@@ -319,14 +319,14 @@ OUString SvtPathOptions_Impl::ExpandMacros( const OUString& rPath ) const
     return sExpanded;
 }
 
-//-------------------------------------------------------------------------
+
 
 OUString SvtPathOptions_Impl::UsePathVariables( const OUString& rPath ) const
 {
     return m_xSubstVariables->reSubstituteVariables( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const
 {
@@ -401,7 +401,7 @@ OUString SvtPathOptions_Impl::SubstVar( const OUString& rVar ) const
     return aWorkText;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtPathOptions_Impl::SvtPathOptions_Impl() :
     m_aPathArray( (sal_Int32)SvtPathOptions::PATH_COUNT ),
@@ -455,7 +455,7 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
     m_aLanguageTag.reset( ConfigManager::getLocale() );
 }
 
-// -----------------------------------------------------------------------
+
 
 // class SvtPathOptions --------------------------------------------------
 
@@ -474,7 +474,7 @@ SvtPathOptions::SvtPathOptions()
     pImp = pOptions;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtPathOptions::~SvtPathOptions()
 {
@@ -486,154 +486,154 @@ SvtPathOptions::~SvtPathOptions()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetAddinPath() const
 {
     return pImp->GetAddinPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetAutoCorrectPath() const
 {
     return pImp->GetAutoCorrectPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetAutoTextPath() const
 {
     return pImp->GetAutoTextPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetBackupPath() const
 {
     return pImp->GetBackupPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetBasicPath() const
 {
     return pImp->GetBasicPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetBitmapPath() const
 {
     return pImp->GetBitmapPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetConfigPath() const
 {
     return pImp->GetConfigPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetDictionaryPath() const
 {
     return pImp->GetDictionaryPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetFavoritesPath() const
 {
     return pImp->GetFavoritesPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetFilterPath() const
 {
     return pImp->GetFilterPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetGalleryPath() const
 {
     return pImp->GetGalleryPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetGraphicPath() const
 {
     return pImp->GetGraphicPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetHelpPath() const
 {
     return pImp->GetHelpPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetLinguisticPath() const
 {
     return pImp->GetLinguisticPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetFingerprintPath() const
 {
     return pImp->GetFingerprintPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetModulePath() const
 {
     return pImp->GetModulePath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetPalettePath() const
 {
     return pImp->GetPalettePath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetPluginPath() const
 {
     return pImp->GetPluginPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetStoragePath() const
 {
     return pImp->GetStoragePath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetTempPath() const
 {
     return pImp->GetTempPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetTemplatePath() const
 {
     return pImp->GetTemplatePath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetUserConfigPath() const
 {
@@ -645,189 +645,189 @@ const OUString& SvtPathOptions::GetUIConfigPath() const
     return pImp->GetUIConfigPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SvtPathOptions::GetWorkPath() const
 {
     return pImp->GetWorkPath();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetAddinPath( const OUString& rPath )
 {
     pImp->SetAddinPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetAutoCorrectPath( const OUString& rPath )
 {
     pImp->SetAutoCorrectPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetAutoTextPath( const OUString& rPath )
 {
     pImp->SetAutoTextPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetBackupPath( const OUString& rPath )
 {
     pImp->SetBackupPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetBasicPath( const OUString& rPath )
 {
     pImp->SetBasicPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetBitmapPath( const OUString& rPath )
 {
     pImp->SetBitmapPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetConfigPath( const OUString& rPath )
 {
     pImp->SetConfigPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetDictionaryPath( const OUString& rPath )
 {
     pImp->SetDictionaryPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetFavoritesPath( const OUString& rPath )
 {
     pImp->SetFavoritesPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetFilterPath( const OUString& rPath )
 {
     pImp->SetFilterPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetGalleryPath( const OUString& rPath )
 {
     pImp->SetGalleryPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetGraphicPath( const OUString& rPath )
 {
     pImp->SetGraphicPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetHelpPath( const OUString& rPath )
 {
     pImp->SetHelpPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetLinguisticPath( const OUString& rPath )
 {
     pImp->SetLinguisticPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetModulePath( const OUString& rPath )
 {
     pImp->SetModulePath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetPalettePath( const OUString& rPath )
 {
     pImp->SetPalettePath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetPluginPath( const OUString& rPath )
 {
     pImp->SetPluginPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetStoragePath( const OUString& rPath )
 {
     pImp->SetStoragePath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetTempPath( const OUString& rPath )
 {
     pImp->SetTempPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetTemplatePath( const OUString& rPath )
 {
     pImp->SetTemplatePath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetUserConfigPath( const OUString& rPath )
 {
     pImp->SetUserConfigPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtPathOptions::SetWorkPath( const OUString& rPath )
 {
     pImp->SetWorkPath( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtPathOptions::SubstituteVariable( const OUString& rVar ) const
 {
     return pImp->SubstVar( rVar );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtPathOptions::ExpandMacros( const OUString& rPath ) const
 {
     return pImp->ExpandMacros( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString SvtPathOptions::UseVariable( const OUString& rPath ) const
 {
     return pImp->UsePathVariables( rPath );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
 {
@@ -953,7 +953,7 @@ bool SvtPathOptions::SearchFile( OUString& rIniFile, Paths ePath )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 const LanguageTag& SvtPathOptions::GetLanguageTag() const
 {
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index b4736c263254..425cf3a8f5fc 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -27,9 +27,9 @@
 
 #include <itemholder1.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 using namespace ::utl                   ;
 using namespace ::rtl                   ;
@@ -56,23 +56,23 @@ class SvtPrintWarningOptions_Impl : public ConfigItem
 {
 public:
 
-//---------------------------------------------------------------------------------------------------------
+
 //  constructor / destructor
-//---------------------------------------------------------------------------------------------------------
+
 
      SvtPrintWarningOptions_Impl();
     ~SvtPrintWarningOptions_Impl();
 
-//---------------------------------------------------------------------------------------------------------
+
 //  overloaded methods of baseclass
-//---------------------------------------------------------------------------------------------------------
+
 
     virtual void Commit();
     virtual void    Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames );
 
-//---------------------------------------------------------------------------------------------------------
+
 //  public interface
-//---------------------------------------------------------------------------------------------------------
+
 
     bool    IsPaperSize() const { return m_bPaperSize; }
     bool    IsPaperOrientation() const { return m_bPaperOrientation; }
@@ -86,17 +86,17 @@ public:
     void        SetTransparency( bool bState ) { m_bTransparency = bState; SetModified(); }
     void        SetModifyDocumentOnPrintingAllowed( bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); }
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private methods
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
 
     static Sequence< OUString > impl_GetPropertyNames();
 
-//-------------------------------------------------------------------------------------------------------------
+
 //  private member
-//-------------------------------------------------------------------------------------------------------------
+
 
 private:
 
@@ -337,7 +337,7 @@ void SvtPrintWarningOptions::SetTransparency( bool bState )
     MutexGuard aGuard( GetOwnStaticMutex() );
     m_pDataContainer->SetTransparency( bState );
 }
-// -----------------------------------------------------------------------------
+
 
 bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const
 {
@@ -345,7 +345,7 @@ bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const
     return m_pDataContainer->IsModifyDocumentOnPrintingAllowed();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( bool bState )
 {
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 609ecc58f0d8..321a930b1b25 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -389,7 +389,7 @@ Sequence< OUString > GetPropertyNames()
     return aNames;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     : ConfigItem( OUString("Office.Common/Save") )
@@ -745,7 +745,7 @@ void SvtSaveOptions_Impl::Commit()
     batch->commit();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SvtSaveOptions_Impl::Notify( const Sequence<OUString>& )
 {
@@ -767,7 +767,7 @@ public:
     void                    SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();}
     bool                IsLoadUserSettings() const {return bLoadUserDefinedSettings;}
 };
-// -----------------------------------------------------------------------
+
 const sal_Char cUserDefinedSettings[] = "UserDefinedSettings";
 
 SvtLoadOptions_Impl::SvtLoadOptions_Impl()
@@ -783,11 +783,11 @@ SvtLoadOptions_Impl::SvtLoadOptions_Impl()
     if (pValues[0].getValueTypeClass() == ::com::sun::star::uno::TypeClass_BOOLEAN)
          bLoadUserDefinedSettings = *(sal_Bool *)pValues[0].getValue();
 }
-// -----------------------------------------------------------------------
+
 SvtLoadOptions_Impl::~SvtLoadOptions_Impl()
 {
 }
-// -----------------------------------------------------------------------
+
 void SvtLoadOptions_Impl::Commit()
 {
     Sequence< OUString > aNames(1);
@@ -796,12 +796,12 @@ void SvtLoadOptions_Impl::Commit()
     aValues[0].setValue(&bLoadUserDefinedSettings, ::getBooleanCppuType());
     PutProperties( aNames, aValues );
 }
-// -----------------------------------------------------------------------
+
 void SvtLoadOptions_Impl::Notify( const Sequence<OUString>& )
 {
     SAL_WARN( "unotools.config", "properties have been changed" );
 }
-// -----------------------------------------------------------------------
+
 
 namespace
 {
@@ -810,7 +810,7 @@ namespace
     };
 }
 
-// -----------------------------------------------------------------------
+
 SvtSaveOptions::SvtSaveOptions()
 {
     // Global access, must be guarded (multithreading)
@@ -827,7 +827,7 @@ SvtSaveOptions::SvtSaveOptions()
     pImp = pOptions;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtSaveOptions::~SvtSaveOptions()
 {
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index c1203331b0fd..314cede137a1 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -106,22 +106,22 @@ using namespace ::com::sun::star::uno   ;
 
 class SvtSecurityOptions_Impl : public ConfigItem
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
 
          SvtSecurityOptions_Impl();
         ~SvtSecurityOptions_Impl();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  overloaded methods of baseclass
-        //---------------------------------------------------------------------------------------------------------
+
 
         /*-****************************************************************************************************//**
             @short      called for notify of configmanager
@@ -154,9 +154,9 @@ class SvtSecurityOptions_Impl : public ConfigItem
 
         virtual void Commit();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  public interface
-        //---------------------------------------------------------------------------------------------------------
+
 
         bool                IsReadOnly      ( SvtSecurityOptions::EOption eOption                   ) const ;
 
diff --git a/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 95389433c0d9..0aec1c473d1e 100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.cxx
@@ -137,7 +137,7 @@ const Sequence< OUString > SvtSysLocaleOptions_Impl::GetPropertyNames()
     return seqPropertyNames;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvtSysLocaleOptions_Impl::SvtSysLocaleOptions_Impl()
     : ConfigItem( ROOTNODE_SYSLOCALE )
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 124eaef77334..7589c3f56d32 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -102,7 +102,7 @@ sal_Int32                    SvtViewOptions::m_nRefCount_Windows         =   0
 class IMPL_TViewData
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         // create "default" item
         IMPL_TViewData()
         {
@@ -114,7 +114,7 @@ class IMPL_TViewData
             m_bDefault     = true            ;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // write access - with reseting of default state
         void setWindowState( const OUString& sValue )
         {
@@ -125,7 +125,7 @@ class IMPL_TViewData
             m_sWindowState = sValue;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         void setUserData( const css::uno::Sequence< css::beans::NamedValue >& lValue )
         {
             m_bDefault  = (
@@ -135,7 +135,7 @@ class IMPL_TViewData
             m_lUserData = lValue;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         void setPageID( sal_Int32 nValue )
         {
             m_bDefault = (
@@ -145,7 +145,7 @@ class IMPL_TViewData
             m_nPageID  = nValue;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         void setVisible( bool bValue )
         {
             m_bDefault = (
@@ -155,14 +155,14 @@ class IMPL_TViewData
             m_bVisible = bValue;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // read access
         OUString                              getWindowState() { return m_sWindowState; }
         css::uno::Sequence< css::beans::NamedValue > getUserData   () { return m_lUserData   ; }
         sal_Int32                                    getPageID     () { return m_nPageID     ; }
         bool                                     getVisible    () { return m_bVisible    ; }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // special operation for easy access on user data
         void setUserItem( const OUString& sName  ,
                           const css::uno::Any&   aValue )
@@ -195,7 +195,7 @@ class IMPL_TViewData
             }
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         css::uno::Any getUserItem( const OUString& sName )
         {
             // default value - if item not exist!
@@ -213,7 +213,7 @@ class IMPL_TViewData
             return aValue;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // check for default items
         bool isDefault() { return m_bDefault; }
 
@@ -252,7 +252,7 @@ typedef ::boost::unordered_map< OUString                    ,
 *//*-*************************************************************************************************************/
 class SvtViewOptionsBase_Impl
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
         enum State { STATE_NONE, STATE_FALSE, STATE_TRUE };
 
@@ -278,12 +278,12 @@ class SvtViewOptionsBase_Impl
                                                                                   const OUString&                                sItem    ,
                                                                                   const css::uno::Any&                                  aValue   );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         css::uno::Reference< css::uno::XInterface > impl_getSetNode( const OUString& sNode           ,
                                                                            bool         bCreateIfMissing);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         OUString                                    m_sListName;
         css::uno::Reference< css::container::XNameAccess > m_xRoot;
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index c6b04807a216..bbb53532c4af 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -54,7 +54,7 @@ const OUString& AtomProvider::getString( int nAtom ) const
     return it == m_aStringMap.end() ? aEmpty : it->second;
 }
 
-// -----------------------------------------------------------------------
+
 
 MultiAtomProvider::MultiAtomProvider()
 {
diff --git a/unotools/source/misc/closeveto.cxx b/unotools/source/misc/closeveto.cxx
index 24a084d96145..b645240cfee1 100644
--- a/unotools/source/misc/closeveto.cxx
+++ b/unotools/source/misc/closeveto.cxx
@@ -77,7 +77,7 @@ namespace utl
         bool    m_bHasOwnership;
     };
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL CloseListener_Impl::queryClosing( const EventObject& i_source, ::sal_Bool i_deliverOwnership ) throw (CloseVetoException, RuntimeException)
     {
         (void)i_source;
@@ -88,13 +88,13 @@ namespace utl
         throw CloseVetoException();
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL CloseListener_Impl::notifyClosing( const EventObject& i_source ) throw (RuntimeException)
     {
         (void)i_source;
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     void SAL_CALL CloseListener_Impl::disposing( const EventObject& i_source ) throw (RuntimeException)
     {
         (void)i_source;
@@ -114,7 +114,7 @@ namespace utl
     //==================================================================================================================
     namespace
     {
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_init( CloseVeto_Data& i_data, const Reference< XInterface >& i_closeable )
         {
             i_data.xCloseable.set( i_closeable, UNO_QUERY );
@@ -124,7 +124,7 @@ namespace utl
             i_data.xCloseable->addCloseListener( i_data.pListener.get() );
         }
 
-        //--------------------------------------------------------------------------------------------------------------
+
         void lcl_deinit( CloseVeto_Data& i_data )
         {
             if ( !i_data.xCloseable.is() )
@@ -149,14 +149,14 @@ namespace utl
     //==================================================================================================================
     //= CloseVeto
     //==================================================================================================================
-    //------------------------------------------------------------------------------------------------------------------
+
     CloseVeto::CloseVeto( const Reference< XInterface >& i_closeable )
         :m_pData( new CloseVeto_Data )
     {
         lcl_init( *m_pData, i_closeable );
     }
 
-    //------------------------------------------------------------------------------------------------------------------
+
     CloseVeto::~CloseVeto()
     {
         lcl_deinit( *m_pData );
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 14d572b9a1d2..101bf989ae62 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -69,14 +69,14 @@ namespace utl
         OComponentResModuleImpl& operator=( const OComponentResModuleImpl& );   // never implemented
     };
 
-    //--------------------------------------------------------------------
+
     void OComponentResModuleImpl::freeResManager()
     {
         delete m_pResources, m_pResources = NULL;
         m_bInitialized = false;
     }
 
-    //--------------------------------------------------------------------
+
     ResMgr* OComponentResModuleImpl::getResManager()
     {
         if ( !m_pResources && !m_bInitialized )
@@ -98,32 +98,32 @@ namespace utl
     //====================================================================
     //= OComponentResourceModule
     //====================================================================
-    //--------------------------------------------------------------------
+
     OComponentResourceModule::OComponentResourceModule( const OString& _rResFilePrefix )
         :BaseClass()
         ,m_pImpl( new OComponentResModuleImpl( _rResFilePrefix ) )
     {
     }
 
-    //--------------------------------------------------------------------
+
     OComponentResourceModule::~OComponentResourceModule()
     {
     }
 
-    //-------------------------------------------------------------------------
+
     ResMgr* OComponentResourceModule::getResManager()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
         return m_pImpl->getResManager();
     }
 
-    //--------------------------------------------------------------------------
+
     void OComponentResourceModule::onFirstClient()
     {
         BaseClass::onFirstClient();
     }
 
-    //--------------------------------------------------------------------------
+
     void OComponentResourceModule::onLastClient()
     {
         m_pImpl->freeResManager();
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index af477672d1eb..176769d989cd 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -143,7 +143,7 @@ namespace
 //.........................................................................
 namespace utl
 {
-//------------------------------------------------------------------
+
 void typeConvert(const Date& _rDate, starutil::Date& _rOut)
 {
     _rOut.Day = _rDate.GetDay();
@@ -151,13 +151,13 @@ void typeConvert(const Date& _rDate, starutil::Date& _rOut)
     _rOut.Year = _rDate.GetYear();
 }
 
-//------------------------------------------------------------------
+
 void typeConvert(const starutil::Date& _rDate, Date& _rOut)
 {
     _rOut = Date(_rDate.Day, _rDate.Month, _rDate.Year);
 }
 
-//------------------------------------------------------------------
+
 void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut)
 {
     _rOut.Year = _rDateTime.GetYear();
@@ -169,7 +169,7 @@ void typeConvert(const DateTime& _rDateTime, starutil::DateTime& _rOut)
     _rOut.NanoSeconds = _rDateTime.GetNanoSec();
 }
 
-//------------------------------------------------------------------
+
 void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut)
 {
     Date aDate(_rDateTime.Day, _rDateTime.Month, _rDateTime.Year);
diff --git a/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index 1aa7b32c0aca..55901ebc310f 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.cxx
@@ -77,17 +77,17 @@ namespace utl
             virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
         };
 
-        //--------------------------------------------------------------------
+
         OObserverImpl::OObserverImpl()
         {
         }
 
-        //--------------------------------------------------------------------
+
         OObserverImpl::~OObserverImpl()
         {
         }
 
-        //--------------------------------------------------------------------
+
         void OObserverImpl::ensureObservation()
         {
             {
@@ -111,7 +111,7 @@ namespace utl
             }
         }
 
-        //--------------------------------------------------------------------
+
         void SAL_CALL OObserverImpl::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException)
         {
             Listeners aToNotify;
@@ -130,7 +130,7 @@ namespace utl
             }
         }
 
-        //--------------------------------------------------------------------
+
         void SAL_CALL OObserverImpl::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException)
         {
             // get the listeners
@@ -158,7 +158,7 @@ namespace utl
             }
         }
 
-        //--------------------------------------------------------------------
+
         void SAL_CALL OObserverImpl::disposing( const EventObject& /*Event*/ ) throw (RuntimeException)
         {
 #if OSL_DEBUG_LEVEL > 0
@@ -172,7 +172,7 @@ namespace utl
     //====================================================================
     //= DesktopTerminationObserver
     //====================================================================
-    //--------------------------------------------------------------------
+
     void DesktopTerminationObserver::registerTerminationListener( ITerminationListener* _pListener )
     {
         if ( !_pListener )
@@ -192,7 +192,7 @@ namespace utl
         OObserverImpl::ensureObservation();
     }
 
-    //--------------------------------------------------------------------
+
     void DesktopTerminationObserver::revokeTerminationListener( ITerminationListener* _pListener )
     {
         ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
diff --git a/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index 61b4257d4576..d9446d59ba58 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.cxx
@@ -55,7 +55,7 @@ namespace utl
         virtual void SAL_CALL disposing( const EventObject& _rSource ) throw (RuntimeException);
     };
 
-    //---------------------------------------------------------------------
+
     OEventListenerImpl::OEventListenerImpl( OEventListenerAdapter* _pAdapter, const Reference< XComponent >& _rxComp )
         :m_pAdapter(_pAdapter)
     {
@@ -72,7 +72,7 @@ namespace utl
         m_xKeepMeAlive = xMeMyselfAndI;
     }
 
-    //---------------------------------------------------------------------
+
     void OEventListenerImpl::dispose()
     {
         if (m_xComponent.is())
@@ -83,7 +83,7 @@ namespace utl
         }
     }
 
-    //---------------------------------------------------------------------
+
     void SAL_CALL OEventListenerImpl::disposing( const EventObject& _rSource ) throw (RuntimeException)
     {
         Reference< XEventListener > xDeleteUponLeaving = m_xKeepMeAlive;
@@ -105,13 +105,13 @@ namespace utl
     //=====================================================================
     //= OEventListenerAdapter
     //=====================================================================
-    //---------------------------------------------------------------------
+
     OEventListenerAdapter::OEventListenerAdapter()
         :m_pImpl(new OEventListenerAdapterImpl)
     {
     }
 
-    //---------------------------------------------------------------------
+
     OEventListenerAdapter::~OEventListenerAdapter()
     {
         stopAllComponentListening( );
@@ -119,7 +119,7 @@ namespace utl
         m_pImpl = NULL;
     }
 
-    //---------------------------------------------------------------------
+
     void OEventListenerAdapter::stopComponentListening( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxComp )
     {
         if ( m_pImpl->aListeners.empty() )
@@ -141,7 +141,7 @@ namespace utl
         while ( dispose != m_pImpl->aListeners.end() );
     }
 
-    //---------------------------------------------------------------------
+
     void OEventListenerAdapter::stopAllComponentListening(  )
     {
         for (   ::std::vector< void* >::const_iterator aDisposeLoop = m_pImpl->aListeners.begin();
@@ -156,7 +156,7 @@ namespace utl
         m_pImpl->aListeners.clear();
     }
 
-    //---------------------------------------------------------------------
+
     void OEventListenerAdapter::startComponentListening( const Reference< XComponent >& _rxComp )
     {
         if (!_rxComp.is())
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index cdb8bd6568c6..489374eb44a7 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -320,7 +320,7 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
 {   NULL,                   NULL },
 };
 
-// -----------------------------------------------------------------------
+
 
 void GetEnglishSearchFontName( OUString& rName )
 {
@@ -442,7 +442,7 @@ void GetEnglishSearchFontName( OUString& rName )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString GetNextFontToken( const OUString& rTokenStr, sal_Int32& rIndex )
 {
@@ -505,7 +505,7 @@ static bool ImplIsFontToken( const OUString& rName, const OUString& rToken )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplAppendFontToken( OUString& rName, const OUString& rNewToken )
 {
@@ -578,7 +578,7 @@ OUString GetSubsFontName( const OUString& rName, sal_uLong nFlags )
     return aName;
 }
 
-// -----------------------------------------------------------------------
+
 
 // TODO: use a more generic String hash
 int FontNameHash::operator()( const OUString& rStr ) const
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 8014c978d82e..e934bf3561f3 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -386,7 +386,7 @@ bool MediaDescriptor::isStreamReadOnly() const
     return bReadOnly;
 }
 
-// ----------------------------------------------------------------------------
+
 
 css::uno::Any MediaDescriptor::getComponentDataEntry( const OUString& rName ) const
 {
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index 8b75bdc9e5cc..626a8b5042c9 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.cxx
@@ -42,14 +42,14 @@ namespace utl
     //========================================================================
     //= DisposableComponent
     //========================================================================
-    //------------------------------------------------------------------------
+
     DisposableComponent::DisposableComponent( const Reference< XInterface >& _rxComponent )
         :m_xComponent( _rxComponent, UNO_QUERY )
     {
         DBG_ASSERT( m_xComponent.is() || !_rxComponent.is(), "DisposableComponent::DisposableComponent: should be an XComponent!" );
     }
 
-    //------------------------------------------------------------------------
+
     DisposableComponent::~DisposableComponent()
     {
         if ( m_xComponent.is() )
@@ -113,7 +113,7 @@ namespace utl
         CloseableComponentImpl& operator=( const CloseableComponentImpl& ); // never implemented
     };
 
-    //------------------------------------------------------------------------
+
     CloseableComponentImpl::CloseableComponentImpl( const Reference< XInterface >& _rxComponent )
         :m_xCloseable( _rxComponent, UNO_QUERY )
     {
@@ -121,14 +121,14 @@ namespace utl
         DBG_ASSERT( m_xCloseable.is() || !_rxComponent.is(), "CloseableComponentImpl::CloseableComponentImpl: component is not an XCloseable!" );
         impl_nf_switchListening( true );
     }
-    //------------------------------------------------------------------------
+
     CloseableComponentImpl::~CloseableComponentImpl()
     {
         nf_closeComponent();
         DBG_DTOR( CloseableComponentImpl, NULL );
     }
 
-    //------------------------------------------------------------------------
+
     void CloseableComponentImpl::nf_closeComponent()
     {
         if ( !m_xCloseable.is() )
@@ -153,7 +153,7 @@ namespace utl
         m_xCloseable.clear();
     }
 
-    //------------------------------------------------------------------------
+
     void CloseableComponentImpl::impl_nf_switchListening( bool _bListen )
     {
         if ( !m_xCloseable.is() )
@@ -172,7 +172,7 @@ namespace utl
         }
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CloseableComponentImpl::queryClosing( const EventObject&
     #ifdef DBG_UTIL
     Source
@@ -185,7 +185,7 @@ namespace utl
         throw CloseVetoException();
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CloseableComponentImpl::notifyClosing( const EventObject&
     #ifdef DBG_UTIL
     Source
@@ -200,7 +200,7 @@ namespace utl
         OSL_FAIL( "CloseableComponentImpl::notifyClosing: unreachable!" );
     }
 
-    //--------------------------------------------------------------------
+
     void SAL_CALL CloseableComponentImpl::disposing( const EventObject&
     #ifdef DBG_UTIL
     Source
@@ -216,14 +216,14 @@ namespace utl
     //= CloseableComponentImpl
     //========================================================================
     DBG_NAME( CloseableComponent )
-    //------------------------------------------------------------------------
+
     CloseableComponent::CloseableComponent( const Reference< XInterface >& _rxComponent )
         :m_pImpl( new CloseableComponentImpl( _rxComponent ) )
     {
         DBG_CTOR( CloseableComponent, NULL );
     }
 
-    //------------------------------------------------------------------------
+
     CloseableComponent::~CloseableComponent()
     {
         // close the component, deliver ownership to anybody who wants to veto the close
diff --git a/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 9ff0fc47c068..863d88873c5b 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.cxx
@@ -52,7 +52,7 @@ private:
     void                        setDateAcceptancePatternsConfig();
 };
 
-// -----------------------------------------------------------------------
+
 
 SvtSysLocale_Impl::SvtSysLocale_Impl() : pCharClass(NULL)
 {
@@ -194,7 +194,7 @@ const LanguageTag& SvtSysLocale::GetUILanguageTag() const
     return pImpl->aSysLocaleOptions.GetRealUILanguageTag();
 }
 
-//------------------------------------------------------------------------
+
 
 // static
 rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index da0a198565b1..1fc0329507d0 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.cxx
@@ -22,19 +22,19 @@
 namespace utl
 {
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInputStreamHelper::acquire() throw ()
 {
     InputStreamHelper_Base::acquire();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInputStreamHelper::release() throw ()
 {
     InputStreamHelper_Base::release();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OInputStreamHelper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
     throw(stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException)
 {
@@ -86,7 +86,7 @@ sal_Int64 SAL_CALL OInputStreamHelper::getLength(  ) throw(::com::sun::star::io:
     return aStat.nSize;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData,
                                                      sal_Int32 nMaxBytesToRead)
     throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException)
@@ -95,7 +95,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::readSomeBytes(staruno::Sequence< sal_Int8
     return readBytes(aData, nMaxBytesToRead);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
     throw (stario::NotConnectedException, stario::BufferSizeExceededException, stario::IOException, staruno::RuntimeException)
 {
@@ -109,7 +109,7 @@ void SAL_CALL OInputStreamHelper::skipBytes(sal_Int32 nBytesToSkip)
     m_nActPos += nBytesToSkip;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OInputStreamHelper::available()
     throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException)
 {
@@ -120,7 +120,7 @@ sal_Int32 SAL_CALL OInputStreamHelper::available()
     return m_nAvailable;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInputStreamHelper::closeInput()
     throw (stario::NotConnectedException, stario::IOException, staruno::RuntimeException)
 {
diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index e54c2455e04c..dfce39da1699 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::lang;
 //= OInputStreamWrapper
 //==================================================================
 DBG_NAME(OInputStreamWrapper)
-//------------------------------------------------------------------
+
 OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream )
                  :m_pSvStream(&_rStream)
                  ,m_bSvStreamOwner(false)
@@ -41,7 +41,7 @@ OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream )
 
 }
 
-//------------------------------------------------------------------
+
 OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner )
                  :m_pSvStream( pStream )
                  ,m_bSvStreamOwner( bOwner )
@@ -50,7 +50,7 @@ OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner )
 
 }
 
-//------------------------------------------------------------------
+
 OInputStreamWrapper::~OInputStreamWrapper()
 {
     if( m_bSvStreamOwner )
@@ -59,7 +59,7 @@ OInputStreamWrapper::~OInputStreamWrapper()
     DBG_DTOR(OInputStreamWrapper,NULL);
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead)
                 throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
@@ -82,7 +82,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 >&
     return nRead;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     checkError();
@@ -99,7 +99,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int
         return readBytes(aData, nMaxBytesToRead);
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -109,7 +109,7 @@ void SAL_CALL OInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( star
     checkError();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedException, staruno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -128,7 +128,7 @@ sal_Int32 SAL_CALL OInputStreamWrapper::available() throw( stario::NotConnectedE
     return nAvailable;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -140,14 +140,14 @@ void SAL_CALL OInputStreamWrapper::closeInput() throw( stario::NotConnectedExcep
     m_pSvStream = NULL;
 }
 
-//------------------------------------------------------------------------------
+
 void OInputStreamWrapper::checkConnected() const
 {
     if (!m_pSvStream)
         throw stario::NotConnectedException(OUString(), const_cast<staruno::XWeak*>(static_cast<const staruno::XWeak*>(this)));
 }
 
-//------------------------------------------------------------------------------
+
 void OInputStreamWrapper::checkError() const
 {
     checkConnected();
@@ -160,19 +160,19 @@ void OInputStreamWrapper::checkError() const
 //==================================================================
 //= OSeekableInputStreamWrapper
 //==================================================================
-//------------------------------------------------------------------------------
+
 OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream& _rStream)
 {
     SetStream( &_rStream, false );
 }
 
-//------------------------------------------------------------------------------
+
 OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner)
 {
     SetStream( _pStream, _bOwner );
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -182,7 +182,7 @@ void SAL_CALL OSeekableInputStreamWrapper::seek( sal_Int64 _nLocation ) throw (I
     checkError();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -193,7 +193,7 @@ sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getPosition(  ) throw (IOExcepti
     return (sal_Int64)nPos;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OSeekableInputStreamWrapper::getLength(  ) throw (IOException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -233,19 +233,19 @@ void SAL_CALL OOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8
     }
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OOutputStreamWrapper::flush() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     rStream.Flush();
     checkError();
 }
 
-//------------------------------------------------------------------
+
 void SAL_CALL OOutputStreamWrapper::closeOutput() throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
 }
 
-//------------------------------------------------------------------------------
+
 void OOutputStreamWrapper::checkError() const
 {
     if (rStream.GetError() != ERRCODE_NONE)
@@ -256,7 +256,7 @@ void OOutputStreamWrapper::checkError() const
 //==================================================================
 //= OSeekableOutputStreamWrapper
 //==================================================================
-//------------------------------------------------------------------------------
+
 OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream)
     :OOutputStreamWrapper(_rStream)
 {
@@ -264,7 +264,7 @@ OSeekableOutputStreamWrapper::OSeekableOutputStreamWrapper(SvStream& _rStream)
 
 OSeekableOutputStreamWrapper::~OSeekableOutputStreamWrapper() {}
 
-//------------------------------------------------------------------------------
+
 Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType ) throw (RuntimeException)
 {
     Any aReturn = OOutputStreamWrapper::queryInterface(_rType);
@@ -273,26 +273,26 @@ Any SAL_CALL OSeekableOutputStreamWrapper::queryInterface( const Type& _rType )
     return aReturn;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OSeekableOutputStreamWrapper::acquire(  ) throw ()
 {
     OOutputStreamWrapper::acquire();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OSeekableOutputStreamWrapper::release(  ) throw ()
 {
     OOutputStreamWrapper::release();
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OSeekableOutputStreamWrapper::seek( sal_Int64 _nLocation ) throw (IllegalArgumentException, IOException, RuntimeException)
 {
     rStream.Seek((sal_uInt32)_nLocation);
     checkError();
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  ) throw (IOException, RuntimeException)
 {
     sal_uInt32 nPos = rStream.Tell();
@@ -300,7 +300,7 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getPosition(  ) throw (IOExcept
     return (sal_Int64)nPos;
 }
 
-//------------------------------------------------------------------------------
+
 sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  ) throw (IOException, RuntimeException)
 {
     sal_uInt32 nCurrentPos = rStream.Tell();
@@ -315,25 +315,25 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength(  ) throw (IOExceptio
     return (sal_Int64)nEndPos;
 }
 
-//------------------------------------------------------------------------------
+
 OStreamWrapper::OStreamWrapper(SvStream& _rStream)
 {
     SetStream( &_rStream, false );
 }
 
-//------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL OStreamWrapper::getInputStream(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return this;
 }
 
-//------------------------------------------------------------------------------
+
 ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL OStreamWrapper::getOutputStream(  ) throw (::com::sun::star::uno::RuntimeException)
 {
     return this;
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aData) throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException)
 {
     sal_uInt32 nWritten = m_pSvStream->Write(aData.getConstArray(),aData.getLength());
@@ -346,7 +346,7 @@ void SAL_CALL OStreamWrapper::writeBytes(const staruno::Sequence< sal_Int8 >& aD
     }
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException)
 {
     m_pSvStream->Flush();
@@ -354,12 +354,12 @@ void SAL_CALL OStreamWrapper::flush() throw(stario::NotConnectedException, stari
         throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OStreamWrapper::closeOutput() throw(stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException)
 {
 }
 
-//------------------------------------------------------------------------------
+
 void SAL_CALL OStreamWrapper::truncate() throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     m_pSvStream->SetStreamSize(0);
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 6e9d826c49e0..13907c2777b8 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.cxx
@@ -1228,7 +1228,7 @@ static bool _UCBOpenContentSync(
     return ( bAborted || bException );
 }
 
-//----------------------------------------------------------------------------
+
 UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler )
     : m_aExpireDate( DateTime::EMPTY )
     , m_xInputStream (NULL)
@@ -1242,7 +1242,7 @@ UcbLockBytes::UcbLockBytes( UcbLockBytesHandler* pHandler )
     SetSynchronMode( true );
 }
 
-//----------------------------------------------------------------------------
+
 UcbLockBytes::~UcbLockBytes()
 {
     if ( !m_bDontClose )
@@ -1284,7 +1284,7 @@ Reference < XInputStream > UcbLockBytes::getInputStream()
     return m_xInputStream;
 }
 
-//----------------------------------------------------------------------------
+
 
 bool UcbLockBytes::setStream_Impl( const Reference<XStream>& aStream )
 {
@@ -1350,7 +1350,7 @@ void UcbLockBytes::SetStreamValid_Impl()
         m_aInitialized.set();
 }
 
-//----------------------------------------------------------------------------
+
 void UcbLockBytes::terminate_Impl()
 {
     m_bTerminated = true;
@@ -1367,13 +1367,13 @@ void UcbLockBytes::terminate_Impl()
         m_xHandler->Handle( UcbLockBytesHandler::DONE, this );
 }
 
-//----------------------------------------------------------------------------
+
 void UcbLockBytes::SetSynchronMode (bool bSynchron)
 {
     SvLockBytes::SetSynchronMode (bSynchron);
 }
 
-//----------------------------------------------------------------------------
+
 ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount, sal_uLong *pRead) const
 {
     if ( IsSynchronMode() )
@@ -1441,7 +1441,7 @@ ErrCode UcbLockBytes::ReadAt ( sal_uLong nPos, void *pBuffer, sal_uLong nCount,
     return ERRCODE_NONE;
 }
 
-//----------------------------------------------------------------------------
+
 ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong nCount, sal_uLong *pWritten)
 {
     if ( pWritten )
@@ -1480,7 +1480,7 @@ ErrCode UcbLockBytes::WriteAt ( sal_uLong nPos, const void *pBuffer, sal_uLong n
     return ERRCODE_NONE;
 }
 
-//----------------------------------------------------------------------------
+
 ErrCode UcbLockBytes::Flush() const
 {
     Reference <XOutputStream > xOutputStream = getOutputStream_Impl();
@@ -1499,7 +1499,7 @@ ErrCode UcbLockBytes::Flush() const
     return ERRCODE_NONE;
 }
 
-//----------------------------------------------------------------------------
+
 ErrCode UcbLockBytes::SetSize (sal_uLong nNewSize)
 {
     SvLockBytesStat aStat;
@@ -1533,7 +1533,7 @@ ErrCode UcbLockBytes::SetSize (sal_uLong nNewSize)
     return ERRCODE_NONE;
 }
 
-//----------------------------------------------------------------------------
+
 ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
 {
     if ( IsSynchronMode() )
@@ -1570,7 +1570,7 @@ ErrCode UcbLockBytes::Stat( SvLockBytesStat *pStat, SvLockBytesStatFlag) const
     return ERRCODE_NONE;
 }
 
-//----------------------------------------------------------------------------
+
 IMPL_LINK_NOARG(UcbLockBytes, DataAvailHdl)
 {
     if ( hasInputStream_Impl() && m_xHandler.Is() )
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 8850d920639f..0d01d30febe6 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -363,7 +363,7 @@ namespace
     }
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionRequest >& i_rRequest, const OUString& i_rServiceName ) const
 {
     try
@@ -388,7 +388,7 @@ bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionReq
     return false;
 }
 
-// ---------------------------------------------------------------------------------------------------------------------
+
 bool UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XInteractionRequest > const & rRequest )
 {
     // the request
diff --git a/uui/source/masterpasscrtdlg.cxx b/uui/source/masterpasscrtdlg.cxx
index e69f0da9b8da..3bb60038724f 100644
--- a/uui/source/masterpasscrtdlg.cxx
+++ b/uui/source/masterpasscrtdlg.cxx
@@ -25,7 +25,7 @@
 
 // MasterPasswordCreateDialog---------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl)
 {
@@ -33,7 +33,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, EditHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
 {
@@ -52,7 +52,7 @@ IMPL_LINK_NOARG(MasterPasswordCreateDialog, OKHdl_Impl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 MasterPasswordCreateDialog::MasterPasswordCreateDialog(Window* pParent, ResMgr* pResMgr)
     : ModalDialog(pParent, "SetMasterPasswordDialog", "uui/ui/setmasterpassworddlg.ui")
diff --git a/uui/source/masterpassworddlg.cxx b/uui/source/masterpassworddlg.cxx
index ca3d11be2780..7cd12253ec95 100644
--- a/uui/source/masterpassworddlg.cxx
+++ b/uui/source/masterpassworddlg.cxx
@@ -24,7 +24,7 @@
 
 // MasterPasswordDialog---------------------------------------------------
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl)
 {
@@ -32,7 +32,7 @@ IMPL_LINK_NOARG(MasterPasswordDialog, OKHdl_Impl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 MasterPasswordDialog::MasterPasswordDialog
 (
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 2d83a53ba077..f05fedaff514 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -49,7 +49,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
                                   OUString const & rTargetFolderURL,
                                   OUString const & rClashingName,
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index d80fe6a2990a..b1ff004cfda1 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -27,7 +27,7 @@
 using namespace ::com::sun::star;
 
 
-// -----------------------------------------------------------------------
+
 
 static void lcl_Move( Window &rWin, long nOffset )
 {
@@ -36,7 +36,7 @@ static void lcl_Move( Window &rWin, long nOffset )
     rWin.SetPosPixel( aTmp );
 }
 
-// -----------------------------------------------------------------------
+
 
 PasswordDialog::PasswordDialog(
     Window* _pParent,
diff --git a/uui/source/sslwarndlg.cxx b/uui/source/sslwarndlg.cxx
index 556127a4385f..88ba2e570405 100644
--- a/uui/source/sslwarndlg.cxx
+++ b/uui/source/sslwarndlg.cxx
@@ -36,7 +36,7 @@ void SSLWarnDialog::ViewCert()
     xDocumentDigitalSignatures.get()->showCertificate(getCert());
 }
 
-// -----------------------------------------------------------------------
+
 
 SSLWarnDialog::SSLWarnDialog(Window* pParent,
     const css::uno::Reference< css::security::XCertificate >& rXCert,
diff --git a/uui/source/unknownauthdlg.cxx b/uui/source/unknownauthdlg.cxx
index abeb2afcd784..0eb3a4c1a4c0 100644
--- a/uui/source/unknownauthdlg.cxx
+++ b/uui/source/unknownauthdlg.cxx
@@ -28,7 +28,7 @@
 
 using namespace css;
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl)
 {
@@ -43,7 +43,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, OKHdl_Impl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl)
 {
@@ -57,7 +57,7 @@ IMPL_LINK_NOARG(UnknownAuthDialog, ViewCertHdl_Impl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 UnknownAuthDialog::UnknownAuthDialog(Window* pParent,
     const css::uno::Reference< css::security::XCertificate >& rXCert,
diff --git a/vbahelper/source/msforms/vbasystemaxcontrol.cxx b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
index 84ac5ebcbb73..9ae1c0f0e7ed 100644
--- a/vbahelper/source/msforms/vbasystemaxcontrol.cxx
+++ b/vbahelper/source/msforms/vbasystemaxcontrol.cxx
@@ -21,63 +21,63 @@
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-//----------------------------------------------------------
+
 VbaSystemAXControl::VbaSystemAXControl(  const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< uno::XInterface >& xControl, const uno::Reference< frame::XModel >& xModel, AbstractGeometryAttributes* pGeomHelper )
 : SystemAXControlImpl_BASE( xParent, xContext, xControl, xModel, pGeomHelper )
 , m_xControlInvocation( xControl, uno::UNO_QUERY_THROW )
 {
 }
 
-//----------------------------------------------------------
+
 uno::Reference< beans::XIntrospectionAccess > SAL_CALL VbaSystemAXControl::getIntrospection()
     throw ( uno::RuntimeException )
 {
     return m_xControlInvocation->getIntrospection();
 }
 
-//----------------------------------------------------------
+
 uno::Any SAL_CALL VbaSystemAXControl::invoke( const OUString& aFunctionName, const uno::Sequence< uno::Any >& aParams, uno::Sequence< ::sal_Int16 >& aOutParamIndex, uno::Sequence< uno::Any >& aOutParam )
     throw ( lang::IllegalArgumentException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException )
 {
     return m_xControlInvocation->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam );
 }
 
-//----------------------------------------------------------
+
 void SAL_CALL VbaSystemAXControl::setValue( const OUString& aPropertyName, const uno::Any& aValue )
     throw ( beans::UnknownPropertyException, script::CannotConvertException, reflection::InvocationTargetException, uno::RuntimeException )
 {
     m_xControlInvocation->setValue( aPropertyName, aValue );
 }
 
-//----------------------------------------------------------
+
 uno::Any SAL_CALL VbaSystemAXControl::getValue( const OUString& aPropertyName )
     throw ( beans::UnknownPropertyException, uno::RuntimeException )
 {
     return m_xControlInvocation->getValue( aPropertyName );
 }
 
-//----------------------------------------------------------
+
 ::sal_Bool SAL_CALL VbaSystemAXControl::hasMethod( const OUString& aName )
     throw ( uno::RuntimeException )
 {
     return m_xControlInvocation->hasMethod( aName );
 }
 
-//----------------------------------------------------------
+
 ::sal_Bool SAL_CALL VbaSystemAXControl::hasProperty( const OUString& aName )
     throw ( uno::RuntimeException )
 {
     return m_xControlInvocation->hasProperty( aName );
 }
 
-//----------------------------------------------------------
+
 OUString
 VbaSystemAXControl::getServiceImplName()
 {
     return OUString( "VbaSystemAXControl" );
 }
 
-//----------------------------------------------------------
+
 uno::Sequence< OUString >
 VbaSystemAXControl::getServiceNames()
 {
diff --git a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
index 5fc986e5677d..00fb17aab5c0 100644
--- a/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
+++ b/vbahelper/source/vbahelper/vbacommandbarcontrols.cxx
@@ -265,7 +265,7 @@ public:
         { return false; }
 };
 
-// ----------------------------------------------------------------------------
+
 
 VbaDummyCommandBarControls::VbaDummyCommandBarControls(
         const uno::Reference< XHelperInterface >& xParent,
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx
index 4b7976a6a847..2663b38409f8 100644
--- a/vbahelper/source/vbahelper/vbahelper.cxx
+++ b/vbahelper/source/vbahelper/vbahelper.cxx
@@ -802,7 +802,7 @@ void setOrAppendPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, con
 }
 
 // ====UserFormGeomentryHelper====
-//---------------------------------------------
+
 UserFormGeometryHelper::UserFormGeometryHelper(
         const uno::Reference< uno::XComponentContext >& /*xContext*/,
         const uno::Reference< awt::XControl >& xControl,
@@ -889,7 +889,7 @@ double UserFormGeometryHelper::getOffsetY() const
     return mfOffsetY;
 }
 
-// ----------------------------------------------------------------------------
+
 
 static const char saPosXName[] = "PositionX";
 static const char saPosYName[] = "PositionY";
diff --git a/vcl/generic/app/geninst.cxx b/vcl/generic/app/geninst.cxx
index c2a6c79cac4f..da3a3d66aad2 100644
--- a/vcl/generic/app/geninst.cxx
+++ b/vcl/generic/app/geninst.cxx
@@ -26,11 +26,11 @@
 
 #include "generic/geninst.h"
 
-// -------------------------------------------------------------------------
+
 //
 // SalYieldMutex
 //
-// -------------------------------------------------------------------------
+
 
 SalYieldMutex::SalYieldMutex()
 {
diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx
index 4102df704506..ae82903b9a71 100644
--- a/vcl/generic/fontmanager/fontmanager.cxx
+++ b/vcl/generic/fontmanager/fontmanager.cxx
@@ -108,7 +108,7 @@ inline sal_uInt32 getUInt32BE( const sal_uInt8*& pBuffer )
     return nRet;
 }
 
-// -------------------------------------------------------------------------
+
 
 static FontWeight parseWeight( const OString& rWeight )
 {
@@ -173,20 +173,20 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) :
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 PrintFontManager::PrintFont::~PrintFont()
 {
     delete m_pMetrics;
 }
 
-// -------------------------------------------------------------------------
+
 
 PrintFontManager::Type1FontFile::~Type1FontFile()
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 PrintFontManager::TrueTypeFontFile::TrueTypeFontFile()
 :   PrintFont( fonttype::TrueType )
@@ -195,20 +195,20 @@ PrintFontManager::TrueTypeFontFile::TrueTypeFontFile()
 ,   m_nTypeFlags( TYPEFLAG_INVALID )
 {}
 
-// -------------------------------------------------------------------------
+
 
 PrintFontManager::TrueTypeFontFile::~TrueTypeFontFile()
 {
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::Type1FontFile::queryMetricPage( int /*nPage*/, MultiAtomProvider* pProvider )
 {
     return readAfmMetrics( pProvider, false, false );
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomProvider* /*pProvider*/ )
 {
@@ -275,7 +275,7 @@ bool PrintFontManager::TrueTypeFontFile::queryMetricPage( int nPage, MultiAtomPr
     return bSuccess;
 }
 
-// -------------------------------------------------------------------------
+
 
 /* #i73387# There seem to be fonts with a rather unwell chosen family name
 *  consider e.g. "Helvetica Narrow" which defines its family as "Helvetica"
@@ -664,7 +664,7 @@ PrintFontManager& PrintFontManager::get()
     return *pManager;
 }
 
-// -------------------------------------------------------------------------
+
 
 /*
  *  the PrintFontManager
@@ -691,7 +691,7 @@ PrintFontManager::PrintFontManager()
     m_aFontInstallerTimer.SetTimeout(5000);
 }
 
-// -------------------------------------------------------------------------
+
 
 PrintFontManager::~PrintFontManager()
 {
@@ -703,7 +703,7 @@ PrintFontManager::~PrintFontManager()
     delete m_pFontCache;
 }
 
-// -------------------------------------------------------------------------
+
 
 OString PrintFontManager::getDirectory( int nAtom ) const
 {
@@ -711,7 +711,7 @@ OString PrintFontManager::getDirectory( int nAtom ) const
     return it != m_aAtomToDir.end() ? it->second : OString();
 }
 
-// -------------------------------------------------------------------------
+
 
 int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate )
 {
@@ -729,7 +729,7 @@ int PrintFontManager::getDirectoryAtom( const OString& rDirectory, bool bCreate
     return nAtom;
 }
 
-// -------------------------------------------------------------------------
+
 
 std::vector<fontID> PrintFontManager::addFontFile( const OString& rFileName )
 {
@@ -919,7 +919,7 @@ bool PrintFontManager::analyzeFontFile( int nDirID, const OString& rFontFile, ::
     return ! rNewFonts.empty();
 }
 
-// -------------------------------------------------------------------------
+
 
 fontID PrintFontManager::findFontFileID( int nDirID, const OString& rFontFile, int nFaceIndex ) const
 {
@@ -999,7 +999,7 @@ std::vector<fontID> PrintFontManager::findFontFileIDs( int nDirID, const OString
     return aIds;
 }
 
-// -------------------------------------------------------------------------
+
 
 OUString PrintFontManager::convertTrueTypeName( void* pRecord ) const
 {
@@ -1085,7 +1085,7 @@ namespace
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OUString >& rNames ) const
 {
@@ -1140,7 +1140,7 @@ void PrintFontManager::analyzeTrueTypeFamilyName( void* pTTFont, ::std::list< OU
     return;
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const
 {
@@ -1467,7 +1467,7 @@ void PrintFontManager::initialize()
     #endif
 }
 
-// -------------------------------------------------------------------------
+
 
 void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs )
 {
@@ -1478,7 +1478,7 @@ void PrintFontManager::getFontList( ::std::list< fontID >& rFontIDs )
         rFontIDs.push_back( it->first );
 }
 
-// -------------------------------------------------------------------------
+
 
 void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& rInfo ) const
 {
@@ -1502,7 +1502,7 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r
         rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
 }
 
-// -------------------------------------------------------------------------
+
 
 void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo ) const
 {
@@ -1525,7 +1525,7 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, PrintFontInfo& rInfo
     rInfo.m_nWidth          = pFont->m_aGlobalMetricX.width < pFont->m_aGlobalMetricY.width ? pFont->m_aGlobalMetricY.width : pFont->m_aGlobalMetricX.width;
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const
 {
@@ -1538,7 +1538,7 @@ bool PrintFontManager::getFontInfo( fontID nFontID, PrintFontInfo& rInfo ) const
     return pFont ? true : false;
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo ) const
 {
@@ -1551,7 +1551,7 @@ bool PrintFontManager::getFontFastInfo( fontID nFontID, FastPrintFontInfo& rInfo
     return pFont ? true : false;
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin, int& xMax, int& yMax )
 {
@@ -1576,7 +1576,7 @@ bool PrintFontManager::getFontBoundingBox( fontID nFontID, int& xMin, int& yMin,
     return bSuccess;
 }
 
-// -------------------------------------------------------------------------
+
 
 int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
 {
@@ -1589,7 +1589,7 @@ int PrintFontManager::getFontFaceNumber( fontID nFontID ) const
     return nRet;
 }
 
-// -------------------------------------------------------------------------
+
 
 
 FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
@@ -1657,7 +1657,7 @@ FontFamily PrintFontManager::matchFamilyName( const OUString& rFamily ) const
     return FAMILY_DONTKNOW;
 }
 
-// -------------------------------------------------------------------------
+
 
 OString PrintFontManager::getAfmFile( PrintFont* pFont ) const
 {
@@ -1680,7 +1680,7 @@ OString PrintFontManager::getAfmFile( PrintFont* pFont ) const
     return aMetricPath;
 }
 
-// -------------------------------------------------------------------------
+
 
 OString PrintFontManager::getFontFile( PrintFont* pFont ) const
 {
@@ -1705,7 +1705,7 @@ OString PrintFontManager::getFontFile( PrintFont* pFont ) const
     return aPath;
 }
 
-// -------------------------------------------------------------------------
+
 
 const OUString& PrintFontManager::getPSName( fontID nFontID ) const
 {
@@ -1719,7 +1719,7 @@ const OUString& PrintFontManager::getPSName( fontID nFontID ) const
     return m_pAtoms->getString( ATOM_PSNAME, pFont ? pFont->m_nPSName : INVALID_ATOM );
 }
 
-// -------------------------------------------------------------------------
+
 
 int PrintFontManager::getFontAscend( fontID nFontID ) const
 {
@@ -1735,7 +1735,7 @@ int PrintFontManager::getFontAscend( fontID nFontID ) const
     return pFont->m_nAscend;
 }
 
-// -------------------------------------------------------------------------
+
 
 int PrintFontManager::getFontDescend( fontID nFontID ) const
 {
@@ -1751,7 +1751,7 @@ int PrintFontManager::getFontDescend( fontID nFontID ) const
     return pFont->m_nDescend;
 }
 
-// -------------------------------------------------------------------------
+
 
 void PrintFontManager::hasVerticalSubstitutions( fontID nFontID,
     const sal_Unicode* pCharacters, int nCharacters, bool* pHasSubst ) const
@@ -1780,7 +1780,7 @@ void PrintFontManager::hasVerticalSubstitutions( fontID nFontID,
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const
 {
@@ -1818,7 +1818,7 @@ bool PrintFontManager::isFontDownloadingAllowedForPrinting( fontID nFont ) const
     return bRet;
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, int nLen, CharacterMetric* pArray, bool bVertical ) const
 {
@@ -1861,7 +1861,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, const sal_Unicode* pString, i
     return true;
 }
 
-// -------------------------------------------------------------------------
+
 
 bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal_Unicode maxCharacter, CharacterMetric* pArray, bool bVertical ) const
 {
@@ -1910,7 +1910,7 @@ bool PrintFontManager::getMetrics( fontID nFontID, sal_Unicode minCharacter, sal
     return true;
 }
 
-// -------------------------------------------------------------------------
+
 
 // TODO: move most of this stuff into the central font-subsetting code
 bool PrintFontManager::createFontSubset(
@@ -2143,7 +2143,7 @@ void PrintFontManager::getGlyphWidths( fontID nFont,
     }
 }
 
-// -------------------------------------------------------------------------
+
 
 const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( fontID nFont, const std::map< sal_Unicode, OString >** pNonEncoded ) const
 {
@@ -2160,7 +2160,7 @@ const std::map< sal_Unicode, sal_Int32 >* PrintFontManager::getEncodingMap( font
     return pFont->m_aEncodingVector.size() ? &pFont->m_aEncodingVector : NULL;
 }
 
-// -------------------------------------------------------------------------
+
 
 std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aChar ) const
 {
@@ -2182,7 +2182,7 @@ std::list< OString > PrintFontManager::getAdobeNameFromUnicode( sal_Unicode aCha
     return aRet;
 }
 
-// -------------------------------------------------------------------------
+
 std::list< sal_Unicode >  PrintFontManager::getUnicodeFromAdobeName( const OString& rName ) const
 {
     std::pair< boost::unordered_multimap< OString, sal_Unicode, OStringHash >::const_iterator,
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 7b2394cfcc6a..4a9d5572735a 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -114,7 +114,7 @@ void SalGenericInstance::RegisterFontSubstitutors( ImplDevFontList* pList )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static FontSelectPattern GetFcSubstitute(const FontSelectPattern &rFontSelData, OUString& rMissingCodes )
 {
@@ -152,7 +152,7 @@ namespace
     };
 }
 
-//--------------------------------------------------------------------------
+
 
 bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelData ) const
 {
@@ -219,7 +219,7 @@ bool FcPreMatchSubstititution::FindFontSubstitute( FontSelectPattern &rFontSelDa
     return bHaveSubstitute;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool FcGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFontSelData,
     OUString& rMissingCodes ) const
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx
index 42be83680f3b..53ccd83c055a 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -88,7 +88,7 @@ static void InitGammaTable()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static FT_Library aLibFT = 0;
 
@@ -99,7 +99,7 @@ typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl::
 
 namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; }
 
-// -----------------------------------------------------------------------
+
 
 // TODO: remove when the priorities are selected by UI
 // if (AH==0) => disable autohinting
@@ -142,7 +142,7 @@ FtFontFile::FtFontFile( const OString& rNativeFileName )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
 {
@@ -160,7 +160,7 @@ FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName )
     return pFontFile;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool FtFontFile::Map()
 {
@@ -189,7 +189,7 @@ bool FtFontFile::Map()
     return (mpFileMap != NULL);
 }
 
-// -----------------------------------------------------------------------
+
 
 void FtFontFile::Unmap()
 {
@@ -253,7 +253,7 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes,
     maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost();
 }
 
-// -----------------------------------------------------------------------
+
 
 FtFontInfo::~FtFontInfo()
 {
@@ -273,7 +273,7 @@ void FtFontInfo::InitHashes() const
     mpGlyph2Char = new Int2IntMap();
 }
 
-// -----------------------------------------------------------------------
+
 
 FT_FaceRec_* FtFontInfo::GetFaceFT()
 {
@@ -313,7 +313,7 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace()
 }
 #endif
 
-// -----------------------------------------------------------------------
+
 
 void FtFontInfo::ReleaseFaceFT()
 {
@@ -325,7 +325,7 @@ void FtFontInfo::ReleaseFaceFT()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
 static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);}
@@ -371,7 +371,7 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FtFontInfo::AnnounceFont( ImplDevFontList* pFontList )
 {
@@ -406,7 +406,7 @@ FreetypeManager::FreetypeManager()
     vclFontFileList::get();
 }
 
-// -----------------------------------------------------------------------
+
 
 FT_Face ServerFont::GetFtFace() const
 {
@@ -415,14 +415,14 @@ FT_Face ServerFont::GetFtFace() const
     return maFaceFT;
 }
 
-// -----------------------------------------------------------------------
+
 
 FreetypeManager::~FreetypeManager()
 {
     ClearFontList();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FreetypeManager::AddFontFile( const OString& rNormalizedName,
     int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr)
@@ -440,7 +440,7 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName,
         mnMaxFontId = nFontId;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FreetypeManager::AnnounceFonts( ImplDevFontList* pToAdd ) const
 {
@@ -451,7 +451,7 @@ void FreetypeManager::AnnounceFonts( ImplDevFontList* pToAdd ) const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FreetypeManager::ClearFontList( )
 {
@@ -463,7 +463,7 @@ void FreetypeManager::ClearFontList( )
     maFontList.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD )
 {
@@ -493,7 +493,7 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes&
     mbOrientation   = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
 {
@@ -667,7 +667,7 @@ bool ServerFont::TestFont() const
     return mbFaceOk;
 }
 
-// -----------------------------------------------------------------------
+
 
 ServerFont::~ServerFont()
 {
@@ -682,14 +682,14 @@ ServerFont::~ServerFont()
     ReleaseFromGarbageCollect();
 }
 
- // -----------------------------------------------------------------------
+
 
 int ServerFont::GetEmUnits() const
 {
     return maFaceFT->units_per_EM;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
 {
@@ -813,7 +813,7 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags )
 {
@@ -824,7 +824,7 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph
         rGlyphId = rFont.GetRawGlyphIndex( rGlyphId );
 }
 
-// -----------------------------------------------------------------------
+
 
 int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
     FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const
@@ -899,7 +899,7 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags,
     return nAngle;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
 {
@@ -944,7 +944,7 @@ sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const
     return sal_GlyphId( nGlyphIndex);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) const
 {
@@ -981,7 +981,7 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
 {
@@ -990,7 +990,7 @@ sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const
     return aGlyphId;
 }
 
-// -----------------------------------------------------------------------
+
 
 static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags )
 {
@@ -1005,7 +1005,7 @@ static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFl
     return (nCharWidth + 32) >> 6;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
 {
@@ -1058,7 +1058,7 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const
     FT_Done_Glyph( pGlyphFT );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ServerFont::GetAntialiasAdvice( void ) const
 {
@@ -1069,7 +1069,7 @@ bool ServerFont::GetAntialiasAdvice( void ) const
     return bAdviseAA;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
 {
@@ -1211,7 +1211,7 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const
 {
@@ -1344,9 +1344,9 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 // determine unicode ranges in font
-// -----------------------------------------------------------------------
+
 
 const ImplFontCharMap* ServerFont::GetImplFontCharMap( void ) const
 {
@@ -1444,9 +1444,9 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 // outline stuff
-// -----------------------------------------------------------------------
+
 
 class PolyArgs
 {
@@ -1473,7 +1473,7 @@ private:
     bool        bHasOffline;
 };
 
-// -----------------------------------------------------------------------
+
 
 PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
 :   mrPolyPoly(rPolyPoly),
@@ -1487,7 +1487,7 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints )
     maPosition.x = maPosition.y = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 PolyArgs::~PolyArgs()
@@ -1496,7 +1496,7 @@ PolyArgs::~PolyArgs()
     delete[] mpPointAry;
 }
 
-// -----------------------------------------------------------------------
+
 
 void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag )
 {
@@ -1511,7 +1511,7 @@ void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag )
     bHasOffline |= (aFlag != POLY_NORMAL);
 }
 
-// -----------------------------------------------------------------------
+
 
 void PolyArgs::ClosePolygon()
 {
@@ -1557,7 +1557,7 @@ void PolyArgs::ClosePolygon()
     bHasOffline = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 extern "C" {
 
@@ -1610,7 +1610,7 @@ static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3,
 
 } // extern "C"
 
-// -----------------------------------------------------------------------
+
 
 bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
     ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
@@ -1688,7 +1688,7 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD )
 {
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx
index dcf21965801c..67eafe8a86c8 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -51,14 +51,14 @@ void ServerFontLayout::DrawText( SalGraphics& rSalGraphics ) const
     rSalGraphics.DrawServerFontLayout( *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ServerFontLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
     return mrServerFont.GetLayoutEngine()->layout(*this, rArgs);
 }
 
-// -----------------------------------------------------------------------
+
 void ServerFontLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
     GenericSalLayout::AdjustLayout( rArgs );
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 501260b22608..3fb28d2f17e2 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1317,7 +1317,7 @@ void PrinterUpdate::doUpdate()
         pInst->PostPrintersChanged();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_STATIC_LINK_NOINSTANCE( PrinterUpdate, UpdateTimerHdl, void*, EMPTYARG )
 {
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index f4e4dc3d5701..50927df0ef59 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -578,14 +578,14 @@ public:
     static bool             CheckFontData( const PhysicalFontFace& r ) { return r.CheckMagic( PSPFD_MAGIC ); }
 };
 
-//--------------------------------------------------------------------------
+
 
 ImplPspFontData::ImplPspFontData( const psp::FastPrintFontInfo& rInfo )
 :   PhysicalFontFace( GenPspGraphics::Info2DevFontAttributes(rInfo), PSPFD_MAGIC ),
     mnFontId( rInfo.m_nID )
 {}
 
-//--------------------------------------------------------------------------
+
 
 ImplFontEntry* ImplPspFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
 {
@@ -612,7 +612,7 @@ private:
     bool                mbArtBold;
 };
 
-//--------------------------------------------------------------------------
+
 
 PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
 :   mrPrinterGfx( rGfx )
@@ -625,7 +625,7 @@ PspFontLayout::PspFontLayout( ::psp::PrinterGfx& rGfx )
     mbArtBold    = mrPrinterGfx.GetArtificialBold();
 }
 
-//--------------------------------------------------------------------------
+
 
 bool PspFontLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
@@ -725,7 +725,7 @@ void PspServerFontLayout::InitFont() const
                           mnOrientation, mbVertical, mbArtItalic, mbArtBold );
 }
 
-//--------------------------------------------------------------------------
+
 
 static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx, bool bIsPspServerFontLayout )
 {
@@ -782,7 +782,7 @@ static void DrawPrinterLayout( const SalLayout& rLayout, ::psp::PrinterGfx& rGfx
     }
 }
 
-//--------------------------------------------------------------------------
+
 
 void PspFontLayout::InitFont() const
 {
@@ -790,7 +790,7 @@ void PspFontLayout::InitFont() const
         mnOrientation, mbVertical, mbArtItalic, mbArtBold );
 }
 
-//--------------------------------------------------------------------------
+
 
 void PspFontLayout::DrawText( SalGraphics& ) const
 {
@@ -1006,7 +1006,7 @@ SalLayout* GenPspGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     return pLayout;
 }
 
-//--------------------------------------------------------------------------
+
 
 bool GenPspGraphics::CreateFontSubset(
                                    const OUString& rToFile,
@@ -1036,7 +1036,7 @@ bool GenPspGraphics::CreateFontSubset(
     return bSuccess;
 }
 
-//--------------------------------------------------------------------------
+
 
 const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
 {
@@ -1049,7 +1049,7 @@ const Ucs2SIntMap* GenPspGraphics::GetFontEncodingVector( const PhysicalFontFace
     return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
 }
 
-//--------------------------------------------------------------------------
+
 
 void GenPspGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
                                   bool bVertical,
@@ -1088,7 +1088,7 @@ void GenPspGraphics::DoGetGlyphWidths( psp::fontID aFont,
     psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
     rMgr.getGlyphWidths( aFont, bVertical, rWidths, rUnicodeEnc );
 }
-// ----------------------------------------------------------------------------
+
 
 ImplDevFontAttributes GenPspGraphics::Info2DevFontAttributes( const psp::FastPrintFontInfo& rInfo )
 {
@@ -1165,7 +1165,7 @@ namespace vcl
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenPspGraphics::AnnounceFonts( ImplDevFontList* pFontList, const psp::FastPrintFontInfo& aInfo )
 {
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 7a43eb1f326c..cdf0e182c66a 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -380,9 +380,9 @@ void* SvpSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn
     return const_cast<char*>("");
 }
 
-// ---------------
+
 // - SalTimer -
-// ---------------
+
 
 void SvpSalInstance::StopTimer()
 {
diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index 74779df5a11e..c45e7f856584 100644
--- a/vcl/osx/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
@@ -29,7 +29,7 @@
 
 using namespace com::sun::star::uno;
 
-//------------------------------------------------------------------------------
+
 // converts the openoffice text/html clipboard format to the HTML Format
 // well known under MS Windows
 // the MS HTML Format has a header before the real html data
@@ -52,7 +52,7 @@ using namespace com::sun::star::uno;
 // The fragment should be preceded and followed by the HTML comments
 // <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the
 // text
-//------------------------------------------------------------------------------
+
 
 namespace // private
 {
diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx
index c4e296072868..225473069d28 100644
--- a/vcl/osx/a11yfocuslistener.cxx
+++ b/vcl/osx/a11yfocuslistener.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::uno;
 
 rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::theListener;
 
-//------------------------------------------------------------------------------
+
 
 rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get()
 {
@@ -41,13 +41,13 @@ rtl::Reference< AquaA11yFocusListener > AquaA11yFocusListener::get()
     return theListener;
 }
 
-//------------------------------------------------------------------------------
+
 
 AquaA11yFocusListener::AquaA11yFocusListener() : m_focusedObject(nil)
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 id AquaA11yFocusListener::getFocusedUIElement()
 {
@@ -67,7 +67,7 @@ id AquaA11yFocusListener::getFocusedUIElement()
     return m_focusedObject;
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAccessible)
@@ -91,7 +91,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 oslInterlockedCount SAL_CALL
 AquaA11yFocusListener::acquire() SAL_THROW(())
@@ -99,7 +99,7 @@ AquaA11yFocusListener::acquire() SAL_THROW(())
     return ReferenceObject::acquire();
 }
 
-//------------------------------------------------------------------------------
+
 
 oslInterlockedCount SAL_CALL
 AquaA11yFocusListener::release() SAL_THROW(())
diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index 1017969c879a..cbd634251fab 100644
--- a/vcl/osx/a11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -36,7 +36,7 @@
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
 
-//------------------------------------------------------------------------------
+
 
 static inline Window *
 getWindow(const ::VclSimpleEvent *pEvent)
@@ -45,7 +45,7 @@ getWindow(const ::VclSimpleEvent *pEvent)
 }
 
 
-//------------------------------------------------------------------------------
+
 
 // callback function for Application::addEventListener
 
@@ -94,7 +94,7 @@ long AquaA11yFocusTracker::WindowEventHandler(AquaA11yFocusTracker *pFocusTracke
     return 0;
 }
 
-//------------------------------------------------------------------------------
+
 
 AquaA11yFocusTracker::AquaA11yFocusTracker() :
     m_aWindowEventLink(this, (PSTUB) WindowEventHandler),
@@ -104,7 +104,7 @@ AquaA11yFocusTracker::AquaA11yFocusTracker() :
     window_got_focus(Application::GetFocusWindow());
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAccessible)
 {
@@ -117,7 +117,7 @@ void AquaA11yFocusTracker::setFocusedObject(const Reference< XAccessible >& xAcc
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox)
 {
@@ -136,7 +136,7 @@ void AquaA11yFocusTracker::notify_toolbox_item_focus(ToolBox *pToolBox)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow)
 {
@@ -171,7 +171,7 @@ void AquaA11yFocusTracker::toolbox_open_floater(Window *pWindow)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow)
 {
@@ -186,7 +186,7 @@ void AquaA11yFocusTracker::toolbox_highlight_on(Window *pWindow)
     notify_toolbox_item_focus(static_cast <ToolBox *> (pWindow));
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow)
 {
@@ -197,7 +197,7 @@ void AquaA11yFocusTracker::toolbox_highlight_off(Window *pWindow)
         notify_toolbox_item_focus( pToolBoxParent );
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::tabpage_activated(Window *pWindow)
 {
@@ -212,7 +212,7 @@ void AquaA11yFocusTracker::tabpage_activated(Window *pWindow)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent)
 {
@@ -227,7 +227,7 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent)
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void AquaA11yFocusTracker::window_got_focus(Window *pWindow)
 {
diff --git a/vcl/osx/a11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index dafabb7133c2..46d699c6f859 100644
--- a/vcl/osx/a11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -50,21 +50,21 @@ NSString * getTableNotification( const AccessibleEventObject& aEvent )
     return notification;
 }
 
-//------------------------------------------------------------------------------
+
 
 AquaA11yEventListener::AquaA11yEventListener(id wrapperObject, sal_Int16 role) : m_wrapperObject(wrapperObject), m_role(role)
 {
     [ m_wrapperObject retain ];
 }
 
-//------------------------------------------------------------------------------
+
 
 AquaA11yEventListener::~AquaA11yEventListener()
 {
     [ m_wrapperObject release ];
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException )
@@ -72,7 +72,7 @@ AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException )
     [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ];
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 AquaA11yEventListener::notifyEvent( const AccessibleEventObject& aEvent ) throw( RuntimeException )
diff --git a/vcl/osx/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
index ac65f1e84338..da69778292e6 100644
--- a/vcl/osx/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
@@ -30,14 +30,14 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
 
-//------------------------------------------------------------------------------
+
 
 DocumentFocusListener::DocumentFocusListener(AquaA11yFocusTracker& rTracker) :
     m_aFocusTracker(rTracker)
 {
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 DocumentFocusListener::disposing( const EventObject& aEvent )
@@ -49,7 +49,7 @@ DocumentFocusListener::disposing( const EventObject& aEvent )
         m_aRefList.erase(aEvent.Source);
 }
 
-//------------------------------------------------------------------------------
+
 
 void SAL_CALL
 DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
@@ -97,7 +97,7 @@ DocumentFocusListener::notifyEvent( const AccessibleEventObject& aEvent )
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject& aEvent )
     throw (IndexOutOfBoundsException, RuntimeException)
@@ -125,7 +125,7 @@ Reference< XAccessible > DocumentFocusListener::getAccessible(const EventObject&
     return Reference< XAccessible >();
 }
 
-//------------------------------------------------------------------------------
+
 
 void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAccessible)
     throw (IndexOutOfBoundsException, RuntimeException)
@@ -136,7 +136,7 @@ void DocumentFocusListener::attachRecursive(const Reference< XAccessible >& xAcc
         attachRecursive(xAccessible, xContext);
 }
 
-//------------------------------------------------------------------------------
+
 
 void DocumentFocusListener::attachRecursive(
     const Reference< XAccessible >& xAccessible,
@@ -152,7 +152,7 @@ void DocumentFocusListener::attachRecursive(
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void DocumentFocusListener::attachRecursive(
     const Reference< XAccessible >& xAccessible,
@@ -185,7 +185,7 @@ void DocumentFocusListener::attachRecursive(
     }
 }
 
-//------------------------------------------------------------------------------
+
 
 void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAccessible)
     throw (IndexOutOfBoundsException, RuntimeException)
@@ -196,7 +196,7 @@ void DocumentFocusListener::detachRecursive(const Reference< XAccessible >& xAcc
         detachRecursive(xAccessible, xContext);
 }
 
-//------------------------------------------------------------------------------
+
 
 void DocumentFocusListener::detachRecursive(
     const Reference< XAccessible >& xAccessible,
@@ -209,7 +209,7 @@ void DocumentFocusListener::detachRecursive(
         detachRecursive(xAccessible, xContext, xStateSet);
 }
 
-//------------------------------------------------------------------------------
+
 
 void DocumentFocusListener::detachRecursive(
     const Reference< XAccessible >&,
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 3ce28c9a2588..71a951c42d68 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -94,7 +94,7 @@ AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
     pSalData->maFrameCheck.insert( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalFrame::~AquaSalFrame()
 {
@@ -130,7 +130,7 @@ AquaSalFrame::~AquaSalFrame()
         [mpNSWindow release];
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::initWindowAndView()
 {
@@ -217,7 +217,7 @@ void AquaSalFrame::initWindowAndView()
     [mpNSWindow setContentView: mpNSView];
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::CocoaToVCL( NSRect& io_rRect, bool bRelativeToScreen )
 {
@@ -251,7 +251,7 @@ void AquaSalFrame::VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen )
         io_rPoint.y = maGeometry.nHeight - io_rPoint.y;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::screenParametersChanged()
 {
@@ -262,7 +262,7 @@ void AquaSalFrame::screenParametersChanged()
     CallCallback( SALEVENT_DISPLAYCHANGED, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* AquaSalFrame::GetGraphics()
 {
@@ -279,7 +279,7 @@ SalGraphics* AquaSalFrame::GetGraphics()
     return mpGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
 {
@@ -288,7 +288,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
     mbGraphics = FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalFrame::PostEvent( void *pData )
 {
@@ -296,7 +296,7 @@ bool AquaSalFrame::PostEvent( void *pData )
     return TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 void AquaSalFrame::SetTitle(const OUString& rTitle)
 {
     if ( !mpNSWindow )
@@ -333,13 +333,13 @@ void AquaSalFrame::SetTitle(const OUString& rTitle)
         [pTitle release];
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetIcon( sal_uInt16 )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
 {
@@ -359,7 +359,7 @@ void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::initShow()
 {
@@ -412,7 +412,7 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
     CallCallback(SALEVENT_PAINT, &aPaintEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
 {
@@ -475,13 +475,13 @@ void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::Enable( sal_Bool )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
 {
@@ -506,7 +506,7 @@ void AquaSalFrame::SetMinClientSize( long nWidth, long nHeight )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
 {
@@ -535,7 +535,7 @@ void AquaSalFrame::SetMaxClientSize( long nWidth, long nHeight )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
 {
@@ -554,7 +554,7 @@ void AquaSalFrame::SetClientSize( long nWidth, long nHeight )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
 {
@@ -570,7 +570,7 @@ void AquaSalFrame::GetClientSize( long& rWidth, long& rHeight )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetWindowState( const SalFrameState* pState )
 {
@@ -646,7 +646,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalFrame::GetWindowState( SalFrameState* pState )
 {
@@ -680,7 +680,7 @@ bool AquaSalFrame::GetWindowState( SalFrameState* pState )
     return TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
 {
@@ -720,7 +720,7 @@ void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
 {
@@ -817,7 +817,7 @@ void AquaSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
         SendPaintEvent();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::StartPresentation( sal_Bool bStart )
 {
@@ -846,13 +846,13 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetAlwaysOnTop( sal_Bool )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::ToTop(sal_uInt16 nFlags)
 {
@@ -873,7 +873,7 @@ void AquaSalFrame::ToTop(sal_uInt16 nFlags)
         [mpNSWindow orderFront: NSApp];
 }
 
-// -----------------------------------------------------------------------
+
 
 NSCursor* AquaSalFrame::getCurrentCursor() const
 {
@@ -929,7 +929,7 @@ void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
     [mpNSWindow invalidateCursorRectsForView: mpNSView];
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetPointerPos( long nX, long nY )
 {
@@ -941,7 +941,7 @@ void AquaSalFrame::SetPointerPos( long nX, long nY )
     CGDisplayMoveCursorToPoint( mainDisplayID, aPoint );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::Flush( void )
 {
@@ -963,7 +963,7 @@ void AquaSalFrame::Flush( void )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::Flush( const Rectangle& rRect )
 {
@@ -986,7 +986,7 @@ void AquaSalFrame::Flush( const Rectangle& rRect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::Sync()
 {
@@ -1000,7 +1000,7 @@ void AquaSalFrame::Sync()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetInputContext( SalInputContext* pContext )
 {
@@ -1016,13 +1016,13 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext )
         return;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::EndExtTextInput( sal_uInt16 )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
@@ -1109,7 +1109,7 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
     return aResult.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void getAppleScrollBarVariant(StyleSettings &rSettings)
 {
@@ -1308,21 +1308,21 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     [mpNSView unlockFocus];
 }
 
-// -----------------------------------------------------------------------
+
 
 const SystemEnvData* AquaSalFrame::GetSystemData() const
 {
     return &maSysData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::Beep()
 {
     NSBeep();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
 {
@@ -1643,7 +1643,7 @@ void AquaSalFrame::UpdateFrameGeometry()
     maGeometry.nHeight = static_cast<unsigned int>(aContentRect.size.height);
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalFrame::CaptureMouse( sal_Bool bCapture )
 {
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index e960e8db82bd..b8172e153cf7 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -70,7 +70,7 @@ static int* gpnInit = 0;
 static NSMenu* pDockMenu = nil;
 static bool bNoSVMain = true;
 static bool bLeftMain = false;
-// -----------------------------------------------------------------------
+
 
 class AquaDelayedSettingsChanged : public Timer
 {
@@ -245,7 +245,7 @@ void SalAbort( const OUString& rErrorText, bool bDumpCore )
         _exit(1);
 }
 
-// -----------------------------------------------------------------------
+
 
 void InitSalData()
 {
@@ -253,7 +253,7 @@ void InitSalData()
     SetSalData( pSalData );
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SalGetDesktopEnvironment()
 {
@@ -261,7 +261,7 @@ const OUString& SalGetDesktopEnvironment()
     return aDesktopEnvironment;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DeInitSalData()
 {
@@ -275,13 +275,13 @@ void DeInitSalData()
     SetSalData( NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 extern "C" {
 #include <crt_externs.h>
 }
 
-// -----------------------------------------------------------------------
+
 
 void InitSalMain()
 {
@@ -325,7 +325,7 @@ bool SalYieldMutex::tryToAcquire()
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 // some convenience functions regarding the yield mutex, aka solar mutex
 
@@ -382,14 +382,14 @@ SalInstance* CreateSalInstance()
     return pInst;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DestroySalInstance( SalInstance* pInst )
 {
     delete pInst;
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalInstance::AquaSalInstance()
 {
@@ -403,7 +403,7 @@ AquaSalInstance::AquaSalInstance()
     maWaitingYieldCond = osl_createCondition();
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalInstance::~AquaSalInstance()
 {
@@ -414,7 +414,7 @@ AquaSalInstance::~AquaSalInstance()
     osl_destroyCondition( maWaitingYieldCond );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::wakeupYield()
 {
@@ -437,7 +437,7 @@ void AquaSalInstance::wakeupYield()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData )
 {
@@ -449,14 +449,14 @@ void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, voi
     wakeupYield();
 }
 
-// -----------------------------------------------------------------------
+
 
 comphelper::SolarMutex* AquaSalInstance::GetYieldMutex()
 {
     return mpSalYieldMutex;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong AquaSalInstance::ReleaseYieldMutex()
 {
@@ -478,7 +478,7 @@ sal_uLong AquaSalInstance::ReleaseYieldMutex()
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
@@ -490,7 +490,7 @@ void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalInstance::CheckYieldMutex()
 {
@@ -505,14 +505,14 @@ bool AquaSalInstance::CheckYieldMutex()
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalInstance::isNSAppThread() const
 {
     return osl::Thread::getCurrentIdentifier() == maMainThread;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
 {
@@ -611,7 +611,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
     };
 }
 
-// -----------------------------------------------------------------------
+
 
 class ReleasePoolHolder
 {
@@ -767,7 +767,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalInstance::AnyInput( sal_uInt16 nType )
 {
@@ -813,14 +813,14 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType )
     return (pEvent != NULL);
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ )
 {
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle )
 {
@@ -830,14 +830,14 @@ SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSt
     return pFrame;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DestroyFrame( SalFrame* pFrame )
 {
     delete pFrame;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, sal_Bool /* bShow */ )
 {
@@ -850,28 +850,28 @@ SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /
     return pObject;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DestroyObject( SalObject* pObject )
 {
     delete ( pObject );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalPrinter* AquaSalInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter )
 {
     return new AquaSalPrinter( dynamic_cast<AquaSalInfoPrinter*>(pInfoPrinter) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DestroyPrinter( SalPrinter* pPrinter )
 {
     delete pPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
 {
@@ -899,20 +899,20 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 {
     delete pInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString AquaSalInstance::GetDefaultPrinter()
 {
@@ -938,7 +938,7 @@ OUString AquaSalInstance::GetDefaultPrinter()
     return maDefaultPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
                                                 ImplJobSetup* pSetupData )
@@ -957,7 +957,7 @@ SalInfoPrinter* AquaSalInstance::CreateInfoPrinter( SalPrinterQueueInfo* pQueueI
     return pNewInfoPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
 {
@@ -967,33 +967,33 @@ void AquaSalInstance::DestroyInfoPrinter( SalInfoPrinter* pPrinter )
     delete pPrinter;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalSystem* AquaSalInstance::CreateSystem()
 {
     return new AquaSalSystem();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DestroySystem( SalSystem* pSystem )
 {
     delete pSystem;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::SetEventCallback( void*, bool(*)(void*,void*,int) )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::SetErrorEventCallback( void*, bool(*)(void*,void*,int) )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
 {
@@ -1065,35 +1065,35 @@ void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OU
 }
 
 
-// -----------------------------------------------------------------------
+
 
 SalTimer* AquaSalInstance::CreateSalTimer()
 {
     return new AquaSalTimer();
 }
 
-// -----------------------------------------------------------------------
+
 
 SalSystem* AquaSalInstance::CreateSalSystem()
 {
     return new AquaSalSystem();
 }
 
-// -----------------------------------------------------------------------
+
 
 SalBitmap* AquaSalInstance::CreateSalBitmap()
 {
     return new QuartzSalBitmap();
 }
 
-// -----------------------------------------------------------------------
+
 
 SalSession* AquaSalInstance::CreateSalSession()
 {
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 class MacImeStatus : public SalI18NImeStatus
 {
@@ -1107,7 +1107,7 @@ public:
     virtual void toggle() {}
 };
 
-// -----------------------------------------------------------------------
+
 
 SalI18NImeStatus* AquaSalInstance::CreateI18NImeStatus()
 {
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index 8c6006f549ba..7912825bddaf 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -950,6 +950,6 @@ AquaSalMenuItem::~AquaSalMenuItem()
         [mpMenuItem autorelease];
 }
 
-// -------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index b0633c355f3e..350903fa665e 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -56,7 +56,7 @@ AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) :
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalObject::~AquaSalObject()
 {
@@ -93,7 +93,7 @@ AquaSalObject::~AquaSalObject()
    This is gives us an 80% solution only, though.
 */
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::ResetClipRegion()
 {
@@ -101,21 +101,21 @@ void AquaSalObject::ResetClipRegion()
     setClippedPosSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 AquaSalObject::GetClipRegionType()
 {
     return SAL_OBJECT_CLIP_INCLUDERECTS;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::BeginSetClipRegion( sal_uLong )
 {
     mbClip = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
@@ -146,14 +146,14 @@ void AquaSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::EndSetClipRegion()
 {
     setClippedPosSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
 {
@@ -164,7 +164,7 @@ void AquaSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
     setClippedPosSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::setClippedPosSize()
 {
@@ -194,7 +194,7 @@ void AquaSalObject::setClippedPosSize()
     [mpClipView scrollToPoint: aClipPt];
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalObject::Show( sal_Bool bVisible )
 {
@@ -202,7 +202,7 @@ void AquaSalObject::Show( sal_Bool bVisible )
         [mpClipView setHidden: (bVisible ? NO : YES)];
 }
 
-// -----------------------------------------------------------------------
+
 
 const SystemEnvData* AquaSalObject::GetSystemData() const
 {
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index c0e13b2dd4ef..b2dafd79552c 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -90,7 +90,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalInfoPrinter::~AquaSalInfoPrinter()
 {
@@ -101,7 +101,7 @@ AquaSalInfoPrinter::~AquaSalInfoPrinter()
         CFRelease( mrContext );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
 {
@@ -146,7 +146,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* AquaSalInfoPrinter::GetGraphics()
 {
@@ -155,21 +155,21 @@ SalGraphics* AquaSalInfoPrinter::GetGraphics()
     return pGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* )
 {
     mbGraphics = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
 {
@@ -217,7 +217,7 @@ bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
     return bSuccess;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation )
 {
@@ -239,7 +239,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
     mePageOrientation = i_eSetOrientation;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData )
 {
@@ -279,21 +279,21 @@ bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupDat
     return mpPrintInfo != nil;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
 {
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType )
 {
@@ -327,7 +327,7 @@ sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
                                   long& o_rOutWidth, long& o_rOutHeight,
@@ -560,7 +560,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
     return bSuccess;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool AquaSalInfoPrinter::EndJob()
 {
@@ -569,7 +569,7 @@ sal_Bool AquaSalInfoPrinter::EndJob()
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool AquaSalInfoPrinter::AbortJob()
 {
@@ -579,7 +579,7 @@ sal_Bool AquaSalInfoPrinter::AbortJob()
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData )
 {
@@ -593,7 +593,7 @@ SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool
     return mpGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool AquaSalInfoPrinter::EndPage()
 {
@@ -601,7 +601,7 @@ sal_Bool AquaSalInfoPrinter::EndPage()
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong AquaSalInfoPrinter::GetErrorCode() const
 {
@@ -615,13 +615,13 @@ AquaSalPrinter::AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalPrinter::~AquaSalPrinter()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
                                const OUString& i_rJobName,
@@ -632,7 +632,7 @@ bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
     return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
                                const OUString& /*i_rJobName*/,
@@ -646,35 +646,35 @@ bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalPrinter::EndJob()
 {
     return mpInfoPrinter->EndJob();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalPrinter::AbortJob()
 {
     return mpInfoPrinter->AbortJob();
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData )
 {
     return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalPrinter::EndPage()
 {
     return mpInfoPrinter->EndPage();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong AquaSalPrinter::GetErrorCode()
 {
diff --git a/vcl/qa/cppunit/dndtest.cxx b/vcl/qa/cppunit/dndtest.cxx
index 4bc18902e05d..604d8702e4d6 100644
--- a/vcl/qa/cppunit/dndtest.cxx
+++ b/vcl/qa/cppunit/dndtest.cxx
@@ -46,7 +46,7 @@ using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::clipboard;
 using namespace ::com::sun::star::datatransfer::dnd;
 
-// -----------------------------------------------------------------------
+
 
 class MyWin : public WorkWindow
 {
@@ -62,7 +62,7 @@ public:
     void        Resize();
 };
 
-// -----------------------------------------------------------------------
+
 
 class MyDragAndDropListener: public ::cppu::WeakImplHelper3 < XDropTargetListener, XDragGestureListener, XDragSourceListener >
 {
@@ -86,7 +86,7 @@ public:
     virtual void SAL_CALL disposing( const EventObject& eo ) throw(RuntimeException);
 };
 
-// -----------------------------------------------------------------------
+
 
 class MyInfoBox : public InfoBox
 {
@@ -96,7 +96,7 @@ public:
     MyInfoBox( Window* pParent );
 };
 
-// -----------------------------------------------------------------------
+
 
 class MyListBox : public ListBox
 {
@@ -106,7 +106,7 @@ public:
     MyListBox( Window* pParent );
 };
 
-// -----------------------------------------------------------------------
+
 
 class StringTransferable : public ::cppu::WeakImplHelper1< XTransferable >
 {
@@ -130,7 +130,7 @@ public:
 };
 
 
-// -----------------------------------------------------------------------
+
 
 class VclDnDTest : public test::BootstrapFixture
 {
@@ -145,7 +145,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-// -----------------------------------------------------------------------
+
 
 void VclDnDTest::testDnD()
 {
@@ -167,7 +167,7 @@ void VclDnDTest::testDnD()
     aListBox.Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
     WorkWindow( pParent, nWinStyle )
@@ -186,56 +186,56 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
         xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::MouseMove( const MouseEvent& rMEvt )
 {
     WorkWindow::MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::MouseButtonDown( const MouseEvent& rMEvt )
 {
     WorkWindow::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::MouseButtonUp( const MouseEvent& rMEvt )
 {
     WorkWindow::MouseButtonUp( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::KeyInput( const KeyEvent& rKEvt )
 {
     WorkWindow::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::KeyUp( const KeyEvent& rKEvt )
 {
     WorkWindow::KeyUp( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::Paint( const Rectangle& rRect )
 {
     WorkWindow::Paint( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MyWin::Resize()
 {
     WorkWindow::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEvent& dge ) throw(RuntimeException)
 {
@@ -243,77 +243,77 @@ void SAL_CALL MyDragAndDropListener::dragGestureRecognized( const DragGestureEve
     xDragSource->startDrag( dge, -1, 0, 0, new StringTransferable( OUString("TestString") ), this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::drop( const DropTargetDropEvent& dtde ) throw(RuntimeException)
 {
     dtde.Context->dropComplete( sal_True );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragEnter( const DropTargetDragEnterEvent& dtdee ) throw(RuntimeException)
 {
     dtdee.Context->acceptDrag( dtdee.DropAction );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragExit( const DropTargetEvent& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragOver( const DropTargetDragEvent& dtde ) throw(RuntimeException)
 {
     dtde.Context->acceptDrag( dtde.DropAction );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dropActionChanged( const DropTargetDragEvent& dtde ) throw(RuntimeException)
 {
     dtde.Context->acceptDrag( dtde.DropAction );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragDropEnd( const DragSourceDropEvent& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragEnter( const DragSourceDragEvent& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragExit( const DragSourceEvent& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dragOver( const DragSourceDragEvent& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::dropActionChanged( const DragSourceDragEvent& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SAL_CALL MyDragAndDropListener::disposing( const EventObject& ) throw(RuntimeException)
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent,
     OUString("dragging over this box should result in another window id in the drag log.") )
@@ -332,7 +332,7 @@ MyInfoBox::MyInfoBox( Window* pParent ) : InfoBox( pParent,
         xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) );
 };
 
-// -----------------------------------------------------------------------
+
 
 MyListBox::MyListBox( Window* pParent ) : ListBox( pParent )
 {
@@ -350,7 +350,7 @@ MyListBox::MyListBox( Window* pParent ) : ListBox( pParent )
         xRecognizer->addDragGestureListener( Reference< XDragGestureListener > ( xListener, UNO_QUERY ) );
 };
 
-// -----------------------------------------------------------------------
+
 
 Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& )
     throw(UnsupportedFlavorException, IOException, RuntimeException)
@@ -358,7 +358,7 @@ Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& )
     return makeAny( m_aData );
 }
 
-// -----------------------------------------------------------------------
+
 
 Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
     throw(RuntimeException)
@@ -366,7 +366,7 @@ Sequence< DataFlavor > SAL_CALL StringTransferable::getTransferDataFlavors(  )
     return m_aFlavorList;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool SAL_CALL StringTransferable::isDataFlavorSupported( const DataFlavor& )
     throw(RuntimeException)
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 72399399d282..ea89b5318f8d 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -106,7 +106,7 @@ CoreTextStyle::CoreTextStyle( const FontSelectPattern& rFSD )
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 CoreTextStyle::~CoreTextStyle( void )
 {
@@ -114,7 +114,7 @@ CoreTextStyle::~CoreTextStyle( void )
         CFRelease( mpStyleDict );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const
 {
@@ -136,7 +136,7 @@ void CoreTextStyle::GetFontMetric( ImplFontMetricData& rMetric ) const
     rMetric.mbKernableFont = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect ) const
 {
@@ -154,7 +154,7 @@ bool CoreTextStyle::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 // callbacks from CTFontCreatePathForGlyph+CGPathApply for GetGlyphOutline()
 struct GgoData { basegfx::B2DPolygon maPolygon; basegfx::B2DPolyPolygon* mpPolyPoly; };
@@ -216,7 +216,7 @@ bool CoreTextStyle::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolyg
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void CoreTextStyle::SetTextColor( const RGBAColor& rColor )
 {
@@ -235,21 +235,21 @@ PhysicalFontFace* CoreTextFontData::Clone( void ) const
     return new CoreTextFontData( *this);
 }
 
-// -----------------------------------------------------------------------
+
 
 CoreTextStyle* CoreTextFontData::CreateTextStyle( const FontSelectPattern& rFSD ) const
 {
     return new CoreTextStyle( rFSD);
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplFontEntry* CoreTextFontData::CreateFontInstance( /*const*/ FontSelectPattern& rFSD ) const
 {
     return new ImplFontEntry( rFSD);
 }
 
-// -----------------------------------------------------------------------
+
 
 int CoreTextFontData::GetFontTable( const char pTagName[5], unsigned char* pResultBuf ) const
 {
@@ -424,7 +424,7 @@ SystemFontList::SystemFontList()
 ,   mpCTFontArray( NULL )
 {}
 
-// -----------------------------------------------------------------------
+
 
 SystemFontList::~SystemFontList()
 {
@@ -439,7 +439,7 @@ SystemFontList::~SystemFontList()
         CFRelease( mpCTFontCollection );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemFontList::AddFont( CoreTextFontData* pFontData )
 {
@@ -447,7 +447,7 @@ void SystemFontList::AddFont( CoreTextFontData* pFontData )
     maFontContainer[ nFontId ] = pFontData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemFontList::AnnounceFonts( ImplDevFontList& rFontList ) const
 {
@@ -456,7 +456,7 @@ void SystemFontList::AnnounceFonts( ImplDevFontList& rFontList ) const
         rFontList.Add( (*it).second->Clone() );
 }
 
-// -----------------------------------------------------------------------
+
 
 CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const
 {
@@ -466,7 +466,7 @@ CoreTextFontData* SystemFontList::GetFontDataFromId( sal_IntPtr nFontId ) const
     return (*it).second;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemFontList::Init( void )
 {
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 98a6938bf5fd..a30a22b1c4d1 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -66,14 +66,14 @@ QuartzSalBitmap::QuartzSalBitmap()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 QuartzSalBitmap::~QuartzSalBitmap()
 {
     Destroy();
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits,
     int nX, int nY, int nWidth, int nHeight )
@@ -108,7 +108,7 @@ bool QuartzSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits,
     return true;
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( CGImageRef xImage, int nBitmapBits,
                              int nX, int nY, int nWidth, int nHeight )
@@ -177,7 +177,7 @@ bool QuartzSalBitmap::Create( BitmapBuffer& buffer)
     return true;
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rBitmapPalette )
 {
@@ -190,21 +190,21 @@ bool QuartzSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapP
     return AllocateUserData();
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp )
 {
     return Create( rSalBmp, rSalBmp.GetBitCount() );
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics )
 {
     return Create( rSalBmp, pGraphics ? pGraphics->GetBitCount() : rSalBmp.GetBitCount() );
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount )
 {
@@ -226,14 +226,14 @@ bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount
     return false;
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > /*xBitmapCanvas*/, Size& /*rSize*/, bool /*bMask*/ )
 {
     return false;
 }
 
-// ------------------------------------------------------------------
+
 
 void QuartzSalBitmap::Destroy()
 {
@@ -242,7 +242,7 @@ void QuartzSalBitmap::Destroy()
     maExternalData = NULL;
 }
 
-// ------------------------------------------------------------------
+
 
 void QuartzSalBitmap::DestroyContext()
 {
@@ -257,7 +257,7 @@ void QuartzSalBitmap::DestroyContext()
     }
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::CreateContext()
 {
@@ -344,7 +344,7 @@ bool QuartzSalBitmap::CreateContext()
     return mxGraphicContext != NULL;
 }
 
-// ------------------------------------------------------------------
+
 
 bool QuartzSalBitmap::AllocateUserData()
 {
@@ -382,7 +382,7 @@ bool QuartzSalBitmap::AllocateUserData()
     return maUserBuffer.get() != 0;
 }
 
-// ------------------------------------------------------------------
+
 
 class ImplPixelFormat
 {
@@ -658,21 +658,21 @@ void QuartzSalBitmap::ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight,
     }
 }
 
-// ------------------------------------------------------------------
+
 
 Size QuartzSalBitmap::GetSize() const
 {
     return Size( mnWidth, mnHeight );
 }
 
-// ------------------------------------------------------------------
+
 
 sal_uInt16 QuartzSalBitmap::GetBitCount() const
 {
     return mnBits;
 }
 
-// ------------------------------------------------------------------
+
 
 static struct pal_entry
 {
@@ -801,7 +801,7 @@ BitmapBuffer* QuartzSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
     return pBuffer;
 }
 
-// ------------------------------------------------------------------
+
 
 void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
 {
@@ -816,7 +816,7 @@ void QuartzSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
     delete pBuffer;
 }
 
-// ------------------------------------------------------------------
+
 
 CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, int nNewHeight ) const
 {
@@ -846,7 +846,7 @@ CGImageRef QuartzSalBitmap::CreateCroppedImage( int nX, int nY, int nNewWidth, i
     return xCroppedImage;
 }
 
-// ------------------------------------------------------------------
+
 
 static void CFRTLFree(void* /*info*/, const void* data, size_t /*size*/)
 {
@@ -896,7 +896,7 @@ CGImageRef QuartzSalBitmap::CreateWithMask( const QuartzSalBitmap& rMask,
     return xMaskedImage;
 }
 
-// ------------------------------------------------------------------
+
 
 /** creates an image from the given rectangle, replacing all black pixels with nMaskColor and make all other full transparent */
 CGImageRef QuartzSalBitmap::CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const
diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx
index 91ff6cb1bc9e..d82621576e34 100644
--- a/vcl/quartz/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -73,7 +73,7 @@ CoreTextFontData::CoreTextFontData( const CoreTextFontData& rSrc )
         mpCharMap->AddReference();
 }
 
-// -----------------------------------------------------------------------
+
 
 CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPtr nFontId )
 :   PhysicalFontFace( rDFA, 0 )
@@ -86,7 +86,7 @@ CoreTextFontData::CoreTextFontData( const ImplDevFontAttributes& rDFA, sal_IntPt
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 CoreTextFontData::~CoreTextFontData()
 {
@@ -94,14 +94,14 @@ CoreTextFontData::~CoreTextFontData()
         mpCharMap->DeReference();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_IntPtr CoreTextFontData::GetFontId() const
 {
     return (sal_IntPtr)mnFontId;
 }
 
-// -----------------------------------------------------------------------
+
 
 static unsigned GetUShort( const unsigned char* p ){return((p[0]<<8)+p[1]);}
 
@@ -188,7 +188,7 @@ bool CoreTextFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapab
     return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CoreTextFontData::ReadOs2Table( void ) const
 {
@@ -240,7 +240,7 @@ void CoreTextFontData::ReadMacCmapEncoding( void ) const
         return;
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalGraphics::AquaSalGraphics()
 #ifdef MACOSX
@@ -319,14 +319,14 @@ void AquaSalGraphics::SetTextColor( SalColor nSalColor )
         mpTextStyle->SetTextColor( maTextColor );
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int /*nFallbackLevel*/ )
 {
     mpTextStyle->GetFontMetric( *pMetric );
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool AddTempDevFont(const OUString& rFontFileURL)
 {
@@ -410,7 +410,7 @@ void AquaSalGraphics::ClearDevFontCache()
     pSalData->mpFontList = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
     const OUString& rFontFileURL, const OUString& /*rFontName*/ )
@@ -418,7 +418,7 @@ bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
     return ::AddTempDevFont(rFontFileURL);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPolygon& rPolyPoly )
 {
@@ -426,7 +426,7 @@ bool AquaSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId, basegfx::B2DPolyPol
     return bRC;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
 {
@@ -434,13 +434,13 @@ bool AquaSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect
     return bRC;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbackLevel*/ )
 {
@@ -476,7 +476,7 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFallbackLevel*/ )
 {
@@ -484,7 +484,7 @@ SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& /*rArgs*/, int /*nFal
     return pSalLayout;
 }
 
-// -----------------------------------------------------------------------
+
 
 const ImplFontCharMap* AquaSalGraphics::GetImplFontCharMap() const
 {
@@ -502,7 +502,7 @@ bool AquaSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi
     return mpFontData->GetImplFontCapabilities(rFontCapabilities);
 }
 
-// -----------------------------------------------------------------------
+
 
 // fake a SFNT font directory entry for a font table
 // see http://developer.apple.com/fonts/TTRefMan/RM06/Chap6.html#Directory
@@ -686,7 +686,7 @@ bool AquaSalGraphics::GetRawFontData( const PhysicalFontFace* pFontData,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bVertical,
     Int32Vector& rGlyphWidths, Ucs2UIntMap& rUnicodeEnc )
@@ -757,7 +757,7 @@ void AquaSalGraphics::GetGlyphWidths( const PhysicalFontFace* pFontData, bool bV
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector(
     const PhysicalFontFace*, const Ucs2OStrMap** /*ppNonEncoded*/ )
@@ -765,7 +765,7 @@ const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector(
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*,
                               const sal_Ucs* /*pUnicodes*/,
@@ -776,7 +776,7 @@ const void* AquaSalGraphics::GetEmbedFontData( const PhysicalFontFace*,
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ )
 {
@@ -786,7 +786,7 @@ void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ )
     DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n");
 }
 
-// -----------------------------------------------------------------------
+
 
 SystemFontData AquaSalGraphics::GetSysFontData( int /* nFallbacklevel */ ) const
 {
@@ -899,5 +899,5 @@ CGContextRef SvpSalGraphics::GetContext()
 }
 
 #endif
- 
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 06a3cfe487b9..2c0226a8334b 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1676,7 +1676,7 @@ void AquaSalGraphics::updateResolution()
 
 #endif
 
-// -----------------------------------------------------------
+
 
 XorEmulation::XorEmulation()
 :   m_xTargetLayer( NULL )
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index 295719e959ec..50792ed81cbc 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -33,7 +33,7 @@
 #include "osx/salframe.h"
 #include "osx/saldata.hxx"
 
-// ----------------------------------------------------------------------
+
 
 void AquaSalGraphics::SetWindowGraphics( AquaSalFrame* pFrame )
 {
@@ -117,7 +117,7 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex
     SetState();
 }
 
-// ----------------------------------------------------------------------
+
 
 void AquaSalGraphics::InvalidateContext()
 {
@@ -125,7 +125,7 @@ void AquaSalGraphics::InvalidateContext()
     mrContext = 0;
 }
 
-// ----------------------------------------------------------------------
+
 
 void AquaSalGraphics::UnsetState()
 {
@@ -162,7 +162,7 @@ void AquaSalGraphics::SetState()
         CGContextSetBlendMode( mrContext, kCGBlendModeDifference );
 }
 
-// ----------------------------------------------------------------------
+
 
 bool AquaSalGraphics::CheckContext()
 {
@@ -264,7 +264,7 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint*  pPtA
     return CGpoints;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalGraphics::UpdateWindow( NSRect& )
 {
@@ -293,6 +293,6 @@ void AquaSalGraphics::UpdateWindow( NSRect& )
         DBG_ASSERT( mpFrame->mbInitShow, "UpdateWindow called on uneligible graphics" );
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 0c61499728dc..5c163ce381a7 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -33,7 +33,7 @@
 #endif
 #include "quartz/salgdi.h"
 
-// -----------------------------------------------------------------------
+
 
 SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
     long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
@@ -51,7 +51,7 @@ SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
 {
@@ -113,7 +113,7 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 AquaSalVirtualDevice::~AquaSalVirtualDevice()
 {
@@ -126,7 +126,7 @@ AquaSalVirtualDevice::~AquaSalVirtualDevice()
     Destroy();
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalVirtualDevice::Destroy()
 {
@@ -153,7 +153,7 @@ void AquaSalVirtualDevice::Destroy()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* AquaSalVirtualDevice::GetGraphics()
 {
@@ -164,14 +164,14 @@ SalGraphics* AquaSalVirtualDevice::GetGraphics()
     return mpGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* )
 {
     mbGraphicsUsed = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 {
@@ -278,7 +278,7 @@ bool AquaSalVirtualDevice::SetSize( long nDX, long nDY )
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 void AquaSalVirtualDevice::GetSize( long& rWidth, long& rHeight )
 {
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index d70bb7335d17..c4a7ea764f0b 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -57,9 +57,9 @@ Help::~Help()
 {
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 bool Help::Start( const OUString&, const Window* )
 {
@@ -71,56 +71,56 @@ bool Help::SearchKeyword( const OUString& )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Help::GetHelpText( const OUString&, const Window* )
 {
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::EnableContextHelp()
 {
     ImplGetSVData()->maHelpData.mbContextHelp = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::DisableContextHelp()
 {
     ImplGetSVData()->maHelpData.mbContextHelp = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::IsContextHelpEnabled()
 {
     return ImplGetSVData()->maHelpData.mbContextHelp;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::EnableExtHelp()
 {
     ImplGetSVData()->maHelpData.mbExtHelp = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::DisableExtHelp()
 {
     ImplGetSVData()->maHelpData.mbExtHelp = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::IsExtHelpEnabled()
 {
     return ImplGetSVData()->maHelpData.mbExtHelp;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::StartExtHelp()
 {
@@ -139,7 +139,7 @@ bool Help::StartExtHelp()
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::EndExtHelp()
 {
@@ -157,28 +157,28 @@ bool Help::EndExtHelp()
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::EnableBalloonHelp()
 {
     ImplGetSVData()->maHelpData.mbBalloonHelp = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::DisableBalloonHelp()
 {
     ImplGetSVData()->maHelpData.mbBalloonHelp = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::IsBalloonHelpEnabled()
 {
     return ImplGetSVData()->maHelpData.mbBalloonHelp;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::ShowBalloon( Window* pParent,
                         const Point& rScreenPos,
@@ -190,7 +190,7 @@ bool Help::ShowBalloon( Window* pParent,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::ShowBalloon( Window* pParent,
                         const Point& rScreenPos, const Rectangle& rRect,
@@ -202,28 +202,28 @@ bool Help::ShowBalloon( Window* pParent,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::EnableQuickHelp()
 {
     ImplGetSVData()->maHelpData.mbQuickHelp = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::DisableQuickHelp()
 {
     ImplGetSVData()->maHelpData.mbQuickHelp = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::IsQuickHelpEnabled()
 {
     return ImplGetSVData()->maHelpData.mbQuickHelp;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Help::ShowQuickHelp( Window* pParent,
                           const Rectangle& rScreenRect,
@@ -237,7 +237,7 @@ bool Help::ShowQuickHelp( Window* pParent,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::HideBalloonAndQuickHelp()
 {
@@ -246,7 +246,7 @@ void Help::HideBalloonAndQuickHelp()
     ImplDestroyHelpWindow( bIsVisible );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect,
                      const OUString& rText, sal_uInt16 nStyle )
@@ -261,7 +261,7 @@ sal_uIntPtr Help::ShowTip( Window* pParent, const Rectangle& rScreenRect,
     return nId;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreenRect, const OUString& rText )
 {
@@ -277,7 +277,7 @@ void Help::UpdateTip( sal_uIntPtr nId, Window* pParent, const Rectangle& rScreen
     pHelpWin->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Help::HideTip( sal_uLong nId )
 {
@@ -342,7 +342,7 @@ HelpTextWindow::HelpTextWindow( Window* pParent, const OUString& rText, sal_uInt
     maHideTimer.SetTimeout( rHelpSettings.GetTipTimeout() );
 }
 
-// -----------------------------------------------------------------------
+
 
 HelpTextWindow::~HelpTextWindow()
 {
@@ -353,7 +353,7 @@ HelpTextWindow::~HelpTextWindow()
         ImplGetSVData()->maHelpData.mpHelpWin = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpTextWindow::SetHelpText( const OUString& rHelpText )
 {
@@ -396,7 +396,7 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText )
     SetOutputSizePixel( aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpTextWindow::ImplShow()
 {
@@ -406,7 +406,7 @@ void HelpTextWindow::ImplShow()
     Update();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpTextWindow::Paint( const Rectangle& )
 {
@@ -455,7 +455,7 @@ void HelpTextWindow::Paint( const Rectangle& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode )
 {
@@ -482,7 +482,7 @@ void HelpTextWindow::ShowHelp( sal_uInt16 nDelayMode )
     maShowTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer)
 {
@@ -506,7 +506,7 @@ IMPL_LINK( HelpTextWindow, TimerHdl, Timer*, pTimer)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size HelpTextWindow::CalcOutSize() const
 {
@@ -516,7 +516,7 @@ Size HelpTextWindow::CalcOutSize() const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ )
 {
@@ -524,14 +524,14 @@ void HelpTextWindow::RequestHelp( const HelpEvent& /*rHEvt*/ )
     // ShowQuickHelp/ShowBalloonHelp in the HelpTextWindow.
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString HelpTextWindow::GetText() const
 {
     return maHelpText;
 }
 
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > HelpTextWindow::CreateAccessible()
 {
@@ -618,7 +618,7 @@ void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 n
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDestroyHelpWindow( bool bUpdateHideTime )
 {
@@ -640,7 +640,7 @@ void ImplDestroyHelpWindow( bool bUpdateHideTime )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSetHelpWindowPos( Window* pHelpWin, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle,
                            const Point& rPos, const Rectangle* pHelpArea )
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 8ed1ec84f73b..d3f377535091 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -36,7 +36,7 @@ SalFrame::~SalFrame()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 // default to full-frame flushes
 // on ports where partial-flushes are much cheaper this method should be overridden
@@ -45,14 +45,14 @@ void SalFrame::Flush( const Rectangle& )
     Flush();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SalFrame::SetRepresentedURL( const OUString& )
 {
     // currently this is Mac only functionality
 }
 
-// -----------------------------------------------------------------------
+
 
 SalInstance::~SalInstance()
 {
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index d9d25d7623b9..dfbb001cb769 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -89,7 +89,7 @@ void ImplInitSVData()
     pImplSVData->maAppData.mnDefaultLayoutBorder = -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDeInitSVData()
 {
@@ -110,14 +110,14 @@ void ImplDeInitSVData()
         delete pSVData->mpPaperNames, pSVData->mpPaperNames = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDestroySVData()
 {
     pImplSVData = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* ImplGetDefaultWindow()
 {
@@ -149,7 +149,7 @@ Window* ImplGetDefaultWindow()
     return pSVData->mpDefaultWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 ResMgr* ImplGetResMgr()
 {
@@ -315,7 +315,7 @@ bool ImplInitAccessBridge()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* ImplFindWindow( const SalFrame* pFrame, ::Point& rSalFramePos )
 {
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index fed5316fef91..5fa2a1680a59 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -207,7 +207,7 @@ void GenericClipboard::removeClipboardListener( const Reference< datatransfer::c
     m_aListeners.remove( listener );
 }
 
-// ------------------------------------------------------------------------
+
 
 class ClipboardFactory : public ::cppu::WeakComponentImplHelper1<
     com::sun::star::lang::XSingleServiceFactory
@@ -225,7 +225,7 @@ public:
     virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& rArgs ) throw();
 };
 
-// ------------------------------------------------------------------------
+
 
 ClipboardFactory::ClipboardFactory() :
         cppu::WeakComponentImplHelper1<
@@ -234,20 +234,20 @@ ClipboardFactory::ClipboardFactory() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 ClipboardFactory::~ClipboardFactory()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XInterface > ClipboardFactory::createInstance() throw()
 {
     return createInstanceWithArguments( Sequence< Any >() );
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XInterface > ClipboardFactory::createInstanceWithArguments( const Sequence< Any >& arguments ) throw()
 {
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index 9e5a138856ec..572051d65d12 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::awt;
 
-// -----------------------------------------------------------------------
+
 
 namespace vcl
 {
@@ -67,7 +67,7 @@ FontIdentificator() {}
 
 };
 
-// --------------------------------------------------------------------
+
 
 FontIdentificator::~FontIdentificator()
 {
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ffeab10531d2..94d2ab883c67 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -79,13 +79,13 @@ public:
                    ~ImplCommonButtonData();
 };
 
-// -----------------------------------------------------------------------
+
 ImplCommonButtonData::ImplCommonButtonData() : maFocusRect(), mnSeparatorX(0), mnButtonState(0),
 mbSmallSymbol(false), maImage(), meImageAlign(IMAGEALIGN_TOP), meSymbolAlign(SYMBOLALIGN_LEFT)
 {
 }
 
-// -----------------------------------------------------------------------
+
 ImplCommonButtonData::~ImplCommonButtonData()
 {
 }
@@ -98,21 +98,21 @@ Button::Button( WindowType nType ) :
     mpButtonData = new ImplCommonButtonData;
 }
 
-// -----------------------------------------------------------------------
+
 
 Button::~Button()
 {
     delete mpButtonData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Button::Click()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, maClickHdl, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Button::GetStandardText( StandardButtonType eButton )
 {
@@ -157,7 +157,7 @@ OUString Button::GetStandardText( StandardButtonType eButton )
     return ResId(nResId, *pResMgr).toString();
 }
 
-// -----------------------------------------------------------------------
+
 bool Button::SetModeImage( const Image& rImage )
 {
     if ( rImage != mpButtonData->maImage )
@@ -169,19 +169,19 @@ bool Button::SetModeImage( const Image& rImage )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 const Image Button::GetModeImage( ) const
 {
     return mpButtonData->maImage;
 }
 
-// -----------------------------------------------------------------------
+
 bool Button::HasImage() const
 {
     return !!(mpButtonData->maImage);
 }
 
-// -----------------------------------------------------------------------
+
 void Button::SetImageAlign( ImageAlign eAlign )
 {
     if ( mpButtonData->meImageAlign != eAlign )
@@ -191,20 +191,20 @@ void Button::SetImageAlign( ImageAlign eAlign )
     }
 }
 
-// -----------------------------------------------------------------------
+
 ImageAlign Button::GetImageAlign() const
 {
     return mpButtonData->meImageAlign;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Button::SetFocusRect( const Rectangle& rFocusRect )
 {
     ImplSetFocusRect( rFocusRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 long Button::ImplGetSeparatorX() const
 {
@@ -216,7 +216,7 @@ void Button::ImplSetSeparatorX( long nX )
     mpButtonData->mnSeparatorX = nX;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Button::ImplGetTextStyle( OUString& rText, WinBits nWinStyle,
                                  sal_uLong nDrawFlags )
@@ -246,7 +246,7 @@ sal_uInt16 Button::ImplGetTextStyle( OUString& rText, WinBits nWinStyle,
     return nTextStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
                                    Size& rSize, bool bLayout,
@@ -520,7 +520,7 @@ void Button::ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos,
     }
 }
 
-// -----------------------------------------------------------------------
+
 void Button::ImplSetFocusRect( const Rectangle &rFocusRect )
 {
     Rectangle aFocusRect = rFocusRect;
@@ -542,25 +542,25 @@ void Button::ImplSetFocusRect( const Rectangle &rFocusRect )
     mpButtonData->maFocusRect = aFocusRect;
 }
 
-// -----------------------------------------------------------------------
+
 const Rectangle& Button::ImplGetFocusRect() const
 {
     return mpButtonData->maFocusRect;
 }
 
-// -----------------------------------------------------------------------
+
 sal_uInt16& Button::ImplGetButtonState()
 {
     return mpButtonData->mnButtonState;
 }
 
-// -----------------------------------------------------------------------
+
 sal_uInt16 Button::ImplGetButtonState() const
 {
     return mpButtonData->mnButtonState;
 }
 
-// -----------------------------------------------------------------------
+
 void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
 {
     if ( mpButtonData->meSymbolAlign != eAlign )
@@ -570,13 +570,13 @@ void Button::ImplSetSymbolAlign( SymbolAlign eAlign )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void Button::SetSmallSymbol(bool bSmall)
 {
     mpButtonData->mbSmallSymbol = bSmall;
 }
 
-// -----------------------------------------------------------------------
+
 void Button::EnableImageDisplay( bool bEnable )
 {
     if( bEnable )
@@ -585,7 +585,7 @@ void Button::EnableImageDisplay( bool bEnable )
         mpButtonData->mnButtonState |= BUTTON_DRAW_NOIMAGE;
 }
 
-// -----------------------------------------------------------------------
+
 void Button::EnableTextDisplay( bool bEnable )
 {
     if( bEnable )
@@ -633,7 +633,7 @@ void PushButton::ImplInitPushButtonData()
     mbInUserDraw    = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -646,7 +646,7 @@ void PushButton::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
 {
@@ -669,20 +669,20 @@ WinBits PushButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& PushButton::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetPushButtonFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& PushButton::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetButtonTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::ImplInitSettings( bool bFont,
                                    bool bForeground, bool bBackground )
@@ -714,7 +714,7 @@ void PushButton::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::ImplDrawPushButtonFrame( Window* pDev,
                                           Rectangle& rRect, sal_uInt16 nStyle )
@@ -742,7 +742,7 @@ void PushButton::ImplDrawPushButtonFrame( Window* pDev,
         rRect = aDecoView.DrawButton( rRect, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool PushButton::ImplHitTestPushButton( Window* pDev,
                                         const Point& rPos )
@@ -753,7 +753,7 @@ bool PushButton::ImplHitTestPushButton( Window* pDev,
     return aTestRect.IsInside( rPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 PushButton::ImplGetTextStyle( sal_uLong nDrawFlags ) const
 {
@@ -790,7 +790,7 @@ sal_uInt16 PushButton::ImplGetTextStyle( sal_uLong nDrawFlags ) const
     return nTextStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplDrawBtnDropDownArrow( OutputDevice* pDev,
                                       long nX, long nY,
@@ -818,7 +818,7 @@ static void ImplDrawBtnDropDownArrow( OutputDevice* pDev,
     pDev->SetFillColor( aOldFillColor );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags,
                                             const Rectangle& rRect,
@@ -940,13 +940,13 @@ void PushButton::ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawF
     pDev->Pop();  // restore clipregion
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::ImplDrawPushButton( bool bLayout )
 {
@@ -1123,7 +1123,7 @@ void PushButton::ImplDrawPushButton( bool bLayout )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::ImplSetDefButton( bool bSet )
 {
@@ -1183,14 +1183,14 @@ void PushButton::ImplSetDefButton( bool bSet )
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool PushButton::ImplIsDefButton() const
 {
     return (ImplGetButtonState() & BUTTON_DRAW_DEFAULT) != 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 PushButton::PushButton( WindowType nType ) :
     Button( nType )
@@ -1198,7 +1198,7 @@ PushButton::PushButton( WindowType nType ) :
     ImplInitPushButtonData();
 }
 
-// -----------------------------------------------------------------------
+
 
 PushButton::PushButton( Window* pParent, WinBits nStyle ) :
     Button( WINDOW_PUSHBUTTON )
@@ -1207,7 +1207,7 @@ PushButton::PushButton( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 PushButton::PushButton( Window* pParent, const ResId& rResId ) :
     Button( WINDOW_PUSHBUTTON )
@@ -1222,13 +1222,13 @@ PushButton::PushButton( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 PushButton::~PushButton()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -1250,7 +1250,7 @@ void PushButton::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::Tracking( const TrackingEvent& rTEvt )
 {
@@ -1316,7 +1316,7 @@ void PushButton::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::KeyInput( const KeyEvent& rKEvt )
 {
@@ -1344,7 +1344,7 @@ void PushButton::KeyInput( const KeyEvent& rKEvt )
         Button::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::KeyUp( const KeyEvent& rKEvt )
 {
@@ -1378,7 +1378,7 @@ void PushButton::KeyUp( const KeyEvent& rKEvt )
         Button::KeyUp( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::FillLayoutData() const
 {
@@ -1386,14 +1386,14 @@ void PushButton::FillLayoutData() const
     const_cast<PushButton*>(this)->ImplDrawPushButton( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::Paint( const Rectangle& )
 {
     ImplDrawPushButton();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                        sal_uLong nFlags )
@@ -1438,7 +1438,7 @@ void PushButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::Resize()
 {
@@ -1446,7 +1446,7 @@ void PushButton::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::GetFocus()
 {
@@ -1455,7 +1455,7 @@ void PushButton::GetFocus()
     Button::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::LoseFocus()
 {
@@ -1464,7 +1464,7 @@ void PushButton::LoseFocus()
     Button::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::StateChanged( StateChangedType nType )
 {
@@ -1514,7 +1514,7 @@ void PushButton::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1530,7 +1530,7 @@ void PushButton::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool PushButton::PreNotify( NotifyEvent& rNEvt )
 {
@@ -1597,14 +1597,14 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt )
     return Button::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::Toggle()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_PUSHBUTTON_TOGGLE, maToggleHdl, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::SetSymbol( SymbolType eSymbol )
 {
@@ -1615,13 +1615,13 @@ void PushButton::SetSymbol( SymbolType eSymbol )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void PushButton::SetSymbolAlign( SymbolAlign eAlign )
 {
     ImplSetSymbolAlign( eAlign );
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::SetDropDown( sal_uInt16 nStyle )
 {
@@ -1632,7 +1632,7 @@ void PushButton::SetDropDown( sal_uInt16 nStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::SetState( TriState eState )
 {
@@ -1657,7 +1657,7 @@ void PushButton::SetState( TriState eState )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::SetPressed( bool bPressed )
 {
@@ -1668,7 +1668,7 @@ void PushButton::SetPressed( bool bPressed )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void PushButton::EndSelection()
 {
@@ -1681,7 +1681,7 @@ void PushButton::EndSelection()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size PushButton::CalcMinimumSize( long nMaxWidth ) const
 {
@@ -1750,7 +1750,7 @@ void OKButton::ImplInit( Window* pParent, WinBits nStyle )
     SetText( Button::GetStandardText( BUTTON_OK ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 OKButton::OKButton( Window* pParent, WinBits nStyle ) :
     PushButton( WINDOW_OKBUTTON )
@@ -1758,7 +1758,7 @@ OKButton::OKButton( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 OKButton::OKButton( Window* pParent, const ResId& rResId ) :
     PushButton( WINDOW_OKBUTTON )
@@ -1772,7 +1772,7 @@ OKButton::OKButton( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void OKButton::Click()
 {
@@ -1815,7 +1815,7 @@ void CancelButton::ImplInit( Window* pParent, WinBits nStyle )
     SetText( Button::GetStandardText( BUTTON_CANCEL ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 CancelButton::CancelButton( Window* pParent, WinBits nStyle ) :
     PushButton( WINDOW_CANCELBUTTON )
@@ -1823,7 +1823,7 @@ CancelButton::CancelButton( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 CancelButton::CancelButton( Window* pParent, const ResId& rResId ) :
     PushButton( WINDOW_CANCELBUTTON )
@@ -1837,7 +1837,7 @@ CancelButton::CancelButton( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CancelButton::Click()
 {
@@ -1886,7 +1886,7 @@ void HelpButton::ImplInit( Window* pParent, WinBits nStyle )
     SetText( Button::GetStandardText( BUTTON_HELP ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 HelpButton::HelpButton( Window* pParent, WinBits nStyle ) :
     PushButton( WINDOW_HELPBUTTON )
@@ -1894,7 +1894,7 @@ HelpButton::HelpButton( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 HelpButton::HelpButton( Window* pParent, const ResId& rResId ) :
     PushButton( WINDOW_HELPBUTTON )
@@ -1908,7 +1908,7 @@ HelpButton::HelpButton( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void HelpButton::Click()
 {
@@ -1935,7 +1935,7 @@ void RadioButton::ImplInitRadioButtonData()
     mbStateChanged  = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -1945,7 +1945,7 @@ void RadioButton::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
 {
@@ -1962,20 +1962,20 @@ WinBits RadioButton::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& RadioButton::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetRadioCheckFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& RadioButton::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetRadioCheckTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplInitSettings( bool bFont,
                                     bool bForeground, bool bBackground )
@@ -2014,7 +2014,7 @@ void RadioButton::DrawRadioButtonState( )
     ImplDrawRadioButtonState( );
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplInvalidateOrDrawRadioButtonState()
 {
@@ -2140,7 +2140,7 @@ void RadioButton::ImplDrawRadioButtonState()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
                             const Point& rPos, const Size& rSize,
@@ -2278,7 +2278,7 @@ void RadioButton::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplDrawRadioButton( bool bLayout )
 {
@@ -2395,7 +2395,7 @@ std::vector< RadioButton* > RadioButton::GetRadioButtonGroup(bool bIncludeThis)
     return aGroup;
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplUncheckAllOther()
 {
@@ -2421,7 +2421,7 @@ void RadioButton::ImplUncheckAllOther()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags )
 {
@@ -2450,7 +2450,7 @@ void RadioButton::ImplCallClick( bool bGrabFocus, sal_uInt16 nFocusFlags )
     mbStateChanged = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 RadioButton::RadioButton( Window* pParent, WinBits nStyle ) :
     Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false )
@@ -2459,7 +2459,7 @@ RadioButton::RadioButton( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 RadioButton::RadioButton( Window* pParent, const ResId& rResId ) :
     Button( WINDOW_RADIOBUTTON ), mbLegacyNoTextAlign( false )
@@ -2474,7 +2474,7 @@ RadioButton::RadioButton( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplLoadRes( const ResId& rResId )
 {
@@ -2486,7 +2486,7 @@ void RadioButton::ImplLoadRes( const ResId& rResId )
         SetState( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 RadioButton::~RadioButton()
 {
@@ -2497,7 +2497,7 @@ RadioButton::~RadioButton()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -2512,7 +2512,7 @@ void RadioButton::MouseButtonDown( const MouseEvent& rMEvt )
     Button::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::Tracking( const TrackingEvent& rTEvt )
 {
@@ -2553,7 +2553,7 @@ void RadioButton::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::KeyInput( const KeyEvent& rKEvt )
 {
@@ -2576,7 +2576,7 @@ void RadioButton::KeyInput( const KeyEvent& rKEvt )
         Button::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::KeyUp( const KeyEvent& rKEvt )
 {
@@ -2591,7 +2591,7 @@ void RadioButton::KeyUp( const KeyEvent& rKEvt )
         Button::KeyUp( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::FillLayoutData() const
 {
@@ -2599,14 +2599,14 @@ void RadioButton::FillLayoutData() const
     const_cast<RadioButton*>(this)->ImplDrawRadioButton( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::Paint( const Rectangle& )
 {
     ImplDrawRadioButton();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                         sal_uLong nFlags )
@@ -2682,7 +2682,7 @@ void RadioButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::Resize()
 {
@@ -2690,7 +2690,7 @@ void RadioButton::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::GetFocus()
 {
@@ -2699,7 +2699,7 @@ void RadioButton::GetFocus()
     Button::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::LoseFocus()
 {
@@ -2713,7 +2713,7 @@ void RadioButton::LoseFocus()
     Button::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::StateChanged( StateChangedType nType )
 {
@@ -2762,7 +2762,7 @@ void RadioButton::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -2778,7 +2778,7 @@ void RadioButton::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool RadioButton::PreNotify( NotifyEvent& rNEvt )
 {
@@ -2806,14 +2806,14 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt )
     return Button::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::Toggle()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_RADIOBUTTON_TOGGLE, maToggleHdl, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool RadioButton::SetModeRadioImage( const Image& rImage )
 {
@@ -2826,14 +2826,14 @@ bool RadioButton::SetModeRadioImage( const Image& rImage )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 const Image& RadioButton::GetModeRadioImage( ) const
 {
     return maImage;
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::SetState( bool bCheck )
 {
@@ -2890,7 +2890,7 @@ bool RadioButton::set_property(const OString &rKey, const OString &rValue)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::Check( bool bCheck )
 {
@@ -2917,7 +2917,7 @@ void RadioButton::Check( bool bCheck )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long RadioButton::ImplGetImageToTextDistance() const
 {
@@ -2926,7 +2926,7 @@ long RadioButton::ImplGetImageToTextDistance() const
     return CalcZoom( 4 );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size RadioButton::ImplGetRadioImageSize() const
 {
@@ -3037,7 +3037,7 @@ Image RadioButton::GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlag
     return pSVData->maCtrlData.mpRadioImgList->GetImage( nId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void RadioButton::ImplSetMinimumNWFSize()
 {
@@ -3066,7 +3066,7 @@ void RadioButton::ImplSetMinimumNWFSize()
     Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size RadioButton::CalcMinimumSize( long nMaxWidth ) const
 {
@@ -3118,7 +3118,7 @@ Size RadioButton::CalcMinimumSize( long nMaxWidth ) const
     return CalcWindowSize( aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size RadioButton::GetOptimalSize() const
 {
@@ -3134,7 +3134,7 @@ void CheckBox::ImplInitCheckBoxData()
     mbTriState      = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -3144,7 +3144,7 @@ void CheckBox::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
 {
@@ -3156,20 +3156,20 @@ WinBits CheckBox::ImplInitStyle( const Window* pPrevWindow, WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& CheckBox::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetRadioCheckFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& CheckBox::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetRadioCheckTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplInitSettings( bool bFont,
                                  bool bForeground, bool bBackground )
@@ -3203,7 +3203,7 @@ void CheckBox::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplLoadRes( const ResId& rResId )
 {
@@ -3218,7 +3218,7 @@ void CheckBox::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplInvalidateOrDrawCheckBoxState()
 {
@@ -3278,7 +3278,7 @@ void CheckBox::ImplDrawCheckBoxState()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
                          const Point& rPos, const Size& rSize,
@@ -3383,7 +3383,7 @@ void CheckBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplDrawCheckBox( bool bLayout )
 {
@@ -3405,7 +3405,7 @@ void CheckBox::ImplDrawCheckBox( bool bLayout )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplCheck()
 {
@@ -3433,7 +3433,7 @@ void CheckBox::ImplCheck()
     Click();
 }
 
-// -----------------------------------------------------------------------
+
 
 CheckBox::CheckBox( Window* pParent, WinBits nStyle ) :
     Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false )
@@ -3442,7 +3442,7 @@ CheckBox::CheckBox( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 CheckBox::CheckBox( Window* pParent, const ResId& rResId ) :
     Button( WINDOW_CHECKBOX ), mbLegacyNoTextAlign( false )
@@ -3457,7 +3457,7 @@ CheckBox::CheckBox( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -3472,7 +3472,7 @@ void CheckBox::MouseButtonDown( const MouseEvent& rMEvt )
     Button::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::Tracking( const TrackingEvent& rTEvt )
 {
@@ -3513,7 +3513,7 @@ void CheckBox::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::KeyInput( const KeyEvent& rKEvt )
 {
@@ -3536,7 +3536,7 @@ void CheckBox::KeyInput( const KeyEvent& rKEvt )
         Button::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::KeyUp( const KeyEvent& rKEvt )
 {
@@ -3551,7 +3551,7 @@ void CheckBox::KeyUp( const KeyEvent& rKEvt )
         Button::KeyUp( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::FillLayoutData() const
 {
@@ -3559,14 +3559,14 @@ void CheckBox::FillLayoutData() const
     const_cast<CheckBox*>(this)->ImplDrawCheckBox( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::Paint( const Rectangle& )
 {
     ImplDrawCheckBox();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                      sal_uLong nFlags )
@@ -3666,7 +3666,7 @@ void CheckBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::Resize()
 {
@@ -3674,7 +3674,7 @@ void CheckBox::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::GetFocus()
 {
@@ -3698,7 +3698,7 @@ void CheckBox::GetFocus()
     Button::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::LoseFocus()
 {
@@ -3725,7 +3725,7 @@ void CheckBox::LoseFocus()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::StateChanged( StateChangedType nType )
 {
@@ -3774,7 +3774,7 @@ void CheckBox::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -3790,7 +3790,7 @@ void CheckBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool CheckBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -3818,14 +3818,14 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt )
     return Button::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::Toggle()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_CHECKBOX_TOGGLE, maToggleHdl, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::SetState( TriState eState )
 {
@@ -3849,7 +3849,7 @@ bool CheckBox::set_property(const OString &rKey, const OString &rValue)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::EnableTriState( bool bTriState )
 {
@@ -3862,7 +3862,7 @@ void CheckBox::EnableTriState( bool bTriState )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long CheckBox::ImplGetImageToTextDistance() const
 {
@@ -3871,7 +3871,7 @@ long CheckBox::ImplGetImageToTextDistance() const
     return CalcZoom( 4 );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size CheckBox::ImplGetCheckImageSize() const
 {
@@ -3961,7 +3961,7 @@ Image CheckBox::GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags )
     return pSVData->maCtrlData.mpCheckImgList->GetImage( nId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void CheckBox::ImplSetMinimumNWFSize()
 {
@@ -3990,7 +3990,7 @@ void CheckBox::ImplSetMinimumNWFSize()
     Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size CheckBox::CalcMinimumSize( long nMaxWidth ) const
 {
@@ -4025,7 +4025,7 @@ Size CheckBox::CalcMinimumSize( long nMaxWidth ) const
     return CalcWindowSize( aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size CheckBox::GetOptimalSize() const
 {
@@ -4040,7 +4040,7 @@ ImageButton::ImageButton( Window* pParent, WinBits nStyle ) :
     ImplInitStyle();
 }
 
-// -----------------------------------------------------------------------
+
 
 ImageButton::ImageButton( Window* pParent, const ResId& rResId ) :
     PushButton( pParent, rResId.SetRT( RSC_IMAGEBUTTON ) )
@@ -4062,13 +4062,13 @@ ImageButton::ImageButton( Window* pParent, const ResId& rResId ) :
     ImplInitStyle();
 }
 
-// -----------------------------------------------------------------------
+
 
 ImageButton::~ImageButton()
 {
 }
 
-// -----------------------------------------------------------------------
+
 void ImageButton::ImplInitStyle()
 {
     WinBits nStyle = GetStyle();
@@ -4089,7 +4089,7 @@ ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ImageRadioButton::~ImageRadioButton()
 {
@@ -4103,7 +4103,7 @@ TriStateBox::TriStateBox( Window* pParent, WinBits nStyle ) :
     EnableTriState( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 TriStateBox::~TriStateBox()
 {
@@ -4116,7 +4116,7 @@ DisclosureButton::DisclosureButton( Window* pParent, WinBits nStyle ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DisclosureButton::ImplDrawCheckBoxState()
 {
@@ -4168,7 +4168,7 @@ void DisclosureButton::ImplDrawCheckBoxState()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void DisclosureButton::KeyInput( const KeyEvent& rKEvt )
 {
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index b6d8c9bc851e..22ae03aca7e2 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -56,7 +56,7 @@ ComboBox::ComboBox( WindowType nType ) :
     SetWidthInChars(-1);
 }
 
-// -----------------------------------------------------------------------
+
 
 ComboBox::ComboBox( Window* pParent, WinBits nStyle ) :
     Edit( WINDOW_COMBOBOX )
@@ -66,7 +66,7 @@ ComboBox::ComboBox( Window* pParent, WinBits nStyle ) :
     SetWidthInChars(-1);
 }
 
-// -----------------------------------------------------------------------
+
 
 ComboBox::ComboBox( Window* pParent, const ResId& rResId ) :
     Edit( WINDOW_COMBOBOX )
@@ -82,7 +82,7 @@ ComboBox::ComboBox( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 ComboBox::~ComboBox()
 {
@@ -97,7 +97,7 @@ ComboBox::~ComboBox()
     delete mpBtn;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::ImplInitComboBoxData()
 {
@@ -114,7 +114,7 @@ void ComboBox::ImplInitComboBoxData()
     m_nMaxWidthChars    = -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::ImplCalcEditHeight()
 {
@@ -140,7 +140,7 @@ void ComboBox::ImplCalcEditHeight()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -219,7 +219,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle )
     SetCompoundControl( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits ComboBox::ImplInitStyle( WinBits nStyle )
 {
@@ -230,7 +230,7 @@ WinBits ComboBox::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::ImplLoadRes( const ResId& rResId )
 {
@@ -247,7 +247,7 @@ void ComboBox::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase )
 {
@@ -259,14 +259,14 @@ void ComboBox::EnableAutocomplete( bool bEnable, bool bMatchCase )
         mpSubEdit->SetAutocompleteHdl( Link() );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ComboBox::IsAutocompleteEnabled() const
 {
     return mpSubEdit->GetAutocompleteHdl().IsSet();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl)
 {
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl)
 {
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
 {
@@ -370,7 +370,7 @@ IMPL_LINK( ComboBox, ImplAutocompleteHdl, Edit*, pEdit )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ComboBox, ImplSelectHdl)
 {
@@ -476,7 +476,7 @@ IMPL_LINK_NOARG(ComboBox, ImplCancelHdl)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n )
 {
@@ -489,7 +489,7 @@ IMPL_LINK( ComboBox, ImplSelectionChangedHdl, void*, n )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ComboBox, ImplDoubleClickHdl)
 {
@@ -497,7 +497,7 @@ IMPL_LINK_NOARG(ComboBox, ImplDoubleClickHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::ToggleDropDown()
 {
@@ -521,21 +521,21 @@ void ComboBox::ToggleDropDown()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::Select()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_COMBOBOX_SELECT, maSelectHdl, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::DoubleClick()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_COMBOBOX_DOUBLECLICK, maDoubleClickHdl, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::EnableAutoSize( bool bAuto )
 {
@@ -554,7 +554,7 @@ void ComboBox::EnableAutoSize( bool bAuto )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::EnableDDAutoWidth( bool b )
 {
@@ -562,7 +562,7 @@ void ComboBox::EnableDDAutoWidth( bool b )
         mpFloatWin->SetAutoWidth( b );
 }
 
- // -----------------------------------------------------------------------
+
 
 void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
 {
@@ -570,7 +570,7 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
         mpFloatWin->SetDropDownLineCount( nLines );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::AdaptDropDownLineCountToMaximum()
 {
@@ -578,7 +578,7 @@ void ComboBox::AdaptDropDownLineCountToMaximum()
     SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::GetDropDownLineCount() const
 {
@@ -588,7 +588,7 @@ sal_uInt16 ComboBox::GetDropDownLineCount() const
     return nLines;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight,
                                 sal_uInt16 nFlags )
@@ -609,7 +609,7 @@ void ComboBox::setPosSizePixel( long nX, long nY, long nWidth, long nHeight,
     Edit::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::Resize()
 {
@@ -637,7 +637,7 @@ void ComboBox::Resize()
         mpFloatWin->SetSizePixel( mpFloatWin->CalcFloatSize() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::FillLayoutData() const
 {
@@ -661,7 +661,7 @@ void ComboBox::FillLayoutData() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::StateChanged( StateChangedType nType )
 {
@@ -727,7 +727,7 @@ void ComboBox::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -751,7 +751,7 @@ void ComboBox::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ComboBox::PreNotify( NotifyEvent& rNEvt )
 {
@@ -759,7 +759,7 @@ bool ComboBox::PreNotify( NotifyEvent& rNEvt )
     return Edit::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ComboBox::Notify( NotifyEvent& rNEvt )
 {
@@ -844,7 +844,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
     return nDone || Edit::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetText( const OUString& rStr )
 {
@@ -854,7 +854,7 @@ void ComboBox::SetText( const OUString& rStr )
     ImplUpdateFloatSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetText( const OUString& rStr, const Selection& rNewSelection )
 {
@@ -864,7 +864,7 @@ void ComboBox::SetText( const OUString& rStr, const Selection& rNewSelection )
     ImplUpdateFloatSelection();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::Modify()
 {
@@ -874,7 +874,7 @@ void ComboBox::Modify()
     Edit::Modify();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::ImplUpdateFloatSelection()
 {
@@ -925,7 +925,7 @@ void ComboBox::ImplUpdateFloatSelection()
     mpImplLB->SetCallSelectionChangedHdl( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::InsertEntry(const OUString& rStr, sal_uInt16 const nPos)
 {
@@ -935,7 +935,7 @@ sal_uInt16 ComboBox::InsertEntry(const OUString& rStr, sal_uInt16 const nPos)
     return nRealPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::InsertEntryWithImage(
         const OUString& rStr, const Image& rImage, sal_uInt16 const nPos)
@@ -945,14 +945,14 @@ void ComboBox::InsertEntryWithImage(
     CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, (void*) sal_IntPtr(nRealPos) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::RemoveEntry( const OUString& rStr )
 {
     RemoveEntryAt(GetEntryPos(rStr));
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::RemoveEntryAt(sal_uInt16 const nPos)
 {
@@ -960,14 +960,14 @@ void ComboBox::RemoveEntryAt(sal_uInt16 const nPos)
     CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(nPos) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::Clear()
 {
     mpImplLB->Clear();
     CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, (void*) sal_IntPtr(-1) );
 }
-// -----------------------------------------------------------------------
+
 
 Image ComboBox::GetEntryImage( sal_uInt16 nPos ) const
 {
@@ -976,7 +976,7 @@ Image ComboBox::GetEntryImage( sal_uInt16 nPos ) const
     return Image();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::GetEntryPos( const OUString& rStr ) const
 {
@@ -986,35 +986,35 @@ sal_uInt16 ComboBox::GetEntryPos( const OUString& rStr ) const
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ComboBox::GetEntry( sal_uInt16 nPos ) const
 {
     return mpImplLB->GetEntryList()->GetEntryText( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::GetEntryCount() const
 {
     return mpImplLB->GetEntryList()->GetEntryCount() - mpImplLB->GetEntryList()->GetMRUCount();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ComboBox::IsTravelSelect() const
 {
     return mpImplLB->IsTravelSelect();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ComboBox::IsInDropDown() const
 {
     return mpFloatWin && mpFloatWin->IsInPopupMode();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::EnableMultiSelection( bool bMulti )
 {
@@ -1022,28 +1022,28 @@ void ComboBox::EnableMultiSelection( bool bMulti )
     mpImplLB->SetMultiSelectionSimpleMode( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ComboBox::IsMultiSelectionEnabled() const
 {
     return mpImplLB->IsMultiSelectionEnabled();
 }
 
-// -----------------------------------------------------------------------
+
 
 long ComboBox::CalcWindowSizePixel( sal_uInt16 nLines ) const
 {
     return mpImplLB->GetEntryHeight() * nLines;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ComboBox::GetOptimalSize() const
 {
     return CalcMinimumSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 long ComboBox::getMaxWidthScrollBarAndDownButton() const
 {
@@ -1105,7 +1105,7 @@ Size ComboBox::CalcMinimumSize() const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const
 {
@@ -1132,7 +1132,7 @@ Size ComboBox::CalcAdjustedSize( const Size& rPrefSize ) const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ComboBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
 {
@@ -1174,7 +1174,7 @@ Size ComboBox::CalcBlockSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const
 {
@@ -1193,7 +1193,7 @@ void ComboBox::GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
@@ -1299,7 +1299,7 @@ void ComboBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, s
 
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ComboBox, ImplUserDrawHdl, UserDrawEvent*, pEvent )
 {
@@ -1307,27 +1307,27 @@ IMPL_LINK( ComboBox, ImplUserDrawHdl, UserDrawEvent*, pEvent )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetUserItemSize( const Size& rSz )
 {
     mpImplLB->GetMainWindow()->SetUserItemSize( rSz );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::EnableUserDraw( bool bUserDraw )
 {
     mpImplLB->GetMainWindow()->EnableUserDraw( bUserDraw );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos )
 {
@@ -1335,35 +1335,35 @@ void ComboBox::DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDraw
     mpImplLB->GetMainWindow()->DrawEntry( rEvt.GetItemId(), bDrawImage, bDrawText, bDrawTextAtImagePos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetSeparatorPos( sal_uInt16 n )
 {
     mpImplLB->SetSeparatorPos( n );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
 {
     mpImplLB->SetMRUEntries( rEntries, cSep );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ComboBox::GetMRUEntries( sal_Unicode cSep ) const
 {
     return mpImplLB->GetMRUEntries( cSep );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetMaxMRUCount( sal_uInt16 n )
 {
     mpImplLB->SetMaxMRUCount( n );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::GetMaxMRUCount() const
 {
@@ -1375,28 +1375,28 @@ sal_uInt16 ComboBox::GetMRUCount() const
     return mpImplLB->GetEntryList()->GetMRUCount();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::GetDisplayLineCount() const
 {
     return mpImplLB->GetDisplayLineCount();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetEntryData( sal_uInt16 nPos, void* pNewData )
 {
     mpImplLB->SetEntryData( nPos + mpImplLB->GetEntryList()->GetMRUCount(), pNewData );
 }
 
-// -----------------------------------------------------------------------
+
 
 void* ComboBox::GetEntryData( sal_uInt16 nPos ) const
 {
     return mpImplLB->GetEntryList()->GetEntryData( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ComboBox::GetTopEntry() const
 {
@@ -1406,21 +1406,21 @@ sal_uInt16 ComboBox::GetTopEntry() const
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ComboBox::SetProminentEntryType( ProminentEntry eType )
 {
     mpImplLB->SetProminentEntryType( eType );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ComboBox::GetDropDownPosSizePixel() const
 {
     return mpFloatWin ? mpFloatWin->GetWindowExtentsRelative( const_cast<ComboBox*>(this) ) : Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 const Wallpaper& ComboBox::GetDisplayBackground() const
 {
@@ -1435,12 +1435,12 @@ const Wallpaper& ComboBox::GetDisplayBackground() const
         return Control::GetDisplayBackground();
     return rBack;
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 ComboBox::GetSelectEntryCount() const
 {
     return mpImplLB->GetEntryList()->GetSelectEntryCount();
 }
-// -----------------------------------------------------------------------------
+
 sal_uInt16 ComboBox::GetSelectEntryPos( sal_uInt16 nIndex ) const
 {
     sal_uInt16 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( nIndex );
@@ -1452,24 +1452,24 @@ sal_uInt16 ComboBox::GetSelectEntryPos( sal_uInt16 nIndex ) const
     }
     return nPos;
 }
-// -----------------------------------------------------------------------------
+
 bool ComboBox::IsEntryPosSelected( sal_uInt16 nPos ) const
 {
     return mpImplLB->GetEntryList()->IsEntryPosSelected( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
 }
-// -----------------------------------------------------------------------------
+
 void ComboBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect)
 {
     if ( nPos < mpImplLB->GetEntryList()->GetEntryCount() )
         mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect );
 }
-// -----------------------------------------------------------------------------
+
 void ComboBox::SetNoSelection()
 {
     mpImplLB->SetNoSelection();
     mpSubEdit->SetText( OUString() );
 }
-// -----------------------------------------------------------------------------
+
 Rectangle ComboBox::GetBoundingRectangle( sal_uInt16 nItem ) const
 {
     Rectangle aRect = mpImplLB->GetMainWindow()->GetBoundingRectangle( nItem );
@@ -1477,7 +1477,7 @@ Rectangle ComboBox::GetBoundingRectangle( sal_uInt16 nItem ) const
     aRect.Move( aOffset.TopLeft().X(), aOffset.TopLeft().Y() );
     return aRect;
 }
-// -----------------------------------------------------------------------------
+
 
 void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle )
 {
@@ -1488,7 +1488,7 @@ void ComboBox::SetBorderStyle( sal_uInt16 nBorderStyle )
         mpImplLB->SetBorderStyle( nBorderStyle );
     }
 }
-// -----------------------------------------------------------------------------
+
 
 long ComboBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const
 {
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 84e25feb4cfb..9a458295c28a 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -43,7 +43,7 @@ void Control::ImplInitControlData()
     mpControlData   = new ImplControlData;
 }
 
-// -----------------------------------------------------------------------
+
 
 Control::Control( WindowType nType ) :
     Window( nType )
@@ -51,7 +51,7 @@ Control::Control( WindowType nType ) :
     ImplInitControlData();
 }
 
-// -----------------------------------------------------------------------
+
 
 Control::Control( Window* pParent, WinBits nStyle ) :
     Window( WINDOW_CONTROL )
@@ -73,28 +73,28 @@ Control::Control( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 Control::~Control()
 {
     delete mpControlData, mpControlData = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::GetFocus()
 {
     Window::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::LoseFocus()
 {
     Window::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::Resize()
 {
@@ -102,13 +102,13 @@ void Control::Resize()
     Window::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::FillLayoutData() const
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::CreateLayoutData() const
 {
@@ -116,21 +116,21 @@ void Control::CreateLayoutData() const
     mpControlData->mpLayoutData = new ::vcl::ControlLayoutData();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Control::HasLayoutData() const
 {
     return mpControlData->mpLayoutData != NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ::vcl::ControlLayoutData* Control::GetLayoutData() const
 {
     return mpControlData->mpLayoutData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::SetText( const OUString& rStr )
 {
@@ -138,7 +138,7 @@ void Control::SetText( const OUString& rStr )
     Window::SetText( rStr );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ControlLayoutData::GetCharacterBounds( long nIndex ) const
 {
@@ -146,7 +146,7 @@ Rectangle ControlLayoutData::GetCharacterBounds( long nIndex ) const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Control::GetCharacterBounds( long nIndex ) const
 {
@@ -155,7 +155,7 @@ Rectangle Control::GetCharacterBounds( long nIndex ) const
     return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetCharacterBounds( nIndex ) : Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 long ControlLayoutData::GetIndexForPoint( const Point& rPoint ) const
 {
@@ -174,7 +174,7 @@ long ControlLayoutData::GetIndexForPoint( const Point& rPoint ) const
     return nIndex;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Control::GetIndexForPoint( const Point& rPoint ) const
 {
@@ -183,7 +183,7 @@ long Control::GetIndexForPoint( const Point& rPoint ) const
     return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetIndexForPoint( rPoint ) : -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ControlLayoutData::GetLineCount() const
 {
@@ -193,7 +193,7 @@ long ControlLayoutData::GetLineCount() const
     return nLines;
 }
 
-// -----------------------------------------------------------------------
+
 
 Pair ControlLayoutData::GetLineStartEnd( long nLine ) const
 {
@@ -218,7 +218,7 @@ Pair ControlLayoutData::GetLineStartEnd( long nLine ) const
     return aPair;
 }
 
-// -----------------------------------------------------------------------
+
 
 Pair Control::GetLineStartEnd( long nLine ) const
 {
@@ -227,7 +227,7 @@ Pair Control::GetLineStartEnd( long nLine ) const
     return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->GetLineStartEnd( nLine ) : Pair( -1, -1 );
 }
 
-// -----------------------------------------------------------------------
+
 
 long ControlLayoutData::ToRelativeLineIndex( long nIndex ) const
 {
@@ -261,7 +261,7 @@ long ControlLayoutData::ToRelativeLineIndex( long nIndex ) const
     return nIndex;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Control::ToRelativeLineIndex( long nIndex ) const
 {
@@ -270,7 +270,7 @@ long Control::ToRelativeLineIndex( long nIndex ) const
     return mpControlData->mpLayoutData ? mpControlData->mpLayoutData->ToRelativeLineIndex( nIndex ) : -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Control::GetDisplayText() const
 {
@@ -279,7 +279,7 @@ OUString Control::GetDisplayText() const
     return mpControlData->mpLayoutData ? OUString(mpControlData->mpLayoutData->m_aDisplayText) : GetText();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Control::Notify( NotifyEvent& rNEvt )
 {
@@ -313,7 +313,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
     return Window::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::StateChanged( StateChangedType nStateChange )
 {
@@ -329,7 +329,7 @@ void Control::StateChanged( StateChangedType nStateChange )
     Window::StateChanged( nStateChange );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::AppendLayoutData( const Control& rSubControl ) const
 {
@@ -355,7 +355,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const
     }
 }
 
-// -----------------------------------------------------------------
+
 
 bool Control::ImplCallEventListenersAndHandler(  sal_uLong nEvent, const Link& rHandler, void* pCaller )
 {
@@ -376,7 +376,7 @@ bool Control::ImplCallEventListenersAndHandler(  sal_uLong nEvent, const Link& r
     return true;
 }
 
-// -----------------------------------------------------------------
+
 
 void Control::SetLayoutDataParent( const Control* pParent ) const
 {
@@ -384,14 +384,14 @@ void Control::SetLayoutDataParent( const Control* pParent ) const
         mpControlData->mpLayoutData->m_pParent = pParent;
 }
 
-// -----------------------------------------------------------------
+
 
 void Control::ImplClearLayoutData() const
 {
     delete mpControlData->mpLayoutData, mpControlData->mpLayoutData = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect )
 {
@@ -420,7 +420,7 @@ void Control::ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect )
     pDev->OutputDevice::SetSettings( aOriginalSettings );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Control::DataChanged( const DataChangedEvent& rDCEvt)
 {
@@ -447,7 +447,7 @@ void Control::DataChanged( const DataChangedEvent& rDCEvt)
     }
 }
 
-// -----------------------------------------------------------------
+
 
 ControlLayoutData::~ControlLayoutData()
 {
@@ -455,7 +455,7 @@ ControlLayoutData::~ControlLayoutData()
         m_pParent->ImplClearLayoutData();
 }
 
-// -----------------------------------------------------------------
+
 
 Size Control::GetOptimalSize() const
 {
@@ -463,7 +463,7 @@ Size Control::GetOptimalSize() const
                  GetTextHeight() + 2 * 6 );
 }
 
-// -----------------------------------------------------------------
+
 
 void Control::SetReferenceDevice( OutputDevice* _referenceDevice )
 {
@@ -474,27 +474,27 @@ void Control::SetReferenceDevice( OutputDevice* _referenceDevice )
     Invalidate();
 }
 
-// -----------------------------------------------------------------
+
 
 OutputDevice* Control::GetReferenceDevice() const
 {
     return mpControlData->mpReferenceDevice;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& Control::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetLabelFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& Control::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetLabelTextColor();
 }
 
-// -----------------------------------------------------------------
+
 void Control::ImplInitSettings( const bool _bFont, const bool _bForeground )
 {
     const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -519,7 +519,7 @@ void Control::ImplInitSettings( const bool _bFont, const bool _bForeground )
     }
 }
 
-// -----------------------------------------------------------------
+
 
 void Control::DrawControlText( OutputDevice& _rTargetDevice, Rectangle& _io_rRect, const OUString& _rStr,
     sal_uInt16 _nStyle, MetricVector* _pVector, OUString* _pDisplayText ) const
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 165d73885552..e24a474a1324 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -137,7 +137,7 @@ struct Impl_IMEInfos
     void        DestroyAttribs();
 };
 
-// -----------------------------------------------------------------------
+
 
 Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos)
     : aOldTextAfterStartPos(rOldTextAfterStartPos)
@@ -149,14 +149,14 @@ Impl_IMEInfos::Impl_IMEInfos(sal_Int32 nP, const OUString& rOldTextAfterStartPos
     bWasCursorOverwrite = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 Impl_IMEInfos::~Impl_IMEInfos()
 {
     delete[] pAttribs;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Impl_IMEInfos::CopyAttribs(const sal_uInt16* pA, sal_Int32 nL)
 {
@@ -166,7 +166,7 @@ void Impl_IMEInfos::CopyAttribs(const sal_uInt16* pA, sal_Int32 nL)
     memcpy( pAttribs, pA, nL*sizeof(sal_uInt16) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Impl_IMEInfos::DestroyAttribs()
 {
@@ -183,7 +183,7 @@ Edit::Edit( WindowType nType ) :
     ImplInitEditData();
 }
 
-// -----------------------------------------------------------------------
+
 
 Edit::Edit( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_EDIT )
@@ -264,7 +264,7 @@ bool Edit::set_property(const OString &rKey, const OString &rValue)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 Edit::~Edit()
 {
@@ -298,7 +298,7 @@ Edit::~Edit()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplInitEditData()
 {
@@ -330,7 +330,7 @@ void Edit::ImplInitEditData()
     mxDnDListener = pDnDWrapper;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Edit::ImplUseNativeBorder( WinBits nStyle )
 {
@@ -385,7 +385,7 @@ void Edit::ImplInit( Window* pParent, WinBits nStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits Edit::ImplInitStyle( WinBits nStyle )
 {
@@ -397,7 +397,7 @@ WinBits Edit::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Edit::IsCharInput( const KeyEvent& rKeyEvent )
 {
@@ -409,7 +409,7 @@ bool Edit::IsCharInput( const KeyEvent& rKeyEvent )
             !rKeyEvent.GetKeyCode().IsMod1() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplModified()
 {
@@ -417,7 +417,7 @@ void Edit::ImplModified()
     Modify();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 {
@@ -461,7 +461,7 @@ void Edit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long Edit::ImplGetExtraOffset() const
 {
@@ -476,7 +476,7 @@ long Edit::ImplGetExtraOffset() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 OUString Edit::ImplGetText() const
 {
@@ -495,7 +495,7 @@ OUString Edit::ImplGetText() const
         return maText.toString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplInvalidateOrRepaint()
 {
@@ -510,7 +510,7 @@ void Edit::ImplInvalidateOrRepaint()
         ImplRepaint();
 }
 
-// -----------------------------------------------------------------------
+
 
 long Edit::ImplGetTextYPosition() const
 {
@@ -521,7 +521,7 @@ long Edit::ImplGetTextYPosition() const
     return ( GetOutputSizePixel().Height() - GetTextHeight() ) / 2;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplRepaint(bool bLayout)
 {
@@ -743,7 +743,7 @@ void Edit::ImplRepaint(bool bLayout)
     delete [] pDXBuffer;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode )
 {
@@ -813,7 +813,7 @@ void Edit::ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uI
     mbInternModified = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Edit::ImplGetValidString( const OUString& rString ) const
 {
@@ -824,7 +824,7 @@ OUString Edit::ImplGetValidString( const OUString& rString ) const
     return aValidString;
 }
 
-// -----------------------------------------------------------------------
+
 uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const
 {
     //!! since we don't want to become incompatible in the next minor update
@@ -833,7 +833,7 @@ uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const
     uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
     return i18n::BreakIterator::create(xContext);
 }
-// -----------------------------------------------------------------------
+
 
 uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChecker()
 {
@@ -845,7 +845,7 @@ uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenc
     return mxISC;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ShowTruncationWarning( Window* pParent )
 {
@@ -857,7 +857,7 @@ void Edit::ShowTruncationWarning( Window* pParent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const
 {
@@ -871,7 +871,7 @@ bool Edit::ImplTruncateToMaxLen( OUString& rStr, sal_Int32 nSelectionLen ) const
     return bWasTruncated;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool bIsUserInput )
 {
@@ -974,7 +974,7 @@ void Edit::ImplInsertText( const OUString& rStr, const Selection* pNewSel, bool
     mbInternModified = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection )
 {
@@ -1009,7 +1009,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int Edit::ImplGetNativeControlType() const
 {
@@ -1140,7 +1140,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplShowCursor( bool bOnlyIfVisible )
 {
@@ -1222,7 +1222,7 @@ void Edit::ImplShowCursor( bool bOnlyIfVisible )
         delete [] pDXBuffer;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplAlign()
 {
@@ -1262,7 +1262,7 @@ void Edit::ImplAlign()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplAlignAndPaint()
 {
@@ -1271,7 +1271,7 @@ void Edit::ImplAlignAndPaint()
     ImplShowCursor();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const
 {
@@ -1332,7 +1332,7 @@ sal_Int32 Edit::ImplGetCharPos( const Point& rWindowPos ) const
     return nIndex;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplSetCursorPos( sal_Int32 nChar, bool bSelect )
 {
@@ -1343,7 +1343,7 @@ void Edit::ImplSetCursorPos( sal_Int32 nChar, bool bSelect )
     ImplSetSelection( aSelection );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplLoadRes( const ResId& rResId )
 {
@@ -1354,7 +1354,7 @@ void Edit::ImplLoadRes( const ResId& rResId )
         SetMaxTextLen( nTextLength );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplCopyToSelectionClipboard()
 {
@@ -1370,7 +1370,7 @@ void Edit::ImplCopy( uno::Reference< datatransfer::clipboard::XClipboard >& rxCl
     ::vcl::unohelper::TextDataObject::CopyStringTo( GetSelected(), rxClipboard );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxClipboard )
 {
@@ -1410,7 +1410,7 @@ void Edit::ImplPaste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -1455,7 +1455,7 @@ void Edit::MouseButtonDown( const MouseEvent& rMEvt )
     mbInMBDown = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -1474,7 +1474,7 @@ void Edit::MouseButtonUp( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Tracking( const TrackingEvent& rTEvt )
 {
@@ -1504,7 +1504,7 @@ void Edit::Tracking( const TrackingEvent& rTEvt )
         mpUpdateDataTimer->Start();//do not update while the user is still travelling in the control
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
 {
@@ -1837,7 +1837,7 @@ bool Edit::ImplHandleKeyEvent( const KeyEvent& rKEvt )
     return bDone;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::KeyInput( const KeyEvent& rKEvt )
 {
@@ -1848,7 +1848,7 @@ void Edit::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::FillLayoutData() const
 {
@@ -1856,7 +1856,7 @@ void Edit::FillLayoutData() const
     const_cast<Edit*>(this)->ImplRepaint(true);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Paint( const Rectangle& )
 {
@@ -1864,7 +1864,7 @@ void Edit::Paint( const Rectangle& )
         ImplRepaint();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Resize()
 {
@@ -1879,7 +1879,7 @@ void Edit::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
@@ -1968,7 +1968,7 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_u
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplInvalidateOutermostBorder( Window* pWin )
 {
@@ -2036,7 +2036,7 @@ void Edit::GetFocus()
     Control::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Edit::GetPreferredKeyInputWindow()
 {
@@ -2046,7 +2046,7 @@ Window* Edit::GetPreferredKeyInputWindow()
         return this;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::LoseFocus()
 {
@@ -2075,7 +2075,7 @@ void Edit::LoseFocus()
     Control::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Command( const CommandEvent& rCEvt )
 {
@@ -2314,7 +2314,7 @@ void Edit::Command( const CommandEvent& rCEvt )
         Control::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::StateChanged( StateChangedType nType )
 {
@@ -2415,7 +2415,7 @@ void Edit::StateChanged( StateChangedType nType )
     Control::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -2435,7 +2435,7 @@ void Edit::DataChanged( const DataChangedEvent& rDCEvt )
     Control::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplShowDDCursor()
 {
@@ -2452,7 +2452,7 @@ void Edit::ImplShowDDCursor()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplHideDDCursor()
 {
@@ -2463,7 +2463,7 @@ void Edit::ImplHideDDCursor()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Modify()
 {
@@ -2493,14 +2493,14 @@ void Edit::Modify()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::UpdateData()
 {
     maUpdateDataHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl)
 {
@@ -2508,7 +2508,7 @@ IMPL_LINK_NOARG(Edit, ImplUpdateDataHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::EnableUpdateData( sal_uLong nTimeout )
 {
@@ -2526,7 +2526,7 @@ void Edit::EnableUpdateData( sal_uLong nTimeout )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetEchoChar( sal_Unicode c )
 {
@@ -2535,7 +2535,7 @@ void Edit::SetEchoChar( sal_Unicode c )
         mpSubEdit->SetEchoChar( c );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetReadOnly( sal_Bool bReadOnly )
 {
@@ -2549,7 +2549,7 @@ void Edit::SetReadOnly( sal_Bool bReadOnly )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetAutocompleteHdl( const Link& rHdl )
 {
@@ -2558,7 +2558,7 @@ void Edit::SetAutocompleteHdl( const Link& rHdl )
         mpSubEdit->SetAutocompleteHdl( rHdl );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetInsertMode( bool bInsert )
 {
@@ -2572,7 +2572,7 @@ void Edit::SetInsertMode( bool bInsert )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Edit::IsInsertMode() const
 {
@@ -2582,7 +2582,7 @@ bool Edit::IsInsertMode() const
         return mbInsertMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetMaxTextLen(sal_Int32 nMaxLen)
 {
@@ -2597,7 +2597,7 @@ void Edit::SetMaxTextLen(sal_Int32 nMaxLen)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetSelection( const Selection& rSelection )
 {
@@ -2611,7 +2611,7 @@ void Edit::SetSelection( const Selection& rSelection )
     ImplSetSelection( rSelection );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint )
 {
@@ -2675,7 +2675,7 @@ void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const Selection& Edit::GetSelection() const
 {
@@ -2685,7 +2685,7 @@ const Selection& Edit::GetSelection() const
         return maSelection;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ReplaceSelected( const OUString& rStr )
 {
@@ -2695,7 +2695,7 @@ void Edit::ReplaceSelected( const OUString& rStr )
         ImplInsertText( rStr );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::DeleteSelected()
 {
@@ -2708,7 +2708,7 @@ void Edit::DeleteSelected()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Edit::GetSelected() const
 {
@@ -2722,7 +2722,7 @@ OUString Edit::GetSelected() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Cut()
 {
@@ -2733,7 +2733,7 @@ void Edit::Cut()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Copy()
 {
@@ -2744,7 +2744,7 @@ void Edit::Copy()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Paste()
 {
@@ -2752,7 +2752,7 @@ void Edit::Paste()
     ImplPaste( aClipboard );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::Undo()
 {
@@ -2768,7 +2768,7 @@ void Edit::Undo()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetText( const OUString& rStr )
 {
@@ -2781,7 +2781,7 @@ void Edit::SetText( const OUString& rStr )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetText( const OUString& rStr, const Selection& rSelection )
 {
@@ -2791,7 +2791,7 @@ void Edit::SetText( const OUString& rStr, const Selection& rSelection )
         ImplSetText( rStr, &rSelection );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Edit::GetText() const
 {
@@ -2801,7 +2801,7 @@ OUString Edit::GetText() const
         return maText.toString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetPlaceholderText( const OUString& rStr )
 {
@@ -2815,7 +2815,7 @@ void Edit::SetPlaceholderText( const OUString& rStr )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Edit::GetPlaceholderText() const
 {
@@ -2825,7 +2825,7 @@ OUString Edit::GetPlaceholderText() const
     return maPlaceholderText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetModifyFlag()
 {
@@ -2835,7 +2835,7 @@ void Edit::SetModifyFlag()
         mbModified = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::ClearModifyFlag()
 {
@@ -2845,7 +2845,7 @@ void Edit::ClearModifyFlag()
         mbModified = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetSubEdit( Edit* pEdit )
 {
@@ -2927,14 +2927,14 @@ Size Edit::GetMinimumEditSize()
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Edit::GetOptimalSize() const
 {
     return CalcMinimumSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Edit::CalcSize(sal_Int32 nChars) const
 {
@@ -2947,7 +2947,7 @@ Size Edit::CalcSize(sal_Int32 nChars) const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 Edit::GetMaxVisChars() const
 {
@@ -2957,28 +2957,28 @@ sal_Int32 Edit::GetMaxVisChars() const
     return nCharWidth ? nOutWidth/nCharWidth : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 Edit::GetCharPos( const Point& rWindowPos ) const
 {
     return ImplGetCharPos( rWindowPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::SetGetSpecialCharsFunction( FncGetSpecialChars fn )
 {
     pImplFncGetSpecialChars = fn;
 }
 
-// -----------------------------------------------------------------------
+
 
 FncGetSpecialChars Edit::GetGetSpecialCharsFunction()
 {
     return pImplFncGetSpecialChars;
 }
 
-// -----------------------------------------------------------------------
+
 
 PopupMenu* Edit::CreatePopupMenu()
 {
@@ -3005,7 +3005,7 @@ PopupMenu* Edit::CreatePopupMenu()
     return pPopup;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Edit::DeletePopupMenu( PopupMenu* pMenu )
 {
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 695d3ae6b8e7..ebe5367ef907 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -94,7 +94,7 @@ void FixedText::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits FixedText::ImplInitStyle( WinBits nStyle )
 {
@@ -103,20 +103,20 @@ WinBits FixedText::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& FixedText::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoFont() : _rStyle.GetLabelFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& FixedText::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return ( GetStyle() & WB_INFO ) ? _rStyle.GetInfoTextColor() : _rStyle.GetLabelTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::ImplInitSettings( bool bFont,
                                   bool bForeground, bool bBackground )
@@ -147,7 +147,7 @@ void FixedText::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedText::FixedText( Window* pParent, WinBits nStyle )
     : Control(WINDOW_FIXEDTEXT)
@@ -158,7 +158,7 @@ FixedText::FixedText( Window* pParent, WinBits nStyle )
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedText::FixedText( Window* pParent, const ResId& rResId )
     : Control(WINDOW_FIXEDTEXT)
@@ -175,7 +175,7 @@ FixedText::FixedText( Window* pParent, const ResId& rResId )
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle )
 {
@@ -208,7 +208,7 @@ sal_uInt16 FixedText::ImplGetTextStyle( WinBits nWinStyle )
     return nTextStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
                           const Point& rPos, const Size& rSize,
@@ -256,14 +256,14 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::Paint( const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                       sal_uLong nFlags )
@@ -303,7 +303,7 @@ void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::Resize()
 {
@@ -311,7 +311,7 @@ void FixedText::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::StateChanged( StateChangedType nType )
 {
@@ -352,7 +352,7 @@ void FixedText::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -368,7 +368,7 @@ void FixedText::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size FixedText::getTextDimensions(Control const *pControl, const OUString &rTxt, long nMaxWidth)
 {
@@ -401,7 +401,7 @@ Size FixedText::CalcMinimumSize( long nMaxWidth ) const
 {
     return CalcWindowSize( CalcMinimumTextSize ( this, nMaxWidth ) );
 }
-// -----------------------------------------------------------------------
+
 
 Size FixedText::GetOptimalSize() const
 {
@@ -425,7 +425,7 @@ Size FixedText::GetOptimalSize() const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedText::FillLayoutData() const
 {
@@ -514,7 +514,7 @@ SelectableFixedText::SelectableFixedText(Window* pParent, WinBits nStyle)
     SetPaintTransparent( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SelectableFixedText::LoseFocus()
 {
@@ -532,7 +532,7 @@ void FixedLine::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits FixedLine::ImplInitStyle( WinBits nStyle )
 {
@@ -541,20 +541,20 @@ WinBits FixedLine::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& FixedLine::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetGroupFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& FixedLine::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetGroupTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::ImplInitSettings( bool bFont,
                                   bool bForeground, bool bBackground )
@@ -585,7 +585,7 @@ void FixedLine::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::ImplDraw( bool bLayout )
 {
@@ -660,7 +660,7 @@ void FixedLine::ImplDraw( bool bLayout )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedLine::FixedLine( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_FIXEDLINE )
@@ -669,7 +669,7 @@ FixedLine::FixedLine( Window* pParent, WinBits nStyle ) :
     SetSizePixel( Size( 2, 2 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedLine::FixedLine( Window* pParent, const ResId& rResId ) :
     Control( WINDOW_FIXEDLINE )
@@ -683,7 +683,7 @@ FixedLine::FixedLine( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void  FixedLine::FillLayoutData() const
 {
@@ -692,20 +692,20 @@ void  FixedLine::FillLayoutData() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::Paint( const Rectangle& )
 {
     ImplDraw();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::Resize()
 {
@@ -713,7 +713,7 @@ void FixedLine::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::StateChanged( StateChangedType nType )
 {
@@ -752,7 +752,7 @@ void FixedLine::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedLine::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -768,7 +768,7 @@ void FixedLine::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size FixedLine::GetOptimalSize() const
 {
@@ -784,7 +784,7 @@ void FixedBitmap::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits FixedBitmap::ImplInitStyle( WinBits nStyle )
 {
@@ -793,7 +793,7 @@ WinBits FixedBitmap::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::ImplInitSettings()
 {
@@ -818,7 +818,7 @@ void FixedBitmap::ImplInitSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::ImplLoadRes( const ResId& rResId )
 {
@@ -833,7 +833,7 @@ void FixedBitmap::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_FIXEDBITMAP )
@@ -841,7 +841,7 @@ FixedBitmap::FixedBitmap( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) :
     Control( WINDOW_FIXEDBITMAP )
@@ -855,13 +855,13 @@ FixedBitmap::FixedBitmap( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedBitmap::~FixedBitmap()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
                             const Point& rPos, const Size& rSize )
@@ -881,14 +881,14 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::Paint( const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                         sal_uLong nFlags )
@@ -912,7 +912,7 @@ void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::Resize()
 {
@@ -920,7 +920,7 @@ void FixedBitmap::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::StateChanged( StateChangedType nType )
 {
@@ -946,7 +946,7 @@ void FixedBitmap::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -960,7 +960,7 @@ void FixedBitmap::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedBitmap::SetBitmap( const Bitmap& rBitmap )
 {
@@ -979,7 +979,7 @@ void FixedImage::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits FixedImage::ImplInitStyle( WinBits nStyle )
 {
@@ -988,7 +988,7 @@ WinBits FixedImage::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::ImplInitSettings()
 {
@@ -1013,7 +1013,7 @@ void FixedImage::ImplInitSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::ImplLoadRes( const ResId& rResId )
 {
@@ -1028,7 +1028,7 @@ void FixedImage::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedImage::FixedImage( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_FIXEDIMAGE )
@@ -1036,7 +1036,7 @@ FixedImage::FixedImage( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedImage::FixedImage( Window* pParent, const ResId& rResId ) :
     Control( WINDOW_FIXEDIMAGE )
@@ -1050,13 +1050,13 @@ FixedImage::FixedImage( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 FixedImage::~FixedImage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
                            const Point& rPos, const Size& rSize )
@@ -1088,27 +1088,27 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     mbInUserDraw = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::Paint( const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size FixedImage::GetOptimalSize() const
 {
     return maImage.GetSizePixel();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                        sal_uLong nFlags )
@@ -1131,7 +1131,7 @@ void FixedImage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::Resize()
 {
@@ -1139,7 +1139,7 @@ void FixedImage::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::StateChanged( StateChangedType nType )
 {
@@ -1166,7 +1166,7 @@ void FixedImage::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1180,7 +1180,7 @@ void FixedImage::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FixedImage::SetImage( const Image& rImage )
 {
@@ -1192,7 +1192,7 @@ void FixedImage::SetImage( const Image& rImage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool FixedImage::SetModeImage( const Image& rImage )
 {
@@ -1200,7 +1200,7 @@ bool FixedImage::SetModeImage( const Image& rImage )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 const Image& FixedImage::GetModeImage( ) const
 {
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 8e1ef5bf1f51..47fd9e25c8db 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -43,7 +43,7 @@ void GroupBox::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits GroupBox::ImplInitStyle( WinBits nStyle )
 {
@@ -52,20 +52,20 @@ WinBits GroupBox::ImplInitStyle( WinBits nStyle )
     return nStyle;
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& GroupBox::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetGroupFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& GroupBox::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetGroupTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::ImplInitSettings( bool bFont,
                                  bool bForeground, bool bBackground )
@@ -98,7 +98,7 @@ void GroupBox::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 GroupBox::GroupBox( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_GROUPBOX )
@@ -106,7 +106,7 @@ GroupBox::GroupBox( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 GroupBox::GroupBox( Window* pParent, const ResId& rResId ) :
     Control( WINDOW_GROUPBOX )
@@ -120,7 +120,7 @@ GroupBox::GroupBox( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
                          const Point& rPos, const Size& rSize, bool bLayout )
@@ -212,7 +212,7 @@ void GroupBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
     DrawControlText( *pDev, aRect, aText, nTextStyle, pVector, pDisplayText );
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::FillLayoutData() const
 {
@@ -220,14 +220,14 @@ void GroupBox::FillLayoutData() const
     const_cast<GroupBox*>(this)->   ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::Paint( const Rectangle& )
 {
     ImplDraw( this, 0, Point(), GetOutputSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
                      sal_uLong nFlags )
@@ -249,7 +249,7 @@ void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::Resize()
 {
@@ -257,7 +257,7 @@ void GroupBox::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::StateChanged( StateChangedType nType )
 {
@@ -295,7 +295,7 @@ void GroupBox::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GroupBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 9d1b2f60cabf..252fb7f67552 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -76,7 +76,7 @@ void ImplInitFieldSettings( Window* pWin, bool bFont, bool bForeground, bool bBa
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplInitDropDownButton( PushButton* pButton )
 {
@@ -104,14 +104,14 @@ ImplEntryList::ImplEntryList( Window* pWindow )
     mnMaxMRUCount = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplEntryList::~ImplEntryList()
 {
     Clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplEntryList::Clear()
 {
@@ -119,7 +119,7 @@ void ImplEntryList::Clear()
     maEntries.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplEntryList::SelectEntry( sal_uInt16 nPos, bool bSelect )
 {
@@ -249,7 +249,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry
     return insPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplEntryList::RemoveEntry( sal_uInt16 nPos )
 {
@@ -264,7 +264,7 @@ void ImplEntryList::RemoveEntry( sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUArea ) const
 {
@@ -278,7 +278,7 @@ sal_uInt16 ImplEntryList::FindEntry( const OUString& rString, bool bSearchMRUAre
     return LISTBOX_ENTRY_NOTFOUND;
 }
 
-    // -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nStart, bool bForward, bool bLazy ) const
 {
@@ -316,7 +316,7 @@ sal_uInt16 ImplEntryList::FindMatchingEntry( const OUString& rStr, sal_uInt16 nS
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const
 {
@@ -333,7 +333,7 @@ sal_uInt16 ImplEntryList::FindEntry( const void* pData ) const
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginIndex, long i_nBeginHeight ) const
 {
@@ -361,7 +361,7 @@ long ImplEntryList::GetAddedHeight( sal_uInt16 i_nEndIndex, sal_uInt16 i_nBeginI
     return i_nEndIndex > i_nBeginIndex ? nHeight : -nHeight;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const
 {
@@ -369,7 +369,7 @@ long ImplEntryList::GetEntryHeight( sal_uInt16 nPos ) const
     return pImplEntry ? pImplEntry->mnHeight : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
 {
@@ -380,7 +380,7 @@ OUString ImplEntryList::GetEntryText( sal_uInt16 nPos ) const
     return aEntryText;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const
 {
@@ -391,7 +391,7 @@ bool ImplEntryList::HasEntryImage( sal_uInt16 nPos ) const
     return bImage;
 }
 
-// -----------------------------------------------------------------------
+
 
 Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const
 {
@@ -402,7 +402,7 @@ Image ImplEntryList::GetEntryImage( sal_uInt16 nPos ) const
     return aImage;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData )
 {
@@ -411,7 +411,7 @@ void ImplEntryList::SetEntryData( sal_uInt16 nPos, void* pNewData )
         pImplEntry->mpUserData = pNewData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void* ImplEntryList::GetEntryData( sal_uInt16 nPos ) const
 {
@@ -419,7 +419,7 @@ void* ImplEntryList::GetEntryData( sal_uInt16 nPos ) const
     return pImplEntry ? pImplEntry->mpUserData : NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags )
 {
@@ -428,7 +428,7 @@ void ImplEntryList::SetEntryFlags( sal_uInt16 nPos, long nFlags )
         pImplEntry->mnFlags = nFlags;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplEntryList::GetEntryFlags( sal_uInt16 nPos ) const
 {
@@ -436,7 +436,7 @@ long ImplEntryList::GetEntryFlags( sal_uInt16 nPos ) const
     return pImplEntry ? pImplEntry->mnFlags : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplEntryList::GetSelectEntryCount() const
 {
@@ -450,14 +450,14 @@ sal_uInt16 ImplEntryList::GetSelectEntryCount() const
     return nSelCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplEntryList::GetSelectEntry( sal_uInt16 nIndex ) const
 {
     return GetEntryText( GetSelectEntryPos( nIndex ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const
 {
@@ -482,7 +482,7 @@ sal_uInt16 ImplEntryList::GetSelectEntryPos( sal_uInt16 nIndex ) const
     return nSelEntryPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const
 {
@@ -490,7 +490,7 @@ bool ImplEntryList::IsEntryPosSelected( sal_uInt16 nIndex ) const
     return pImplEntry ? pImplEntry->mbIsSelected : sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const
 {
@@ -498,7 +498,7 @@ bool ImplEntryList::IsEntrySelectable( sal_uInt16 nPos ) const
     return pImplEntry ? ((pImplEntry->mnFlags & LISTBOX_ENTRY_FLAG_DISABLE_SELECTION) == 0) : true;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplEntryList::FindFirstSelectable( sal_uInt16 nPos, bool bForward /* = true */ )
 {
@@ -574,21 +574,21 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
     ImplCalcMetrics();
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplListBoxWindow::~ImplListBoxWindow()
 {
     delete mpEntryList;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplInitSettings( bool bFont, bool bForeground, bool bBackground )
 {
     ImplInitFieldSettings( this, bFont, bForeground, bBackground );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplCalcMetrics()
 {
@@ -620,7 +620,7 @@ void ImplListBoxWindow::ImplCalcMetrics()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::Clear()
 {
@@ -650,7 +650,7 @@ void ImplListBoxWindow::SetUserItemSize( const Size& rSz )
     ImplCalcMetrics();
 }
 
-// -----------------------------------------------------------------------
+
 
 struct ImplEntryMetrics
 {
@@ -663,7 +663,7 @@ struct ImplEntryMetrics
     long    nImgHeight;
 };
 
-// -----------------------------------------------------------------------
+
 void ImplListBoxWindow::EnableQuickSelection( const bool& b )
 {
     maQuickSelectionEngine.SetEnabled( b );
@@ -751,7 +751,7 @@ void ImplListBoxWindow::ImplUpdateEntryMetrics( ImplEntryType& rEntry )
     rEntry.mnHeight = aMetrics.nEntryHeight;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplCallSelect()
 {
@@ -794,7 +794,7 @@ void ImplListBoxWindow::ImplCallSelect()
     mbSelectionChanged = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry )
 {
@@ -808,7 +808,7 @@ sal_uInt16 ImplListBoxWindow::InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewE
     return nNewPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos )
 {
@@ -819,7 +819,7 @@ void ImplListBoxWindow::RemoveEntry( sal_uInt16 nPos )
     ImplCalcMetrics();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags )
 {
@@ -829,7 +829,7 @@ void ImplListBoxWindow::SetEntryFlags( sal_uInt16 nPos, long nFlags )
         ImplUpdateEntryMetrics( *pEntry );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplShowFocusRect()
 {
@@ -839,7 +839,7 @@ void ImplListBoxWindow::ImplShowFocusRect()
     mbHasFocusRect = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplHideFocusRect()
 {
@@ -851,7 +851,7 @@ void ImplListBoxWindow::ImplHideFocusRect()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
 {
@@ -870,7 +870,7 @@ sal_uInt16 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
     return nSelect;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const
 {
@@ -888,7 +888,7 @@ bool ImplListBoxWindow::IsVisible( sal_uInt16 i_nEntry ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const
 {
@@ -908,7 +908,7 @@ sal_uInt16 ImplListBoxWindow::GetLastVisibleEntry() const
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -949,7 +949,7 @@ void ImplListBoxWindow::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
 {
@@ -1030,7 +1030,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::DeselectAll()
 {
@@ -1041,7 +1041,7 @@ void ImplListBoxWindow::DeselectAll()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect )
 {
@@ -1092,7 +1092,7 @@ void ImplListBoxWindow::SelectEntry( sal_uInt16 nPos, bool bSelect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, bool bShift, bool bCtrl, bool bSelectPosChange /*=FALSE*/ )
 {
@@ -1249,7 +1249,7 @@ bool ImplListBoxWindow::SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, b
     return bSelectionChanged;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
 {
@@ -1418,7 +1418,7 @@ void ImplListBoxWindow::Tracking( const TrackingEvent& rTEvt )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt )
 {
@@ -1426,7 +1426,7 @@ void ImplListBoxWindow::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 {
@@ -1715,7 +1715,7 @@ bool ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
     return bDone;
 }
 
-// -----------------------------------------------------------------------
+
 namespace
 {
     static ::vcl::StringEntryIdentifier lcl_getEntry( const ImplEntryList& _rList, sal_uInt16 _nPos, OUString& _out_entryText )
@@ -1738,20 +1738,20 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------
+
 ::vcl::StringEntryIdentifier ImplListBoxWindow::CurrentEntry( OUString& _out_entryText ) const
 {
     return lcl_getEntry( *GetEntryList(), ( mnCurrentPos == LISTBOX_ENTRY_NOTFOUND ) ? 0 : mnCurrentPos + 1, _out_entryText );
 }
 
-// -----------------------------------------------------------------------
+
 ::vcl::StringEntryIdentifier ImplListBoxWindow::NextEntry( ::vcl::StringEntryIdentifier _currentEntry, OUString& _out_entryText ) const
 {
     sal_uInt16 nNextPos = lcl_getEntryPos( _currentEntry ) + 1;
     return lcl_getEntry( *GetEntryList(), nNextPos, _out_entryText );
 }
 
-// -----------------------------------------------------------------------
+
 void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry )
 {
     sal_uInt16 nSelect = lcl_getEntryPos( _entry );
@@ -1781,7 +1781,7 @@ void ImplListBoxWindow::SelectEntry( ::vcl::StringEntryIdentifier _entry )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout )
 {
@@ -1838,7 +1838,7 @@ void ImplListBoxWindow::ImplPaint( sal_uInt16 nPos, bool bErase, bool bLayout )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout )
 {
@@ -1958,7 +1958,7 @@ void ImplListBoxWindow::DrawEntry( sal_uInt16 nPos, bool bDrawImage, bool bDrawT
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::FillLayoutData() const
 {
@@ -1967,7 +1967,7 @@ void ImplListBoxWindow::FillLayoutData() const
         ImplDoPaint( Rectangle( Point( 0, 0 ), GetOutputSize() ), true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
 {
@@ -1999,14 +1999,14 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
         ImplShowFocusRect();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::Paint( const Rectangle& rRect )
 {
     ImplDoPaint( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const
 {
@@ -2021,7 +2021,7 @@ sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const
     return nEntries;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::Resize()
 {
@@ -2043,7 +2043,7 @@ void ImplListBoxWindow::Resize()
     ImplClearLayoutData();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::GetFocus()
 {
@@ -2058,7 +2058,7 @@ void ImplListBoxWindow::GetFocus()
     Control::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::LoseFocus()
 {
@@ -2066,7 +2066,7 @@ void ImplListBoxWindow::LoseFocus()
     Control::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop )
 {
@@ -2097,7 +2097,7 @@ void ImplListBoxWindow::SetTopEntry( sal_uInt16 nTop )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos )
 {
@@ -2111,14 +2111,14 @@ void ImplListBoxWindow::ShowProminentEntry( sal_uInt16 nEntryPos )
     SetTopEntry( nEntryPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::SetLeftIndent( long n )
 {
     ScrollHorz( n - mnLeft );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::ScrollHorz( long n )
 {
@@ -2152,7 +2152,7 @@ void ImplListBoxWindow::ScrollHorz( long n )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const
 {
@@ -2164,7 +2164,7 @@ Size ImplListBoxWindow::CalcSize(sal_Int32 nMaxLines) const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const
 {
@@ -2175,7 +2175,7 @@ Rectangle ImplListBoxWindow::GetBoundingRectangle( sal_uInt16 nItem ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::StateChanged( StateChangedType nType )
 {
@@ -2211,7 +2211,7 @@ void ImplListBoxWindow::StateChanged( StateChangedType nType )
     ImplClearLayoutData();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -2229,7 +2229,7 @@ void ImplListBoxWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBoxWindow::ImplGetTextStyle() const
 {
@@ -2275,7 +2275,7 @@ ImplListBox::ImplListBox( Window* pParent, WinBits nWinStyle ) :
     maLBWindow.Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplListBox::~ImplListBox()
 {
@@ -2284,7 +2284,7 @@ ImplListBox::~ImplListBox()
     delete mpScrollBarBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::Clear()
 {
@@ -2299,7 +2299,7 @@ void ImplListBox::Clear()
     StateChanged( STATE_CHANGE_DATA );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr )
 {
@@ -2309,7 +2309,7 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr )
     return nNewPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, const Image& rImage )
 {
@@ -2319,7 +2319,7 @@ sal_uInt16 ImplListBox::InsertEntry( sal_uInt16 nPos, const OUString& rStr, cons
     return nNewPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::RemoveEntry( sal_uInt16 nPos )
 {
@@ -2327,42 +2327,42 @@ void ImplListBox::RemoveEntry( sal_uInt16 nPos )
     StateChanged( STATE_CHANGE_DATA );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::SetEntryFlags( sal_uInt16 nPos, long nFlags )
 {
     maLBWindow.SetEntryFlags( nPos, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::SelectEntry( sal_uInt16 nPos, bool bSelect )
 {
     maLBWindow.SelectEntry( nPos, bSelect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::SetNoSelection()
 {
     maLBWindow.DeselectAll();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::GetFocus()
 {
     maLBWindow.GrabFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* ImplListBox::GetPreferredKeyInputWindow()
 {
     return &maLBWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::Resize()
 {
@@ -2372,7 +2372,7 @@ void ImplListBox::Resize()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ImplListBox, MRUChanged)
 {
@@ -2380,7 +2380,7 @@ IMPL_LINK_NOARG(ImplListBox, MRUChanged)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled)
 {
@@ -2396,7 +2396,7 @@ IMPL_LINK_NOARG(ImplListBox, LBWindowScrolled)
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB )
 {
@@ -2409,7 +2409,7 @@ IMPL_LINK( ImplListBox, ScrollBarHdl, ScrollBar*, pSB )
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::ImplCheckScrollBars()
 {
@@ -2492,7 +2492,7 @@ void ImplListBox::ImplCheckScrollBars()
     ImplInitScrollBars();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::ImplInitScrollBars()
 {
@@ -2516,7 +2516,7 @@ void ImplListBox::ImplInitScrollBars()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::ImplResizeControls()
 {
@@ -2580,7 +2580,7 @@ void ImplListBox::ImplResizeControls()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::StateChanged( StateChangedType nType )
 {
@@ -2630,14 +2630,14 @@ void ImplListBox::StateChanged( StateChangedType nType )
     Control::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
         Control::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplListBox::Notify( NotifyEvent& rNEvt )
 {
@@ -2658,14 +2658,14 @@ bool ImplListBox::Notify( NotifyEvent& rNEvt )
     return nDone || Window::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 const Wallpaper& ImplListBox::GetDisplayBackground() const
 {
     return maLBWindow.GetDisplayBackground();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
 {
@@ -2683,7 +2683,7 @@ bool ImplListBox::HandleWheelAsCursorTravel( const CommandEvent& rCEvt )
     return bDone;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
 {
@@ -2716,7 +2716,7 @@ void ImplListBox::SetMRUEntries( const OUString& rEntries, sal_Unicode cSep )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const
 {
@@ -2730,7 +2730,7 @@ OUString ImplListBox::GetMRUEntries( sal_Unicode cSep ) const
     return aEntries.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBox::SetEdgeBlending(bool bNew)
 {
@@ -2758,7 +2758,7 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
     mnItemPos = LISTBOX_ENTRY_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::MBDown()
 {
@@ -2766,7 +2766,7 @@ void ImplWin::MBDown()
         maMBDownHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::MouseButtonDown( const MouseEvent& )
 {
@@ -2776,7 +2776,7 @@ void ImplWin::MouseButtonDown( const MouseEvent& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::FillLayoutData() const
 {
@@ -2784,7 +2784,7 @@ void ImplWin::FillLayoutData() const
     const_cast<ImplWin*>(this)->ImplDraw( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplWin::PreNotify( NotifyEvent& rNEvt )
 {
@@ -2807,7 +2807,7 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt )
     return Control::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::ImplDraw( bool bLayout )
 {
@@ -2918,14 +2918,14 @@ void ImplWin::ImplDraw( bool bLayout )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::Paint( const Rectangle& )
 {
     ImplDraw();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos, bool bLayout )
 {
@@ -3000,7 +3000,7 @@ void ImplWin::DrawEntry( bool bDrawImage, bool bDrawText, bool bDrawTextAtImageP
         ShowFocus( maFocusRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::Resize()
 {
@@ -3009,7 +3009,7 @@ void ImplWin::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::GetFocus()
 {
@@ -3028,7 +3028,7 @@ void ImplWin::GetFocus()
     Control::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWin::LoseFocus()
 {
@@ -3055,7 +3055,7 @@ ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBtn::MBDown()
 {
@@ -3063,7 +3063,7 @@ void ImplBtn::MBDown()
        maMBDownHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBtn::MouseButtonDown( const MouseEvent& )
 {
@@ -3101,7 +3101,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( Window* pParent ) :
 
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
 {
@@ -3114,7 +3114,7 @@ bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
     return FloatingWindow::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags )
 {
@@ -3150,7 +3150,7 @@ void ImplListBoxFloatingWindow::setPosSizePixel( long nX, long nY, long nWidth,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxFloatingWindow::Resize()
 {
@@ -3158,7 +3158,7 @@ void ImplListBoxFloatingWindow::Resize()
     FloatingWindow::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ImplListBoxFloatingWindow::CalcFloatSize()
 {
@@ -3232,7 +3232,7 @@ Size ImplListBoxFloatingWindow::CalcFloatSize()
     return aFloatSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplListBoxFloatingWindow::StartFloat( bool bStartTracking )
 {
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 5b41fc616994..1e3441a01705 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -26,7 +26,7 @@
 
 namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode;
 
-// -----------------------------------------------------------------------
+
 
 ImageControl::ImageControl( Window* pParent, WinBits nStyle )
     :FixedImage( pParent, nStyle )
@@ -34,7 +34,7 @@ ImageControl::ImageControl( Window* pParent, WinBits nStyle )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ImageControl::ImageControl( Window* pParent, const ResId& rResId )
     :FixedImage( pParent, rResId )
@@ -42,7 +42,7 @@ ImageControl::ImageControl( Window* pParent, const ResId& rResId )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImageControl::SetScaleMode( const ::sal_Int16 _nMode )
 {
@@ -53,14 +53,14 @@ void ImageControl::SetScaleMode( const ::sal_Int16 _nMode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImageControl::Resize()
 {
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 namespace
 {
     static Size lcl_calcPaintSize( const Rectangle& _rPaintRect, const Size& _rBitmapSize )
@@ -83,7 +83,7 @@ namespace
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const
 {
@@ -149,7 +149,7 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi
     }   // switch ( mnScaleMode )
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImageControl::Paint( const Rectangle& /*rRect*/ )
 {
@@ -177,7 +177,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
     const Point     aPos  = pDev->LogicToPixel( rPos );
@@ -198,7 +198,7 @@ void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSiz
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImageControl::GetFocus()
 {
@@ -206,7 +206,7 @@ void ImageControl::GetFocus()
     GetWindow( WINDOW_BORDER )->Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImageControl::LoseFocus()
 {
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index bf87289c1677..0ee8067a2a20 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -615,7 +615,7 @@ void ListBox::AdaptDropDownLineCountToMaximum()
     SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ListBox::GetDropDownLineCount() const
 {
@@ -1536,7 +1536,7 @@ bool ListBox::set_property(const OString &rKey, const OString &rValue)
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ListBox::SetEdgeBlending(bool bNew)
 {
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index a942545ec792..35d01ed13c10 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -78,7 +78,7 @@ void Slider::ImplInit( Window* pParent, WinBits nStyle )
     SetSizePixel( CalcWindowSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 Slider::Slider( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_SLIDER )
@@ -86,7 +86,7 @@ Slider::Slider( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::ImplInitSettings()
 {
@@ -111,7 +111,7 @@ void Slider::ImplInitSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::ImplUpdateRects( bool bUpdate )
 {
@@ -220,7 +220,7 @@ void Slider::ImplUpdateRects( bool bUpdate )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long Slider::ImplCalcThumbPos( long nPixPos )
 {
@@ -231,7 +231,7 @@ long Slider::ImplCalcThumbPos( long nPixPos )
     return nCalcThumbPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Slider::ImplCalcThumbPosPix( long nPos )
 {
@@ -248,7 +248,7 @@ long Slider::ImplCalcThumbPosPix( long nPos )
     return nCalcThumbPos+mnThumbPixOffset;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::ImplCalc( bool bUpdate )
 {
@@ -319,7 +319,7 @@ void Slider::ImplCalc( bool bUpdate )
     ImplUpdateRects( bUpdate );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::ImplDraw( sal_uInt16 nDrawFlags )
 {
@@ -459,7 +459,7 @@ void Slider::ImplDraw( sal_uInt16 nDrawFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Slider::ImplIsPageUp( const Point& rPos )
 {
@@ -478,7 +478,7 @@ bool Slider::ImplIsPageUp( const Point& rPos )
     return aRect.IsInside( rPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Slider::ImplIsPageDown( const Point& rPos )
 {
@@ -497,7 +497,7 @@ bool Slider::ImplIsPageDown( const Point& rPos )
     return aRect.IsInside( rPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 long Slider::ImplSlide( long nNewPos, bool bCallEndSlide )
 {
@@ -515,7 +515,7 @@ long Slider::ImplSlide( long nNewPos, bool bCallEndSlide )
     return nDelta;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Slider::ImplDoAction( bool bCallEndSlide )
 {
@@ -549,7 +549,7 @@ long Slider::ImplDoAction( bool bCallEndSlide )
     return nDelta;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction )
 {
@@ -611,7 +611,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, bool bCallAction )
         ImplDraw( mnDragDraw );
 }
 
-// -----------------------------------------------------------------------
+
 
 long Slider::ImplDoSlide( long nNewPos )
 {
@@ -624,7 +624,7 @@ long Slider::ImplDoSlide( long nNewPos )
     return nDelta;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Slider::ImplDoSlideAction( ScrollType eScrollType )
 {
@@ -639,7 +639,7 @@ long Slider::ImplDoSlideAction( ScrollType eScrollType )
     return nDelta;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -700,7 +700,7 @@ void Slider::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::MouseButtonUp( const MouseEvent& )
 {
@@ -720,7 +720,7 @@ void Slider::MouseButtonUp( const MouseEvent& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::Tracking( const TrackingEvent& rTEvt )
 {
@@ -807,7 +807,7 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::KeyInput( const KeyEvent& rKEvt )
 {
@@ -849,14 +849,14 @@ void Slider::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::Paint( const Rectangle& )
 {
     ImplDraw( SLIDER_DRAW_ALL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::Resize()
 {
@@ -867,14 +867,14 @@ void Slider::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::RequestHelp( const HelpEvent& rHEvt )
 {
     Control::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::StateChanged( StateChangedType nType )
 {
@@ -920,7 +920,7 @@ void Slider::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -934,21 +934,21 @@ void Slider::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::Slide()
 {
     maSlideHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::EndSlide()
 {
     maEndSlideHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::SetRange( const Range& rRange )
 {
@@ -975,7 +975,7 @@ void Slider::SetRange( const Range& rRange )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Slider::SetThumbPos( long nNewThumbPos )
 {
@@ -991,7 +991,7 @@ void Slider::SetThumbPos( long nNewThumbPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Slider::CalcWindowSizePixel()
 {
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 6d6d7dbc256f..fccfe301b48e 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -50,7 +50,7 @@ void SpinButton::ImplInit( Window* pParent, WinBits nStyle )
     Control::ImplInit( pParent, nStyle, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 SpinButton::SpinButton( Window* pParent, WinBits nStyle )
     :Control( WINDOW_SPINBUTTON )
@@ -59,13 +59,13 @@ SpinButton::SpinButton( Window* pParent, WinBits nStyle )
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 SpinButton::~SpinButton()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
 {
@@ -85,7 +85,7 @@ IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::Up()
 {
@@ -100,7 +100,7 @@ void SpinButton::Up()
     ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::Down()
 {
@@ -115,7 +115,7 @@ void SpinButton::Down()
     ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN, maDownHdlLink, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::Resize()
 {
@@ -140,7 +140,7 @@ void SpinButton::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
@@ -199,7 +199,7 @@ void SpinButton::Paint( const Rectangle& )
         ShowFocus( maFocusRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -225,7 +225,7 @@ void SpinButton::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::MouseButtonUp( const MouseEvent& )
 {
@@ -254,7 +254,7 @@ void SpinButton::MouseButtonUp( const MouseEvent& )
     mbInitialUp = mbInitialDown = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::MouseMove( const MouseEvent& rMEvt )
 {
@@ -297,7 +297,7 @@ void SpinButton::MouseMove( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::KeyInput( const KeyEvent& rKEvt )
 {
@@ -336,7 +336,7 @@ void SpinButton::KeyInput( const KeyEvent& rKEvt )
         Control::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::StateChanged( StateChangedType nType )
 {
@@ -373,21 +373,21 @@ void SpinButton::StateChanged( StateChangedType nType )
     Control::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::SetRangeMin( long nNewRange )
 {
     SetRange( Range( nNewRange, GetRangeMax() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::SetRangeMax( long nNewRange )
 {
     SetRange( Range( GetRangeMin(), nNewRange ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::SetRange( const Range& rRange )
 {
@@ -414,7 +414,7 @@ void SpinButton::SetRange( const Range& rRange )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::SetValue( long nValue )
 {
@@ -431,7 +431,7 @@ void SpinButton::SetValue( long nValue )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::GetFocus()
 {
@@ -439,7 +439,7 @@ void SpinButton::GetFocus()
     Control::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::LoseFocus()
 {
@@ -447,7 +447,7 @@ void SpinButton::LoseFocus()
     Control::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SpinButton::ImplMoveFocus( bool _bUpper )
 {
@@ -461,7 +461,7 @@ bool SpinButton::ImplMoveFocus( bool _bUpper )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinButton::ImplCalcFocusRect( bool _bUpper )
 {
@@ -474,7 +474,7 @@ void SpinButton::ImplCalcFocusRect( bool _bUpper )
     mbUpperIsFocused = _bUpper;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle* SpinButton::ImplFindPartRect( const Point& rPt )
 {
@@ -523,6 +523,6 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt )
     return Control::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 3e72b136c363..8251a50d6951 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -303,7 +303,7 @@ void SpinField::ImplInitSpinFieldData()
     mbInDropDown    = false;
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::ImplInit( Window* pParent, WinBits nWinStyle )
 {
@@ -339,7 +339,7 @@ void SpinField::ImplInit( Window* pParent, WinBits nWinStyle )
     }
 }
 
-// --------------------------------------------------------------------
+
 
 SpinField::SpinField( WindowType nTyp ) :
     Edit( nTyp )
@@ -347,7 +347,7 @@ SpinField::SpinField( WindowType nTyp ) :
     ImplInitSpinFieldData();
 }
 
-// --------------------------------------------------------------------
+
 
 SpinField::SpinField( Window* pParent, WinBits nWinStyle ) :
     Edit( WINDOW_SPINFIELD )
@@ -369,42 +369,42 @@ SpinField::SpinField( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// --------------------------------------------------------------------
+
 
 SpinField::~SpinField()
 {
     delete mpEdit;
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::Up()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_UP, maUpHdlLink, this );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::Down()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_DOWN, maDownHdlLink, this );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::First()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_FIRST, maFirstHdlLink, this );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::Last()
 {
     ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_LAST, maLastHdlLink, this );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -448,7 +448,7 @@ void SpinField::MouseButtonDown( const MouseEvent& rMEvt )
     Edit::MouseButtonDown( rMEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -475,7 +475,7 @@ void SpinField::MouseButtonUp( const MouseEvent& rMEvt )
     Edit::MouseButtonUp( rMEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::MouseMove( const MouseEvent& rMEvt )
 {
@@ -522,7 +522,7 @@ void SpinField::MouseMove( const MouseEvent& rMEvt )
     Edit::MouseMove( rMEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 bool SpinField::Notify( NotifyEvent& rNEvt )
 {
@@ -610,14 +610,14 @@ bool SpinField::Notify( NotifyEvent& rNEvt )
     return nDone || Edit::Notify( rNEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::Command( const CommandEvent& rCEvt )
 {
     Edit::Command( rCEvt );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::FillLayoutData() const
 {
@@ -631,7 +631,7 @@ void SpinField::FillLayoutData() const
         Edit::FillLayoutData();
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::Paint( const Rectangle& rRect )
 {
@@ -662,7 +662,7 @@ void SpinField::Paint( const Rectangle& rRect )
     Edit::Paint( rRect );
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea )
 {
@@ -747,7 +747,7 @@ void SpinField::ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rec
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void SpinField::Resize()
 {
@@ -808,7 +808,7 @@ void SpinField::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinField::StateChanged( StateChangedType nType )
 {
@@ -872,7 +872,7 @@ void SpinField::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinField::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -886,7 +886,7 @@ void SpinField::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle* SpinField::ImplFindPartRect( const Point& rPt )
 {
@@ -947,7 +947,7 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt )
     return Edit::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinField::EndDropDown()
 {
@@ -955,7 +955,7 @@ void SpinField::EndDropDown()
     Paint( Rectangle( Point(), GetOutputSizePixel() ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SpinField::ShowDropDown( sal_Bool )
 {
@@ -996,14 +996,14 @@ Size SpinField::CalcMinimumSize() const
     return CalcMinimumSizeForText(GetText());
 }
 
-// -----------------------------------------------------------------------
+
 
 Size SpinField::GetOptimalSize() const
 {
     return CalcMinimumSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size SpinField::CalcSize(sal_Int32 nChars) const
 {
@@ -1017,7 +1017,7 @@ Size SpinField::CalcSize(sal_Int32 nChars) const
     return aSz;
 }
 
-// --------------------------------------------------------------------
+
 
 IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer )
 {
@@ -1036,7 +1036,7 @@ IMPL_LINK( SpinField, ImplTimeout, Timer*, pTimer )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SpinField::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags )
 {
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 81d2119b29d3..1f388c42d553 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -63,7 +63,7 @@ struct ImplTabItem
     {}
 };
 
-// -----------------------------------------------------------------------
+
 
 struct ImplTabCtrlData
 {
@@ -75,7 +75,7 @@ struct ImplTabCtrlData
     ListBox*                        mpListBox;
 };
 
-// -----------------------------------------------------------------------
+
 
 #define TAB_OFFSET          3
 #define TAB_TABOFFSET_X     3
@@ -137,20 +137,20 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle )
         pParent->AddChildEventListener( LINK( this, TabControl, ImplWindowEventListener ) );
 }
 
-// -----------------------------------------------------------------
+
 
 const Font& TabControl::GetCanonicalFont( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetAppFont();
 }
 
-// -----------------------------------------------------------------
+
 const Color& TabControl::GetCanonicalTextColor( const StyleSettings& _rStyle ) const
 {
     return _rStyle.GetButtonTextColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplInitSettings( bool bFont,
                                    bool bForeground, bool bBackground )
@@ -188,7 +188,7 @@ void TabControl::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplFreeLayoutData()
 {
@@ -200,7 +200,7 @@ void TabControl::ImplFreeLayoutData()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TabControl::TabControl( Window* pParent, WinBits nStyle ) :
     Control( WINDOW_TABCONTROL )
@@ -209,7 +209,7 @@ TabControl::TabControl( Window* pParent, WinBits nStyle ) :
     OSL_TRACE("*** TABCONTROL no notabs? %s", ( GetStyle() & WB_NOBORDER ) ? "true" : "false" );
 }
 
-// -----------------------------------------------------------------------
+
 
 TabControl::TabControl( Window* pParent, const ResId& rResId ) :
     Control( WINDOW_TABCONTROL )
@@ -223,7 +223,7 @@ TabControl::TabControl( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplLoadRes( const ResId& rResId )
 {
@@ -244,7 +244,7 @@ void TabControl::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TabControl::~TabControl()
 {
@@ -262,7 +262,7 @@ TabControl::~TabControl()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplTabItem* TabControl::ImplGetItem( sal_uInt16 nId ) const
 {
@@ -276,7 +276,7 @@ ImplTabItem* TabControl::ImplGetItem( sal_uInt16 nId ) const
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size TabControl::ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth )
 {
@@ -627,7 +627,7 @@ Rectangle TabControl::ImplGetTabRect( sal_uInt16 nItemPos, long nWidth, long nHe
     return size_t(nItemPos) < mpTabCtrlData->maItemList.size() ? mpTabCtrlData->maItemList[nItemPos].maRect : Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId )
 {
@@ -733,7 +733,7 @@ void TabControl::ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId )
     Invalidate( aRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool TabControl::ImplPosCurTabPage()
 {
@@ -755,7 +755,7 @@ bool TabControl::ImplPosCurTabPage()
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplActivateTabPage( bool bNext )
 {
@@ -774,7 +774,7 @@ void TabControl::ImplActivateTabPage( bool bNext )
     SelectTabPage( GetPageId( nCurPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplShowFocus()
 {
@@ -826,7 +826,7 @@ void TabControl::ImplShowFocus()
     ShowFocus( aRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout, bool bFirstInGroup, bool bLastInGroup, bool /* bIsCurrentItem */ )
 {
@@ -1026,7 +1026,7 @@ void TabControl::ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bo
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
 {
@@ -1062,7 +1062,7 @@ bool TabControl::ImplHandleKeyEvent( const KeyEvent& rKeyEvent )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl)
 {
@@ -1070,7 +1070,7 @@ IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( TabControl, ImplWindowEventListener, VclSimpleEvent*, pEvent )
 {
@@ -1088,7 +1088,7 @@ IMPL_LINK( TabControl, ImplWindowEventListener, VclSimpleEvent*, pEvent )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -1104,7 +1104,7 @@ void TabControl::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::KeyInput( const KeyEvent& rKEvt )
 {
@@ -1125,7 +1125,7 @@ void TabControl::KeyInput( const KeyEvent& rKEvt )
     Control::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::Paint( const Rectangle& rRect )
 {
@@ -1133,7 +1133,7 @@ void TabControl::Paint( const Rectangle& rRect )
         ImplPaint( rRect, false );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
 {
@@ -1315,7 +1315,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
         mbSmallInvalidate = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::setAllocation(const Size &rAllocation)
 {
@@ -1407,7 +1407,7 @@ void TabControl::Resize()
     setAllocation(Control::GetOutputSizePixel());
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::GetFocus()
 {
@@ -1424,7 +1424,7 @@ void TabControl::GetFocus()
     Control::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::LoseFocus()
 {
@@ -1433,7 +1433,7 @@ void TabControl::LoseFocus()
     Control::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -1518,7 +1518,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt )
     Control::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::Command( const CommandEvent& rCEvt )
 {
@@ -1559,7 +1559,7 @@ void TabControl::Command( const CommandEvent& rCEvt )
     Control::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::StateChanged( StateChangedType nType )
 {
@@ -1594,7 +1594,7 @@ void TabControl::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -1610,7 +1610,7 @@ void TabControl::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle* TabControl::ImplFindPartRect( const Point& rPt )
 {
@@ -1678,7 +1678,7 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt )
     return Control::PreNotify(rNEvt);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool TabControl::Notify( NotifyEvent& rNEvt )
 {
@@ -1690,21 +1690,21 @@ bool TabControl::Notify( NotifyEvent& rNEvt )
     return nRet || Control::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::ActivatePage()
 {
     maActivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool TabControl::DeactivatePage()
 {
     return !maDeactivateHdl.IsSet() || maDeactivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetTabPageSizePixel( const Size& rSize )
 {
@@ -1718,7 +1718,7 @@ void TabControl::SetTabPageSizePixel( const Size& rSize )
     Window::SetOutputSizePixel( aNewSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size TabControl::GetTabPageSizePixel() const
 {
@@ -1726,7 +1726,7 @@ Size TabControl::GetTabPageSizePixel() const
     return aRect.GetSize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos )
 {
@@ -1753,7 +1753,7 @@ void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText,
                              sal_uInt16 nPos )
@@ -1807,7 +1807,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText,
     ImplCallEventListeners( VCLEVENT_TABPAGE_INSERTED, (void*) (sal_uLong)nPageId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::RemovePage( sal_uInt16 nPageId )
 {
@@ -1855,7 +1855,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::Clear()
 {
@@ -1874,7 +1874,7 @@ void TabControl::Clear()
     ImplCallEventListeners( VCLEVENT_TABPAGE_REMOVEDALL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable )
 {
@@ -1897,14 +1897,14 @@ void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabControl::GetPageCount() const
 {
     return (sal_uInt16)mpTabCtrlData->maItemList.size();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabControl::GetPageId( sal_uInt16 nPos ) const
 {
@@ -1913,7 +1913,7 @@ sal_uInt16 TabControl::GetPageId( sal_uInt16 nPos ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabControl::GetPagePos( sal_uInt16 nPageId ) const
 {
@@ -1927,7 +1927,7 @@ sal_uInt16 TabControl::GetPagePos( sal_uInt16 nPageId ) const
     return TAB_PAGE_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabControl::GetPageId( const Point& rPos ) const
 {
@@ -1964,7 +1964,7 @@ sal_uInt16 TabControl::GetPageId( const OString& rName ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetCurPageId( sal_uInt16 nPageId )
 {
@@ -2001,7 +2001,7 @@ void TabControl::SetCurPageId( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 TabControl::GetCurPageId() const
 {
@@ -2011,7 +2011,7 @@ sal_uInt16 TabControl::GetCurPageId() const
         return mnCurPageId;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SelectTabPage( sal_uInt16 nPageId )
 {
@@ -2035,7 +2035,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetTabPage( sal_uInt16 nPageId, TabPage* pTabPage )
 {
@@ -2065,7 +2065,7 @@ void TabControl::SetTabPage( sal_uInt16 nPageId, TabPage* pTabPage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TabPage* TabControl::GetTabPage( sal_uInt16 nPageId ) const
 {
@@ -2077,7 +2077,7 @@ TabPage* TabControl::GetTabPage( sal_uInt16 nPageId ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText )
 {
@@ -2100,7 +2100,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString TabControl::GetPageText( sal_uInt16 nPageId ) const
 {
@@ -2111,7 +2111,7 @@ OUString TabControl::GetPageText( sal_uInt16 nPageId ) const
     return pItem->maText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetHelpText( sal_uInt16 nPageId, const OUString& rText )
 {
@@ -2122,7 +2122,7 @@ void TabControl::SetHelpText( sal_uInt16 nPageId, const OUString& rText )
     pItem->maHelpText = rText;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const
 {
@@ -2139,7 +2139,7 @@ const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const
     return pItem->maHelpText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetHelpId( sal_uInt16 nPageId, const OString& rId ) const
 {
@@ -2177,7 +2177,7 @@ OString TabControl::GetPageName( sal_uInt16 nPageId ) const
     return OString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetPageImage( sal_uInt16 i_nPageId, const Image& i_rImage )
 {
@@ -2192,7 +2192,7 @@ void TabControl::SetPageImage( sal_uInt16 i_nPageId, const Image& i_rImage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle TabControl::GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) const
 {
@@ -2215,7 +2215,7 @@ Rectangle TabControl::GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) cons
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 long TabControl::GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const
 {
@@ -2248,7 +2248,7 @@ long TabControl::GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) co
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::FillLayoutData() const
 {
@@ -2257,7 +2257,7 @@ void TabControl::FillLayoutData() const
     const_cast<TabControl*>(this)->ImplPaint( Rectangle(), true );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle TabControl::GetTabBounds( sal_uInt16 nPageId ) const
 {
@@ -2270,7 +2270,7 @@ Rectangle TabControl::GetTabBounds( sal_uInt16 nPageId ) const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabControl::SetItemsOffset( const Point& rOffs )
 {
@@ -2286,7 +2286,7 @@ Point TabControl::GetItemsOffset() const
         return Point();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size TabControl::calculateRequisition() const
 {
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 969e5898d29a..6a8c268a1a4e 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -2271,9 +2271,9 @@ sal_Int32 TextView::GetLineNumberOfCursorInSelection() const
 }
 
 
-// -------------------------------------------------------------------------
+
 // (+) class TextSelFunctionSet
-// -------------------------------------------------------------------------
+
 TextSelFunctionSet::TextSelFunctionSet( TextView* pView )
 {
     mpView = pView;
diff --git a/vcl/source/edit/xtextedt.cxx b/vcl/source/edit/xtextedt.cxx
index c543c563d4e1..0f8f1342e277 100644
--- a/vcl/source/edit/xtextedt.cxx
+++ b/vcl/source/edit/xtextedt.cxx
@@ -223,9 +223,9 @@ bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& rSea
 }
 
 
-// -------------------------------------------------------------------------
+
 // class ExtTextView
-// -------------------------------------------------------------------------
+
 ExtTextView::ExtTextView( ExtTextEngine* pEng, Window* pWindow )
     : TextView( pEng, pWindow )
 {
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx
index cbb35a2ccd61..47962c368793 100644
--- a/vcl/source/filter/FilterConfigCache.cxx
+++ b/vcl/source/filter/FilterConfigCache.cxx
@@ -300,7 +300,7 @@ void FilterConfigCache::ImplInitSmart()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 FilterConfigCache::FilterConfigCache( bool bConfig ) :
     bUseConfig ( bConfig )
@@ -442,7 +442,7 @@ bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat )
     return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat;
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat )
 {
@@ -556,6 +556,6 @@ bool FilterConfigCache::IsExportPixelFormat( sal_uInt16 nFormat )
     return (nFormat < aExport.size()) && aExport[ nFormat ].bIsPixelFormat;
 }
 
-// ------------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/FilterConfigItem.cxx b/vcl/source/filter/FilterConfigItem.cxx
index db9af7ad21ed..253566b1be8e 100644
--- a/vcl/source/filter/FilterConfigItem.cxx
+++ b/vcl/source/filter/FilterConfigItem.cxx
@@ -400,14 +400,14 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 Sequence< PropertyValue > FilterConfigItem::GetFilterData() const
 {
     return aFilterData;
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XStatusIndicator > FilterConfigItem::GetStatusIndicator() const
 {
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index abdcbea87bdb..ded84a24c523 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -782,7 +782,7 @@ static bool ImpPeekGraphicFormat( SvStream& rStream, OUString& rFormatExtension,
     return bTest && !bSomethingTested;
 }
 
-//--------------------------------------------------------------------------
+
 
 sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream& rStream, sal_uInt16& rFormat )
 {
@@ -828,7 +828,7 @@ sal_uInt16 GraphicFilter::ImpTestOrFindFormat( const OUString& rPath, SvStream&
     return GRFILTER_OK;
 }
 
-//--------------------------------------------------------------------------
+
 
 #ifndef DISABLE_EXPORT
 
@@ -1343,7 +1343,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
     return ImportGraphic( rGraphic, rPath, rIStream, nFormat, pDeterminedFormat, nImportFlags, NULL, pExtHeader );
 }
 
-//-------------------------------------------------------------------------
+
 
 sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPath, SvStream& rIStream,
                                      sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat, sal_uInt32 nImportFlags,
diff --git a/vcl/source/filter/igif/decode.cxx b/vcl/source/filter/igif/decode.cxx
index fd92fba99856..db1bc12725bb 100644
--- a/vcl/source/filter/igif/decode.cxx
+++ b/vcl/source/filter/igif/decode.cxx
@@ -20,7 +20,7 @@
 
 #include "decode.hxx"
 
-// ------------------------------------------------------------------------
+
 
 struct GIFLZWTableEntry
 {
@@ -29,7 +29,7 @@ struct GIFLZWTableEntry
     sal_uInt8               nData;
 };
 
-// ------------------------------------------------------------------------
+
 
 GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) :
             nInputBitsBuf       ( 0 ),
@@ -57,7 +57,7 @@ GIFLZWDecompressor::GIFLZWDecompressor( sal_uInt8 cDataSize ) :
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 GIFLZWDecompressor::~GIFLZWDecompressor()
 {
@@ -65,7 +65,7 @@ GIFLZWDecompressor::~GIFLZWDecompressor()
     delete[] pTable;
 }
 
-// ------------------------------------------------------------------------
+
 
 HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize,
                                             sal_uLong& rCount, bool& rEOI )
@@ -111,7 +111,7 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize,
     return pTarget;
 }
 
-// ------------------------------------------------------------------------
+
 
 void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirstData )
 {
@@ -130,7 +130,7 @@ void GIFLZWDecompressor::AddToTable( sal_uInt16 nPrevCode, sal_uInt16 nCodeFirst
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 bool GIFLZWDecompressor::ProcessOneCode()
 {
diff --git a/vcl/source/filter/ixbm/xbmread.cxx b/vcl/source/filter/ixbm/xbmread.cxx
index 8b99c81c7f80..3b94c802b343 100644
--- a/vcl/source/filter/ixbm/xbmread.cxx
+++ b/vcl/source/filter/ixbm/xbmread.cxx
@@ -23,9 +23,9 @@
 #include <comphelper/string.hxx>
 #include "xbmread.hxx"
 
-// -------------
+
 // - XBMReader -
-// -------------
+
 
 XBMReader::XBMReader( SvStream& rStm ) :
             rIStm           ( rStm ),
@@ -40,7 +40,7 @@ XBMReader::XBMReader( SvStream& rStm ) :
     InitTable();
 }
 
-// ------------------------------------------------------------------------
+
 
 XBMReader::~XBMReader()
 {
@@ -50,7 +50,7 @@ XBMReader::~XBMReader()
         aBmp1.ReleaseAccess( pAcc1 );
 }
 
-// ------------------------------------------------------------------------
+
 
 void XBMReader::InitTable()
 {
@@ -88,7 +88,7 @@ void XBMReader::InitTable()
     pHexTable[(int)'\0'] = -1;
 }
 
-// ------------------------------------------------------------------------
+
 
 OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
                                  const char* pTok2, const char* pTok3 )
@@ -135,7 +135,7 @@ OString XBMReader::FindTokenLine( SvStream* pInStm, const char* pTok1,
     return aRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 long XBMReader::ParseDefine( const sal_Char* pDefine )
 {
@@ -184,7 +184,7 @@ long XBMReader::ParseDefine( const sal_Char* pDefine )
     return nRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat eFormat )
 {
@@ -257,7 +257,7 @@ bool XBMReader::ParseData( SvStream* pInStm, const OString& aLastLine, XBMFormat
     return true;
 }
 
-// ------------------------------------------------------------------------
+
 
 ReadState XBMReader::ReadXBM( Graphic& rGraphic )
 {
@@ -353,9 +353,9 @@ ReadState XBMReader::ReadXBM( Graphic& rGraphic )
     return eReadState;
 }
 
-// -------------
+
 // - ImportXBM -
-// -------------
+
 
 bool ImportXBM( SvStream& rStm, Graphic& rGraphic )
 {
diff --git a/vcl/source/filter/ixpm/xpmread.cxx b/vcl/source/filter/ixpm/xpmread.cxx
index 27f49b19e2f3..9d3ad23145c4 100644
--- a/vcl/source/filter/ixpm/xpmread.cxx
+++ b/vcl/source/filter/ixpm/xpmread.cxx
@@ -24,9 +24,9 @@
 #define _XPMPRIVATE
 #include "xpmread.hxx"
 
-// -------------
+
 // - XPMReader -
-// -------------
+
 
 XPMReader::XPMReader( SvStream& rStm ) :
             mrIStm          ( rStm ),
@@ -49,7 +49,7 @@ XPMReader::XPMReader( SvStream& rStm ) :
 
 }
 
-// ------------------------------------------------------------------------
+
 
 XPMReader::~XPMReader()
 {
@@ -57,7 +57,7 @@ XPMReader::~XPMReader()
         maBmp.ReleaseAccess( mpAcc );
 }
 
-// ------------------------------------------------------------------------
+
 
 ReadState XPMReader::ReadXPM( Graphic& rGraphic )
 {
@@ -214,7 +214,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic )
     return eReadState;
 }
 
-// ------------------------------------------------------------------------
+
 // ImplGetColor returns variouls colour values,
 // returns TRUE if various colours could be assigned
 
@@ -233,7 +233,7 @@ bool XPMReader::ImplGetColor( sal_uLong nNumb )
     return bStatus;
 }
 
-// ------------------------------------------------------------------------
+
 // ImpGetScanLine reads the string mpBufSize and writes the pixel in the
 // Bitmap. Parameter nY is the horizontal position.
 
@@ -299,7 +299,7 @@ bool XPMReader::ImplGetScanLine( sal_uLong nY )
     return bStatus;
 }
 
-// ------------------------------------------------------------------------
+
 // tries to determine a colour value from mpStringBuf
 // if a colour was found the RGB value is written a pDest[1]..pDest[2]
 // pDest[0] contains 0xFF if the colour is transparent otherwise 0
@@ -367,7 +367,7 @@ bool XPMReader::ImplGetColSub( sal_uInt8* pDest )
     return bColStatus;
 }
 
-// ------------------------------------------------------------------------
+
 // ImplGetColKey searches string mpStringBuf for a parameter 'nKey'
 // and returns a boolean. (if TRUE mpPara and mnParaSize will be set)
 
@@ -411,7 +411,7 @@ bool XPMReader::ImplGetColKey( sal_uInt8 nKey )
     return ( mnParaSize ) ? true : false;
 }
 
-// ------------------------------------------------------------------------
+
 // ImplGetRGBHex translates the ASCII-Hexadecimalvalue belonging to mpPara
 // in a RGB value and writes this to pDest
 // below formats should be contained in mpPara:
@@ -441,7 +441,7 @@ void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong  nAdd )
     }
 }
 
-// ------------------------------------------------------------------------
+
 // ImplGetUlong returns the value of a up to 6-digit long ASCII-decimal number.
 
 sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara )
@@ -464,7 +464,7 @@ sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara )
     else return 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode )
 {
@@ -495,7 +495,7 @@ bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSi
     return bRet;
 }
 
-// ------------------------------------------------------------------------
+
 // ImplGetPara tries to retrieve nNumb (0...x) parameters from mpStringBuf.
 // Parameters are separated by spaces or tabs.
 // If a parameter was found then the return value is TRUE and mpPara + mnParaSize
@@ -551,7 +551,7 @@ bool XPMReader::ImplGetPara ( sal_uLong nNumb )
     return ( ( nCount == nNumb ) && ( mpPara ) );
 }
 
-// ------------------------------------------------------------------------
+
 // The next string is read and stored in mpStringBuf (terminated with 0);
 // mnStringSize contains the size of the string read.
 // Comments like '//' and '/*....*/' are skipped.
@@ -650,9 +650,9 @@ bool XPMReader::ImplGetString( void )
     return mbStatus;
 }
 
-// -------------
+
 // - ImportXPM -
-// -------------
+
 
 bool ImportXPM( SvStream& rStm, Graphic& rGraphic )
 {
diff --git a/vcl/source/filter/wmf/winwmf.cxx b/vcl/source/filter/wmf/winwmf.cxx
index 8d6fd89787aa..26efbadd9a0a 100644
--- a/vcl/source/filter/wmf/winwmf.cxx
+++ b/vcl/source/filter/wmf/winwmf.cxx
@@ -139,7 +139,7 @@ inline Point WMFReader::ReadPoint()
     return Point( nX, nY );
 }
 
-// ------------------------------------------------------------------------
+
 
 inline Point WMFReader::ReadYX()
 {
@@ -148,7 +148,7 @@ inline Point WMFReader::ReadYX()
     return Point( nX, nY );
 }
 
-// ------------------------------------------------------------------------
+
 
 Rectangle WMFReader::ReadRectangle()
 {
@@ -160,7 +160,7 @@ Rectangle WMFReader::ReadRectangle()
     return Rectangle( aTL, aBR );
 }
 
-// ------------------------------------------------------------------------
+
 
 Size WMFReader::ReadYXExt()
 {
@@ -169,7 +169,7 @@ Size WMFReader::ReadYXExt()
     return Size( nW, nH );
 }
 
-// ------------------------------------------------------------------------
+
 
 void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
 {
@@ -1089,7 +1089,7 @@ void WMFReader::ReadRecordParams( sal_uInt16 nFunc )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 bool WMFReader::ReadHeader()
 {
@@ -1304,7 +1304,7 @@ void WMFReader::ReadWMF()
         pWMF->Seek( nStartPos );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pStm )
 {
diff --git a/vcl/source/filter/wmf/wmf.cxx b/vcl/source/filter/wmf/wmf.cxx
index f9e51a2a8724..2100052336ab 100644
--- a/vcl/source/filter/wmf/wmf.cxx
+++ b/vcl/source/filter/wmf/wmf.cxx
@@ -25,7 +25,7 @@
 #include <vcl/gdimetafiletools.hxx>
 #include <comphelper/scopeguard.hxx>
 
-// -----------------------------------------------------------------------------
+
 
 bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile, FilterConfigItem* pConfigItem, WMF_EXTERNALHEADER *pExtHeader )
 {
@@ -56,7 +56,7 @@ bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, GDIMetaFile & rGDIMetaFile,
     return !rStreamWMF.GetError();
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem* pFilterConfigItem )
 {
@@ -90,7 +90,7 @@ bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& rMTF, FilterConfigItem*
     return rStream.good();
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream,
                               FilterConfigItem* pConfigItem, bool bPlaceable)
@@ -109,7 +109,7 @@ bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream & rTargetStream
     return aWMFWriter.WriteWMF( aGdiMetaFile, rTargetStream, pConfigItem, bPlaceable );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream,
                               FilterConfigItem* pConfigItem )
@@ -128,7 +128,7 @@ bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & rTargetStream
     return aEMFWriter.WriteEMF( aGdiMetaFile, pConfigItem );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool WriteWindowMetafileBits( SvStream& rStream, const GDIMetaFile& rMTF )
 {
diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx
index 1baff780e01f..ac979a20a6ef 100644
--- a/vcl/source/filter/wmf/wmfwr.cxx
+++ b/vcl/source/filter/wmf/wmfwr.cxx
@@ -1651,7 +1651,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable )
 {
@@ -1685,7 +1685,7 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, bool bPlaceable )
          .WriteUInt16( (sal_uInt16)0x0000 );          // reserved
 }
 
-// ------------------------------------------------------------------------
+
 
 void WMFWriter::UpdateHeader()
 {
@@ -1707,7 +1707,7 @@ void WMFWriter::UpdateHeader()
     pWMF->Seek(nPos);
 }
 
-// ------------------------------------------------------------------------
+
 
 bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
                             FilterConfigItem* pFConfigItem, bool bPlaceable )
@@ -1833,7 +1833,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
     return bStatus;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode,
                                         const Size& rPrefSize)
@@ -1859,7 +1859,7 @@ sal_uInt16 WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode,
     return nDivisor;
 }
 
-// ------------------------------------------------------------------------
+
 
 void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF )
 {
@@ -1912,7 +1912,7 @@ void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize,
                 sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, sal_uInt16 nCheckSum )
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index d57b849ad965..79c9f50ab577 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -142,9 +142,9 @@ static const char* pStringIds[] = {
     "Regular",          "Roman",            "Semibold"
 };
 
-// --------------------------------------------------------------------
 
-// --------------------------------------------------------------------
+
+
 
 // TOP DICT keywords (also covers PRIV DICT keywords)
 static const char* pDictOps[] = {
@@ -158,7 +158,7 @@ static const char* pDictOps[] = {
     "shortint",         "longint",              "BCD",              NULL
 };
 
-// --------------------------------------------------------------------
+
 
 // TOP DICT escapes (also covers PRIV DICT escapes)
 static const char* pDictEscs[] = {
@@ -174,7 +174,7 @@ static const char* pDictEscs[] = {
     "nFDArray",             "nFDSelect",        "sFontName"
 };
 
-// --------------------------------------------------------------------
+
 
 static const char* pType1Ops[] = {
     NULL,               "2hstem",           NULL,               "2vstem",
@@ -187,7 +187,7 @@ static const char* pType1Ops[] = {
     NULL,               NULL,               "4vhcurveto",       "4hvcurveto"
 };
 
-// --------------------------------------------------------------------
+
 
 static const char* pT1EscOps[] = {
     "0dotsection",      "6vstem3",          "6hstem3",          NULL,
@@ -201,7 +201,7 @@ static const char* pT1EscOps[] = {
     NULL,               "2setcurrentpoint"
 };
 
-// --------------------------------------------------------------------
+
 
 struct TYPE1OP
 {
@@ -222,7 +222,7 @@ struct TYPE1OP
     };
 };
 
-// --------------------------------------------------------------------
+
 
 static const char* pType2Ops[] = {
     NULL,           "hhstem",       NULL,           "vvstem",
@@ -235,7 +235,7 @@ static const char* pType2Ops[] = {
     ".shortint",    "Gcallgsubr",   ".vhcurveto",   ".hvcurveto"
 };
 
-// --------------------------------------------------------------------
+
 
 static const char* pT2EscOps[] = {
     NULL,       NULL,       NULL,       "2and",
@@ -250,7 +250,7 @@ static const char* pT2EscOps[] = {
     "9hflex1",  "fflex1"
 };
 
-// --------------------------------------------------------------------
+
 
 struct TYPE2OP
 {
@@ -350,7 +350,7 @@ public:
                 GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& ) = 0;
 };
 
-// --------------------------------------------------------------------
+
 
 SubsetterContext::~SubsetterContext( void)
 {}
@@ -463,7 +463,7 @@ private:
     ValType maCharWidth;
 };
 
-// --------------------------------------------------------------------
+
 
 CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
 :   mpBasePtr( pBasePtr)
@@ -478,14 +478,14 @@ CffSubsetterContext::CffSubsetterContext( const U8* pBasePtr, int nBaseLen)
     mpCffLocal = &maCffLocal[0];
 }
 
-// --------------------------------------------------------------------
+
 
 CffSubsetterContext::~CffSubsetterContext( void)
 {
     // TODO: delete[] maCffLocal;
 }
 
-// --------------------------------------------------------------------
+
 
 inline int CffSubsetterContext::popInt( void)
 {
@@ -495,7 +495,7 @@ inline int CffSubsetterContext::popInt( void)
     return nInt;
 }
 
-// --------------------------------------------------------------------
+
 
 inline int CffSubsetterContext::peekInt( void) const
 {
@@ -505,7 +505,7 @@ inline int CffSubsetterContext::peekInt( void) const
     return nInt;
 }
 
-// --------------------------------------------------------------------
+
 
 inline int CffSubsetterContext::getInt( int nIndex) const
 {
@@ -515,7 +515,7 @@ inline int CffSubsetterContext::getInt( int nIndex) const
     return nInt;
 }
 
-// --------------------------------------------------------------------
+
 
 inline void CffSubsetterContext::updateWidth( bool bUseFirstVal)
 {
@@ -535,7 +535,7 @@ inline void CffSubsetterContext::updateWidth( bool bUseFirstVal)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::addHints( bool bVerticalHints)
 {
@@ -568,7 +568,7 @@ void CffSubsetterContext::addHints( bool bVerticalHints)
     mnStackIdx = 0;
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::setCharStringType( int nVal)
 {
@@ -579,7 +579,7 @@ void CffSubsetterContext::setCharStringType( int nVal)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::readDictOp( void)
 {
@@ -718,7 +718,7 @@ void CffSubsetterContext::readDictOp( void)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::read2push()
 {
@@ -752,7 +752,7 @@ void CffSubsetterContext::read2push()
     push( aVal);
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::writeType1Val( ValType aVal)
 {
@@ -789,7 +789,7 @@ void CffSubsetterContext::writeType1Val( ValType aVal)
     mpWritePtr = pOut;
 }
 
-// --------------------------------------------------------------------
+
 
 inline void CffSubsetterContext::pop2write( void)
 {
@@ -797,14 +797,14 @@ inline void CffSubsetterContext::pop2write( void)
     writeType1Val( aVal);
 }
 
-// --------------------------------------------------------------------
+
 
 inline void CffSubsetterContext::writeTypeOp( int nTypeOp)
 {
     *(mpWritePtr++) = static_cast<U8>(nTypeOp);
 }
 
-// --------------------------------------------------------------------
+
 
 inline void CffSubsetterContext::writeTypeEsc( int nTypeEsc)
 {
@@ -812,7 +812,7 @@ inline void CffSubsetterContext::writeTypeEsc( int nTypeEsc)
     *(mpWritePtr++) = static_cast<U8>(nTypeEsc);
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTypeXor)
 {
@@ -828,7 +828,7 @@ void CffSubsetterContext::pop2MultiWrite( int nArgsPerTypo, int nTypeOp, int nTy
     clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::popAll2Write( int nTypeOp)
 {
@@ -841,7 +841,7 @@ void CffSubsetterContext::popAll2Write( int nTypeOp)
     writeTypeOp( nTypeOp);
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::writeCurveTo( int nStackPos,
     int nIX1, int nIY1, int nIX2, int nIY2, int nIX3, int nIY3)
@@ -866,7 +866,7 @@ void CffSubsetterContext::writeCurveTo( int nStackPos,
     writeTypeOp( TYPE1OP::RCURVETO );
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::convertOneTypeOp( void)
 {
@@ -1093,7 +1093,7 @@ void CffSubsetterContext::convertOneTypeOp( void)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::convertOneTypeEsc( void)
 {
@@ -1276,7 +1276,7 @@ void CffSubsetterContext::convertOneTypeEsc( void)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber)
 {
@@ -1298,7 +1298,7 @@ void CffSubsetterContext::callType2Subr( bool bGlobal, int nSubrNumber)
     mpReadEnd = pOldReadEnd;
 }
 
-// --------------------------------------------------------------------
+
 
 static const int MAX_T1OPS_SIZE = 81920; // TODO: use dynamic value
 
@@ -1375,7 +1375,7 @@ if( mbSawError) {
     return nType1Len;
 }
 
-// --------------------------------------------------------------------
+
 
 RealType CffSubsetterContext::readRealVal()
 {
@@ -1447,7 +1447,7 @@ RealType CffSubsetterContext::readRealVal()
     return fReal;
 }
 
-// --------------------------------------------------------------------
+
 
 // prepare to access an element inside a CFF/CID index table
 int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
@@ -1488,7 +1488,7 @@ int CffSubsetterContext::seekIndexData( int nIndexBase, int nDataIndex)
     return (nOfs2 - nOfs1);
 }
 
-// --------------------------------------------------------------------
+
 
 // skip over a CFF/CID index table
 void CffSubsetterContext::seekIndexEnd( int nIndexBase)
@@ -1543,7 +1543,7 @@ CffLocal::CffLocal( void)
     maFamilyOtherBlues.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 CffGlobal::CffGlobal( void)
 :   mnNameIdxBase( 0)
@@ -1569,7 +1569,7 @@ CffGlobal::CffGlobal( void)
     // TODO; maFontMatrix.clear();
 }
 
-// --------------------------------------------------------------------
+
 
 void CffSubsetterContext::initialCffRead( void)
 {
@@ -1672,7 +1672,7 @@ void CffSubsetterContext::initialCffRead( void)
     // ignore the Notices info
 }
 
-// --------------------------------------------------------------------
+
 
 // get a cstring from a StringID
 const char* CffSubsetterContext::getString( int nStringID)
@@ -1706,7 +1706,7 @@ const char* CffSubsetterContext::getString( int nStringID)
     return aNameBuf;
 }
 
-// --------------------------------------------------------------------
+
 
 // access a CID's FDSelect table
 int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
@@ -1752,7 +1752,7 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
     return -1;
 }
 
-// --------------------------------------------------------------------
+
 
 int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const
 {
@@ -1801,7 +1801,7 @@ int CffSubsetterContext::getGlyphSID( int nGlyphIndex) const
     return nSID;
 }
 
-// --------------------------------------------------------------------
+
 
 // NOTE: the result becomes invalid with the next call to this method
 const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
@@ -1839,7 +1839,7 @@ const char* CffSubsetterContext::getGlyphName( int nGlyphIndex)
      return pGlyphName;
 }
 
-// --------------------------------------------------------------------
+
 
 class Type1Emitter
 {
@@ -1868,7 +1868,7 @@ public:
     int         mnHexLineCol;
 };
 
-// --------------------------------------------------------------------
+
 
 Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
 :   mpFileOut( pOutFile)
@@ -1881,7 +1881,7 @@ Type1Emitter::Type1Emitter( FILE* pOutFile, bool bPfbSubset)
     maSubsetName[0] = '\0';
 }
 
-// --------------------------------------------------------------------
+
 
 Type1Emitter::~Type1Emitter( void)
 {
@@ -1892,7 +1892,7 @@ Type1Emitter::~Type1Emitter( void)
     mpFileOut = NULL;
 }
 
-// --------------------------------------------------------------------
+
 
 void Type1Emitter::setSubsetName( const char* pSubsetName)
 {
@@ -1902,7 +1902,7 @@ void Type1Emitter::setSubsetName( const char* pSubsetName)
     maSubsetName[sizeof(maSubsetName)-1] = '\0';
 }
 
-// --------------------------------------------------------------------
+
 
 int Type1Emitter::tellPos( void) const
 {
@@ -1910,7 +1910,7 @@ int Type1Emitter::tellPos( void) const
     return nTellPos;
 }
 
-// --------------------------------------------------------------------
+
 
 size_t Type1Emitter::updateLen( int nTellPos, size_t nLength)
 {
@@ -1928,14 +1928,14 @@ size_t Type1Emitter::updateLen( int nTellPos, size_t nLength)
     return nWrote;
 }
 
-// --------------------------------------------------------------------
+
 
 inline size_t Type1Emitter::emitRawData(const char* pData, size_t nLength) const
 {
     return fwrite( pData, 1, nLength, mpFileOut);
 }
 
-// --------------------------------------------------------------------
+
 
 inline void Type1Emitter::emitAllRaw( void)
 {
@@ -1946,7 +1946,7 @@ inline void Type1Emitter::emitAllRaw( void)
     mpPtr = maBuffer;
 }
 
-// --------------------------------------------------------------------
+
 
 inline void Type1Emitter::emitAllHex( void)
 {
@@ -1974,7 +1974,7 @@ inline void Type1Emitter::emitAllHex( void)
     mpPtr = maBuffer;
 }
 
-// --------------------------------------------------------------------
+
 
 void Type1Emitter::emitAllCrypted( void)
 {
@@ -1991,7 +1991,7 @@ void Type1Emitter::emitAllCrypted( void)
         emitAllHex();
 }
 
-// --------------------------------------------------------------------
+
 
 // #i110387# quick-and-dirty double->ascii conversion
 // needed because sprintf/ecvt/etc. alone are too localized (LC_NUMERIC)
@@ -2002,7 +2002,7 @@ inline int dbl2str( char* pOut, double fVal, int nPrecision=6)
     return nLen;
 }
 
-// --------------------------------------------------------------------
+
 
 void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
     const ValVector& rVector)
@@ -2028,7 +2028,7 @@ void Type1Emitter::emitValVector( const char* pLineHead, const char* pLineTail,
     mpPtr += sprintf( mpPtr, "%s", pLineTail);
 }
 
-// --------------------------------------------------------------------
+
 
 bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter,
     const sal_GlyphId* pReqGlyphIds, const U8* pReqEncoding,
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 8b8970486cad..ab0636f73c04 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -36,12 +36,12 @@ FontSubsetInfo::FontSubsetInfo()
 ,   mpSftTTFont( NULL)
 {}
 
-// --------------------------------------------------------------------
+
 
 FontSubsetInfo::~FontSubsetInfo()
 {}
 
-// --------------------------------------------------------------------
+
 
 // prepare subsetting for fonts where the input font file is mapped
 bool FontSubsetInfo::LoadFont(
@@ -55,7 +55,7 @@ bool FontSubsetInfo::LoadFont(
     return (mnInByteLength > 0);
 }
 
-// --------------------------------------------------------------------
+
 
 // prepare subsetting for fonts that are known to the SFT-parser
 bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont )
@@ -66,7 +66,7 @@ bool FontSubsetInfo::LoadFont( vcl::_TrueTypeFont* pSftTTFont )
     return (mpSftTTFont == NULL);
 }
 
-// --------------------------------------------------------------------
+
 
 bool FontSubsetInfo::CreateFontSubset(
     int nReqFontTypeMask,
@@ -113,7 +113,7 @@ bool FontSubsetInfo::CreateFontSubset(
     return bOK;
 }
 
-// --------------------------------------------------------------------
+
 
 // TODO: move function to sft.cxx to replace dummy implementation
 bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths )
@@ -158,7 +158,7 @@ bool FontSubsetInfo::CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths )
     return (nSFTErr != vcl::SF_OK);
 }
 
-// --------------------------------------------------------------------
+
 
 // TODO: replace dummy implementation
 bool FontSubsetInfo::CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths)
diff --git a/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index b92d6b670757..22365b709764 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.cxx
@@ -51,7 +51,7 @@ ConverterCache::ConverterCache( void)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 ConverterCache::~ConverterCache( void)
 {
@@ -64,7 +64,7 @@ ConverterCache::~ConverterCache( void)
     }
 }
 
-// --------------------------------------------------------------------
+
 
 void ConverterCache::ensureConverter( int nSelect )
 {
@@ -93,7 +93,7 @@ void ConverterCache::ensureConverter( int nSelect )
     rtl_resetUnicodeToTextContext( maConverterCache[ nSelect ], aContext );
 }
 
-// --------------------------------------------------------------------
+
 
 sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar )
 {
@@ -118,7 +118,7 @@ sal_uInt16 ConverterCache::convertOne( int nSelect, sal_Unicode aChar )
     return aCode;
 }
 
-// --------------------------------------------------------------------
+
 
 void ConverterCache::convertStr( int nSelect, const sal_Unicode* pSrc, sal_uInt16* pDst, int nCount )
 {
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 73029540a90b..22afc65c627e 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -946,7 +946,7 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nSc
     return bRetval;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
 {
@@ -965,14 +965,14 @@ bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
     return bRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 void Bitmap::AdaptBitCount(Bitmap& rNew) const
 {
     ImplAdaptBitCount(rNew);
 }
 
-// ------------------------------------------------------------------------
+
 
 void Bitmap::ImplAdaptBitCount(Bitmap& rNew) const
 {
@@ -2084,7 +2084,7 @@ bool Bitmap::ImplScaleSuper(
     return bRet;
 }
 
-//-----------------------------------------------------------------------------------
+
 
 namespace
 {
@@ -2442,7 +2442,7 @@ bool Bitmap::ImplScaleConvolution(
     return bResult;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool Bitmap::Dither( sal_uLong nDitherFlags )
 {
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index a6fb09f1ad05..91c299177d63 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.cxx
@@ -27,9 +27,9 @@
 #include <numeric>
 
 
-// ----------------
+
 // - ImplLineInfo -
-// ----------------
+
 
 ImplLineInfo::ImplLineInfo() :
     mnRefCount  ( 1 ),
@@ -45,7 +45,7 @@ ImplLineInfo::ImplLineInfo() :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) :
     mnRefCount  ( 1 ),
@@ -61,7 +61,7 @@ ImplLineInfo::ImplLineInfo( const ImplLineInfo& rImplLineInfo ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const
 {
@@ -76,9 +76,9 @@ inline bool ImplLineInfo::operator==( const ImplLineInfo& rB ) const
         && meLineCap == rB.meLineCap);
 }
 
-// ------------
+
 // - LineInfo -
-// ------------
+
 
 LineInfo::LineInfo( LineStyle eStyle, long nWidth )
 {
@@ -87,7 +87,7 @@ LineInfo::LineInfo( LineStyle eStyle, long nWidth )
     mpImplLineInfo->mnWidth = nWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 LineInfo::LineInfo( const LineInfo& rLineInfo )
 {
@@ -95,7 +95,7 @@ LineInfo::LineInfo( const LineInfo& rLineInfo )
     mpImplLineInfo->mnRefCount++;
 }
 
-// -----------------------------------------------------------------------
+
 
 LineInfo::~LineInfo()
 {
@@ -103,7 +103,7 @@ LineInfo::~LineInfo()
         delete mpImplLineInfo;
 }
 
-// -----------------------------------------------------------------------
+
 
 LineInfo& LineInfo::operator=( const LineInfo& rLineInfo )
 {
@@ -117,7 +117,7 @@ LineInfo& LineInfo::operator=( const LineInfo& rLineInfo )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool LineInfo::operator==( const LineInfo& rLineInfo ) const
 {
@@ -126,7 +126,7 @@ bool LineInfo::operator==( const LineInfo& rLineInfo ) const
            *mpImplLineInfo == *rLineInfo.mpImplLineInfo );
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::ImplMakeUnique()
 {
@@ -139,7 +139,7 @@ void LineInfo::ImplMakeUnique()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetStyle( LineStyle eStyle )
 {
@@ -147,7 +147,7 @@ void LineInfo::SetStyle( LineStyle eStyle )
     mpImplLineInfo->meStyle = eStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetWidth( long nWidth )
 {
@@ -155,7 +155,7 @@ void LineInfo::SetWidth( long nWidth )
     mpImplLineInfo->mnWidth = nWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetDashCount( sal_uInt16 nDashCount )
 {
@@ -163,7 +163,7 @@ void LineInfo::SetDashCount( sal_uInt16 nDashCount )
     mpImplLineInfo->mnDashCount = nDashCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetDashLen( long nDashLen )
 {
@@ -171,7 +171,7 @@ void LineInfo::SetDashLen( long nDashLen )
     mpImplLineInfo->mnDashLen = nDashLen;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetDotCount( sal_uInt16 nDotCount )
 {
@@ -179,7 +179,7 @@ void LineInfo::SetDotCount( sal_uInt16 nDotCount )
     mpImplLineInfo->mnDotCount = nDotCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetDotLen( long nDotLen )
 {
@@ -187,7 +187,7 @@ void LineInfo::SetDotLen( long nDotLen )
     mpImplLineInfo->mnDotLen = nDotLen;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetDistance( long nDistance )
 {
@@ -195,7 +195,7 @@ void LineInfo::SetDistance( long nDistance )
     mpImplLineInfo->mnDistance = nDistance;
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin)
 {
@@ -207,7 +207,7 @@ void LineInfo::SetLineJoin(basegfx::B2DLineJoin eLineJoin)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap)
 {
@@ -218,7 +218,7 @@ void LineInfo::SetLineCap(com::sun::star::drawing::LineCap eLineCap)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool LineInfo::IsDefault() const
 {
@@ -227,7 +227,7 @@ bool LineInfo::IsDefault() const
         && ( com::sun::star::drawing::LineCap_BUTT == mpImplLineInfo->meLineCap));
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
 {
@@ -266,7 +266,7 @@ SvStream& ReadImplLineInfo( SvStream& rIStm, ImplLineInfo& rImplLineInfo )
     return rIStm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo )
 {
@@ -290,7 +290,7 @@ SvStream& WriteImplLineInfo( SvStream& rOStm, const ImplLineInfo& rImplLineInfo
     return rOStm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo )
 {
@@ -298,14 +298,14 @@ SvStream& ReadLineInfo( SvStream& rIStm, LineInfo& rLineInfo )
     return ReadImplLineInfo( rIStm, *rLineInfo.mpImplLineInfo );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& WriteLineInfo( SvStream& rOStm, const LineInfo& rLineInfo )
 {
     return WriteImplLineInfo( rOStm, *rLineInfo.mpImplLineInfo );
 }
 
-// -----------------------------------------------------------------------
+
 
 void LineInfo::applyToB2DPolyPolygon(
     basegfx::B2DPolyPolygon& io_rLinePolyPolygon,
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 16ecaa20ac57..e3977355321b 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -38,7 +38,7 @@ inline void ImplScalePoint( Point& rPt, double fScaleX, double fScaleY )
     rPt.Y() = FRound( fScaleY * rPt.Y() );
 }
 
-// ------------------------------------------------------------------------
+
 
 inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY )
 {
@@ -52,7 +52,7 @@ inline void ImplScaleRect( Rectangle& rRect, double fScaleX, double fScaleY )
     rRect.Justify();
 }
 
-// ------------------------------------------------------------------------
+
 
 inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY )
 {
@@ -60,7 +60,7 @@ inline void ImplScalePoly( Polygon& rPoly, double fScaleX, double fScaleY )
         ImplScalePoint( rPoly[ i ], fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 inline void ImplScaleLineInfo( LineInfo& rLineInfo, double fScaleX, double fScaleY )
 {
@@ -90,7 +90,7 @@ MetaAction::MetaAction() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction::MetaAction( sal_uInt16 nType ) :
     mnRefCount( 1 ),
@@ -98,59 +98,59 @@ MetaAction::MetaAction( sal_uInt16 nType ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction::~MetaAction()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaAction::Execute( OutputDevice* )
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaAction::Clone()
 {
     return new MetaAction;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaAction::Move( long, long )
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaAction::Scale( double, double )
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaAction::Compare( const MetaAction& ) const
 {
     return true;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaAction::Write( SvStream& rOStm, ImplMetaWriteData* )
 {
     rOStm.WriteUInt16( mnType );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaAction::Read( SvStream&, ImplMetaReadData* )
 {
     // DO NOT read mnType - ReadMetaAction already did that!
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData )
 {
@@ -237,7 +237,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData
 
 IMPL_META_ACTION( Pixel, META_PIXEL_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) :
     MetaAction  ( META_PIXEL_ACTION ),
@@ -246,14 +246,14 @@ MetaPixelAction::MetaPixelAction( const Point& rPt, const Color& rColor ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPixelAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawPixel( maPt, maColor );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPixelAction::Clone()
 {
@@ -262,21 +262,21 @@ MetaAction* MetaPixelAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPixelAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPixelAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoint( maPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -284,7 +284,7 @@ bool MetaPixelAction::Compare( const MetaAction& rMetaAction ) const
            ( maColor == ((MetaPixelAction&)rMetaAction).maColor );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -293,7 +293,7 @@ void MetaPixelAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     maColor.Write( rOStm, true );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -306,7 +306,7 @@ void MetaPixelAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Point, META_POINT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPointAction::MetaPointAction( const Point& rPt ) :
     MetaAction  ( META_POINT_ACTION ),
@@ -314,14 +314,14 @@ MetaPointAction::MetaPointAction( const Point& rPt ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPointAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawPixel( maPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPointAction::Clone()
 {
@@ -330,28 +330,28 @@ MetaAction* MetaPointAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPointAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPointAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoint( maPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPointAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maPt == ((MetaPointAction&)rMetaAction).maPt;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -359,7 +359,7 @@ void MetaPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WritePair( rOStm, maPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -371,7 +371,7 @@ void MetaPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Line, META_LINE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) :
     MetaAction  ( META_LINE_ACTION ),
@@ -380,7 +380,7 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd,
                                 const LineInfo& rLineInfo ) :
@@ -391,7 +391,7 @@ MetaLineAction::MetaLineAction( const Point& rStart, const Point& rEnd,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineAction::Execute( OutputDevice* pOut )
 {
@@ -401,7 +401,7 @@ void MetaLineAction::Execute( OutputDevice* pOut )
         pOut->DrawLine( maStartPt, maEndPt, maLineInfo );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaLineAction::Clone()
 {
@@ -410,7 +410,7 @@ MetaAction* MetaLineAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineAction::Move( long nHorzMove, long nVertMove )
 {
@@ -418,7 +418,7 @@ void MetaLineAction::Move( long nHorzMove, long nVertMove )
     maEndPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineAction::Scale( double fScaleX, double fScaleY )
 {
@@ -427,7 +427,7 @@ void MetaLineAction::Scale( double fScaleX, double fScaleY )
     ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -436,7 +436,7 @@ bool MetaLineAction::Compare( const MetaAction& rMetaAction ) const
            ( maEndPt == ((MetaLineAction&)rMetaAction).maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -447,7 +447,7 @@ void MetaLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteLineInfo( rOStm, maLineInfo );            // Version 2
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -468,7 +468,7 @@ void MetaLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Rect, META_RECT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaRectAction::MetaRectAction( const Rectangle& rRect ) :
     MetaAction  ( META_RECT_ACTION ),
@@ -476,14 +476,14 @@ MetaRectAction::MetaRectAction( const Rectangle& rRect ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRectAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawRect( maRect );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaRectAction::Clone()
 {
@@ -492,28 +492,28 @@ MetaAction* MetaRectAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRectAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRectAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScaleRect( maRect, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaRectAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maRect == ((MetaRectAction&)rMetaAction).maRect;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -521,7 +521,7 @@ void MetaRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteRectangle( rOStm, maRect );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -533,7 +533,7 @@ void MetaRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect,
                                           sal_uInt32 nHorzRound, sal_uInt32 nVertRound ) :
@@ -544,14 +544,14 @@ MetaRoundRectAction::MetaRoundRectAction( const Rectangle& rRect,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRoundRectAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawRect( maRect, mnHorzRound, mnVertRound );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaRoundRectAction::Clone()
 {
@@ -560,14 +560,14 @@ MetaAction* MetaRoundRectAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRoundRectAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRoundRectAction::Scale( double fScaleX, double fScaleY )
 {
@@ -576,7 +576,7 @@ void MetaRoundRectAction::Scale( double fScaleX, double fScaleY )
     mnVertRound = FRound( mnVertRound * fabs(fScaleY) );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -585,7 +585,7 @@ bool MetaRoundRectAction::Compare( const MetaAction& rMetaAction ) const
            ( mnVertRound == ((MetaRoundRectAction&)rMetaAction).mnVertRound );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -594,7 +594,7 @@ void MetaRoundRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt32( mnHorzRound ).WriteUInt32( mnVertRound );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -606,7 +606,7 @@ void MetaRoundRectAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Ellipse, META_ELLIPSE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) :
     MetaAction  ( META_ELLIPSE_ACTION ),
@@ -614,14 +614,14 @@ MetaEllipseAction::MetaEllipseAction( const Rectangle& rRect ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEllipseAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawEllipse( maRect );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaEllipseAction::Clone()
 {
@@ -630,28 +630,28 @@ MetaAction* MetaEllipseAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEllipseAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEllipseAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScaleRect( maRect, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaEllipseAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maRect == ((MetaEllipseAction&)rMetaAction).maRect;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -659,7 +659,7 @@ void MetaEllipseAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteRectangle( rOStm, maRect );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -671,7 +671,7 @@ void MetaEllipseAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Arc, META_ARC_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaArcAction::MetaArcAction( const Rectangle& rRect,
                               const Point& rStart, const Point& rEnd ) :
@@ -682,14 +682,14 @@ MetaArcAction::MetaArcAction( const Rectangle& rRect,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaArcAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawArc( maRect, maStartPt, maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaArcAction::Clone()
 {
@@ -698,7 +698,7 @@ MetaAction* MetaArcAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaArcAction::Move( long nHorzMove, long nVertMove )
 {
@@ -707,7 +707,7 @@ void MetaArcAction::Move( long nHorzMove, long nVertMove )
     maEndPt.Move(  nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaArcAction::Scale( double fScaleX, double fScaleY )
 {
@@ -716,7 +716,7 @@ void MetaArcAction::Scale( double fScaleX, double fScaleY )
     ImplScalePoint( maEndPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -725,7 +725,7 @@ bool MetaArcAction::Compare( const MetaAction& rMetaAction ) const
            ( maEndPt == ((MetaArcAction&)rMetaAction).maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -735,7 +735,7 @@ void MetaArcAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WritePair( rOStm, maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -749,7 +749,7 @@ void MetaArcAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Pie, META_PIE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPieAction::MetaPieAction( const Rectangle& rRect,
                               const Point& rStart, const Point& rEnd ) :
@@ -760,14 +760,14 @@ MetaPieAction::MetaPieAction( const Rectangle& rRect,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPieAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawPie( maRect, maStartPt, maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPieAction::Clone()
 {
@@ -776,7 +776,7 @@ MetaAction* MetaPieAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPieAction::Move( long nHorzMove, long nVertMove )
 {
@@ -785,7 +785,7 @@ void MetaPieAction::Move( long nHorzMove, long nVertMove )
     maEndPt.Move(  nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPieAction::Scale( double fScaleX, double fScaleY )
 {
@@ -794,7 +794,7 @@ void MetaPieAction::Scale( double fScaleX, double fScaleY )
     ImplScalePoint( maEndPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -803,7 +803,7 @@ bool MetaPieAction::Compare( const MetaAction& rMetaAction ) const
            ( maEndPt == ((MetaPieAction&)rMetaAction).maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -813,7 +813,7 @@ void MetaPieAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WritePair( rOStm, maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -827,7 +827,7 @@ void MetaPieAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Chord, META_CHORD_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaChordAction::MetaChordAction( const Rectangle& rRect,
                                   const Point& rStart, const Point& rEnd ) :
@@ -838,14 +838,14 @@ MetaChordAction::MetaChordAction( const Rectangle& rRect,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaChordAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawChord( maRect, maStartPt, maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaChordAction::Clone()
 {
@@ -854,7 +854,7 @@ MetaAction* MetaChordAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaChordAction::Move( long nHorzMove, long nVertMove )
 {
@@ -863,7 +863,7 @@ void MetaChordAction::Move( long nHorzMove, long nVertMove )
     maEndPt.Move(  nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaChordAction::Scale( double fScaleX, double fScaleY )
 {
@@ -872,7 +872,7 @@ void MetaChordAction::Scale( double fScaleX, double fScaleY )
     ImplScalePoint( maEndPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -881,7 +881,7 @@ bool MetaChordAction::Compare( const MetaAction& rMetaAction ) const
            ( maEndPt == ((MetaChordAction&)rMetaAction).maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -891,7 +891,7 @@ void MetaChordAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WritePair( rOStm, maEndPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -905,7 +905,7 @@ void MetaChordAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( PolyLine, META_POLYLINE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) :
     MetaAction  ( META_POLYLINE_ACTION ),
@@ -913,7 +913,7 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ) :
     MetaAction  ( META_POLYLINE_ACTION ),
@@ -922,7 +922,7 @@ MetaPolyLineAction::MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rL
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyLineAction::Execute( OutputDevice* pOut )
 {
@@ -932,7 +932,7 @@ void MetaPolyLineAction::Execute( OutputDevice* pOut )
         pOut->DrawPolyLine( maPoly, maLineInfo );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPolyLineAction::Clone()
 {
@@ -941,14 +941,14 @@ MetaAction* MetaPolyLineAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyLineAction::Move( long nHorzMove, long nVertMove )
 {
     maPoly.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyLineAction::Scale( double fScaleX, double fScaleY )
 {
@@ -956,7 +956,7 @@ void MetaPolyLineAction::Scale( double fScaleX, double fScaleY )
     ImplScaleLineInfo( maLineInfo, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -969,7 +969,7 @@ bool MetaPolyLineAction::Compare( const MetaAction& rMetaAction ) const
 
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -987,7 +987,7 @@ void MetaPolyLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         maPoly.Write( rOStm );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1012,7 +1012,7 @@ void MetaPolyLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Polygon, META_POLYGON_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) :
     MetaAction  ( META_POLYGON_ACTION ),
@@ -1020,14 +1020,14 @@ MetaPolygonAction::MetaPolygonAction( const Polygon& rPoly ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolygonAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawPolygon( maPoly );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPolygonAction::Clone()
 {
@@ -1036,28 +1036,28 @@ MetaAction* MetaPolygonAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolygonAction::Move( long nHorzMove, long nVertMove )
 {
     maPoly.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolygonAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoly( maPoly, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPolygonAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maPoly.IsEqual(((MetaPolygonAction&)rMetaAction).maPoly );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1073,7 +1073,7 @@ void MetaPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         maPoly.Write( rOStm );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1094,7 +1094,7 @@ void MetaPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) :
     MetaAction  ( META_POLYPOLYGON_ACTION ),
@@ -1102,14 +1102,14 @@ MetaPolyPolygonAction::MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyPolygonAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawPolyPolygon( maPolyPoly );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPolyPolygonAction::Clone()
 {
@@ -1118,14 +1118,14 @@ MetaAction* MetaPolyPolygonAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyPolygonAction::Move( long nHorzMove, long nVertMove )
 {
     maPolyPoly.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY )
 {
@@ -1133,14 +1133,14 @@ void MetaPolyPolygonAction::Scale( double fScaleX, double fScaleY )
         ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPolyPolygonAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maPolyPoly.IsEqual(((MetaPolyPolygonAction&)rMetaAction).maPolyPoly );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1174,7 +1174,7 @@ void MetaPolyPolygonAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1199,7 +1199,7 @@ void MetaPolyPolygonAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Text, META_TEXT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr,
                                 sal_Int32 nIndex, sal_Int32 nLen ) :
@@ -1211,14 +1211,14 @@ MetaTextAction::MetaTextAction( const Point& rPt, const OUString& rStr,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawText( maPt, maStr, mnIndex, mnLen );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextAction::Clone()
 {
@@ -1227,21 +1227,21 @@ MetaAction* MetaTextAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoint( maPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1251,7 +1251,7 @@ bool MetaTextAction::Compare( const MetaAction& rMetaAction ) const
            ( mnLen == ((MetaTextAction&)rMetaAction).mnLen );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1264,7 +1264,7 @@ void MetaTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
@@ -1288,7 +1288,7 @@ MetaTextArrayAction::MetaTextArrayAction() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
     MetaAction  ( META_TEXTARRAY_ACTION ),
@@ -1308,7 +1308,7 @@ MetaTextArrayAction::MetaTextArrayAction( const MetaTextArrayAction& rAction ) :
         mpDXAry = NULL;
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
                                           const OUString& rStr,
@@ -1332,21 +1332,21 @@ MetaTextArrayAction::MetaTextArrayAction( const Point& rStartPt,
         mpDXAry = NULL;
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaTextArrayAction::~MetaTextArrayAction()
 {
     delete[] mpDXAry;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextArrayAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawTextArray( maStartPt, maStr, mpDXAry, mnIndex, mnLen );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextArrayAction::Clone()
 {
@@ -1355,14 +1355,14 @@ MetaAction* MetaTextArrayAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextArrayAction::Move( long nHorzMove, long nVertMove )
 {
     maStartPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextArrayAction::Scale( double fScaleX, double fScaleY )
 {
@@ -1375,7 +1375,7 @@ void MetaTextArrayAction::Scale( double fScaleX, double fScaleY )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1386,7 +1386,7 @@ bool MetaTextArrayAction::Compare( const MetaAction& rMetaAction ) const
            ( memcmp( mpDXAry, ((MetaTextArrayAction&)rMetaAction).mpDXAry, mnLen ) == 0 );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1405,7 +1405,7 @@ void MetaTextArrayAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
@@ -1469,7 +1469,7 @@ void MetaTextArrayAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 
 IMPL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth,
                                               const OUString& rStr,
@@ -1483,14 +1483,14 @@ MetaStretchTextAction::MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidt
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaStretchTextAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawStretchText( maPt, mnWidth, maStr, mnIndex, mnLen );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaStretchTextAction::Clone()
 {
@@ -1499,14 +1499,14 @@ MetaAction* MetaStretchTextAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaStretchTextAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaStretchTextAction::Scale( double fScaleX, double fScaleY )
 {
@@ -1514,7 +1514,7 @@ void MetaStretchTextAction::Scale( double fScaleX, double fScaleY )
     mnWidth = (sal_uLong)FRound( mnWidth * fabs(fScaleX) );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1525,7 +1525,7 @@ bool MetaStretchTextAction::Compare( const MetaAction& rMetaAction ) const
            ( mnLen == ((MetaStretchTextAction&)rMetaAction).mnLen );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1539,7 +1539,7 @@ void MetaStretchTextAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
@@ -1558,7 +1558,7 @@ void MetaStretchTextAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 
 IMPL_META_ACTION( TextRect, META_TEXTRECT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect,
                                         const OUString& rStr, sal_uInt16 nStyle ) :
@@ -1569,14 +1569,14 @@ MetaTextRectAction::MetaTextRectAction( const Rectangle& rRect,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextRectAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawText( maRect, maStr, mnStyle );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextRectAction::Clone()
 {
@@ -1585,21 +1585,21 @@ MetaAction* MetaTextRectAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextRectAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextRectAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScaleRect( maRect, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1608,7 +1608,7 @@ bool MetaTextRectAction::Compare( const MetaAction& rMetaAction ) const
            ( mnStyle == ((MetaTextRectAction&)rMetaAction).mnStyle );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1620,7 +1620,7 @@ void MetaTextRectAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     write_uInt16_lenPrefixed_uInt16s_FromOUString(rOStm, maStr); // version 2
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
@@ -1637,7 +1637,7 @@ void MetaTextRectAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 
 IMPL_META_ACTION( TextLine, META_TEXTLINE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth,
                                         FontStrikeout eStrikeout,
@@ -1652,14 +1652,14 @@ MetaTextLineAction::MetaTextLineAction( const Point& rPos, long nWidth,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawTextLine( maPos, mnWidth, meStrikeout, meUnderline, meOverline );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextLineAction::Clone()
 {
@@ -1668,14 +1668,14 @@ MetaAction* MetaTextLineAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineAction::Move( long nHorzMove, long nVertMove )
 {
     maPos.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineAction::Scale( double fScaleX, double fScaleY )
 {
@@ -1683,7 +1683,7 @@ void MetaTextLineAction::Scale( double fScaleX, double fScaleY )
     mnWidth = FRound( mnWidth * fabs(fScaleX) );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1694,7 +1694,7 @@ bool MetaTextLineAction::Compare( const MetaAction& rMetaAction ) const
            ( meOverline  == ((MetaTextLineAction&)rMetaAction).meOverline );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1709,7 +1709,7 @@ void MetaTextLineAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt32( static_cast<sal_uInt32>(meOverline) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1735,7 +1735,7 @@ void MetaTextLineAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Bmp, META_BMP_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) :
     MetaAction  ( META_BMP_ACTION ),
@@ -1744,14 +1744,14 @@ MetaBmpAction::MetaBmpAction( const Point& rPt, const Bitmap& rBmp ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawBitmap( maPt, maBmp );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaBmpAction::Clone()
 {
@@ -1760,21 +1760,21 @@ MetaAction* MetaBmpAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoint( maPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1782,7 +1782,7 @@ bool MetaBmpAction::Compare( const MetaAction& rMetaAction ) const
            ( maPt == ((MetaBmpAction&)rMetaAction).maPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1794,7 +1794,7 @@ void MetaBmpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1807,7 +1807,7 @@ void MetaBmpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( BmpScale, META_BMPSCALE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz,
                                         const Bitmap& rBmp ) :
@@ -1818,14 +1818,14 @@ MetaBmpScaleAction::MetaBmpScaleAction( const Point& rPt, const Size& rSz,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScaleAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawBitmap( maPt, maSz, maBmp );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaBmpScaleAction::Clone()
 {
@@ -1834,14 +1834,14 @@ MetaAction* MetaBmpScaleAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScaleAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY )
 {
@@ -1851,7 +1851,7 @@ void MetaBmpScaleAction::Scale( double fScaleX, double fScaleY )
     maSz = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1860,7 +1860,7 @@ bool MetaBmpScaleAction::Compare( const MetaAction& rMetaAction ) const
            ( maSz == ((MetaBmpScaleAction&)rMetaAction).maSz );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1873,7 +1873,7 @@ void MetaBmpScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1887,7 +1887,7 @@ void MetaBmpScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size& rDstSz,
                                                 const Point& rSrcPt, const Size& rSrcSz,
@@ -1901,14 +1901,14 @@ MetaBmpScalePartAction::MetaBmpScalePartAction( const Point& rDstPt, const Size&
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScalePartAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawBitmap( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaBmpScalePartAction::Clone()
 {
@@ -1917,14 +1917,14 @@ MetaAction* MetaBmpScalePartAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScalePartAction::Move( long nHorzMove, long nVertMove )
 {
     maDstPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY )
 {
@@ -1934,7 +1934,7 @@ void MetaBmpScalePartAction::Scale( double fScaleX, double fScaleY )
     maDstSz = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -1945,7 +1945,7 @@ bool MetaBmpScalePartAction::Compare( const MetaAction& rMetaAction ) const
            ( maSrcSz == ((MetaBmpScalePartAction&)rMetaAction).maSrcSz );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -1960,7 +1960,7 @@ void MetaBmpScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -1976,7 +1976,7 @@ void MetaBmpScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( BmpEx, META_BMPEX_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) :
     MetaAction  ( META_BMPEX_ACTION ),
@@ -1985,14 +1985,14 @@ MetaBmpExAction::MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawBitmapEx( maPt, maBmpEx );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaBmpExAction::Clone()
 {
@@ -2001,21 +2001,21 @@ MetaAction* MetaBmpExAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoint( maPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2023,7 +2023,7 @@ bool MetaBmpExAction::Compare( const MetaAction& rMetaAction ) const
            ( maPt == ((MetaBmpExAction&)rMetaAction).maPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2035,7 +2035,7 @@ void MetaBmpExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2048,7 +2048,7 @@ void MetaBmpExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz,
                                             const BitmapEx& rBmpEx ) :
@@ -2059,14 +2059,14 @@ MetaBmpExScaleAction::MetaBmpExScaleAction( const Point& rPt, const Size& rSz,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScaleAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawBitmapEx( maPt, maSz, maBmpEx );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaBmpExScaleAction::Clone()
 {
@@ -2075,14 +2075,14 @@ MetaAction* MetaBmpExScaleAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScaleAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY )
 {
@@ -2092,7 +2092,7 @@ void MetaBmpExScaleAction::Scale( double fScaleX, double fScaleY )
     maSz = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2101,7 +2101,7 @@ bool MetaBmpExScaleAction::Compare( const MetaAction& rMetaAction ) const
            ( maSz == ((MetaBmpExScaleAction&)rMetaAction).maSz );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2114,7 +2114,7 @@ void MetaBmpExScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2128,7 +2128,7 @@ void MetaBmpExScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const Size& rDstSz,
                                                     const Point& rSrcPt, const Size& rSrcSz,
@@ -2142,14 +2142,14 @@ MetaBmpExScalePartAction::MetaBmpExScalePartAction( const Point& rDstPt, const S
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScalePartAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawBitmapEx( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmpEx );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaBmpExScalePartAction::Clone()
 {
@@ -2158,14 +2158,14 @@ MetaAction* MetaBmpExScalePartAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScalePartAction::Move( long nHorzMove, long nVertMove )
 {
     maDstPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY )
 {
@@ -2175,7 +2175,7 @@ void MetaBmpExScalePartAction::Scale( double fScaleX, double fScaleY )
     maDstSz = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2186,7 +2186,7 @@ bool MetaBmpExScalePartAction::Compare( const MetaAction& rMetaAction ) const
            ( maSrcSz == ((MetaBmpExScalePartAction&)rMetaAction).maSrcSz );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2201,7 +2201,7 @@ void MetaBmpExScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2217,7 +2217,7 @@ void MetaBmpExScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Mask, META_MASK_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaMaskAction::MetaMaskAction( const Point& rPt,
                                 const Bitmap& rBmp,
@@ -2229,14 +2229,14 @@ MetaMaskAction::MetaMaskAction( const Point& rPt,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawMask( maPt, maBmp, maColor );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaMaskAction::Clone()
 {
@@ -2245,21 +2245,21 @@ MetaAction* MetaMaskAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScalePoint( maPt, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2268,7 +2268,7 @@ bool MetaMaskAction::Compare( const MetaAction& rMetaAction ) const
            ( maPt == ((MetaMaskAction&)rMetaAction).maPt );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2280,7 +2280,7 @@ void MetaMaskAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2293,7 +2293,7 @@ void MetaMaskAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( MaskScale, META_MASKSCALE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz,
                                           const Bitmap& rBmp,
@@ -2306,14 +2306,14 @@ MetaMaskScaleAction::MetaMaskScaleAction( const Point& rPt, const Size& rSz,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScaleAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawMask( maPt, maSz, maBmp, maColor );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaMaskScaleAction::Clone()
 {
@@ -2322,14 +2322,14 @@ MetaAction* MetaMaskScaleAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScaleAction::Move( long nHorzMove, long nVertMove )
 {
     maPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY )
 {
@@ -2339,7 +2339,7 @@ void MetaMaskScaleAction::Scale( double fScaleX, double fScaleY )
     maSz = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2349,7 +2349,7 @@ bool MetaMaskScaleAction::Compare( const MetaAction& rMetaAction ) const
            ( maSz == ((MetaMaskScaleAction&)rMetaAction).maSz );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2362,7 +2362,7 @@ void MetaMaskScaleAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2376,7 +2376,7 @@ void MetaMaskScaleAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Size& rDstSz,
                                                   const Point& rSrcPt, const Size& rSrcSz,
@@ -2392,14 +2392,14 @@ MetaMaskScalePartAction::MetaMaskScalePartAction( const Point& rDstPt, const Siz
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScalePartAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawMask( maDstPt, maDstSz, maSrcPt, maSrcSz, maBmp, maColor );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaMaskScalePartAction::Clone()
 {
@@ -2408,14 +2408,14 @@ MetaAction* MetaMaskScalePartAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScalePartAction::Move( long nHorzMove, long nVertMove )
 {
     maDstPt.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY )
 {
@@ -2425,7 +2425,7 @@ void MetaMaskScalePartAction::Scale( double fScaleX, double fScaleY )
     maDstSz = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2437,7 +2437,7 @@ bool MetaMaskScalePartAction::Compare( const MetaAction& rMetaAction ) const
            ( maSrcSz == ((MetaMaskScalePartAction&)rMetaAction).maSrcSz );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2453,7 +2453,7 @@ void MetaMaskScalePartAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2470,7 +2470,7 @@ void MetaMaskScalePartAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Gradient, META_GRADIENT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ) :
     MetaAction  ( META_GRADIENT_ACTION ),
@@ -2479,14 +2479,14 @@ MetaGradientAction::MetaGradientAction( const Rectangle& rRect, const Gradient&
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawGradient( maRect, maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaGradientAction::Clone()
 {
@@ -2495,21 +2495,21 @@ MetaAction* MetaGradientAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScaleRect( maRect, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2517,7 +2517,7 @@ bool MetaGradientAction::Compare( const MetaAction& rMetaAction ) const
            ( maGradient == ((MetaGradientAction&)rMetaAction).maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2526,7 +2526,7 @@ void MetaGradientAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteGradient( rOStm, maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2542,7 +2542,7 @@ MetaGradientExAction::MetaGradientExAction() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ) :
     MetaAction  ( META_GRADIENTEX_ACTION ),
@@ -2551,13 +2551,13 @@ MetaGradientExAction::MetaGradientExAction( const PolyPolygon& rPolyPoly, const
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaGradientExAction::~MetaGradientExAction()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientExAction::Execute( OutputDevice* pOut )
 {
@@ -2568,7 +2568,7 @@ void MetaGradientExAction::Execute( OutputDevice* pOut )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaGradientExAction::Clone()
 {
@@ -2577,14 +2577,14 @@ MetaAction* MetaGradientExAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientExAction::Move( long nHorzMove, long nVertMove )
 {
     maPolyPoly.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientExAction::Scale( double fScaleX, double fScaleY )
 {
@@ -2592,7 +2592,7 @@ void MetaGradientExAction::Scale( double fScaleX, double fScaleY )
         ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2600,7 +2600,7 @@ bool MetaGradientExAction::Compare( const MetaAction& rMetaAction ) const
            ( maGradient == ((MetaGradientExAction&)rMetaAction).maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2614,7 +2614,7 @@ void MetaGradientExAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteGradient( rOStm, maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2627,7 +2627,7 @@ void MetaGradientExAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Hatch, META_HATCH_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ) :
     MetaAction  ( META_HATCH_ACTION ),
@@ -2636,14 +2636,14 @@ MetaHatchAction::MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHa
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaHatchAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawHatch( maPolyPoly, maHatch );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaHatchAction::Clone()
 {
@@ -2652,14 +2652,14 @@ MetaAction* MetaHatchAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaHatchAction::Move( long nHorzMove, long nVertMove )
 {
     maPolyPoly.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaHatchAction::Scale( double fScaleX, double fScaleY )
 {
@@ -2667,7 +2667,7 @@ void MetaHatchAction::Scale( double fScaleX, double fScaleY )
         ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2675,7 +2675,7 @@ bool MetaHatchAction::Compare( const MetaAction& rMetaAction ) const
            ( maHatch == ((MetaHatchAction&)rMetaAction).maHatch );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2689,7 +2689,7 @@ void MetaHatchAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteHatch( rOStm, maHatch );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2702,7 +2702,7 @@ void MetaHatchAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect,
                                           const Wallpaper& rPaper ) :
@@ -2712,14 +2712,14 @@ MetaWallpaperAction::MetaWallpaperAction( const Rectangle& rRect,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaWallpaperAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawWallpaper( maRect, maWallpaper );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaWallpaperAction::Clone()
 {
@@ -2728,21 +2728,21 @@ MetaAction* MetaWallpaperAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaWallpaperAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaWallpaperAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScaleRect( maRect, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2750,7 +2750,7 @@ bool MetaWallpaperAction::Compare( const MetaAction& rMetaAction ) const
            ( maWallpaper == ((MetaWallpaperAction&)rMetaAction).maWallpaper );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2758,7 +2758,7 @@ void MetaWallpaperAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteWallpaper( rOStm, maWallpaper );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2770,7 +2770,7 @@ void MetaWallpaperAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) :
     MetaAction  ( META_CLIPREGION_ACTION ),
@@ -2779,7 +2779,7 @@ MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip )
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaClipRegionAction::Execute( OutputDevice* pOut )
 {
@@ -2789,7 +2789,7 @@ void MetaClipRegionAction::Execute( OutputDevice* pOut )
         pOut->SetClipRegion();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaClipRegionAction::Clone()
 {
@@ -2798,21 +2798,21 @@ MetaAction* MetaClipRegionAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaClipRegionAction::Move( long nHorzMove, long nVertMove )
 {
     maRegion.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaClipRegionAction::Scale( double fScaleX, double fScaleY )
 {
     maRegion.Scale( fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -2820,7 +2820,7 @@ bool MetaClipRegionAction::Compare( const MetaAction& rMetaAction ) const
            ( mbClip == ((MetaClipRegionAction&)rMetaAction).mbClip );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2829,7 +2829,7 @@ void MetaClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbClip );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2842,7 +2842,7 @@ void MetaClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& rRect ) :
     MetaAction  ( META_ISECTRECTCLIPREGION_ACTION ),
@@ -2850,14 +2850,14 @@ MetaISectRectClipRegionAction::MetaISectRectClipRegionAction( const Rectangle& r
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRectClipRegionAction::Execute( OutputDevice* pOut )
 {
     pOut->IntersectClipRegion( maRect );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaISectRectClipRegionAction::Clone()
 {
@@ -2866,28 +2866,28 @@ MetaAction* MetaISectRectClipRegionAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRectClipRegionAction::Move( long nHorzMove, long nVertMove )
 {
     maRect.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRectClipRegionAction::Scale( double fScaleX, double fScaleY )
 {
     ImplScaleRect( maRect, fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaISectRectClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maRect == ((MetaISectRectClipRegionAction&)rMetaAction).maRect;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2895,7 +2895,7 @@ void MetaISectRectClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* p
     WriteRectangle( rOStm, maRect );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2907,7 +2907,7 @@ void MetaISectRectClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) :
     MetaAction  ( META_ISECTREGIONCLIPREGION_ACTION ),
@@ -2915,14 +2915,14 @@ MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region&
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRegionClipRegionAction::Execute( OutputDevice* pOut )
 {
     pOut->IntersectClipRegion( maRegion );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaISectRegionClipRegionAction::Clone()
 {
@@ -2931,28 +2931,28 @@ MetaAction* MetaISectRegionClipRegionAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRegionClipRegionAction::Move( long nHorzMove, long nVertMove )
 {
     maRegion.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRegionClipRegionAction::Scale( double fScaleX, double fScaleY )
 {
     maRegion.Scale( fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaISectRegionClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maRegion == ((MetaISectRegionClipRegionAction&)rMetaAction).maRegion;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -2960,7 +2960,7 @@ void MetaISectRegionClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData*
     WriteRegion( rOStm, maRegion );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -2972,7 +2972,7 @@ void MetaISectRegionClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMove ) :
     MetaAction  ( META_MOVECLIPREGION_ACTION ),
@@ -2981,14 +2981,14 @@ MetaMoveClipRegionAction::MetaMoveClipRegionAction( long nHorzMove, long nVertMo
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMoveClipRegionAction::Execute( OutputDevice* pOut )
 {
     pOut->MoveClipRegion( mnHorzMove, mnVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaMoveClipRegionAction::Clone()
 {
@@ -2997,7 +2997,7 @@ MetaAction* MetaMoveClipRegionAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY )
 {
@@ -3005,7 +3005,7 @@ void MetaMoveClipRegionAction::Scale( double fScaleX, double fScaleY )
     mnVertMove = FRound( mnVertMove * fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3013,7 +3013,7 @@ bool MetaMoveClipRegionAction::Compare( const MetaAction& rMetaAction ) const
            ( mnVertMove == ((MetaMoveClipRegionAction&)rMetaAction).mnVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3022,7 +3022,7 @@ void MetaMoveClipRegionAction::Write( SvStream& rOStm, ImplMetaWriteData* pData
     rOStm.WriteInt32( sal::static_int_cast<sal_Int32>(mnHorzMove) ).WriteInt32( sal::static_int_cast<sal_Int32>(mnVertMove) );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3038,7 +3038,7 @@ void MetaMoveClipRegionAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( LineColor, META_LINECOLOR_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) :
     MetaAction  ( META_LINECOLOR_ACTION ),
@@ -3047,7 +3047,7 @@ MetaLineColorAction::MetaLineColorAction( const Color& rColor, bool bSet ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineColorAction::Execute( OutputDevice* pOut )
 {
@@ -3057,7 +3057,7 @@ void MetaLineColorAction::Execute( OutputDevice* pOut )
         pOut->SetLineColor();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaLineColorAction::Clone()
 {
@@ -3066,7 +3066,7 @@ MetaAction* MetaLineColorAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3074,7 +3074,7 @@ bool MetaLineColorAction::Compare( const MetaAction& rMetaAction ) const
            ( mbSet == ((MetaLineColorAction&)rMetaAction).mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3083,7 +3083,7 @@ void MetaLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3096,7 +3096,7 @@ void MetaLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( FillColor, META_FILLCOLOR_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) :
     MetaAction  ( META_FILLCOLOR_ACTION ),
@@ -3105,7 +3105,7 @@ MetaFillColorAction::MetaFillColorAction( const Color& rColor, bool bSet ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFillColorAction::Execute( OutputDevice* pOut )
 {
@@ -3115,7 +3115,7 @@ void MetaFillColorAction::Execute( OutputDevice* pOut )
         pOut->SetFillColor();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaFillColorAction::Clone()
 {
@@ -3124,7 +3124,7 @@ MetaAction* MetaFillColorAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3132,7 +3132,7 @@ bool MetaFillColorAction::Compare( const MetaAction& rMetaAction ) const
            ( mbSet == ((MetaFillColorAction&)rMetaAction).mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3141,7 +3141,7 @@ void MetaFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3154,7 +3154,7 @@ void MetaFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextColorAction::MetaTextColorAction( const Color& rColor ) :
     MetaAction  ( META_TEXTCOLOR_ACTION ),
@@ -3162,14 +3162,14 @@ MetaTextColorAction::MetaTextColorAction( const Color& rColor ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextColorAction::Execute( OutputDevice* pOut )
 {
     pOut->SetTextColor( maColor );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextColorAction::Clone()
 {
@@ -3178,14 +3178,14 @@ MetaAction* MetaTextColorAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextColorAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maColor == ((MetaTextColorAction&)rMetaAction).maColor;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3193,7 +3193,7 @@ void MetaTextColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     maColor.Write( rOStm, true );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3205,7 +3205,7 @@ void MetaTextColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet ) :
     MetaAction  ( META_TEXTFILLCOLOR_ACTION ),
@@ -3214,7 +3214,7 @@ MetaTextFillColorAction::MetaTextFillColorAction( const Color& rColor, bool bSet
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextFillColorAction::Execute( OutputDevice* pOut )
 {
@@ -3224,7 +3224,7 @@ void MetaTextFillColorAction::Execute( OutputDevice* pOut )
         pOut->SetTextFillColor();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextFillColorAction::Clone()
 {
@@ -3233,7 +3233,7 @@ MetaAction* MetaTextFillColorAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3241,7 +3241,7 @@ bool MetaTextFillColorAction::Compare( const MetaAction& rMetaAction ) const
            ( mbSet == ((MetaTextFillColorAction&)rMetaAction).mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3250,7 +3250,7 @@ void MetaTextFillColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3263,7 +3263,7 @@ void MetaTextFillColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet ) :
     MetaAction  ( META_TEXTLINECOLOR_ACTION ),
@@ -3272,7 +3272,7 @@ MetaTextLineColorAction::MetaTextLineColorAction( const Color& rColor, bool bSet
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineColorAction::Execute( OutputDevice* pOut )
 {
@@ -3282,7 +3282,7 @@ void MetaTextLineColorAction::Execute( OutputDevice* pOut )
         pOut->SetTextLineColor();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextLineColorAction::Clone()
 {
@@ -3291,7 +3291,7 @@ MetaAction* MetaTextLineColorAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3299,7 +3299,7 @@ bool MetaTextLineColorAction::Compare( const MetaAction& rMetaAction ) const
            ( mbSet == ((MetaTextLineColorAction&)rMetaAction).mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3308,7 +3308,7 @@ void MetaTextLineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3321,7 +3321,7 @@ void MetaTextLineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet ) :
     MetaAction  ( META_OVERLINECOLOR_ACTION ),
@@ -3330,7 +3330,7 @@ MetaOverlineColorAction::MetaOverlineColorAction( const Color& rColor, bool bSet
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaOverlineColorAction::Execute( OutputDevice* pOut )
 {
@@ -3340,7 +3340,7 @@ void MetaOverlineColorAction::Execute( OutputDevice* pOut )
         pOut->SetOverlineColor();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaOverlineColorAction::Clone()
 {
@@ -3349,7 +3349,7 @@ MetaAction* MetaOverlineColorAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3357,7 +3357,7 @@ bool MetaOverlineColorAction::Compare( const MetaAction& rMetaAction ) const
            ( mbSet == ((MetaOverlineColorAction&)rMetaAction).mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3366,7 +3366,7 @@ void MetaOverlineColorAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3379,7 +3379,7 @@ void MetaOverlineColorAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) :
     MetaAction  ( META_TEXTALIGN_ACTION ),
@@ -3387,14 +3387,14 @@ MetaTextAlignAction::MetaTextAlignAction( TextAlign aAlign ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAlignAction::Execute( OutputDevice* pOut )
 {
     pOut->SetTextAlign( maAlign );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextAlignAction::Clone()
 {
@@ -3403,14 +3403,14 @@ MetaAction* MetaTextAlignAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextAlignAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maAlign == ((MetaTextAlignAction&)rMetaAction).maAlign;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3418,7 +3418,7 @@ void MetaTextAlignAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt16( (sal_uInt16) maAlign );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3432,7 +3432,7 @@ void MetaTextAlignAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( MapMode, META_MAPMODE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) :
     MetaAction  ( META_MAPMODE_ACTION ),
@@ -3440,14 +3440,14 @@ MetaMapModeAction::MetaMapModeAction( const MapMode& rMapMode ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMapModeAction::Execute( OutputDevice* pOut )
 {
     pOut->SetMapMode( maMapMode );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaMapModeAction::Clone()
 {
@@ -3456,7 +3456,7 @@ MetaAction* MetaMapModeAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMapModeAction::Scale( double fScaleX, double fScaleY )
 {
@@ -3466,14 +3466,14 @@ void MetaMapModeAction::Scale( double fScaleX, double fScaleY )
     maMapMode.SetOrigin( aPoint );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaMapModeAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maMapMode == ((MetaMapModeAction&)rMetaAction).maMapMode;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3481,7 +3481,7 @@ void MetaMapModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     WriteMapMode( rOStm, maMapMode );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3493,7 +3493,7 @@ void MetaMapModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Font, META_FONT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaFontAction::MetaFontAction( const Font& rFont ) :
     MetaAction  ( META_FONT_ACTION ),
@@ -3510,14 +3510,14 @@ MetaFontAction::MetaFontAction( const Font& rFont ) :
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFontAction::Execute( OutputDevice* pOut )
 {
     pOut->SetFont( maFont );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaFontAction::Clone()
 {
@@ -3526,7 +3526,7 @@ MetaAction* MetaFontAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFontAction::Scale( double fScaleX, double fScaleY )
 {
@@ -3536,14 +3536,14 @@ void MetaFontAction::Scale( double fScaleX, double fScaleY )
     maFont.SetSize( aSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaFontAction::Compare( const MetaAction& rMetaAction ) const
 {
     return maFont == ((MetaFontAction&)rMetaAction).maFont;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3554,7 +3554,7 @@ void MetaFontAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         pData->meActualCharSet = osl_getThreadTextEncoding();
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 {
@@ -3569,7 +3569,7 @@ void MetaFontAction::Read( SvStream& rIStm, ImplMetaReadData* pData )
 
 IMPL_META_ACTION( Push, META_PUSH_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) :
     MetaAction  ( META_PUSH_ACTION ),
@@ -3577,14 +3577,14 @@ MetaPushAction::MetaPushAction( sal_uInt16 nFlags ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPushAction::Execute( OutputDevice* pOut )
 {
     pOut->Push( mnFlags );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPushAction::Clone()
 {
@@ -3593,14 +3593,14 @@ MetaAction* MetaPushAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaPushAction::Compare( const MetaAction& rMetaAction ) const
 {
     return mnFlags == ((MetaPushAction&)rMetaAction).mnFlags;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3608,7 +3608,7 @@ void MetaPushAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt16( mnFlags );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3620,14 +3620,14 @@ void MetaPushAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Pop, META_POP_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 void MetaPopAction::Execute( OutputDevice* pOut )
 {
     pOut->Pop();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaPopAction::Clone()
 {
@@ -3636,14 +3636,14 @@ MetaAction* MetaPopAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPopAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
     WRITE_BASE_COMPAT( rOStm, 1, pData );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3654,7 +3654,7 @@ void MetaPopAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( RasterOp, META_RASTEROP_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) :
     MetaAction  ( META_RASTEROP_ACTION ),
@@ -3662,14 +3662,14 @@ MetaRasterOpAction::MetaRasterOpAction( RasterOp eRasterOp ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRasterOpAction::Execute( OutputDevice* pOut )
 {
     pOut->SetRasterOp( meRasterOp );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaRasterOpAction::Clone()
 {
@@ -3678,14 +3678,14 @@ MetaAction* MetaRasterOpAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaRasterOpAction::Compare( const MetaAction& rMetaAction ) const
 {
     return meRasterOp == ((MetaRasterOpAction&)rMetaAction).meRasterOp;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3693,7 +3693,7 @@ void MetaRasterOpAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt16( (sal_uInt16) meRasterOp );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3707,7 +3707,7 @@ void MetaRasterOpAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( Transparent, META_TRANSPARENT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ) :
     MetaAction      ( META_TRANSPARENT_ACTION ),
@@ -3716,14 +3716,14 @@ MetaTransparentAction::MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTransparentAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawTransparent( maPolyPoly, mnTransPercent );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTransparentAction::Clone()
 {
@@ -3732,14 +3732,14 @@ MetaAction* MetaTransparentAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTransparentAction::Move( long nHorzMove, long nVertMove )
 {
     maPolyPoly.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTransparentAction::Scale( double fScaleX, double fScaleY )
 {
@@ -3747,7 +3747,7 @@ void MetaTransparentAction::Scale( double fScaleX, double fScaleY )
         ImplScalePoly( maPolyPoly[ i ], fScaleX, fScaleY );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3755,7 +3755,7 @@ bool MetaTransparentAction::Compare( const MetaAction& rMetaAction ) const
            ( mnTransPercent == ((MetaTransparentAction&)rMetaAction).mnTransPercent );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3777,7 +3777,7 @@ void MetaTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt16( mnTransPercent );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3790,7 +3790,7 @@ void MetaTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos,
                                                         const Size& rSize, const Gradient& rGradient ) :
@@ -3802,14 +3802,14 @@ MetaFloatTransparentAction::MetaFloatTransparentAction( const GDIMetaFile& rMtf,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFloatTransparentAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawTransparent( maMtf, maPoint, maSize, maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaFloatTransparentAction::Clone()
 {
@@ -3818,14 +3818,14 @@ MetaAction* MetaFloatTransparentAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFloatTransparentAction::Move( long nHorzMove, long nVertMove )
 {
     maPoint.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY )
 {
@@ -3835,7 +3835,7 @@ void MetaFloatTransparentAction::Scale( double fScaleX, double fScaleY )
     maSize = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3845,7 +3845,7 @@ bool MetaFloatTransparentAction::Compare( const MetaAction& rMetaAction ) const
            ( maGradient == ((MetaFloatTransparentAction&)rMetaAction).maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3857,7 +3857,7 @@ void MetaFloatTransparentAction::Write( SvStream& rOStm, ImplMetaWriteData* pDat
     WriteGradient( rOStm, maGradient );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3872,7 +3872,7 @@ void MetaFloatTransparentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( EPS, META_EPS_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize,
                               const GfxLink& rGfxLink, const GDIMetaFile& rSubst ) :
@@ -3884,14 +3884,14 @@ MetaEPSAction::MetaEPSAction( const Point& rPoint, const Size& rSize,
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEPSAction::Execute( OutputDevice* pOut )
 {
     pOut->DrawEPS( maPoint, maSize, maGfxLink, &maSubst );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaEPSAction::Clone()
 {
@@ -3900,14 +3900,14 @@ MetaAction* MetaEPSAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEPSAction::Move( long nHorzMove, long nVertMove )
 {
     maPoint.Move( nHorzMove, nVertMove );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEPSAction::Scale( double fScaleX, double fScaleY )
 {
@@ -3917,7 +3917,7 @@ void MetaEPSAction::Scale( double fScaleX, double fScaleY )
     maSize = aRectangle.GetSize();
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3927,7 +3927,7 @@ bool MetaEPSAction::Compare( const MetaAction& rMetaAction ) const
            ( maSize == ((MetaEPSAction&)rMetaAction).maSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3938,7 +3938,7 @@ void MetaEPSAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     maSubst.Write( rOStm );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -3953,7 +3953,7 @@ void MetaEPSAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( RefPoint, META_REFPOINT_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) :
     MetaAction  ( META_REFPOINT_ACTION ),
@@ -3962,7 +3962,7 @@ MetaRefPointAction::MetaRefPointAction( const Point& rRefPoint, bool bSet ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRefPointAction::Execute( OutputDevice* pOut )
 {
@@ -3972,7 +3972,7 @@ void MetaRefPointAction::Execute( OutputDevice* pOut )
         pOut->SetRefPoint();
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaRefPointAction::Clone()
 {
@@ -3981,7 +3981,7 @@ MetaAction* MetaRefPointAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -3989,7 +3989,7 @@ bool MetaRefPointAction::Compare( const MetaAction& rMetaAction ) const
            ( mbSet == ((MetaRefPointAction&)rMetaAction).mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -3998,7 +3998,7 @@ void MetaRefPointAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUChar( mbSet );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaRefPointAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -4015,7 +4015,7 @@ MetaCommentAction::MetaCommentAction( sal_Int32 nValue ) :
     ImplInitDynamicData( NULL, 0UL );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) :
     MetaAction  ( META_COMMENT_ACTION ),
@@ -4025,7 +4025,7 @@ MetaCommentAction::MetaCommentAction( const MetaCommentAction& rAct ) :
     ImplInitDynamicData( rAct.mpData, rAct.mnDataSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue, const sal_uInt8* pData, sal_uInt32 nDataSize ) :
     MetaAction  ( META_COMMENT_ACTION ),
@@ -4035,7 +4035,7 @@ MetaCommentAction::MetaCommentAction( const OString& rComment, sal_Int32 nValue,
     ImplInitDynamicData( pData, nDataSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaCommentAction::~MetaCommentAction()
 {
@@ -4043,7 +4043,7 @@ MetaCommentAction::~MetaCommentAction()
         delete[] mpData;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize )
 {
@@ -4059,7 +4059,7 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaCommentAction::Execute( OutputDevice* pOut )
 {
@@ -4070,7 +4070,7 @@ void MetaCommentAction::Execute( OutputDevice* pOut )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaCommentAction::Clone()
 {
@@ -4131,7 +4131,7 @@ void MetaCommentAction::Move( long nXMove, long nYMove )
     }
 }
 
-// ------------------------------------------------------------------------
+
 // SJ: 25.07.06 #i56656# we are not able to mirrorcertain kind of
 // comments properly, especially the XPATHSTROKE and XPATHFILL lead to
 // problems, so it is better to remove these comments when mirroring
@@ -4197,7 +4197,7 @@ void MetaCommentAction::Scale( double fXScale, double fYScale )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const
 {
@@ -4207,7 +4207,7 @@ bool MetaCommentAction::Compare( const MetaAction& rMetaAction ) const
            ( memcmp( mpData, ((MetaCommentAction&)rMetaAction).mpData, mnDataSize ) == 0 );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -4219,7 +4219,7 @@ void MetaCommentAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
         rOStm.Write( mpData, mnDataSize );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -4244,7 +4244,7 @@ void MetaCommentAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) :
     MetaAction  ( META_LAYOUTMODE_ACTION ),
@@ -4252,14 +4252,14 @@ MetaLayoutModeAction::MetaLayoutModeAction( sal_uInt32 nLayoutMode ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLayoutModeAction::Execute( OutputDevice* pOut )
 {
     pOut->SetLayoutMode( mnLayoutMode );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaLayoutModeAction::Clone()
 {
@@ -4268,14 +4268,14 @@ MetaAction* MetaLayoutModeAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaLayoutModeAction::Compare( const MetaAction& rMetaAction ) const
 {
     return mnLayoutMode == ((MetaLayoutModeAction&)rMetaAction).mnLayoutMode;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -4283,7 +4283,7 @@ void MetaLayoutModeAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt32( mnLayoutMode );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
@@ -4295,7 +4295,7 @@ void MetaLayoutModeAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 IMPL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION )
 
-// ------------------------------------------------------------------------
+
 
 MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) :
     MetaAction  ( META_TEXTLANGUAGE_ACTION ),
@@ -4303,14 +4303,14 @@ MetaTextLanguageAction::MetaTextLanguageAction( LanguageType eTextLanguage ) :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLanguageAction::Execute( OutputDevice* pOut )
 {
     pOut->SetDigitLanguage( meTextLanguage );
 }
 
-// ------------------------------------------------------------------------
+
 
 MetaAction* MetaTextLanguageAction::Clone()
 {
@@ -4319,14 +4319,14 @@ MetaAction* MetaTextLanguageAction::Clone()
     return pClone;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool MetaTextLanguageAction::Compare( const MetaAction& rMetaAction ) const
 {
     return meTextLanguage == ((MetaTextLanguageAction&)rMetaAction).meTextLanguage;
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
 {
@@ -4334,7 +4334,7 @@ void MetaTextLanguageAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
     rOStm.WriteUInt16( meTextLanguage );
 }
 
-// ------------------------------------------------------------------------
+
 
 void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* )
 {
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 0a6a8c1ddc13..4e7222cdb2f5 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -25,15 +25,15 @@
 
 #include "octree.hxx"
 
-// ---------
+
 // - pMask -
-// ---------
+
 
 static const sal_uInt8 pImplMask[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 };
 
-// -------------
+
 // - NodeCache -
-// -------------
+
 
 ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) :
             pActNode( NULL )
@@ -49,7 +49,7 @@ ImpNodeCache::ImpNodeCache( const sal_uLong nInitSize ) :
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 ImpNodeCache::~ImpNodeCache()
 {
@@ -62,9 +62,9 @@ ImpNodeCache::~ImpNodeCache()
     }
 }
 
-// ----------
+
 // - Octree -
-// ----------
+
 
 Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) :
             nMax        ( nColors ),
@@ -77,7 +77,7 @@ Octree::Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ) :
     ImplCreateOctree();
 }
 
-// ------------------------------------------------------------------------
+
 
 Octree::~Octree()
 {
@@ -85,7 +85,7 @@ Octree::~Octree()
     delete pNodeCache;
 }
 
-// ------------------------------------------------------------------------
+
 
 void Octree::ImplCreateOctree()
 {
@@ -131,7 +131,7 @@ void Octree::ImplCreateOctree()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void Octree::ImplDeleteOctree( PPNODE ppNode )
 {
@@ -145,7 +145,7 @@ void Octree::ImplDeleteOctree( PPNODE ppNode )
     *ppNode = NULL;
 }
 
-// ------------------------------------------------------------------------
+
 
 void Octree::ImplAdd( PPNODE ppNode )
 {
@@ -184,7 +184,7 @@ void Octree::ImplAdd( PPNODE ppNode )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void Octree::ImplReduce()
 {
@@ -224,7 +224,7 @@ void Octree::ImplReduce()
     nLeafCount -= --nChildren;
 }
 
-// ------------------------------------------------------------------------
+
 
 void Octree::CreatePalette( PNODE pNode )
 {
@@ -241,7 +241,7 @@ void Octree::CreatePalette( PNODE pNode )
 
 }
 
-// ------------------------------------------------------------------------
+
 
 void Octree::GetPalIndex( PNODE pNode )
 {
@@ -259,9 +259,9 @@ void Octree::GetPalIndex( PNODE pNode )
     }
 }
 
-// -------------------
+
 // - InverseColorMap -
-// -------------------
+
 
 InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
             nBits( 8 - OCTREE_BITS )
@@ -315,7 +315,7 @@ InverseColorMap::InverseColorMap( const BitmapPalette& rPal ) :
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 InverseColorMap::~InverseColorMap()
 {
@@ -323,7 +323,7 @@ InverseColorMap::~InverseColorMap()
     rtl_freeMemory( pMap );
 }
 
-// ------------------------------------------------------------------------
+
 
 void InverseColorMap::ImplCreateBuffers( const sal_uLong nMax )
 {
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 111fdf652a8a..a5e2c57e6f0d 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -660,7 +660,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
     }
 }
 
-// ------------------------------------------------------------------
+
 
 void OutputDevice::DrawTransformedBitmapEx(
     const basegfx::B2DHomMatrix& rTransformation,
diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx
index 4c522a94f76a..830a1ee3748e 100644
--- a/vcl/source/gdi/outdev5.cxx
+++ b/vcl/source/gdi/outdev5.cxx
@@ -92,7 +92,7 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
         mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawEllipse( const Rectangle& rRect )
 {
@@ -140,7 +140,7 @@ void OutputDevice::DrawEllipse( const Rectangle& rRect )
         mpAlphaVDev->DrawEllipse( rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawArc( const Rectangle& rRect,
                             const Point& rStartPt, const Point& rEndPt )
@@ -185,7 +185,7 @@ void OutputDevice::DrawArc( const Rectangle& rRect,
         mpAlphaVDev->DrawArc( rRect, rStartPt, rEndPt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawPie( const Rectangle& rRect,
                             const Point& rStartPt, const Point& rEndPt )
@@ -237,7 +237,7 @@ void OutputDevice::DrawPie( const Rectangle& rRect,
         mpAlphaVDev->DrawPie( rRect, rStartPt, rEndPt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawChord( const Rectangle& rRect,
                               const Point& rStartPt, const Point& rEndPt )
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 9d785e2610f9..e61e6bf58f12 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -175,7 +175,7 @@ void OutputDevice::DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLon
         mpAlphaVDev->DrawGrid( rRect, rDist, nFlags );
 }
 
-// ------------------------------------------------------------------------
+
 // Caution: This method is nearly the same as
 // void OutputDevice::DrawPolyPolygon( const basegfx::B2DPolyPolygon& rB2DPolyPoly )
 // so when changes are made here do not forget to make change sthere, too
@@ -240,7 +240,7 @@ void OutputDevice::DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly,
     DrawTransparent(toPolyPolygon(rB2DPolyPoly), static_cast<sal_uInt16>(fTransparency * 100.0));
 }
 
-// ------------------------------------------------------------------------
+
 
 void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
                                     sal_uInt16 nTransparencePercent )
@@ -635,7 +635,7 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
                                     const Size& rSize, const Gradient& rTransparenceGradient )
@@ -796,7 +796,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::ImplDrawColorWallpaper( long nX, long nY,
                                            long nWidth, long nHeight,
@@ -815,7 +815,7 @@ void OutputDevice::ImplDrawColorWallpaper( long nX, long nY,
     EnableMapMode( bMap );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
                                             long nWidth, long nHeight,
@@ -1058,7 +1058,7 @@ void OutputDevice::ImplDrawBitmapWallpaper( long nX, long nY,
     mpMetaFile = pOldMetaFile;
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY,
                                               long nWidth, long nHeight,
@@ -1103,7 +1103,7 @@ void OutputDevice::ImplDrawGradientWallpaper( long nX, long nY,
     mpMetaFile = pOldMetaFile;
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::ImplDrawWallpaper( long nX, long nY,
                                       long nWidth, long nHeight,
@@ -1117,7 +1117,7 @@ void OutputDevice::ImplDrawWallpaper( long nX, long nY,
         ImplDrawColorWallpaper(  nX, nY, nWidth, nHeight, rWallpaper );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawWallpaper( const Rectangle& rRect,
                                   const Wallpaper& rWallpaper )
@@ -1144,7 +1144,7 @@ void OutputDevice::DrawWallpaper( const Rectangle& rRect,
         mpAlphaVDev->DrawWallpaper( rRect, rWallpaper );
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::Erase()
 {
@@ -1184,7 +1184,7 @@ void OutputDevice::Erase()
         mpAlphaVDev->Erase();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
                             const GfxLink& rGfxLink, GDIMetaFile* pSubst )
@@ -1242,7 +1242,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
     return bDrawn;
 }
 
-// -----------------------------------------------------------------------
+
 
 void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt32 nLen, Color aStart, Color aEnd)
 {
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 9e310c7ab9ac..33296903fbb2 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -25,7 +25,7 @@
 
 #include "salgdi.hxx"
 
-// -----------------------------------------------------------------------
+
 
 static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice )
 {
@@ -140,12 +140,12 @@ PushButtonValue* PushButtonValue::clone() const
     return new PushButtonValue( *this );
 }
 
-// -----------------------------------------------------------------------
+
 // These functions are mainly passthrough functions that allow access to
 // the SalFrame behind a Window object for native widget rendering purposes.
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPart ) const
 {
@@ -160,7 +160,7 @@ bool OutputDevice::IsNativeControlSupported( ControlType nType, ControlPart nPar
 }
 
 
-// -----------------------------------------------------------------------
+
 
 bool OutputDevice::HitTestNativeControl( ControlType nType,
                               ControlPart nPart,
@@ -183,7 +183,7 @@ bool OutputDevice::HitTestNativeControl( ControlType nType,
         rIsInside, this ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 static boost::shared_ptr< ImplControlValue > lcl_transformControlValue( const ImplControlValue& rVal, const OutputDevice& rDev )
 {
@@ -303,7 +303,7 @@ bool OutputDevice::DrawNativeControl( ControlType nType,
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool OutputDevice::GetNativeControlRegion(  ControlType nType,
                                 ControlPart nPart,
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 2a805f6d5a67..5d632fcd02ba 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star::beans;
 
 static bool lcl_canUsePDFAxialShading(const Gradient& rGradient);
 
-// -----------------------------------------------------------------------------
+
 
 void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gradient& i_rGradient,
                                        VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext )
@@ -64,7 +64,7 @@ void PDFWriterImpl::implWriteGradient( const PolyPolygon& i_rPolyPoly, const Gra
     m_rOuterFace.Pop();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSize, const BitmapEx& i_rBitmapEx,
                                        VirtualDevice* i_pDummyVDev, const vcl::PDFWriter::PlayMetafileContext& i_rContext )
@@ -243,7 +243,7 @@ void PDFWriterImpl::implWriteBitmapEx( const Point& i_rPoint, const Size& i_rSiz
 }
 
 
-// -----------------------------------------------------------------------------
+
 
 void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevData* i_pOutDevData, const vcl::PDFWriter::PlayMetafileContext& i_rContext, VirtualDevice* pDummyVDev )
 {
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 699ef39df805..f7e0820f9c17 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.cxx
@@ -42,7 +42,7 @@
 // converted to rectangles and the points in the list are deleted.
 //
 //
-// -----------------------------------------------------------------------
+
 
 ImplRegionBand::ImplRegionBand( long nTop, long nBottom )
 {
@@ -58,7 +58,7 @@ ImplRegionBand::ImplRegionBand( long nTop, long nBottom )
     mbTouched           = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplRegionBand::ImplRegionBand(
     const ImplRegionBand& rRegionBand,
@@ -120,7 +120,7 @@ ImplRegionBand::ImplRegionBand(
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplRegionBand::~ImplRegionBand()
 {
@@ -145,7 +145,7 @@ ImplRegionBand::~ImplRegionBand()
     }
 }
 
-// -----------------------------------------------------------------------
+
 //
 // generate separations from lines and process union with existing
 // separations
@@ -198,7 +198,7 @@ void ImplRegionBand::ProcessPoints()
     mpFirstBandPoint = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 //
 // generate separations from lines and process union with existing
 // separations
@@ -311,7 +311,7 @@ bool ImplRegionBand::InsertPoint( long nX, long nLineId,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplRegionBand::MoveX( long nHorzMove )
 {
@@ -325,7 +325,7 @@ void ImplRegionBand::MoveX( long nHorzMove )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplRegionBand::ScaleX( double fHorzScale )
 {
@@ -338,7 +338,7 @@ void ImplRegionBand::ScaleX( double fHorzScale )
     }
 }
 
-// -----------------------------------------------------------------------
+
 //
 // combine overlaping sparations
 
@@ -383,7 +383,7 @@ bool ImplRegionBand::OptimizeBand()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplRegionBand::Union( long nXLeft, long nXRight )
 {
@@ -457,7 +457,7 @@ void ImplRegionBand::Union( long nXLeft, long nXRight )
     OptimizeBand();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplRegionBand::Intersect( long nXLeft, long nXRight )
 {
@@ -504,7 +504,7 @@ void ImplRegionBand::Intersect( long nXLeft, long nXRight )
     OptimizeBand();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplRegionBand::Exclude( long nXLeft, long nXRight )
 {
@@ -584,7 +584,7 @@ void ImplRegionBand::Exclude( long nXLeft, long nXRight )
     OptimizeBand();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplRegionBand::XOr( long nXLeft, long nXRight )
 {
@@ -831,7 +831,7 @@ void ImplRegionBand::XOr( long nXLeft, long nXRight )
     OptimizeBand();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplRegionBand::IsInside( long nX )
 {
@@ -847,7 +847,7 @@ bool ImplRegionBand::IsInside( long nX )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplRegionBand::IsOver( long nLeft, long nRight )
 {
@@ -863,7 +863,7 @@ bool ImplRegionBand::IsOver( long nLeft, long nRight )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplRegionBand::IsInside( long nLeft, long nRight )
 {
@@ -879,7 +879,7 @@ bool ImplRegionBand::IsInside( long nLeft, long nRight )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplRegionBand::GetXLeftBoundary() const
 {
@@ -888,7 +888,7 @@ long ImplRegionBand::GetXLeftBoundary() const
     return mpFirstSep->mnXLeft;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplRegionBand::GetXRightBoundary() const
 {
@@ -901,7 +901,7 @@ long ImplRegionBand::GetXRightBoundary() const
     return pSep->mnXRight;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const
 {
@@ -934,7 +934,7 @@ bool ImplRegionBand::operator==( const ImplRegionBand& rRegionBand ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplRegionBand* ImplRegionBand::SplitBand (const sal_Int32 nY)
 {
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 6e3f7fe06d3d..8c536275a5ed 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -1419,7 +1419,7 @@ bool Region::IsInside( const Rectangle& rRect ) const
     return aRegion.IsEmpty();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Region::IsOver( const Rectangle& rRect ) const
 {
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 90e6d2996c85..c2bb8b7422b7 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -215,14 +215,14 @@ int GetVerticalFlags( sal_UCS4 nChar )
     return GF_NONE; // not rotated as default
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_UCS4 GetVerticalChar( sal_UCS4 )
 {
     return 0; // #i14788# input method is responsible vertical char changes
 }
 
-// -----------------------------------------------------------------------
+
 
 VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar )
 {
@@ -230,7 +230,7 @@ VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 nChar )
     return nChar;
 }
 
-// -----------------------------------------------------------------------
+
 
 VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang )
 {
@@ -324,7 +324,7 @@ VCL_DLLPUBLIC sal_UCS4 GetLocalizedChar( sal_UCS4 nChar, LanguageType eLang )
     return nChar;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline bool IsControlChar( sal_UCS4 cChar )
 {
@@ -376,7 +376,7 @@ bool ImplLayoutRuns::AddPos( int nCharPos, bool bRTL )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL )
 {
@@ -397,7 +397,7 @@ bool ImplLayoutRuns::AddRun( int nCharPos0, int nCharPos1, bool bRTL )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplLayoutRuns::PosIsInRun( int nCharPos ) const
 {
@@ -441,7 +441,7 @@ bool ImplLayoutRuns::PosIsInAnyRun( int nCharPos ) const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft )
 {
@@ -487,7 +487,7 @@ bool ImplLayoutRuns::GetNextPos( int* nCharPos, bool* bRightToLeft )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplLayoutRuns::GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRightToLeft ) const
 {
@@ -583,7 +583,7 @@ ImplLayoutArgs::ImplLayoutArgs( const sal_Unicode* pStr, int nLen,
     maRuns.ResetPos();
 }
 
-// -----------------------------------------------------------------------
+
 
 // add a run after splitting it up to get rid of control chars
 void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL )
@@ -616,7 +616,7 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL )
     maRuns.AddRun( nCharPos0, nCharPos1, bRTL );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplLayoutArgs::PrepareFallback()
 {
@@ -665,7 +665,7 @@ bool ImplLayoutArgs::PrepareFallback()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplLayoutArgs::GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL )
 {
@@ -686,12 +686,12 @@ SalLayout::SalLayout()
     maDrawOffset( 0, 0 )
 {}
 
-// -----------------------------------------------------------------------
+
 
 SalLayout::~SalLayout()
 {}
 
-// -----------------------------------------------------------------------
+
 
 void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
@@ -701,7 +701,7 @@ void SalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
     mnOrientation = rArgs.mnOrientation;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SalLayout::Release() const
 {
@@ -712,7 +712,7 @@ void SalLayout::Release() const
     delete const_cast<SalLayout*>(this);
 }
 
-// -----------------------------------------------------------------------
+
 
 Point SalLayout::GetDrawPosition( const Point& rRelative ) const
 {
@@ -744,7 +744,7 @@ Point SalLayout::GetDrawPosition( const Point& rRelative ) const
     return aPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 // returns asian kerning values in quarter of character width units
 // to enable automatic halfwidth substitution for fullwidth punctuation
@@ -787,7 +787,7 @@ int SalLayout::CalcAsianKerning( sal_UCS4 c, bool bLeft, bool /*TODO:? bVertical
     return nResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SalLayout::GetOutline( SalGraphics& rSalGraphics,
     ::basegfx::B2DPolyPolygonVector& rVector ) const
@@ -823,7 +823,7 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics,
     return (bAllOk && bOneOk);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) const
 {
@@ -854,7 +854,7 @@ bool SalLayout::GetBoundRect( SalGraphics& rSalGraphics, Rectangle& rRect ) cons
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const
 {
@@ -877,19 +877,19 @@ bool SalLayout::IsSpacingGlyph( sal_GlyphId nGlyph ) const
 GenericSalLayout::GenericSalLayout()
 {}
 
-// -----------------------------------------------------------------------
+
 
 GenericSalLayout::~GenericSalLayout()
 {}
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::AppendGlyph( const GlyphItem& rGlyphItem )
 {
     m_GlyphItems.push_back(rGlyphItem);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const
 {
@@ -965,7 +965,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32* pCharWidths ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const
 {
@@ -977,7 +977,7 @@ long GenericSalLayout::FillDXArray( sal_Int32* pCharWidths ) const
     return nWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 // the text width is the maximum logical extent of all glyphs
 long GenericSalLayout::GetTextWidth() const
@@ -1004,7 +1004,7 @@ long GenericSalLayout::GetTextWidth() const
     return nWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
@@ -1016,7 +1016,7 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
         Justify( rArgs.mnLayoutWidth );
 }
 
-// -----------------------------------------------------------------------
+
 
 // This DXArray thing is one of the stupidest ideas I have ever seen (I've been
 // told that it probably a one-to-one mapping of some Windows 3.1 API, which is
@@ -1144,7 +1144,7 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& rArgs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::Justify( long nNewWidth )
 {
@@ -1222,7 +1222,7 @@ void GenericSalLayout::Justify( long nNewWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength )
 {
@@ -1264,7 +1264,7 @@ void GenericSalLayout::ApplyAsianKerning( const sal_Unicode* pStr, int nLength )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth )
 {
@@ -1317,7 +1317,7 @@ void GenericSalLayout::KashidaJustify( long nKashidaIndex, int nKashidaWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const
 {
@@ -1349,7 +1349,7 @@ void GenericSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
 {
@@ -1370,7 +1370,7 @@ sal_Int32 GenericSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int n
     return -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
     int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry,
@@ -1458,7 +1458,7 @@ int GenericSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos
     return nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos )
 {
@@ -1485,7 +1485,7 @@ void GenericSalLayout::MoveGlyph( int nStart, long nNewXPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::DropGlyph( int nStart )
 {
@@ -1498,7 +1498,7 @@ void GenericSalLayout::DropGlyph( int nStart )
     pG->mnCharPos = -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void GenericSalLayout::Simplify( bool bIsBase )
 {
@@ -1520,7 +1520,7 @@ void GenericSalLayout::Simplify( bool bIsBase )
     m_GlyphItems.erase(m_GlyphItems.begin() + j, m_GlyphItems.end());
 }
 
-// -----------------------------------------------------------------------
+
 
 // make sure GlyphItems are sorted left to right
 void GenericSalLayout::SortGlyphItems()
@@ -1576,7 +1576,7 @@ void MultiSalLayout::SetInComplete(bool bInComplete)
     maFallbackRuns[mnLevel-1] = ImplLayoutRuns();
 }
 
-// -----------------------------------------------------------------------
+
 
 MultiSalLayout::~MultiSalLayout()
 {
@@ -1584,7 +1584,7 @@ MultiSalLayout::~MultiSalLayout()
         mpLayouts[ i ]->Release();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool MultiSalLayout::AddFallback( SalLayout& rFallback,
     ImplLayoutRuns& rFallbackRuns, const PhysicalFontFace* pFallbackFont )
@@ -1599,7 +1599,7 @@ bool MultiSalLayout::AddFallback( SalLayout& rFallback,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
@@ -1610,7 +1610,7 @@ bool MultiSalLayout::LayoutText( ImplLayoutArgs& rArgs )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
@@ -1979,7 +1979,7 @@ void MultiSalLayout::AdjustLayout( ImplLayoutArgs& rArgs )
         mpLayouts[n]->DisableGlyphInjection( false );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MultiSalLayout::InitFont() const
 {
@@ -1987,7 +1987,7 @@ void MultiSalLayout::InitFont() const
         mpLayouts[0]->InitFont();
 }
 
-// -----------------------------------------------------------------------
+
 
 void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const
 {
@@ -2004,7 +2004,7 @@ void MultiSalLayout::DrawText( SalGraphics& rGraphics ) const
     // NOTE: now the baselevel font is active again
 }
 
- // -----------------------------------------------------------------------
+
 
 sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
 {
@@ -2043,7 +2043,7 @@ sal_Int32 MultiSalLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFa
     return -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const
 {
@@ -2091,7 +2091,7 @@ long MultiSalLayout::FillDXArray( sal_Int32* pCharWidths ) const
     return nMaxWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) const
 {
@@ -2117,7 +2117,7 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& rPos,
     int& nStart, sal_Int32* pGlyphAdvAry, int* pCharPosAry,
@@ -2167,7 +2167,7 @@ int MultiSalLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point& r
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool MultiSalLayout::GetOutline( SalGraphics& rGraphics,
     ::basegfx::B2DPolyPolygonVector& rPPV ) const
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 2602dbc3d7f8..2d774a58b7f9 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -122,7 +122,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
     pSVData->maGDIData.mpFirstVirDev = this;
 }
 
-// -----------------------------------------------------------------------
+
 
 VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
 :   mpVirDev( NULL ),
@@ -135,7 +135,7 @@ VirtualDevice::VirtualDevice( sal_uInt16 nBitCount )
     ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount );
 }
 
-// -----------------------------------------------------------------------
+
 
 VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount )
     : mpVirDev( NULL ),
@@ -148,7 +148,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
     ImplInitVirDev( &rCompDev, 1, 1, nBitCount );
 }
 
-// -----------------------------------------------------------------------
+
 
 VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount, sal_uInt16 nAlphaBitCount )
     : mpVirDev( NULL ),
@@ -165,7 +165,7 @@ VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount
     mnAlphaDepth = sal::static_int_cast<sal_Int8>(nAlphaBitCount);
 }
 
-// -----------------------------------------------------------------------
+
 
 VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount )
 :   mpVirDev( NULL ),
@@ -176,7 +176,7 @@ VirtualDevice::VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCo
     ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount, pData );
 }
 
-// -----------------------------------------------------------------------
+
 
 VirtualDevice::~VirtualDevice()
 {
@@ -201,7 +201,7 @@ VirtualDevice::~VirtualDevice()
         pSVData->maGDIData.mpLastVirDev = mpPrev;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer )
 {
@@ -303,7 +303,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 // #i32109#: Fill opaque areas correctly (without relying on
 // fill/linecolor state)
@@ -319,7 +319,7 @@ void VirtualDevice::ImplFillOpaqueRectangle( const Rectangle& rRect )
     Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase, const basebmp::RawMemorySharedArray &pBuffer )
 {
@@ -373,7 +373,7 @@ bool VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize
     return ImplSetOutputSizePixel( rNewSize, true, pBuffer);
 }
 
-// -----------------------------------------------------------------------
+
 
 void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode )
 {
@@ -455,13 +455,13 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32
     mpFontCache = new ImplFontCache();
 }
 
-// -----------------------------------------------------------------------
+
 
 void VirtualDevice::Compat_ZeroExtleadBug()
 {
     meRefDevMode = (sal_uInt8)meRefDevMode | REFDEV_FORCE_ZERO_EXTLEAD;
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 7c08e016b5cb..af7a3a0f20b6 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -28,7 +28,7 @@
 #include <vcl/dibtools.hxx>
 #include <vcl/settings.hxx>
 
-// -----------------------------------------------------------------------
+
 
 ImplWallpaper::ImplWallpaper() :
     maColor( COL_TRANSPARENT )
@@ -41,7 +41,7 @@ ImplWallpaper::ImplWallpaper() :
     meStyle         = WALLPAPER_NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) :
     maColor( rImplWallpaper.maColor )
@@ -67,7 +67,7 @@ ImplWallpaper::ImplWallpaper( const ImplWallpaper& rImplWallpaper ) :
         mpRect = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplWallpaper::~ImplWallpaper()
 {
@@ -77,7 +77,7 @@ ImplWallpaper::~ImplWallpaper()
     delete mpRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp )
 {
@@ -87,7 +87,7 @@ void ImplWallpaper::ImplSetCachedBitmap( BitmapEx& rBmp )
         *mpCache = rBmp;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWallpaper::ImplReleaseCachedBitmap()
 {
@@ -95,7 +95,7 @@ void ImplWallpaper::ImplReleaseCachedBitmap()
     mpCache = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
 {
@@ -150,7 +150,7 @@ SvStream& ReadImplWallpaper( SvStream& rIStm, ImplWallpaper& rImplWallpaper )
     return rIStm;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpaper )
 {
@@ -182,7 +182,7 @@ SvStream& WriteImplWallpaper( SvStream& rOStm, const ImplWallpaper& rImplWallpap
     return rOStm;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline void Wallpaper::ImplMakeUnique( bool bReleaseCache )
 {
@@ -198,7 +198,7 @@ inline void Wallpaper::ImplMakeUnique( bool bReleaseCache )
         mpImplWallpaper->ImplReleaseCachedBitmap();
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper::Wallpaper()
 {
@@ -209,7 +209,7 @@ Wallpaper::Wallpaper()
     mpImplWallpaper = &aStaticImplWallpaper;
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper::Wallpaper( const Wallpaper& rWallpaper )
 {
@@ -222,7 +222,7 @@ Wallpaper::Wallpaper( const Wallpaper& rWallpaper )
         mpImplWallpaper->mnRefCount++;
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper::Wallpaper( const Color& rColor )
 {
@@ -232,7 +232,7 @@ Wallpaper::Wallpaper( const Color& rColor )
     mpImplWallpaper->meStyle    = WALLPAPER_TILE;
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper::Wallpaper( const BitmapEx& rBmpEx )
 {
@@ -242,7 +242,7 @@ Wallpaper::Wallpaper( const BitmapEx& rBmpEx )
     mpImplWallpaper->meStyle    = WALLPAPER_TILE;
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper::Wallpaper( const Gradient& rGradient )
 {
@@ -252,7 +252,7 @@ Wallpaper::Wallpaper( const Gradient& rGradient )
     mpImplWallpaper->meStyle    = WALLPAPER_TILE;
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper::~Wallpaper()
 {
@@ -267,7 +267,7 @@ Wallpaper::~Wallpaper()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Wallpaper::SetColor( const Color& rColor )
 {
@@ -279,7 +279,7 @@ void Wallpaper::SetColor( const Color& rColor )
         mpImplWallpaper->meStyle = WALLPAPER_TILE;
 }
 
-// -----------------------------------------------------------------------
+
 
 const Color& Wallpaper::GetColor() const
 {
@@ -287,7 +287,7 @@ const Color& Wallpaper::GetColor() const
     return mpImplWallpaper->maColor;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Wallpaper::SetStyle( WallpaperStyle eStyle )
 {
@@ -302,7 +302,7 @@ void Wallpaper::SetStyle( WallpaperStyle eStyle )
     mpImplWallpaper->meStyle = eStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 WallpaperStyle Wallpaper::GetStyle() const
 {
@@ -310,7 +310,7 @@ WallpaperStyle Wallpaper::GetStyle() const
     return mpImplWallpaper->meStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Wallpaper::SetBitmap( const BitmapEx& rBitmap )
 {
@@ -337,7 +337,7 @@ void Wallpaper::SetBitmap( const BitmapEx& rBitmap )
         mpImplWallpaper->meStyle = WALLPAPER_TILE;
 }
 
-// -----------------------------------------------------------------------
+
 
 BitmapEx Wallpaper::GetBitmap() const
 {
@@ -351,7 +351,7 @@ BitmapEx Wallpaper::GetBitmap() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Wallpaper::IsBitmap() const
 {
@@ -360,7 +360,7 @@ bool Wallpaper::IsBitmap() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void Wallpaper::SetGradient( const Gradient& rGradient )
 {
@@ -376,7 +376,7 @@ void Wallpaper::SetGradient( const Gradient& rGradient )
         mpImplWallpaper->meStyle = WALLPAPER_TILE;
 }
 
-// -----------------------------------------------------------------------
+
 
 Gradient Wallpaper::GetGradient() const
 {
@@ -392,7 +392,7 @@ Gradient Wallpaper::GetGradient() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Wallpaper::IsGradient() const
 {
@@ -401,7 +401,7 @@ bool Wallpaper::IsGradient() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 Gradient Wallpaper::ImplGetApplicationGradient() const
 {
@@ -417,7 +417,7 @@ Gradient Wallpaper::ImplGetApplicationGradient() const
     return g;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Wallpaper::SetRect( const Rectangle& rRect )
 {
@@ -441,7 +441,7 @@ void Wallpaper::SetRect( const Rectangle& rRect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Wallpaper::GetRect() const
 {
@@ -455,7 +455,7 @@ Rectangle Wallpaper::GetRect() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Wallpaper::IsRect() const
 {
@@ -464,7 +464,7 @@ bool Wallpaper::IsRect() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 bool Wallpaper::IsFixed() const
 {
@@ -474,7 +474,7 @@ bool Wallpaper::IsFixed() const
         return (!mpImplWallpaper->mpBitmap && !mpImplWallpaper->mpGradient);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Wallpaper::IsScrollable() const
 {
@@ -488,7 +488,7 @@ bool Wallpaper::IsScrollable() const
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper )
 {
@@ -513,7 +513,7 @@ Wallpaper& Wallpaper::operator=( const Wallpaper& rWallpaper )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const
 {
@@ -546,7 +546,7 @@ bool Wallpaper::operator==( const Wallpaper& rWallpaper ) const
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper )
 {
@@ -554,7 +554,7 @@ SvStream& ReadWallpaper( SvStream& rIStm, Wallpaper& rWallpaper )
     return ReadImplWallpaper( rIStm, *rWallpaper.mpImplWallpaper );
 }
 
-// -----------------------------------------------------------------------
+
 
 SvStream& WriteWallpaper( SvStream& rOStm, const Wallpaper& rWallpaper )
 {
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 4ded993eb491..61b5763f6646 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -95,7 +95,7 @@ sal_uInt16 ImplAccelEntryGetIndex( ImplAccelList* pList, sal_uInt16 nId,
     return ACCELENTRY_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
 {
@@ -134,7 +134,7 @@ static void ImplAccelEntryInsert( ImplAccelList* pList, ImplAccelEntry* pEntry )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_uInt16 ImplAccelEntryGetFirstPos( ImplAccelList* pList, sal_uInt16 nId )
 {
@@ -165,7 +165,7 @@ void Accelerator::ImplInit()
     mpDel               = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const
 {
@@ -176,7 +176,7 @@ ImplAccelEntry* Accelerator::ImplGetAccelData( const KeyCode& rKeyCode ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
 {
@@ -199,7 +199,7 @@ void Accelerator::ImplCopyData( ImplAccelData& rAccelData )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::ImplDeleteData()
 {
@@ -214,7 +214,7 @@ void Accelerator::ImplDeleteData()
     mpData->maIdList.clear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode,
                                    bool bEnable, Accelerator* pAutoAccel )
@@ -269,7 +269,7 @@ void Accelerator::ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode,
         ImplAccelEntryInsert( &(mpData->maIdList), pEntry );
 }
 
-// -----------------------------------------------------------------------
+
 
 Accelerator::Accelerator()
 {
@@ -278,7 +278,7 @@ Accelerator::Accelerator()
     mpData = new ImplAccelData;
 }
 
-// -----------------------------------------------------------------------
+
 
 Accelerator::Accelerator( const Accelerator& rAccel ) :
     Resource(),
@@ -291,7 +291,7 @@ Accelerator::Accelerator( const Accelerator& rAccel ) :
     ImplCopyData( *((ImplAccelData*)(rAccel.mpData)) );
 }
 
-// -----------------------------------------------------------------------
+
 
 Accelerator::Accelerator( const ResId& rResId )
 {
@@ -302,7 +302,7 @@ Accelerator::Accelerator( const ResId& rResId )
     ImplLoadRes( rResId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::ImplLoadRes( const ResId& rResId )
 {
@@ -318,7 +318,7 @@ void Accelerator::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Accelerator::~Accelerator()
 {
@@ -331,35 +331,35 @@ Accelerator::~Accelerator()
     delete mpData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::Activate()
 {
     maActivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::Deactivate()
 {
     maDeactivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::Select()
 {
     maSelectHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode )
 {
     ImplInsertAccel( nItemId, rKeyCode, true, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Accelerator::InsertItem( const ResId& rResId )
 {
@@ -393,7 +393,7 @@ void Accelerator::InsertItem( const ResId& rResId )
     ImplInsertAccel( nAccelKeyId, aKeyCode, !bDisable, pAutoAccel );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Accelerator::GetItemCount() const
 {
@@ -401,7 +401,7 @@ sal_uInt16 Accelerator::GetItemCount() const
     return (sal_uInt16)mpData->maIdList.size();
 }
 
-// -----------------------------------------------------------------------
+
 
 KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const
 {
@@ -413,7 +413,7 @@ KeyCode Accelerator::GetKeyCode( sal_uInt16 nItemId ) const
         return KeyCode();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const
 {
@@ -425,7 +425,7 @@ sal_uInt16 Accelerator::GetItemId( sal_uInt16 nPos ) const
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const
 {
@@ -437,7 +437,7 @@ Accelerator* Accelerator::GetAccel( sal_uInt16 nItemId ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 Accelerator& Accelerator::operator=( const Accelerator& rAccel )
 {
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 5fe29c0e3341..66ce04be9c19 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -35,7 +35,7 @@ ImplAccelManager::~ImplAccelManager()
     delete mpSequenceList;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
 {
@@ -53,7 +53,7 @@ bool ImplAccelManager::InsertAccel( Accelerator* pAccel )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
 {
@@ -90,7 +90,7 @@ void ImplAccelManager::RemoveAccel( Accelerator* pAccel )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplAccelManager::EndSequence( bool bCancel )
 {
@@ -118,7 +118,7 @@ void ImplAccelManager::EndSequence( bool bCancel )
     mpSequenceList = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplAccelManager::IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat )
 {
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index b68b4ab9ae51..27eafacfaac5 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -79,7 +79,7 @@ static void ImplGetPinImage( sal_uInt16 nStyle, bool bPinIn, Image& rImage )
     rImage = pSVData->maCtrlData.mpPinImgList->GetImage( nId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCalcSymbolRect( Rectangle& rRect )
 {
@@ -99,7 +99,7 @@ void Window::ImplCalcSymbolRect( Rectangle& rRect )
     rRect.Bottom()  -= nExtraHeight;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
                                   const Rectangle& rRect, SymbolType eSymbol )
@@ -112,7 +112,7 @@ static void ImplDrawBrdWinSymbol( OutputDevice* pDev,
                           pDev->GetSettings().GetStyleSettings().GetButtonTextColor(), 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
                                         const Rectangle& rRect,
@@ -151,50 +151,50 @@ static void ImplDrawBrdWinSymbolButton( OutputDevice* pDev,
 
 // =======================================================================
 
-// ------------------------
+
 // - ImplBorderWindowView -
-// ------------------------
+
 
 ImplBorderWindowView::~ImplBorderWindowView()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplBorderWindowView::MouseMove( const MouseEvent& )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplBorderWindowView::MouseButtonDown( const MouseEvent& )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplBorderWindowView::Tracking( const TrackingEvent& )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplBorderWindowView::RequestHelp( const Point&, Rectangle& )
 {
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ImplBorderWindowView::GetMenuRect() const
 {
     return Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData )
 {
@@ -230,7 +230,7 @@ void ImplBorderWindowView::ImplInitTitle( ImplBorderFrameData* pData )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const Point& rPos )
 {
@@ -309,7 +309,7 @@ sal_uInt16 ImplBorderWindowView::ImplHitTest( ImplBorderFrameData* pData, const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
 {
@@ -351,7 +351,7 @@ bool ImplBorderWindowView::ImplMouseMove( ImplBorderFrameData* pData, const Mous
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt )
 {
@@ -471,7 +471,7 @@ bool ImplBorderWindowView::ImplMouseButtonDown( ImplBorderFrameData* pData, cons
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt )
 {
@@ -924,7 +924,7 @@ bool ImplBorderWindowView::ImplTracking( ImplBorderFrameData* pData, const Track
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
                                               const Point& rPos,
@@ -995,7 +995,7 @@ OUString ImplBorderWindowView::ImplRequestHelp( ImplBorderFrameData* pData,
     return aHelpStr;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const
 {
@@ -1018,21 +1018,21 @@ long ImplBorderWindowView::ImplCalcTitleWidth( const ImplBorderFrameData* pData
 
 // =======================================================================
 
-// --------------------------
+
 // - ImplNoBorderWindowView -
-// --------------------------
+
 
 ImplNoBorderWindowView::ImplNoBorderWindowView( ImplBorderWindow* )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplNoBorderWindowView::Init( OutputDevice*, long, long )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                         sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
@@ -1043,14 +1043,14 @@ void ImplNoBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopB
     rBottomBorder   = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplNoBorderWindowView::CalcTitleWidth() const
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point* )
 {
@@ -1058,9 +1058,9 @@ void ImplNoBorderWindowView::DrawWindow( sal_uInt16, OutputDevice*, const Point*
 
 // =======================================================================
 
-// -----------------------------
+
 // - ImplSmallBorderWindowView -
-// -----------------------------
+
 
 // =======================================================================
 
@@ -1073,7 +1073,7 @@ ImplSmallBorderWindowView::ImplSmallBorderWindowView( ImplBorderWindow* pBorderW
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight )
 {
@@ -1234,7 +1234,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                            sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
@@ -1245,14 +1245,14 @@ void ImplSmallBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rT
     rBottomBorder   = mnBottomBorder;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplSmallBorderWindowView::CalcTitleWidth() const
 {
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*, const Point* )
 {
@@ -1416,9 +1416,9 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
 
 // =======================================================================
 
-// ---------------------------
+
 // - ImplStdBorderWindowView -
-// ---------------------------
+
 
 ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow )
 {
@@ -1438,7 +1438,7 @@ ImplStdBorderWindowView::ImplStdBorderWindowView( ImplBorderWindow* pBorderWindo
     mpDTitleVirDev              = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplStdBorderWindowView::~ImplStdBorderWindowView()
 {
@@ -1446,42 +1446,42 @@ ImplStdBorderWindowView::~ImplStdBorderWindowView()
     delete mpDTitleVirDev;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplStdBorderWindowView::MouseMove( const MouseEvent& rMEvt )
 {
     return ImplMouseMove( &maFrameData, rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt )
 {
     return ImplMouseButtonDown( &maFrameData, rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt )
 {
     return ImplTracking( &maFrameData, rTEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplStdBorderWindowView::RequestHelp( const Point& rPos, Rectangle& rHelpRect )
 {
     return ImplRequestHelp( &maFrameData, rPos, rHelpRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ImplStdBorderWindowView::GetMenuRect() const
 {
     return maFrameData.maMenuRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeight )
 {
@@ -1629,7 +1629,7 @@ void ImplStdBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHeigh
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                          sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
@@ -1640,14 +1640,14 @@ void ImplStdBorderWindowView::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTop
     rBottomBorder   = maFrameData.mnBottomBorder;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplStdBorderWindowView::CalcTitleWidth() const
 {
     return ImplCalcTitleWidth( &maFrameData );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset )
 {
@@ -1943,7 +1943,7 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent,
     ImplInit( pParent, nStyle, nTypeStyle, pSystemParentData );
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle ,
                                     sal_uInt16 nTypeStyle ) :
@@ -1952,35 +1952,35 @@ ImplBorderWindow::ImplBorderWindow( Window* pParent, WinBits nStyle ,
     ImplInit( pParent, nStyle, nTypeStyle, ::com::sun::star::uno::Any() );
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplBorderWindow::~ImplBorderWindow()
 {
     delete mpBorderView;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::MouseMove( const MouseEvent& rMEvt )
 {
     mpBorderView->MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::MouseButtonDown( const MouseEvent& rMEvt )
 {
     mpBorderView->MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::Tracking( const TrackingEvent& rTEvt )
 {
     mpBorderView->Tracking( rTEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::Paint( const Rectangle& )
 {
@@ -1992,7 +1992,7 @@ void ImplBorderWindow::Draw( const Rectangle&, OutputDevice* pOutDev, const Poin
     mpBorderView->DrawWindow( BORDERWINDOW_DRAW_ALL, pOutDev, &rPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::Activate()
 {
@@ -2000,7 +2000,7 @@ void ImplBorderWindow::Activate()
     Window::Activate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::Deactivate()
 {
@@ -2011,7 +2011,7 @@ void ImplBorderWindow::Deactivate()
     Window::Deactivate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -2037,7 +2037,7 @@ void ImplBorderWindow::RequestHelp( const HelpEvent& rHEvt )
     Window::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::Resize()
 {
@@ -2091,7 +2091,7 @@ void ImplBorderWindow::Resize()
     Window::Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::StateChanged( StateChangedType nType )
 {
@@ -2111,7 +2111,7 @@ void ImplBorderWindow::StateChanged( StateChangedType nType )
     Window::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -2127,7 +2127,7 @@ void ImplBorderWindow::DataChanged( const DataChangedEvent& rDCEvt )
     Window::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::InitView()
 {
@@ -2148,7 +2148,7 @@ void ImplBorderWindow::InitView()
     mpBorderView->Init( this, aSize.Width(), aSize.Height() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize )
 {
@@ -2191,7 +2191,7 @@ void ImplBorderWindow::UpdateView( bool bNewView, const Size& rNewOutSize )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::InvalidateBorder()
 {
@@ -2224,7 +2224,7 @@ void ImplBorderWindow::InvalidateBorder()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetDisplayActive( bool bActive )
 {
@@ -2236,7 +2236,7 @@ void ImplBorderWindow::SetDisplayActive( bool bActive )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize )
 {
@@ -2244,7 +2244,7 @@ void ImplBorderWindow::SetTitleType( sal_uInt16 nTitleType, const Size& rSize )
     UpdateView( false, rSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle )
 {
@@ -2255,7 +2255,7 @@ void ImplBorderWindow::SetBorderStyle( sal_uInt16 nStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetPin( bool bPin )
 {
@@ -2263,7 +2263,7 @@ void ImplBorderWindow::SetPin( bool bPin )
     InvalidateBorder();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize )
 {
@@ -2272,7 +2272,7 @@ void ImplBorderWindow::SetRollUp( bool bRollUp, const Size& rSize )
     UpdateView( false, rSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetCloser()
 {
@@ -2282,7 +2282,7 @@ void ImplBorderWindow::SetCloser()
     InvalidateBorder();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetDockButton( bool bDockButton )
 {
@@ -2292,7 +2292,7 @@ void ImplBorderWindow::SetDockButton( bool bDockButton )
     InvalidateBorder();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetHideButton( bool bHideButton )
 {
@@ -2302,7 +2302,7 @@ void ImplBorderWindow::SetHideButton( bool bHideButton )
     InvalidateBorder();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetMenuButton( bool bMenuButton )
 {
@@ -2312,14 +2312,14 @@ void ImplBorderWindow::SetMenuButton( bool bMenuButton )
     InvalidateBorder();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::UpdateMenuHeight()
 {
     Resize();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetMenuBarWindow( Window* pWindow )
 {
@@ -2329,7 +2329,7 @@ void ImplBorderWindow::SetMenuBarWindow( Window* pWindow )
         pWindow->Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::SetMenuBarMode( bool bHide )
 {
@@ -2337,7 +2337,7 @@ void ImplBorderWindow::SetMenuBarMode( bool bHide )
     UpdateMenuHeight();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
                                   sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const
@@ -2347,7 +2347,7 @@ void ImplBorderWindow::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
         rTopBorder += mpMenuBarWindow->GetSizePixel().Height();
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplBorderWindow::CalcTitleWidth() const
 {
diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx
index 9f1b4677403a..9c7f010931c7 100644
--- a/vcl/source/window/cmdevt.cxx
+++ b/vcl/source/window/cmdevt.cxx
@@ -39,7 +39,7 @@ CommandExtTextInputData::CommandExtTextInputData( const OUString& rText,
     mbOnlyCursor    = bOnlyCursor;
 }
 
-// -----------------------------------------------------------------------
+
 
 CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData& rData ) :
     maText( rData.maText )
@@ -56,7 +56,7 @@ CommandExtTextInputData::CommandExtTextInputData( const CommandExtTextInputData&
     mbOnlyCursor    = rData.mbOnlyCursor;
 }
 
-// -----------------------------------------------------------------------
+
 
 CommandExtTextInputData::~CommandExtTextInputData()
 {
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 64c3ee9b2e8f..bfd3cb5ea2c0 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -120,7 +120,7 @@ static void ImplCursorInvert( ImplCursorData* pData )
     pWindow->EnableMapMode( bMapMode );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::ImplDraw()
 {
@@ -150,7 +150,7 @@ void Cursor::ImplDraw()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::ImplRestore()
 {
@@ -260,7 +260,7 @@ void Cursor::ImplNew()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Cursor, ImplTimerHdl)
 {
@@ -285,7 +285,7 @@ Cursor::Cursor()
     mbVisible       = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 Cursor::Cursor( const Cursor& rCursor ) :
     maSize( rCursor.maSize ),
@@ -300,7 +300,7 @@ Cursor::Cursor( const Cursor& rCursor ) :
     mbVisible       = rCursor.mbVisible;
 }
 
-// -----------------------------------------------------------------------
+
 
 Cursor::~Cursor()
 {
@@ -313,7 +313,7 @@ Cursor::~Cursor()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetStyle( sal_uInt16 nStyle )
 {
@@ -324,7 +324,7 @@ void Cursor::SetStyle( sal_uInt16 nStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::Show()
 {
@@ -335,7 +335,7 @@ void Cursor::Show()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::Hide()
 {
@@ -346,7 +346,7 @@ void Cursor::Hide()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetWindow( Window* pWindow )
 {
@@ -357,7 +357,7 @@ void Cursor::SetWindow( Window* pWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetPos( const Point& rPoint )
 {
@@ -368,7 +368,7 @@ void Cursor::SetPos( const Point& rPoint )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetSize( const Size& rSize )
 {
@@ -379,7 +379,7 @@ void Cursor::SetSize( const Size& rSize )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetWidth( long nNewWidth )
 {
@@ -390,7 +390,7 @@ void Cursor::SetWidth( long nNewWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetOrientation( short nNewOrientation )
 {
@@ -401,7 +401,7 @@ void Cursor::SetOrientation( short nNewOrientation )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Cursor::SetDirection( unsigned char nNewDirection )
 {
@@ -412,7 +412,7 @@ void Cursor::SetDirection( unsigned char nNewDirection )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Cursor& Cursor::operator=( const Cursor& rCursor )
 {
@@ -427,7 +427,7 @@ Cursor& Cursor::operator=( const Cursor& rCursor )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Cursor::operator==( const Cursor& rCursor ) const
 {
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 169aeb2dea96..adcc3bd49292 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -830,7 +830,7 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect,
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void DecorationView::DrawSymbol( const Rectangle& rRect, SymbolType eType,
                                  const Color& rColor, sal_uInt16 nStyle )
@@ -1056,7 +1056,7 @@ Rectangle DecorationView::DrawButton( const Rectangle& rRect, sal_uInt16 nStyle
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical )
 {
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index e2a18ba7f977..334a155a5f80 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -108,7 +108,7 @@ static bool ImplIsMnemonicCtrl( Window* pWindow )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 // Called by native error dialog popup implementations
 void ImplHideSplash()
@@ -182,7 +182,7 @@ Window * firstLogicalChildOfParent(Window *pTopLevel)
     return pChild;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWindowAutoMnemonic( Window* pWindow )
 {
@@ -281,7 +281,7 @@ static PushButton* ImplGetDefaultButton( Dialog* pDialog )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 static PushButton* ImplGetOKButton( Dialog* pDialog )
 {
@@ -297,7 +297,7 @@ static PushButton* ImplGetOKButton( Dialog* pDialog )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 static PushButton* ImplGetCancelButton( Dialog* pDialog )
 {
@@ -314,7 +314,7 @@ static PushButton* ImplGetCancelButton( Dialog* pDialog )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplMouseAutoPos( Dialog* pDialog )
 {
@@ -371,7 +371,7 @@ void Dialog::ImplInitDialogData()
     maLayoutTimer.SetTimeoutHdl( LINK( this, Dialog, ImplHandleLayoutTimerHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -456,7 +456,7 @@ void Dialog::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::ImplInitSettings()
 {
@@ -474,7 +474,7 @@ void Dialog::ImplInitSettings()
         SetBackground( GetSettings().GetStyleSettings().GetDialogColor() );
 }
 
-// -----------------------------------------------------------------------
+
 
 Dialog::Dialog( WindowType nType )
     : SystemWindow( nType )
@@ -537,7 +537,7 @@ Dialog::Dialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescri
 }
 
 
-// -----------------------------------------------------------------------
+
 
 Dialog::Dialog( Window* pParent, WinBits nStyle )
     : SystemWindow( WINDOW_DIALOG )
@@ -577,7 +577,7 @@ void Dialog::set_content_area(VclBox* pContentArea)
     mpContentArea = pContentArea;
 }
 
-// -----------------------------------------------------------------------
+
 
 Dialog::~Dialog()
 {
@@ -586,7 +586,7 @@ Dialog::~Dialog()
     mpDialogImpl = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl)
 {
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(Dialog, ImplAsyncCloseHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Dialog::Notify( NotifyEvent& rNEvt )
 {
@@ -698,7 +698,7 @@ void Dialog::setOptimalLayoutSize()
     setPosSizeOnContainee(aSize, *pBox);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::StateChanged( StateChangedType nType )
 {
@@ -737,7 +737,7 @@ void Dialog::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -751,7 +751,7 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Dialog::Close()
 {
@@ -801,7 +801,7 @@ bool Dialog::Close()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Dialog::ImplStartExecuteModal()
 {
@@ -880,7 +880,7 @@ bool Dialog::ImplStartExecuteModal()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::ImplEndExecuteModal()
 {
@@ -888,7 +888,7 @@ void Dialog::ImplEndExecuteModal()
     pSVData->maAppData.mnModalMode--;
 }
 
-// -----------------------------------------------------------------------
+
 
 short Dialog::Execute()
 {
@@ -989,7 +989,7 @@ short Dialog::Execute()
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 // virtual
 void Dialog::StartExecuteModal( const Link& rEndDialogHdl )
@@ -1001,7 +1001,7 @@ void Dialog::StartExecuteModal( const Link& rEndDialogHdl )
     mpDialogImpl->mbStartedModal = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::EndDialog( long nResult )
 {
@@ -1059,14 +1059,14 @@ void Dialog::EndDialog( long nResult )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long Dialog::GetResult() const
 {
     return mpDialogImpl->mnResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::EndAllDialogs( Window* pParent )
 {
@@ -1085,7 +1085,7 @@ void Dialog::EndAllDialogs( Window* pParent )
    }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::SetModalInputMode( bool bModal )
 {
@@ -1153,7 +1153,7 @@ void Dialog::SetModalInputMode( bool bModal )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs )
 {
@@ -1172,7 +1172,7 @@ void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs )
     SetModalInputMode( bModal );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Dialog::GrabFocusToFirstControl()
 {
@@ -1345,7 +1345,7 @@ VclBuilderContainer::~VclBuilderContainer()
     delete m_pUIBuilder;
 }
 
-// -----------------------------------------------------------------------
+
 
 ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) :
     Dialog( WINDOW_MODELESSDIALOG )
@@ -1371,7 +1371,7 @@ ModalDialog::ModalDialog( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 ModalDialog::ModalDialog( Window* pParent, const ResId& rResId ) :
     Dialog( WINDOW_MODALDIALOG )
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index 0fc9c9617f89..5874e24dc603 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -50,7 +50,7 @@ static bool ImplHasIndirectTabParent( Window* pWindow )
           && ( pNonLayoutParent->ImplGetWindow()->GetStyle() & WB_CHILDDLGCTRL ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplGetTopParentOfTabHierarchy( Window* pParent )
 {
@@ -73,7 +73,7 @@ static Window* ImplGetTopParentOfTabHierarchy( Window* pParent )
     return pResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex )
 {
@@ -149,7 +149,7 @@ static Window* ImplGetSubChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16&
     return pFoundWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable )
 {
@@ -183,7 +183,7 @@ static Window* ImplGetChildWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nI
     return pWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIndex, bool bTestEnable )
 {
@@ -196,7 +196,7 @@ static Window* ImplGetNextWindow( Window* pParent, sal_uInt16 n, sal_uInt16& nIn
     return pWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType,
                                   sal_uInt16 nFormStart, sal_uInt16 nFormEnd,
@@ -302,7 +302,7 @@ Window* Window::ImplGetDlgWindow( sal_uInt16 nIndex, sal_uInt16 nType,
     return pWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt16& rIndex,
                                       sal_uInt16& rFormStart, sal_uInt16& rFormEnd )
@@ -400,7 +400,7 @@ static Window* ImplFindDlgCtrlWindow( Window* pParent, Window* pWindow, sal_uInt
     return pSWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Unicode cCharCode,
                                     sal_uInt16 nFormStart, sal_uInt16 nFormEnd, bool bCheckEnable = true )
@@ -492,7 +492,7 @@ static Window* ImplFindAccelWindow( Window* pParent, sal_uInt16& rIndex, sal_Uni
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplControlFocus( sal_uInt16 nFlags )
 {
@@ -535,7 +535,7 @@ void Window::ImplControlFocus( sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 namespace
 {
@@ -969,7 +969,7 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 // checks if this window has dialog control
 bool Window::ImplHasDlgCtrl()
@@ -1020,7 +1020,7 @@ if ( !pDlgCtrlParent || (GetStyle() & WB_NODIALOGCONTROL) || ((pDlgCtrlParent->G
         pWindow->ImplControlFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow,
                                         bool bGetFocus )
@@ -1079,7 +1079,7 @@ static void ImplDlgCtrlUpdateDefButton( Window* pParent, Window* pFocusWindow,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus )
 {
@@ -1092,7 +1092,7 @@ void Window::ImplDlgCtrlFocusChanged( Window* pWindow, bool bGetFocus )
     ImplDlgCtrlUpdateDefButton( this, pWindow, bGetFocus );
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::ImplFindDlgCtrlWindow( Window* pWindow )
 {
@@ -1105,21 +1105,21 @@ Window* Window::ImplFindDlgCtrlWindow( Window* pWindow )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::GetParentLabelFor( const Window* ) const
 {
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::GetParentLabeledBy( const Window* ) const
 {
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_Unicode getAccel( const OUString& rStr )
 {
@@ -1222,7 +1222,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationLabelFor() const
     return pWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplGetLabeledBy( Window* pFrameWindow, WindowType nMyType, Window* pLabeled )
 {
@@ -1364,7 +1364,7 @@ Window* Window::getLegacyNonLayoutAccessibleRelationMemberOf() const
     return pWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 KeyEvent Window::GetActivationKey() const
 {
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 13bca4abecd9..22d91bdf9ab0 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -96,7 +96,7 @@ DockingAreaWindow::~DockingAreaWindow()
     delete mpImplData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -109,7 +109,7 @@ void DockingAreaWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplInvalidateMenubar( DockingAreaWindow* pThis )
 {
@@ -138,7 +138,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
         ImplInvalidateMenubar( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool DockingAreaWindow::IsHorizontal() const
 {
@@ -160,7 +160,7 @@ WindowAlign DockingAreaWindow::GetAlign() const
     return mpImplData->meAlign;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingAreaWindow::Paint( const Rectangle& )
 {
@@ -263,6 +263,6 @@ void DockingAreaWindow::Resize()
         Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index cb5fd3334170..0e80b6dbb827 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -110,7 +110,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
     maEndDockTimer.SetTimeout( 50 );
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplDockFloatWin2::~ImplDockFloatWin2()
 {
@@ -118,7 +118,7 @@ ImplDockFloatWin2::~ImplDockFloatWin2()
         Application::RemoveUserEvent( mnLastUserEvent );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
 {
@@ -240,7 +240,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl)
     mbInMove = false;
     return 0;
 }
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin2::Move()
 {
@@ -264,7 +264,7 @@ void ImplDockFloatWin2::Move()
         mnLastUserEvent = Application::PostUserEvent( LINK( this, ImplDockFloatWin2, DockingHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin2::Resize()
 {
@@ -284,7 +284,7 @@ void ImplDockFloatWin2::setPosSizePixel( long nX, long nY,
     FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton )
@@ -293,7 +293,7 @@ void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton )
     mpDockWin->TitleButtonClick( nButton );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin2::Pin()
 {
@@ -301,7 +301,7 @@ void ImplDockFloatWin2::Pin()
     mpDockWin->Pin();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin2::Roll()
 {
@@ -309,7 +309,7 @@ void ImplDockFloatWin2::Roll()
     mpDockWin->Roll();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin2::PopupModeEnd()
 {
@@ -317,7 +317,7 @@ void ImplDockFloatWin2::PopupModeEnd()
     mpDockWin->PopupModeEnd();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin2::Resizing( Size& rSize )
 {
@@ -325,7 +325,7 @@ void ImplDockFloatWin2::Resizing( Size& rSize )
     mpDockWin->Resizing( rSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplDockFloatWin2::Close()
 {
@@ -437,7 +437,7 @@ bool DockingManager::IsInPopupMode( const Window *pWindow )
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingManager::EndPopupMode( const Window *pWin )
 {
@@ -446,7 +446,7 @@ void DockingManager::EndPopupMode( const Window *pWin )
         pWrapper->GetFloatingWindow()->EndPopupMode();
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingManager::AddWindow( const Window *pWindow )
 {
@@ -866,7 +866,7 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplDockingWindowWrapper::ImplStartDocking( const Point& rPos )
 {
@@ -943,7 +943,7 @@ void ImplDockingWindowWrapper::ImplInitData()
     maMaxOutSize        = Size( SHRT_MAX, SHRT_MAX );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
 {
@@ -1035,7 +1035,7 @@ void ImplDockingWindowWrapper::Tracking( const TrackingEvent& rTEvt )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRect )
 {
@@ -1045,7 +1045,7 @@ void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRe
     mbDocking = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect )
 {
@@ -1056,7 +1056,7 @@ bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect )
     return data.mbFloating;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMode )
 {
@@ -1097,7 +1097,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
     mbStartDockingEnabled = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
 {
@@ -1106,7 +1106,7 @@ bool ImplDockingWindowWrapper::PrepareToggleFloatingMode()
     return bFloating;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplDockingWindowWrapper::Close()
 {
@@ -1114,7 +1114,7 @@ bool ImplDockingWindowWrapper::Close()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::ToggleFloatingMode()
 {
@@ -1131,7 +1131,7 @@ void ImplDockingWindowWrapper::ToggleFloatingMode()
     mbStartDockingEnabled = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType )
 {
@@ -1149,28 +1149,28 @@ void ImplDockingWindowWrapper::TitleButtonClick( sal_uInt16 nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::Pin()
 {
     // TODO: send event
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::Roll()
 {
     // TODO: send event
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::PopupModeEnd()
 {
     // TODO: send event
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::Resizing( Size& rSize )
 {
@@ -1180,7 +1180,7 @@ void ImplDockingWindowWrapper::Resizing( Size& rSize )
         pDockingWindow->Resizing( rSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisible )
 {
@@ -1195,7 +1195,7 @@ void ImplDockingWindowWrapper::ShowTitleButton( sal_uInt16 nButton, bool bVisibl
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, sal_uLong nFlags )
 {
@@ -1299,7 +1299,7 @@ bool ImplDockingWindowWrapper::IsInPopupMode() const
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
 {
@@ -1414,21 +1414,21 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::SetFloatStyle( WinBits nStyle )
 {
     mnFloatBits = nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits ImplDockingWindowWrapper::GetFloatStyle() const
 {
     return mnFloatBits;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
@@ -1440,7 +1440,7 @@ void ImplDockingWindowWrapper::setPosSizePixel( long nX, long nY,
         GetWindow()->setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point ImplDockingWindowWrapper::GetPosPixel() const
 {
@@ -1450,7 +1450,7 @@ Point ImplDockingWindowWrapper::GetPosPixel() const
         return mpDockingWindow->GetPosPixel();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ImplDockingWindowWrapper::GetSizePixel() const
 {
@@ -1460,9 +1460,9 @@ Size ImplDockingWindowWrapper::GetSizePixel() const
         return mpDockingWindow->GetSizePixel();
 }
 
-// -----------------------------------------------------------------------
+
 // old inlines from DockingWindow
-// -----------------------------------------------------------------------
+
 
 void ImplDockingWindowWrapper::SetMinOutputSizePixel( const Size& rSize )
 {
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 3346751b751c..f733b53b4ed6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -41,7 +41,7 @@
 
 // =======================================================================
 
-// -----------------------------------------------------------------------
+
 
 class DockingWindow::ImplData
 {
@@ -63,7 +63,7 @@ DockingWindow::ImplData::~ImplData()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 class ImplDockFloatWin : public FloatingWindow
 {
@@ -121,7 +121,7 @@ ImplDockFloatWin::ImplDockFloatWin( Window* pParent, WinBits nWinBits,
     maDockTimer.SetTimeout( 50 );
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplDockFloatWin::~ImplDockFloatWin()
 {
@@ -129,7 +129,7 @@ ImplDockFloatWin::~ImplDockFloatWin()
         Application::RemoveUserEvent( mnLastUserEvent );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
 {
@@ -196,7 +196,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl)
     mbInMove = false;
     return 0;
 }
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::Move()
 {
@@ -220,7 +220,7 @@ void ImplDockFloatWin::Move()
         mnLastUserEvent = Application::PostUserEvent( LINK( this, ImplDockFloatWin, DockingHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::Resize()
 {
@@ -229,7 +229,7 @@ void ImplDockFloatWin::Resize()
     mpDockWin->ImplPosSizeWindow( 0, 0, aSize.Width(), aSize.Height(), WINDOW_POSSIZE_POSSIZE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton )
 {
@@ -237,7 +237,7 @@ void ImplDockFloatWin::TitleButtonClick( sal_uInt16 nButton )
     mpDockWin->TitleButtonClick( nButton );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::Pin()
 {
@@ -245,7 +245,7 @@ void ImplDockFloatWin::Pin()
     mpDockWin->Pin();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::Roll()
 {
@@ -253,7 +253,7 @@ void ImplDockFloatWin::Roll()
     mpDockWin->Roll();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::PopupModeEnd()
 {
@@ -261,7 +261,7 @@ void ImplDockFloatWin::PopupModeEnd()
     mpDockWin->PopupModeEnd();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDockFloatWin::Resizing( Size& rSize )
 {
@@ -269,7 +269,7 @@ void ImplDockFloatWin::Resizing( Size& rSize )
     mpDockWin->Resizing( rSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplDockFloatWin::Close()
 {
@@ -349,7 +349,7 @@ void DockingWindow::ImplInitDockingWindowData()
     mbHideBtn               = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -368,7 +368,7 @@ void DockingWindow::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::ImplInitSettings()
 {
@@ -389,7 +389,7 @@ void DockingWindow::ImplInitSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::ImplLoadRes( const ResId& rResId )
 {
@@ -429,7 +429,7 @@ void DockingWindow::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 DockingWindow::DockingWindow( WindowType nType ) :
     Window( nType )
@@ -437,7 +437,7 @@ DockingWindow::DockingWindow( WindowType nType ) :
     ImplInitDockingWindowData();
 }
 
-// -----------------------------------------------------------------------
+
 
 DockingWindow::DockingWindow( Window* pParent, WinBits nStyle ) :
     Window( WINDOW_DOCKINGWINDOW )
@@ -446,7 +446,7 @@ DockingWindow::DockingWindow( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 DockingWindow::DockingWindow( Window* pParent, const ResId& rResId ) :
     Window( WINDOW_DOCKINGWINDOW )
@@ -461,7 +461,7 @@ DockingWindow::DockingWindow( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 DockingWindow::~DockingWindow()
 {
@@ -473,7 +473,7 @@ DockingWindow::~DockingWindow()
     delete mpImplData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::Tracking( const TrackingEvent& rTEvt )
 {
@@ -595,7 +595,7 @@ void DockingWindow::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool DockingWindow::Notify( NotifyEvent& rNEvt )
 {
@@ -649,21 +649,21 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt )
     return Window::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::StartDocking()
 {
     mbDocking = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool DockingWindow::Docking( const Point&, Rectangle& )
 {
     return IsFloatingMode();
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
 {
@@ -691,14 +691,14 @@ void DockingWindow::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
     mbDocking = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool DockingWindow::PrepareToggleFloatingMode()
 {
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool DockingWindow::Close()
 {
@@ -716,43 +716,43 @@ bool DockingWindow::Close()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::ToggleFloatingMode()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::TitleButtonClick( sal_uInt16 )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::Pin()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::Roll()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::PopupModeEnd()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::Resizing( Size& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::StateChanged( StateChangedType nType )
 {
@@ -774,7 +774,7 @@ void DockingWindow::StateChanged( StateChangedType nType )
     Window::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -788,7 +788,7 @@ void DockingWindow::DataChanged( const DataChangedEvent& rDCEvt )
         Window::DataChanged( rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::SetFloatingMode( bool bFloatMode )
 {
@@ -896,7 +896,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::SetFloatStyle( WinBits nStyle )
 {
@@ -910,7 +910,7 @@ void DockingWindow::SetFloatStyle( WinBits nStyle )
     mnFloatBits = nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits DockingWindow::GetFloatStyle() const
 {
@@ -923,7 +923,7 @@ WinBits DockingWindow::GetFloatStyle() const
     return mnFloatBits;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::setPosSizePixel( long nX, long nY,
                                      long nWidth, long nHeight,
@@ -945,7 +945,7 @@ void DockingWindow::setPosSizePixel( long nX, long nY,
         Window::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point DockingWindow::GetPosPixel() const
 {
@@ -964,7 +964,7 @@ Point DockingWindow::GetPosPixel() const
         return Window::GetPosPixel();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size DockingWindow::GetSizePixel() const
 {
@@ -983,7 +983,7 @@ Size DockingWindow::GetSizePixel() const
         return Window::GetSizePixel();
 }
 
-// -----------------------------------------------------------------------
+
 
 void DockingWindow::SetOutputSizePixel( const Size& rNewSize )
 {
@@ -1003,7 +1003,7 @@ void DockingWindow::SetOutputSizePixel( const Size& rNewSize )
         Window::SetOutputSizePixel( rNewSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size DockingWindow::GetOutputSizePixel() const
 {
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 8aa30f8bf7fc..285b161b2a70 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -138,7 +138,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::ImplInitSettings()
 {
@@ -162,7 +162,7 @@ FloatingWindow::FloatingWindow( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) :
     SystemWindow( WINDOW_FLOATINGWINDOW )
@@ -176,7 +176,7 @@ FloatingWindow::FloatingWindow( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::ImplLoadRes( const ResId& rResId )
 {
@@ -208,7 +208,7 @@ void FloatingWindow::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 FloatingWindow::~FloatingWindow()
 {
@@ -226,14 +226,14 @@ FloatingWindow::~FloatingWindow()
     delete mpImplData;
 }
 
-// -----------------------------------------------------------------------
+
 
 Point FloatingWindow::CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex )
 {
     return ImplCalcPos( pWindow, rRect, nFlags, rArrangeIndex );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point FloatingWindow::ImplCalcPos( Window* pWindow,
                                    const Rectangle& rRect, sal_uLong nFlags,
@@ -447,7 +447,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
     return pW->OutputToScreenPixel( aPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest )
 {
@@ -505,7 +505,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
 {
@@ -524,7 +524,7 @@ FloatingWindow* FloatingWindow::ImplFindLastLevelFloat()
     return pLastFoundWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow )
 {
@@ -542,7 +542,7 @@ bool FloatingWindow::ImplIsFloatPopupModeWindow( const Window* pWindow )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
 {
@@ -553,7 +553,7 @@ IMPL_LINK_NOARG(FloatingWindow, ImplEndPopupModeHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool FloatingWindow::Notify( NotifyEvent& rNEvt )
 {
@@ -578,7 +578,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::StateChanged( StateChangedType nType )
 {
@@ -591,7 +591,7 @@ void FloatingWindow::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -605,7 +605,7 @@ void FloatingWindow::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::ImplCallPopupModeEnd()
 {
@@ -617,14 +617,14 @@ void FloatingWindow::ImplCallPopupModeEnd()
         Application::PostUserEvent( mnPostId, LINK( this, FloatingWindow, ImplEndPopupModeHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::PopupModeEnd()
 {
     maPopupModeEndHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::SetTitleType( sal_uInt16 nTitle )
 {
@@ -646,7 +646,7 @@ void FloatingWindow::SetTitleType( sal_uInt16 nTitle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
 {
@@ -729,7 +729,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
     Show( true, SHOW_NOACTIVATE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags )
 {
@@ -776,7 +776,7 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, sal_uLong nFlags )
     StartPopupMode( aRect, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
 {
@@ -852,14 +852,14 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
     mbInCleanUp = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::EndPopupMode( sal_uInt16 nFlags )
 {
     ImplEndPopupMode( nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void FloatingWindow::AddPopupModeWindow( Window* pWindow )
 {
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 36dc800c9fcd..10baa88203f0 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -36,7 +36,7 @@ void IntroWindow::ImplInitIntroWindowData()
     pSVData->mpIntroWindow = this;
 }
 
-// -----------------------------------------------------------------------
+
 
 IntroWindow::IntroWindow( ) :
     WorkWindow( WINDOW_INTROWINDOW )
@@ -45,7 +45,7 @@ IntroWindow::IntroWindow( ) :
     WorkWindow::ImplInit( 0, WB_INTROWIN, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 IntroWindow::~IntroWindow()
 {
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index df81d987cc73..8e1f439a6f0e 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -52,7 +52,7 @@ static const sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] =
     0, 0, 0, 0                                                     // KEYFUNC_FRONT
 };
 
-// -----------------------------------------------------------------------
+
 
 void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 )
 {
@@ -73,7 +73,7 @@ KeyCode::KeyCode( KeyFuncType eFunction )
     eFunc = eFunction;
 }
 
-// -----------------------------------------------------------------------
+
 
 KeyCode::KeyCode( const ResId& rResId )
 {
@@ -99,7 +99,7 @@ KeyCode::KeyCode( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString KeyCode::GetName( Window* pWindow ) const
 {
@@ -108,7 +108,7 @@ OUString KeyCode::GetName( Window* pWindow ) const
     return pWindow ? pWindow->ImplGetFrame()->GetKeyName( GetFullCode() ) : "";
 }
 
-// -----------------------------------------------------------------------
+
 
 KeyFuncType KeyCode::GetFunction() const
 {
diff --git a/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index b90b1a20b766..bc84e210c550 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.cxx
@@ -65,7 +65,7 @@ KeyEvent KeyEvent::LogicalTextDirectionality (TextDirectionality eMode) const
 }
 
 
-// -------------------------------------------------------
+
 
 const Point&   HelpEvent::GetMousePosPixel() const
 {
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index e4b1998d445f..bdd52f3d016e 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -478,9 +478,9 @@ size_t MenuItemList::GetItemCount( KeyCode aKeyCode ) const
 }
 
 
-// ----------------------
+
 // - MenuFloatingWindow -
-// ----------------------
+
 
 class MenuFloatingWindow : public FloatingWindow
 {
@@ -2358,7 +2358,7 @@ bool Menu::ImplGetNativeSubmenuArrowSize( Window* pWin, Size& rArrowSize, long&
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Menu::ImplAddDel( ImplMenuDelData& rDel )
 {
@@ -2371,7 +2371,7 @@ void Menu::ImplAddDel( ImplMenuDelData& rDel )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
 {
@@ -2392,7 +2392,7 @@ void Menu::ImplRemoveDel( ImplMenuDelData& rDel )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Menu::ImplCalcSize( const Window* pWin )
 {
@@ -3273,9 +3273,9 @@ void Menu::HighlightItem( sal_uInt16 nItemPos )
 }
 
 
-// -----------
+
 // - MenuBar -
-// -----------
+
 
 MenuBar::MenuBar() : Menu( true )
 {
@@ -3377,7 +3377,7 @@ bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, bool bFromMenu )
     return bDone;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MenuBar::SelectEntry( sal_uInt16 nId )
 {
@@ -3400,7 +3400,7 @@ void MenuBar::SelectEntry( sal_uInt16 nId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 // handler for native menu selection and command events
 
@@ -3501,7 +3501,7 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const
     return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId );
 }
 
-// -----------------------------------------------------------------------
+
 
 // sal_Bool PopupMenu::bAnyPopupInExecute = sal_False;
 
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 2fe22fbee90c..800ee0983849 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.cxx
@@ -37,7 +37,7 @@ MnemonicGenerator::MnemonicGenerator()
     memset( maMnemonics, 1, sizeof( maMnemonics ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
 {
@@ -62,7 +62,7 @@ sal_uInt16 MnemonicGenerator::ImplGetMnemonicIndex( sal_Unicode c )
     return MNEMONIC_INDEX_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
 {
@@ -78,7 +78,7 @@ sal_Unicode MnemonicGenerator::ImplFindMnemonic( const OUString& rKey )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MnemonicGenerator::RegisterMnemonic( const OUString& rKey )
 {
@@ -121,7 +121,7 @@ void MnemonicGenerator::RegisterMnemonic( const OUString& rKey )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
 {
@@ -345,7 +345,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey )
     return rKey;
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass()
 {
@@ -354,7 +354,7 @@ uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass
     return mxCharClass;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString MnemonicGenerator::EraseAllMnemonicChars( const OUString& rStr )
 {
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 3a700f10e711..780283efc064 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -65,7 +65,7 @@ void MessBox::ImplInitMessBoxData()
     mbCheck             = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MessBox::ImplInitButtons()
 {
@@ -144,7 +144,7 @@ void MessBox::ImplInitButtons()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 MessBox::MessBox( Window* pParent, WinBits nStyle,
                   const OUString& rTitle, const OUString& rMessage ) :
@@ -159,7 +159,7 @@ MessBox::MessBox( Window* pParent, WinBits nStyle,
         SetText( rTitle );
 }
 
-// -----------------------------------------------------------------------
+
 
 MessBox::MessBox( Window* pParent, const ResId& rResId ) :
     ButtonDialog( WINDOW_MESSBOX )
@@ -182,7 +182,7 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) :
     ImplInitButtons();
 }
 
-// -----------------------------------------------------------------------
+
 
 void MessBox::ImplLoadRes( const ResId& )
 {
@@ -191,7 +191,7 @@ void MessBox::ImplLoadRes( const ResId& )
     SetHelpText( ReadStringRes() );
 }
 
-// -----------------------------------------------------------------------
+
 
 MessBox::~MessBox()
 {
@@ -200,7 +200,7 @@ MessBox::~MessBox()
     delete mpCheckBox;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MessBox::ImplPosControls()
 {
@@ -398,7 +398,7 @@ void MessBox::ImplPosControls()
     SetPageSizePixel( aPageSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void MessBox::StateChanged( StateChangedType nType )
 {
@@ -409,14 +409,14 @@ void MessBox::StateChanged( StateChangedType nType )
     ButtonDialog::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool MessBox::GetCheckBoxState() const
 {
     return mpCheckBox ? mpCheckBox->IsChecked() : mbCheck;
 }
 
-// -----------------------------------------------------------------------
+
 
 void MessBox::SetCheckBoxState( bool bCheck )
 {
@@ -424,7 +424,7 @@ void MessBox::SetCheckBoxState( bool bCheck )
     mbCheck = bCheck;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size MessBox::GetOptimalSize() const
 {
@@ -443,7 +443,7 @@ void InfoBox::ImplInitInfoBoxData()
     SetImage( InfoBox::GetStandardImage() );
 }
 
-// -----------------------------------------------------------------------
+
 
 InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) :
     MessBox( pParent, WB_OK | WB_DEF_OK, OUString(), rMessage )
@@ -451,7 +451,7 @@ InfoBox::InfoBox( Window* pParent, const OUString& rMessage ) :
     ImplInitInfoBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 InfoBox::InfoBox( Window* pParent, const ResId & rResId ) :
     MessBox( pParent, rResId.SetRT( RSC_INFOBOX ) )
@@ -459,7 +459,7 @@ InfoBox::InfoBox( Window* pParent, const ResId & rResId ) :
     ImplInitInfoBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) :
     MessBox( pParent, nStyle, OUString(), rMessage )
@@ -467,7 +467,7 @@ InfoBox::InfoBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) :
     ImplInitInfoBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 Image InfoBox::GetStandardImage()
 {
@@ -486,7 +486,7 @@ void WarningBox::ImplInitWarningBoxData()
     SetImage( WarningBox::GetStandardImage() );
 }
 
-// -----------------------------------------------------------------------
+
 
 WarningBox::WarningBox( Window* pParent, WinBits nStyle,
                         const OUString& rMessage ) :
@@ -495,7 +495,7 @@ WarningBox::WarningBox( Window* pParent, WinBits nStyle,
     ImplInitWarningBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 WarningBox::WarningBox( Window* pParent, const ResId& rResId ) :
     MessBox( pParent, rResId.SetRT( RSC_WARNINGBOX ) )
@@ -503,7 +503,7 @@ WarningBox::WarningBox( Window* pParent, const ResId& rResId ) :
     ImplInitWarningBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 void WarningBox::SetDefaultCheckBoxText()
 {
@@ -512,7 +512,7 @@ void WarningBox::SetDefaultCheckBoxText()
         maCheckBoxText = ResId(SV_STDTEXT_DONTWARNAGAIN, *pResMgr).toString();
 }
 
-// -----------------------------------------------------------------------
+
 
 Image WarningBox::GetStandardImage()
 {
@@ -531,7 +531,7 @@ void ErrorBox::ImplInitErrorBoxData()
     SetImage( ErrorBox::GetStandardImage() );
 }
 
-// -----------------------------------------------------------------------
+
 
 ErrorBox::ErrorBox( Window* pParent, WinBits nStyle,
                     const OUString& rMessage ) :
@@ -540,7 +540,7 @@ ErrorBox::ErrorBox( Window* pParent, WinBits nStyle,
     ImplInitErrorBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) :
     MessBox( pParent, rResId.SetRT( RSC_ERRORBOX ) )
@@ -548,7 +548,7 @@ ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) :
     ImplInitErrorBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 Image ErrorBox::GetStandardImage()
 {
@@ -576,7 +576,7 @@ void QueryBox::ImplInitQueryBoxData()
     SetImage( QueryBox::GetStandardImage() );
 }
 
-// -----------------------------------------------------------------------
+
 
 QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage ) :
     MessBox( pParent, nStyle, OUString(), rMessage )
@@ -584,7 +584,7 @@ QueryBox::QueryBox( Window* pParent, WinBits nStyle, const OUString& rMessage )
     ImplInitQueryBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 QueryBox::QueryBox( Window* pParent, const ResId& rResId ) :
     MessBox( pParent, rResId.SetRT( RSC_QUERYBOX ) )
@@ -592,7 +592,7 @@ QueryBox::QueryBox( Window* pParent, const ResId& rResId ) :
     ImplInitQueryBoxData();
 }
 
-// -----------------------------------------------------------------------
+
 
 void QueryBox::SetDefaultCheckBoxText()
 {
@@ -601,7 +601,7 @@ void QueryBox::SetDefaultCheckBoxText()
         maCheckBoxText = ResId(SV_STDTEXT_DONTASKAGAIN, *pResMgr).toString();
 }
 
-// -----------------------------------------------------------------------
+
 
 Image QueryBox::GetStandardImage()
 {
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 371fceab8a6d..6de81b334fbc 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1839,11 +1839,11 @@ void PrintDialog::previewBackward()
     mpPageEdit->Down();
 }
 
-// -----------------------------------------------------------------------------
+
 //
 // PrintProgressDialog
 //
-// -----------------------------------------------------------------------------
+
 
 PrintProgressDialog::PrintProgressDialog(Window* i_pParent, int i_nMax)
     : ModelessDialog(i_pParent, "PrintProgressDialog",
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 5b2480e50747..7fff5407523c 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -64,7 +64,7 @@ void Splitter::ImplInitSplitterData()
     mnKeyboardStepSize = SPLITTER_DEFAULTSTEPSIZE;
 }
 
-// -----------------------------------------------------------------------
+
 
 // Should only be called from a ImplInit method for initialization or
 // after checking bNew is different from the current mbHorzSplit value.
@@ -90,7 +90,7 @@ void Splitter::ImplInitHorVer(bool bNew)
     SetPointer( Pointer( ePointerStyle ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::ImplInit( Window* pParent, WinBits nWinStyle )
 {
@@ -109,7 +109,7 @@ void Splitter::ImplInit( Window* pParent, WinBits nWinStyle )
     pTList->AddWindow( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::ImplSplitMousePos( Point& rPos )
 {
@@ -129,7 +129,7 @@ void Splitter::ImplSplitMousePos( Point& rPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::ImplDrawSplitter()
 {
@@ -149,7 +149,7 @@ void Splitter::ImplDrawSplitter()
     mpRefWin->InvertTracking( mpRefWin->PixelToLogic(aInvRect), SHOWTRACK_SPLIT );
 }
 
-// -----------------------------------------------------------------------
+
 
 Splitter::Splitter( Window* pParent, WinBits nStyle ) :
     Window( WINDOW_SPLITTER )
@@ -161,7 +161,7 @@ Splitter::Splitter( Window* pParent, WinBits nStyle ) :
     SetFillColor();
 }
 
-// -----------------------------------------------------------------------
+
 
 Splitter::Splitter( Window* pParent, const ResId& rResId ) :
     Window( WINDOW_SPLITTER )
@@ -179,7 +179,7 @@ Splitter::Splitter( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 Splitter::~Splitter()
 {
@@ -187,7 +187,7 @@ Splitter::~Splitter()
     pTList->RemoveWindow( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::SetHorizontal(bool bNew)
 {
@@ -197,14 +197,14 @@ void Splitter::SetHorizontal(bool bNew)
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::SetKeyboardStepSize( long nStepSize )
 {
     mnKeyboardStepSize = nStepSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 Splitter* Splitter::ImplFindSibling()
 {
@@ -224,7 +224,7 @@ Splitter* Splitter::ImplFindSibling()
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Splitter::ImplSplitterActive()
 {
@@ -249,7 +249,7 @@ bool Splitter::ImplSplitterActive()
     return bActive;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -280,7 +280,7 @@ void Splitter::MouseButtonDown( const MouseEvent& rMEvt )
         StartDrag();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::Tracking( const TrackingEvent& rTEvt )
 {
@@ -356,7 +356,7 @@ void Splitter::Tracking( const TrackingEvent& rTEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::ImplKbdTracking( KeyCode aKeyCode )
 {
@@ -473,21 +473,21 @@ void Splitter::ImplKbdTracking( KeyCode aKeyCode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::StartSplit()
 {
     maStartSplitHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::Split()
 {
     maSplitHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::EndSplit()
 {
@@ -495,13 +495,13 @@ void Splitter::EndSplit()
         maEndSplitHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::Splitting( Point& /* rSplitPos */ )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin )
 {
@@ -512,14 +512,14 @@ void Splitter::SetDragRectPixel( const Rectangle& rDragRect, Window* _pRefWin )
         mpRefWin = _pRefWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::SetSplitPosPixel( long nNewPos )
 {
     mnSplitPos = nNewPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::StartDrag()
 {
@@ -547,7 +547,7 @@ void Splitter::StartDrag()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::ImplStartKbdSplitting()
 {
@@ -577,7 +577,7 @@ void Splitter::ImplStartKbdSplitting()
         mnStartSplitPos = maDragPos.Y();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::ImplRestoreSplitter()
 {
@@ -608,7 +608,7 @@ void Splitter::ImplRestoreSplitter()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::GetFocus()
 {
@@ -618,7 +618,7 @@ void Splitter::GetFocus()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::LoseFocus()
 {
@@ -631,7 +631,7 @@ void Splitter::LoseFocus()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::KeyInput( const KeyEvent& rKEvt )
 {
@@ -732,14 +732,14 @@ void Splitter::KeyInput( const KeyEvent& rKEvt )
     mbInKeyEvent = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Splitter::Notify( NotifyEvent& rNEvt )
 {
     return Window::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -762,7 +762,7 @@ void Splitter::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Splitter::Paint( const Rectangle& rPaintRect )
 {
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 5cac8f0da7ff..834a8131ed15 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -42,7 +42,7 @@
 #define STATUSBAR_PRGS_COUNT    100
 #define STATUSBAR_PRGS_MIN      5
 
-// -----------------------------------------------------------------------
+
 
 class StatusBar::ImplData
 {
@@ -91,7 +91,7 @@ inline long ImplCalcProgessWidth( sal_uInt16 nMax, long nSize )
     return ((nMax*(nSize+(nSize/2)))-(nSize/2)+(STATUSBAR_PRGS_OFFSET*2));
 }
 
-// -----------------------------------------------------------------------
+
 
 static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize,
                                  sal_uInt16 nStyle )
@@ -112,7 +112,7 @@ static Point ImplGetItemTextPos( const Size& rRectSize, const Size& rTextSize,
     return Point( nX, nY );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool StatusBar::ImplIsItemUpdate()
 {
@@ -122,7 +122,7 @@ bool StatusBar::ImplIsItemUpdate()
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -155,7 +155,7 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
     SetOutputSizePixel( CalcWindowSizePixel() );
 }
 
-// -----------------------------------------------------------------------
+
 
 StatusBar::StatusBar( Window* pParent, WinBits nStyle ) :
     Window( WINDOW_STATUSBAR )
@@ -163,7 +163,7 @@ StatusBar::StatusBar( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 StatusBar::~StatusBar()
 {
@@ -178,7 +178,7 @@ StatusBar::~StatusBar()
     delete mpImplData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplInitSettings( bool bFont,
                                   bool bForeground, bool bBackground )
@@ -233,7 +233,7 @@ void StatusBar::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplFormat()
 {
@@ -309,7 +309,7 @@ void StatusBar::ImplFormat()
     mbFormat = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const
 {
@@ -330,7 +330,7 @@ Rectangle StatusBar::ImplGetItemRectPos( sal_uInt16 nPos ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const
 {
@@ -349,7 +349,7 @@ sal_uInt16 StatusBar::ImplGetFirstVisiblePos() const
     return ~0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth )
 {
@@ -386,7 +386,7 @@ void StatusBar::ImplDrawText( bool bOffScreen, long nOldTextWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, bool bDrawFrame )
 {
@@ -487,7 +487,7 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText,
         ImplCallEventListeners( VCLEVENT_STATUSBAR_DRAWITEM, (void*) sal_IntPtr(pItem->mnId) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void DrawProgress( Window* pWindow, const Point& rPos,
                    long nOffset, long nPrgsWidth, long nPrgsHeight,
@@ -605,7 +605,7 @@ void DrawProgress( Window* pWindow, const Point& rPos,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplDrawProgress( bool bPaint,
                                   sal_uInt16 nPercent1, sal_uInt16 nPercent2 )
@@ -634,7 +634,7 @@ void StatusBar::ImplDrawProgress( bool bPaint,
                   nPercent1*100, nPercent2*100, mnPercentCount, maPrgsFrameRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ImplCalcProgressRect()
 {
@@ -688,7 +688,7 @@ void StatusBar::ImplCalcProgressRect()
         maPrgsTxtPos.Y()    = mnTextY;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -727,7 +727,7 @@ void StatusBar::MouseButtonDown( const MouseEvent& rMEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::Paint( const Rectangle& )
 {
@@ -759,14 +759,14 @@ void StatusBar::Paint( const Rectangle& )
     DrawLine( Point( 0, 0 ), Point( mnDX-1, 0 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::Move()
 {
     Window::Move();
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::Resize()
 {
@@ -788,7 +788,7 @@ void StatusBar::Resize()
     Invalidate();
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -855,7 +855,7 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt )
     Window::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::StateChanged( StateChangedType nType )
 {
@@ -884,7 +884,7 @@ void StatusBar::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -917,7 +917,7 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::Click()
 {
@@ -925,7 +925,7 @@ void StatusBar::Click()
     maClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::DoubleClick()
 {
@@ -933,13 +933,13 @@ void StatusBar::DoubleClick()
     maDoubleClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
                             StatusBarItemBits nBits,
@@ -979,7 +979,7 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth,
     ImplCallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, (void*) sal_IntPtr(nItemId) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::RemoveItem( sal_uInt16 nItemId )
 {
@@ -997,7 +997,7 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::ShowItem( sal_uInt16 nItemId )
 {
@@ -1019,7 +1019,7 @@ void StatusBar::ShowItem( sal_uInt16 nItemId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::HideItem( sal_uInt16 nItemId )
 {
@@ -1041,7 +1041,7 @@ void StatusBar::HideItem( sal_uInt16 nItemId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool StatusBar::IsItemVisible( sal_uInt16 nItemId ) const
 {
@@ -1068,14 +1068,14 @@ void StatusBar::Clear()
     ImplCallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 StatusBar::GetItemCount() const
 {
     return (sal_uInt16)mpItemList->size();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const
 {
@@ -1084,7 +1084,7 @@ sal_uInt16 StatusBar::GetItemId( sal_uInt16 nPos ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const
 {
@@ -1097,7 +1097,7 @@ sal_uInt16 StatusBar::GetItemPos( sal_uInt16 nItemId ) const
     return STATUSBAR_ITEM_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const
 {
@@ -1117,7 +1117,7 @@ sal_uInt16 StatusBar::GetItemId( const Point& rPos ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const
 {
@@ -1142,7 +1142,7 @@ Rectangle StatusBar::GetItemRect( sal_uInt16 nItemId ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const
 {
@@ -1172,7 +1172,7 @@ Point StatusBar::GetItemTextPos( sal_uInt16 nItemId ) const
     return Point();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const
 {
@@ -1184,7 +1184,7 @@ sal_uLong StatusBar::GetItemWidth( sal_uInt16 nItemId ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const
 {
@@ -1196,7 +1196,7 @@ StatusBarItemBits StatusBar::GetItemBits( sal_uInt16 nItemId ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const
 {
@@ -1208,7 +1208,7 @@ long StatusBar::GetItemOffset( sal_uInt16 nItemId ) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1244,7 +1244,7 @@ void StatusBar::SetItemText( sal_uInt16 nItemId, const OUString& rText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const
 {
@@ -1255,7 +1255,7 @@ const OUString& StatusBar::GetItemText( sal_uInt16 nItemId ) const
     return (*mpItemList)[ nPos ]->maText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand )
 {
@@ -1270,7 +1270,7 @@ void StatusBar::SetItemCommand( sal_uInt16 nItemId, const OUString& rCommand )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId )
 {
@@ -1282,7 +1282,7 @@ const OUString StatusBar::GetItemCommand( sal_uInt16 nItemId )
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetItemData( sal_uInt16 nItemId, void* pNewData )
 {
@@ -1333,7 +1333,7 @@ void StatusBar::RedrawItem( sal_uInt16 nItemId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1343,7 +1343,7 @@ void StatusBar::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
         (*mpItemList)[ nPos ]->maHelpText = rText;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const
 {
@@ -1367,7 +1367,7 @@ const OUString& StatusBar::GetHelpText( sal_uInt16 nItemId ) const
     return pItem->maHelpText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1377,7 +1377,7 @@ void StatusBar::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
         (*mpItemList)[ nPos ]->maQuickHelpText = rText;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const
 {
@@ -1389,7 +1389,7 @@ const OUString& StatusBar::GetQuickHelpText( sal_uInt16 nItemId ) const
     return pItem->maQuickHelpText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
 {
@@ -1399,7 +1399,7 @@ void StatusBar::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
         (*mpItemList)[ nPos ]->maHelpId = rHelpId;
 }
 
-// -----------------------------------------------------------------------
+
 
 OString StatusBar::GetHelpId( sal_uInt16 nItemId ) const
 {
@@ -1444,7 +1444,7 @@ void StatusBar::StartProgressMode( const OUString& rText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
 {
@@ -1463,7 +1463,7 @@ void StatusBar::SetProgressValue( sal_uInt16 nNewPercent )
     mnPercent = nNewPercent;
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::EndProgressMode()
 {
@@ -1482,7 +1482,7 @@ void StatusBar::EndProgressMode()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetText( const OUString& rText )
 {
@@ -1517,7 +1517,7 @@ void StatusBar::SetText( const OUString& rText )
         Window::SetText( rText );
 }
 
-// -----------------------------------------------------------------------
+
 
 Size StatusBar::CalcWindowSizePixel() const
 {
@@ -1574,7 +1574,7 @@ Size StatusBar::CalcWindowSizePixel() const
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName )
 {
@@ -1592,7 +1592,7 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const
 {
@@ -1603,6 +1603,6 @@ const OUString& StatusBar::GetAccessibleName( sal_uInt16 nItemId ) const
     return (*mpItemList)[ nPos ]->maAccessibleName;
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 203ccc5e70c7..a871d2db2914 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -127,7 +127,7 @@ void SystemChildWindow::ImplInitSysChild( Window* pParent, WinBits nStyle, Syste
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) :
     Window( WINDOW_SYSTEMCHILDWINDOW )
@@ -135,7 +135,7 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle ) :
     ImplInitSysChild( pParent, nStyle, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, bool bShow ) :
     Window( WINDOW_SYSTEMCHILDWINDOW )
@@ -143,7 +143,7 @@ SystemChildWindow::SystemChildWindow( Window* pParent, WinBits nStyle, SystemWin
     ImplInitSysChild( pParent, nStyle, pData, bShow );
 }
 
-// -----------------------------------------------------------------------
+
 
 SystemChildWindow::~SystemChildWindow()
 {
@@ -155,7 +155,7 @@ SystemChildWindow::~SystemChildWindow()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const SystemEnvData* SystemChildWindow::GetSystemData() const
 {
@@ -165,7 +165,7 @@ const SystemEnvData* SystemChildWindow::GetSystemData() const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemChildWindow::EnableEraseBackground( bool bEnable )
 {
@@ -173,7 +173,7 @@ void SystemChildWindow::EnableEraseBackground( bool bEnable )
         mpWindowImpl->mpSysObj->EnableEraseBackground( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemChildWindow::ImplTestJavaException( void* pEnv )
 {
@@ -213,7 +213,7 @@ void SystemChildWindow::SetForwardKey( bool bEnable )
         mpWindowImpl->mpSysObj->SetForwardKey( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_IntPtr SystemChildWindow::GetParentWindowHandle( bool bUseJava )
 {
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 94ae46949227..fb87f72f0a76 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -87,7 +87,7 @@ SystemWindow::~SystemWindow()
     mpImplData = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemWindow::Notify( NotifyEvent& rNEvt )
 {
@@ -108,7 +108,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt )
     return Window::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemWindow::PreNotify( NotifyEvent& rNEvt )
 {
@@ -152,7 +152,7 @@ bool SystemWindow::PreNotify( NotifyEvent& rNEvt )
     return Window::PreNotify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 TaskPaneList* SystemWindow::GetTaskPaneList()
 {
@@ -174,7 +174,7 @@ TaskPaneList* SystemWindow::GetTaskPaneList()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemWindow::Close()
 {
@@ -203,31 +203,31 @@ bool SystemWindow::Close()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::TitleButtonClick( sal_uInt16 )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::Pin()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::Roll()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::Resizing( Size& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetRepresentedURL( const OUString& i_rURL )
 {
@@ -244,7 +244,7 @@ void SystemWindow::SetRepresentedURL( const OUString& i_rURL )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetIcon( sal_uInt16 nIcon )
 {
@@ -264,7 +264,7 @@ void SystemWindow::SetIcon( sal_uInt16 nIcon )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::EnableSaveBackground( bool bSave )
 {
@@ -282,7 +282,7 @@ void SystemWindow::EnableSaveBackground( bool bSave )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemWindow::IsSaveBackgroundEnabled() const
 {
@@ -295,7 +295,7 @@ bool SystemWindow::IsSaveBackgroundEnabled() const
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible )
 {
@@ -326,7 +326,7 @@ void SystemWindow::ShowTitleButton( sal_uInt16 nButton, bool bVisible )
         return;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const
 {
@@ -336,7 +336,7 @@ bool SystemWindow::IsTitleButtonVisible( sal_uInt16 nButton ) const
         return mbHideBtn;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetPin( bool bPin )
 {
@@ -348,7 +348,7 @@ void SystemWindow::SetPin( bool bPin )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::RollUp()
 {
@@ -368,7 +368,7 @@ void SystemWindow::RollUp()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::RollDown()
 {
@@ -382,7 +382,7 @@ void SystemWindow::RollDown()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetMinOutputSizePixel( const Size& rSize )
 {
@@ -397,7 +397,7 @@ void SystemWindow::SetMinOutputSizePixel( const Size& rSize )
         mpWindowImpl->mpFrame->SetMinClientSize( rSize.Width(), rSize.Height() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetMaxOutputSizePixel( const Size& rSize )
 {
@@ -422,7 +422,7 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const
 {
     return mpImplData->maMaxOutSize;
 }
-// -----------------------------------------------------------------------
+
 
 Size SystemWindow::GetResizeOutputSizePixel() const
 {
@@ -434,7 +434,7 @@ Size SystemWindow::GetResizeOutputSizePixel() const
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplWindowStateFromStr(WindowStateData& rData,
     const OString& rStr)
@@ -550,7 +550,7 @@ static void ImplWindowStateFromStr(WindowStateData& rData,
     rData.SetMask( nValidMask );
 }
 
-// -----------------------------------------------------------------------
+
 
 static OString ImplWindowStateToStr(const WindowStateData& rData)
 {
@@ -596,7 +596,7 @@ static OString ImplWindowStateToStr(const WindowStateData& rData)
     return rStrBuf.makeStringAndClear();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin )
 {
@@ -806,7 +806,7 @@ void SystemWindow::SetWindowStateData( const WindowStateData& rData )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
 {
@@ -893,7 +893,7 @@ void SystemWindow::GetWindowStateData( WindowStateData& rData ) const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetWindowState(const OString& rStr)
 {
@@ -905,7 +905,7 @@ void SystemWindow::SetWindowState(const OString& rStr)
     SetWindowStateData( aData );
 }
 
-// -----------------------------------------------------------------------
+
 
 OString SystemWindow::GetWindowState( sal_uLong nMask ) const
 {
@@ -916,7 +916,7 @@ OString SystemWindow::GetWindowState( sal_uLong nMask ) const
     return ImplWindowStateToStr(aData);
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetMenuBar( MenuBar* pMenuBar )
 {
@@ -980,7 +980,7 @@ void SystemWindow::SetMenuBar( MenuBar* pMenuBar )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SystemWindow::SetMenuBarMode( sal_uInt16 nMode )
 {
@@ -997,7 +997,7 @@ void SystemWindow::SetMenuBarMode( sal_uInt16 nMode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SystemWindow::ImplIsInTaskPaneList( Window* pWin )
 {
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 9bb2f242abc8..b2f8d718fda9 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -35,7 +35,7 @@ void TabDialog::ImplInitTabDialogData()
     mbPosControls   = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabDialog::ImplPosControls()
 {
@@ -212,7 +212,7 @@ void TabDialog::ImplPosControls()
     mbPosControls = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 TabDialog::TabDialog( Window* pParent, WinBits nStyle ) :
     Dialog( WINDOW_TABDIALOG )
@@ -221,7 +221,7 @@ TabDialog::TabDialog( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 TabDialog::TabDialog( Window* pParent, const ResId& rResId ) :
     Dialog( WINDOW_TABDIALOG )
@@ -237,14 +237,14 @@ TabDialog::TabDialog( Window* pParent, const OString& rID, const OUString& rUIXM
     ImplInitTabDialogData();
 }
 
-// -----------------------------------------------------------------------
+
 
 TabDialog::~TabDialog()
 {
     delete mpFixedLine;
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabDialog::StateChanged( StateChangedType nType )
 {
@@ -257,7 +257,7 @@ void TabDialog::StateChanged( StateChangedType nType )
     Dialog::StateChanged( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabDialog::AdjustLayout()
 {
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 8c64ba7e20e2..a8cbdb528404 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -49,7 +49,7 @@ void TabPage::ImplInit( Window* pParent, WinBits nStyle )
         EnableChildTransparentMode( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabPage::ImplInitSettings()
 {
@@ -74,7 +74,7 @@ void TabPage::ImplInitSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TabPage::TabPage( Window* pParent, WinBits nStyle ) :
     Window( WINDOW_TABPAGE )
@@ -82,7 +82,7 @@ TabPage::TabPage( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 TabPage::TabPage( Window* pParent, const ResId& rResId ) :
     Window( WINDOW_TABPAGE )
@@ -103,7 +103,7 @@ TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDesc
     m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID);
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabPage::StateChanged( StateChangedType nType )
 {
@@ -123,7 +123,7 @@ void TabPage::StateChanged( StateChangedType nType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabPage::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -137,7 +137,7 @@ void TabPage::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabPage::Paint( const Rectangle& )
 {
@@ -161,7 +161,7 @@ void TabPage::Paint( const Rectangle& )
     }
 }
 
-// -----------------------------------------------------------------------
+
 void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong )
 {
     Point aPos = pDev->LogicToPixel( rPos );
@@ -189,13 +189,13 @@ void TabPage::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sa
     pDev->Pop();
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabPage::ActivatePage()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void TabPage::DeactivatePage()
 {
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index b111106dac21..da13a444f259 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -75,7 +75,7 @@ struct LTRSortBackward : public ::std::binary_function< const Window*, const Win
     }
 };
 
-// --------------------------------------------------
+
 
 static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward )
 {
@@ -86,7 +86,7 @@ static void ImplTaskPaneListGrabFocus( Window *pWindow, bool bForward )
     pWindow->ImplGrabFocus( GETFOCUS_F6 | (bForward ? GETFOCUS_FORWARD : GETFOCUS_BACKWARD));
 }
 
-// --------------------------------------------------
+
 
 TaskPaneList::TaskPaneList()
 {
@@ -96,7 +96,7 @@ TaskPaneList::~TaskPaneList()
 {
 }
 
-// --------------------------------------------------
+
 
 void TaskPaneList::AddWindow( Window *pWindow )
 {
@@ -136,7 +136,7 @@ void TaskPaneList::AddWindow( Window *pWindow )
     }
 }
 
-// --------------------------------------------------
+
 
 void TaskPaneList::RemoveWindow( Window *pWindow )
 {
@@ -149,7 +149,7 @@ void TaskPaneList::RemoveWindow( Window *pWindow )
     }
 }
 
-// --------------------------------------------------
+
 
 bool TaskPaneList::IsInList( Window *pWindow )
 {
@@ -161,7 +161,7 @@ bool TaskPaneList::IsInList( Window *pWindow )
         return false;
 }
 
-// --------------------------------------------------
+
 
 bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent )
 {
@@ -249,7 +249,7 @@ bool TaskPaneList::HandleKeyEvent( KeyEvent aKeyEvent )
     return false;
 }
 
-// --------------------------------------------------
+
 
 // returns next splitter
 Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward )
@@ -288,7 +288,7 @@ Window* TaskPaneList::FindNextSplitter( Window *pWindow, bool bForward )
     return pWindow;
 }
 
-// --------------------------------------------------
+
 
 // returns first valid item (regardless of type) if pWindow==0, otherwise returns next valid float
 Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward )
@@ -332,6 +332,6 @@ Window* TaskPaneList::FindNextFloat( Window *pWindow, bool bForward )
     return pWindow;
 }
 
-// --------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index c89bb59c9298..175af19aa236 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -60,7 +60,7 @@
 #define SMALLBUTTON_OFF_NORMAL_X    3
 #define SMALLBUTTON_OFF_NORMAL_Y    3
 
-// -----------------------------------------------------------------------
+
 
 #define TB_TEXTOFFSET           2
 #define TB_IMAGETEXTOFFSET      3
@@ -91,9 +91,9 @@
 #define DOCK_LINEOFFSET         3
 
 
-// -----------------------------------------------------------------------
+
 static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow );
-// -----------------------------------------------------------------------
+
 
 typedef ::std::vector< ToolBox* > ImplTBList;
 
@@ -149,7 +149,7 @@ public:
     bool            IsResizeMode() { return mbResizeMode; }
 };
 
-// -----------------------------------------------------------------------
+
 
 static ImplTBDragMgr* ImplGetTBDragMgr()
 {
@@ -159,7 +159,7 @@ static ImplTBDragMgr* ImplGetTBDragMgr()
     return pSVData->maCtrlData.mpTBDragMgr;
 }
 
-// -----------------------------------------------------------------------
+
 
 int ToolBox::ImplGetDragWidth( ToolBox* pThis )
 {
@@ -198,7 +198,7 @@ ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
     return tmpButtonType;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
 {
@@ -217,7 +217,7 @@ void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop,
                               long& rRight, long& rBottom, const ToolBox *pThis )
@@ -267,7 +267,7 @@ void ToolBox::ImplCalcBorder( WindowAlign eAlign, long& rLeft, long& rTop,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplCheckUpdate( ToolBox *pThis )
 {
@@ -281,7 +281,7 @@ static void ImplCheckUpdate( ToolBox *pThis )
         pThis->Update();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplDrawGrip( ToolBox* pThis )
 {
@@ -663,7 +663,7 @@ void ToolBox::ImplDrawBorder( ToolBox* pWin )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplIsFixedControl( const ImplToolItem *pItem )
 {
@@ -673,7 +673,7 @@ static bool ImplIsFixedControl( const ImplToolItem *pItem )
              pItem->mpWindow->GetType() == WINDOW_GROUPBOX) );
 }
 
-// -----------------------------------------------------------------------
+
 
 const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis )
 {
@@ -688,7 +688,7 @@ const ImplToolItem *ToolBox::ImplGetFirstClippedItem( const ToolBox* pThis )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode )
 {
@@ -806,7 +806,7 @@ Size ToolBox::ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uIn
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplCalcFloatSizes( ToolBox* pThis )
 {
@@ -873,7 +873,7 @@ void ToolBox::ImplCalcFloatSizes( ToolBox* pThis )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines )
 {
@@ -900,7 +900,7 @@ Size ToolBox::ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines )
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplCalcMinMaxFloatSize( ToolBox* pThis, Size& rMinSize, Size& rMaxSize )
 {
@@ -942,7 +942,7 @@ void ToolBox::ImplSetMinMaxFloatSize( ToolBox *pThis )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 
 sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize )
@@ -976,7 +976,7 @@ sal_uInt16 ToolBox::ImplCalcLines( ToolBox* pThis, long nToolSize )
     return static_cast<sal_uInt16>(nLines);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos )
 {
@@ -1010,7 +1010,7 @@ sal_uInt16 ToolBox::ImplTestLineSize( ToolBox* pThis, const Point& rPos )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect,
                      sal_uInt16 nLineMode )
@@ -1106,7 +1106,7 @@ void ToolBox::ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRec
     pThis->mnDockLines = i;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos )
 {
@@ -1170,7 +1170,7 @@ sal_uInt16 ToolBox::ImplFindItemPos( ToolBox* pBox, const Point& rPos )
     return nPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplTBDragMgr::ImplTBDragMgr()
 {
@@ -1187,14 +1187,14 @@ ImplTBDragMgr::ImplTBDragMgr()
     maAccel.SetSelectHdl( LINK( this, ImplTBDragMgr, SelectHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplTBDragMgr::~ImplTBDragMgr()
 {
     delete mpBoxList;
 }
 
-// -----------------------------------------------------------------------
+
 
 ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect )
 {
@@ -1225,7 +1225,7 @@ ToolBox* ImplTBDragMgr::FindToolBox( const Rectangle& rRect )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
                                    const Point& rPos, const Rectangle& rRect,
@@ -1270,7 +1270,7 @@ void ImplTBDragMgr::StartDragging( ToolBox* pToolBox,
     pToolBox->ShowTracking( maRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTBDragMgr::Dragging( const Point& rPos )
 {
@@ -1304,7 +1304,7 @@ void ImplTBDragMgr::Dragging( const Point& rPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTBDragMgr::EndDragging( bool bOK )
 {
@@ -1392,7 +1392,7 @@ void ImplTBDragMgr::EndDragging( bool bOK )
     mpDragBox = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplTBDragMgr::UpdateDragRect()
 {
@@ -1403,7 +1403,7 @@ void ImplTBDragMgr::UpdateDragRect()
     mpDragBox->ShowTracking( maRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel )
 {
@@ -1415,7 +1415,7 @@ IMPL_LINK( ImplTBDragMgr, SelectHdl, Accelerator*, pAccel )
     return sal_True;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
 {
@@ -1496,7 +1496,7 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
     ImplInitSettings( true, true, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplInitSettings( bool bFont,
                                 bool bForeground, bool bBackground )
@@ -1563,7 +1563,7 @@ void ToolBox::ImplInitSettings( bool bFont,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplLoadRes( const ResId& rResId )
 {
@@ -1620,7 +1620,7 @@ void ToolBox::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ToolBox::ToolBox( Window* pParent, WinBits nStyle ) :
     DockingWindow( WINDOW_TOOLBOX )
@@ -1628,7 +1628,7 @@ ToolBox::ToolBox( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
     DockingWindow( WINDOW_TOOLBOX )
@@ -1651,7 +1651,7 @@ ToolBox::ToolBox( Window* pParent, const ResId& rResId ) :
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 
 ToolBox::~ToolBox()
 {
@@ -1688,7 +1688,7 @@ ToolBox::~ToolBox()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const
 {
@@ -1702,7 +1702,7 @@ ImplToolItem* ToolBox::ImplGetItem( sal_uInt16 nItemId ) const
 
     return NULL;
 }
-// -----------------------------------------------------------------------
+
 
 static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButtons )
 {
@@ -1717,7 +1717,7 @@ static void ImplAddButtonBorder( long &rWidth, long& rHeight, bool bNativeButton
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::ImplCalcItem()
 {
@@ -2005,7 +2005,7 @@ bool ToolBox::ImplCalcItem()
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalcHorz )
 {
@@ -2156,7 +2156,7 @@ sal_uInt16 ToolBox::ImplCalcBreaks( long nWidth, long* pMaxLineWidth, bool bCalc
     return nLines;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ToolBox::ImplGetOptimalFloatingSize()
 {
@@ -2708,7 +2708,7 @@ void ToolBox::ImplFormat( bool bResize )
     mbFormat = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
 {
@@ -2739,7 +2739,7 @@ IMPL_LINK_NOARG(ToolBox, ImplDropdownLongClickHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl)
 {
@@ -2750,7 +2750,7 @@ IMPL_LINK_NOARG(ToolBox, ImplUpdateHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 static void ImplDrawMoreIndicator( ToolBox *pBox, const Rectangle& rRect, bool bSetColor, bool bRotate )
 {
     Color aOldFillColor = pBox->GetFillColor();
@@ -2878,7 +2878,7 @@ static void ImplDrawDropdownArrow( ToolBox *pBox, const Rectangle& rDropDownRect
         pBox->SetLineColor( );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight )
 {
@@ -2920,7 +2920,7 @@ void ToolBox::ImplDrawMenubutton( ToolBox *pThis, bool bHighlight )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn )
 {
@@ -2951,7 +2951,7 @@ void ToolBox::ImplDrawSpin( bool bUpperIn, bool bLowerIn )
                         bUpperIn, bLowerIn, bTmpUpper, bTmpLower, !mbHorz );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect )
 {
@@ -3000,7 +3000,7 @@ void ToolBox::ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplDrawButton( ToolBox* pThis, const Rectangle &rRect, sal_uInt16 highlight, bool bChecked, bool bEnabled, bool bIsWindow )
 {
@@ -3356,7 +3356,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint,
         pMgr->UpdateDragRect();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplDrawFloatwinBorder( ImplToolItem* pItem )
 {
@@ -3431,7 +3431,7 @@ void ToolBox::ImplFloatControl( bool bStart, FloatingWindow* pFloatWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ShowLine( bool bNext )
 {
@@ -3466,7 +3466,7 @@ void ToolBox::ShowLine( bool bNext )
     ImplFormat();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat )
 {
@@ -3528,7 +3528,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
 {
@@ -3646,7 +3646,7 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::MouseMove( const MouseEvent& rMEvt )
 {
@@ -3867,7 +3867,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt )
     DockingWindow::MouseMove( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -4093,7 +4093,7 @@ void ToolBox::MouseButtonDown( const MouseEvent& rMEvt )
         DockingWindow::MouseButtonDown( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -4111,7 +4111,7 @@ void ToolBox::MouseButtonUp( const MouseEvent& rMEvt )
     DockingWindow::MouseButtonUp( rMEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Tracking( const TrackingEvent& rTEvt )
 {
@@ -4130,7 +4130,7 @@ void ToolBox::Tracking( const TrackingEvent& rTEvt )
     DockingWindow::Tracking( rTEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Paint( const Rectangle& rPaintRect )
 {
@@ -4185,14 +4185,14 @@ void ToolBox::Paint( const Rectangle& rPaintRect )
     ImplShowFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Move()
 {
     DockingWindow::Move();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Resize()
 {
@@ -4302,7 +4302,7 @@ void ToolBox::Resize()
     }
 }
 
-// -----------------------------------------------------------------------
+
 const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const
 {
     ImplToolItem* pItem = ImplGetItem( nItemId );
@@ -4324,7 +4324,7 @@ const OUString& ToolBox::ImplGetHelpText( sal_uInt16 nItemId ) const
     return pItem->maHelpText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -4401,7 +4401,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt )
     DockingWindow::RequestHelp( rHEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::Notify( NotifyEvent& rNEvt )
 {
@@ -4486,7 +4486,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt )
     return DockingWindow::Notify( rNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Command( const CommandEvent& rCEvt )
 {
@@ -4552,7 +4552,7 @@ void ToolBox::Command( const CommandEvent& rCEvt )
     DockingWindow::Command( rCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::StateChanged( StateChangedType nType )
 {
@@ -4590,7 +4590,7 @@ void ToolBox::StateChanged( StateChangedType nType )
         maStateChangedHandler.Call( &nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
 {
@@ -4612,14 +4612,14 @@ void ToolBox::DataChanged( const DataChangedEvent& rDCEvt )
         maDataChangedHandler.Call( (void*)&rDCEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::PrepareToggleFloatingMode()
 {
     return DockingWindow::PrepareToggleFloatingMode();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ToggleFloatingMode()
 {
@@ -4663,7 +4663,7 @@ void ToolBox::ToggleFloatingMode()
     ImplFormat();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::StartDocking()
 {
@@ -4673,7 +4673,7 @@ void ToolBox::StartDocking()
     DockingWindow::StartDocking();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
 {
@@ -4799,7 +4799,7 @@ bool ToolBox::Docking( const Point& rPos, Rectangle& rRect )
     return bFloatMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
 {
@@ -4814,7 +4814,7 @@ void ToolBox::EndDocking( const Rectangle& rRect, sal_Bool bFloatMode )
         DockingWindow::EndDocking( rRect, bFloatMode );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Resizing( Size& rSize )
 {
@@ -4960,7 +4960,7 @@ Size ToolBox::CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ToolBox::CalcMinimumWindowSizePixel() const
 {
@@ -5003,7 +5003,7 @@ Size ToolBox::CalcMinimumWindowSizePixel() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::EnableCustomize( bool bEnable )
 {
@@ -5019,14 +5019,14 @@ void ToolBox::EnableCustomize( bool bEnable )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::GetFocus()
 {
     DockingWindow::GetFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::LoseFocus()
 {
@@ -5035,7 +5035,7 @@ void ToolBox::LoseFocus()
     DockingWindow::LoseFocus();
 }
 
-// -----------------------------------------------------------------------
+
 
 // performs the action associated with an item, ie simulates clicking the item
 void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl )
@@ -5050,7 +5050,7 @@ void ToolBox::TriggerItem( sal_uInt16 nItemId, bool bShift, bool bCtrl )
     ImplActivateItem( aKeyCode );
 }
 
-// -----------------------------------------------------------------------
+
 
 // calls the button's action handler
 // returns sal_True if action was called
@@ -5114,7 +5114,7 @@ bool ToolBox::ImplActivateItem( KeyCode aKeyCode )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplCloseLastPopup( Window *pParent )
 {
@@ -5181,7 +5181,7 @@ bool ToolBox::ImplOpenItem( KeyCode aKeyCode )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::KeyInput( const KeyEvent& rKEvt )
 {
@@ -5371,7 +5371,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt )
         DockingWindow::KeyInput( rKEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 // returns the current toolbox line of the item
 sal_uInt16 ToolBox::ImplGetItemLine( ImplToolItem* pCurrentItem )
@@ -5421,7 +5421,7 @@ ImplToolItem* ToolBox::ImplGetFirstValidItem( sal_uInt16 nLine )
     return (it == mpData->m_aItems.end()) ? NULL : &(*it);
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList )
 {
@@ -5519,7 +5519,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus )
     mbChangingHighlight = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 // check for keyboard accessible items
 static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped )
@@ -5530,7 +5530,7 @@ static bool ImplIsValidItem( const ImplToolItem* pItem, bool bNotClipped )
     return bValid;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle )
 {
@@ -5693,7 +5693,7 @@ bool ToolBox::ImplChangeHighlightUpDn( bool bUp, bool bNoCycle )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplShowFocus()
 {
@@ -5709,7 +5709,7 @@ void ToolBox::ImplShowFocus()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplHideFocus()
 {
@@ -5731,7 +5731,7 @@ void ToolBox::ImplHideFocus()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplDisableFlatButtons()
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 72039beca9bc..f1aad48bcf7b 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -60,7 +60,7 @@ using namespace com::sun::star;
 
 #define TB_SEP_SIZE             8
 
-// -----------------------------------------------------------------------
+
 
 ImplToolBoxPrivateData::ImplToolBoxPrivateData() :
         m_pLayoutData( NULL ),
@@ -97,7 +97,7 @@ ImplToolBoxPrivateData::~ImplToolBoxPrivateData()
     delete mpMenu;
 }
 
-// -----------------------------------------------------------------------
+
 void ImplToolItem::init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits,
                         bool bEmptyBtn)
 {
@@ -125,7 +125,7 @@ ImplToolItem::ImplToolItem()
     init(0, 0, true);
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
                             ToolBoxItemBits nItemBits ) :
@@ -134,7 +134,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
     init(nItemId, nItemBits, false);
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString& rText,
                             ToolBoxItemBits nItemBits ) :
@@ -143,7 +143,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const OUString& rText,
     init(nItemId, nItemBits, false);
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
                             const OUString& rText, ToolBoxItemBits nItemBits ) :
@@ -153,7 +153,7 @@ ImplToolItem::ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
     init(nItemId, nItemBits, false);
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
         mpWindow                ( rItem.mpWindow ),
@@ -188,13 +188,13 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) :
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem::~ImplToolItem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
 {
@@ -230,7 +230,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem )
     return *this;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize )
 {
@@ -284,7 +284,7 @@ Size ImplToolItem::GetSize( bool bHorz, bool bCheckMaxWidth, long maxWidth, cons
     return aSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbImage, bool& rbText ) const
 {
@@ -344,7 +344,7 @@ void ImplToolItem::DetermineButtonDrawStyle( ButtonType eButtonType, bool& rbIma
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const
 {
@@ -362,22 +362,22 @@ Rectangle ImplToolItem::GetDropDownRect( bool bHorz ) const
     return aRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplToolItem::IsClipped() const
 {
     return ( meType == TOOLBOXITEM_BUTTON && mbVisible && maRect.IsEmpty() );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplToolItem::IsItemHidden() const
 {
     return ( meType == TOOLBOXITEM_BUTTON && !mbVisible );
 }
 
-// -----------------------------------------------------------------------
-// -----------------------------------------------------------------------
+
+
 
 const OUString ToolBox::ImplConvertMenuString( const OUString& rStr )
 {
@@ -388,7 +388,7 @@ const OUString ToolBox::ImplConvertMenuString( const OUString& rStr )
     return aCvtStr;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint )
 {
@@ -425,7 +425,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint )
     ImplCallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplUpdateItem( sal_uInt16 nIndex )
 {
@@ -451,7 +451,7 @@ void ToolBox::ImplUpdateItem( sal_uInt16 nIndex )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Click()
 {
@@ -459,7 +459,7 @@ void ToolBox::Click()
     maClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::DoubleClick()
 {
@@ -467,7 +467,7 @@ void ToolBox::DoubleClick()
     maDoubleClickHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Activate()
 {
@@ -476,7 +476,7 @@ void ToolBox::Activate()
     maActivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Deactivate()
 {
@@ -485,7 +485,7 @@ void ToolBox::Deactivate()
     maDeactivateHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Highlight()
 {
@@ -493,7 +493,7 @@ void ToolBox::Highlight()
     maHighlightHdl.Call( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Select()
 {
@@ -513,19 +513,19 @@ void ToolBox::Select()
         pWrapper->GetFloatingWindow()->EndPopupMode();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Customize( const ToolBoxCustomizeEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::UserDraw( const UserDrawEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos )
 {
@@ -618,7 +618,7 @@ void ToolBox::InsertItem( const ResId& rResId, sal_uInt16 nPos )
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
                           ToolBoxItemBits nBits, sal_uInt16 nPos )
@@ -639,7 +639,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >(nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
                           const OUString& rText,
@@ -661,7 +661,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage,
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText,
                           ToolBoxItemBits nBits, sal_uInt16 nPos )
@@ -798,7 +798,7 @@ void ToolBox::InsertItem(const OUString& rCommand, const uno::Reference<frame::X
         pItem->maMinimalItemSize = rRequestedSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertWindow( sal_uInt16 nItemId, Window* pWindow,
                             ToolBoxItemBits nBits, sal_uInt16 nPos )
@@ -826,7 +826,7 @@ void ToolBox::InsertWindow( sal_uInt16 nItemId, Window* pWindow,
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertSpace( sal_uInt16 nPos )
 {
@@ -844,7 +844,7 @@ void ToolBox::InsertSpace( sal_uInt16 nPos )
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize )
 {
@@ -864,7 +864,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize )
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::InsertBreak( sal_uInt16 nPos )
 {
@@ -882,7 +882,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos )
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::RemoveItem( sal_uInt16 nPos )
 {
@@ -916,7 +916,7 @@ void ToolBox::RemoveItem( sal_uInt16 nPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
                         sal_uInt16 nNewPos )
@@ -946,7 +946,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Clear()
 {
@@ -963,7 +963,7 @@ void ToolBox::Clear()
     ImplCallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetButtonType( ButtonType eNewType )
 {
@@ -977,7 +977,7 @@ void ToolBox::SetButtonType( ButtonType eNewType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetToolboxButtonSize( ToolBoxButtonSize eSize )
 {
@@ -994,7 +994,7 @@ ToolBoxButtonSize ToolBox::GetToolboxButtonSize() const
     return mpData->meButtonSize;
 }
 
-// -----------------------------------------------------------------------
+
 
 /*static*/ Size
 ToolBox::GetDefaultImageSize(bool bLarge)
@@ -1013,7 +1013,7 @@ Size ToolBox::GetDefaultImageSize() const
     return GetDefaultImageSize( GetToolboxButtonSize() == TOOLBOX_BUTTONSIZE_LARGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetAlign( WindowAlign eNewAlign )
 {
@@ -1041,7 +1041,7 @@ void ToolBox::SetAlign( WindowAlign eNewAlign )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetLineCount( sal_uInt16 nNewLines )
 {
@@ -1058,28 +1058,28 @@ void ToolBox::SetLineCount( sal_uInt16 nNewLines )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetPageScroll( bool b )
 {
     mpData->mbPageScroll = b;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::GetItemCount() const
 {
     return (sal_uInt16)mpData->m_aItems.size();
 }
 
-// -----------------------------------------------------------------------
+
 
 ToolBoxItemType ToolBox::GetItemType( sal_uInt16 nPos ) const
 {
     return (nPos < mpData->m_aItems.size()) ? mpData->m_aItems[nPos].meType : TOOLBOXITEM_DONTKNOW;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::GetItemPos( sal_uInt16 nItemId ) const
 {
@@ -1091,7 +1091,7 @@ sal_uInt16 ToolBox::GetItemPos( sal_uInt16 nItemId ) const
     return TOOLBOX_ITEM_NOTFOUND;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::GetItemPos( const Point& rPos ) const
 {
@@ -1115,14 +1115,14 @@ sal_uInt16 ToolBox::GetItemPos( const Point& rPos ) const
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::GetItemId( sal_uInt16 nPos ) const
 {
     return (nPos < mpData->m_aItems.size()) ? mpData->m_aItems[nPos].mnId : 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 ToolBox::GetItemId( const Point& rPos ) const
 {
@@ -1156,7 +1156,7 @@ sal_uInt16 ToolBox::GetItemId(const OUString &rCommand) const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 Point ToolBox::ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const
 {
@@ -1218,7 +1218,7 @@ Point ToolBox::GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) con
     return ImplGetPopupPosition( GetItemRect( nItemId ), rSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ToolBox::GetItemRect( sal_uInt16 nItemId ) const
 {
@@ -1229,7 +1229,7 @@ Rectangle ToolBox::GetItemRect( sal_uInt16 nItemId ) const
     return GetItemPosRect( nPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ToolBox::GetItemPosRect( sal_uInt16 nPos ) const
 {
@@ -1254,7 +1254,7 @@ Size ToolBox::GetItemContentSize( sal_uInt16 nItemId ) const
         return Size();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::ImplHasExternalMenubutton()
 {
@@ -1269,7 +1269,7 @@ bool ToolBox::ImplHasExternalMenubutton()
     }
     return bRet;
 }
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits )
 {
@@ -1288,7 +1288,7 @@ void ToolBox::SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ToolBoxItemBits ToolBox::GetItemBits( sal_uInt16 nItemId ) const
 {
@@ -1313,7 +1313,7 @@ void ToolBox::SetItemExpand( sal_uInt16 nItemId, bool bExpand )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::GetItemExpand( sal_uInt16 nItemId ) const
 {
@@ -1323,7 +1323,7 @@ bool ToolBox::GetItemExpand( sal_uInt16 nItemId ) const
     return pItem->mbExpand;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemData( sal_uInt16 nItemId, void* pNewData )
 {
@@ -1336,7 +1336,7 @@ void ToolBox::SetItemData( sal_uInt16 nItemId, void* pNewData )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void* ToolBox::GetItemData( sal_uInt16 nItemId ) const
 {
@@ -1348,7 +1348,7 @@ void* ToolBox::GetItemData( sal_uInt16 nItemId ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
 {
@@ -1388,7 +1388,7 @@ void ToolBox::SetItemImage( sal_uInt16 nItemId, const Image& rImage )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetImageList( const ImageList& rImageList )
 {
@@ -1405,7 +1405,7 @@ void ToolBox::SetImageList( const ImageList& rImageList )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static Image ImplRotImage( const Image& rImage, long nAngle10 )
 {
@@ -1448,7 +1448,7 @@ void ToolBox::SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static Image ImplMirrorImage( const Image& rImage )
 {
@@ -1486,7 +1486,7 @@ void ToolBox::SetItemImageMirrorMode( sal_uInt16 nItemId, bool bMirror )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Image ToolBox::GetItemImage( sal_uInt16 nItemId ) const
 {
@@ -1498,7 +1498,7 @@ Image ToolBox::GetItemImage( sal_uInt16 nItemId ) const
         return Image();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1530,7 +1530,7 @@ void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& ToolBox::GetItemText( sal_uInt16 nItemId ) const
 {
@@ -1542,7 +1542,7 @@ const OUString& ToolBox::GetItemText( sal_uInt16 nItemId ) const
     return pItem->maText;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow )
 {
@@ -1559,7 +1559,7 @@ void ToolBox::SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const
 {
@@ -1571,7 +1571,7 @@ Window* ToolBox::GetItemWindow( sal_uInt16 nItemId ) const
         return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::StartSelection()
 {
@@ -1587,7 +1587,7 @@ void ToolBox::StartSelection()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::EndSelection()
 {
@@ -1612,7 +1612,7 @@ void ToolBox::EndSelection()
     mnMouseModifier = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease )
 {
@@ -1658,7 +1658,7 @@ void ToolBox::SetItemDown( sal_uInt16 nItemId, bool bDown, bool bRelease )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
 {
@@ -1721,7 +1721,7 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const
 {
@@ -1733,7 +1733,7 @@ TriState ToolBox::GetItemState( sal_uInt16 nItemId ) const
         return STATE_NOCHECK;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable )
 {
@@ -1765,7 +1765,7 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const
 {
@@ -1777,7 +1777,7 @@ bool ToolBox::IsItemEnabled( sal_uInt16 nItemId ) const
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible )
 {
@@ -1795,7 +1795,7 @@ void ToolBox::ShowItem( sal_uInt16 nItemId, bool bVisible )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::IsItemVisible( sal_uInt16 nItemId ) const
 {
@@ -1807,7 +1807,7 @@ bool ToolBox::IsItemVisible( sal_uInt16 nItemId ) const
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const
 {
@@ -1825,7 +1825,7 @@ bool ToolBox::IsItemReallyVisible( sal_uInt16 nItemId ) const
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetItemCommand(sal_uInt16 nItemId, const OUString& rCommand)
 {
@@ -1835,7 +1835,7 @@ void ToolBox::SetItemCommand(sal_uInt16 nItemId, const OUString& rCommand)
         pItem->maCommandStr = rCommand;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString ToolBox::GetItemCommand( sal_uInt16 nItemId ) const
 {
@@ -1847,7 +1847,7 @@ const OUString ToolBox::GetItemCommand( sal_uInt16 nItemId ) const
     return OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1857,7 +1857,7 @@ void ToolBox::SetQuickHelpText( sal_uInt16 nItemId, const OUString& rText )
         pItem->maQuickHelpText = rText;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const
 {
@@ -1871,7 +1871,7 @@ const OUString& ToolBox::GetQuickHelpText( sal_uInt16 nItemId ) const
         return sEmpty;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
 {
@@ -1881,14 +1881,14 @@ void ToolBox::SetHelpText( sal_uInt16 nItemId, const OUString& rText )
         pItem->maHelpText = rText;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& ToolBox::GetHelpText( sal_uInt16 nItemId ) const
 {
     return ImplGetHelpText( nItemId );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
 {
@@ -1898,7 +1898,7 @@ void ToolBox::SetHelpId( sal_uInt16 nItemId, const OString& rHelpId )
         pItem->maHelpId = rHelpId;
 }
 
-// -----------------------------------------------------------------------
+
 
 OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const
 {
@@ -1917,7 +1917,7 @@ OString ToolBox::GetHelpId( sal_uInt16 nItemId ) const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetOutStyle( sal_uInt16 nNewStyle )
 {
@@ -1940,7 +1940,7 @@ void ToolBox::SetOutStyle( sal_uInt16 nNewStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 // disable key input if all items are disabled
 
@@ -1959,7 +1959,7 @@ void ToolBox::ImplUpdateInputEnable()
     mpData->mbKeyInputDisabled = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::ImplFillLayoutData() const
 {
@@ -1976,7 +1976,7 @@ void ToolBox::ImplFillLayoutData() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ToolBox::GetDisplayText() const
 {
@@ -1985,7 +1985,7 @@ OUString ToolBox::GetDisplayText() const
     return mpData->m_pLayoutData ? OUString(mpData->m_pLayoutData->m_aDisplayText) : OUString();
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle ToolBox::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const
 {
@@ -2006,7 +2006,7 @@ Rectangle ToolBox::GetCharacterBounds( sal_uInt16 nItemID, long nIndex ) const
     return (mpData->m_pLayoutData && nItemIndex != -1) ? mpData->m_pLayoutData->GetCharacterBounds( nItemIndex+nIndex ) : Rectangle();
 }
 
-// -----------------------------------------------------------------------
+
 
 long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
 {
@@ -2030,7 +2030,7 @@ long ToolBox::GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const
     return nIndex;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetDropdownClickHdl( const Link& rLink )
 {
@@ -2042,7 +2042,7 @@ const Link& ToolBox::GetDropdownClickHdl() const
     return mpData->maDropdownClickHdl;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::SetMenuType( sal_uInt16 aType )
 {
@@ -2089,7 +2089,7 @@ void ToolBox::SetMenuButtonHdl( const Link& rLink )
     mpData->maMenuButtonHdl = rLink;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::ImplHasClippedItems()
 {
@@ -2250,7 +2250,7 @@ void ToolBox::ExecuteCustomMenu()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 // checks override first, useful during calculation of sizes
 bool ToolBox::ImplIsFloatingMode() const
@@ -2278,7 +2278,7 @@ bool ToolBox::ImplIsInPopupMode() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ToolBox::Lock( bool bLock )
 {
@@ -2298,7 +2298,7 @@ void ToolBox::Lock( bool bLock )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ToolBox::AlwaysLocked()
 {
@@ -2372,6 +2372,6 @@ void ToolBox::SetImageListProvider(vcl::IImageListProvider* _pProvider)
     mpData->mpImageListProvider = _pProvider;
     ImplUpdateImageList();
 }
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8a3f00645e13..d68ec89ffa0f 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -117,7 +117,7 @@ using ::com::sun::star::awt::XTopWindow;
 #define IMPL_PAINT_ERASE            ((sal_uInt16)0x0010)
 #define IMPL_PAINT_CHECKRTL         ((sal_uInt16)0x0020)
 
-// -----------------------------------------------------------------------
+
 
 struct ImplCalcToTopData
 {
@@ -142,7 +142,7 @@ ImplAccessibleInfos::~ImplAccessibleInfos()
     delete pAccessibleDescription;
 }
 
-// -----------------------------------------------------------------------
+
 
 WindowImpl::WindowImpl( WindowType nType )
 {
@@ -303,7 +303,7 @@ WindowImpl::~WindowImpl()
 }
 
 
-// -----------------------------------------------------------------------
+
 
 // helper method to allow inline constructor even for pWindow!=NULL case
 void ImplDelData::AttachToWindow( const Window* pWindow )
@@ -312,7 +312,7 @@ void ImplDelData::AttachToWindow( const Window* pWindow )
         const_cast<Window*>(pWindow)->ImplAddDel( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 // define dtor for ImplDelData
 ImplDelData::~ImplDelData()
@@ -327,7 +327,7 @@ ImplDelData::~ImplDelData()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 #ifdef DBG_UTIL
 const char* ImplDbgCheckWindow( const void* pObj )
@@ -405,7 +405,7 @@ void Window::ImplInitAppFontData( Window* pWindow )
         pSVData->maGDIData.mnAppFontX += (pSVData->maGDIData.mnAppFontX*pSVData->maAppData.mnDialogScaleX)/100;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplCheckUIFont( const Font& rFont )
 {
@@ -448,7 +448,7 @@ bool Window::ImplCheckUIFont( const Font& rFont )
     return bUIFontOk;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
 {
@@ -699,7 +699,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl )
         GetpApp()->OverrideSystemSettings( rSettings );
 }
 
-// -----------------------------------------------------------------------
+
 
 MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Window* pDest )
 {
@@ -708,7 +708,7 @@ MouseEvent ImplTranslateMouseEvent( const MouseEvent& rE, Window* pSource, Windo
     return MouseEvent( aPos, rE.GetClicks(), rE.GetMode(), rE.GetButtons(), rE.GetModifier() );
 }
 
-// -----------------------------------------------------------------------
+
 
 CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, Window* pSource, Window* pDest )
 {
@@ -738,7 +738,7 @@ void Window::ImplInitWindowData( WindowType nType )
     mbEnableRTL         = Application::GetSettings().GetLayoutRTL();         // true: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData )
 {
@@ -1021,7 +1021,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
         GetAccessibleParentWindow()->ImplCallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplSetFrameParent( const Window* pParent )
 {
@@ -1041,7 +1041,7 @@ void Window::ImplSetFrameParent( const Window* pParent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInsertWindow( Window* pParent )
 {
@@ -1092,7 +1092,7 @@ void Window::ImplInsertWindow( Window* pParent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplRemoveWindow( bool bRemoveFrameData )
 {
@@ -1176,7 +1176,7 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition)
         mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild = this;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallResize()
 {
@@ -1192,7 +1192,7 @@ void Window::ImplCallResize()
     ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallMove()
 {
@@ -1236,7 +1236,7 @@ void Window::ImplCallMove()
     ImplCallEventListeners( VCLEVENT_WINDOW_MOVE );
 }
 
-// -----------------------------------------------------------------------
+
 
 static OString ImplAutoHelpID( ResMgr* pResMgr )
 {
@@ -1248,7 +1248,7 @@ static OString ImplAutoHelpID( ResMgr* pResMgr )
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinBits Window::ImplInitRes( const ResId& rResId )
 {
@@ -1261,7 +1261,7 @@ WinBits Window::ImplInitRes( const ResId& rResId )
     return nStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 WindowResHeader Window::ImplLoadResHeader( const ResId& rResId )
 {
@@ -1373,7 +1373,7 @@ void Window::ImplLoadRes( const ResId& rResId )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplWinData* Window::ImplGetWinData() const
 {
@@ -1399,7 +1399,7 @@ ImplWinData* Window::ImplGetWinData() const
     return mpWindowImpl->mpWinData;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* Window::ImplGetFrameGraphics() const
 {
@@ -1416,7 +1416,7 @@ SalGraphics* Window::ImplGetFrameGraphics() const
     return mpWindowImpl->mpFrameWindow->mpGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::ImplFindWindow( const Point& rFramePos )
 {
@@ -1459,7 +1459,7 @@ Window* Window::ImplFindWindow( const Point& rFramePos )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
 {
@@ -1488,7 +1488,7 @@ sal_uInt16 Window::ImplHitTest( const Point& rFramePos )
     return nHitTest;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplIsRealParentPath( const Window* pWindow ) const
 {
@@ -1503,7 +1503,7 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const
 {
@@ -1522,7 +1522,7 @@ bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const
 {
@@ -1531,7 +1531,7 @@ bool Window::ImplIsWindowOrChild( const Window* pWindow, bool bSystemWindow ) co
     return ImplIsChild( pWindow, bSystemWindow );
 }
 
-// -----------------------------------------------------------------------
+
 
 int Window::ImplTestMousePointerSet()
 {
@@ -1547,7 +1547,7 @@ int Window::ImplTestMousePointerSet()
     return sal_False;
 }
 
-// -----------------------------------------------------------------------
+
 
 PointerStyle Window::ImplGetMousePointer() const
 {
@@ -1591,7 +1591,7 @@ PointerStyle Window::ImplGetMousePointer() const
     return ePointerStyle;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplResetReallyVisible()
 {
@@ -1626,7 +1626,7 @@ void Window::ImplResetReallyVisible()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplSetReallyVisible()
 {
@@ -1668,7 +1668,7 @@ void Window::ImplSetReallyVisible()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallInitShow()
 {
@@ -1694,7 +1694,7 @@ void Window::ImplCallInitShow()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok
 {
@@ -1707,7 +1707,7 @@ void Window::ImplAddDel( ImplDelData* pDel ) // TODO: make "const" when incompat
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incompatiblity ok
 {
@@ -1723,7 +1723,7 @@ void Window::ImplRemoveDel( ImplDelData* pDel ) // TODO: make "const" when incom
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInitResolutionSettings()
 {
@@ -1757,7 +1757,7 @@ void Window::ImplInitResolutionSettings()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplPointToLogic( Font& rFont ) const
 {
@@ -1784,7 +1784,7 @@ void Window::ImplPointToLogic( Font& rFont ) const
     rFont.SetSize( aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplLogicToPoint( Font& rFont ) const
 {
@@ -1811,7 +1811,7 @@ void Window::ImplLogicToPoint( Font& rFont ) const
     rFont.SetSize( aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplSysObjClip( const Region* pOldRegion )
 {
@@ -1900,7 +1900,7 @@ bool Window::ImplSysObjClip( const Region* pOldRegion )
     return bUpdate;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateSysObjChildrenClip()
 {
@@ -1915,7 +1915,7 @@ void Window::ImplUpdateSysObjChildrenClip()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateSysObjOverlapsClip()
 {
@@ -1929,7 +1929,7 @@ void Window::ImplUpdateSysObjOverlapsClip()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateSysObjClip()
 {
@@ -1952,7 +1952,7 @@ void Window::ImplUpdateSysObjClip()
         mpWindowImpl->mpFrameWindow->ImplUpdateSysObjOverlapsClip();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller )
 {
@@ -1999,7 +1999,7 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller )
     return bUpdate;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller )
 {
@@ -2016,7 +2016,7 @@ bool Window::ImplSetClipFlagOverlapWindows( bool bSysObjOnlySmaller )
     return bUpdate;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller )
 {
@@ -2050,7 +2050,7 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller )
         return mpWindowImpl->mpFrameWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplIntersectWindowClipRegion( Region& rRegion )
 {
@@ -2060,7 +2060,7 @@ void Window::ImplIntersectWindowClipRegion( Region& rRegion )
     rRegion.Intersect( mpWindowImpl->maWinClipRegion );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplIntersectWindowRegion( Region& rRegion )
 {
@@ -2070,7 +2070,7 @@ void Window::ImplIntersectWindowRegion( Region& rRegion )
         rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplExcludeWindowRegion( Region& rRegion )
 {
@@ -2090,7 +2090,7 @@ void Window::ImplExcludeWindowRegion( Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplExcludeOverlapWindows( Region& rRegion )
 {
@@ -2107,7 +2107,7 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplExcludeOverlapWindows2( Region& rRegion )
 {
@@ -2117,7 +2117,7 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion )
     ImplExcludeOverlapWindows( rRegion );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps )
 {
@@ -2152,7 +2152,7 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps )
         ImplGetParent()->ImplIntersectWindowClipRegion( rRegion );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplClipChildren( Region& rRegion )
 {
@@ -2177,7 +2177,7 @@ bool Window::ImplClipChildren( Region& rRegion )
     return bOtherClip;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplClipAllChildren( Region& rRegion )
 {
@@ -2190,7 +2190,7 @@ void Window::ImplClipAllChildren( Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplClipSiblings( Region& rRegion )
 {
@@ -2207,7 +2207,7 @@ void Window::ImplClipSiblings( Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInitWinClipRegion()
 {
@@ -2231,7 +2231,7 @@ void Window::ImplInitWinClipRegion()
     mpWindowImpl->mbInitWinClipRegion = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInitWinChildClipRegion()
 {
@@ -2256,7 +2256,7 @@ void Window::ImplInitWinChildClipRegion()
     mpWindowImpl->mbInitChildRegion = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 Region* Window::ImplGetWinChildClipRegion()
 {
@@ -2270,7 +2270,7 @@ Region* Window::ImplGetWinChildClipRegion()
         return &mpWindowImpl->maWinClipRegion;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion )
 {
@@ -2289,7 +2289,7 @@ void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Re
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion )
 {
@@ -2303,7 +2303,7 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R
     ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion )
 {
@@ -2331,7 +2331,7 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region&
         ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion,
                                     bool bChildren, bool bParent, bool bSiblings )
@@ -2403,7 +2403,7 @@ void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegio
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
 {
@@ -2563,7 +2563,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallOverlapPaint()
 {
@@ -2585,7 +2585,7 @@ void Window::ImplCallOverlapPaint()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplPostPaint()
 {
@@ -2593,7 +2593,7 @@ void Window::ImplPostPaint()
         mpWindowImpl->mpFrameData->maPaintTimer.Start();
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Window, ImplHandlePaintHdl)
 {
@@ -2612,7 +2612,7 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl)
 {
@@ -2629,7 +2629,7 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags )
 {
@@ -2688,7 +2688,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags
     ImplPostPaint();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion )
 {
@@ -2709,7 +2709,7 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInvalidateParentFrameRegion( Region& rRegion )
 {
@@ -2722,7 +2722,7 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags )
 {
@@ -2810,7 +2810,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags )
         pOpaqueWindow->Update();        // start painting at the opaque parent
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
                                        long nHorzScroll, long nVertScroll,
@@ -2835,7 +2835,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect,
                                            long nHorzScroll, long nVertScroll,
@@ -2874,7 +2874,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags )
 {
@@ -2918,7 +2918,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags )
 {
@@ -2959,7 +2959,7 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplScroll( const Rectangle& rRect,
                          long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
@@ -3130,7 +3130,7 @@ void Window::ImplScroll( const Rectangle& rRect,
         mpWindowImpl->mpCursor->ImplResume();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateAll( bool bOverlapWindows )
 {
@@ -3162,7 +3162,7 @@ void Window::ImplUpdateAll( bool bOverlapWindows )
         Flush();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateWindowPtr( Window* pWindow )
 {
@@ -3189,7 +3189,7 @@ void Window::ImplUpdateWindowPtr( Window* pWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateWindowPtr()
 {
@@ -3201,7 +3201,7 @@ void Window::ImplUpdateWindowPtr()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame )
 {
@@ -3230,7 +3230,7 @@ void Window::ImplUpdateOverlapWindowPtr( bool bNewFrame )
         Show( true );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplUpdatePos()
 {
@@ -3263,7 +3263,7 @@ bool Window::ImplUpdatePos()
     return bSysChild;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplUpdateSysObjPos()
 {
@@ -3277,7 +3277,7 @@ void Window::ImplUpdateSysObjPos()
         pChild = pChild->mpWindowImpl->mpNext;
     }
 }
-// -----------------------------------------------------------------------
+
 
 void Window::ImplPosSizeWindow( long nX, long nY,
                                 long nWidth, long nHeight, sal_uInt16 nFlags )
@@ -3583,7 +3583,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
     delete pOldRegion;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplToBottomChild()
 {
@@ -3602,7 +3602,7 @@ void Window::ImplToBottomChild()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData )
 {
@@ -3631,7 +3631,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplToTop( sal_uInt16 nFlags )
 {
@@ -3723,7 +3723,7 @@ void Window::ImplToTop( sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplStartToTop( sal_uInt16 nFlags )
 {
@@ -3778,7 +3778,7 @@ void Window::ImplStartToTop( sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible )
 {
@@ -3807,7 +3807,7 @@ void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible )
         ImplGenerateMouseMove();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplShowAllOverlaps()
 {
@@ -3824,7 +3824,7 @@ void Window::ImplShowAllOverlaps()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplHideAllOverlaps()
 {
@@ -3841,7 +3841,7 @@ void Window::ImplHideAllOverlaps()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
 {
@@ -3868,7 +3868,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplGenerateMouseMove()
 {
@@ -3876,7 +3876,7 @@ void Window::ImplGenerateMouseMove()
         Application::PostUserEvent( mpWindowImpl->mpFrameData->mnMouseMoveId, LINK( mpWindowImpl->mpFrameWindow, Window, ImplGenerateMouseMoveHdl ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl)
 {
@@ -3891,14 +3891,14 @@ IMPL_LINK_NOARG(Window, ImplGenerateMouseMoveHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInvertFocus( const Rectangle& rRect )
 {
     InvertTracking( rRect, SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
                                           Window* pOldOverlapWindow )
@@ -3991,7 +3991,7 @@ static bool IsWindowFocused(const WindowImpl& rWinImpl)
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 void Window::ImplGrabFocus( sal_uInt16 nFlags )
 {
     // #143570# no focus for destructing windows
@@ -4210,7 +4210,7 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplNewInputContext()
 {
@@ -4257,14 +4257,14 @@ void Window::ImplNewInputContext()
         pFocusWin->mpFontCache->Release( pFontEntry );
 }
 
-// -----------------------------------------------------------------------
+
 
 Window::Window( WindowType nType )
 {
     ImplInitWindowData( nType );
 }
 
-// -----------------------------------------------------------------------
+
 
 Window::Window( Window* pParent, WinBits nStyle )
 {
@@ -4273,7 +4273,7 @@ Window::Window( Window* pParent, WinBits nStyle )
     ImplInit( pParent, nStyle, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 Window::Window( Window* pParent, const ResId& rResId )
     : mpWindowImpl(NULL)
@@ -4288,7 +4288,7 @@ Window::Window( Window* pParent, const ResId& rResId )
         Show();
 }
 
-// -----------------------------------------------------------------------
+
 #if OSL_DEBUG_LEVEL > 0
 namespace
 {
@@ -4311,7 +4311,7 @@ namespace
     }
 }
 #endif
-// -----------------------------------------------------------------------
+
 
 Window::~Window()
 {
@@ -4753,7 +4753,7 @@ Window::~Window()
     delete mpWindowImpl; mpWindowImpl = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 void Window::doLazyDelete()
 {
     SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(this);
@@ -4776,7 +4776,7 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const
     mpWindowImpl->mpFrame->SimulateKeyPress(nKeyCode);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::MouseMove( const MouseEvent& rMEvt )
 {
@@ -4785,7 +4785,7 @@ void Window::MouseMove( const MouseEvent& rMEvt )
         mpWindowImpl->mbMouseMove = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::MouseButtonDown( const MouseEvent& rMEvt )
 {
@@ -4794,7 +4794,7 @@ void Window::MouseButtonDown( const MouseEvent& rMEvt )
         mpWindowImpl->mbMouseButtonDown = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::MouseButtonUp( const MouseEvent& rMEvt )
 {
@@ -4803,7 +4803,7 @@ void Window::MouseButtonUp( const MouseEvent& rMEvt )
         mpWindowImpl->mbMouseButtonUp = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::KeyInput( const KeyEvent& rKEvt )
 {
@@ -4812,7 +4812,7 @@ void Window::KeyInput( const KeyEvent& rKEvt )
         mpWindowImpl->mbKeyInput = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::KeyUp( const KeyEvent& rKEvt )
 {
@@ -4821,26 +4821,26 @@ void Window::KeyUp( const KeyEvent& rKEvt )
         mpWindowImpl->mbKeyUp = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::PrePaint()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Paint( const Rectangle& rRect )
 {
     ImplCallEventListeners( VCLEVENT_WINDOW_PAINT, (void*)&rRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::PostPaint()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
 {
@@ -4868,7 +4868,7 @@ void Window::GetFocus()
     Notify( aNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::LoseFocus()
 {
@@ -4876,7 +4876,7 @@ void Window::LoseFocus()
     Notify( aNEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::RequestHelp( const HelpEvent& rHEvt )
 {
@@ -4928,7 +4928,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Command( const CommandEvent& rCEvt )
 {
@@ -4939,7 +4939,7 @@ void Window::Command( const CommandEvent& rCEvt )
         mpWindowImpl->mbCommand = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Tracking( const TrackingEvent& rTEvt )
 {
@@ -4949,13 +4949,13 @@ void Window::Tracking( const TrackingEvent& rTEvt )
         pWrapper->Tracking( rTEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::UserEvent( sal_uLong, void* )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::StateChanged( StateChangedType eType )
 {
@@ -4980,13 +4980,13 @@ void Window::StateChanged( StateChangedType eType )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::DataChanged( const DataChangedEvent& )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
 {
@@ -5087,7 +5087,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::PreNotify( NotifyEvent& rNEvt )
 {
@@ -5130,7 +5130,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt )
     return bDone;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::Notify( NotifyEvent& rNEvt )
 {
@@ -5239,7 +5239,7 @@ bool Window::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData )
 {
@@ -5252,7 +5252,7 @@ void Window::ImplCallEventListeners( sal_uLong nEvent, void* pData )
     CallEventListeners( nEvent, pData );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::CallEventListeners( sal_uLong nEvent, void* pData )
 {
@@ -5294,35 +5294,35 @@ void Window::FireVclEvent( VclSimpleEvent* pEvent )
     ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::AddEventListener( const Link& rEventListener )
 {
     mpWindowImpl->maEventListeners.addListener( rEventListener );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::RemoveEventListener( const Link& rEventListener )
 {
     mpWindowImpl->maEventListeners.removeListener( rEventListener );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::AddChildEventListener( const Link& rEventListener )
 {
     mpWindowImpl->maChildEventListeners.addListener( rEventListener );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::RemoveChildEventListener( const Link& rEventListener )
 {
     mpWindowImpl->maChildEventListeners.removeListener( rEventListener );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller )
 {
@@ -5331,9 +5331,9 @@ sal_uLong Window::PostUserEvent( const Link& rLink, void* pCaller )
     return nEventId;
 }
 
-// -----------------------------------------------------------------------
 
-// -----------------------------------------------------------------------
+
+
 
 bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller )
 {
@@ -5357,7 +5357,7 @@ bool Window::PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCalle
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::RemoveUserEvent( sal_uLong nUserEvent )
 {
@@ -5378,7 +5378,7 @@ void Window::RemoveUserEvent( sal_uLong nUserEvent )
     pSVEvent->mbCall = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsLocked( bool bChildren ) const
 {
@@ -5399,7 +5399,7 @@ bool Window::IsLocked( bool bChildren ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetStyle( WinBits nStyle )
 {
@@ -5412,7 +5412,7 @@ void Window::SetStyle( WinBits nStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetExtendedStyle( WinBits nExtendedStyle )
 {
@@ -5438,7 +5438,7 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SystemWindow* Window::GetSystemWindow() const
 {
@@ -5449,7 +5449,7 @@ SystemWindow* Window::GetSystemWindow() const
     return (SystemWindow*)pWin;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
 {
@@ -5491,7 +5491,7 @@ void Window::SetBorderStyle( sal_uInt16 nBorderStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Window::GetBorderStyle() const
 {
@@ -5507,7 +5507,7 @@ sal_uInt16 Window::GetBorderStyle() const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Window::CalcTitleWidth() const
 {
@@ -5537,7 +5537,7 @@ long Window::CalcTitleWidth() const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EnableClipSiblings( bool bClipSiblings )
 {
@@ -5548,7 +5548,7 @@ void Window::EnableClipSiblings( bool bClipSiblings )
     mpWindowImpl->mbClipSiblings = bClipSiblings;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetMouseTransparent( bool bTransparent )
 {
@@ -5562,7 +5562,7 @@ void Window::SetMouseTransparent( bool bTransparent )
     mpWindowImpl->mbMouseTransparent = bTransparent;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetPaintTransparent( bool bTransparent )
 {
@@ -5577,7 +5577,7 @@ void Window::SetPaintTransparent( bool bTransparent )
     mpWindowImpl->mbPaintTransparent = bTransparent;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetInputContext( const InputContext& rInputContext )
 {
@@ -5587,7 +5587,7 @@ void Window::SetInputContext( const InputContext& rInputContext )
         ImplNewInputContext();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EndExtTextInput( sal_uInt16 nFlags )
 {
@@ -5596,7 +5596,7 @@ void Window::EndExtTextInput( sal_uInt16 nFlags )
         ImplGetFrame()->EndExtTextInput( nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
 {
@@ -5622,7 +5622,7 @@ void Window::SetCursorRect( const Rectangle* pRect, long nExtTextInputWidth )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 const Rectangle* Window::GetCursorRect() const
 {
@@ -5631,7 +5631,7 @@ const Rectangle* Window::GetCursorRect() const
     return pWinData->mpCursorRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Window::GetCursorExtTextInputWidth() const
 {
@@ -5640,7 +5640,7 @@ long Window::GetCursorExtTextInputWidth() const
     return pWinData->mnCursorExtWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical ) {
 
@@ -5657,7 +5657,7 @@ void Window::SetCompositionCharRect( const Rectangle* pRect, long nCompositionLe
     }
 }
 
-// -----------------------------------------------------------------------
+
 void Window::SetSettings( const AllSettings& rSettings )
 {
     SetSettings( rSettings, sal_False );
@@ -5698,7 +5698,7 @@ void Window::SetSettings( const AllSettings& rSettings, sal_Bool bChild )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::UpdateSettings( const AllSettings& rSettings, bool bChild )
 {
@@ -5768,7 +5768,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
 {
@@ -5783,7 +5783,7 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetPointFont( const Font& rFont )
 {
@@ -5793,7 +5793,7 @@ void Window::SetPointFont( const Font& rFont )
     SetFont( aFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 Font Window::GetPointFont() const
 {
@@ -5803,7 +5803,7 @@ Font Window::GetPointFont() const
     return aFont;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetParentClipMode( sal_uInt16 nMode )
 {
@@ -5821,7 +5821,7 @@ void Window::SetParentClipMode( sal_uInt16 nMode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Window::GetParentClipMode() const
 {
@@ -5832,7 +5832,7 @@ sal_uInt16 Window::GetParentClipMode() const
         return mpWindowImpl->mnParentClipMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetWindowRegionPixel()
 {
@@ -5868,7 +5868,7 @@ void Window::SetWindowRegionPixel()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetWindowRegionPixel( const Region& rRegion )
 {
@@ -5956,7 +5956,7 @@ void Window::SetWindowRegionPixel( const Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 const Region& Window::GetWindowRegionPixel() const
 {
@@ -5967,7 +5967,7 @@ const Region& Window::GetWindowRegionPixel() const
         return mpWindowImpl->maWinRegion;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsWindowRegionPixel() const
 {
@@ -5978,7 +5978,7 @@ bool Window::IsWindowRegionPixel() const
         return mpWindowImpl->mbWinRegion;
 }
 
-// -----------------------------------------------------------------------
+
 
 Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
 {
@@ -6017,7 +6017,7 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const
     return aWinClipRegion;
 }
 
-// -----------------------------------------------------------------------
+
 
 Region Window::GetPaintRegion() const
 {
@@ -6035,7 +6035,7 @@ Region Window::GetPaintRegion() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ExpandPaintClipRegion( const Region& rRegion )
 {
@@ -6061,7 +6061,7 @@ void Window::ExpandPaintClipRegion( const Region& rRegion )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static SystemWindow *ImplGetLastSystemWindow( Window *pWin )
 {
@@ -6245,7 +6245,7 @@ void Window::SetParent( Window* pNewParent )
         Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Show( bool bVisible, sal_uInt16 nFlags )
 {
@@ -6497,7 +6497,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
     */
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Window::GetSizePixel() const
 {
@@ -6531,7 +6531,7 @@ void Window::GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder,
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void Window::Enable( bool bEnable, bool bChild )
 {
@@ -6593,7 +6593,7 @@ void Window::Enable( bool bEnable, bool bChild )
         ImplGenerateMouseMove();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetCallHandlersOnInputDisabled( bool bCall )
 {
@@ -6607,14 +6607,14 @@ void Window::SetCallHandlersOnInputDisabled( bool bCall )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsCallHandlersOnInputDisabled() const
 {
     return mpWindowImpl->mbCallHandlersDuringInputDisabled ? true : false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EnableInput( bool bEnable, bool bChild )
 {
@@ -6679,7 +6679,7 @@ void Window::EnableInput( bool bEnable, bool bChild )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin,
                           const Window* pExcludeWindow )
@@ -6745,7 +6745,7 @@ void Window::EnableInput( bool bEnable, bool bChild, bool bSysWin,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::AlwaysEnableInput( bool bAlways, bool bChild )
 {
@@ -6776,7 +6776,7 @@ void Window::AlwaysEnableInput( bool bAlways, bool bChild )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::AlwaysDisableInput( bool bAlways, bool bChild )
 {
@@ -6807,7 +6807,7 @@ void Window::AlwaysDisableInput( bool bAlways, bool bChild )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetActivateMode( sal_uInt16 nMode )
 {
@@ -6840,7 +6840,7 @@ void Window::SetActivateMode( sal_uInt16 nMode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ToTop( sal_uInt16 nFlags )
 {
@@ -6849,7 +6849,7 @@ void Window::ToTop( sal_uInt16 nFlags )
     ImplFocusToTop( nFlags, IsReallyVisible() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
 {
@@ -7024,7 +7024,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EnableAlwaysOnTop( bool bEnable )
 {
@@ -7040,7 +7040,7 @@ void Window::EnableAlwaysOnTop( bool bEnable )
         mpWindowImpl->mpFrame->SetAlwaysOnTop( bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::setPosSizePixel( long nX, long nY,
                               long nWidth, long nHeight, sal_uInt16 nFlags )
@@ -7171,14 +7171,14 @@ void Window::setPosSizePixel( long nX, long nY,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::GetPosPixel() const
 {
     return mpWindowImpl->maPos;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Window::GetDesktopRectPixel() const
 {
@@ -7187,7 +7187,7 @@ Rectangle Window::GetDesktopRectPixel() const
     return rRect;
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::OutputToScreenPixel( const Point& rPos ) const
 {
@@ -7195,7 +7195,7 @@ Point Window::OutputToScreenPixel( const Point& rPos ) const
     return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::ScreenToOutputPixel( const Point& rPos ) const
 {
@@ -7203,7 +7203,7 @@ Point Window::ScreenToOutputPixel( const Point& rPos ) const
     return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY );
 }
 
-// -----------------------------------------------------------------------
+
 
 long Window::ImplGetUnmirroredOutOffX()
 {
@@ -7242,7 +7242,7 @@ Point Window::NormalizedScreenToOutputPixel( const Point& rPos ) const
     return Point( rPos.X()-offx, rPos.Y()-mnOutOffY );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const
 {
@@ -7254,7 +7254,7 @@ Point Window::OutputToAbsoluteScreenPixel( const Point& rPos ) const
     return p;
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const
 {
@@ -7266,7 +7266,7 @@ Point Window::AbsoluteScreenToOutputPixel( const Point& rPos ) const
     return p;
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rRect ) const
 {
@@ -7286,7 +7286,7 @@ Rectangle Window::ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle &rR
 }
 
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Window::GetWindowExtentsRelative( Window *pRelativeWindow ) const
 {
@@ -7300,7 +7300,7 @@ Rectangle Window::GetClientWindowExtentsRelative( Window *pRelativeWindow ) cons
     return ImplGetWindowExtentsRelative( pRelativeWindow, true );
 }
 
-// -----------------------------------------------------------------------
+
 
 Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bClientOnly ) const
 {
@@ -7330,7 +7330,7 @@ Rectangle Window::ImplGetWindowExtentsRelative( Window *pRelativeWindow, bool bC
     return Rectangle( aPos, aSize );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
 {
@@ -7340,7 +7340,7 @@ void Window::Scroll( long nHorzScroll, long nVertScroll, sal_uInt16 nFlags )
                 nHorzScroll, nVertScroll, nFlags & ~SCROLL_CLIP );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Scroll( long nHorzScroll, long nVertScroll,
                      const Rectangle& rRect, sal_uInt16 nFlags )
@@ -7353,7 +7353,7 @@ void Window::Scroll( long nHorzScroll, long nVertScroll,
         ImplScroll( aRect, nHorzScroll, nVertScroll, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Invalidate( sal_uInt16 nFlags )
 {
@@ -7364,7 +7364,7 @@ void Window::Invalidate( sal_uInt16 nFlags )
     ImplInvalidate( NULL, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
 {
@@ -7382,7 +7382,7 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
 {
@@ -7400,7 +7400,7 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Validate( sal_uInt16 nFlags )
 {
@@ -7411,7 +7411,7 @@ void Window::Validate( sal_uInt16 nFlags )
     ImplValidate( NULL, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::HasPaintEvent() const
 {
@@ -7440,7 +7440,7 @@ bool Window::HasPaintEvent() const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Update()
 {
@@ -7509,7 +7509,7 @@ void Window::Update()
         Flush();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Flush()
 {
@@ -7518,7 +7518,7 @@ void Window::Flush()
     mpWindowImpl->mpFrame->Flush( aWinRect );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Sync()
 {
@@ -7526,7 +7526,7 @@ void Window::Sync()
     mpWindowImpl->mpFrame->Sync();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetUpdateMode( bool bUpdate )
 {
@@ -7535,7 +7535,7 @@ void Window::SetUpdateMode( bool bUpdate )
     StateChanged( STATE_CHANGE_UPDATEMODE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::GrabFocus()
 {
@@ -7543,7 +7543,7 @@ void Window::GrabFocus()
     ImplGrabFocus( 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::HasFocus() const
 {
@@ -7563,7 +7563,7 @@ bool Window::HasFocus() const
     return (this == ImplGetSVData()->maWinData.mpFocusWin);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::GrabFocusToDocument()
 {
@@ -7575,7 +7575,7 @@ void Window::SetFakeFocus( bool bFocus )
     ImplGetWindowImpl()->mbFakeFocusSet = bFocus;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::HasChildPathFocus( bool bSystemWindow ) const
 {
@@ -7595,7 +7595,7 @@ bool Window::HasChildPathFocus( bool bSystemWindow ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::CaptureMouse()
 {
@@ -7616,7 +7616,7 @@ void Window::CaptureMouse()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ReleaseMouse()
 {
@@ -7634,7 +7634,7 @@ void Window::ReleaseMouse()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsMouseCaptured() const
 {
@@ -7642,7 +7642,7 @@ bool Window::IsMouseCaptured() const
     return (this == ImplGetSVData()->maWinData.mpCaptureWin);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetPointer( const Pointer& rPointer )
 {
@@ -7657,7 +7657,7 @@ void Window::SetPointer( const Pointer& rPointer )
         mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EnableChildPointerOverwrite( bool bOverwrite )
 {
@@ -7672,7 +7672,7 @@ void Window::EnableChildPointerOverwrite( bool bOverwrite )
         mpWindowImpl->mpFrame->SetPointer( ImplGetMousePointer() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetPointerPosPixel( const Point& rPos )
 {
@@ -7695,7 +7695,7 @@ void Window::SetPointerPosPixel( const Point& rPos )
     mpWindowImpl->mpFrame->SetPointerPos( aPos.X(), aPos.Y() );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::GetPointerPosPixel()
 {
@@ -7710,7 +7710,7 @@ Point Window::GetPointerPosPixel()
     return ImplFrameToOutput( aPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 Point Window::GetLastPointerPosPixel()
 {
@@ -7725,7 +7725,7 @@ Point Window::GetLastPointerPosPixel()
     return ImplFrameToOutput( aPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ShowPointer( bool bVisible )
 {
@@ -7740,7 +7740,7 @@ void Window::ShowPointer( bool bVisible )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Window::PointerState Window::GetPointerState()
 {
@@ -7764,14 +7764,14 @@ Window::PointerState Window::GetPointerState()
     return aState;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsMouseOver()
 {
     return ImplGetWinData()->mbMouseOver;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EnterWait()
 {
@@ -7786,7 +7786,7 @@ void Window::EnterWait()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::LeaveWait()
 {
@@ -7804,7 +7804,7 @@ void Window::LeaveWait()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetCursor( Cursor* pCursor )
 {
@@ -7819,7 +7819,7 @@ void Window::SetCursor( Cursor* pCursor )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetText( const OUString& rStr )
 {
@@ -7851,7 +7851,7 @@ void Window::SetText( const OUString& rStr )
     StateChanged( STATE_CHANGE_TEXT );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Window::GetText() const
 {
@@ -7859,7 +7859,7 @@ OUString Window::GetText() const
     return mpWindowImpl->maText;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString Window::GetDisplayText() const
 {
@@ -7867,7 +7867,7 @@ OUString Window::GetDisplayText() const
     return GetText();
 }
 
-// -----------------------------------------------------------------------
+
 
 const Wallpaper& Window::GetDisplayBackground() const
 {
@@ -7895,7 +7895,7 @@ const Wallpaper& Window::GetDisplayBackground() const
     return rBack;
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& Window::GetHelpText() const
 {
@@ -7932,7 +7932,7 @@ const OUString& Window::GetHelpText() const
     return mpWindowImpl->maHelpText;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::FindWindow( const Point& rPos ) const
 {
@@ -7941,7 +7941,7 @@ Window* Window::FindWindow( const Point& rPos ) const
     return ((Window*)this)->ImplFindWindow( aPos );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 Window::GetChildCount() const
 {
@@ -7957,7 +7957,7 @@ sal_uInt16 Window::GetChildCount() const
     return nChildCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::GetChild( sal_uInt16 nChild ) const
 {
@@ -7975,7 +7975,7 @@ Window* Window::GetChild( sal_uInt16 nChild ) const
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 Window* Window::GetWindow( sal_uInt16 nType ) const
 {
@@ -8066,7 +8066,7 @@ Window* Window::GetWindow( sal_uInt16 nType ) const
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const
 {
@@ -8086,7 +8086,7 @@ bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const
 {
@@ -8096,7 +8096,7 @@ bool Window::IsWindowOrChild( const Window* pWindow, bool bSystemWindow ) const
     return ImplIsChild( pWindow, bSystemWindow );
 }
 
-// -----------------------------------------------------------------------
+
 
 const SystemEnvData* Window::GetSystemData() const
 {
@@ -8116,7 +8116,7 @@ const SystemEnvData* Window::GetSystemData() const
     return aRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow  )
 {
@@ -8128,7 +8128,7 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::
     mpWindowImpl->mpVCLXWindow = pVCLXWindow;
 }
 
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > Window::GetComponentInterface( sal_Bool bCreate )
 {
@@ -8141,7 +8141,7 @@ void Window::SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::
     return mpWindowImpl->mxWindowPeer;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace )
 {
@@ -8151,7 +8151,7 @@ void Window::SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun
         pWrapper->SetWindowInterface( this, xIFace );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallDeactivateListeners( Window *pNew )
 {
@@ -8170,7 +8170,7 @@ void Window::ImplCallDeactivateListeners( Window *pNew )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplCallActivateListeners( Window *pOld )
 {
@@ -8202,7 +8202,7 @@ void Window::ImplCallActivateListeners( Window *pOld )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplStopDnd()
 {
@@ -8218,14 +8218,14 @@ bool Window::ImplStopDnd()
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplStartDnd()
 {
     GetDropTarget();
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< XDropTarget > Window::GetDropTarget()
 {
@@ -8285,7 +8285,7 @@ uno::Reference< XDropTarget > Window::GetDropTarget()
     return uno::Reference< XDropTarget > ( mpWindowImpl->mxDNDListenerContainer, UNO_QUERY );
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< XDragSource > Window::GetDragSource()
 {
@@ -8352,14 +8352,14 @@ uno::Reference< XDragSource > Window::GetDragSource()
     return uno::Reference< XDragSource > ();
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< XDragGestureRecognizer > Window::GetDragGestureRecognizer()
 {
     return uno::Reference< XDragGestureRecognizer > ( GetDropTarget(), UNO_QUERY );
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< XClipboard > Window::GetClipboard()
 {
@@ -8388,7 +8388,7 @@ uno::Reference< XClipboard > Window::GetClipboard()
     return static_cast < XClipboard * > (0);
 }
 
-// -----------------------------------------------------------------------
+
 
 uno::Reference< XClipboard > Window::GetPrimarySelection()
 {
@@ -8433,9 +8433,9 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
     return static_cast < XClipboard * > (0);
 }
 
-// -----------------------------------------------------------------------
+
 // Accessibility
-// -----------------------------------------------------------------------
+
 
 ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( bool bCreate )
 {
@@ -9054,7 +9054,7 @@ void Window::RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle&
     mpOutDevData->mpRecordLayout = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly )
 {
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 05c237571eea..6214e9017857 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -192,7 +192,7 @@ void Window::ImplSaveOverlapBackground()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::ImplRestoreOverlapBackground( Region& rInvRegion )
 {
@@ -233,7 +233,7 @@ bool Window::ImplRestoreOverlapBackground( Region& rInvRegion )
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplDeleteOverlapBackground()
 {
@@ -262,7 +262,7 @@ void Window::ImplDeleteOverlapBackground()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplInvalidateAllOverlapBackgrounds()
 {
@@ -295,7 +295,7 @@ void Window::ImplInvalidateAllOverlapBackgrounds()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ShowFocus( const Rectangle& rRect )
 {
@@ -342,7 +342,7 @@ void Window::ShowFocus( const Rectangle& rRect )
     mpWindowImpl->mbInShowFocus = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::HideFocus()
 {
@@ -377,7 +377,7 @@ void Window::HideFocus()
     mpWindowImpl->mbInHideFocus = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
 {
@@ -412,7 +412,7 @@ void Window::Invert( const Rectangle& rRect, sal_uInt16 nFlags )
     mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
 {
@@ -449,7 +449,7 @@ void Window::Invert( const Polygon& rPoly, sal_uInt16 nFlags )
     mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
 {
@@ -477,7 +477,7 @@ void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
     mpWindowImpl->mbTrackVisible              = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::HideTracking()
 {
@@ -490,7 +490,7 @@ void Window::HideTracking()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
 {
@@ -554,7 +554,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
 {
@@ -607,7 +607,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags )
     pGraphics->Invert( nPoints, pPtAry, SAL_INVERT_TRACKFRAME, this );
 }
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
 {
@@ -634,7 +634,7 @@ IMPL_LINK( Window, ImplTrackTimerHdl, Timer*, pTimer )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::StartTracking( sal_uInt16 nFlags )
 {
@@ -663,7 +663,7 @@ void Window::StartTracking( sal_uInt16 nFlags )
     CaptureMouse();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EndTracking( sal_uInt16 nFlags )
 {
@@ -706,14 +706,14 @@ void Window::EndTracking( sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::IsTracking() const
 {
     return (ImplGetSVData()->maWinData.mpTrackWin == this);
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::StartAutoScroll( sal_uInt16 nFlags )
 {
@@ -730,7 +730,7 @@ void Window::StartAutoScroll( sal_uInt16 nFlags )
     pSVData->maAppData.mpWheelWindow = new ImplWheelWindow( this );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::EndAutoScroll()
 {
@@ -746,7 +746,7 @@ void Window::EndAutoScroll()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SaveBackground( const Point& rPos, const Size& rSize,
                              const Point& rDestOff, VirtualDevice& rSaveDevice )
@@ -780,7 +780,7 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize,
         rSaveDevice.DrawOutDev( rDestOff, rSize, rPos, rSize, *this );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uIntPtr Window::SaveFocus()
 {
@@ -796,7 +796,7 @@ sal_uIntPtr Window::SaveFocus()
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore )
 {
@@ -819,7 +819,7 @@ bool Window::EndSaveFocus( sal_uIntPtr nSaveId, bool bRestore )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetZoom( const Fraction& rZoom )
 {
@@ -830,14 +830,14 @@ void Window::SetZoom( const Fraction& rZoom )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 inline long WinFloatRound( double fVal )
 {
     return( fVal > 0.0 ? (long) ( fVal + 0.5 ) : -(long) ( -fVal + 0.5 ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetZoomedPointFont( const Font& rFont )
 {
@@ -877,7 +877,7 @@ void Window::SetZoomedPointFont( const Font& rFont )
         SetPointFont( rFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 long Window::CalcZoom( long nCalc ) const
 {
@@ -893,7 +893,7 @@ long Window::CalcZoom( long nCalc ) const
     return nCalc;
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetControlFont()
 {
@@ -905,7 +905,7 @@ void Window::SetControlFont()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetControlFont( const Font& rFont )
 {
@@ -927,7 +927,7 @@ void Window::SetControlFont( const Font& rFont )
     StateChanged( STATE_CHANGE_CONTROLFONT );
 }
 
-// -----------------------------------------------------------------------
+
 
 Font Window::GetControlFont() const
 {
@@ -940,7 +940,7 @@ Font Window::GetControlFont() const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetControlForeground()
 {
@@ -952,7 +952,7 @@ void Window::SetControlForeground()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetControlForeground( const Color& rColor )
 {
@@ -976,7 +976,7 @@ void Window::SetControlForeground( const Color& rColor )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetControlBackground()
 {
@@ -988,7 +988,7 @@ void Window::SetControlBackground()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::SetControlBackground( const Color& rColor )
 {
@@ -1012,7 +1012,7 @@ void Window::SetControlBackground( const Color& rColor )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Window::CalcWindowSize( const Size& rOutSz ) const
 {
@@ -1022,7 +1022,7 @@ Size Window::CalcWindowSize( const Size& rOutSz ) const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Window::CalcOutputSize( const Size& rWinSz ) const
 {
@@ -1032,7 +1032,7 @@ Size Window::CalcOutputSize( const Size& rWinSz ) const
     return aSz;
 }
 
-// -----------------------------------------------------------------------
+
 
 Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
 {
@@ -1044,7 +1044,7 @@ Font Window::GetDrawPixelFont( OutputDevice* pDev ) const
     return aFont;
 }
 
-// -----------------------------------------------------------------------
+
 
 long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const
 {
@@ -1060,7 +1060,7 @@ long Window::GetDrawPixel( OutputDevice* pDev, long nPixels ) const
     return nP;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void lcl_HandleScrollHelper( ScrollBar* pScrl, long nN, bool isMultiplyByLineSize )
 {
@@ -1252,7 +1252,7 @@ bool Window::HandleScrollCommand( const CommandEvent& rCmd,
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 
 
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index 00919acce11a..88430780f077 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.cxx
@@ -22,7 +22,7 @@
 #include "vcl/waitobj.hxx"
 #include "vcl/button.hxx"
 
-// -----------------------------------------------------------------------
+
 
 WaitObject::~WaitObject()
 {
@@ -30,14 +30,14 @@ WaitObject::~WaitObject()
         mpWindow->LeaveWait();
 }
 
-// -----------------------------------------------------------------------
+
 
 Size Window::GetOptimalSize() const
 {
     return Size();
 }
 
-// -----------------------------------------------------------------------
+
 
 void Window::ImplAdjustNWFSizes()
 {
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 5a9e2f14cfbd..69f2db6f02b7 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -168,7 +168,7 @@ static bool ImplHandleMouseFloatMode( Window* pChild, const Point& rMousePos,
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos )
 {
@@ -200,7 +200,7 @@ static void ImplHandleMouseHelpRequest( Window* pChild, const Point& rMousePos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSetMousePointer( Window* pChild )
 {
@@ -211,7 +211,7 @@ static void ImplSetMousePointer( Window* pChild )
         pChild->ImplGetFrame()->SetPointer( pChild->ImplGetMousePointer() );
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL,
                              bool bMouse = false, Point* pPos = NULL )
@@ -254,7 +254,7 @@ static bool ImplCallCommand( Window* pChild, sal_uInt16 nEvt, void* pData = NULL
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 /*  #i34277# delayed context menu activation;
 *   necessary if there already was a popup menu running.
@@ -854,7 +854,7 @@ bool ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeav
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static Window* ImplGetKeyInputWindow( Window* pWindow )
 {
@@ -897,7 +897,7 @@ static Window* ImplGetKeyInputWindow( Window* pWindow )
     return pChild;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
                            sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward )
@@ -1187,7 +1187,7 @@ static bool ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleExtTextInput( Window* pWindow,
                                     const OUString& rText,
@@ -1282,7 +1282,7 @@ static bool ImplHandleExtTextInput( Window* pWindow,
     return !ImplCallCommand( pChild, COMMAND_EXTTEXTINPUT, &aData );
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleEndExtTextInput( Window* /* pWindow */ )
 {
@@ -1311,7 +1311,7 @@ static bool ImplHandleEndExtTextInput( Window* /* pWindow */ )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleExtTextInputPos( Window* pWindow,
                                        Rectangle& rRect, long& rInputWidth,
@@ -1359,7 +1359,7 @@ static void ImplHandleExtTextInputPos( Window* pWindow,
             = pChild != 0 && pChild->GetInputContext().GetFont().IsVertical();
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang )
 {
@@ -1368,7 +1368,7 @@ static bool ImplHandleInputContextChange( Window* pWindow, LanguageType eNewLang
     return !ImplCallCommand( pChild, COMMAND_INPUTCONTEXTCHANGE, &aData );
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
                                   const CommandWheelData* pWheelData )
@@ -1392,7 +1392,7 @@ static bool ImplCallWheelCommand( Window* pWindow, const Point& rPos,
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEvt, bool scaleDirectly = false )
 {
@@ -1499,7 +1499,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv
     return !bRet;
 }
 
-// -----------------------------------------------------------------------
+
 #define IMPL_PAINT_CHECKRTL         ((sal_uInt16)0x0020)
 
 static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate )
@@ -1532,7 +1532,7 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void KillOwnPopups( Window* pWindow )
 {
@@ -1546,7 +1546,7 @@ static void KillOwnPopups( Window* pWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
 {
@@ -1615,7 +1615,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
     pWindow->ImplGetWindowImpl()->mpFrameData->mbMinimized = bMinimized;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleMove( Window* pWindow )
 {
@@ -1642,7 +1642,7 @@ static void ImplHandleMove( Window* pWindow )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeight )
 {
@@ -1650,7 +1650,7 @@ static void ImplHandleMoveResize( Window* pWindow, long nNewWidth, long nNewHeig
     ImplHandleResize( pWindow, nNewWidth, nNewHeight );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplActivateFloatingWindows( Window* pWindow, bool bActive )
 {
@@ -1671,7 +1671,7 @@ static void ImplActivateFloatingWindows( Window* pWindow, bool bActive )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl)
 {
@@ -1781,7 +1781,7 @@ IMPL_LINK_NOARG(Window, ImplAsyncFocusHdl)
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleGetFocus( Window* pWindow )
 {
@@ -1800,7 +1800,7 @@ static void ImplHandleGetFocus( Window* pWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleLoseFocus( Window* pWindow )
 {
@@ -1840,7 +1840,7 @@ static void ImplHandleLoseFocus( Window* pWindow )
         pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true );
 }
 
-// -----------------------------------------------------------------------
+
 struct DelayedCloseEvent
 {
     Window*         pWindow;
@@ -1920,7 +1920,7 @@ void ImplHandleClose( Window* pWindow )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleUserEvent( ImplSVEvent* pSVEvent )
 {
@@ -1964,7 +1964,7 @@ static sal_uInt16 ImplGetMouseMoveMode( SalMouseEvent* pEvent )
     return nMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent )
 {
@@ -1982,7 +1982,7 @@ static sal_uInt16 ImplGetMouseButtonMode( SalMouseEvent* pEvent )
     return nMode;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent )
 {
@@ -1992,7 +1992,7 @@ inline bool ImplHandleSalMouseLeave( Window* pWindow, SalMouseEvent* pEvent )
                                  ImplGetMouseMoveMode( pEvent ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent )
 {
@@ -2002,7 +2002,7 @@ inline bool ImplHandleSalMouseMove( Window* pWindow, SalMouseEvent* pEvent )
                                  ImplGetMouseMoveMode( pEvent ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent )
 {
@@ -2017,7 +2017,7 @@ inline bool ImplHandleSalMouseButtonDown( Window* pWindow, SalMouseEvent* pEvent
                                  ImplGetMouseButtonMode( pEvent ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent )
 {
@@ -2032,14 +2032,14 @@ inline bool ImplHandleSalMouseButtonUp( Window* pWindow, SalMouseEvent* pEvent )
                                  ImplGetMouseButtonMode( pEvent ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleSalMouseActivate( Window* /*pWindow*/, SalMouseActivateEvent* /*pEvent*/ )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt16 nEvent )
 {
@@ -2082,7 +2082,7 @@ static bool ImplHandleMenuEvent( Window* pWindow, SalMenuEvent* pEvent, sal_uInt
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent )
 {
@@ -2121,7 +2121,7 @@ static void ImplHandleSalKeyMod( Window* pWindow, SalKeyModEvent* pEvent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleInputLanguageChange( Window* pWindow )
 {
@@ -2133,7 +2133,7 @@ static void ImplHandleInputLanguageChange( Window* pWindow )
     ImplCallCommand( pChild, COMMAND_INPUTLANGUAGECHANGE );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSalSettings( sal_uInt16 nEvent )
 {
@@ -2187,7 +2187,7 @@ static void ImplHandleSalSettings( sal_uInt16 nEvent )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEvent* pEvt )
 {
@@ -2209,7 +2209,7 @@ static void ImplHandleSalExtTextInputPos( Window* pWindow, SalExtTextInputPosEve
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandleShowDialog( Window* pWindow, int nDialogId )
 {
@@ -2226,7 +2226,7 @@ static bool ImplHandleShowDialog( Window* pWindow, int nDialogId )
     return ImplCallCommand( pWindow, COMMAND_SHOWDIALOG, &aCmdData );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSurroundingTextRequest( Window *pWindow,
                           OUString& rText,
@@ -2249,7 +2249,7 @@ static void ImplHandleSurroundingTextRequest( Window *pWindow,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSalSurroundingTextRequest( Window *pWindow,
                          SalSurroundingTextRequestEvent *pEvt )
@@ -2274,7 +2274,7 @@ static void ImplHandleSalSurroundingTextRequest( Window *pWindow,
         pEvt->mnEnd = aSelRange.Max();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSurroundingTextSelectionChange( Window *pWindow,
                               sal_uLong nStart,
@@ -2288,7 +2288,7 @@ static void ImplHandleSurroundingTextSelectionChange( Window *pWindow,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleStartReconversion( Window *pWindow )
 {
@@ -2297,7 +2297,7 @@ static void ImplHandleStartReconversion( Window *pWindow )
     ImplCallCommand( pChild, COMMAND_PREPARERECONVERSION );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSalQueryCharPosition( Window *pWindow,
                                             SalQueryCharPositionEvent *pEvt )
@@ -2342,7 +2342,7 @@ static void ImplHandleSalQueryCharPosition( Window *pWindow,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplWindowFrameProc( Window* pWindow, SalFrame* /*pFrame*/,
                           sal_uInt16 nEvent, const void* pEvent )
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 4f6eee505780..3f29acade5bd 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -47,7 +47,7 @@ void WorkWindow::ImplInitWorkWindowData()
     mbFullScreenMode        = false;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData )
 {
@@ -73,7 +73,7 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pS
     SetActivateMode( ACTIVATE_MODE_GRABFOCUS );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::star::uno::Any& aSystemWorkWindowToken )
 {
@@ -90,7 +90,7 @@ void WorkWindow::ImplInit( Window* pParent, WinBits nStyle, const ::com::sun::st
         ImplInit( pParent, nStyle, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 WorkWindow::WorkWindow( WindowType nType ) :
     SystemWindow( nType )
@@ -98,7 +98,7 @@ WorkWindow::WorkWindow( WindowType nType ) :
     ImplInitWorkWindowData();
 }
 
-// -----------------------------------------------------------------------
+
 
 WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) :
     SystemWindow( WINDOW_WORKWINDOW )
@@ -107,7 +107,7 @@ WorkWindow::WorkWindow( Window* pParent, WinBits nStyle ) :
     ImplInit( pParent, nStyle, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSystemWorkWindowToken, WinBits nStyle ) :
     SystemWindow( WINDOW_WORKWINDOW )
@@ -117,7 +117,7 @@ WorkWindow::WorkWindow( Window* pParent, const ::com::sun::star::uno::Any& aSyst
     ImplInit( pParent, nStyle, aSystemWorkWindowToken );
 }
 
-// -----------------------------------------------------------------------
+
 
 WorkWindow::WorkWindow( SystemParentData* pParent ) :
     SystemWindow( WINDOW_WORKWINDOW )
@@ -127,7 +127,7 @@ WorkWindow::WorkWindow( SystemParentData* pParent ) :
     ImplInit( NULL, 0, pParent );
 }
 
-// -----------------------------------------------------------------------
+
 
 WorkWindow::~WorkWindow()
 {
@@ -139,7 +139,7 @@ WorkWindow::~WorkWindow()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WorkWindow::ShowFullScreenMode( bool bFullScreenMode )
 {
@@ -171,7 +171,7 @@ void WorkWindow::ShowFullScreenMode( bool bFullScreenMode, sal_Int32 nDisplayScr
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags )
 {
@@ -222,7 +222,7 @@ void WorkWindow::StartPresentationMode( bool bPresentation, sal_uInt16 nFlags, s
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WorkWindow::IsMinimized() const
 {
@@ -232,7 +232,7 @@ bool WorkWindow::IsMinimized() const
     return (( aState.mnState & WINDOWSTATE_STATE_MINIMIZED ) != 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WorkWindow::SetPluginParent( SystemParentData* pParent )
 {
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index b5c2f7775050..1c798ae8ec6a 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -38,11 +38,11 @@
 #include "unx/i18n_im.hxx"
 #include "salframe.hxx"
 
-// -------------------------------------------------------------------------
+
 //
 // i. preedit start callback
 //
-// -------------------------------------------------------------------------
+
 
 int
 PreeditStartCallback ( XIC, XPointer client_data, XPointer )
@@ -58,11 +58,11 @@ PreeditStartCallback ( XIC, XPointer client_data, XPointer )
     return -1;
 }
 
-// -------------------------------------------------------------------------
+
 //
 // ii. preedit done callback
 //
-// -------------------------------------------------------------------------
+
 
 void
 PreeditDoneCallback ( XIC, XPointer client_data, XPointer )
@@ -76,11 +76,11 @@ PreeditDoneCallback ( XIC, XPointer client_data, XPointer )
     pPreeditData->eState = ePreeditStatusStartPending;
 }
 
-// -------------------------------------------------------------------------
+
 //
 // iii. preedit draw callback
 //
-// -------------------------------------------------------------------------
+
 
 //
 // Handle deletion of text in a preedit_draw_callback
@@ -423,11 +423,11 @@ GetPreeditSpotLocation(XIC ic, XPointer client_data)
     return;
 }
 
-// -------------------------------------------------------------------------
+
 //
 // iv. preedit caret callback
 //
-// -------------------------------------------------------------------------
+
 
 #if OSL_DEBUG_LEVEL > 1
 void
@@ -472,12 +472,12 @@ PreeditCaretCallback ( XIC, XPointer,XIMPreeditCaretCallbackStruct* )
     #endif
 }
 
-// -----------------------------------------------------------------------
+
 //
 // v. commit string callback: convert an extended text input (iiimp ... )
 //     into an ordinary key-event
 //
-// -----------------------------------------------------------------------
+
 
 Bool
 IsControlCode(sal_Unicode nChar)
@@ -488,11 +488,11 @@ IsControlCode(sal_Unicode nChar)
         return False;
 }
 
-// ----------------------------------------------------------------------------------
+
 //
 // vi. status callbacks: for now these are empty, they are just needed for turbo linux
 //
-// ----------------------------------------------------------------------------------
+
 
 void
 StatusStartCallback (XIC, XPointer, XPointer)
@@ -557,11 +557,11 @@ SwitchIMCallback (XIC, XPointer, XPointer call_data)
     ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
 }
 
-// ----------------------------------------------------------------------------------
+
 //
 // vii. destroy callbacks: internally disable all IC/IM calls
 //
-// ----------------------------------------------------------------------------------
+
 
 void
 IC_IMDestroyCallback (XIM, XPointer client_data, XPointer)
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 84d2e441a436..d486066e82b8 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -56,12 +56,12 @@ static void sendEmptyCommit( SalFrame* pFrame )
         pFrame->CallCallback( SALEVENT_ENDEXTTEXTINPUT, NULL );
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // Constructor / Destructor, the InputContext is bound to the SalFrame, as it
 // needs the shell window as a focus window
 //
-// ----------------------------------------------------------------------------
+
 
 SalI18N_InputContext::~SalI18N_InputContext()
 {
@@ -80,9 +80,9 @@ SalI18N_InputContext::~SalI18N_InputContext()
         free(maClientData.aText.pCharStyle);
 }
 
-// ----------------------------------------------------------------------------
+
 // convenience routine to add items to a XVaNestedList
-// ----------------------------------------------------------------------------
+
 
 static XVaNestedList
 XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
@@ -111,9 +111,9 @@ XVaAddToNestedList( XVaNestedList a_srclist, char* name, XPointer value )
     return a_dstlist != NULL ? a_dstlist : a_srclist ;
 }
 
-// ----------------------------------------------------------------------------
+
 // convenience routine to create a fontset
-// ----------------------------------------------------------------------------
+
 
 static XFontSet
 get_font_set( Display *p_display )
@@ -133,11 +133,11 @@ get_font_set( Display *p_display )
     return p_font_set;
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // Constructor for a InputContext (IC)
 //
-// ----------------------------------------------------------------------------
+
 
 SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
         mbUseable( True ),
@@ -373,12 +373,12 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) :
     }
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // In Solaris 8 the status window does not unmap if the frame unmapps, so
 // unmap it the hard way
 //
-// ---------------------------------------------------------------------------
+
 
 void
 SalI18N_InputContext::Unmap( SalFrame* pFrame )
@@ -419,12 +419,12 @@ SalI18N_InputContext::Map( SalFrame *pFrame )
     }
 }
 
-// --------------------------------------------------------------------------
+
 //
 // Handle DestroyCallbacks
 // in fact this is a callback called from the XNDestroyCallback
 //
-// --------------------------------------------------------------------------
+
 
 void
 SalI18N_InputContext::HandleDestroyIM()
@@ -433,12 +433,12 @@ SalI18N_InputContext::HandleDestroyIM()
     mbUseable = False;
 }
 
-// ---------------------------------------------------------------------------
+
 //
 //  make sure, the input method gets all the X-Events it needs, this is only
 //  called once on each frame, it relys on a valid maContext
 //
-// ---------------------------------------------------------------------------
+
 
 void
 SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow )
@@ -460,11 +460,11 @@ SalI18N_InputContext::ExtendEventMask( XLIB_Window aFocusWindow )
     }
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // tune the styles provided by the input method with the supported one
 //
-// ---------------------------------------------------------------------------
+
 
 unsigned int
 SalI18N_InputContext::GetWeightingOfIMStyle( XIMStyle nStyle ) const
@@ -547,11 +547,11 @@ SalI18N_InputContext::SupportInputMethodStyle( XIMStyles *pIMStyles )
     return (mnPreeditStyle != 0) && (mnStatusStyle != 0) ;
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // handle extended and normal key input
 //
-// ---------------------------------------------------------------------------
+
 
 int
 SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
@@ -603,13 +603,13 @@ SalI18N_InputContext::UpdateSpotLocation()
     return 0;
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // set and unset the focus for the Input Context
 // the context may be NULL despite it is useable if the framewindow is
 // in unmapped state
 //
-// ---------------------------------------------------------------------------
+
 
 void
 SalI18N_InputContext::SetICFocus( SalFrame* pFocusFrame )
@@ -655,11 +655,11 @@ SalI18N_InputContext::UnsetICFocus( SalFrame* pFrame )
     }
 }
 
-// ---------------------------------------------------------------------------
+
 //
 // multi byte input method only
 //
-// ---------------------------------------------------------------------------
+
 
 void
 SalI18N_InputContext::SetLanguage(LanguageType)
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 9d91943e468b..576023b3621b 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -48,12 +48,12 @@ using namespace vcl;
 extern "C" char * XSetIMValues(XIM im, ...);
 #endif
 
-// ------------------------------------------------------------------------------------
+
 //
 // kinput2 IME needs special key handling since key release events are filtered in
 // preeditmode and XmbResetIC does not work
 //
-// ------------------------------------------------------------------------------------
+
 
 bool
 IMServerKinput2 ()
@@ -143,11 +143,11 @@ XKeyEventOp::match (const XKeyEvent &rEvent) const
             && same_screen == rEvent.same_screen;
 }
 
-// -------------------------------------------------------------------------
+
 //
 // locale handling
 //
-// -------------------------------------------------------------------------
+
 
 //  Locale handling of the operating system layer
 
@@ -262,11 +262,11 @@ SalI18N_InputMethod::PosixLocale()
     return False;
 }
 
-// ------------------------------------------------------------------------
+
 //
 // Constructor / Destructor / Initialisation
 //
-// ------------------------------------------------------------------------
+
 
 SalI18N_InputMethod::SalI18N_InputMethod( ) : mbUseable( bUseInputMethodDefault ),
                                               maMethod( (XIM)NULL ),
@@ -446,7 +446,7 @@ SalI18N_InputMethod::HandleDestroyIM()
     maMethod        = NULL;
 }
 
-// ------------------------------------------------------------------------
+
 //
 // add a connection watch into the SalXLib yieldTable to allow iiimp
 // connection processing: soffice waits in select() not in XNextEvent(), so
@@ -455,7 +455,7 @@ SalI18N_InputMethod::HandleDestroyIM()
 // have the focus because the atok12 lookup choice aux window has it we stay
 // deaf and dump otherwise.
 //
-// ------------------------------------------------------------------------
+
 
 int
 InputMethod_HasPendingEvent(int nFileDescriptor, void *pData)
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 3446d18472dc..995c25b645c6 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -75,7 +75,7 @@ void StatusWindow::setPosition( SalFrame* )
 {
 }
 
-// --------------------------------------------------------------------------
+
 
 namespace vcl {
 
@@ -301,7 +301,7 @@ OUString XIMStatusWindow::getText() const
     return m_aStatusText.GetText();
 }
 
-// --------------------------------------------------------------------------
+
 
 namespace vcl {
 
@@ -470,7 +470,7 @@ void IIIMPStatusWindow::GetFocus()
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 IMPL_LINK( IIIMPStatusWindow, SelectHdl, MenuButton*, pBtn )
 {
@@ -516,14 +516,14 @@ I18NStatus& I18NStatus::get()
     return *pInstance;
 }
 
-// --------------------------------------------------------------------------
+
 
 bool I18NStatus::exists()
 {
     return pInstance != NULL;
 }
 
-// --------------------------------------------------------------------------
+
 
 void I18NStatus::free()
 {
@@ -531,7 +531,7 @@ void I18NStatus::free()
         delete pInstance, pInstance = NULL;
 }
 
-// --------------------------------------------------------------------------
+
 
 I18NStatus::I18NStatus() :
         m_pParent( NULL ),
@@ -539,7 +539,7 @@ I18NStatus::I18NStatus() :
 {
 }
 
-// --------------------------------------------------------------------------
+
 
 I18NStatus::~I18NStatus()
 {
@@ -549,7 +549,7 @@ I18NStatus::~I18NStatus()
         pInstance = NULL;
 }
 
-// --------------------------------------------------------------------------
+
 
 void I18NStatus::setParent( SalFrame* pParent )
 {
@@ -567,7 +567,7 @@ void I18NStatus::setParent( SalFrame* pParent )
     m_pStatusWindow->setPosition( m_pParent );
 }
 
-// --------------------------------------------------------------------------
+
 
 void I18NStatus::show( bool bShow, ShowReason eReason )
 {
@@ -578,7 +578,7 @@ void I18NStatus::show( bool bShow, ShowReason eReason )
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void I18NStatus::setStatusText( const OUString& rText )
 {
@@ -615,14 +615,14 @@ void I18NStatus::setStatusText( const OUString& rText )
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void I18NStatus::changeIM( const OUString& rIM )
 {
     m_aCurrentIM = rIM;
 }
 
-// --------------------------------------------------------------------------
+
 
 SalFrame* I18NStatus::getStatusFrame() const
 {
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 2ea2c4c61141..23d296c0ed7b 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -146,7 +146,7 @@ static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI )
     return true;
 }
 
-// ---------------------------------------------------------------------------
+
 extern "C" srv_vendor_t
 sal_GetServerVendor( Display *p_display )
 {
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 487cd637f45d..02066a6b074e 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -78,7 +78,7 @@ X11SalInstance::~X11SalInstance()
 }
 
 
-// --------------------------------------------------------
+
 // AnyInput from sv/mow/source/app/svapp.cxx
 
 struct PredicateReturn
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index 10863b26f470..521c8b404095 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -71,7 +71,7 @@ X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 X11Clipboard::~X11Clipboard()
 {
@@ -90,7 +90,7 @@ X11Clipboard::~X11Clipboard()
 }
 
 
-// ------------------------------------------------------------------------
+
 
 void X11Clipboard::fireChangedContentsEvent()
 {
@@ -111,7 +111,7 @@ void X11Clipboard::fireChangedContentsEvent()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void X11Clipboard::clearContents()
 {
@@ -134,7 +134,7 @@ void X11Clipboard::clearContents()
         xOwner->lostOwnership(xThis, m_aContents);
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
     throw(RuntimeException)
@@ -146,7 +146,7 @@ Reference< XTransferable > SAL_CALL X11Clipboard::getContents()
     return m_aContents;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL X11Clipboard::setContents(
     const Reference< XTransferable >& xTrans,
@@ -181,7 +181,7 @@ void SAL_CALL X11Clipboard::setContents(
     fireChangedContentsEvent();
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SAL_CALL X11Clipboard::getName()
     throw(RuntimeException)
@@ -189,7 +189,7 @@ OUString SAL_CALL X11Clipboard::getName()
     return m_rSelectionManager.getString( m_aSelection );
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
     throw(RuntimeException)
@@ -198,7 +198,7 @@ sal_Int8 SAL_CALL X11Clipboard::getRenderingCapabilities()
 }
 
 
-// ------------------------------------------------------------------------
+
 void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardListener >& listener )
     throw(RuntimeException)
 {
@@ -206,7 +206,7 @@ void SAL_CALL X11Clipboard::addClipboardListener( const Reference< XClipboardLis
     m_aListeners.push_back( listener );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboardListener >& listener )
     throw(RuntimeException)
@@ -216,35 +216,35 @@ void SAL_CALL X11Clipboard::removeClipboardListener( const Reference< XClipboard
 }
 
 
-// ------------------------------------------------------------------------
+
 
 Reference< XTransferable > X11Clipboard::getTransferable()
 {
     return getContents();
 }
 
-// ------------------------------------------------------------------------
+
 
 void X11Clipboard::clearTransferable()
 {
     clearContents();
 }
 
-// ------------------------------------------------------------------------
+
 
 void X11Clipboard::fireContentsChanged()
 {
     fireChangedContentsEvent();
 }
 
-// ------------------------------------------------------------------------
+
 
 Reference< XInterface > X11Clipboard::getReference() throw()
 {
     return Reference< XInterface >( static_cast< OWeakObject* >(this) );
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SAL_CALL X11Clipboard::getImplementationName(  )
     throw(RuntimeException)
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index f8463ab7dedd..9c593a487d34 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -46,7 +46,7 @@ DropTarget::~DropTarget()
         m_pSelectionManager->deregisterDropTarget( m_aTargetWindow );
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception )
 {
@@ -76,7 +76,7 @@ void DropTarget::initialize( const Sequence< Any >& arguments ) throw( ::com::su
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw()
 {
@@ -85,7 +85,7 @@ void DropTarget::addDropTargetListener( const Reference< XDropTargetListener >&
     m_aListeners.push_back( xListener );
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener >& xListener ) throw()
 {
@@ -94,14 +94,14 @@ void DropTarget::removeDropTargetListener( const Reference< XDropTargetListener
     m_aListeners.remove( xListener );
 }
 
-// --------------------------------------------------------------------------
+
 
 sal_Bool DropTarget::isActive() throw()
 {
     return m_bActive;
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::setActive( sal_Bool active ) throw()
 {
@@ -110,14 +110,14 @@ void DropTarget::setActive( sal_Bool active ) throw()
     m_bActive = active;
 }
 
-// --------------------------------------------------------------------------
+
 
 sal_Int8 DropTarget::getDefaultActions() throw()
 {
     return m_nDefaultActions;
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::setDefaultActions( sal_Int8 actions ) throw()
 {
@@ -126,7 +126,7 @@ void DropTarget::setDefaultActions( sal_Int8 actions ) throw()
     m_nDefaultActions = actions;
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::drop( const DropTargetDropEvent& dtde ) throw()
 {
@@ -140,7 +140,7 @@ void DropTarget::drop( const DropTargetDropEvent& dtde ) throw()
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw()
 {
@@ -154,7 +154,7 @@ void DropTarget::dragEnter( const DropTargetDragEnterEvent& dtde ) throw()
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::dragExit( const DropTargetEvent& dte ) throw()
 {
@@ -168,7 +168,7 @@ void DropTarget::dragExit( const DropTargetEvent& dte ) throw()
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void DropTarget::dragOver( const DropTargetDragEvent& dtde ) throw()
 {
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 9ae8e0ebbd4e..ff8e07a80ba0 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -199,7 +199,7 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType )
     return aEncoding;
 }
 
-// ------------------------------------------------------------------------
+
 
 ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& SelectionManager::getInstances()
 {
@@ -207,7 +207,7 @@ rtl_TextEncoding x11::getTextPlainEncoding( const OUString& rMimeType )
     return aInstances;
 }
 
-// ------------------------------------------------------------------------
+
 
 SelectionManager::SelectionManager() :
         m_nIncrementalThreshold( 15*1024 ),
@@ -461,7 +461,7 @@ void SelectionManager::initialize( const Sequence< Any >& arguments ) throw (::c
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 SelectionManager::~SelectionManager()
 {
@@ -526,7 +526,7 @@ SelectionManager::~SelectionManager()
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 SelectionAdaptor* SelectionManager::getAdaptor( Atom selection )
 {
@@ -535,7 +535,7 @@ SelectionAdaptor* SelectionManager::getAdaptor( Atom selection )
     return it != m_aSelections.end() ? it->second->m_pAdaptor : NULL;
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SelectionManager::convertFromCompound( const char* pText, int nLen )
 {
@@ -566,7 +566,7 @@ OUString SelectionManager::convertFromCompound( const char* pText, int nLen )
     return aRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 OString SelectionManager::convertToCompound( const OUString& rText )
 {
@@ -606,7 +606,7 @@ OString SelectionManager::convertToCompound( const OUString& rText )
     return aRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::convertData(
                                    const css::uno::Reference< XTransferable >& xTransferable,
@@ -686,7 +686,7 @@ bool SelectionManager::convertData(
     return bSuccess;
 }
 
-// ------------------------------------------------------------------------
+
 
 SelectionManager& SelectionManager::get( const OUString& rDisplayName )
 {
@@ -705,7 +705,7 @@ SelectionManager& SelectionManager::get( const OUString& rDisplayName )
     return *pInstance;
 }
 
-// ------------------------------------------------------------------------
+
 
 const OUString& SelectionManager::getString( Atom aAtom )
 {
@@ -726,7 +726,7 @@ const OUString& SelectionManager::getString( Atom aAtom )
     return m_aAtomToString[ aAtom ];
 }
 
-// ------------------------------------------------------------------------
+
 
 Atom SelectionManager::getAtom( const OUString& rString )
 {
@@ -743,7 +743,7 @@ Atom SelectionManager::getAtom( const OUString& rString )
     return m_aStringToAtom[ rString ];
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::requestOwnership( Atom selection )
 {
@@ -787,7 +787,7 @@ bool SelectionManager::requestOwnership( Atom selection )
     return bSuccess;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront )
 {
@@ -830,7 +830,7 @@ void SelectionManager::convertTypeToNative( const OUString& rType, Atom selectio
         rConversions.push_back( getAtom( rType ) );
 };
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection )
 {
@@ -861,7 +861,7 @@ void SelectionManager::getNativeTypeList( const Sequence< DataFlavor >& rTypes,
         rOutTypeList.push_back( m_nMULTIPLEAtom );
 }
 
-// ------------------------------------------------------------------------
+
 
 OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, int& rFormat )
 {
@@ -882,7 +882,7 @@ OUString SelectionManager::convertTypeFromNative( Atom nType, Atom selection, in
     return getString( nType );
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData )
 {
@@ -1020,7 +1020,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
     return bSuccess;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData )
 {
@@ -1235,7 +1235,7 @@ bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequ
     return bSuccess;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >& rTypes )
 {
@@ -1440,7 +1440,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
     return bSuccess;
 }
 
-// ------------------------------------------------------------------------
+
 
 PixmapHolder* SelectionManager::getPixmapHolder( Atom selection )
 {
@@ -1600,7 +1600,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
     return bConverted;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest )
 {
@@ -1809,7 +1809,7 @@ bool SelectionManager::handleSelectionRequest( XSelectionRequestEvent& rRequest
     return true;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
 {
@@ -1928,7 +1928,7 @@ bool SelectionManager::handleReceivePropertyNotify( XPropertyEvent& rNotify )
     return bHandled;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
 {
@@ -2028,7 +2028,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
     return bHandled;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
 {
@@ -2121,7 +2121,7 @@ bool SelectionManager::handleSelectionNotify( XSelectionEvent& rNotify )
     return bHandled;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
 {
@@ -2371,7 +2371,7 @@ void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLI
  *  methods for XDropTargetDragContext
  */
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::sendDragStatus( Atom nDropAction )
 {
@@ -2440,14 +2440,14 @@ void SelectionManager::sendDragStatus( Atom nDropAction )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Int8 SelectionManager::getUserDragAction() const
 {
     return (m_nTargetAcceptAction != DNDConstants::ACTION_DEFAULT) ? m_nTargetAcceptAction : m_nUserDragAction;
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::updateDragAction( int modifierState )
 {
@@ -2500,7 +2500,7 @@ bool SelectionManager::updateDragAction( int modifierState )
     return bRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
 {
@@ -2560,7 +2560,7 @@ void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleDragEvent( XEvent& rMessage )
 {
@@ -2881,7 +2881,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
     return bHandled;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time )
 {
@@ -2903,7 +2903,7 @@ void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow,
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time )
 {
@@ -2937,7 +2937,7 @@ sal_Bool SelectionManager::isDragImageSupported() throw()
     return sal_False;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
 {
@@ -2951,7 +2951,7 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
     return aCursor;
 }
 
-// ------------------------------------------------------------------------
+
 
 int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy )
 {
@@ -3022,7 +3022,7 @@ int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy )
     return nVersion;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
 {
@@ -3181,7 +3181,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::startDrag(
                                  const DragGestureEvent& trigger,
@@ -3527,7 +3527,7 @@ sal_Int32 SelectionManager::getCurrentCursor()
     return m_aCurrentCursor;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time )
 {
@@ -3543,13 +3543,13 @@ void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLI
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time )
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::transferablesFlavorsChanged()
 {
@@ -3602,7 +3602,7 @@ void SelectionManager::transferablesFlavorsChanged()
  *  dispatch loop
  */
 
-// ------------------------------------------------------------------------
+
 
 bool SelectionManager::handleXEvent( XEvent& rEvent )
 {
@@ -3688,7 +3688,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
     return bHandled;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::dispatchEvent( int millisec )
 {
@@ -3730,7 +3730,7 @@ void SelectionManager::dispatchEvent( int millisec )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::run( void* pThis )
 {
@@ -3855,7 +3855,7 @@ void SelectionManager::shutdown() throw()
     m_xDropTransferable.clear();
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
 {
@@ -3915,7 +3915,7 @@ void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang:
     disposing(rEvent);
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor )
 {
@@ -3927,7 +3927,7 @@ void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdapt
     m_aSelections[ selection ]  = pNewSelection;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::deregisterHandler( Atom selection )
 {
@@ -3943,7 +3943,7 @@ void SelectionManager::deregisterHandler( Atom selection )
     }
 }
 
-// ------------------------------------------------------------------------
+
 
 static bool bWasError = false;
 
@@ -3999,7 +3999,7 @@ void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTar
         OSL_FAIL( "attempt to register None as drop target" );
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::deregisterDropTarget( XLIB_Window aWindow )
 {
@@ -4055,27 +4055,27 @@ css::uno::Reference< XTransferable > SelectionManager::getTransferable() throw()
     return m_xDragSourceTransferable;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::clearTransferable() throw()
 {
     m_xDragSourceTransferable.clear();
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManager::fireContentsChanged() throw()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 css::uno::Reference< XInterface > SelectionManager::getReference() throw()
 {
     return css::uno::Reference< XInterface >( static_cast<OWeakObject*>(this) );
 }
 
-// ------------------------------------------------------------------------
+
 
 /*
  *  SelectionManagerHolder
@@ -4089,13 +4089,13 @@ SelectionManagerHolder::SelectionManagerHolder() :
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 SelectionManagerHolder::~SelectionManagerHolder()
 {
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManagerHolder::initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception )
 {
@@ -4126,14 +4126,14 @@ sal_Bool SelectionManagerHolder::isDragImageSupported() throw()
     return m_xRealDragSource.is() ? m_xRealDragSource->isDragImageSupported() : sal_False;
 }
 
-// ------------------------------------------------------------------------
+
 
 sal_Int32 SelectionManagerHolder::getDefaultCursor( sal_Int8 dragAction ) throw()
 {
     return m_xRealDragSource.is() ? m_xRealDragSource->getDefaultCursor( dragAction ) : 0;
 }
 
-// ------------------------------------------------------------------------
+
 
 void SelectionManagerHolder::startDrag(
                                        const ::com::sun::star::datatransfer::dnd::DragGestureEvent& trigger,
@@ -4146,13 +4146,13 @@ void SelectionManagerHolder::startDrag(
         m_xRealDragSource->startDrag( trigger, sourceActions, cursor, image, transferable, listener );
 }
 
-// ------------------------------------------------------------------------
+
 
 /*
  *  XServiceInfo
  */
 
-// ------------------------------------------------------------------------
+
 
 OUString SelectionManagerHolder::getImplementationName() throw()
 {
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 644e88db036f..0ed55666cd97 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -57,7 +57,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
     return aRet;
 }
 
-// ------------------------------------------------------------------------
+
 
 css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments )
 {
@@ -86,14 +86,14 @@ css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequenc
     return static_cast<OWeakObject*>(pClipboard);
 }
 
-// ------------------------------------------------------------------------
+
 
 css::uno::Reference< XInterface > X11SalInstance::CreateDragSource()
 {
     return css::uno::Reference < XInterface >( ( OWeakObject * ) new SelectionManagerHolder() );
 }
 
-// ------------------------------------------------------------------------
+
 
 css::uno::Reference< XInterface > X11SalInstance::CreateDropTarget()
 {
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 49ba13ee747c..44e82c5b44c9 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -35,7 +35,7 @@ X11GlyphPeer::X11GlyphPeer()
 {
 }
 
-// ---------------------------------------------------------------------------
+
 
 X11GlyphPeer::~X11GlyphPeer()
 {
@@ -69,7 +69,7 @@ X11GlyphCache::X11GlyphCache( X11GlyphPeer& rPeer )
 {
 }
 
-// ---------------------------------------------------------------------------
+
 
 namespace
 {
@@ -111,7 +111,7 @@ X11GlyphCache& X11GlyphCache::GetInstance()
     return theGlyphCacheHolder::get().getGlyphCache();
 }
 
-// ---------------------------------------------------------------------------
+
 
 void X11GlyphCache::KillInstance()
 {
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 00538b00f9fe..d748e6a94ce6 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -48,9 +48,9 @@
 #include <valgrind/memcheck.h>
 #endif
 
-// -------------
+
 // - SalBitmap -
-// -------------
+
 
 SalBitmap* X11SalInstance::CreateSalBitmap()
 {
@@ -60,7 +60,7 @@ SalBitmap* X11SalInstance::CreateSalBitmap()
 ImplSalBitmapCache* X11SalBitmap::mpCache = NULL;
 sal_uLong           X11SalBitmap::mnCacheInstCount = 0;
 
-// -----------------------------------------------------------------------------
+
 
 X11SalBitmap::X11SalBitmap()
     : mpDIB( NULL )
@@ -69,14 +69,14 @@ X11SalBitmap::X11SalBitmap()
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 X11SalBitmap::~X11SalBitmap()
 {
     Destroy();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void X11SalBitmap::ImplCreateCache()
 {
@@ -84,7 +84,7 @@ void X11SalBitmap::ImplCreateCache()
         mpCache = new ImplSalBitmapCache;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void X11SalBitmap::ImplDestroyCache()
 {
@@ -94,7 +94,7 @@ void X11SalBitmap::ImplDestroyCache()
         delete mpCache, mpCache = NULL;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void X11SalBitmap::ImplRemovedFromCache()
 {
@@ -120,7 +120,7 @@ namespace
 }
 #endif
 
-// -----------------------------------------------------------------------------
+
 
 BitmapBuffer* X11SalBitmap::ImplCreateDIB(
     const Size& rSize,
@@ -211,7 +211,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
     return pDIB;
 }
 
-// -----------------------------------------------------------------------------
+
 
 BitmapBuffer* X11SalBitmap::ImplCreateDIB(
     Drawable aDrawable,
@@ -386,7 +386,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
     return pDIB;
 }
 
-// -----------------------------------------------------------------------------
+
 
 XImage* X11SalBitmap::ImplCreateXImage(
     SalDisplay *pSalDisp,
@@ -562,7 +562,7 @@ XImage* X11SalBitmap::ImplCreateXImage(
     return pImage;
 }
 
-// -----------------------------------------------------------------------------
+
 bool X11SalBitmap::ImplCreateFromDrawable(
     Drawable aDrawable,
     SalX11Screen nScreen,
@@ -579,7 +579,7 @@ bool X11SalBitmap::ImplCreateFromDrawable(
 
     return( mpDDB != NULL );
 }
-// -----------------------------------------------------------------------------
+
 
 ImplSalDDB* X11SalBitmap::ImplGetDDB(
     Drawable          aDrawable,
@@ -678,7 +678,7 @@ ImplSalDDB* X11SalBitmap::ImplGetDDB(
     return mpDDB;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void X11SalBitmap::ImplDraw(
     Drawable           aDrawable,
@@ -693,7 +693,7 @@ void X11SalBitmap::ImplDraw(
         mpDDB->ImplDraw( aDrawable, nDrawableDepth, rTwoRect, rGC );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
 {
@@ -703,7 +703,7 @@ bool X11SalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap
     return( mpDIB != NULL );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
 {
@@ -744,21 +744,21 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
             ( rSalBmp.mpDDB && ( mpDDB != NULL ) ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool X11SalBitmap::Create( const SalBitmap&, SalGraphics* )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool X11SalBitmap::Create( const SalBitmap&, sal_uInt16 )
 {
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool X11SalBitmap::Create(
     const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
@@ -799,7 +799,7 @@ bool X11SalBitmap::Create(
     return false;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void X11SalBitmap::Destroy()
 {
@@ -816,7 +816,7 @@ void X11SalBitmap::Destroy()
         mpCache->ImplRemove( this );
 }
 
-// -----------------------------------------------------------------------------
+
 
 Size X11SalBitmap::GetSize() const
 {
@@ -830,7 +830,7 @@ Size X11SalBitmap::GetSize() const
     return aSize;
 }
 
-// -----------------------------------------------------------------------------
+
 
 sal_uInt16 X11SalBitmap::GetBitCount() const
 {
@@ -846,7 +846,7 @@ sal_uInt16 X11SalBitmap::GetBitCount() const
     return nBitCount;
 }
 
-// -----------------------------------------------------------------------------
+
 
 BitmapBuffer* X11SalBitmap::AcquireBuffer( bool )
 {
@@ -866,7 +866,7 @@ BitmapBuffer* X11SalBitmap::AcquireBuffer( bool )
     return mpDIB;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly )
 {
@@ -880,7 +880,7 @@ void X11SalBitmap::ReleaseBuffer( BitmapBuffer*, bool bReadOnly )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
 {
@@ -898,9 +898,9 @@ bool X11SalBitmap::GetSystemData( BitmapSystemData& rData )
     return false;
 }
 
-// --------------
+
 // - ImplSalDDB -
-// --------------
+
 
 ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
                         SalX11Screen nXScreen, const SalTwoRect& rTwoRect )
@@ -932,7 +932,7 @@ ImplSalDDB::ImplSalDDB( XImage* pImage, Drawable aDrawable,
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 ImplSalDDB::ImplSalDDB(
     Drawable aDrawable,
@@ -973,7 +973,7 @@ ImplSalDDB::ImplSalDDB(
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 ImplSalDDB::~ImplSalDDB()
 {
@@ -981,7 +981,7 @@ ImplSalDDB::~ImplSalDDB()
         XFreePixmap( GetGenericData()->GetSalDisplay()->GetDisplay(), maPixmap );
 }
 
-// -----------------------------------------------------------------------------
+
 
 bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRect& rTwoRect ) const
 {
@@ -1017,7 +1017,7 @@ bool ImplSalDDB::ImplMatches( SalX11Screen nXScreen, long nDepth, const SalTwoRe
     return bRet;
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ImplSalDDB::ImplDraw(
     Drawable aDrawable,
@@ -1032,7 +1032,7 @@ void ImplSalDDB::ImplDraw(
               rTwoRect.mnDestX, rTwoRect.mnDestY, rGC );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ImplSalDDB::ImplDraw(
     Drawable aSrcDrawable,
@@ -1062,9 +1062,9 @@ void ImplSalDDB::ImplDraw(
     }
 }
 
-// ----------------------
+
 // - ImplSalBitmapCache -
-// ----------------------
+
 
 struct ImplBmpObj
 {
@@ -1076,21 +1076,21 @@ struct ImplBmpObj
                     mpBmp( pBmp ), mnMemSize( nMemSize ), mnFlags( nFlags ) {}
 };
 
-// -----------------------------------------------------------------------------
+
 
 ImplSalBitmapCache::ImplSalBitmapCache() :
     mnTotalSize( 0UL )
 {
 }
 
-// -----------------------------------------------------------------------------
+
 
 ImplSalBitmapCache::~ImplSalBitmapCache()
 {
     ImplClear();
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uLong nFlags )
 {
@@ -1118,7 +1118,7 @@ void ImplSalBitmapCache::ImplAdd( X11SalBitmap* pBmp, sal_uLong nMemSize, sal_uL
         maBmpList.push_back( new ImplBmpObj( pBmp, nMemSize, nFlags ) );
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
 {
@@ -1138,7 +1138,7 @@ void ImplSalBitmapCache::ImplRemove( X11SalBitmap* pBmp )
     }
 }
 
-// -----------------------------------------------------------------------------
+
 
 void ImplSalBitmapCache::ImplClear()
 {
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 3daf71bbae57..e4b853f2eb99 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -423,7 +423,7 @@ void X11SalGraphics::copyBits( const SalTwoRect& rPosAry,
     }
 }
 
-// --------------------------------------------------------------------------
+
 
 void X11SalGraphics::copyArea ( long nDestX,    long nDestY,
                                 long nSrcX,     long nSrcY,
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index e0e1ff4bcc2a..7f40deb81377 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -91,11 +91,11 @@ struct _XRegion
     BOX extents;
 };
 
-// ----------------------------------------------------------------------------
+
 //
 // X11SalGraphics
 //
-// ----------------------------------------------------------------------------
+
 
 GC
 X11SalGraphics::GetFontGC()
@@ -124,7 +124,7 @@ X11SalGraphics::GetFontGC()
     return pFontGC_;
 }
 
-//--------------------------------------------------------------------------
+
 
 bool X11SalGraphics::setFont( const FontSelectPattern *pEntry, int nFallbackLevel )
 {
@@ -194,7 +194,7 @@ void ImplServerFontEntry::HandleFontOptions( void )
     mpServerFont->SetFontOptions( mpFontOptions );
 }
 
-//--------------------------------------------------------------------------
+
 
 CairoFontsCache::LRUFonts CairoFontsCache::maLRUFonts;
 int CairoFontsCache::mnRefCount = 0;
@@ -449,7 +449,7 @@ void X11SalGraphics::DrawServerFontLayout( const ServerFontLayout& rLayout )
     cairo_destroy(cr);
 }
 
-//--------------------------------------------------------------------------
+
 
 const ImplFontCharMap* X11SalGraphics::GetImplFontCharMap() const
 {
@@ -467,11 +467,11 @@ bool X11SalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rGetImplFont
     return mpServerFont[0]->GetFontCapabilities(rGetImplFontCapabilities);
 }
 
-// ----------------------------------------------------------------------------
+
 //
 // SalGraphics
 //
-// ----------------------------------------------------------------------------
+
 
 sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLevel )
 {
@@ -483,7 +483,7 @@ sal_uInt16 X11SalGraphics::SetFont( FontSelectPattern *pEntry, int nFallbackLeve
     return nRetVal;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void
 X11SalGraphics::SetTextColor( SalColor nSalColor )
@@ -496,7 +496,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
     }
 }
 
-// ----------------------------------------------------------------------------
+
 
 bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
     const OUString& rFileURL, const OUString& rFontName )
@@ -575,7 +575,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
     ImplGetSVData()->maGDIData.mbNativeFontConfig = true;
 }
 
-// ----------------------------------------------------------------------------
+
 
 void cairosubcallback(void* pPattern)
 {
@@ -600,7 +600,7 @@ ImplFontOptions* GetFCFontOptions( const ImplFontAttributes& rFontAttributes, in
     return rPFM.getFontOptions(aInfo, nSize, cairosubcallback);
 }
 
-// ----------------------------------------------------------------------------
+
 
 void
 X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
@@ -615,7 +615,7 @@ X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric, int nFallbackLevel )
     }
 }
 
-// ---------------------------------------------------------------------------
+
 
 bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
 {
@@ -647,7 +647,7 @@ bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
     return true;
 }
 
-// ---------------------------------------------------------------------------
+
 
 bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
     ::basegfx::B2DPolyPolygon& rPolyPoly )
@@ -667,7 +667,7 @@ bool X11SalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
     return false;
 }
 
-//--------------------------------------------------------------------------
+
 
 SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
 {
@@ -691,7 +691,7 @@ SalLayout* X11SalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     return pLayout;
 }
 
-//--------------------------------------------------------------------------
+
 
 SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
 {
@@ -716,7 +716,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
     return aSysFontData;
 }
 
-//--------------------------------------------------------------------------
+
 
 bool X11SalGraphics::CreateFontSubset(
                                    const OUString& rToFile,
@@ -746,7 +746,7 @@ bool X11SalGraphics::CreateFontSubset(
     return bSuccess;
 }
 
-//--------------------------------------------------------------------------
+
 
 const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, const sal_Ucs* pUnicodes, sal_Int32* pWidths, FontSubsetInfo& rInfo, long* pDataLen )
 {
@@ -759,14 +759,14 @@ const void* X11SalGraphics::GetEmbedFontData( const PhysicalFontFace* pFont, con
     return GenPspGraphics::DoGetEmbedFontData( aFont, pUnicodes, pWidths, rInfo, pDataLen );
 }
 
-//--------------------------------------------------------------------------
+
 
 void X11SalGraphics::FreeEmbedFontData( const void* pData, long nLen )
 {
     GenPspGraphics::DoFreeEmbedFontData( pData, nLen );
 }
 
-//--------------------------------------------------------------------------
+
 
 const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace* pFont, const Ucs2OStrMap** pNonEncoded )
 {
@@ -779,7 +779,7 @@ const Ucs2SIntMap* X11SalGraphics::GetFontEncodingVector( const PhysicalFontFace
     return GenPspGraphics::DoGetFontEncodingVector( aFont, pNonEncoded );
 }
 
-//--------------------------------------------------------------------------
+
 
 void X11SalGraphics::GetGlyphWidths( const PhysicalFontFace* pFont,
                                    bool bVertical,
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index 75fb57f02cee..03974a859caf 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -29,7 +29,7 @@
 
 using namespace rtl;
 
-// ---------------------------------------------------------------------------
+
 
 XRenderPeer::XRenderPeer()
     : mpDisplay( GetGenericData()->GetSalDisplay()->GetDisplay() )
@@ -38,7 +38,7 @@ XRenderPeer::XRenderPeer()
     InitRenderLib();
 }
 
-// ---------------------------------------------------------------------------
+
 
 XRenderPeer& XRenderPeer::GetInstance()
 {
@@ -46,7 +46,7 @@ XRenderPeer& XRenderPeer::GetInstance()
     return aPeer;
 }
 
-// ---------------------------------------------------------------------------
+
 
 void XRenderPeer::InitRenderLib()
 {
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 5204b036c9ba..cbfe171b173b 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -1530,20 +1530,20 @@ PPDKey::PPDKey( const OUString& rKey ) :
 {
 }
 
-// -------------------------------------------------------------------
+
 
 PPDKey::~PPDKey()
 {
 }
 
-// -------------------------------------------------------------------
+
 
 const PPDValue* PPDKey::getValue( int n ) const
 {
     return ((unsigned int)n < m_aOrderedValues.size() && n >= 0) ? m_aOrderedValues[n] : NULL;
 }
 
-// -------------------------------------------------------------------
+
 
 const PPDValue* PPDKey::getValue( const OUString& rOption ) const
 {
@@ -1551,7 +1551,7 @@ const PPDValue* PPDKey::getValue( const OUString& rOption ) const
     return it != m_aValues.end() ? &it->second : NULL;
 }
 
-// -------------------------------------------------------------------
+
 
 const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const
 {
@@ -1566,7 +1566,7 @@ const PPDValue* PPDKey::getValueCaseInsensitive( const OUString& rOption ) const
     return pValue;
 }
 
-// -------------------------------------------------------------------
+
 
 void PPDKey::eraseValue( const OUString& rOption )
 {
@@ -1585,7 +1585,7 @@ void PPDKey::eraseValue( const OUString& rOption )
     m_aValues.erase( it );
 }
 
-// -------------------------------------------------------------------
+
 
 PPDValue* PPDKey::insertValue( const OUString& rOption, PPDValueType eType )
 {
@@ -1601,7 +1601,7 @@ PPDValue* PPDKey::insertValue( const OUString& rOption, PPDValueType eType )
     return pValue;
 }
 
-// -------------------------------------------------------------------
+
 
 /*
  * PPDContext
@@ -1612,7 +1612,7 @@ PPDContext::PPDContext( const PPDParser* pParser ) :
 {
 }
 
-// -------------------------------------------------------------------
+
 
 PPDContext& PPDContext::operator=( const PPDContext& rCopy )
 {
@@ -1621,13 +1621,13 @@ PPDContext& PPDContext::operator=( const PPDContext& rCopy )
     return *this;
 }
 
-// -------------------------------------------------------------------
+
 
 PPDContext::~PPDContext()
 {
 }
 
-// -------------------------------------------------------------------
+
 
 const PPDKey* PPDContext::getModifiedKey( int n ) const
 {
@@ -1637,7 +1637,7 @@ const PPDKey* PPDContext::getModifiedKey( int n ) const
     return it != m_aCurrentValues.end() ? it->first : NULL;
 }
 
-// -------------------------------------------------------------------
+
 
 void PPDContext::setParser( const PPDParser* pParser )
 {
@@ -1648,7 +1648,7 @@ void PPDContext::setParser( const PPDParser* pParser )
     }
 }
 
-// -------------------------------------------------------------------
+
 
 const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const
 {
@@ -1670,7 +1670,7 @@ const PPDValue* PPDContext::getValue( const PPDKey* pKey ) const
     return pValue;
 }
 
-// -------------------------------------------------------------------
+
 
 const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue, bool bDontCareForConstraints )
 {
@@ -1720,7 +1720,7 @@ const PPDValue* PPDContext::setValue( const PPDKey* pKey, const PPDValue* pValue
     return pValue;
 }
 
-// -------------------------------------------------------------------
+
 
 bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue )
 {
@@ -1744,7 +1744,7 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pValue )
     return bRet;
 }
 
-// -------------------------------------------------------------------
+
 
 bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable )
 {
@@ -1762,7 +1762,7 @@ bool PPDContext::resetValue( const PPDKey* pKey, bool bDefaultable )
     return bRet;
 }
 
-// -------------------------------------------------------------------
+
 
 bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue, bool bDoReset )
 {
@@ -1850,7 +1850,7 @@ bool PPDContext::checkConstraints( const PPDKey* pKey, const PPDValue* pNewValue
     return true;
 }
 
-// -------------------------------------------------------------------
+
 
 char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
 {
@@ -1896,7 +1896,7 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
     return pBuffer;
 }
 
-// -------------------------------------------------------------------
+
 
 void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes )
 {
@@ -1932,7 +1932,7 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes )
     }
 }
 
-// -------------------------------------------------------------------
+
 
 int PPDContext::getRenderResolution() const
 {
@@ -1958,7 +1958,7 @@ int PPDContext::getRenderResolution() const
     return  nDPI;
 }
 
-// -------------------------------------------------------------------
+
 
 void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const
 {
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index bd3379ad30b3..0c6e7138977f 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -82,7 +82,7 @@ namespace psp
 *  class PrinterInfoManager
 */
 
-// -----------------------------------------------------------------
+
 
 PrinterInfoManager& PrinterInfoManager::get()
 {
@@ -110,7 +110,7 @@ void PrinterInfoManager::release()
     pSalData->m_pPIManager = NULL;
 }
 
-// -----------------------------------------------------------------
+
 
 PrinterInfoManager::PrinterInfoManager( Type eType ) :
     m_pQueueInfo( NULL ),
@@ -125,7 +125,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
     initSystemDefaultPaper();
 }
 
-// -----------------------------------------------------------------
+
 
 PrinterInfoManager::~PrinterInfoManager()
 {
@@ -135,14 +135,14 @@ PrinterInfoManager::~PrinterInfoManager()
     #endif
 }
 
-// -----------------------------------------------------------------
+
 
 bool PrinterInfoManager::isCUPSDisabled() const
 {
     return m_bDisableCUPS;
 }
 
-// -----------------------------------------------------------------
+
 
 void PrinterInfoManager::setCUPSDisabled( bool bDisable )
 {
@@ -153,7 +153,7 @@ void PrinterInfoManager::setCUPSDisabled( bool bDisable )
     checkPrintersChanged( true );
 }
 
-// -----------------------------------------------------------------
+
 
 void PrinterInfoManager::initSystemDefaultPaper()
 {
@@ -162,7 +162,7 @@ void PrinterInfoManager::initSystemDefaultPaper()
         RTL_TEXTENCODING_UTF8);
 }
 
-// -----------------------------------------------------------------
+
 
 bool PrinterInfoManager::checkPrintersChanged( bool bWait )
 {
@@ -212,7 +212,7 @@ bool PrinterInfoManager::checkPrintersChanged( bool bWait )
     return bChanged;
 }
 
-// -----------------------------------------------------------------
+
 
 void PrinterInfoManager::initialize()
 {
@@ -583,7 +583,7 @@ void PrinterInfoManager::initialize()
     }
 }
 
-// -----------------------------------------------------------------
+
 
 void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
 {
@@ -593,7 +593,7 @@ void PrinterInfoManager::listPrinters( ::std::list< OUString >& rList ) const
         rList.push_back( it->first );
 }
 
-// -----------------------------------------------------------------
+
 
 const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter ) const
 {
@@ -605,7 +605,7 @@ const PrinterInfo& PrinterInfoManager::getPrinterInfo( const OUString& rPrinter
     return it != m_aPrinters.end() ? it->second.m_aInfo : aEmptyInfo;
 }
 
-// -----------------------------------------------------------------
+
 
 void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const PrinterInfo& rNewInfo )
 {
@@ -621,7 +621,7 @@ void PrinterInfoManager::changePrinterInfo( const OUString& rPrinter, const Prin
     }
 }
 
-// -----------------------------------------------------------------
+
 
 // need to check writeability / creatability of config files
 static bool checkWriteability( const OUString& rUniPath )
@@ -771,7 +771,7 @@ bool PrinterInfoManager::writePrinterConfig()
     return true;
 }
 
-// -----------------------------------------------------------------
+
 
 bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUString& rDriverName )
 {
@@ -827,7 +827,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
     return bSuccess;
 }
 
-// -----------------------------------------------------------------
+
 
 bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bCheckOnly )
 {
@@ -881,7 +881,7 @@ bool PrinterInfoManager::removePrinter( const OUString& rPrinterName, bool bChec
     return bSuccess;
 }
 
-// -----------------------------------------------------------------
+
 
 bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
 {
@@ -900,13 +900,13 @@ bool PrinterInfoManager::setDefaultPrinter( const OUString& rPrinterName )
     return bSuccess;
 }
 
-// -----------------------------------------------------------------
+
 bool PrinterInfoManager::addOrRemovePossible() const
 {
     return true;
 }
 
-// -----------------------------------------------------------------
+
 
 void PrinterInfoManager::getSystemPrintCommands( std::list< OUString >& rCommands )
 {
@@ -1027,7 +1027,7 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const
     }
 }
 
-// -----------------------------------------------------------------
+
 
 SystemQueueInfo::SystemQueueInfo() :
     m_bChanged( false )
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 50ba7dcbaf2f..7a0bdcca3d31 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2392,14 +2392,14 @@ void X11SalFrame::SetTitle( const OUString& rTitle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void X11SalFrame::Flush()
 {
     XFlush( GetDisplay()->GetDisplay() );
 }
 
-// -----------------------------------------------------------------------
+
 
 void X11SalFrame::Sync()
 {
@@ -2445,7 +2445,7 @@ void X11SalFrame::SetInputContext( SalInputContext* pContext )
       return;
 }
 
-// -----------------------------------------------------------------------
+
 
 void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
 {
@@ -2453,7 +2453,7 @@ void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
           mpInputContext->EndExtTextInput( nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index a694b91bd91b..f718ed30eb43 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -364,7 +364,7 @@ X11SalObject::GetClipRegionType()
     return maClipRegion.GetClipRegionType();
 }
 
-// -----------------------------------------------------------------------
+
 
 void
 X11SalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
@@ -410,7 +410,7 @@ void X11SalObject::GrabFocus()
                          CurrentTime );
 }
 
-// -----------------------------------------------------------------------
+
 
 const SystemEnvData* X11SalObject::GetSystemData() const
 {
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index 9df91e511925..7b7fe395eb8a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -50,9 +50,9 @@
 
 #include "gtk/fpicker/SalGtkFilePicker.hxx"
 
-//------------------------------------------------------------------------
+
 // namespace directives
-//------------------------------------------------------------------------
+
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
@@ -312,9 +312,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
     gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true);
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePickerNotifier
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener )
     throw( uno::RuntimeException )
@@ -334,9 +334,9 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X
     m_xListener.clear();
 }
 
-// -------------------------------------------------
+
 // XEventListener
-// -------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException )
 {
@@ -348,9 +348,9 @@ void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) thr
         removeFilePickerListener( xFilePickerListener );
 }
 
-//-----------------------------------------------------------------------------------------
+
 // FilePicker Event functions
-//-----------------------------------------------------------------------------------------
+
 
 void SalGtkFilePicker::impl_fileSelectionChanged( FilePickerEvent aEvent )
 {
@@ -408,20 +408,20 @@ public:
 
 //=====================================================================
 
-//---------------------------------------------------------------------
+
 FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
     :m_sTitle( _rTitle )
     ,m_aSubFilters( _rSubFilters )
 {
 }
 
-//---------------------------------------------------------------------
+
 bool FilterEntry::hasSubFilters() const
 {
     return( 0 < m_aSubFilters.getLength() );
 }
 
-//---------------------------------------------------------------------
+
 sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
 {
     _rSubFilterList = m_aSubFilters;
@@ -504,7 +504,7 @@ dialog_remove_buttons( GtkDialog *pDialog )
     g_list_free( pChildren );
 }
 
-//------------------------------------------------------------------------------------
+
 namespace {
     //................................................................................
     struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool >
@@ -543,7 +543,7 @@ namespace {
 }
 
 
-//------------------------------------------------------------------------------------
+
 bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle )
 {
     bool bRet = false;
@@ -559,7 +559,7 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle )
     return bRet;
 }
 
-//------------------------------------------------------------------------------------
+
 bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )
 {
     bool bRet = false;
@@ -581,7 +581,7 @@ bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters )
     return bRet;
 }
 
-//------------------------------------------------------------------------------------
+
 void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
 {
     if( !m_pFilterList )
@@ -595,9 +595,9 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter
 }
 
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
@@ -616,9 +616,9 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt
     m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
@@ -642,9 +642,9 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
     // TODO m_pImpl->setCurrentFilter( aTitle );
 }
 
-//-----------------------------------------------------------------------------------------
+
 //
-//-----------------------------------------------------------------------------------------
+
 
 void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername)
 {
@@ -703,9 +703,9 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept
     return m_aCurrentFilter;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // XFilterGroupManager functions
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
@@ -735,9 +735,9 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle
 
 }
 
-//-----------------------------------------------------------------------------------------
+
 // XFilePicker functions
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException )
 {
@@ -956,9 +956,9 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno
     return aSelectedFiles;
 }
 
-//-----------------------------------------------------------------------------------------
+
 // XExecutableDialog functions
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException )
 {
@@ -1128,7 +1128,7 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException )
     return retVal;
 }
 
-//------------------------------------------------------------------------------------
+
 
 // cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl
 GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
@@ -1183,9 +1183,9 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType )
 
 
 
-//------------------------------------------------------------------------------------
+
 // XFilePickerControlAccess functions
-//------------------------------------------------------------------------------------
+
 static void HackWidthToFirst(GtkComboBox *pWidget)
 {
     GtkRequisition requisition;
@@ -1469,9 +1469,9 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
     return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 );
 }
 
-//------------------------------------------------------------------------------------
+
 // XFilePreview functions
-//------------------------------------------------------------------------------------
+
 
 uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException )
 {
@@ -1655,9 +1655,9 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException
     return mbPreviewState;
 }
 
-//------------------------------------------------------------------------------------
+
 // XInitialization
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments )
     throw( uno::Exception, uno::RuntimeException )
@@ -1820,9 +1820,9 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP
         pobjFP->setShowState( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( cb ) ) );
 }
 
-//------------------------------------------------------------------------------------
+
 // XCancellable
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException )
 {
@@ -1833,9 +1833,9 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException )
     // TODO m_pImpl->cancel();
 }
 
-//--------------------------------------------------
+
 // Misc
-//-------------------------------------------------
+
 void SalGtkFilePicker::SetCurFilter( const OUString& rFilter )
 {
     // Get all the filters already added
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index 18d2750b40d0..8b0f7fbf983f 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -47,9 +47,9 @@ using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-//-----------------------------------------------------------------------------------------
+
 // constructor
-//-----------------------------------------------------------------------------------------
+
 SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentContext >& xContext ) :
     SalGtkPicker( xContext )
 {
@@ -65,9 +65,9 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), sal_False );
 }
 
-// -------------------------------------------------
+
 // XEventListener
-// -------------------------------------------------
+
 
 void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& )
     throw( uno::RuntimeException )
@@ -128,9 +128,9 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription
 {
 }
 
-//-----------------------------------------------------------------------------------------
+
 // XExecutableDialog functions
-//-----------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException )
 {
@@ -177,9 +177,9 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException )
     return retVal;
 }
 
-//------------------------------------------------------------------------------------
+
 // XCancellable
-//------------------------------------------------------------------------------------
+
 
 void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException )
 {
diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx
index b07e581b027e..f4e144a9b118 100644
--- a/vcl/unx/gtk/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx
@@ -30,9 +30,9 @@
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
 
-//---------------------------------------
+
 // translate control ids to resource ids
-//---------------------------------------
+
 static const struct
 {
     sal_Int32 ctrlId;
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 4ae67fef72a2..c73131b0898a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -205,13 +205,13 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow );
  *
  */
 
-//---
+
 static Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
                                 const ImplControlValue& aValue, const OUString& rCaption );
 
 static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect );
 
-//---
+
 static Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
                             const ImplControlValue& aValue, const OUString& rCaption );
 
@@ -226,11 +226,11 @@ static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlType nType, C
 static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, ControlType nType, ControlPart nPart, Rectangle aAreaRect,
                             ControlState nState, const ImplControlValue& aValue,
                             const OUString& rCaption );
-//---
+
 static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
                             const ImplControlValue& aValue, const OUString& rCaption );
 
-//---
+
 static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState,
                             const ImplControlValue& aValue, const OUString& rCaption );
 
@@ -246,10 +246,10 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen,
                                    const OUString& rCaption );
 
 static int getFrameWidth(GtkWidget* widget);
-//---
+
 
 static Rectangle NWGetScrollButtonRect(    SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect );
-//---
+
 
 /*********************************************************
  * PixmapCache
@@ -1622,7 +1622,7 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect )
     return Rectangle( Point( x, y ), Size( w, h ) );
 }
 
-//-------------------------------------
+
 
 bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
                                       ControlType, ControlPart,
@@ -1680,7 +1680,7 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable,
     return true;
 }
 
-//-------------------------------------
+
 
 bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
                                       ControlType, ControlPart,
@@ -1727,7 +1727,7 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable,
     return true;
 }
 
-//-------------------------------------
+
 static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow )
 {
     // Size the arrow appropriately
@@ -2068,7 +2068,7 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart,
     return true;
 }
 
-//---
+
 
 static Rectangle NWGetScrollButtonRect(    SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect )
 {
@@ -2151,7 +2151,7 @@ static Rectangle NWGetScrollButtonRect(    SalX11Screen nScreen, ControlPart nPa
     return( buttonRect );
 }
 
-//-------------------------------------
+
 
 bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable,
                                         ControlType nType, ControlPart nPart,
@@ -2290,7 +2290,7 @@ static void NWPaintOneEditBox(    SalX11Screen nScreen,
 
 
 
-//-------------------------------------
+
 
 bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
                                         const Rectangle& rControlRectangle,
@@ -2396,7 +2396,7 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart,
     return true;
 }
 
-//---
+
 
 static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen,
                                       ControlType,
@@ -2488,7 +2488,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen,
 }
 
 
-//-------------------------------------
+
 
 bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
                                          ControlType nType, ControlPart nPart,
@@ -2568,7 +2568,7 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable,
     return true;
 }
 
-//----
+
 
 static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
                                           ControlType,
@@ -2626,7 +2626,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen,
     return( aButtonRect );
 }
 
-//-------------------------------------
+
 
 
 
@@ -2781,7 +2781,7 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart,
     return bSuccess;
 }
 
-//-------------------------------------
+
 
 bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable,
                                         ControlType nType, ControlPart nPart,
@@ -3032,7 +3032,7 @@ bool GtkSalGraphics::NWPaintGTKToolbar(
     return true;
 }
 
-//----
+
 
 bool GtkSalGraphics::NWPaintGTKMenubar(
             GdkDrawable* gdkDrawable,
@@ -3535,7 +3535,7 @@ bool GtkSalGraphics::NWPaintGTKSlider(
     return bRet;
 }
 
-//----
+
 
 static int getFrameWidth(GtkWidget* widget)
 {
@@ -3605,7 +3605,7 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen,
     return( aPartRect );
 }
 
-//----
+
 
 static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen,
                                             ControlType,
@@ -4224,7 +4224,7 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy
  * Widget ensure functions - make sure cached objects are valid
  ************************************************************************/
 
-//-------------------------------------
+
 
 static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )
 {
@@ -4257,7 +4257,7 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen )
     gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget );
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKButton( SalX11Screen nScreen )
 {
@@ -4268,7 +4268,7 @@ static void NWEnsureGTKButton( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKRadio( SalX11Screen nScreen )
 {
@@ -4281,7 +4281,7 @@ static void NWEnsureGTKRadio( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKCheck( SalX11Screen nScreen )
 {
@@ -4292,7 +4292,7 @@ static void NWEnsureGTKCheck( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKScrollbars( SalX11Screen nScreen )
 {
@@ -4309,7 +4309,7 @@ static void NWEnsureGTKScrollbars( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKArrow( SalX11Screen nScreen )
 {
@@ -4324,7 +4324,7 @@ static void NWEnsureGTKArrow( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKEditBox( SalX11Screen nScreen )
 {
@@ -4335,7 +4335,7 @@ static void NWEnsureGTKEditBox( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKSpinButton( SalX11Screen nScreen )
 {
@@ -4352,7 +4352,7 @@ static void NWEnsureGTKSpinButton( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKNotebook( SalX11Screen nScreen )
 {
@@ -4363,7 +4363,7 @@ static void NWEnsureGTKNotebook( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKOptionMenu( SalX11Screen nScreen )
 {
@@ -4374,7 +4374,7 @@ static void NWEnsureGTKOptionMenu( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKCombo( SalX11Screen nScreen )
 {
@@ -4394,7 +4394,7 @@ static void NWEnsureGTKCombo( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen )
 {
@@ -4408,7 +4408,7 @@ static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKToolbar( SalX11Screen nScreen )
 {
@@ -4439,7 +4439,7 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen )
     }
 }
 
-//-------------------------------------
+
 
 static void NWEnsureGTKMenubar( SalX11Screen nScreen )
 {
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index f5356db897dc..265070c0823f 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3948,9 +3948,9 @@ void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )
     }
 }
 
-// ----------------------------------------------------------------------
+
 // GtkSalFrame::IMHandler
-// ----------------------------------------------------------------------
+
 
 GtkSalFrame::IMHandler::IMHandler( GtkSalFrame* pFrame )
 : m_pFrame(pFrame),
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 378930a3202b..8472838fc429 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1715,9 +1715,9 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar
     return bReturn;
 }
 
-// -----------------------------------------------------------------------
+
 // KDESalFrame implementation
-// -----------------------------------------------------------------------
+
 
 KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nStyle ) :
     X11SalFrame( pParent, nStyle )
@@ -2089,9 +2089,9 @@ KDESalFrame::GraphicsHolder::~GraphicsHolder()
     delete pGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 // KDESalInstance implementation
-// -----------------------------------------------------------------------
+
 
 SalFrame *
 KDESalInstance::CreateFrame( SalFrame *pParent, sal_uLong nStyle )
@@ -2106,9 +2106,9 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDESalInstance::createFilePicker(
                 new UnxFilePicker( xMSF ) );
 }
 
-// -----------------------------------------------------------------------
+
 // KDESalData pieces
-// -----------------------------------------------------------------------
+
 
 // Create the widget painter so we have some control over
 // the destruction sequence, so Qt doesn't die in action.
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index fc9967459dda..73d2e6edf22e 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -42,7 +42,7 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
     return eEncoding;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString ImplSalGetUniString(const sal_Char* pStr, sal_Int32 const nLen)
 {
@@ -88,28 +88,28 @@ BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
     return PostMessageW( hWnd, nMsg, wParam, lParam );
 }
 
-// -----------------------------------------------------------------------
+
 
 BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
 {
     return SendMessageW( hWnd, nMsg, wParam, lParam );
 }
 
-// -----------------------------------------------------------------------
+
 
 BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax )
 {
     return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
 }
 
-// -----------------------------------------------------------------------
+
 
 BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT wMsgFilterMax, UINT wRemoveMsg )
 {
     return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg );
 }
 
-// -----------------------------------------------------------------------
+
 
 LONG ImplDispatchMessage( CONST MSG *lpMsg )
 {
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index fdb5cc57b2d7..178693f15615 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -43,7 +43,7 @@ WinSalSystem::~WinSalSystem()
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
                                           HDC hDC,
@@ -178,7 +178,7 @@ OUString WinSalSystem::GetDisplayScreenName( unsigned int nScreen )
     return (nScreen < m_aMonitors.size()) ? m_aMonitors[nScreen].m_aName : OUString();
 }
 
-// -----------------------------------------------------------------------
+
 /* We have to map the button identifier to the identifier used by the Win32
    Platform SDK to specify the default button for the MessageBox API.
    The first dimension is the button combination, the second dimension
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 316c5443df95..ece177210cb2 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -127,7 +127,7 @@ public:
     sal_uLong                       GetAcquireCount( sal_uLong nThreadId );
 };
 
-// -----------------------------------------------------------------------
+
 
 SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData )
 {
@@ -136,7 +136,7 @@ SalYieldMutex::SalYieldMutex( WinSalInstance* pInstData )
     mnThreadId  = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SalYieldMutex::acquire()
 {
@@ -145,7 +145,7 @@ void SalYieldMutex::acquire()
     mnThreadId = GetCurrentThreadId();
 }
 
-// -----------------------------------------------------------------------
+
 
 void SalYieldMutex::release()
 {
@@ -187,7 +187,7 @@ void SalYieldMutex::release()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SalYieldMutex::tryToAcquire()
 {
@@ -201,7 +201,7 @@ bool SalYieldMutex::tryToAcquire()
         return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId )
 {
@@ -211,7 +211,7 @@ sal_uLong SalYieldMutex::GetAcquireCount( sal_uLong nThreadId )
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalYieldMutexAcquireWithWait()
 {
@@ -259,7 +259,7 @@ void ImplSalYieldMutexAcquireWithWait()
         pInst->mpSalYieldMutex->acquire();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ImplSalYieldMutexTryToAcquire()
 {
@@ -270,7 +270,7 @@ sal_Bool ImplSalYieldMutexTryToAcquire()
         return FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalYieldMutexAcquire()
 {
@@ -279,7 +279,7 @@ void ImplSalYieldMutexAcquire()
         pInst->mpSalYieldMutex->acquire();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalYieldMutexRelease()
 {
@@ -291,7 +291,7 @@ void ImplSalYieldMutexRelease()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong ImplSalReleaseYieldMutex()
 {
@@ -311,7 +311,7 @@ sal_uLong ImplSalReleaseYieldMutex()
     return nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalAcquireYieldMutex( sal_uLong nCount )
 {
@@ -327,7 +327,7 @@ void ImplSalAcquireYieldMutex( sal_uLong nCount )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalInstance::CheckYieldMutex()
 {
@@ -367,9 +367,9 @@ void SalData::initKeyCodeMap()
 }
 
 // =======================================================================
-// -------
+
 // SalData
-// -------
+
 
 SalData::SalData()
 {
@@ -468,7 +468,7 @@ void DeInitSalData()
     delete pSalData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void InitSalMain()
 {
@@ -485,7 +485,7 @@ void InitSalMain()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SalInstance* CreateSalInstance()
 {
@@ -569,7 +569,7 @@ SalInstance* CreateSalInstance()
     return pInst;
 }
 
-// -----------------------------------------------------------------------
+
 
 void DestroySalInstance( SalInstance* pInst )
 {
@@ -586,7 +586,7 @@ void DestroySalInstance( SalInstance* pInst )
     delete pInst;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalInstance::WinSalInstance()
 {
@@ -598,7 +598,7 @@ WinSalInstance::WinSalInstance()
     ::tools::SolarMutex::SetSolarMutex( mpSalYieldMutex );
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalInstance::~WinSalInstance()
 {
@@ -609,28 +609,28 @@ WinSalInstance::~WinSalInstance()
     DestroyWindow( mhComWnd );
 }
 
-// -----------------------------------------------------------------------
+
 
 comphelper::SolarMutex* WinSalInstance::GetYieldMutex()
 {
     return mpSalYieldMutex;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong WinSalInstance::ReleaseYieldMutex()
 {
     return ImplSalReleaseYieldMutex();
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
     ImplSalAcquireYieldMutex( nCount );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalDispatchMessage( MSG* pMsg )
 {
@@ -645,7 +645,7 @@ static void ImplSalDispatchMessage( MSG* pMsg )
         ImplSalPostDispatchMsg( pMsg, lResult );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents )
 {
@@ -676,7 +676,7 @@ void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 {
@@ -727,7 +727,7 @@ void WinSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
 {
@@ -873,7 +873,7 @@ LRESULT CALLBACK SalComWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalInstance::AnyInput( sal_uInt16 nType )
 {
@@ -955,7 +955,7 @@ bool WinSalInstance::AnyInput( sal_uInt16 nType )
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SalTimer::Start( sal_uLong nMS )
 {
@@ -972,7 +972,7 @@ void SalTimer::Start( sal_uLong nMS )
         ImplSalStartTimer( nMS, FALSE );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle )
 {
@@ -980,7 +980,7 @@ SalFrame* WinSalInstance::CreateChildFrame( SystemParentData* pSystemParentData,
     return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)pSystemParentData->hWnd );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle )
 {
@@ -993,14 +993,14 @@ SalFrame* WinSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameSty
     return (SalFrame*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEFRAME, nSalFrameStyle, (LPARAM)hWndParent );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalInstance::DestroyFrame( SalFrame* pFrame )
 {
     ImplSendMessage( mhComWnd, SAL_MSG_DESTROYFRAME, 0, (LPARAM)pFrame );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalObject* WinSalInstance::CreateObject( SalFrame* pParent,
                                          SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows
@@ -1010,14 +1010,14 @@ SalObject* WinSalInstance::CreateObject( SalFrame* pParent,
     return (SalObject*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalInstance::DestroyObject( SalObject* pObject )
 {
     ImplSendMessage( mhComWnd, SAL_MSG_DESTROYOBJECT, 0, (LPARAM)pObject );
 }
 
-// -----------------------------------------------------------------------
+
 
 void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes )
 {
@@ -1026,7 +1026,7 @@ void* WinSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rReturn
     return const_cast<char *>("");
 }
 
-// -----------------------------------------------------------------------
+
 
 /** Add a file to the system shells recent document list if there is any.
       This function may have no effect under Unix because there is no
@@ -1108,14 +1108,14 @@ void WinSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUS
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SalTimer* WinSalInstance::CreateSalTimer()
 {
     return new WinSalTimer();
 }
 
-// -----------------------------------------------------------------------
+
 
 SalBitmap* WinSalInstance::CreateSalBitmap()
 {
@@ -1139,7 +1139,7 @@ SalI18NImeStatus* WinSalInstance::CreateI18NImeStatus()
     return new WinImeStatus();
 }
 
-// -----------------------------------------------------------------------
+
 
 const OUString& SalGetDesktopEnvironment()
 {
@@ -1153,7 +1153,7 @@ SalSession* WinSalInstance::CreateSalSession()
 }
 
 #if !defined ( __MINGW32__ ) || defined ( _WIN64 )
-// -----------------------------------------------------------------------
+
 int WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(int, LPEXCEPTION_POINTERS pExceptionInfo)
 {
     // Decide if an exception is a c++ (mostly UNO) exception or a process violation.
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 9e6fd34e020b..fa66249df02e 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -67,7 +67,7 @@ HCURSOR ImplLoadSalCursor( int nId )
     return hCursor;
 }
 
-// -----------------------------------------------------------------------
+
 
 HBITMAP ImplLoadSalBitmap( int nId )
 {
@@ -80,7 +80,7 @@ HBITMAP ImplLoadSalBitmap( int nId )
     return hBitmap;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon )
 {
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 95ab585e981d..68cd6ca5098e 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -56,7 +56,7 @@ void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex )
     pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalTimer::~WinSalTimer()
 {
@@ -90,7 +90,7 @@ void WinSalTimer::Stop()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void CALLBACK SalTimerProc( HWND, UINT, UINT_PTR nId, DWORD )
 {
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index f0e150975e89..5324581d4c6d 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -64,7 +64,7 @@
 #endif
 
 
-// ------------------------------------------------------------------
+
 // - Inlines -
 
 inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex )
@@ -75,7 +75,7 @@ inline void ImplSetPixel4( const HPBYTE pScanline, long nX, const BYTE cIndex )
                  ( rByte &= 0x0f, rByte |= ( cIndex << 4 ) );
 }
 
-// ------------------------------------------------------------------
+
 // Helper class to manage Gdiplus::Bitmap instances inside of
 // WinSalBitmap
 
@@ -194,13 +194,13 @@ public:
     }
 };
 
-// ------------------------------------------------------------------
+
 // Global instance of GdiPlusBuffer which manages Gdiplus::Bitmap
 // instances
 
 static GdiPlusBuffer aGdiPlusBuffer;
 
-// ------------------------------------------------------------------
+
 // - WinSalBitmap -
 
 WinSalBitmap::WinSalBitmap()
@@ -213,14 +213,14 @@ WinSalBitmap::WinSalBitmap()
 {
 }
 
-// ------------------------------------------------------------------
+
 
 WinSalBitmap::~WinSalBitmap()
 {
     Destroy();
 }
 
-// ------------------------------------------------------------------
+
 
 void WinSalBitmap::Destroy()
 {
@@ -238,7 +238,7 @@ void WinSalBitmap::Destroy()
     mnBitCount = 0;
 }
 
-// ------------------------------------------------------------------
+
 
 GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSource) const
 {
@@ -281,7 +281,7 @@ GdiPlusBmpPtr WinSalBitmap::ImplGetGdiPlusBitmap(const WinSalBitmap* pAlphaSourc
     return maGdiPlusBitmap;
 }
 
-// ------------------------------------------------------------------
+
 
 Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
 {
@@ -372,7 +372,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap()
     return pRetval;
 }
 
-// ------------------------------------------------------------------
+
 
 Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlphaSource)
 {
@@ -530,7 +530,7 @@ Gdiplus::Bitmap* WinSalBitmap::ImplCreateGdiPlusBitmap(const WinSalBitmap& rAlph
     return pRetval;
 }
 
-// ------------------------------------------------------------------
+
 
 bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
 {
@@ -581,7 +581,7 @@ bool WinSalBitmap::Create( HANDLE hBitmap, bool bDIB, bool bCopyHandle )
     return bRet;
 }
 
-// ------------------------------------------------------------------
+
 
 bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal )
 {
@@ -599,7 +599,7 @@ bool WinSalBitmap::Create( const Size& rSize, sal_uInt16 nBitCount, const Bitmap
     return bRet;
 }
 
-// ------------------------------------------------------------------
+
 
 bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap )
 {
@@ -628,7 +628,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap )
     return bRet;
 }
 
-// ------------------------------------------------------------------
+
 
 bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
 {
@@ -674,7 +674,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
     return bRet;
 }
 
-// ------------------------------------------------------------------
+
 
 bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount )
 {
@@ -726,7 +726,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, sal_uInt16 nNewBitCount )
     return bRet;
 }
 
-// ------------------------------------------------------------------
+
 
 bool WinSalBitmap::Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& /*rSize*/, bool bMask )
 {
@@ -775,7 +775,7 @@ sal_uInt16 WinSalBitmap::ImplGetDIBColorCount( HGLOBAL hDIB )
     return nColors;
 }
 
-// ------------------------------------------------------------------
+
 
 HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rPal )
 {
@@ -832,7 +832,7 @@ HGLOBAL WinSalBitmap::ImplCreateDIB( const Size& rSize, sal_uInt16 nBits, const
     return hDIB;
 }
 
-// ------------------------------------------------------------------
+
 
 HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
 {
@@ -878,7 +878,7 @@ HANDLE WinSalBitmap::ImplCopyDIBOrDDB( HANDLE hHdl, bool bDIB )
     return hCopy;
 }
 
-// ------------------------------------------------------------------
+
 
 BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
 {
@@ -977,7 +977,7 @@ BitmapBuffer* WinSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
     return pBuffer;
 }
 
-// ------------------------------------------------------------------
+
 
 void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
 {
@@ -1001,7 +1001,7 @@ void WinSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
     }
 }
 
-// ------------------------------------------------------------------
+
 
 void WinSalBitmap::ImplDecodeRLEBuffer( const BYTE* pSrcBuf, BYTE* pDstBuf,
                                      const Size& rSizePixel, bool bRLE4 )
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index c999f0df8373..845fb22a43af 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -60,7 +60,7 @@ struct SysColorEntry
 static SysColorEntry* pFirstSysColor = NULL;
 static SysColorEntry* pActSysColor = NULL;
 
-// -----------------------------------------------------------------------------
+
 
 // Blue7
 static PALETTEENTRY aImplExtraColor1 =
@@ -68,7 +68,7 @@ static PALETTEENTRY aImplExtraColor1 =
     0, 184, 255, 0
 };
 
-// -----------------------------------------------------------------------------
+
 
 static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] =
 {
@@ -90,7 +90,7 @@ static PALETTEENTRY aImplSalSysPalEntryAry[ DITHER_MAX_SYSCOLOR ] =
 { 0xFF, 0xFF, 0xFF, 0 }
 };
 
-// -----------------------------------------------------------------------------
+
 
 static BYTE aOrdDither8Bit[8][8] =
 {
@@ -104,7 +104,7 @@ static BYTE aOrdDither8Bit[8][8] =
    { 33, 20, 30, 17, 32, 20, 29, 16 }
 };
 
-// -----------------------------------------------------------------------------
+
 
 static BYTE aOrdDither16Bit[8][8] =
 {
@@ -309,7 +309,7 @@ void ImplInitSalGDI()
     ReleaseDC( 0, hDC );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplFreeSalGDI()
 {
@@ -383,7 +383,7 @@ void ImplFreeSalGDI()
     ImplReleaseTempFonts( *pSalData );
 }
 
-// -----------------------------------------------------------------------
+
 
 static int ImplIsPaletteEntry( BYTE nRed, BYTE nGreen, BYTE nBlue )
 {
@@ -492,7 +492,7 @@ void ImplUpdateSysColorEntries()
     ImplInsertSysColorEntry( COLOR_INACTIVECAPTIONTEXT );
 }
 
-// -----------------------------------------------------------------------
+
 
 static SalColor ImplGetROPSalColor( SalROPColor nROPColor )
 {
@@ -523,7 +523,7 @@ void ImplSalInitGraphics( WinSalGraphics* pData )
     ::SetROP2( pData->getHDC(), R2_COPYPEN );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalDeInitGraphics( WinSalGraphics* pData )
 {
@@ -741,7 +741,7 @@ WinSalGraphics::WinSalGraphics()
     mnPenWidth          = GSL_PEN_WIDTH;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalGraphics::~WinSalGraphics()
 {
@@ -776,7 +776,7 @@ WinSalGraphics::~WinSalGraphics()
     delete mpFontKernPairs;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
 {
@@ -790,14 +790,14 @@ void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
         rDPIX = rDPIY = 600;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 WinSalGraphics::GetBitCount() const
 {
     return (sal_uInt16)GetDeviceCaps( getHDC(), BITSPIXEL );
 }
 
-// -----------------------------------------------------------------------
+
 
 long WinSalGraphics::GetGraphicsWidth() const
 {
@@ -821,7 +821,7 @@ long WinSalGraphics::GetGraphicsWidth() const
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::ResetClipRegion()
 {
@@ -834,7 +834,7 @@ void WinSalGraphics::ResetClipRegion()
     SelectClipRgn( getHDC(), 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::setClipRegion( const Region& i_rClip )
 {
@@ -1065,7 +1065,7 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetLineColor()
 {
@@ -1088,7 +1088,7 @@ void WinSalGraphics::SetLineColor()
     mbStockPen  = TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetLineColor( SalColor nSalColor )
 {
@@ -1147,7 +1147,7 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor )
     mbStockPen  = bStockPen;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetFillColor()
 {
@@ -1170,7 +1170,7 @@ void WinSalGraphics::SetFillColor()
     mbStockBrush = TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetFillColor( SalColor nSalColor )
 {
@@ -1275,7 +1275,7 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor )
     mbStockBrush = bStockBrush;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetXORMode( bool bSet, bool )
 {
@@ -1283,21 +1283,21 @@ void WinSalGraphics::SetXORMode( bool bSet, bool )
     ::SetROP2( getHDC(), bSet ? R2_XORPEN : R2_COPYPEN );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetROPLineColor( SalROPColor nROPColor )
 {
     SetLineColor( ImplGetROPSalColor( nROPColor ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::SetROPFillColor( SalROPColor nROPColor )
 {
     SetFillColor( ImplGetROPSalColor( nROPColor ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawPixel( long nX, long nY )
 {
@@ -1313,7 +1313,7 @@ void WinSalGraphics::drawPixel( long nX, long nY )
         SetPixel( getHDC(), (int)nX, (int)nY, mnPenColor );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
 {
@@ -1338,7 +1338,7 @@ void WinSalGraphics::drawPixel( long nX, long nY, SalColor nSalColor )
         ::SetPixel( getHDC(), (int)nX, (int)nY, nCol );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
 {
@@ -1380,7 +1380,7 @@ void WinSalGraphics::drawLine( long nX1, long nY1, long nX2, long nY2 )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
 {
@@ -1405,7 +1405,7 @@ void WinSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight )
         WIN_Rectangle( getHDC(), (int)nX, (int)nY, (int)(nX+nWidth), (int)(nY+nHeight) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
 {
@@ -1454,7 +1454,7 @@ void WinSalGraphics::drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
 {
@@ -1468,7 +1468,7 @@ void WinSalGraphics::drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry )
         WIN_Polygon( getHDC(), pWinPtAry, MAX_64KSALPOINTS );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints,
                                    PCONSTSALPOINT* pPtAry )
@@ -1537,11 +1537,11 @@ void WinSalGraphics::drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoint
         delete [] pWinPointAryAry;
 }
 
-// -----------------------------------------------------------------------
+
 
 #define SAL_POLY_STACKBUF       32
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
 {
@@ -1558,7 +1558,7 @@ bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPt
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry )
 {
@@ -1610,7 +1610,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints,
                                              const SalPoint* const* pPtAry, const BYTE* const* pFlgAry )
@@ -1667,7 +1667,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32*
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 #define POSTSCRIPT_BUFSIZE 0x4000           // MAXIMUM BUFSIZE EQ 0xFFFF
 
@@ -1770,7 +1770,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
                 aBuf.append( "aa" );
 
                 // #107797# Write out EPS encapsulation header
-                // ----------------------------------------------------------------------------------
+
 
                 // directly taken from the PLRM 3.0, p. 726. Note:
                 // this will definitely cause problems when
@@ -1801,7 +1801,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
 
 
                 // #i10737# Apply clipping manually
-                // ----------------------------------------------------------------------------------
+
 
                 // Windows seems to ignore any clipping at the HDC,
                 // when followed by a POSTSCRIPT_PASSTHROUGH
@@ -1843,13 +1843,13 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
                 }
 
                 // #107797# Write out buffer
-                // ----------------------------------------------------------------------------------
+
                 *((sal_uInt16*)aBuf.getStr()) = (sal_uInt16)( aBuf.getLength() - 2 );
                 Escape ( getHDC(), nEscape, aBuf.getLength(), (LPTSTR)aBuf.getStr(), 0 );
 
 
                 // #107797# Write out EPS transformation code
-                // ----------------------------------------------------------------------------------
+
                 double  dM11 = nWidth / ( nBoundingBox[2] - nBoundingBox[0] );
                 double  dM22 = nHeight / (nBoundingBox[1] - nBoundingBox[3] );
                 // reserve a sal_uInt16 again
@@ -1869,7 +1869,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
 
 
                 // #107797# Write out actual EPS content
-                // ----------------------------------------------------------------------------------
+
                 sal_uLong   nToDo = nSize;
                 sal_uLong   nDoNow;
                 while ( nToDo )
@@ -1889,7 +1889,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
 
 
                 // #107797# Write out EPS encapsulation footer
-                // ----------------------------------------------------------------------------------
+
                 // reserve a sal_uInt16 again
                 aBuf.setLength( 2 );
                 aBuf.append( "%%EndDocument\n"
@@ -1906,7 +1906,7 @@ bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void*
     return bRetValue;
 }
 
-// -----------------------------------------------------------------------
+
 
 SystemGraphicsData WinSalGraphics::GetGraphicsData() const
 {
@@ -1916,6 +1916,6 @@ SystemGraphicsData WinSalGraphics::GetGraphicsData() const
     return aRes;
 }
 
-// -----------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 9e8537952e13..d81229604ebb 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -96,7 +96,7 @@ void WinSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics* pSrcGraph
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplCalcOutSideRgn( const RECT& rSrcRect,
                          int nLeft, int nTop, int nRight, int nBottom,
@@ -139,7 +139,7 @@ void ImplCalcOutSideRgn( const RECT& rSrcRect,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::copyArea( long nDestX, long nDestY,
                             long nSrcX, long nSrcY,
@@ -335,7 +335,7 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY,
 
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplDrawBitmap( HDC hDC,
                      const SalTwoRect& rPosAry, const WinSalBitmap& rSalBitmap,
@@ -443,7 +443,7 @@ void ImplDrawBitmap( HDC hDC,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap)
 {
@@ -472,7 +472,7 @@ void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSal
         mbXORMode ? SRCINVERT : SRCCOPY );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
                               const SalBitmap& rSSalBitmap,
@@ -528,7 +528,7 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
     delete pMask;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
                               const SalBitmap& rSSalBitmap,
@@ -623,7 +623,7 @@ void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
                                     long nHeight, sal_uInt8 nTransparency )
@@ -652,7 +652,7 @@ bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth,
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::drawMask( const SalTwoRect& rPosAry,
                             const SalBitmap& rSSalBitmap,
@@ -686,7 +686,7 @@ void WinSalGraphics::drawMask( const SalTwoRect& rPosAry,
     DeleteBrush( hMaskBrush );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
 {
@@ -724,7 +724,7 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY )
     return pSalBitmap;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalColor WinSalGraphics::getPixel( long nX, long nY )
 {
@@ -738,7 +738,7 @@ SalColor WinSalGraphics::getPixel( long nX, long nY )
                               GetBValue( aWinCol ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags )
 {
@@ -783,7 +783,7 @@ void WinSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalInv
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nSalFlags )
 {
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index be8ea7845218..2fd048fed949 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -59,9 +59,9 @@ using namespace vcl;
 
 static const int MAXFONTHEIGHT = 2048;
 
-// -----------
+
 // - Inlines -
-// -----------
+
 
 inline FIXED FixedFromDouble( double d )
 {
@@ -69,7 +69,7 @@ inline FIXED FixedFromDouble( double d )
     return *(FIXED*) &l;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline int IntTimes256FromFixed(FIXED f)
 {
@@ -86,7 +86,7 @@ static bool bImplSalCourierNew = false;
 
 // =======================================================================
 
-// -----------------------------------------------------------------------
+
 
 // TODO: also support temporary TTC font files
 typedef std::map< OUString, ImplDevFontAttributes > FontAttrMap;
@@ -649,7 +649,7 @@ static rtl_TextEncoding ImplCharSetToSal( BYTE nCharSet )
     return eTextEncoding;
 }
 
-// -----------------------------------------------------------------------
+
 
 static FontFamily ImplFamilyToSal( BYTE nFamily )
 {
@@ -677,7 +677,7 @@ static FontFamily ImplFamilyToSal( BYTE nFamily )
     return FAMILY_DONTKNOW;
 }
 
-// -----------------------------------------------------------------------
+
 
 static BYTE ImplFamilyToWin( FontFamily eFamily )
 {
@@ -708,7 +708,7 @@ static BYTE ImplFamilyToWin( FontFamily eFamily )
     return FF_DONTCARE;
 }
 
-// -----------------------------------------------------------------------
+
 
 static FontWeight ImplWeightToSal( int nWeight )
 {
@@ -732,7 +732,7 @@ static FontWeight ImplWeightToSal( int nWeight )
         return WEIGHT_BLACK;
 }
 
-// -----------------------------------------------------------------------
+
 
 static int ImplWeightToWin( FontWeight eWeight )
 {
@@ -773,7 +773,7 @@ static int ImplWeightToWin( FontWeight eWeight )
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline FontPitch ImplLogPitchToSal( BYTE nPitch )
 {
@@ -783,7 +783,7 @@ inline FontPitch ImplLogPitchToSal( BYTE nPitch )
         return PITCH_VARIABLE;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline FontPitch ImplMetricPitchToSal( BYTE nPitch )
 {
@@ -794,7 +794,7 @@ inline FontPitch ImplMetricPitchToSal( BYTE nPitch )
         return PITCH_VARIABLE;
 }
 
-// -----------------------------------------------------------------------
+
 
 inline BYTE ImplPitchToWin( FontPitch ePitch )
 {
@@ -806,7 +806,7 @@ inline BYTE ImplPitchToWin( FontPitch ePitch )
         return DEFAULT_PITCH;
 }
 
-// -----------------------------------------------------------------------
+
 
 static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rEnumFont,
     const NEWTEXTMETRICA& rMetric, DWORD nFontType )
@@ -881,7 +881,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXA& rE
     return aDFA;
 }
 
-// -----------------------------------------------------------------------
+
 
 static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rEnumFont,
     const NEWTEXTMETRICW& rMetric, DWORD nFontType )
@@ -956,7 +956,7 @@ static ImplDevFontAttributes WinFont2DevFontAttributes( const ENUMLOGFONTEXW& rE
     return aDFA;
 }
 
-// -----------------------------------------------------------------------
+
 
 static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogFont,
                                          const NEWTEXTMETRICA* pMetric,
@@ -975,7 +975,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataA( const ENUMLOGFONTEXA* pLogF
     return pData;
 }
 
-// -----------------------------------------------------------------------
+
 
 static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogFont,
                                          const NEWTEXTMETRICW* pMetric,
@@ -994,7 +994,7 @@ static ImplWinFontData* ImplLogMetricToDevFontDataW( const ENUMLOGFONTEXW* pLogF
     return pData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalLogFontToFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
 {
@@ -1180,7 +1180,7 @@ ImplWinFontData::ImplWinFontData( const ImplDevFontAttributes& rDFS,
 #endif
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplWinFontData::~ImplWinFontData()
 {
@@ -1198,19 +1198,19 @@ ImplWinFontData::~ImplWinFontData()
     delete mpEncodingVector;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_IntPtr ImplWinFontData::GetFontId() const
 {
     return mnId;
 }
 
-// -----------------------------------------------------------------------
+
 
 static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
 static inline DWORD CalcTag( const char p[4]) { return (p[0]+(p[1]<<8)+(p[2]<<16)+(p[3]<<24)); }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWinFontData::UpdateFromHDC( HDC hDC ) const
 {
@@ -1267,7 +1267,7 @@ const gr_face* ImplWinFontData::GraphiteFace() const
     return (mpGraphiteData)? mpGraphiteData->getFace() : NULL;
 }
 #endif
-// -----------------------------------------------------------------------
+
 
 bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const
 {
@@ -1276,14 +1276,14 @@ bool ImplWinFontData::HasGSUBstitutions( HDC hDC ) const
     return !maGsubTable.empty();
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplWinFontData::IsGSUBstituted( sal_UCS4 cChar ) const
 {
     return( maGsubTable.find( cChar ) != maGsubTable.end() );
 }
 
-// -----------------------------------------------------------------------
+
 
 const ImplFontCharMap* ImplWinFontData::GetImplFontCharMap() const
 {
@@ -1298,7 +1298,7 @@ bool ImplWinFontData::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabi
     return !rFontCapabilities.maUnicodeRange.empty() || !rFontCapabilities.maCodePageRange.empty();
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWinFontData::ReadGsubTable( HDC hDC ) const
 {
@@ -1345,7 +1345,7 @@ void ImplWinFontData::ReadGsubTable( HDC hDC ) const
     CloseTTFont( pTTFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWinFontData::ReadCmapTable( HDC hDC ) const
 {
@@ -1433,7 +1433,7 @@ void WinSalGraphics::SetTextColor( SalColor nSalColor )
     ::SetTextColor( getHDC(), aCol );
 }
 
-// -----------------------------------------------------------------------
+
 
 int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*,
                                       const NEWTEXTMETRICEXW*,
@@ -1443,7 +1443,7 @@ int CALLBACK SalEnumQueryFontProcExW( const ENUMLOGFONTEXW*,
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplGetLogFontFromFontSelect( HDC hDC,
                                    const FontSelectPattern* pFont,
@@ -1516,7 +1516,7 @@ void ImplGetLogFontFromFontSelect( HDC hDC,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 HFONT WinSalGraphics::ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont )
 {
@@ -1665,7 +1665,7 @@ sal_uInt16 WinSalGraphics::SetFont( FontSelectPattern* pFont, int nFallbackLevel
         return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLevel )
 {
@@ -1743,7 +1743,7 @@ void WinSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackLe
     pMetric->mnMinKashida = GetMinKashidaWidth();
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uLong WinSalGraphics::GetKernPairs()
 {
@@ -1774,7 +1774,7 @@ sal_uLong WinSalGraphics::GetKernPairs()
     return mnFontKernPairCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 const ImplFontCharMap* WinSalGraphics::GetImplFontCharMap() const
 {
@@ -1790,7 +1790,7 @@ bool WinSalGraphics::GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabil
     return mpWinFontData[0]->GetImplFontCapabilities(rFontCapabilities);
 }
 
-// -----------------------------------------------------------------------
+
 
 int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont,
                                   const NEWTEXTMETRICEXA* pMetric,
@@ -1846,7 +1846,7 @@ int CALLBACK SalEnumFontsProcExA( const ENUMLOGFONTEXA* pLogFont,
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont,
                                   const NEWTEXTMETRICEXW* pMetric,
@@ -1896,7 +1896,7 @@ int CALLBACK SalEnumFontsProcExW( const ENUMLOGFONTEXW* pLogFont,
     return 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 struct TempFontItem
 {
@@ -1975,7 +1975,7 @@ bool ImplAddTempFont( SalData& rSalData, const OUString& rFontFileURL )
     return (nRet > 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplReleaseTempFonts( SalData& rSalData )
 {
@@ -2006,7 +2006,7 @@ void ImplReleaseTempFonts( SalData& rSalData )
 #endif // FR_PRIVATE
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
     ImplDevFontAttributes& rDFA )
@@ -2103,7 +2103,7 @@ static bool ImplGetFontAttrFromFile( const OUString& rFontFileURL,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
     const OUString& rFontFileURL, const OUString& rFontName )
@@ -2161,7 +2161,7 @@ bool WinSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
 {
@@ -2263,7 +2263,7 @@ void WinSalGraphics::ClearDevFontCache()
     //anything to do here ?
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
 {
@@ -2295,7 +2295,7 @@ bool WinSalGraphics::GetGlyphBoundRect( sal_GlyphId aGlyphId, Rectangle& rRect )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
     ::basegfx::B2DPolyPolygon& rB2DPolyPoly )
@@ -2479,7 +2479,7 @@ bool WinSalGraphics::GetGlyphOutline( sal_GlyphId aGlyphId,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 class ScopedFont
 {
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index aee96e196b3f..23b286abdd88 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -61,7 +61,7 @@
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 
-// -----------------------------------------------------------------------
+
 
 void impAddB2DPolygonToGDIPlusGraphicsPathReal(Gdiplus::GpPath *pPath, const basegfx::B2DPolygon& rPolygon, bool bNoLineJoin)
 {
@@ -324,7 +324,7 @@ bool WinSalGraphics::drawPolyLine(
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void paintToGdiPlus(
     Gdiplus::Graphics& rGraphics,
@@ -359,7 +359,7 @@ void paintToGdiPlus(
         0);
 }
 
-// -----------------------------------------------------------------------
+
 
 void setInterpolationMode(
     Gdiplus::Graphics& rGraphics,
@@ -459,7 +459,7 @@ bool WinSalGraphics::drawAlphaBitmap(
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalGraphics::drawTransformedBitmap(
     const basegfx::B2DPoint& rNull,
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 40346f3c6e91..0703bbbbb64a 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -388,7 +388,7 @@ Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const
 }
 
 // Helper functions
-// ----
+
 
 void ImplConvertSpinbuttonValues( int nControlPart, const ControlState& rState, const Rectangle& rRect,
                                  int* pLunaPart, int *pLunaState, RECT *pRect )
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 603dd40918f9..420d312711da 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -151,7 +151,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice )
 {
@@ -172,7 +172,7 @@ WinSalVirtualDevice::WinSalVirtualDevice()
     mbForeignDC = FALSE;        // uses a foreign DC instead of a bitmap
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalVirtualDevice::~WinSalVirtualDevice()
 {
@@ -197,7 +197,7 @@ WinSalVirtualDevice::~WinSalVirtualDevice()
     mpGraphics = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* WinSalVirtualDevice::GetGraphics()
 {
@@ -210,14 +210,14 @@ SalGraphics* WinSalVirtualDevice::GetGraphics()
     return mpGraphics;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalVirtualDevice::ReleaseGraphics( SalGraphics* )
 {
     mbGraphics = FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalVirtualDevice::SetSize( long nDX, long nDY )
 {
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index b6bb33490d49..947219a582f7 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -102,7 +102,7 @@ private:
     mutable int             mnMinKashidaGlyph;
 };
 
-// -----------------------------------------------------------------------
+
 
 inline void ImplWinFontEntry::CacheGlyphWidth( int nCharCode, int nCharWidth )
 {
@@ -198,14 +198,14 @@ WinLayout::WinLayout( HDC hDC, const ImplWinFontData& rWFD, ImplWinFontEntry& rW
     mrWinFontEntry( rWFE )
 {}
 
-// -----------------------------------------------------------------------
+
 
 void WinLayout::InitFont() const
 {
     ::SelectObject( mhDC, mhFont );
 }
 
-// -----------------------------------------------------------------------
+
 
 // Using reasonably sized fonts to emulate huge fonts works around
 // a lot of problems in printer and display drivers. Huge fonts are
@@ -251,7 +251,7 @@ SimpleWinLayout::SimpleWinLayout( HDC hDC, BYTE nCharSet,
     mbDisableGlyphs = true;
 }
 
-// -----------------------------------------------------------------------
+
 
 SimpleWinLayout::~SimpleWinLayout()
 {
@@ -265,7 +265,7 @@ SimpleWinLayout::~SimpleWinLayout()
     delete[] mpOutGlyphs;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
@@ -530,7 +530,7 @@ bool SimpleWinLayout::LayoutText( ImplLayoutArgs& rArgs )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPos, int& nStart,
     long* pGlyphAdvances, int* pCharIndexes,
@@ -599,7 +599,7 @@ int SimpleWinLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIds, Point& rPo
     return nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const
 {
@@ -647,7 +647,7 @@ void SimpleWinLayout::DrawText( SalGraphics& rGraphics ) const
         DeleteFont( SelectFont( aHDC, hOrigFont ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 long SimpleWinLayout::FillDXArray( long* pDXArray ) const
 {
@@ -667,7 +667,7 @@ long SimpleWinLayout::FillDXArray( long* pDXArray ) const
     return mnWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
 // NOTE: the nFactor is used to prevent rounding errors for small nCharExtra values
@@ -692,7 +692,7 @@ sal_Int32 SimpleWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF
     return -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
 {
@@ -736,7 +736,7 @@ void SimpleWinLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::Justify( long nNewWidth )
 {
@@ -773,7 +773,7 @@ void SimpleWinLayout::Justify( long nNewWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
@@ -812,7 +812,7 @@ void SimpleWinLayout::AdjustLayout( ImplLayoutArgs& rArgs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
 {
@@ -857,7 +857,7 @@ void SimpleWinLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos )
 {
@@ -885,14 +885,14 @@ void SimpleWinLayout::MoveGlyph( int nStart, long nNewXPos )
         mnBaseAdv += nDelta;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::DropGlyph( int nStart )
 {
     mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SimpleWinLayout::Simplify( bool /*bIsBase*/ )
 {
@@ -995,7 +995,7 @@ public:
     bool            HasKashidas() const { return mbHasKashidas; }
 };
 
-// -----------------------------------------------------------------------
+
 
 class UniscribeLayout : public WinLayout
 {
@@ -1067,7 +1067,7 @@ static bool bUspInited = false;
 
 static bool bManualCellAlign = true;
 
-// -----------------------------------------------------------------------
+
 
 static bool InitUSP()
 {
@@ -1107,7 +1107,7 @@ static bool InitUSP()
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 UniscribeLayout::UniscribeLayout( HDC hDC,
     const ImplWinFontData& rWinFontData, ImplWinFontEntry& rWinFontEntry )
@@ -1132,7 +1132,7 @@ UniscribeLayout::UniscribeLayout( HDC hDC,
     mbDisableGlyphInjection( false )
 {}
 
-// -----------------------------------------------------------------------
+
 
 UniscribeLayout::~UniscribeLayout()
 {
@@ -1148,7 +1148,7 @@ UniscribeLayout::~UniscribeLayout()
     delete[] mpGlyphs2Chars;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
 {
@@ -1568,7 +1568,7 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs )
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 // calculate the range of relevant glyphs for this visual item
 bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem,
@@ -1631,7 +1631,7 @@ bool UniscribeLayout::GetItemSubrange( const VisualItem& rVisualItem,
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
     int& nStartx8, sal_Int32* pGlyphAdvances, int* pCharPosAry,
@@ -1898,7 +1898,7 @@ int UniscribeLayout::GetNextGlyphs( int nLen, sal_GlyphId* pGlyphs, Point& rPos,
     return nCount;
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos )
 {
@@ -1965,7 +1965,7 @@ void UniscribeLayout::MoveGlyph( int nStartx8, long nNewXPos )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::DropGlyph( int nStartx8 )
 {
@@ -1994,7 +1994,7 @@ void UniscribeLayout::DropGlyph( int nStartx8 )
     mpOutGlyphs[ nStart ] = DROPPED_OUTGLYPH;
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::Simplify( bool /*bIsBase*/ )
 {
@@ -2097,7 +2097,7 @@ void UniscribeLayout::Simplify( bool /*bIsBase*/ )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::DrawText( SalGraphics& ) const
 {
@@ -2149,7 +2149,7 @@ void UniscribeLayout::DrawText( SalGraphics& ) const
         DeleteFont( SelectFont( mhDC, hOrigFont ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 long UniscribeLayout::FillDXArray( long* pDXArray ) const
 {
@@ -2180,7 +2180,7 @@ long UniscribeLayout::FillDXArray( long* pDXArray ) const
     return nWidth;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor ) const
 {
@@ -2225,7 +2225,7 @@ sal_Int32 UniscribeLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int nF
     return -1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
 {
@@ -2294,7 +2294,7 @@ void UniscribeLayout::GetCaretPositions( int nMaxIdx, long* pCaretXArray ) const
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
@@ -2307,7 +2307,7 @@ void UniscribeLayout::AdjustLayout( ImplLayoutArgs& rArgs )
         Justify( rArgs.mnLayoutWidth );
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
 {
@@ -2446,7 +2446,7 @@ void UniscribeLayout::ApplyDXArray( const ImplLayoutArgs& rArgs )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::InitKashidaHandling()
 {
@@ -2590,7 +2590,7 @@ bool UniscribeLayout::KashidaWordFix ( int nMinGlyphPos, int nEndGlyphPos, int*
     return true;
 }
 
-// -----------------------------------------------------------------------
+
 
 void UniscribeLayout::Justify( long nNewWidth )
 {
@@ -2642,7 +2642,7 @@ void UniscribeLayout::Justify( long nNewWidth )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 bool UniscribeLayout::IsKashidaPosValid ( int nCharPos ) const
 {
@@ -2950,7 +2950,7 @@ SalLayout* WinSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLe
     return pWinLayout;
 }
 
-// -----------------------------------------------------------------------
+
 
 int    WinSalGraphics::GetMinKashidaWidth()
 {
@@ -2974,7 +2974,7 @@ ImplWinFontEntry::ImplWinFontEntry( FontSelectPattern& rFSD )
     maScriptCache = NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplWinFontEntry::~ImplWinFontEntry()
 {
@@ -2983,14 +2983,14 @@ ImplWinFontEntry::~ImplWinFontEntry()
     delete[] mpKerningPairs;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplWinFontEntry::HasKernData() const
 {
     return (mnKerningPairs >= 0);
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData )
 {
@@ -2999,7 +2999,7 @@ void ImplWinFontEntry::SetKernData( int nPairCount, const KERNINGPAIR* pPairData
     ::memcpy( mpKerningPairs, (const void*)pPairData, nPairCount*sizeof(KERNINGPAIR) );
 }
 
-// -----------------------------------------------------------------------
+
 
 int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const
 {
@@ -3020,7 +3020,7 @@ int ImplWinFontEntry::GetKerning( sal_Unicode cLeft, sal_Unicode cRight ) const
     return nKernAmount;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool ImplWinFontEntry::InitKashidaHandling( HDC hDC )
 {
@@ -3059,7 +3059,7 @@ PhysicalFontFace* ImplWinFontData::Clone() const
     return pClone;
 }
 
-// -----------------------------------------------------------------------
+
 
 ImplFontEntry* ImplWinFontData::CreateFontInstance( FontSelectPattern& rFSD ) const
 {
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
index 86067035de53..54ae7ea58b32 100644
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/source/gdi/wntgdi.cxx
@@ -26,7 +26,7 @@
 #pragma warning(pop)
 #endif
 
-// -----------------------------------------------------------------------
+
 
 extern "C"
 {
@@ -36,7 +36,7 @@ BOOL WINAPI WIN_Rectangle( HDC hDC, int X1, int Y1, int X2, int Y2 )
 }
 }
 
-// -----------------------------------------------------------------------
+
 
 extern "C"
 {
@@ -46,7 +46,7 @@ BOOL WINAPI WIN_Polygon( HDC hDC, CONST POINT * ppt, int ncnt )
 }
 }
 
-// -----------------------------------------------------------------------
+
 
 extern "C"
 {
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 77528383e6cb..390d051cb320 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -197,7 +197,7 @@ static void ImplSaveFrameState( WinSalFrame* pFrame )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 // if pParentRect is set, the workarea of the monitor that contains pParentRect is returned
 void ImplSalGetWorkArea( HWND hWnd, RECT *pRect, const RECT *pParentRect )
@@ -703,7 +703,7 @@ static UINT ImplSalGetWheelScrollLines()
     return nScrLines;
 }
 
-// -----------------------------------------------------------------------
+
 
 static UINT ImplSalGetWheelScrollChars()
 {
@@ -729,7 +729,7 @@ static UINT ImplSalGetWheelScrollChars()
     return nScrChars;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height )
 {
@@ -745,7 +745,7 @@ static void ImplSalAddBorder( const WinSalFrame* pFrame, int& width, int& height
     height = aWinRect.bottom - aWinRect.top + 1;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame,
                                        int& rX, int& rY, int& rDX, int& rDY )
@@ -824,7 +824,7 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame,
     rDY = nScreenDY+(nFrameY*2)+nCaptionY;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, sal_Bool bAlways = FALSE )
 {
@@ -842,7 +842,7 @@ static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, sal_Bool bAlways = F
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalFrame::WinSalFrame()
 {
@@ -912,7 +912,7 @@ WinSalFrame::WinSalFrame()
     pSalData->mpFirstFrame = this;
 }
 
-// -----------------------------------------------------------------------
+
 void WinSalFrame::updateScreenNumber()
 {
     if( mnDisplay == -1 ) // spans all monitors
@@ -935,7 +935,7 @@ void WinSalFrame::updateScreenNumber()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalFrame::~WinSalFrame()
 {
@@ -992,7 +992,7 @@ WinSalFrame::~WinSalFrame()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 SalGraphics* WinSalFrame::GetGraphics()
 {
@@ -1071,7 +1071,7 @@ SalGraphics* WinSalFrame::GetGraphics()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
 {
@@ -1095,14 +1095,14 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics )
     mbGraphics = FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalFrame::PostEvent( void* pData )
 {
     return (sal_Bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetTitle( const OUString& rTitle )
 {
@@ -1111,7 +1111,7 @@ void WinSalFrame::SetTitle( const OUString& rTitle )
     SetWindowTextW( mhWnd, reinterpret_cast<LPCWSTR>(rTitle.getStr()) );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetIcon( sal_uInt16 nIcon )
 {
@@ -1133,7 +1133,7 @@ void WinSalFrame::SetIcon( sal_uInt16 nIcon )
     ImplSendMessage( mhWnd, WM_SETICON, ICON_SMALL, (LPARAM)hSmIcon );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetMenu( SalMenu* pSalMenu )
 {
@@ -1147,7 +1147,7 @@ void WinSalFrame::DrawMenuBar()
     ::DrawMenuBar( mhWnd );
 }
 
-// -----------------------------------------------------------------------
+
 HWND ImplGetParentHwnd( HWND hWnd )
 {
     WinSalFrame* pFrame = GetWindowPtr( hWnd );
@@ -1161,14 +1161,14 @@ HWND ImplGetParentHwnd( HWND hWnd )
 
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame* WinSalFrame::GetParent() const
 {
     return GetWindowPtr( ImplGetParentHwnd( mhWnd ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate )
 {
@@ -1246,14 +1246,14 @@ static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 
 void WinSalFrame::SetExtendedFrameStyle( SalExtStyle )
 {
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate )
 {
@@ -1266,14 +1266,14 @@ void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate )
         ImplSalShow( mhWnd, bVisible, bNoActivate );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::Enable( sal_Bool bEnable )
 {
     EnableWindow( mhWnd, bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetMinClientSize( long nWidth, long nHeight )
 {
@@ -1287,7 +1287,7 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight )
     mnMaxHeight = nHeight;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
                                                    sal_uInt16 nFlags )
@@ -1500,7 +1500,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight,
         CallCallback( nEvent, NULL );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool bAsChild )
 {
@@ -1651,7 +1651,7 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool
                      SAL_MSG_DESTROYHWND, (WPARAM) 0, (LPARAM)hWndOld);
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetParent( SalFrame* pNewParent )
 {
@@ -1674,7 +1674,7 @@ bool WinSalFrame::SetPluginParent( SystemParentData* pNewParent )
 }
 
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::GetWorkArea( Rectangle &rRect )
 {
@@ -1686,7 +1686,7 @@ void WinSalFrame::GetWorkArea( Rectangle &rRect )
     rRect.Bottom()   = aRect.bottom-1;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::GetClientSize( long& rWidth, long& rHeight )
 {
@@ -1694,7 +1694,7 @@ void WinSalFrame::GetClientSize( long& rWidth, long& rHeight )
     rHeight = maGeometry.nHeight;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetWindowState( const SalFrameState* pState )
 {
@@ -1855,7 +1855,7 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState )
         mbDefPos = FALSE; // window was positioned
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalFrame::GetWindowState( SalFrameState* pState )
 {
@@ -1873,7 +1873,7 @@ bool WinSalFrame::GetWindowState( SalFrameState* pState )
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetScreenNumber( unsigned int nNewScreen )
 {
@@ -1944,7 +1944,7 @@ void WinSalFrame::SetApplicationID( const OUString &rApplicationID )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
 {
@@ -2009,7 +2009,7 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::StartPresentation( sal_Bool bStart )
 {
@@ -2064,7 +2064,7 @@ void WinSalFrame::StartPresentation( sal_Bool bStart )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetAlwaysOnTop( sal_Bool bOnTop )
 {
@@ -2076,7 +2076,7 @@ void WinSalFrame::SetAlwaysOnTop( sal_Bool bOnTop )
     SetWindowPos( mhWnd, hWnd, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags )
 {
@@ -2131,7 +2131,7 @@ static void ImplSalToTop( HWND hWnd, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::ToTop( sal_uInt16 nFlags )
 {
@@ -2145,7 +2145,7 @@ void WinSalFrame::ToTop( sal_uInt16 nFlags )
         ImplSalToTop( mhWnd, nFlags );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
 {
@@ -2280,7 +2280,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::CaptureMouse( sal_Bool bCapture )
 {
@@ -2294,7 +2294,7 @@ void WinSalFrame::CaptureMouse( sal_Bool bCapture )
     ImplSendMessage( mhWnd, nMsg, 0, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetPointerPos( long nX, long nY )
 {
@@ -2305,21 +2305,21 @@ void WinSalFrame::SetPointerPos( long nX, long nY )
     SetCursorPos( aPt.x, aPt.y );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::Flush()
 {
     GdiFlush();
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::Sync()
 {
     GdiFlush();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext )
 {
@@ -2381,7 +2381,7 @@ static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pCont
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::SetInputContext( SalInputContext* pContext )
 {
@@ -2389,7 +2389,7 @@ void WinSalFrame::SetInputContext( SalInputContext* pContext )
     ImplSendMessage( mhWnd, SAL_MSG_SETINPUTCONTEXT, 0, (LPARAM)(void*)pContext );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
 {
@@ -2407,7 +2407,7 @@ static void ImplSalFrameEndExtTextInput( HWND hWnd, sal_uInt16 nFlags )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
 {
@@ -2415,7 +2415,7 @@ void WinSalFrame::EndExtTextInput( sal_uInt16 nFlags )
     ImplSendMessage( mhWnd, SAL_MSG_ENDEXTTEXTINPUT, (WPARAM)nFlags, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
                                 UINT& rCount, UINT nMaxSize,
@@ -2487,7 +2487,7 @@ static void ImplGetKeyNameText( LONG lParam, sal_Unicode* pBuf,
         rCount = 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
@@ -2689,14 +2689,14 @@ OUString WinSalFrame::GetKeyName( sal_uInt16 nKeyCode )
     return OUString( aKeyBuf, sal::static_int_cast< sal_uInt16 >(nKeyBufLen) );
 }
 
-// -----------------------------------------------------------------------
+
 
 inline Color ImplWinColorToSal( COLORREF nColor )
 {
     return Color( GetRValue( nColor ), GetGValue( nColor ), GetBValue( nColor ) );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rFont )
 {
@@ -2716,7 +2716,7 @@ static void ImplSalUpdateStyleFontW( HDC hDC, const LOGFONTW& rLogFont, Font& rF
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static long ImplA2I( const BYTE* pStr )
 {
@@ -2741,7 +2741,7 @@ static long ImplA2I( const BYTE* pStr )
     return n;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::UpdateSettings( AllSettings& rSettings )
 {
@@ -2973,14 +2973,14 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     WinSalGraphics::updateSettingsNative( rSettings );
 }
 
-// -----------------------------------------------------------------------
+
 
 const SystemEnvData* WinSalFrame::GetSystemData() const
 {
     return &maSysData;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::Beep()
 {
@@ -2988,7 +2988,7 @@ void WinSalFrame::Beep()
     MessageBeep( 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame::SalPointerState WinSalFrame::GetPointerState()
 {
@@ -3015,7 +3015,7 @@ SalFrame::SalPointerState WinSalFrame::GetPointerState()
     return aState;
 }
 
-// -----------------------------------------------------------------------
+
 
 SalFrame::SalIndicatorState WinSalFrame::GetIndicatorState()
 {
@@ -3050,14 +3050,14 @@ void WinSalFrame::SimulateKeyPress( sal_uInt16 nKeyCode )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::ResetClipRegion()
 {
     SetWindowRgn( mhWnd, 0, TRUE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::BeginSetClipRegion( sal_uLong nRects )
 {
@@ -3074,7 +3074,7 @@ void WinSalFrame::BeginSetClipRegion( sal_uLong nRects )
     mbFirstClipRect       = TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
@@ -3117,7 +3117,7 @@ void WinSalFrame::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
         mpNextClipRect++;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalFrame::EndSetClipRegion()
 {
@@ -3157,7 +3157,7 @@ void WinSalFrame::EndSetClipRegion()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
                                 WPARAM wParam, LPARAM lParam )
@@ -3324,7 +3324,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg,
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static long ImplHandleMouseActivateMsg( HWND hWnd )
 {
@@ -3344,7 +3344,7 @@ static long ImplHandleMouseActivateMsg( HWND hWnd )
     return pFrame->CallCallback( SALEVENT_MOUSEACTIVATE, &aMouseActivateEvt );
 }
 
-// -----------------------------------------------------------------------
+
 
 static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
 {
@@ -3416,7 +3416,7 @@ static long ImplHandleWheelMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam )
 {
@@ -3438,7 +3438,7 @@ static sal_uInt16 ImplSalGetKeyCode( WPARAM wParam )
     return nKeyCode;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplUpdateInputLang( WinSalFrame* pFrame )
 {
@@ -3465,7 +3465,7 @@ static sal_Unicode ImplGetCharCode( WinSalFrame* pFrame, WPARAM nCharCode )
     return (sal_Unicode)nCharCode;
 }
 
-// -----------------------------------------------------------------------
+
 
 LanguageType WinSalFrame::GetInputLanguage()
 {
@@ -3478,7 +3478,7 @@ LanguageType WinSalFrame::GetInputLanguage()
         return (LanguageType) mnInputLang;
 }
 
-// -----------------------------------------------------------------------
+
 
 bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode )
 {
@@ -3516,7 +3516,7 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
                               WPARAM wParam, LPARAM lParam, LRESULT& rResult )
@@ -3800,7 +3800,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg,
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg,
                              WPARAM wParam, LPARAM lParam )
@@ -3853,7 +3853,7 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg,
     return 0;
 }
 
-// -----------------------------------------------------------------------
+
 
 long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
 {
@@ -3891,7 +3891,7 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool ImplHandlePaintMsg( HWND hWnd )
 {
@@ -3960,7 +3960,7 @@ static bool ImplHandlePaintMsg( HWND hWnd )
     return bMutex ? true : false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect )
 {
@@ -3980,7 +3980,7 @@ static void ImplHandlePaintMsg2( HWND hWnd, RECT* pRect )
         ImplPostMessage( hWnd, SAL_MSG_POSTPAINT, (WPARAM)pRect, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void SetMaximizedFrameGeometry( HWND hWnd, WinSalFrame* pFrame, RECT* pParentRect )
 {
@@ -4066,7 +4066,7 @@ static void UpdateFrameGeometry( HWND hWnd, WinSalFrame* pFrame )
     pFrame->updateScreenNumber();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplCallMoveHdl( HWND hWnd )
 {
@@ -4080,7 +4080,7 @@ static void ImplCallMoveHdl( HWND hWnd )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplCallClosePopupsHdl( HWND hWnd )
 {
@@ -4091,7 +4091,7 @@ static void ImplCallClosePopupsHdl( HWND hWnd )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleMoveMsg( HWND hWnd )
 {
@@ -4130,7 +4130,7 @@ static void ImplHandleMoveMsg( HWND hWnd )
         ImplPostMessage( hWnd, SAL_MSG_POSTMOVE, 0, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplCallSizeHdl( HWND hWnd )
 {
@@ -4153,7 +4153,7 @@ static void ImplCallSizeHdl( HWND hWnd )
         ImplPostMessage( hWnd, SAL_MSG_POSTCALLSIZE, 0, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
 {
@@ -4174,7 +4174,7 @@ static void ImplHandleSizeMsg( HWND hWnd, WPARAM wParam, LPARAM lParam )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleFocusMsg( HWND hWnd )
 {
@@ -4212,7 +4212,7 @@ static void ImplHandleFocusMsg( HWND hWnd )
         ImplPostMessage( hWnd, SAL_MSG_POSTFOCUS, 0, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleCloseMsg( HWND hWnd )
 {
@@ -4230,7 +4230,7 @@ static void ImplHandleCloseMsg( HWND hWnd )
         ImplPostMessage( hWnd, WM_CLOSE, 0, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 static long ImplHandleShutDownMsg( HWND hWnd )
 {
@@ -4245,7 +4245,7 @@ static long ImplHandleShutDownMsg( HWND hWnd )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg,
                                          WPARAM wParam, LPARAM lParam )
@@ -4297,7 +4297,7 @@ static void ImplHandleSettingsChangeMsg( HWND hWnd, UINT nMsg,
     ImplSalYieldMutexRelease();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam )
 {
@@ -4310,7 +4310,7 @@ static void ImplHandleUserEvent( HWND hWnd, LPARAM lParam )
     ImplSalYieldMutexRelease();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleForcePalette( HWND hWnd )
 {
@@ -4344,7 +4344,7 @@ static void ImplHandleForcePalette( HWND hWnd )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg,
                                   WPARAM wParam, LPARAM lParam, int& rDef )
@@ -4494,7 +4494,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg,
         return nCols;
 }
 
-// -----------------------------------------------------------------------
+
 
 static int ImplHandleMinMax( HWND hWnd, LPARAM lParam )
 {
@@ -4571,7 +4571,7 @@ static int ImplHandleMinMax( HWND hWnd, LPARAM lParam )
     return bRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 // retrieves the SalMenuItem pointer from a hMenu
 // the pointer is stored in every item, so if no position
@@ -5092,7 +5092,7 @@ static int ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam )
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam )
 {
@@ -5125,7 +5125,7 @@ static void ImplHandleInputLangChange( HWND hWnd, WPARAM, LPARAM lParam )
     ImplSalYieldMutexRelease();
 }
 
-// -----------------------------------------------------------------------
+
 
 static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC )
 {
@@ -5156,7 +5156,7 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_Bool ImplHandleIMEStartComposition( HWND hWnd )
 {
@@ -5186,7 +5186,7 @@ static sal_Bool ImplHandleIMEStartComposition( HWND hWnd )
     return bDef;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
                                                HIMC hIMC, LPARAM lParam )
@@ -5317,7 +5317,7 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame,
     return !bDef;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
 {
@@ -5364,7 +5364,7 @@ static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam )
     return bDef;
 }
 
-// -----------------------------------------------------------------------
+
 
 static sal_Bool ImplHandleIMEEndComposition( HWND hWnd )
 {
@@ -5384,7 +5384,7 @@ static sal_Bool ImplHandleIMEEndComposition( HWND hWnd )
     return bDef;
 }
 
-// -----------------------------------------------------------------------
+
 
 static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam )
 {
@@ -5485,7 +5485,7 @@ static void ImplHandleIMENotify( HWND hWnd, WPARAM wParam )
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static bool
 ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet)
@@ -5525,7 +5525,7 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet)
     return false;
 }
 
-// -----------------------------------------------------------------------
+
 
 static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
 {
@@ -5580,7 +5580,7 @@ static LRESULT ImplHandleIMEReconvertString( HWND hWnd, LPARAM lParam )
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 static LRESULT ImplHandleIMEConfirmReconvertString( HWND hWnd, LPARAM lParam )
 {
@@ -5648,7 +5648,7 @@ static LRESULT ImplHandleIMEQueryCharPosition( HWND hWnd, LPARAM lParam ) {
     return TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void SalTestMouseLeave()
 {
@@ -5663,7 +5663,7 @@ void SalTestMouseLeave()
     }
 }
 
-// -----------------------------------------------------------------------
+
 
 static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam ,
                                  LRESULT& rResult )
@@ -5693,7 +5693,7 @@ static int ImplSalWheelMousePos( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPa
     return TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
 {
@@ -6171,7 +6171,7 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult )
 {
@@ -6194,7 +6194,7 @@ sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam
     return bResult;
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall )
 {
@@ -6256,7 +6256,7 @@ sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall )
         return TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 #ifdef _WIN32
 bool HasAtHook()
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index b4d40a692016..1284636990dc 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -398,6 +398,6 @@ WinSalMenuItem::~WinSalMenuItem()
         ImplRemoveItemById( mpSalMenu, mnId );
 }
 
-// -------------------------------------------------------------------
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index f6287e7c93b7..ac70f7a8183a 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -52,7 +52,7 @@ static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalObject* ImplFindSalObject( HWND hWndChild )
 {
@@ -69,7 +69,7 @@ WinSalObject* ImplFindSalObject( HWND hWndChild )
     return NULL;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
 {
@@ -92,7 +92,7 @@ WinSalFrame* ImplFindSalObjectFrame( HWND hWnd )
     return pFrame;
 }
 
-// -----------------------------------------------------------------------
+
 
 LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
 {
@@ -149,7 +149,7 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam )
     return CallNextHookEx( pSalData->mhSalObjMsgHook, nCode, wParam, lParam );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_Bool ImplSalPreDispatchMsg( MSG* pMsg )
 {
@@ -234,7 +234,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg )
     return FALSE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void ImplSalPostDispatchMsg( MSG* pMsg, LRESULT /* nDispatchResult */ )
 {
@@ -388,7 +388,7 @@ LRESULT CALLBACK SalSysObjWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM
     return nRet;
 }
 
-// -----------------------------------------------------------------------
+
 
 LRESULT CALLBACK SalSysObjChildWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef )
 {
@@ -584,7 +584,7 @@ WinSalObject::WinSalObject()
     pSalData->mpFirstObject = this;
 }
 
-// -----------------------------------------------------------------------
+
 
 WinSalObject::~WinSalObject()
 {
@@ -626,21 +626,21 @@ WinSalObject::~WinSalObject()
         ImplSendMessage( hWndParent, SAL_MSG_FORCEPALETTE, 0, 0 );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::ResetClipRegion()
 {
     SetWindowRgn( mhWnd, 0, TRUE );
 }
 
-// -----------------------------------------------------------------------
+
 
 sal_uInt16 WinSalObject::GetClipRegionType()
 {
     return SAL_OBJECT_CLIP_INCLUDERECTS;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount )
 {
@@ -662,7 +662,7 @@ void WinSalObject::BeginSetClipRegion( sal_uLong nRectCount )
     mbFirstClipRect       = TRUE;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight )
 {
@@ -701,7 +701,7 @@ void WinSalObject::UnionClipRegion( long nX, long nY, long nWidth, long nHeight
     mpNextClipRect++;
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::EndSetClipRegion()
 {
@@ -726,7 +726,7 @@ void WinSalObject::EndSetClipRegion()
     SetWindowRgn( mhWnd, hRegion, TRUE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
 {
@@ -742,7 +742,7 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight )
                   SWP_NOZORDER | SWP_NOACTIVATE | nStyle );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::Show( sal_Bool bVisible )
 {
@@ -752,14 +752,14 @@ void WinSalObject::Show( sal_Bool bVisible )
         ShowWindow( mhWnd, SW_HIDE );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::Enable( sal_Bool bEnable )
 {
     EnableWindow( mhWnd, bEnable );
 }
 
-// -----------------------------------------------------------------------
+
 
 void WinSalObject::GrabFocus()
 {
diff --git a/winaccessibility/source/service/AccResource.cxx b/winaccessibility/source/service/AccResource.cxx
index b81db7a2fb7d..e3ace6fc9884 100644
--- a/winaccessibility/source/service/AccResource.cxx
+++ b/winaccessibility/source/service/AccResource.cxx
@@ -39,13 +39,13 @@
 //==================================================================
 SimpleResMgr* ResourceManager::m_pImpl = NULL;
 
-//------------------------------------------------------------------
+
 ResourceManager::EnsureDelete::~EnsureDelete()
 {
     delete ResourceManager::m_pImpl;
 }
 
-//------------------------------------------------------------------
+
 void ResourceManager::ensureImplExists()
 {
     //Comment the following code because the acc resource is not necessary now. Can open them if necessary
@@ -68,7 +68,7 @@ void ResourceManager::ensureImplExists()
   */
 }
 
-//------------------------------------------------------------------
+
 ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId)
 {
     ::rtl::OUString sReturn;
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 3495f4be52d8..bd985173f4ff 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -2453,7 +2453,7 @@ void SchXMLExportHelper_Impl::exportAxes(
     Reference< chart::XAxisSupplier > xAxisSupp( xDiagram, uno::UNO_QUERY );
 
     // x axis
-    // -------
+
     Reference< ::com::sun::star::chart2::XAxis > xNewAxis = lcl_getAxis( xCooSys, XML_X );
     if( xNewAxis.is() )
     {
@@ -2477,7 +2477,7 @@ void SchXMLExportHelper_Impl::exportAxes(
     }
 
     // secondary x axis
-    // -------
+
     Reference< chart::XSecondAxisTitleSupplier > xSecondTitleSupp( xDiagram, uno::UNO_QUERY );
     xNewAxis = lcl_getAxis( xCooSys, XML_X, false );
     if( xNewAxis.is() )
@@ -2487,7 +2487,7 @@ void SchXMLExportHelper_Impl::exportAxes(
     }
 
     // y axis
-    // -------
+
     xNewAxis = lcl_getAxis( xCooSys, XML_Y );
     if( xNewAxis.is() )
     {
@@ -2496,7 +2496,7 @@ void SchXMLExportHelper_Impl::exportAxes(
     }
 
     // secondary y axis
-    // -------
+
     xNewAxis = lcl_getAxis( xCooSys, XML_Y, false );
     if( xNewAxis.is() )
     {
@@ -2505,7 +2505,7 @@ void SchXMLExportHelper_Impl::exportAxes(
     }
 
     // z axis
-    // -------
+
     xNewAxis = lcl_getAxis( xCooSys, XML_Z );
     if( xNewAxis.is() )
     {
@@ -3207,7 +3207,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
     sal_Bool bExportContent )
 {
     // data-points
-    // -----------
+
     // write data-points only if they contain autostyles
     // objects with equal autostyles are grouped using the attribute
     // repeat="number"
diff --git a/xmloff/source/style/kernihdl.cxx b/xmloff/source/style/kernihdl.cxx
index 34307ae13c1c..758c05a881f0 100644
--- a/xmloff/source/style/kernihdl.cxx
+++ b/xmloff/source/style/kernihdl.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
 
-// --
+
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 
diff --git a/xmloff/source/style/shadwhdl.cxx b/xmloff/source/style/shadwhdl.cxx
index 348fd132d773..923013b954cf 100644
--- a/xmloff/source/style/shadwhdl.cxx
+++ b/xmloff/source/style/shadwhdl.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
 
-// --
+
 #include <com/sun/star/table/ShadowFormat.hpp>
 #include <tools/color.hxx>
 #include <sax/tools/converter.hxx>
diff --git a/xmloff/source/style/shdwdhdl.cxx b/xmloff/source/style/shdwdhdl.cxx
index 69884c83de8a..6ba55c9f98e8 100644
--- a/xmloff/source/style/shdwdhdl.cxx
+++ b/xmloff/source/style/shdwdhdl.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustrbuf.hxx>
 
-// --
+
 #include <xmloff/xmltoken.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx
index 5141f74ba8f4..a5d49d82f35b 100644
--- a/xmloff/source/style/xmltabi.cxx
+++ b/xmloff/source/style/xmltabi.cxx
@@ -53,7 +53,7 @@ static SvXMLTokenMapEntry aTabsAttributesAttrTokenMap[] =
     XML_TOKEN_MAP_END
 };
 
-// ---
+
 
 class SvxXMLTabStopContext_Impl : public SvXMLImportContext
 {
@@ -175,7 +175,7 @@ SvXMLImportContext *SvxXMLTabStopContext_Impl::CreateChildContext(
 class SvxXMLTabStopArray_Impl : public std::vector<SvxXMLTabStopContext_Impl *> {};
 
 
-// ---
+
 
 TYPEINIT1( SvxXMLTabStopImportContext, XMLElementPropertyContext );
 
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 95f6f0ce599a..0135f28b6484 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -258,7 +258,7 @@ static int txtparae_bContainsIllegalCharacters = sal_False;
 // The following map shows which property values are required:
 //
 // property                     auto style pass     export
-// -------------------------------------------------------
+
 // ParaStyleName                if style exists     always
 // ParaConditionalStyleName     if style exists     always
 // NumberingRules               if style exists     always
diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx
index df4af5a4fc2a..1edf5f6ed5f8 100644
--- a/xmlscript/test/imexp.cxx
+++ b/xmlscript/test/imexp.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <config_folders.h>
- 
+
 #include <stdio.h>
 #include <osl/file.h>